rpms/kernel/devel linux-2.6-iwlwifi-fw-name-compat.patch, NONE, 1.1 config-generic, 1.8, 1.9 git-wireless-dev.patch, 1.24, 1.25 kernel.spec, 1.35, 1.36

John W. Linville (linville) fedora-extras-commits at redhat.com
Fri Jul 27 20:21:35 UTC 2007


Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4838

Modified Files:
	config-generic git-wireless-dev.patch kernel.spec 
Added Files:
	linux-2.6-iwlwifi-fw-name-compat.patch 
Log Message:
Update git-wireless-dev.patch (iwlwifi & bcm43xx updates)

linux-2.6-iwlwifi-fw-name-compat.patch:

--- NEW FILE linux-2.6-iwlwifi-fw-name-compat.patch ---
--- linux-2.6.22.noarch/drivers/net/wireless/iwl-base.c.orig	2007-07-27 16:01:31.000000000 -0400
+++ linux-2.6.22.noarch/drivers/net/wireless/iwl-base.c	2007-07-27 16:09:27.000000000 -0400
@@ -6200,8 +6200,10 @@ static int iwl_read_ucode(struct iwl_pri
 #if IWL == 3945
 	/* firmware file name contains uCode/driver compatibility version */
 	const char *name = "iwlwifi-3945" IWL3945_UCODE_API ".ucode";
+	const char *alt_name = "iwlwifi-3945.ucode";
 #elif IWL == 4965
 	const char *name = "iwlwifi-4965" IWL4965_UCODE_API ".ucode";
+	const char *alt_name = "iwlwifi-4965.ucode";
 #endif
 	u8 *src;
 	size_t len;
@@ -6211,8 +6213,13 @@ static int iwl_read_ucode(struct iwl_pri
 	 * request_firmware() is synchronous, file is in memory on return. */
 	rc = request_firmware(&ucode_raw, name, &priv->pci_dev->dev);
 	if (rc < 0) {
-		IWL_ERROR("%s firmware file req failed: Reason %d\n", name, rc);
-		goto error;
+		rc = request_firmware(&ucode_raw, alt_name,
+		                      &priv->pci_dev->dev);
+		if (rc < 0) {
+			IWL_ERROR("%s firmware file req failed: Reason %d\n",
+			          name, rc);
+			goto error;
+		}
 	}
 
 	IWL_DEBUG_INFO("Got firmware '%s' file (%zd bytes) from disk\n",


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config-generic	25 Jul 2007 18:20:14 -0000	1.8
+++ config-generic	27 Jul 2007 20:21:01 -0000	1.9
@@ -1197,6 +1197,7 @@
 
 CONFIG_MAC80211=m
 CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_HT=y
 # CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m

git-wireless-dev.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.24 -r 1.25 git-wireless-dev.patch
Index: git-wireless-dev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-wireless-dev.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- git-wireless-dev.patch	26 Jul 2007 02:18:35 -0000	1.24
+++ git-wireless-dev.patch	27 Jul 2007 20:21:01 -0000	1.25
@@ -1,5 +1,5 @@
---- linux-2.6.22.noarch/CREDITS.orig	2007-07-25 21:50:25.000000000 -0400
-+++ linux-2.6.22.noarch/CREDITS	2007-07-25 21:54:04.000000000 -0400
+--- linux-2.6.22.noarch/CREDITS.orig	2007-07-27 15:44:55.000000000 -0400
++++ linux-2.6.22.noarch/CREDITS	2007-07-27 15:47:17.000000000 -0400
 @@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /p
  S: (ask for current address)
  S: USA
@@ -37,7 +37,7 @@
  N: John G Dorsey
  E: john+ at cs.cmu.edu
  D: ARM Linux ports to Assabet/Neponset, Spot
-@@ -3516,6 +3532,12 @@ S: Maastrichterweg 63
+@@ -3517,6 +3533,12 @@ S: Maastrichterweg 63
  S: 5554 GG Valkenswaard
  S: The Netherlands
  
@@ -50,7 +50,7 @@
  N: Peter Shaobo Wang
  E: pwang at mmdcorp.com
  W: http://www.mmdcorp.com/pw/linux
-@@ -3650,6 +3672,15 @@ S: Alte Regensburger Str. 11a
+@@ -3651,6 +3673,15 @@ S: Alte Regensburger Str. 11a
  S: 93149 Nittenau
  S: Germany
  
@@ -66,8 +66,8 @@
  N: Lars Wirzenius
  E: liw at iki.fi
  D: Linux System Administrator's Guide, author, former maintainer
---- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-07-25 21:54:05.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/nl80211.h.orig	2007-07-27 15:44:55.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/nl80211.h	2007-07-27 15:47:17.000000000 -0400
 @@ -7,6 +7,201 @@
   */
  
@@ -327,8 +327,8 @@
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
---- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-25 21:50:31.000000000 -0400
-+++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-25 21:54:05.000000000 -0400
+--- linux-2.6.22.noarch/include/linux/ieee80211.h.orig	2007-07-27 15:44:55.000000000 -0400
++++ linux-2.6.22.noarch/include/linux/ieee80211.h	2007-07-27 15:47:17.000000000 -0400
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
@@ -627,9 +627,9 @@
 +};
 +
  #endif /* IEEE80211_H */
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,387 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_chipcommon.h	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,385 @@
 +#ifndef LINUX_SSB_CHIPCO_H_
 +#define LINUX_SSB_CHIPCO_H_
 +
@@ -644,7 +644,6 @@
 + *
 + * Licensed under the GPL version 2. See COPYING for details.
 + */
-+#ifdef __KERNEL__
 +
 +/** ChipCommon core registers. **/
 +
@@ -1015,11 +1014,10 @@
 +				  struct ssb_serial_port *ports);
 +#endif /* CONFIG_SSB_SERIAL */
 +
-+#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_CHIPCO_H_ */
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,163 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_extif.h	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,160 @@
 +/*
 + * Hardware-specific External Interface I/O core definitions
 + * for the BCM47xx family of SiliconBackplane-based chips.
@@ -1042,8 +1040,6 @@
 +#ifndef LINUX_SSB_EXTIFCORE_H_
 +#define LINUX_SSB_EXTIFCORE_H_
 +
-+#ifdef __KERNEL__
-+
 +struct ssb_extif {
 +	struct ssb_device *dev;
 +};
@@ -1181,16 +1177,13 @@
 +#define SSB_EXTIF_WATCHDOG_CLK		48000000	/* Hz */
 +
 +
-+#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_EXTIFCORE_H_ */
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,47 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_mips.h	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,44 @@
 +#ifndef LINUX_SSB_MIPSCORE_H_
 +#define LINUX_SSB_MIPSCORE_H_
 +
-+#ifdef __KERNEL__
-+
 +#ifdef CONFIG_SSB_DRIVER_MIPS
 +
 +struct ssb_device;
@@ -1231,14 +1224,12 @@
 +
 +#endif /* CONFIG_SSB_DRIVER_MIPS */
 +
-+#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_MIPSCORE_H_ */
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,294 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_regs.h	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,292 @@
 +#ifndef LINUX_SSB_REGS_H_
 +#define LINUX_SSB_REGS_H_
-+#ifdef __KERNEL__
 +
 +
 +/* SiliconBackplane Address Map.
@@ -1260,10 +1251,10 @@
 +
 +#define SSB_PCI_DMA		0x40000000	/* Client Mode sb2pcitranslation2 (1 GB) */
 +#define SSB_PCI_DMA_SZ		0x40000000	/* Client Mode sb2pcitranslation2 size in bytes */
-+#define SSB_PCIE_DMA_L32		0x00000000	/* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), low 32 bits */
-+#define SSB_PCIE_DMA_H32		0x80000000	/* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), high 32 bits */
-+#define	SSB_EUART		(SB_EXTIF_BASE + 0x00800000)
-+#define	SSB_LED			(SB_EXTIF_BASE + 0x00900000)
++#define SSB_PCIE_DMA_L32	0x00000000	/* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), low 32 bits */
++#define SSB_PCIE_DMA_H32	0x80000000	/* PCIE Client Mode sb2pcitranslation2 (2 ZettaBytes), high 32 bits */
++#define	SSB_EUART		(SSB_EXTIF_BASE + 0x00800000)
++#define	SSB_LED			(SSB_EXTIF_BASE + 0x00900000)
 +
 +
 +/* Enumeration space constants */
@@ -1506,7 +1497,7 @@
 +	SSB_SPROM1CCODE_NONE,
 +};
 +
