dirty fix to merging

1 files changed, 171 insertions, 0 deletions

diff --git a/drivers/net/wireless/bcmdhd.1.88.45.x.cn/dhd_static_buf.c b/drivers/net/wireless/bcmdhd.1.88.45.x.cn/dhd_static_buf.c
new file mode 100644
index 00000000..31bcde37
--- /dev/null
+++ b/drivers/net/wireless/bcmdhd.1.88.45.x.cn/dhd_static_buf.c
@@ -0,0 +1,171 @@
+#include <linux/module.h>

+#include <linux/kernel.h>

+#include <linux/init.h> 

+#include <linux/platform_device.h> 

+#include <linux/delay.h> 

+#include <linux/err.h> 

+#include <linux/skbuff.h> 

+#include <linux/wlan_plat.h> 

+

+#define CONFIG_BROADCOM_WIFI_RESERVED_MEM

+

+#ifdef CONFIG_BROADCOM_WIFI_RESERVED_MEM

+

+#define WLAN_STATIC_PKT_BUF			4

+#define WLAN_STATIC_SCAN_BUF0		5

+#define WLAN_STATIC_SCAN_BUF1		6

+#define WLAN_STATIC_DHD_INFO		7

+#define PREALLOC_WLAN_SEC_NUM		5

+#define PREALLOC_WLAN_BUF_NUM		160

+#define PREALLOC_WLAN_SECTION_HEADER	24

+

+#define WLAN_SECTION_SIZE_0	(PREALLOC_WLAN_BUF_NUM * 128)

+#define WLAN_SECTION_SIZE_1	(PREALLOC_WLAN_BUF_NUM * 128)

+#define WLAN_SECTION_SIZE_2	(PREALLOC_WLAN_BUF_NUM * 512)

+#define WLAN_SECTION_SIZE_3	(PREALLOC_WLAN_BUF_NUM * 1024)

+#define WLAN_SECTION_SIZE_7	(PREALLOC_WLAN_BUF_NUM * 128)

+

+#define DHD_SKB_HDRSIZE			336

+#define DHD_SKB_1PAGE_BUFSIZE	((PAGE_SIZE*1)-DHD_SKB_HDRSIZE)

+#define DHD_SKB_2PAGE_BUFSIZE	((PAGE_SIZE*2)-DHD_SKB_HDRSIZE)

+#define DHD_SKB_4PAGE_BUFSIZE	((PAGE_SIZE*4)-DHD_SKB_HDRSIZE)

+

+#define WLAN_SKB_BUF_NUM	17

+

+static struct sk_buff *wlan_static_skb[WLAN_SKB_BUF_NUM];

+

+struct wlan_mem_prealloc {

+	void *mem_ptr;

+	unsigned long size;

+};

+

+static struct wlan_mem_prealloc wlan_mem_array[PREALLOC_WLAN_SEC_NUM] = {

+	{NULL, (WLAN_SECTION_SIZE_0 + PREALLOC_WLAN_SECTION_HEADER)},

+	{NULL, (WLAN_SECTION_SIZE_1 + PREALLOC_WLAN_SECTION_HEADER)},

+	{NULL, (WLAN_SECTION_SIZE_2 + PREALLOC_WLAN_SECTION_HEADER)},

+	{NULL, (WLAN_SECTION_SIZE_3 + PREALLOC_WLAN_SECTION_HEADER)},

+	{NULL, (WLAN_SECTION_SIZE_7 + PREALLOC_WLAN_SECTION_HEADER)}

+};

+

+void *wlan_static_scan_buf0;

+void *wlan_static_scan_buf1;

+void *bcmdhd_mem_prealloc(int section, unsigned long size)

+{

+	if (section == WLAN_STATIC_PKT_BUF) {

+		printk("1 %s: section=%d, wlan_static_skb=%p\n",

+			__FUNCTION__, section, wlan_static_skb);

+		return wlan_static_skb;

+	}

+	if (section == WLAN_STATIC_SCAN_BUF0) {

+		printk("2 %s: section=%d, wlan_static_scan_buf0=%p\n",

+			__FUNCTION__, section, wlan_static_scan_buf0);

+		return wlan_static_scan_buf0;

+	}

+	if (section == WLAN_STATIC_SCAN_BUF1) {

+		printk("3 %s: section=%d, wlan_static_scan_buf1=%p\n",

+			__FUNCTION__, section, wlan_static_scan_buf1);

+		return wlan_static_scan_buf1;

+	}

+	if (section == WLAN_STATIC_DHD_INFO) {

+		printk("4 %s: section=%d, wlan_mem_array[4]=%p\n",

+			__FUNCTION__, section, wlan_mem_array[4].mem_ptr);

+		return wlan_mem_array[4].mem_ptr;

+	}

+	if ((section < 0) || (section > PREALLOC_WLAN_SEC_NUM)) {

+		printk("5 %s: out of section %d\n", __FUNCTION__, section);

+		return NULL;

+	}

+

+	if (wlan_mem_array[section].size < size) {

+		printk("6 %s: wlan_mem_array[section].size=%d, size=%d\n",

+			__FUNCTION__, wlan_mem_array[section].size, size);

+		return NULL;

+	}

+	printk("7 %s: wlan_mem_array[section].mem_ptr=%p, size=%d\n",

+		__FUNCTION__, wlan_mem_array[section], size);

+

+	return wlan_mem_array[section].mem_ptr;

+}

