rpms/kernel/F-7 linux-2.6-irda-smc-remove-quirk.patch, NONE, 1.1 kernel-2.6.spec, 1.3332, 1.3333

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12067

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-irda-smc-remove-quirk.patch 
Log Message:
* Wed Aug 29 2007 Chuck Ebbert <cebbert at redhat.com>
- remove IRDA quirk for SMC controllers (#260481)


linux-2.6-irda-smc-remove-quirk.patch:

--- NEW FILE linux-2.6-irda-smc-remove-quirk.patch ---
===================================================================
--- w.orig/drivers/pnp/quirks.c	2007-08-21 12:34:51.000000000 -0600
+++ w/drivers/pnp/quirks.c	2007-08-21 12:35:08.000000000 -0600
@@ -107,108 +107,6 @@
 	return;
 }
 
-static int quirk_smc_fir_enabled(struct pnp_dev *dev)
-{
-	unsigned long firbase;
-	u8 bank, high, low, chip;
-
-	if (!pnp_port_valid(dev, 1))
-		return 0;
-
-	firbase = pnp_port_start(dev, 1);
-
-	/* Select register bank 3 */
-	bank = inb(firbase + 7);
-	bank &= 0xf0;
-	bank |= 3;
-	outb(bank, firbase + 7);
-
-	high = inb(firbase + 0);
-	low  = inb(firbase + 1);
-	chip = inb(firbase + 2);
-
-	/* This corresponds to the check in smsc_ircc_present() */
-	if (high == 0x10 && low == 0xb8 && (chip == 0xf1 || chip == 0xf2))
-		return 1;
-
-	return 0;
-}
-
-static void quirk_smc_enable(struct pnp_dev *dev)
-{
-	struct resource fir, sir, irq;
-
-	pnp_activate_dev(dev);
-	if (quirk_smc_fir_enabled(dev))
-		return;
-
-	/*
-	 * Sometimes the BIOS claims the device is enabled, but it reports
-	 * the wrong FIR resources or doesn't properly configure ISA or LPC
-	 * bridges on the way to the device.
-	 *
-	 * HP nc6000 and nc8000/nw8000 laptops have known problems like
-	 * this.  Fortunately, they do fix things up if we auto-configure
-	 * the device using its _PRS and _SRS methods.
-	 */
-	dev_err(&dev->dev, "%s not responding at SIR 0x%lx, FIR 0x%lx; "
-		"auto-configuring\n", dev->id->id,
-		(unsigned long) pnp_port_start(dev, 0),
-		(unsigned long) pnp_port_start(dev, 1));
-
-	pnp_disable_dev(dev);
-	pnp_init_resource_table(&dev->res);
-	pnp_auto_config_dev(dev);
-	pnp_activate_dev(dev);
-	if (quirk_smc_fir_enabled(dev)) {
-		dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n",
-			(unsigned long) pnp_port_start(dev, 0),
-			(unsigned long) pnp_port_start(dev, 1));
-		return;
-	}
-
-	/*
-	 * The Toshiba Portege 4000 _CRS reports the FIR region first,
-	 * followed by the SIR region.  The BIOS will configure the bridge,
-	 * but only if we call _SRS with SIR first, then FIR.  It also
-	 * reports the IRQ as active high, when it is really active low.
-	 */
-	dev_err(&dev->dev, "not responding at SIR 0x%lx, FIR 0x%lx; "
-		"swapping SIR/FIR and reconfiguring\n",
-		(unsigned long) pnp_port_start(dev, 0),
-		(unsigned long) pnp_port_start(dev, 1));
-
-	/*
-	 * Clear IORESOURCE_AUTO so pnp_activate_dev() doesn't reassign
-	 * these resources any more.
-	 */
-	fir = dev->res.port_resource[0];
-	sir = dev->res.port_resource[1];
-	fir.flags &= ~IORESOURCE_AUTO;
-	sir.flags &= ~IORESOURCE_AUTO;
-
-	irq = dev->res.irq_resource[0];
-	irq.flags &= ~IORESOURCE_AUTO;
-	irq.flags &= ~IORESOURCE_BITS;
-	irq.flags |= IORESOURCE_IRQ_LOWEDGE;
-
-	pnp_disable_dev(dev);
-	dev->res.port_resource[0] = sir;
-	dev->res.port_resource[1] = fir;
-	dev->res.irq_resource[0] = irq;
-	pnp_activate_dev(dev);
-
-	if (quirk_smc_fir_enabled(dev)) {
-		dev_err(&dev->dev, "responds at SIR 0x%lx, FIR 0x%lx\n",
-			(unsigned long) pnp_port_start(dev, 0),
-			(unsigned long) pnp_port_start(dev, 1));
-		return;
-	}
-
-	dev_err(&dev->dev, "giving up; try \"smsc-ircc2.nopnp\" and "
-		"email bjorn.helgaas at hp.com\n");
-}
-
 
 /*
  *  PnP Quirks
@@ -229,7 +127,6 @@
 	{ "CTL0043", quirk_sb16audio_resources },
 	{ "CTL0044", quirk_sb16audio_resources },
 	{ "CTL0045", quirk_sb16audio_resources },
-	{ "SMCf010", quirk_smc_enable },
 	{ "" }
 };
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3332
retrieving revision 1.3333
diff -u -r1.3332 -r1.3333
--- kernel-2.6.spec	29 Aug 2007 16:13:25 -0000	1.3332
+++ kernel-2.6.spec	29 Aug 2007 18:18:08 -0000	1.3333
@@ -614,6 +614,7 @@
 Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
 Patch760: linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
+Patch770: linux-2.6-irda-smc-remove-quirk.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
@@ -1346,8 +1347,10 @@
 ApplyPatch linux-2.6-sdhci-fix-interrupt-mask.patch
 # fix the interrupt mask fix
 ApplyPatch linux-2.6-sdhci-clear-error-interrupt.patch
-# v4l/dvb: fix aritar hd5000 tuner
+# v4l/dvb: fix airstar hd5000 tuner
 ApplyPatch linux-2.6-v4l-dvb-fix-airstar-hd5000-tuner.patch
+# irda: remove smc quirk that breaks hp 6000 notebooks
+ApplyPatch linux-2.6-irda-smc-remove-quirk.patch
 
 # USB
 #
@@ -2305,6 +2308,9 @@
 
 %changelog
 * Wed Aug 29 2007 Chuck Ebbert <cebbert at redhat.com>
+- remove IRDA quirk for SMC controllers (#260481)
+
+* Wed Aug 29 2007 Chuck Ebbert <cebbert at redhat.com>
 - CFS scheduler v20.5
 - disable 64-bit DMA for atl1 network adapter