-+/* Address-Match values and masks (SSB_ADMATCH?) */
++/* Address-Match values and masks (SSB_ADMATCHxxx) */
 +#define SSB_ADM_TYPE			0x00000003	/* Address type */
 +#define  SSB_ADM_TYPE0			0
 +#define  SSB_ADM_TYPE1			1
@@ -1528,14 +1519,12 @@
 +#define SSB_ADM_BASE2_SHIFT		16
 +
 +
-+#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_REGS_H_ */
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,108 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb_driver_pci.h	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,106 @@
 +#ifndef LINUX_SSB_PCICORE_H_
 +#define LINUX_SSB_PCICORE_H_
-+#ifdef __KERNEL__
 +
 +#ifdef CONFIG_SSB_DRIVER_PCICORE
 +
@@ -1639,22 +1628,18 @@
 +}
 +
 +#endif /* CONFIG_SSB_DRIVER_PCICORE */
-+#endif /* __KERNEL__ */
 +#endif /* LINUX_SSB_PCICORE_H_ */
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,422 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/include/linux/ssb/ssb.h	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,431 @@
 +#ifndef LINUX_SSB_H_
 +#define LINUX_SSB_H_
-+#ifdef __KERNEL__
 +
 +#include <linux/device.h>
 +#include <linux/list.h>
 +#include <linux/types.h>
