[kernel] r14951 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Jan 18 21:48:34 UTC 2010
Author: benh
Date: Mon Jan 18 21:48:29 2010
New Revision: 14951
Log:
[x86] Update rt2860sta/rt2870sta firmware loader patch
- Accept 8K versions of rt2870.bin
- Fix hang on resume
Added:
dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/6
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Sun Jan 17 23:46:37 2010 (r14950)
+++ dists/trunk/linux-2.6/debian/changelog Mon Jan 18 21:48:29 2010 (r14951)
@@ -17,6 +17,9 @@
- agp/intel-agp: Clear entire GTT on startup
- drm: remove address mask param for drm_pci_alloc()
* Add MODULE_FIRMWARE declarations to several drivers that lacked them
+ * [x86] Update rt2860sta/rt2870sta firmware loader patch
+ - Accept 8K versions of rt2870.bin
+ - Fix hang on resume
[ Ian Campbell ]
* xen: Enable up to 32G of guest memory on i386.
Added: dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch Mon Jan 18 21:48:29 2010 (r14951)
@@ -0,0 +1,91 @@
+From 6c628a539fe6953bfe6112d75c7fbb1f9409a086 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 28 Jun 2009 15:49:17 +0100
+Subject: [PATCH] rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite()
+
+These functions do not modify the data they are passed.
+---
+ drivers/staging/rt2860/rtmp.h | 6 +++---
+ drivers/staging/rt2870/common/rtusb_io.c | 10 +++++-----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
+index 90fd40f..d283256 100644
+--- a/drivers/staging/rt2860/rtmp.h
++++ b/drivers/staging/rt2860/rtmp.h
+@@ -6095,13 +6095,13 @@ NTSTATUS RTUSBMultiRead(
+ NTSTATUS RTUSBMultiWrite(
+ IN PRTMP_ADAPTER pAd,
+ IN USHORT Offset,
+- IN PUCHAR pData,
++ IN const u8 *pData,
+ IN USHORT length);
+
+ NTSTATUS RTUSBMultiWrite_OneByte(
+ IN PRTMP_ADAPTER pAd,
+ IN USHORT Offset,
+- IN PUCHAR pData);
++ IN const u8 *pData);
+
+ NTSTATUS RTUSBReadBBPRegister(
+ IN PRTMP_ADAPTER pAd,
+@@ -6220,7 +6220,7 @@ NTSTATUS RTUSBFirmwareRun(
+
+ NTSTATUS RTUSBFirmwareWrite(
+ IN PRTMP_ADAPTER pAd,
+- IN PUCHAR pFwImage,
++ IN const u8 *pFwImage,
+ IN ULONG FwLen);
+
+ NTSTATUS RTUSBFirmwareOpmode(
+diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
+index 1d69590..1f776c4 100644
+--- a/drivers/staging/rt2870/common/rtusb_io.c
++++ b/drivers/staging/rt2870/common/rtusb_io.c
+@@ -92,7 +92,7 @@ NTSTATUS RTUSBFirmwareRun(
+ */
+ NTSTATUS RTUSBFirmwareWrite(
+ IN PRTMP_ADAPTER pAd,
+- IN PUCHAR pFwImage,
++ IN const u8 *pFwImage,
+ IN ULONG FwLen)
+ {
+ UINT32 MacReg;
+@@ -224,7 +224,7 @@ NTSTATUS RTUSBMultiRead(
+ NTSTATUS RTUSBMultiWrite_OneByte(
+ IN PRTMP_ADAPTER pAd,
+ IN USHORT Offset,
+- IN PUCHAR pData)
++ IN const u8 *pData)
+ {
+ NTSTATUS Status;
+
+@@ -236,7 +236,7 @@ NTSTATUS RTUSBMultiWrite_OneByte(
+ 0x6,
+ 0,
+ Offset,
+- pData,
++ (u8 *)pData,
+ 1);
+
+ return Status;
+@@ -245,14 +245,14 @@ NTSTATUS RTUSBMultiWrite_OneByte(
+ NTSTATUS RTUSBMultiWrite(
+ IN PRTMP_ADAPTER pAd,
+ IN USHORT Offset,
+- IN PUCHAR pData,
++ IN const u8 *pData,
+ IN USHORT length)
+ {
+ NTSTATUS Status;
+
+
+ USHORT index = 0,Value;
+- PUCHAR pSrc = pData;
++ const u8 *pSrc = pData;
+ USHORT resude = 0;
+
+ resude = length % 2;
+--
+1.6.6
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt28x0sta-use-request_firmware.patch Mon Jan 18 21:48:29 2010 (r14951)
@@ -0,0 +1,268 @@
+From 96fa9ac6fbf64117221dcfcdcc03f64d77ae6901 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 28 Jun 2009 15:51:07 +0100
+Subject: [PATCH] rt{2860,2870}sta: Use request_firmware() to load firmware
+
+When originally introduced into staging, these drivers had custom
+firmware-loading code which checked a version number and CRC at the
+end of each blob. This reintroduces those checks, using crc-ccitt
+instead of custom code.
+
+The removed firmware will be added to the linux-firmware.git
+repository.
+
+Based on work by Darren Salt <linux at youmustbejoking.demon.co.uk>.
+---
+ drivers/staging/rt2860/Kconfig | 3 +-
+ drivers/staging/rt2860/common/rtmp_init.c | 144 +++++++++++++++++-----------
+ drivers/staging/rt2860/rt_linux.c | 3 +
+ drivers/staging/rt2860/rtmp.h | 1 +
+ drivers/staging/rt2870/Kconfig | 3 +-
+ 5 files changed, 95 insertions(+), 59 deletions(-)
+
+diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
+index 6dff527..b98aba7 100644
+--- a/drivers/staging/rt2860/Kconfig
++++ b/drivers/staging/rt2860/Kconfig
+@@ -1,6 +1,7 @@
+ config RT2860
+ tristate "Ralink 2860 wireless support"
+- depends on BROKEN
+ depends on PCI && X86 && WLAN
++ select CRC_CCITT
++ select FW_LOADER
+ ---help---
+ This is an experimental driver for the Ralink 2860 wireless chip.
+diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
+index 20c2ce2..a575f4f 100644
+--- a/drivers/staging/rt2860/common/rtmp_init.c
++++ b/drivers/staging/rt2860/common/rtmp_init.c
+@@ -38,14 +38,8 @@
+ Jan Lee 2006-09-15 RT2860. Change for 802.11n , EEPROM, Led, BA, HT.
+ */
+ #include "../rt_config.h"
+-#ifdef RT2860
+-#include "firmware.h"
+-#include <linux/bitrev.h>
+-#endif
+-#ifdef RT2870
+-/* New firmware handles both RT2870 and RT3070. */
+-#include "../../rt3070/firmware.h"
+-#endif
++#include <linux/firmware.h>
++#include <linux/crc-ccitt.h>
+
+ UCHAR BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
+ ULONG BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
+@@ -174,23 +168,25 @@ RTMP_REG_PAIR STAMACRegTable[] = {
+ #define NUM_STA_MAC_REG_PARMS (sizeof(STAMACRegTable) / sizeof(RTMP_REG_PAIR))
+
+ #ifdef RT2870
+-//
+-// RT2870 Firmware Spec only used 1 oct for version expression
+-//
+-#define FIRMWARE_MINOR_VERSION 7
+
+-#endif // RT2870 //
++#define FIRMWAREIMAGE_LENGTH 0x1000
+
+-// New 8k byte firmware size for RT3071/RT3072
+-#define FIRMWAREIMAGE_MAX_LENGTH 0x2000
+-#define FIRMWAREIMAGE_LENGTH (sizeof (FirmwareImage) / sizeof(UCHAR))
+-#define FIRMWARE_MAJOR_VERSION 0
++#define FIRMWARE_2870_MIN_VERSION 12
++#define FIRMWARE_2870_FILENAME "rt2870.bin" /* for RT2870/RT3070 */
++MODULE_FIRMWARE(FIRMWARE_2870_FILENAME);
+
+-#define FIRMWAREIMAGEV1_LENGTH 0x1000
+-#define FIRMWAREIMAGEV2_LENGTH 0x1000
++#define FIRMWARE_3071_MIN_VERSION 2
++#define FIRMWARE_3071_FILENAME "rt3071.bin" /* for RT3071/RT3072 */
++MODULE_FIRMWARE(FIRMWARE_3071_FILENAME);
++
++#else /* RT2860 */
++
++#define FIRMWAREIMAGE_LENGTH 0x2000
++
++#define FIRMWARE_2860_MIN_VERSION 11
++#define FIRMWARE_2860_FILENAME "rt2860.bin"
++MODULE_FIRMWARE(FIRMWARE_2860_FILENAME);
+
+-#ifdef RT2860
+-#define FIRMWARE_MINOR_VERSION 2
+ #endif
+
+
+@@ -2955,6 +2951,70 @@ VOID NICEraseFirmware(
+
+ }/* End of NICEraseFirmware */
+
++static const struct firmware *rtmp_get_firmware(PRTMP_ADAPTER adapter)
++{
++ const char *name;
++ const struct firmware *fw = NULL;
++ u8 min_version;
++ struct device *dev;
++ int err;
++
++ if (adapter->firmware)
++ return adapter->firmware;
++
++#ifdef RT2870
++ if (IS_RT3071(adapter)) {
++ name = FIRMWARE_3071_FILENAME;
++ min_version = FIRMWARE_3071_MIN_VERSION;
++ } else {
++ name = FIRMWARE_2870_FILENAME;
++ min_version = FIRMWARE_2870_MIN_VERSION;
++ }
++ dev = &((POS_COOKIE)adapter->OS_Cookie)->pUsb_Dev->dev;
++#else /* RT2860 */
++ name = FIRMWARE_2860_FILENAME;
++ min_version = FIRMWARE_2860_MIN_VERSION;
++ dev = &((POS_COOKIE)adapter->OS_Cookie)->pci_dev->dev;
++#endif
++
++ err = request_firmware(&fw, name, dev);
++ if (err) {
++ dev_err(dev, "firmware file %s request failed (%d)\n",
++ name, err);
++ return NULL;
++ }
++
++ if (fw->size < FIRMWAREIMAGE_LENGTH) {
++ dev_err(dev, "firmware file %s size is invalid\n", name);
++ goto invalid;
++ }
++
++ /* is it new enough? */
++ adapter->FirmwareVersion = fw->data[FIRMWAREIMAGE_LENGTH - 3];
++ if (adapter->FirmwareVersion < min_version) {
++ dev_err(dev,
++ "firmware file %s is too old;"
++ " driver requires v%d or later\n",
++ name, min_version);
++ goto invalid;
++ }
++
++ /* is the internal CRC correct? */
++ if (crc_ccitt(0xffff, fw->data, FIRMWAREIMAGE_LENGTH - 2) !=
++ (fw->data[FIRMWAREIMAGE_LENGTH - 2] |
++ (fw->data[FIRMWAREIMAGE_LENGTH - 1] << 8))) {
++ dev_err(dev, "firmware file %s failed internal CRC\n", name);
++ goto invalid;
++ }
++
++ adapter->firmware = fw;
++ return fw;
++
++invalid:
++ release_firmware(fw);
++ return NULL;
++}
++
+ /*
+ ========================================================================
+
+@@ -2975,46 +3035,16 @@ VOID NICEraseFirmware(
+ NDIS_STATUS NICLoadFirmware(
+ IN PRTMP_ADAPTER pAd)
+ {
++ const struct firmware *fw;
+ NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
+- PUCHAR pFirmwareImage;
+- ULONG FileLength, Index;
+- //ULONG firm;
++ ULONG Index;
+ UINT32 MacReg = 0;
+-#ifdef RT2870
+- UINT32 Version = (pAd->MACVersion >> 16);
+-#endif // RT2870 //
+
+- pFirmwareImage = FirmwareImage;
+- FileLength = sizeof(FirmwareImage);
+-#ifdef RT2870
+- // New 8k byte firmware size for RT3071/RT3072
+- //printk("Usb Chip\n");
+- if (FIRMWAREIMAGE_LENGTH == FIRMWAREIMAGE_MAX_LENGTH)
+- //The firmware image consists of two parts. One is the origianl and the other is the new.
+- //Use Second Part
+- {
+- if ((Version != 0x2860) && (Version != 0x2872) && (Version != 0x3070))
+- { // Use Firmware V2.
+- //printk("KH:Use New Version,part2\n");
+- pFirmwareImage = (PUCHAR)&FirmwareImage[FIRMWAREIMAGEV1_LENGTH];
+- FileLength = FIRMWAREIMAGEV2_LENGTH;
+- }
+- else
+- {
+- //printk("KH:Use New Version,part1\n");
+- pFirmwareImage = FirmwareImage;
+- FileLength = FIRMWAREIMAGEV1_LENGTH;
+- }
+- }
+- else
+- {
+- DBGPRINT(RT_DEBUG_ERROR, ("KH: bin file should be 8KB.\n"));
+- Status = NDIS_STATUS_FAILURE;
+- }
+-
+-#endif // RT2870 //
++ fw = rtmp_get_firmware(pAd);
++ if (!fw)
++ return NDIS_STATUS_FAILURE;
+
+- RT28XX_WRITE_FIRMWARE(pAd, pFirmwareImage, FileLength);
++ RT28XX_WRITE_FIRMWARE(pAd, fw->data, FIRMWAREIMAGE_LENGTH);
+
+ /* check if MCU is ready */
+ Index = 0;
+diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
+index ed27b85..4f730ff 100644
+--- a/drivers/staging/rt2860/rt_linux.c
++++ b/drivers/staging/rt2860/rt_linux.c
+@@ -25,6 +25,7 @@
+ *************************************************************************
+ */
+
++#include <linux/firmware.h>
+ #include <linux/sched.h>
+ #include "rt_config.h"
+
+@@ -299,6 +300,8 @@ VOID RTMPFreeAdapter(
+
+ NdisFreeSpinLock(&pAd->irq_lock);
+
++ release_firmware(pAd->firmware);
++
+ vfree(pAd); // pci_free_consistent(os_cookie->pci_dev,sizeof(RTMP_ADAPTER),pAd,os_cookie->pAd_pa);
+ kfree(os_cookie);
+ }
+diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
+index d283256..2a56821 100644
+--- a/drivers/staging/rt2860/rtmp.h
++++ b/drivers/staging/rt2860/rtmp.h
+@@ -2522,6 +2522,7 @@ typedef struct _RTMP_ADAPTER
+ PVOID OS_Cookie; // save specific structure relative to OS
+ PNET_DEV net_dev;
+ ULONG VirtualIfCnt;
++ const struct firmware *firmware;
+
+ #ifdef RT2860
+ USHORT LnkCtrlBitMask;
+diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
+index 05ee373..a0c9eb3 100644
+--- a/drivers/staging/rt2870/Kconfig
++++ b/drivers/staging/rt2870/Kconfig
+@@ -1,6 +1,7 @@
+ config RT2870
+ tristate "Ralink 2870/3070 wireless support"
+- depends on BROKEN
+ depends on USB && X86 && WLAN
++ select CRC_CCITT
++ select FW_LOADER
+ ---help---
+ This is an experimental driver for the Ralink xx70 wireless chips.
+--
+1.6.6
+
Modified: dists/trunk/linux-2.6/debian/patches/series/6
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/6 Sun Jan 17 23:46:37 2010 (r14950)
+++ dists/trunk/linux-2.6/debian/patches/series/6 Mon Jan 18 21:48:29 2010 (r14951)
@@ -21,3 +21,6 @@
+ features/all/module-firmware/0028-sep-declare-MODULE_FIRMWARE.patch
+ features/all/module-firmware/0029-isight-firmware-declare-MODULE_FIRMWARE.patch
+ features/all/module-firmware/0030-btmrvl-sdio-declare-MODULE_FIRMWARE.patch
+- features/all/drivers-staging-rt28x0sta-request_firmware.patch
++ features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch
++ features/all/rt28x0sta-use-request_firmware.patch
More information about the Kernel-svn-changes
mailing list