- Bump the LinuxBIOS major version

- Rename chip_config chip_operations throughout the tree
- Fix Config.lb on most of the Opteron Ports
- Fix the amd 8000 chipset support for setting the subsystem vendor and device ids
- Add detection of devices that are on the motherboard (i.e. In Config.lb)
- Baby step in getting the resource limit handling correct, Ignore fixed resources
- Only call enable_childrens_resources on devices we know will have children
  For some busses like i2c it is non-sense and we don't want it.
- Set the resource limits for pnp devices resources.
- Improve the resource size detection for pnp devices.
- Added a configuration register to amd8111_ide.c so we can enable/disable individual ide channels
- Added a header file to hold the prototype of isa_dma_init
- Fixed most of the superio chips so the should work now, the via superio pci device is the exception.
- The code compiles and runs so it is time for me to go to bed.


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1698 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

8 files changed, 195 insertions, 252 deletions

diff --git a/src/mainboard/amd/quartet/Config.lb b/src/mainboard/amd/quartet/Config.lb
index 20667f5db4..bd7e11ceb0 100644
--- a/src/mainboard/amd/quartet/Config.lb
+++ b/src/mainboard/amd/quartet/Config.lb
@@ -251,102 +251,115 @@ mainboardinit cpu/k8/disable_mmx_sse.inc
 dir /pc80
 config chip.h
 
-northbridge amd/amdk8 "mc0"
-	pci 0:18.0
-	pci 0:18.0
-	pci 0:18.0
-	pci 0:18.1
-	pci 0:18.2
-	pci 0:18.3
-	southbridge amd/amd8111 "amd8111" link 2
-		pci 0:0.0
-		pci 0:1.0 on
-		pci 0:1.1 on
-		pci 0:1.2 on
-		pci 0:1.3 on
-		pci 0:1.5 on
-		pci 0:1.6 on
-		pci 1:0.0 on
-		pci 1:0.1 on
-		pci 1:0.2 on
-		pci 1:1.0 on
-		superio NSC/pc87360 link 1
-			pnp 2e.0 off  # Floppy 
-				 io 0x60 = 0x3f0
-				irq 0x70 = 6
-				drq 0x74 = 2
-			pnp 2e.1 off  # Parallel Port
-				 io 0x60 = 0x378
-				irq 0x70 = 7
-			pnp 2e.2 off # Com 2
-				 io 0x60 = 0x2f8
-				irq 0x70 = 3
-			pnp 2e.3 on  # Com 1
-				 io 0x60 = 0x3f8
-				irq 0x70 = 4
-			pnp 2e.4 off # SWC
-			pnp 2e.5 off # Mouse
-			pnp 2e.6 on  # Keyboard
-				 io 0x60 = 0x60
-				 io 0x62 = 0x64
-				irq 0x70 = 1
-			pnp 2e.7 off # GPIO
-			pnp 2e.8 off # ACB
-			pnp 2e.9 off # FSCM
-			pnp 2e.a off # WDT  
+chip northbridge/amd/amdk8 # mc0
+	device pci_domain 0 on
+		device pci 18.0 on end
+		device pci 18.0 on end
+		device pci 18.0 
+			chip southbridge amd/amd8111
+				device pci 0:0.0 on 
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 0.2 on end
+					device pci 1.0 on end
+				end
+				device pci 1.0 on 
+					chip superio/NSC/pc87360
+						device pnp 2e.0 off     # Floppy 
+							 io 0x60 = 0x3f0
+							irq 0x70 = 6
+							drq 0x74 = 2
+						end
+						device pnp 2e.1 off     # Parallel Port
+							 io 0x60 = 0x378
+							irq 0x70 = 7
+						end
+						device pnp 2e.2 off     # Com 2
+							 io 0x60 = 0x2f8
+							irq 0x70 = 3
+						end
+						device pnp 2e.3 on      # Com 1
+							 io 0x60 = 0x3f8
+							irq 0x70 = 4
+						end
+						device pnp 2e.4 off end # SWC
+						device pnp 2e.5 off end # Mouse
+						device pnp 2e.6 on      # Keyboard
+							 io 0x60 = 0x60
+							 io 0x62 = 0x64
+							irq 0x70 = 1
+						end
+						device pnp 2e.7 off end # GPIO
+						device pnp 2e.8 off end # ACB
+						device pnp 2e.9 off end # FSCM
+						device pnp 2e.a off end # WDT  
+					end
+				end
+				device pci 1.1 on end
+				device pci 1.2 on end
+				device pci 1.3 on end
+				device pci 1.5 on end
+				device pci 1.6 on end
+			end
+		end
+		device pci 18.1 on end
+		device pci 18.2 on end
+		device pci 18.3 on end
+	
+		chip northbridge/amd/amdk8 # mc1
+			device pci 19.0 on end
+			device pci 19.0 on 
+				chip southbridge amd/amd8131 # amd8131_0
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 1.0 on end
+					device pci 1.1 on end
+				end
+				chip southbridge amd/amd8131 # amd8131_1
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 1.0 on end
+					device pci 1.1 on end
+				end
+			end
+			device pci 19.0 on end
+			device pci 19.1 on end
+			device pci 19.2 on end
+			device pci 19.3 on end
 		end