[...6083 lines suppressed...]
-+++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,93 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/drivers/ssb/Kconfig	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,92 @@
 +menu "Sonics Silicon Backplane"
 +
 +config SSB
 +	tristate "Sonics Silicon Backplane support"
-+	depends on EXPERIMENTAL
++	depends on EXPERIMENTAL && HAS_IOMEM
 +	help
 +	  Support for the Sonics Silicon Backplane bus
 +
@@ -91734,7 +91816,6 @@
 +config SSB_DRIVER_PCICORE
 +	bool "SSB PCI core driver"
 +	depends on SSB && SSB_PCIHOST
-+	default y
 +	help
 +	  Driver for the Sonics Silicon Backplane attached
 +	  Broadcom PCI core.
@@ -91767,9 +91848,9 @@
 +	  If unsure, say N
 +
 +endmenu
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,407 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/drivers/ssb/scan.c	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,413 @@
 +/*
 + * Sonics Silicon Backplane
 + * Bus scanning
@@ -91787,14 +91868,12 @@
 +#include <linux/ssb/ssb.h>
 +#include <linux/ssb/ssb_regs.h>
 +#include <linux/pci.h>
-+#include <asm/io.h>
++#include <linux/io.h>
 +
-+#ifdef CONFIG_SSB_PCMCIAHOST
-+# include <pcmcia/cs_types.h>
-+# include <pcmcia/cs.h>
-+# include <pcmcia/cistpl.h>
-+# include <pcmcia/ds.h>
-+#endif
++#include <pcmcia/cs_types.h>
++#include <pcmcia/cs.h>
++#include <pcmcia/cistpl.h>
++#include <pcmcia/ds.h>
 +
 +#include "ssb_private.h"
 +
@@ -91974,7 +92053,11 @@
 +		iounmap(bus->mmio);
 +		break;
 +	case SSB_BUSTYPE_PCI:
++#ifdef CONFIG_SSB_PCIHOST
 +		pci_iounmap(bus->host_pci, bus->mmio);
++#else
++		SSB_BUG_ON(1); /* Can't reach this code. */
++#endif
 +		break;
 +	}
 +	bus->mmio = NULL;
@@ -91994,7 +92077,11 @@
 +		mmio = ioremap(baseaddr, SSB_CORE_SIZE);
 +		break;
 +	case SSB_BUSTYPE_PCI:
++#ifdef CONFIG_SSB_PCIHOST
 +		mmio = pci_iomap(bus->host_pci, 0, ~0UL);
++#else
++		SSB_BUG_ON(1); /* Can't reach this code. */
++#endif
 +		break;
 +	}
 +
@@ -92177,9 +92264,9 @@
 +	ssb_iounmap(bus);
 +	goto out;
 +}
---- /dev/null	2007-07-25 20:19:48.826786442 -0400
-+++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-07-25 21:54:05.000000000 -0400
-@@ -0,0 +1,562 @@
+--- /dev/null	2007-07-27 08:43:03.361455709 -0400
++++ linux-2.6.22.noarch/drivers/ssb/driver_pcicore.c	2007-07-27 15:47:17.000000000 -0400
+@@ -0,0 +1,564 @@
 +/*
 + * Sonics Silicon Backplane
 + * Broadcom PCI-core driver
@@ -92216,8 +92303,10 @@
 +#ifdef CONFIG_SSB_PCICORE_HOSTMODE
 +
 +#include <asm/paccess.h>
-+/* Read the bus and catch bus exceptions. This is MIPS specific. */
-+#define mips_busprobe(val, addr)	get_dbe((val), (addr))
++/* Probe a 32bit value on the bus and catch bus exceptions.
++ * Returns nonzero on a bus exception.
++ * This is MIPS specific */
++#define mips_busprobe32(val, addr)	get_dbe((val), ((u32 *)(addr)))
 +
 +/* Assume one-hot slot wiring */
 +#define SSB_PCI_SLOT_MAX	16
@@ -92236,7 +92325,8 @@
 +	int pos, size;
 +	u32 *base;
 +
-+	printk("PCI: Fixing up device %s\n", pci_name(d));
++	ssb_printk(KERN_INFO "PCI: Fixing up device %s\n",
++		   pci_name(d));
 +
 +	/* Fix up resource bases */
 +	for (pos = 0; pos < 6; pos++) {
@@ -92267,7 +92357,7 @@
 +	if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) != 0)
 +		return;
 +
