r2186 - trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-08 11:09:10 +0100 (Sat, 08 Jan 2005)
New Revision: 2186

Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-misc-powermac-fixes.dpatch
Log:
This patch is also partially applied


Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-misc-powermac-fixes.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-misc-powermac-fixes.dpatch	2005-01-08 09:59:13 UTC (rev 2185)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/powerpc-misc-powermac-fixes.dpatch	2005-01-08 10:09:10 UTC (rev 2186)
@@ -9,26 +9,6 @@
 
 @DPATCH@
 
-diff -urN debian-kernel-2.6.8/arch/ppc/kernel/pci.c debian-kernel-2.6.8-patched/arch/ppc/kernel/pci.c
---- debian-kernel-2.6.8/arch/ppc/kernel/pci.c	2004-08-14 07:36:57.000000000 +0200
-+++ debian-kernel-2.6.8-patched/arch/ppc/kernel/pci.c	2004-12-24 11:02:28.000000000 +0100
-@@ -33,6 +33,7 @@
- unsigned long isa_io_base     = 0;
- unsigned long isa_mem_base    = 0;
- unsigned long pci_dram_offset = 0;
-+int pcibios_assign_bus_offset = 1;
- 
- void pcibios_make_OF_bus_map(void);
- 
-@@ -1279,7 +1280,7 @@
- 		bus = pci_scan_bus(hose->first_busno, hose->ops, hose);
- 		hose->last_busno = bus->subordinate;
- 		if (pci_assign_all_busses || next_busno <= hose->last_busno)
--			next_busno = hose->last_busno+1;
-+			next_busno = hose->last_busno + pcibios_assign_bus_offset;
- 	}
- 	pci_bus_count = next_busno;
- 
 diff -urN debian-kernel-2.6.8/arch/ppc/platforms/pmac_feature.c debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_feature.c
 --- debian-kernel-2.6.8/arch/ppc/platforms/pmac_feature.c	2004-08-14 07:37:41.000000000 +0200
 +++ debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_feature.c	2004-12-24 10:55:34.000000000 +0100
@@ -43,68 +23,3 @@
  #endif /* CONFIG_POWER4 */
  };
  
-@@ -2665,7 +2669,7 @@
- 			struct device_node *p = of_get_parent(ui2c);
- 			if (p && !strcmp(p->name, "uni-n"))
- 				break;
--			ui2c = of_find_node_by_type(np, "i2c");
-+			ui2c = of_find_node_by_type(ui2c, "i2c");
- 		}
- 		if (ui2c == NULL)
- 			break;
-diff -urN debian-kernel-2.6.8/arch/ppc/platforms/pmac_pci.c debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_pci.c
---- debian-kernel-2.6.8/arch/ppc/platforms/pmac_pci.c	2004-08-14 07:36:58.000000000 +0200
-+++ debian-kernel-2.6.8-patched/arch/ppc/platforms/pmac_pci.c	2004-12-24 10:51:06.000000000 +0100
-@@ -50,6 +50,7 @@
- #endif /* CONFIG_POWER4 */
- 
- extern u8 pci_cache_line_size;
-+extern int pcibios_assign_bus_offset;
- 
- struct pci_dev *k2_skiplist[2];
- 
-@@ -315,6 +316,10 @@
- 	unsigned int addr;
- 	int i;
- 
-+	struct device_node *np = pci_busdev_to_OF_node(bus, devfn);
-+	if (np == NULL)
-+		return PCIBIOS_DEVICE_NOT_FOUND;
-+
- 	/*
- 	 * When a device in K2 is powered down, we die on config
- 	 * cycle accesses. Fix that here.
-@@ -362,6 +367,9 @@
- 	unsigned int addr;
- 	int i;
- 
-+	struct device_node *np = pci_busdev_to_OF_node(bus, devfn);
-+	if (np == NULL)
-+		return PCIBIOS_DEVICE_NOT_FOUND;
- 	/*
- 	 * When a device in K2 is powered down, we die on config
- 	 * cycle accesses. Fix that here.
-@@ -565,6 +573,14 @@
- 
- 	init_p2pbridge();
- 	fixup_nec_usb2();
-+	
-+	/* We are still having some issues with the Xserve G4, enabling
-+	 * some offset between bus number and domains for now when we
-+	 * assign all busses should help for now
-+	 */
-+	if (pci_assign_all_busses)
-+		pcibios_assign_bus_offset = 0x10;
-+
- #ifdef CONFIG_POWER4 
- 	/* There is something wrong with DMA on U3/HT. I haven't figured out
- 	 * the details yet, but if I set the cache line size to 128 bytes like
-@@ -707,7 +723,7 @@
- 	 * properties or figuring out the U3 address space decoding logic and
- 	 * then read its configuration register (if any).
- 	 */
--	hose->io_base_phys = 0xf4000000 + 0x00400000;
-+	hose->io_base_phys = 0xf4000000;
- 	hose->io_base_virt = ioremap(hose->io_base_phys, 0x00400000);
- 	isa_io_base = (unsigned long) hose->io_base_virt;
- 	hose->io_resource.name = np->full_name;