-	end
-end
-
-northbridge amd/amdk8 "mc1"
-	pci 0:19.0
-	pci 0:19.0
-	pci 0:19.0
-	pci 0:19.1
-	pci 0:19.2
-	pci 0:19.3
-	southbridge amd/amd8131 "amd8131_0" link 1
-		pci 0:0.0
-		pci 0:0.1
-		pci 0:1.0
-		pci 0:1.1
-	end
-	southbridge amd/amd8131 "amd8131_1" link 1
-		pci 0:0.0
-		pci 0:0.1
-		pci 0:1.0
-		pci 0:1.1
-	end
-end
-
-northbridge amd/amdk8 "mc2"
-	pci 0:1a.0
-	pci 0:1a.0
-	pci 0:1a.0
-	pci 0:1a.1
-	pci 0:1a.2
-	pci 0:1a.3
-end
-
-northbridge amd/amdk8 "mc3"
-	pci 0:1b.0
-	pci 0:1b.0
-	pci 0:1b.0
-	pci 0:1b.1
-	pci 0:1b.2
-	pci 0:1b.3
-end
-
-cpu k8 "cpu0"
-end
-
-cpu k8 "cpu1" 
-end
 
-cpu k8 "cpu2" 
-end
+		chip northbridge/amd/amdk8 # mc2
+			device pci 1a.0 on end
+			device pci 1a.0 on end
+			device pci 1a.0 on end
+			device pci 1a.1 on end
+			device pci 1a.2 on end
+			device pci 1a.3 on end
+		end
 
-cpu k8 "cpu3" 
+		chip northbridge/amd/amdk8 # mc3
+			device pci 1b.0 on end
+			device pci 1b.0 on end
+			device pci 1b.0 on end
+			device pci 1b.1 on end
+			device pci 1b.2 on end
+			device pci 1b.3 on end
+		end
+	end # pci_domain 0
+	device apic_cluster 0 on
+		chip cpu/amd/socket_940
+			device apic 0 on end
+		end
+		chip cpu/amd/socket_940
+			device apic 1 on end
+		end 		
+		chip cpu/amd/socket_940
+			device apic 2 on end
+		end 		
+		chip cpu/amd/socket_940
+			device apic 3 on end
+		end
+	end
 end
 
 ##
