~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,13 +1,9 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/* Support for hardware buffer manager.
2	3	*
3	4	* Copyright (C) 2016 Marvell
4	5	*
5	6	* Gregory CLEMENT <gregory.clement@free-electrons.com>
6		- *
7		- * This program is free software; you can redistribute it and/or modify
8		- * it under the terms of the GNU General Public License as published by
9		- * the Free Software Foundation; either version 2 of the License, or
10		- * (at your option) any later version.
11	7	*/
12	8	#include <linux/kernel.h>
13	9	#include <linux/printk.h>
..	..	@@ -47,34 +43,33 @@
47	43	}
48	44	EXPORT_SYMBOL_GPL(hwbm_pool_refill);
49	45
50		-int hwbm_pool_add(struct hwbm_pool *bm_pool, unsigned int buf_num, gfp_t gfp)
	46	+int hwbm_pool_add(struct hwbm_pool *bm_pool, unsigned int buf_num)
51	47	{
52	48	int err, i;
53		- unsigned long flags;
54	49
55		- spin_lock_irqsave(&bm_pool->lock, flags);
	50	+ mutex_lock(&bm_pool->buf_lock);
56	51	if (bm_pool->buf_num == bm_pool->size) {
57	52	pr_warn("pool already filled\n");
58		- spin_unlock_irqrestore(&bm_pool->lock, flags);
	53	+ mutex_unlock(&bm_pool->buf_lock);
59	54	return bm_pool->buf_num;
60	55	}
61	56
62	57	if (buf_num + bm_pool->buf_num > bm_pool->size) {
63	58	pr_warn("cannot allocate %d buffers for pool\n",
64	59	buf_num);
65		- spin_unlock_irqrestore(&bm_pool->lock, flags);
	60	+ mutex_unlock(&bm_pool->buf_lock);
66	61	return 0;
67	62	}
68	63
69	64	if ((buf_num + bm_pool->buf_num) < bm_pool->buf_num) {
70	65	pr_warn("Adding %d buffers to the %d current buffers will overflow\n",
71	66	buf_num, bm_pool->buf_num);
72		- spin_unlock_irqrestore(&bm_pool->lock, flags);
	67	+ mutex_unlock(&bm_pool->buf_lock);
73	68	return 0;
74	69	}
75	70
76	71	for (i = 0; i < buf_num; i++) {
77		- err = hwbm_pool_refill(bm_pool, gfp);
	72	+ err = hwbm_pool_refill(bm_pool, GFP_KERNEL);
78	73	if (err < 0)
79	74	break;
80	75	}
..	..	@@ -83,7 +78,7 @@
83	78	bm_pool->buf_num += i;
84	79
85	80	pr_debug("hwpm pool: %d of %d buffers added\n", i, buf_num);
86		- spin_unlock_irqrestore(&bm_pool->lock, flags);
	81	+ mutex_unlock(&bm_pool->buf_lock);
87	82
88	83	return i;
89	84	}