+

+EXPORT_SYMBOL(bcmdhd_mem_prealloc);

+

+int bcmdhd_init_wlan_mem(void) 

+{

+	int i;

+	int j;

+

+	for (i=0; i<8; i++) {

+		wlan_static_skb[i] = dev_alloc_skb(DHD_SKB_1PAGE_BUFSIZE);

+		if (!wlan_static_skb[i])

+			goto err_skb_alloc; 

+		printk("1 %s: wlan_static_skb[%d]=%p, size=%d\n",

+			__FUNCTION__, i, wlan_static_skb[i], DHD_SKB_1PAGE_BUFSIZE);

+	}

+

+	for (; i<16; i++) {

+		wlan_static_skb[i] = dev_alloc_skb(DHD_SKB_2PAGE_BUFSIZE);

+		if (!wlan_static_skb[i])

+			goto err_skb_alloc; 

+		printk("2 %s: wlan_static_skb[%d]=%p, size=%d\n",

+			__FUNCTION__, i, wlan_static_skb[i], DHD_SKB_2PAGE_BUFSIZE);

+	}

+

+	wlan_static_skb[i] = dev_alloc_skb(DHD_SKB_4PAGE_BUFSIZE);

+	if (!wlan_static_skb[i])

+		goto err_skb_alloc; 

+	printk("3 %s: wlan_static_skb[%d]=%p, size=%d\n",

+		__FUNCTION__, i, wlan_static_skb[i], DHD_SKB_4PAGE_BUFSIZE);

+

+	for (i=0; i<PREALLOC_WLAN_SEC_NUM; i++) {

+		wlan_mem_array[i].mem_ptr =

+				kmalloc(wlan_mem_array[i].size, GFP_KERNEL);

+

+		if (!wlan_mem_array[i].mem_ptr)

+			goto err_mem_alloc;

+		printk("4 %s: wlan_mem_array[%d]=%p, size=%d\n",

+			__FUNCTION__, i, wlan_static_skb[i], wlan_mem_array[i].size);

+	}

+

+	wlan_static_scan_buf0 = kmalloc (65536, GFP_KERNEL);

+	if(!wlan_static_scan_buf0)

+		goto err_mem_alloc;

+	printk("5 %s: wlan_static_scan_buf0=%p, size=%d\n",

+		__FUNCTION__, wlan_static_scan_buf0, 65536);

+

+	wlan_static_scan_buf1 = kmalloc (65536, GFP_KERNEL);

+	if(!wlan_static_scan_buf1)

+		goto err_mem_alloc;

+	printk("6 %s: wlan_static_scan_buf1=%p, size=%d\n",

+		__FUNCTION__, wlan_static_scan_buf1, 65536);

+

+	printk("%s: WIFI MEM Allocated\n", __FUNCTION__);

+	return 0;

+

+err_mem_alloc:

+	pr_err("Failed to mem_alloc for WLAN\n");

+	for (j=0; j<i; j++)

+		kfree(wlan_mem_array[j].mem_ptr);

+

+	i = WLAN_SKB_BUF_NUM;

+

+err_skb_alloc:

+	pr_err("Failed to skb_alloc for WLAN\n");

+	for (j=0; j<i; j++)

+		dev_kfree_skb(wlan_static_skb[j]);

+

+	return -ENOMEM;

+}

+#endif /* CONFIG_BROADCOM_WIFI_RESERVED_MEM */

+

+static int __init bcmdhd_wlan_init(void)

+{

+	printk("%s()\n", __FUNCTION__);

+

+#ifdef CONFIG_BROADCOM_WIFI_RESERVED_MEM

+	bcmdhd_init_wlan_mem();

+#endif

+

+	return 0;

+}

+

+__initcall(bcmdhd_wlan_init);