diff --git a/src/mainboard/amd/quartet/chip.h b/src/mainboard/amd/quartet/chip.h
index 6f46dd00b4..526dcc4515 100644
--- a/src/mainboard/amd/quartet/chip.h
+++ b/src/mainboard/amd/quartet/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_control mainboard_amd_quartet_control;
+extern struct chip_operations mainboard_amd_quartet_control;
 
 struct mainboard_amd_quartet_config {
 	int nothing;
diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c
index cf5b475e95..4071c3b93d 100644
--- a/src/mainboard/amd/quartet/mainboard.c
+++ b/src/mainboard/amd/quartet/mainboard.c
@@ -8,37 +8,7 @@
 #include "../../../northbridge/amd/amdk8/northbridge.h"
 #include "chip.h"
 
-unsigned long initial_apicid[CONFIG_MAX_CPUS] =
-{
-	0, 1, 2, 3,
-};
-
-static struct device_operations mainboard_operations = {
-	.read_resources   = root_dev_read_resources,
-	.set_resources    = root_dev_set_resources,
-	.enable_resources = enable_childrens_resources,
-	.init             = 0,
-	.scan_bus         = amdk8_scan_root_bus,
-	.enable           = 0,
-};
-
-static void enumerate(struct chip *chip)
-{
-	struct chip *child;
-
-	if (chip->control && chip->control->name) {
- 		printk_debug("Enumerating: %s\n", chip->control->name);
- 	}
-
-	dev_root.ops = &mainboard_operations;
-	chip->dev = &dev_root;
-	chip->bus = 0;
-	for (child = chip->children; child; child = child->next) {
-		child->bus = &dev_root.link[0];
-	}
-}
 
-struct chip_control mainboard_amd_quartet_control = {
-	.enumerate = enumerate, 
+struct chip_operations mainboard_amd_quartet_control = {
 	.name      = "AMD Quartet mainboard ",
 };
diff --git a/src/mainboard/amd/serenade/Config.lb b/src/mainboard/amd/serenade/Config.lb
index 5b048fb396..4ae9a44c53 100644
--- a/src/mainboard/amd/serenade/Config.lb
+++ b/src/mainboard/amd/serenade/Config.lb
@@ -251,78 +251,93 @@ mainboardinit cpu/k8/disable_mmx_sse.inc
 dir /pc80
 config chip.h
 
-northbridge amd/amdk8 "mc0"
-	pci 0:18.0
-	pci 0:18.0
-	pci 0:18.0
-	pci 0:18.1
-	pci 0:18.2
-	pci 0:18.3
-	southbridge amd/amd8131 "amd8131" link 2
-		pci 0:0.0
-		pci 0:0.1
-		pci 0:1.0
-		pci 0:1.1
+chip northbridage/amd/amdk8 # mc0
+	device pci_domain 0 on
+		device pci 18.0 on end # LDT 0 
+		device pci 18.0 on end # LDT1
+		device pci 18.0 on     # LDT2
+			chip southbridge/amd/amd8131
+				# the on/off keyword is mandatory
+				device pci 0.0 on end
+				device pci 0.1 on end
+				device pci 1.0 on end
+				device pci 1.1 on end
+			end
+			chip southbridge/amd/amd8111
+				# this "device pci 0.0" is the parent the next one
+				# PCI bridge
+				device pci 0.0 on
+					device pci 0.0 on end
+					device pci 0.1 on end
+					device pci 0.2 on end
+					device pci 1.0 off end
+				end
+				device pci 1.0 on
+					chip superio/windond/w83627hf
+						device	pnp 2e.0 on  # Floppy 
+							 io 0x60 = 0x3f0
+							irq 0x70 = 6
+							drq 0x74 = 2
+						end
+						device pnp 2e.1 off  # Parallel Port
+							 io 0x60 = 0x378
+							irq 0x70 = 7
+						end
+						device pnp 2e.2 on # Com 1
+							 io 0x60 = 0x3f8
+							irq 0x70 = 4
+						end
+						device pnp 2e.3 off # Com 2
+							 io 0x60 = 0x2f8
+							irq 0x70 = 3
+						end
+						device pnp 2e.5 on  # Keyboard
+							 io 0x60 = 0x60
+							 io 0x62 = 0x64
+							irq 0x70 = 1
+							irq 0x72 = 12
+						end
+						device pnp 2e.6 off end # CIR
+						device pnp 2e.7 off end # GAM_MIDI_GIPO1
+						device pnp 2e.8 off end # GPIO2
+						device pnp 2e.9 off end # GPIO3
+						device pnp 2e.a off end # ACPI
+						device pnp 2e.b on      # HW Monitor
+							 io 0x60 = 0x290
+						end 
+					end
+				end
+				device pci 1.1 on end
+				device pci 1.2 on end
+				device pci 1.3 on end
+				device pci 1.5 off end
+				device pci 1.6 off end
+			end
+		end #  device pci 18.0 
+		
+		device pci 18.1 on end
+		device pci 18.2 on end
+		device pci 18.3 on end
+
+		chip northbridge/amd/amdk8
+			device pci 19.0 on end
+			device pci 19.0 on end
+			device pci 19.0 on end
+			device pci 19.1 on end
+			device pci 19.2 on end
+			device pci 19.3 on end
+		end
 	end
-	southbridge amd/amd8111 "amd8111" link 2
-		#pci 0:0.0
-		#pci 0:1.0 on
-		#pci 0:1.1 on
-		#pci 0:1.2 on
-		#pci 0:1.3 on
-		#pci 0:1.5 off
-		#pci 0:1.6 off
-		#pci 1:0.0 on
-		#pci 1:0.1 on
-		#pci 1:0.2 on
-		#pci 1:1.0 off
-                superio winbond/w83627hf link 1
-                        pnp 2e.0 on #  Floppy
-                                 io 0x60 = 0x3f0
-                                irq 0x70 = 6
-                                drq 0x74 = 2
-                        pnp 2e.1 off #  Parallel Port
-                                 io 0x60 = 0x378
-                                irq 0x70 = 7
-                        pnp 2e.2 on #  Com1
-                                 io 0x60 = 0x3f8
-                                irq 0x70 = 4
-                        pnp 2e.3 off #  Com2
-                                 io 0x60 = 0x2f8
-                                irq 0x70 = 3
-                        pnp 2e.5 on #  Keyboard
-                                 io 0x60 = 0x60
-                                 io 0x62 = 0x64
-                                irq 0x70 = 1
-                                irq 0x72 = 12
-                        pnp 2e.6 off #  CIR
-                        pnp 2e.7 off #  GAME_MIDI_GIPO1
-                        pnp 2e.8 off #  GPIO2
-                        pnp 2e.9 off #  GPIO3
-                        pnp 2e.a off #  ACPI
-                        pnp 2e.b on #  HW Monitor
-                                 io 0x60 = 0x290
-                end
-
+	device apci_cluster 0 on
+		chip cpu/amd/socket_940
+			device apic 0 on end
+		end
+		chip cpu/amd/socket_940
+			device apic 1 on end
+		end
 	end
 end
 
-northbridge amd/amdk8 "mc1"
-	pci 0:19.0
-	pci 0:19.0
-	pci 0:19.0
-	pci 0:19.1
-	pci 0:19.2
-	pci 0:19.3
-end
-
-cpu k8 "cpu0"
-	register "ldt2" = "{ .chip = &amd8131, .ht_width=16, .ht_speed=600 }"
-end
-
-cpu k8 "cpu1" 
-end
-
 ##
 ## Include the old serial code for those few places that still need it.
 ##
diff --git a/src/mainboard/amd/serenade/chip.h b/src/mainboard/amd/serenade/chip.h
index b0d76e7eec..066852b37a 100644
--- a/src/mainboard/amd/serenade/chip.h
+++ b/src/mainboard/amd/serenade/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_control mainboard_amd_serenade_control;
+extern struct chip_operations mainboard_amd_serenade_control;
 
 struct mainboard_amd_serenade_config {
 	int nothing;
diff --git a/src/mainboard/amd/serenade/mainboard.c b/src/mainboard/amd/serenade/mainboard.c
index cce62a28e8..750438ce28 100644
--- a/src/mainboard/amd/serenade/mainboard.c
+++ b/src/mainboard/amd/serenade/mainboard.c
@@ -8,37 +8,6 @@
 #include "../../../northbridge/amd/amdk8/northbridge.h"
 #include "chip.h"
 
-unsigned long initial_apicid[CONFIG_MAX_CPUS] =
-{
-	0, 1,
-};
-
-static struct device_operations mainboard_operations = {
-	.read_resources   = root_dev_read_resources,
-	.set_resources    = root_dev_set_resources,
-	.enable_resources = enable_childrens_resources,
-	.init             = 0,
-	.scan_bus         = amdk8_scan_root_bus,
-	.enable           = 0,
-};
-
-static void enumerate(struct chip *chip)
-{
-	struct chip *child;
-
-	if (chip->control && chip->control->name) {
-		printk_debug("Enumerating: %s\n", chip->control->name);
-	}
-
-	dev_root.ops = &mainboard_operations;
-	chip->dev = &dev_root;
-	chip->bus = 0;
-	for (child = chip->children; child; child = child->next) {
-		child->bus = &dev_root.link[0];
-	}
-}
-
-struct chip_control mainboard_amd_serenade_control = {
-	.enumerate = enumerate, 
+struct chip_operations mainboard_amd_serenade_control = {
 	.name      = "AMD Serenade mainboard ",
 };
diff --git a/src/mainboard/amd/solo/chip.h b/src/mainboard/amd/solo/chip.h
index 5a72960b28..63cf26d91b 100644
--- a/src/mainboard/amd/solo/chip.h
+++ b/src/mainboard/amd/solo/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_control mainboard_amd_solo_control;
+extern struct chip_operations mainboard_amd_solo_control;
 
 struct mainboard_amd_solo_config {
 	int nothing;
diff --git a/src/mainboard/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c
index 75e66c1d03..155231b41c 100644
--- a/src/mainboard/amd/solo/mainboard.c
+++ b/src/mainboard/amd/solo/mainboard.c
@@ -10,30 +10,6 @@
 #include "chip.h"
 
 
-unsigned long initial_apicid[CONFIG_MAX_CPUS] = {
-	0,
-};
-
-static struct device_operations mainboard_operations = {
-	.read_resources = root_dev_read_resources,
-	.set_resources = root_dev_set_resources,
-	.enable_resources = enable_childrens_resources,
-	.init = 0,
-	.scan_bus = amdk8_scan_root_bus,
-	.enable = 0,
-};
-
-static void enumerate(struct chip *chip)
-{
-	struct chip *child;
-	dev_root.ops = &mainboard_operations;
-	chip->dev = &dev_root;
-	chip->bus = 0;
-	for (child = chip->children; child; child = child->next) {
-		child->bus = &dev_root.link[0];
-	}
-}
-struct chip_control mainboard_amd_solo_control = {
-	.enumerate = enumerate,
+struct chip_operations mainboard_amd_solo_control = {
 	.name = "AMD Solo7 mainboard ",
 };