From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 5 Apr 2009 13:12:40 +0000 (+0200)
Subject: Remove h12y crash patch.
X-Git-Tag: v2.5-beta1~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=572b9db4906ae3d101e76d07ba0c3eff3ca435ef;p=people%2Fstevee%2Fipfire-2.x.git

Remove h12y crash patch.
has problems with cardbus drivers
if you have a h12y notebook add "reserve=0xFFB00000,0x100000" at bootprompt
---

diff --git a/lfs/linux b/lfs/linux
index 59639d3a36..f0da900f3c 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -103,9 +103,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Not report deprecated syscall 1.23 (for kudzu)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
     
-	# Fix crash on Twinhead H12Y notebooks
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
-
 	# Openswan
 	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
 
diff --git a/src/patches/linux-h12y-mmio-quirks.patch b/src/patches/linux-h12y-mmio-quirks.patch
deleted file mode 100755
index 8f258bbe15..0000000000
--- a/src/patches/linux-h12y-mmio-quirks.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- linux/drivers/pci/quirks.c	2008-09-08 20:33:16.000000000 +0200
-+++ linux/drivers/pci/quirks.c	2008-10-06 16:37:35.000000000 +0200
-@@ -1381,6 +1381,82 @@
- 			 PCI_DEVICE_ID_TOSHIBA_TC86C001_IDE,
- 			 quirk_tc86c001_ide);
- 
-+/*
-+ * The Twinhad H12Y assign mmio (0xffbfe800-0xffbfecff)
-+ * resources that seems to be used by an unknown device.
-+ * This quirk reserve more than really used mmio space to
-+ * force change the mmio area of the cardreader and the network chip.
-+ * See http://bugzilla.kernel.org/show_bug.cgi?id=10231
-+ * and http://bugzilla.kernel.org/show_bug.cgi?id=9905
-+ * for more details
-+ */
-+static void __init quirk_h12y_1_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * Network Device: Realtek 8139C of Twinhead H12Y
-+ * PCI VENDOR: 0x10EC PCI ID:0x8139
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+	struct resource *r = &dev->resource[1];
-+	if ((dev->subsystem_vendor) == 0x14FF &&
-+	    (dev->subsystem_device) == 0xA003) {
-+		r->start = 0;
-+		r->end = 0x03ff;
-+	}	
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_REALTEK,
-+			PCI_DEVICE_ID_REALTEK_8139,
-+			quirk_h12y_1_mmio);
-+
-+static void __init quirk_h12y_2_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * SD-Cardreader Device: O2 7120 of Twinhead H12Y
-+ * PCI VENDOR: 0x1217 PCI ID:0x7120
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+	struct resource *r = &dev->resource[0];
-+	if ((dev->subsystem_vendor) == 0x14FF &&
-+	    (dev->subsystem_device) == 0xA003) {
-+		r->start = 0;
-+		r->end = 0x03ff;
-+	}	
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7120,quirk_h12y_2_mmio);
-+
-+static void __init quirk_h12y_3_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * Firewire Device: O2 00F7 of Twinhead H12Y
-+ * PCI VENDOR: 0x1217 PCI ID:0x00F7
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+	struct resource *r = &dev->resource[1];
-+	if ((dev->subsystem_vendor) == 0x14FF &&
-+	    (dev->subsystem_device) == 0xA003) {
-+		r->start = 0;
-+		r->end = 0x0fff;
-+	}	
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x00F7,quirk_h12y_3_mmio);
-+
-+static void __init quirk_h12y_4_mmio(struct pci_dev *dev)
-+{
-+/*
-+ * MS-Cardreader Device: O2 7130 of Twinhead H12Y
-+ * PCI VENDOR: 0x1217 PCI ID:0x7130
-+ * SUB VENDOR: 0x14FF SUB ID:0xA003
-+ */
-+	struct resource *r = &dev->resource[0];
-+	if ((dev->subsystem_vendor) == 0x14FF &&
-+	    (dev->subsystem_device) == 0xA003) {
-+		r->start = 0;
-+		r->end = 0x1fff;
-+	}	
-+}
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_O2,0x7130,quirk_h12y_4_mmio);
-+
-+
- static void __devinit quirk_netmos(struct pci_dev *dev)
- {
- 	unsigned int num_parallel = (dev->subsystem_device & 0xf0) >> 4;