-+	printk("PCI: fixing up bridge\n");
++	ssb_printk(KERN_INFO "PCI: fixing up bridge\n");
 +
 +	/* Enable PCI bridge bus mastering and memory space */
 +	pci_set_master(dev);
@@ -92329,7 +92419,7 @@
 +	u32 addr, val;
 +	void __iomem *mmio;
 +
-+	assert(pc->hostmode);
++	SSB_WARN_ON(!pc->hostmode);
 +	if (unlikely(len != 1 && len != 2 && len != 4))
 +		goto out;
 +	addr = get_cfgspace_addr(pc, bus, dev, func, off);
@@ -92340,7 +92430,7 @@
 +	if (!mmio)
 +		goto out;
 +
-+	if (mips_busprobe(val, (u32 *) mmio)) {
++	if (mips_busprobe32(val, mmio)) {
 +		val = 0xffffffff;
 +		goto unmap;
 +	}
@@ -92375,7 +92465,7 @@
 +	u32 addr, val = 0;
 +	void __iomem *mmio;
 +
-+	assert(pc->hostmode);
++	SSB_WARN_ON(!pc->hostmode);
 +	if (unlikely(len != 1 && len != 2 && len != 4))
 +		goto out;
 +	addr = get_cfgspace_addr(pc, bus, dev, func, off);
@@ -92386,7 +92476,7 @@
 +	if (!mmio)
 +		goto out;
 +
-+	if (mips_busprobe(val, (u32 *) mmio)) {
++	if (mips_busprobe32(val, mmio)) {
 +		val = 0xffffffff;
 +		goto unmap;
 +	}
@@ -92473,10 +92563,8 @@
 +{
 +	u32 val;
 +
-+	if (extpci_core) {
-+		WARN_ON(1);
++	if (WARN_ON(extpci_core))
 +		return;
-+	}
 +	extpci_core = pc;
 +
 +	ssb_dprintk(KERN_INFO PFX "PCIcore in host mode found\n");
@@ -92546,7 +92634,7 @@
 +	if (bus->chip_id == 0x5350)
 +		return 0;
 +
-+	return !mips_busprobe(tmp, (u32 *) (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
++	return !mips_busprobe32(tmp, (bus->mmio + (pc->dev->core_index * SSB_CORE_SIZE)));
 +}
 +#endif /* CONFIG_SSB_PCICORE_HOSTMODE */
 +
@@ -92640,7 +92728,8 @@
 +	struct ssb_device *dev;
 +
 +	dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
-+	assert(dev);
++	if (WARN_ON(!dev))
++		return;
 +	/* This forces an update of the cached registers. */
 +	ssb_broadcast_value(dev, 0xFD8, 0);
 +}
@@ -92713,7 +92802,7 @@
 +			pcicore_write32(pc, SSB_PCICORE_SBTOPCI2, tmp);
 +		}
 +	} else {
-+		assert(pdev->id.coreid == SSB_DEV_PCIE);
++		WARN_ON(pdev->id.coreid != SSB_DEV_PCIE);
 +		//TODO: Better make defines for all these magic PCIE values.
 +		if ((pdev->id.revision == 0) || (pdev->id.revision == 1)) {
 +			/* TLP Workaround register. */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kernel.spec	27 Jul 2007 19:16:59 -0000	1.35
+++ kernel.spec	27 Jul 2007 20:21:02 -0000	1.36
@@ -578,7 +578,8 @@
 Patch670: linux-2.6-ata-quirk.patch
 Patch680: git-wireless-dev.patch
 Patch690: linux-2.6-e1000-ich9.patch
-Patch710: linux-2.6-bcm43xx-pci-neuter.patch
+Patch700: linux-2.6-bcm43xx-pci-neuter.patch
+Patch710: linux-2.6-iwlwifi-fw-name-compat.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch780: linux-2.6-highres-timers.patch
 Patch800: linux-2.6-wakeups-hdaps.patch
@@ -1188,6 +1189,8 @@
 ApplyPatch linux-2.6-e1000-ich9.patch
 # avoid bcm3xx vs bcm43xx-mac80211 PCI ID conflicts
 ApplyPatch linux-2.6-bcm43xx-pci-neuter.patch
+# temp compat patch for iwlwifi firmware filenames
+ApplyPatch linux-2.6-iwlwifi-fw-name-compat.patch
 
 # ACPI patches
 
@@ -2133,6 +2136,9 @@
 %endif
 
 %changelog
+* Fri Jul 27 2007 John W. Linville <linville at redhat.com>
+- Update git-wireless-dev.patch (iwlwifi & bcm43xx updates)
+
 * Fri Jul 27 2007 Chuck Ebbert <cebbert at redhat.com>
 - temporarily added debug messages for x86 bootup
 




More information about the scm-commits mailing list