On 10/28/2010 04:48 PM, Stefan Lippers-Hollmann wrote:
>
> I assume you refer to rtl8712u.bin in your r8712u_firmware tree:
> http://git.kernel.org/?p=linux/kernel/git/lwfinger/r8712u_firmware.git;a=blob_plain;f=rtl8712u.bin
> 200fd952db3cc9259b1fd05e3e51966f *rtl8712u.bin
>
>> you want to grab the new firmware package, I can send you a copy of the patch.
>
> I'd very much like to test the patch(2) needed for rtl8712, if possible.
Attached is the patch. You should place rtl8712u.bin in
/lib/modules/rtl8712u/rtl8712u.bin.
Larry
>From 2559d624a3bfc47e6ba9d1cf5157c5c7b1cbf80e Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Date: Tue, 26 Oct 2010 10:59:11 -0500
Subject: [PATCH 1/2] staging: r8712u: Switch driver to use external firmware from linux-firmware
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
drivers/staging/rtl8712/TODO | 2 --
drivers/staging/rtl8712/hal_init.c | 22 +++++++++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rtl8712/TODO b/drivers/staging/rtl8712/TODO
index 5c88821..ed22b0b 100644
--- a/drivers/staging/rtl8712/TODO
+++ b/drivers/staging/rtl8712/TODO
@@ -4,8 +4,6 @@ TODO:
- switch to use MAC80211
- checkpatch.pl fixes - only a few remain
- sparse fixes
-- switch from large inline firmware file to use the firmware interface
- and add the file to the linux-firmware package.
Please send any patches to Greg Kroah-Hartman <greg@xxxxxxxxx>,
Larry Finger <Larry.Finger@xxxxxxxxxxxx> and
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 32088a6..014fbbc 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -31,7 +31,6 @@
#include "osdep_service.h"
#include "drv_types.h"
#include "rtl871x_byteorder.h"
-#include "farray.h"
#include "usb_osintf.h"
#define FWBUFF_ALIGN_SZ 512
@@ -40,11 +39,24 @@
static u32 rtl871x_open_fw(struct _adapter *padapter, void **pphfwfile_hdl,
const u8 **ppmappedfw)
{
- u32 len;
+ int rc;
+ const char firmware_file[] = "rtl8712u/rtl8712u.bin";
+ const struct firmware **praw = (const struct firmware **)
+ (pphfwfile_hdl);
+ struct dvobj_priv *pdvobjpriv = (struct dvobj_priv *)
+ (&padapter->dvobjpriv);
+ struct usb_device *pusbdev = pdvobjpriv->pusbdev;
- *ppmappedfw = f_array;
- len = sizeof(f_array);
- return len;
+ printk(KERN_INFO "r8712u: Loading firmware from \"%s\"\n",
+ firmware_file);
+ rc = request_firmware(praw, firmware_file, &pusbdev->dev);
+ if (rc < 0) {
+ printk(KERN_ERR "r8712u: Unable to load firmware\n");
+ printk(KERN_ERR "r8712u: Install latest linux-firmware\n");
+ return 0;
+ }
+ *ppmappedfw = (u8 *)((*praw)->data);
+ return (*praw)->size;
}
static void fill_fwpriv(struct _adapter *padapter, struct fw_priv *pfwpriv)
--
1.7.1
