[kernel] r15933 - in dists/trunk/linux-2.6/debian: . config patches/bugfix/all patches/bugfix/parisc patches/bugfix/sh4 patches/bugfix/x86 patches/debian patches/debian/dfsg patches/features/all patches/features/all/speakup patches/features/arm patches/series
Ben Hutchings
benh at alioth.debian.org
Sun Jul 4 20:11:26 UTC 2010
Author: benh
Date: Sun Jul 4 20:11:06 2010
New Revision: 15933
Log:
Update to upstream release candidate 2.6.35-rc3
Refresh/remove patches as appropriate.
Add patches for SD7220 firmware in ip_qib where it moved from ipath.
Added:
dists/trunk/linux-2.6/debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch
dists/trunk/linux-2.6/debian/patches/features/all/ib_qib-use-request_firmware-to-load-SD7220-firmware.patch
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/SCSI-implement-sd_unlock_native_capacity.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/block-ide-simplify-bdops-set_capacity-to-unlock_native_capacity.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/cifs-allow-null-nd-on-create.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ext4-Conditionally-define-compat-ioctl-numbers.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/ext4-Fix-compat-EXT4_IOC_ADD_GROUP.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/fs-explicitly-pass-in-whether-sb-is-pinned-or-not.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/iwlwifi-manage-QoS-by-mac-stack.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/linux-2.6-acpi-sleep-live-sci-live.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/mac80211-explicitly-disable-enable-QoS.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/p54pci-fix-regression.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/p54pci-fix-serious-sparse-warning.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/p54pci-prevent-stuck-rx-ring.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/phylib-fix-typo-in-bcm6xx-PHY-driver-table.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/rndis_host-Poll-status-channel-before-control-channel.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/thinkpad-acpi-add-x100e.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/writeback-Update-dirty-flags-in-two-steps.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/writeback-ensure-WB_SYNC_NONE-writeback-with-sb-pinned-is-sync.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/writeback-fix-non-integrity-write-back.patch
dists/trunk/linux-2.6/debian/patches/bugfix/parisc/clear-fp-exception-flag-on-SIGFPE.patch
dists/trunk/linux-2.6/debian/patches/bugfix/sh4/fix-sh_tmu.patch
dists/trunk/linux-2.6/debian/patches/bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch
dists/trunk/linux-2.6/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch
dists/trunk/linux-2.6/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-infiniband-hw-ipath-iba7220-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/rtl8192u_usb-Remove-code-for-using-built-in-firmware.patch
dists/trunk/linux-2.6/debian/patches/debian/revert-removal-of-r8192sU_HWImg-c.patch
dists/trunk/linux-2.6/debian/patches/debian/rtl8192u_usb-Restore-lookup-tables.patch
dists/trunk/linux-2.6/debian/patches/features/all/RTC-rtc-cmos-Fix-binary-mode-support.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/phylib-Add-module-table-to-all-existing-phy-drivers.patch
dists/trunk/linux-2.6/debian/patches/features/all/phylib-Support-phy-module-autoloading.patch
dists/trunk/linux-2.6/debian/patches/features/arm/compression-add-lzma.patch
dists/trunk/linux-2.6/debian/patches/features/arm/guruplug.patch
dists/trunk/linux-2.6/debian/patches/features/arm/ts41x-export-jp1.patch
dists/trunk/linux-2.6/debian/patches/series/1~experimental.2
dists/trunk/linux-2.6/debian/patches/series/1~experimental.3
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/defines
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h2-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h25-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch
dists/trunk/linux-2.6/debian/patches/debian/version.patch
dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
dists/trunk/linux-2.6/debian/patches/series/base
dists/trunk/linux-2.6/debian/patches/series/orig-0
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/changelog Sun Jul 4 20:11:06 2010 (r15933)
@@ -1,4 +1,6 @@
-linux-2.6 (2.6.34-1~experimental.3) UNRELEASED; urgency=low
+linux-2.6 (2.6.35~rc3-1~experimental.1) UNRELEASED; urgency=low
+
+ * New upstream snapshot
[ Ben Hutchings ]
* ipr: add writeq definition if needed (Closes: #584840)
Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/config/defines Sun Jul 4 20:11:06 2010 (r15933)
@@ -1,5 +1,5 @@
[abi]
-abiname: 1
+abiname: trunk
[base]
arches:
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h2-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h2-disable.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h2-disable.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -1,12 +1,10 @@
-diff --git a/drivers/staging/wlags49_h2/Kconfig b/drivers/staging/wlags49_h2/Kconfig
-index 92053fe..b99b1b1 100644
--- a/drivers/staging/wlags49_h2/Kconfig
+++ b/drivers/staging/wlags49_h2/Kconfig
@@ -1,6 +1,7 @@
config WLAGS49_H2
tristate "Agere Systems HERMES II Wireless PC Card Model 0110"
- depends on WLAN_80211 && WIRELESS_EXT && PCMCIA
+ depends on WLAN && PCMCIA
+ depends on BROKEN
+ select WIRELESS_EXT
select WEXT_SPY
- ---help---
- Driver for wireless cards using Agere's HERMES II chipset
+ select WEXT_PRIV
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h25-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h25-disable.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-wlags49_h25-disable.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -1,12 +1,10 @@
-diff --git a/drivers/staging/wlags49_h25/Kconfig b/drivers/staging/wlags49_h25/Kconfig
-index 304a8c9..24365a8 100644
--- a/drivers/staging/wlags49_h25/Kconfig
+++ b/drivers/staging/wlags49_h25/Kconfig
@@ -1,6 +1,7 @@
config WLAGS49_H25
tristate "Linksys HERMES II.5 WCF54G_Wireless-G_CompactFlash_Card"
- depends on WLAN_80211 && WIRELESS_EXT && PCMCIA
+ depends on WLAN && PCMCIA
+ depends on BROKEN
+ select WIRELESS_EXT
select WEXT_SPY
- ---help---
- Driver for wireless cards using Agere's HERMES II.5 chipset
+ select WEXT_PRIV
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Sun Jul 4 20:11:06 2010 (r15933)
@@ -39,7 +39,7 @@
unifdef drivers/media/dvb/frontends/lgs8gxx.c -UREMOVE_DFSG
-rm drivers/infiniband/hw/ipath/ipath_sd7220_img.c
+rm drivers/infiniband/hw/qib/qib_sd7220_img.c
rm drivers/net/appletalk/cops.c
rm drivers/net/appletalk/cops.h
@@ -50,12 +50,7 @@
rm drivers/staging/otus/hal/hp*fw*.c*
-# Next line should be removed for next upstream release/rc
-rm drivers/staging/rtl8192su/r8192SU_HWImg.c
-
-# Switch to unifdef for next upstream release/rc
-rm drivers/staging/rtl8192u/r819xU_firmware_img.c
-#unifdef drivers/staging/rtl8192u/r819xU_firmware_img.c -UREMOVE_DFSG
+unifdef drivers/staging/rtl8192u/r819xU_firmware_img.c -UREMOVE_DFSG
rm drivers/staging/vt6656/firmware.c
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -19,7 +19,7 @@
fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
-fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.13.0.fw bnx2x-e1h-5.2.13.0.fw
--fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j9.fw \
+-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j15.fw \
- bnx2/bnx2-rv2p-09-5.0.0.j10.fw \
- bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \
- bnx2/bnx2-mips-06-5.0.0.j6.fw \
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/ip_qib-sd7220-disable.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -0,0 +1,36 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 17 Aug 2009 02:17:09 +0100
+Subject: [PATCH] ib_qib: disable use of SD7220
+
+--- a/drivers/infiniband/hw/qib/Makefile
++++ b/drivers/infiniband/hw/qib/Makefile
+@@ -6,7 +6,7 @@ ib_qib-y := qib_cq.o qib_diag.o qib_dma.o qib_driver.o qib_eeprom.o \
+ qib_qp.o qib_qsfp.o qib_rc.o qib_ruc.o qib_sdma.o qib_srq.o \
+ qib_sysfs.o qib_twsi.o qib_tx.o qib_uc.o qib_ud.o \
+ qib_user_pages.o qib_user_sdma.o qib_verbs_mcast.o qib_iba7220.o \
+- qib_sd7220.o qib_sd7220_img.o qib_iba7322.o qib_verbs.o
++ qib_sd7220.o qib_iba7322.o qib_verbs.o
+
+ # 6120 has no fallback if no MSI interrupts, others can do INTx
+ ib_qib-$(CONFIG_PCI_MSI) += qib_iba6120.o
+--- a/drivers/infiniband/hw/qib/qib_sd7220.c
++++ b/drivers/infiniband/hw/qib/qib_sd7220.c
+@@ -881,6 +902,18 @@ int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
+ return errors ? -errors : sofar;
+ }
+
++int
++qib_sd7220_ib_load(struct qib_devdata *dd)
++{
++ return -1;
++}
++
++int
++qib_sd7220_ib_vfy(struct qib_devdata *dd)
++{
++ return -1;
++}
++
+ /*
+ * IRQ not set up at this point in init, so we poll.
+ */
Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -1,10 +1,8 @@
-diff --git a/Makefile b/Makefile
-index 59cf6da..6e1e048 100644
--- a/Makefile
+++ b/Makefile
-@@ -193,35 +193,6 @@ export KBUILD_BUILDHOST := $(SUBARCH)
- ARCH ?= $(SUBARCH)
+@@ -192,35 +192,6 @@
CROSS_COMPILE ?=
+ CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
-# Architecture as present in compile.h
-UTS_MACHINE := $(ARCH)
@@ -38,7 +36,7 @@
KCONFIG_CONFIG ?= .config
# SHELL used by kbuild
-@@ -339,6 +315,36 @@ LDFLAGS_MODULE =
+@@ -340,6 +311,36 @@ LDFLAGS_MODULE =
AFLAGS_KERNEL =
CFLAGS_GCOV = -fprofile-arcs -ftest-coverage
Modified: dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/debian/sysrq-mask.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -6,11 +6,11 @@
#include <asm/irq_regs.h>
/* Whether we react on sysrq keys or just ignore them */
--int __read_mostly __sysrq_enabled = 1;
-+int __read_mostly __sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_MASK;
-
- static int __read_mostly sysrq_always_enabled;
+-static int __read_mostly sysrq_enabled = 1;
++static int __read_mostly sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_MASK;
+ static bool __read_mostly sysrq_always_enabled;
+ static bool sysrq_on(void)
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 234ceb1..415a834 100644
--- a/lib/Kconfig.debug
Modified: dists/trunk/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/version.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/debian/version.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -1,8 +1,6 @@
-diff --git a/init/version.c b/init/version.c
-index 9d17d70..ef8aa6e 100644
--- a/init/version.c
+++ b/init/version.c
-@@ -33,12 +33,31 @@ struct uts_namespace init_uts_ns = {
+@@ -36,12 +36,31 @@ struct uts_namespace init_uts_ns = {
};
EXPORT_SYMBOL_GPL(init_uts_ns);
@@ -37,20 +35,17 @@
" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+#endif
" (" LINUX_COMPILER ") %s\n";
-diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index 82d0af4..d8e0d05 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
-@@ -47,19 +47,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+@@ -64,18 +64,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
- echo \#define LINUX_COMPILE_BY \"`whoami`\"
- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
-- if [ -x /bin/dnsdomainname ]; then
-- domain=`dnsdomainname 2> /dev/null`
-- elif [ -x /bin/domainname ]; then
+- domain=`dnsdomainname 2> /dev/null`
+- if [ -z "$domain" ]; then
- domain=`domainname 2> /dev/null`
- fi
-
Modified: dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -8,5 +8,5 @@
MODULE_DEVICE_TABLE(pci, pciidlist);
-#endif
- static int i915_drm_freeze(struct drm_device *dev)
- {
+ #define INTEL_PCH_DEVICE_ID_MASK 0xff00
+ #define INTEL_PCH_CPT_DEVICE_ID_TYPE 0x1c00
Added: dists/trunk/linux-2.6/debian/patches/features/all/ib_qib-use-request_firmware-to-load-SD7220-firmware.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/ib_qib-use-request_firmware-to-load-SD7220-firmware.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -0,0 +1,178 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Mon, 17 Aug 2009 02:17:09 +0100
+Subject: [PATCH] ib_qib: use request_firmware() to load SD7220 firmware
+
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+--- a/drivers/infiniband/hw/qib/qib_7220.h
++++ b/drivers/infiniband/hw/qib/qib_7220.h
+@@ -109,10 +109,6 @@ struct qib_chippport_specific {
+ */
+ int qib_sd7220_presets(struct qib_devdata *dd);
+ int qib_sd7220_init(struct qib_devdata *dd);
+-int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum, u8 *img,
+- int len, int offset);
+-int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum, const u8 *img,
+- int len, int offset);
+ void qib_sd7220_clr_ibpar(struct qib_devdata *);
+ /*
+ * Below used for sdnum parameter, selecting one of the two sections
+@@ -121,9 +117,6 @@ void qib_sd7220_clr_ibpar(struct qib_devdata *);
+ */
+ #define IB_7220_SERDES 2
+
+-int qib_sd7220_ib_load(struct qib_devdata *dd);
+-int qib_sd7220_ib_vfy(struct qib_devdata *dd);
+-
+ static inline u32 qib_read_kreg32(const struct qib_devdata *dd,
+ const u16 regno)
+ {
+--- a/drivers/infiniband/hw/qib/qib_sd7220.c
++++ b/drivers/infiniband/hw/qib/qib_sd7220.c
+@@ -37,10 +37,14 @@
+
+ #include <linux/pci.h>
+ #include <linux/delay.h>
++#include <linux/firmware.h>
+
+ #include "qib.h"
+ #include "qib_7220.h"
+
++#define SD7220_FW_NAME "qlogic/sd7220.fw"
++MODULE_FIRMWARE(SD7220_FW_NAME);
++
+ /*
+ * Same as in qib_iba7220.c, but just the registers needed here.
+ * Could move whole set to qib_7220.h, but decided better to keep
+@@ -74,6 +78,11 @@
+ #define PCIE_SERDES0 0
+ #define PCIE_SERDES1 1
+
++static int
++qib_sd7220_ib_load(struct qib_devdata *dd, const struct firmware *fw);
++static int
++qib_sd7220_ib_vfy(struct qib_devdata *dd, const struct firmware *fw);
++
+ /*
+ * The EPB requires addressing in a particular form. EPB_LOC() is intended
+ * to make #definitions a little more readable.
+@@ -110,10 +119,12 @@ static int epb_access(struct qib_devdata *dd, int sdnum, int claim);
+ * state of the reset "pin", is no longer valid. Instead, we check for the
+ * actual uC code having been loaded.
+ */
+-static int qib_ibsd_ucode_loaded(struct qib_pportdata *ppd)
++static int
++qib_ibsd_ucode_loaded(struct qib_pportdata *ppd, const struct firmware *fw)
+ {
+ struct qib_devdata *dd = ppd->dd;
+- if (!dd->cspec->serdes_first_init_done && (qib_sd7220_ib_vfy(dd) > 0))
++ if (!dd->cspec->serdes_first_init_done &&
++ (qib_sd7220_ib_vfy(dd, fw) > 0))
+ dd->cspec->serdes_first_init_done = 1;
+ return dd->cspec->serdes_first_init_done;
+ }
+@@ -377,6 +388,7 @@ static void qib_sd_trimdone_monitor(struct qib_devdata *dd,
+ */
+ int qib_sd7220_init(struct qib_devdata *dd)
+ {
++ const struct firmware *fw;
+ int ret = 1; /* default to failure */
+ int first_reset, was_reset;
+
+@@ -387,8 +399,15 @@ int qib_sd7220_init(struct qib_devdata *dd)
+ qib_ibsd_reset(dd, 1);
+ qib_sd_trimdone_monitor(dd, "Driver-reload");
+ }
++
++ ret = request_firmware(&fw, SD7220_FW_NAME, &dd->pcidev->dev);
++ if (ret) {
++ qib_dev_err(dd, "Failed to load IB SERDES image\n");
++ goto done;
++ }
++
+ /* Substitute our deduced value for was_reset */
+- ret = qib_ibsd_ucode_loaded(dd->pport);
++ ret = qib_ibsd_ucode_loaded(dd->pport, fw);
+ if (ret < 0)
+ goto bail;
+
+@@ -437,13 +456,13 @@ int qib_sd7220_init(struct qib_devdata *dd)
+ int vfy;
+ int trim_done;
+
+- ret = qib_sd7220_ib_load(dd);
++ ret = qib_sd7220_ib_load(dd, fw);
+ if (ret < 0) {
+ qib_dev_err(dd, "Failed to load IB SERDES image\n");
+ goto bail;
+ } else {
+ /* Loaded image, try to verify */
+- vfy = qib_sd7220_ib_vfy(dd);
++ vfy = qib_sd7220_ib_vfy(dd, fw);
+ if (vfy != ret) {
+ qib_dev_err(dd, "SERDES PRAM VFY failed\n");
+ goto bail;
+@@ -506,6 +525,8 @@ bail:
+ done:
+ /* start relock timer regardless, but start at 1 second */
+ set_7220_relock_poll(dd, -1);
++
++ release_firmware(fw);
+ return ret;
+ }
+
+@@ -829,8 +850,8 @@ static int qib_sd7220_ram_xfer(struct qib_devdata *dd, int sdnum, u32 loc,
+
+ #define PROG_CHUNK 64
+
+-int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
+- u8 *img, int len, int offset)
++static int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
++ const u8 *img, int len, int offset)
+ {
+ int cnt, sofar, req;
+
+@@ -840,7 +861,7 @@ int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
+ if (req > PROG_CHUNK)
+ req = PROG_CHUNK;
+ cnt = qib_sd7220_ram_xfer(dd, sdnum, offset + sofar,
+- img + sofar, req, 0);
++ (u8 *)img + sofar, req, 0);
+ if (cnt < req) {
+ sofar = -1;
+ break;
+@@ -853,8 +874,8 @@ int qib_sd7220_prog_ld(struct qib_devdata *dd, int sdnum,
+ #define VFY_CHUNK 64
+ #define SD_PRAM_ERROR_LIMIT 42
+
+-int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
+- const u8 *img, int len, int offset)
++static int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
++ const u8 *img, int len, int offset)
+ {
+ int cnt, sofar, req, idx, errors;
+ unsigned char readback[VFY_CHUNK];
+@@ -881,16 +902,16 @@ int qib_sd7220_prog_vfy(struct qib_devdata *dd, int sdnum,
+ return errors ? -errors : sofar;
+ }
+
+-int
+-qib_sd7220_ib_load(struct qib_devdata *dd)
++static int
++qib_sd7220_ib_load(struct qib_devdata *dd, const struct firmware *fw)
+ {
+- return -1;
++ return qib_sd7220_prog_ld(dd, IB_7220_SERDES, fw->data, fw->size, 0);
+ }
+
+-int
+-qib_sd7220_ib_vfy(struct qib_devdata *dd)
++static int
++qib_sd7220_ib_vfy(struct qib_devdata *dd, const struct firmware *fw)
+ {
+- return -1;
++ return qib_sd7220_prog_vfy(dd, IB_7220_SERDES, fw->data, fw->size, 0);
+ }
+
+ /*
Modified: dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/features/all/r8169-rtl8168d-1-2-request_firmware-2.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -18,9 +18,9 @@
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -23,6 +23,7 @@
- #include <linux/tcp.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
+ #include <linux/pm_runtime.h>
+#include <linux/firmware.h>
#include <asm/system.h>
Modified: dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Sun Jul 4 20:11:06 2010 (r15933)
@@ -3,10 +3,10 @@
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
-@@ -138,6 +138,8 @@
- source "drivers/staging/dt3155/Kconfig"
+@@ -146,6 +146,8 @@
+ source "drivers/staging/mrst-touchscreen/Kconfig"
- source "drivers/staging/crystalhd/Kconfig"
+ source "drivers/staging/msm/Kconfig"
+
+source "drivers/staging/speakup/Kconfig"
@@ -14,10 +14,10 @@
endif # STAGING
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
-@@ -51,3 +51,4 @@
- obj-$(CONFIG_FB_SM7XX) += sm7xx/
- obj-$(CONFIG_DT3155) += dt3155/
- obj-$(CONFIG_CRYSTALHD) += crystalhd/
+@@ -53,3 +53,4 @@
+ obj-$(CONFIG_FB_XGI) += xgifb/
+ obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH) += mrst-touchscreen/
+ obj-$(CONFIG_MSM_STAGING) += msm/
+obj-$(CONFIG_SPEAKUP) += speakup/
--- a/drivers/staging/speakup/Kbuild
+++ b/drivers/staging/speakup/Kbuild
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/series/base Sun Jul 4 20:11:06 2010 (r15933)
@@ -5,7 +5,7 @@
+ debian/piix-disable-redundant-devids.patch
-+ features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
++ features/all/ib_qib-use-request_firmware-to-load-SD7220-firmware.patch
+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
+ features/all/lgs8gxx-lgs8g75-request_firmware.patch
@@ -28,13 +28,12 @@
# made manually
+ features/all/speakup/slab-build-fix.patch
-#+ bugfix/ia64/hardcode-arch-script-output.patch
++ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
+ bugfix/arm/disable-scsi_acard.patch
+ bugfix/mips/disable-werror.patch
+ bugfix/powerpc/lpar-console.patch
#+ bugfix/all/wireless-regulatory-default-EU.patch
-+ features/arm/compression-add-lzma.patch
+ features/all/i915-autoload-without-CONFIG_DRM_I915_KMS.patch
@@ -42,31 +41,11 @@
+ debian/arch-sh4-fix-uimage-build.patch
-+ features/all/phylib-Support-phy-module-autoloading.patch
-+ features/all/phylib-Add-module-table-to-all-existing-phy-drivers.patch
-
-+ bugfix/x86/PCI-Disable-MSI-for-MCP55-on-P5N32-E-SLI.patch
-+ bugfix/all/phylib-fix-typo-in-bcm6xx-PHY-driver-table.patch
-+ bugfix/all/rndis_host-Poll-status-channel-before-control-channel.patch
-+ bugfix/all/thinkpad-acpi-add-x100e.patch
-+ bugfix/all/p54pci-prevent-stuck-rx-ring.patch
-+ bugfix/all/p54pci-fix-serious-sparse-warning.patch
-+ bugfix/all/p54pci-fix-regression.patch
-+ bugfix/all/cifs-allow-null-nd-on-create.patch
+ bugfix/mips/mips-ide-flush-dcache.patch
-
-+ features/arm/guruplug.patch
-+ bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch
-+ bugfix/all/block-restart-partition-scan-after-resizing.patch
-+ bugfix/all/block-ide-simplify-bdops-set_capacity-to-unlock_native_capacity.patch
-+ bugfix/all/SCSI-implement-sd_unlock_native_capacity.patch
-+ bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch
-+ bugfix/all/libata-implement-on-demand-HPA-unlocking.patch
-+ bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch
-+ bugfix/all/drm-edid-Fix-1024x768 at 85Hz.patch
-+ bugfix/all/3c503-Fix-IRQ-probing.patch
-+ bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch
-+ bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch
-+ bugfix/all/thinkpad-acpi-fix-backlight.patch
-+ bugfix/all/linux-2.6-acpi-sleep-live-sci-live.patch
-+ bugfix/all/fs-explicitly-pass-in-whether-sb-is-pinned-or-not.patch
+#+ bugfix/all/thinkpad-acpi-fix-backlight.patch
++ features/mips/MIPS-Loongson-Define-rtc-device-on-MC146818-systems.patch
++ features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
++ bugfix/all/ipr-add-writeq-definition-if-needed.patch
++ bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch
++ bugfix/all/Staging-rtl8192s_usb-Fix-device-ID-table.patch
++ bugfix/all/Staging-rtl8192u_usb-Add-LG-device-ID-043e-7a01.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 Sun Jul 4 17:08:13 2010 (r15932)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Sun Jul 4 20:11:06 2010 (r15933)
@@ -1,12 +1,9 @@
+ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
+ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
-+ debian/dfsg/drivers-infiniband-hw-ipath-iba7220-disable.patch
++ debian/dfsg/ip_qib-sd7220-disable.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
+ debian/dfsg/drivers-staging-otus-disable.patch
-# Next patch can be removed for next upstream release/rc
-+ debian/dfsg/drivers-staging-rtl8192su-disable.patch
-# Next patch should be added for next upstream release/rc
-#+ debian/dfsg/rtl8192u_usb-Remove-built-in-firmware.patch
++ debian/dfsg/rtl8192u_usb-Remove-built-in-firmware.patch
+ debian/dfsg/drivers-staging-wlags49_h2-disable.patch
+ debian/dfsg/drivers-staging-wlags49_h25-disable.patch
+ debian/dfsg/firmware-cleanup.patch
More information about the Kernel-svn-changes
mailing list