From 23229038effd56e64ef1d00372a9ac9868615cfe Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 4 Nov 2009 02:02:19 +0000 Subject: Update to 2.6.32-rc6 Refresh firmware patches for Kconfig context changes. Remove bugfix patches merged upstream. svn path=/dists/trunk/linux-2.6/; revision=14541 --- debian/changelog | 2 +- .../all/cpuidle-return-with-irq-enabled.patch | 38 ----------------- .../patches/bugfix/all/hfsplus-limit-to-2tb.patch | 35 ---------------- .../debian/dfsg/drivers-staging-otus-disable.patch | 4 +- .../dfsg/drivers-staging-rt2860-disable.patch | 6 +-- .../dfsg/drivers-staging-rt2870-disable.patch | 4 +- .../dfsg/drivers-staging-rt3090-disable.patch | 2 +- .../dfsg/drivers-staging-rtl8192su-disable.patch | 4 +- ...rivers-staging-rt28x0sta-request_firmware.patch | 49 ++++++++++++++-------- debian/patches/series/base | 2 - 10 files changed, 40 insertions(+), 106 deletions(-) delete mode 100644 debian/patches/bugfix/all/cpuidle-return-with-irq-enabled.patch delete mode 100644 debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch diff --git a/debian/changelog b/debian/changelog index e2d0b80f3..4eb6638ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low +linux-2.6 (2.6.32~rc6-1) UNRELEASED; urgency=low [ Ben Hutchings ] * New upstream release candidate. diff --git a/debian/patches/bugfix/all/cpuidle-return-with-irq-enabled.patch b/debian/patches/bugfix/all/cpuidle-return-with-irq-enabled.patch deleted file mode 100644 index 786fe89bc..000000000 --- a/debian/patches/bugfix/all/cpuidle-return-with-irq-enabled.patch +++ /dev/null @@ -1,38 +0,0 @@ -Subject: [PATCH] CPUidle: always return with interrupts enabled - -In the case where cpuidle_idle_call() returns before changing state -due to a need_resched(), it was returning with IRQs disabled. - -This patch ensures IRQs are (re)enabled before returning. - -Reported-by: Hemanth V -Signed-off-by: Kevin Hilman ---- - drivers/cpuidle/cpuidle.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c -index ad41f19..12fdd39 100644 ---- a/drivers/cpuidle/cpuidle.c -+++ b/drivers/cpuidle/cpuidle.c -@@ -75,8 +75,11 @@ static void cpuidle_idle_call(void) - #endif - /* ask the governor for the next state */ - next_state = cpuidle_curr_governor->select(dev); -- if (need_resched()) -+ if (need_resched()) { -+ local_irq_enable(); - return; -+ } -+ - target_state = &dev->states[next_state]; - - /* enter the state and update stats */ --- -1.6.4.3 - --- -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html -Please read the FAQ at http://www.tux.org/lkml/ diff --git a/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch b/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch deleted file mode 100644 index dfa3d98cb..000000000 --- a/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Ben Hutchings -Subject: [PATCH] hfsplus: Refuse to mount volumes larger than 2TB - -As found in , hfsplus is using type u32 -rather than sector_t for some sector number calculations. - -In particular, hfsplus_get_block() does: - - u32 ablock, dblock, mask; -... - map_bh(bh_result, sb, (dblock << HFSPLUS_SB(sb).fs_shift) + HFSPLUS_SB(sb).blockoffset + (iblock & mask)); - -I am not confident that I can find and fix all cases where a sector -number may be truncated. For now, avoid data loss by refusing to mount -HFS+ volumes with more than 2^32 sectors (2TB). - -[plus fix by Andrew Morton ] ---- ---- a/fs/hfsplus/wrapper.c -+++ b/fs/hfsplus/wrapper.c -@@ -99,6 +99,10 @@ - - if (hfsplus_get_last_session(sb, &part_start, &part_size)) - return -EINVAL; -+ if ((u64)part_start + part_size > 0x100000000ULL) { -+ pr_err("hfs: volumes larger than 2TB are not supported yet\n"); -+ return -EINVAL; -+ } - while (1) { - bh = sb_bread512(sb, part_start + HFSPLUS_VOLHEAD_SECTOR, vhdr); - if (!bh) - --- -Ben Hutchings -Quantity is no substitute for quality, but it's the only one we've got. diff --git a/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch b/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch index a4d805806..b7dc8b190 100644 --- a/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch +++ b/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch @@ -1,11 +1,9 @@ -diff --git a/drivers/staging/otus/Kconfig b/drivers/staging/otus/Kconfig -index d549d08..fef9785 100644 --- a/drivers/staging/otus/Kconfig +++ b/drivers/staging/otus/Kconfig @@ -1,5 +1,6 @@ config OTUS tristate "Atheros OTUS 802.11n USB wireless support" + depends on BROKEN - depends on USB && WLAN_80211 && MAC80211 + depends on USB && WLAN && MAC80211 default N ---help--- diff --git a/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch index e06d68f49..8885c480e 100644 --- a/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch +++ b/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch @@ -1,11 +1,9 @@ -diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig -index 7f44e5e..9fb130d 100644 --- a/drivers/staging/rt2860/Kconfig +++ b/drivers/staging/rt2860/Kconfig @@ -1,5 +1,6 @@ config RT2860 tristate "Ralink 2860 wireless support" + depends on BROKEN - depends on PCI && X86 && WLAN_80211 + depends on PCI && X86 && WLAN ---help--- - This is an experimental driver for the Ralink 2860 wireless chip. + This is an experimental driver for the Ralink 2860 wireless chip. diff --git a/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch index e5adc4605..6e9759d10 100644 --- a/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch +++ b/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch @@ -4,6 +4,6 @@ config RT2870 tristate "Ralink 2870/3070 wireless support" + depends on BROKEN - depends on USB && X86 && WLAN_80211 + depends on USB && X86 && WLAN ---help--- - This is an experimental driver for the Ralink xx70 wireless chips. + This is an experimental driver for the Ralink xx70 wireless chips. diff --git a/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch index b4d7ba1df..e4a4bc261 100644 --- a/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch +++ b/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch @@ -4,6 +4,6 @@ config RT3090 tristate "Ralink 3090 wireless support" + depends on BROKEN - depends on PCI && X86 && WLAN_80211 + depends on PCI && X86 && WLAN ---help--- This is an experimental driver for the Ralink 3090 wireless chip. diff --git a/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch index 656c83ac9..beacebb8b 100644 --- a/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch +++ b/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch @@ -1,11 +1,9 @@ -diff --git a/drivers/staging/rtl8192su/Kconfig b/drivers/staging/rtl8192su/Kconfig -index 770f412..3b6b088 100644 --- a/drivers/staging/rtl8192su/Kconfig +++ b/drivers/staging/rtl8192su/Kconfig @@ -1,5 +1,6 @@ config RTL8192SU tristate "RealTek RTL8192SU Wireless LAN NIC driver" + depends on BROKEN - depends on PCI + depends on PCI && WLAN depends on WIRELESS_EXT default N diff --git a/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch b/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch index 8925f480c..c143f69eb 100644 --- a/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch +++ b/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch @@ -1,20 +1,31 @@ +From 3b25874ebf3f8a675da0e2a2ae358f76ae67141d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 28 Jun 2009 15:51:07 +0100 -Subject: [PATCH] rt2860/2870/3070: use the firmware loader interface and library CRC code +Subject: [PATCH 08/24] rt2860/2870/3070: use the firmware loader interface and library CRC code Based on work by Darren Salt . +--- + drivers/staging/rt2860/Kconfig | 3 +- + drivers/staging/rt2860/common/rtmp_init.c | 100 ++++++++++++++++++----------- + drivers/staging/rt2870/Kconfig | 3 +- + drivers/staging/rt3090/Kconfig | 2 + + 4 files changed, 68 insertions(+), 40 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_80211 + 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..916be2f 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c @@ -38,14 +38,8 @@ @@ -34,7 +45,7 @@ Based on work by Darren Salt . UCHAR BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; ULONG BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008, -@@ -243,12 +180,14 @@ RTMP_REG_PAIR STAMACRegTable[] = { +@@ -178,12 +172,14 @@ RTMP_REG_PAIR STAMACRegTable[] = { // RT2870 Firmware Spec only used 1 oct for version expression // #define FIRMWARE_MINOR_VERSION 7 @@ -51,7 +62,7 @@ Based on work by Darren Salt . #define FIRMWARE_MAJOR_VERSION 0 #define FIRMWAREIMAGEV1_LENGTH 0x1000 -@@ -256,6 +195,8 @@ RTMP_REG_PAIR STAMACRegTable[] = { +@@ -191,6 +187,8 @@ RTMP_REG_PAIR STAMACRegTable[] = { #ifdef RT2860 #define FIRMWARE_MINOR_VERSION 2 @@ -60,7 +71,7 @@ Based on work by Darren Salt . #endif -@@ -3314,45 +3255,65 @@ NDIS_STATUS NICLoadFirmware( +@@ -2976,45 +2974,65 @@ NDIS_STATUS NICLoadFirmware( IN PRTMP_ADAPTER pAd) { NDIS_STATUS Status = NDIS_STATUS_SUCCESS; @@ -128,12 +139,12 @@ Based on work by Darren Salt . + dev_err(dev, "firmware file %s size is wrong\n", name); + goto fail; + } - -- RT28XX_WRITE_FIRMWARE(pAd, pFirmwareImage, FileLength); ++ + /* is it new enough? */ + pAd->FirmwareVersion = (fw->data[fw->size - 4] << 8 | + fw->data[fw->size - 3]); -+ + +- RT28XX_WRITE_FIRMWARE(pAd, pFirmwareImage, FileLength); + if (pAd->FirmwareVersion < + (FIRMWARE_MAJOR_VERSION << 8 | FIRMWARE_MINOR_VERSION)) { + dev_err(dev, "rt28x0sta: firmware file %s is too old\n", @@ -154,7 +165,7 @@ Based on work by Darren Salt . /* check if MCU is ready */ Index = 0; -@@ -3372,9 +3335,15 @@ NDIS_STATUS NICLoadFirmware( +@@ -3034,9 +3052,15 @@ NDIS_STATUS NICLoadFirmware( DBGPRINT(RT_DEBUG_ERROR, ("NICLoadFirmware: MCU is not ready\n\n\n")); } /* End of if */ @@ -170,27 +181,31 @@ Based on work by Darren Salt . } /* End of NICLoadFirmware */ +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,7 +1,8 @@ +@@ -1,6 +1,7 @@ config RT2870 tristate "Ralink 2870/3070 wireless support" - depends on BROKEN - depends on USB && X86 && WLAN_80211 + depends on USB && X86 && WLAN + select CRC_CCITT + select FW_LOADER ---help--- This is an experimental driver for the Ralink xx70 wireless chips. - +diff --git a/drivers/staging/rt3090/Kconfig b/drivers/staging/rt3090/Kconfig +index 8ba68b0..7a59f34 100644 --- a/drivers/staging/rt3090/Kconfig +++ b/drivers/staging/rt3090/Kconfig -@@ -1,7 +1,8 @@ - config RT3090 +@@ -2,5 +2,7 @@ config RT3090 tristate "Ralink 3090 wireless support" -- depends on BROKEN - depends on PCI && X86 && WLAN_80211 + 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. - +-- +1.6.5.2 + diff --git a/debian/patches/series/base b/debian/patches/series/base index 7397f80d1..42de982a0 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -42,6 +42,4 @@ #+ bugfix/all/wireless-regulatory-default-EU.patch #+ features/sparc/video-sunxvr500-intergraph.patch + bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch -+ bugfix/all/hfsplus-limit-to-2tb.patch -+ bugfix/all/cpuidle-return-with-irq-enabled.patch + debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch -- cgit v1.2.3