From 491d6bfd347b6e0a1181b5bc12556e2ecbe85e84 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 18 Jan 2010 21:49:14 +0000 Subject: [PATCH] [x86] Enable rt3090sta using firmware loader svn path=/dists/trunk/linux-2.6/; revision=14952 --- debian/changelog | 1 + debian/config/kernelarch-x86/config | 5 + .../all/rt3090sta-use-request_firmware.patch | 426 ++++++++++++++++++ debian/patches/series/6 | 1 + 4 files changed, 433 insertions(+) create mode 100644 debian/patches/features/all/rt3090sta-use-request_firmware.patch diff --git a/debian/changelog b/debian/changelog index bf4ccf1a5..cfbd86500 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ linux-2.6 (2.6.32-6) UNRELEASED; urgency=low * [x86] Update rt2860sta/rt2870sta firmware loader patch - Accept 8K versions of rt2870.bin - Fix hang on resume + * [x86] Enable rt3090sta using firmware loader [ Ian Campbell ] * xen: Enable up to 32G of guest memory on i386. diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index ba1beadcc..eb11f3b3d 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1100,6 +1100,11 @@ CONFIG_RT2860=m ## CONFIG_RT2870=m +## +## file: drivers/staging/rt3090/Kconfig +## +CONFIG_RT3090=m + ## ## file: drivers/staging/rtl8187se/Kconfig ## diff --git a/debian/patches/features/all/rt3090sta-use-request_firmware.patch b/debian/patches/features/all/rt3090sta-use-request_firmware.patch new file mode 100644 index 000000000..06e4fe97e --- /dev/null +++ b/debian/patches/features/all/rt3090sta-use-request_firmware.patch @@ -0,0 +1,426 @@ +From fbc0964ef80092b2f2d18a13f4f95c8806e4fe72 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sun, 17 Jan 2010 16:22:36 +0000 +Subject: [PATCH] rt3090sta: Use request_firmware() to load firmware + +Based on work by Darren Salt . +--- + drivers/staging/rt3090/Kconfig | 3 +- + drivers/staging/rt3090/common/rtmp_mcu.c | 333 ++++++------------------------ + drivers/staging/rt3090/rt_linux.c | 2 + + drivers/staging/rt3090/rtmp.h | 1 + + 4 files changed, 65 insertions(+), 274 deletions(-) + +diff --git a/drivers/staging/rt3090/Kconfig b/drivers/staging/rt3090/Kconfig +index 8ba68b0..e4a2e0f 100644 +--- a/drivers/staging/rt3090/Kconfig ++++ b/drivers/staging/rt3090/Kconfig +@@ -1,6 +1,7 @@ + config RT3090 + tristate "Ralink 3090 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 3090 wireless chip. +diff --git a/drivers/staging/rt3090/common/rtmp_mcu.c b/drivers/staging/rt3090/common/rtmp_mcu.c +index 23f785a..b142442 100644 +--- a/drivers/staging/rt3090/common/rtmp_mcu.c ++++ b/drivers/staging/rt3090/common/rtmp_mcu.c +@@ -36,73 +36,14 @@ + */ + + #include "../rt_config.h" +-#include "../firmware.h" ++#include ++#include + +-//#define BIN_IN_FILE /* use *.bin firmware */ ++#define FIRMWAREIMAGE_LENGTH 0x2000 + +- +-// 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 FIRMWAREIMAGEV1_LENGTH 0x1000 +-#define FIRMWAREIMAGEV2_LENGTH 0x1000 +- +-#ifdef RTMP_MAC_PCI +-#define FIRMWARE_MINOR_VERSION 2 +-#endif // RTMP_MAC_PCI // +- +-const unsigned short ccitt_16Table[] = { +- 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, +- 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, +- 0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, +- 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE, +- 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, +- 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D, +- 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4, +- 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC, +- 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823, +- 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B, +- 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12, +- 0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A, +- 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41, +- 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49, +- 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70, +- 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78, +- 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F, +- 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067, +- 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E, +- 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256, +- 0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D, +- 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, +- 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C, +- 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634, +- 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB, +- 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3, +- 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A, +- 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92, +- 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9, +- 0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1, +- 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8, +- 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0 +-}; +-#define ByteCRC16(v, crc) \ +- (unsigned short)((crc << 8) ^ ccitt_16Table[((crc >> 8) ^ (v)) & 255]) +- +-unsigned char BitReverse(unsigned char x) +-{ +- int i; +- unsigned char Temp=0; +- for(i=0; ; i++) +- { +- if(x & 0x80) Temp |= 0x80; +- if(i==7) break; +- x <<= 1; +- Temp >>= 1; +- } +- return Temp; +-} ++#define FIRMWARE_3090_MIN_VERSION 19 ++#define FIRMWARE_3090_FILENAME "rt3090.bin" ++MODULE_FIRMWARE(FIRMWARE_3090_FILENAME); + + + /* +@@ -129,6 +70,55 @@ INT RtmpAsicEraseFirmware( + return 0; + } + ++static const struct firmware *rtmp_get_firmware(PRTMP_ADAPTER adapter) ++{ ++ const char *name = FIRMWARE_3090_FILENAME; ++ const struct firmware *fw = NULL; ++ u8 min_version = FIRMWARE_3090_MIN_VERSION; ++ struct device *dev = &((POS_COOKIE)adapter->OS_Cookie)->pci_dev->dev; ++ int err; ++ ++ if (adapter->firmware) ++ return adapter->firmware; ++ ++ 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; ++} ++ + /* + ======================================================================== + +@@ -149,219 +139,16 @@ INT RtmpAsicEraseFirmware( + NDIS_STATUS RtmpAsicLoadFirmware( + IN PRTMP_ADAPTER pAd) + { +-#ifdef BIN_IN_FILE +-#define NICLF_DEFAULT_USE() \ +- flg_default_firm_use = TRUE; \ +- DBGPRINT(RT_DEBUG_OFF, ("%s - Use default firmware!\n", __FUNCTION__)); +- ++ const struct firmware *fw; + NDIS_STATUS Status = NDIS_STATUS_SUCCESS; +- PUCHAR src; +- RTMP_OS_FD srcf; +- INT retval, i; +- PUCHAR pFirmwareImage; +- INT FileLength = 0; +- UINT32 MacReg; + ULONG Index; +- ULONG firm; +- BOOLEAN flg_default_firm_use = FALSE; +- RTMP_OS_FS_INFO osFSInfo; +- +- DBGPRINT(RT_DEBUG_TRACE, ("===> %s\n", __FUNCTION__)); +- +- /* init */ +- pFirmwareImage = NULL; +- src = RTMP_FIRMWARE_FILE_NAME; +- +- RtmpOSFSInfoChange(&osFSInfo, TRUE); +- +- pAd->FirmwareVersion = (FIRMWARE_MAJOR_VERSION << 8) + \ +- FIRMWARE_MINOR_VERSION; +- +- +- /* allocate firmware buffer */ +- pFirmwareImage = kmalloc(MAX_FIRMWARE_IMAGE_SIZE, MEM_ALLOC_FLAG); +- if (pFirmwareImage == NULL) +- { +- /* allocate fail, use default firmware array in firmware.h */ +- DBGPRINT(RT_DEBUG_ERROR, ("%s - Allocate memory fail!\n", __FUNCTION__)); +- NICLF_DEFAULT_USE(); +- } +- else +- { +- /* allocate ok! zero the firmware buffer */ +- memset(pFirmwareImage, 0x00, MAX_FIRMWARE_IMAGE_SIZE); +- } /* End of if */ +- +- +- /* if ok, read firmware file from *.bin file */ +- if (flg_default_firm_use == FALSE) +- { +- do +- { +- /* open the bin file */ +- srcf = RtmpOSFileOpen(src, O_RDONLY, 0); +- +- if (IS_FILE_OPEN_ERR(srcf)) +- { +- DBGPRINT(RT_DEBUG_ERROR, ("%s - Error opening file %s\n", __FUNCTION__, src)); +- NICLF_DEFAULT_USE(); +- break; +- } +- +- +- /* read the firmware from the file *.bin */ +- FileLength = RtmpOSFileRead(srcf, pFirmwareImage, MAX_FIRMWARE_IMAGE_SIZE); +- if (FileLength != MAX_FIRMWARE_IMAGE_SIZE) +- { +- DBGPRINT(RT_DEBUG_ERROR, ("%s: error file length (=%d) in RT2860AP.BIN\n", +- __FUNCTION__, FileLength)); +- NICLF_DEFAULT_USE(); +- break; +- } +- else +- { +- PUCHAR ptr = pFirmwareImage; +- USHORT crc = 0xffff; +- +- +- /* calculate firmware CRC */ +- for(i=0; i<(MAX_FIRMWARE_IMAGE_SIZE-2); i++, ptr++) +- crc = ByteCRC16(BitReverse(*ptr), crc); +- /* End of for */ +- +- if ((pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-2] != \ +- (UCHAR)BitReverse((UCHAR)(crc>>8))) || +- (pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-1] != \ +- (UCHAR)BitReverse((UCHAR)crc))) +- { +- /* CRC fail */ +- DBGPRINT(RT_DEBUG_ERROR, ("%s: CRC = 0x%02x 0x%02x " +- "error, should be 0x%02x 0x%02x\n", +- __FUNCTION__, +- pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-2], +- pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-1], +- (UCHAR)(crc>>8), (UCHAR)(crc))); +- NICLF_DEFAULT_USE(); +- break; +- } +- else +- { +- /* firmware is ok */ +- pAd->FirmwareVersion = \ +- (pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-4] << 8) + +- pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-3]; +- +- /* check if firmware version of the file is too old */ +- if ((pAd->FirmwareVersion) < \ +- ((FIRMWARE_MAJOR_VERSION << 8) + +- FIRMWARE_MINOR_VERSION)) +- { +- DBGPRINT(RT_DEBUG_ERROR, ("%s: firmware version too old!\n", __FUNCTION__)); +- NICLF_DEFAULT_USE(); +- break; +- } /* End of if */ +- } /* End of if */ +- +- DBGPRINT(RT_DEBUG_TRACE, +- ("NICLoadFirmware: CRC ok, ver=%d.%d\n", +- pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-4], +- pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-3])); +- } /* End of if (FileLength == MAX_FIRMWARE_IMAGE_SIZE) */ +- break; +- } while(TRUE); +- +- /* close firmware file */ +- if (IS_FILE_OPEN_ERR(srcf)) +- ; +- else +- { +- retval = RtmpOSFileClose(srcf); +- if (retval) +- { +- DBGPRINT(RT_DEBUG_ERROR, ("--> Error %d closing %s\n", -retval, src)); +- } +- } +- } +- +- +- /* write firmware to ASIC */ +- if (flg_default_firm_use == TRUE) +- { +- /* use default fimeware, free allocated buffer */ +- if (pFirmwareImage != NULL) +- kfree(pFirmwareImage); +- /* End of if */ +- +- /* use default *.bin array */ +- pFirmwareImage = FirmwareImage; +- FileLength = sizeof(FirmwareImage); +- } /* End of if */ +- +- /* enable Host program ram write selection */ +- RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x10000); +- +- for(i=0; iMACVersion >> 16); +- +- pFirmwareImage = FirmwareImage; +- FileLength = sizeof(FirmwareImage); +- +- // New 8k byte firmware size for RT3071/RT3072 +- //DBGPRINT(RT_DEBUG_TRACE, ("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 +- { +-#ifdef RTMP_MAC_PCI +- if ((Version == 0x2860) || IS_RT3090(pAd)||IS_RT3390(pAd)) +- { +- pFirmwareImage = FirmwareImage; +- FileLength = FIRMWAREIMAGE_LENGTH; +- } +-#endif // RTMP_MAC_PCI // +- } +- else +- { +- DBGPRINT(RT_DEBUG_ERROR, ("KH: bin file should be 8KB.\n")); +- Status = NDIS_STATUS_FAILURE; +- } +- + +- RTMP_WRITE_FIRMWARE(pAd, pFirmwareImage, FileLength); ++ fw = rtmp_get_firmware(pAd); ++ if (!fw) ++ return NDIS_STATUS_FAILURE; + +-#endif ++ RTMP_WRITE_FIRMWARE(pAd, fw->data, FIRMWAREIMAGE_LENGTH); + + /* check if MCU is ready */ + Index = 0; +diff --git a/drivers/staging/rt3090/rt_linux.c b/drivers/staging/rt3090/rt_linux.c +index 9b94aa6..7077a9a 100644 +--- a/drivers/staging/rt3090/rt_linux.c ++++ b/drivers/staging/rt3090/rt_linux.c +@@ -25,6 +25,7 @@ + ************************************************************************* + */ + ++#include + #include + #include "rt_config.h" + +@@ -299,6 +300,7 @@ NdisFreeSpinLock(&pAd->McuCmdLock); + + 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); + if (os_cookie) +diff --git a/drivers/staging/rt3090/rtmp.h b/drivers/staging/rt3090/rtmp.h +index 8ef6d0b..8348277 100644 +--- a/drivers/staging/rt3090/rtmp.h ++++ b/drivers/staging/rt3090/rtmp.h +@@ -2202,6 +2202,7 @@ struct _RTMP_ADAPTER + PVOID OS_Cookie; // save specific structure relative to OS + PNET_DEV net_dev; + ULONG VirtualIfCnt; ++ const struct firmware *firmware; + + RTMP_CHIP_OP chipOps; + USHORT ThisTbttNumToNextWakeUp; +-- +1.6.6 + diff --git a/debian/patches/series/6 b/debian/patches/series/6 index be20f1ece..e665bdd7d 100644 --- a/debian/patches/series/6 +++ b/debian/patches/series/6 @@ -24,3 +24,4 @@ - features/all/drivers-staging-rt28x0sta-request_firmware.patch + features/all/rt28x0sta-constify-RTUSBMultiWrite-RTUSBFirmwareWrite.patch + features/all/rt28x0sta-use-request_firmware.patch ++ features/all/rt3090sta-use-request_firmware.patch