diff options
Diffstat (limited to 'src/northbridge')
| -rw-r--r-- | src/northbridge/amd/amdk8/chip.h | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/amdk8/northbridge.c | 80 | ||||
| -rw-r--r-- | src/northbridge/emulation/qemu-i386/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/855pm/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/e7501/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/intel/i855pm/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/transmeta/tm5800/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/via/vt8601/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/via/vt8623/northbridge.c | 1 |
9 files changed, 47 insertions, 42 deletions
diff --git a/src/northbridge/amd/amdk8/chip.h b/src/northbridge/amd/amdk8/chip.h index a6111c98c9..26d4e53ac6 100644 --- a/src/northbridge/amd/amdk8/chip.h +++ b/src/northbridge/amd/amdk8/chip.h @@ -2,4 +2,4 @@ struct northbridge_amd_amdk8_config { }; -extern struct chip_control northbridge_amd_amdk8_control; +extern struct chip_operations northbridge_amd_amdk8_ops; diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c index 4933b161b7..cb2f9fa0a7 100644 --- a/src/northbridge/amd/amdk8/northbridge.c +++ b/src/northbridge/amd/amdk8/northbridge.c @@ -6,10 +6,10 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> +#include <cpu/cpu.h> #include "chip.h" #include "northbridge.h" #include "amdk8.h" @@ -487,7 +487,7 @@ static struct pci_driver mcf0_driver __pci_driver = { #define BRIDGE_IO_MASK (IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH) -static void bridge_read_resources(device_t dev) +static void pci_domain_read_resources(device_t dev) { struct resource *resource; unsigned reg; @@ -556,7 +556,7 @@ static void ram_resource(device_t dev, unsigned long index, IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED; } -static void bridge_set_resources(device_t dev) +static void pci_domain_set_resources(device_t dev) { struct resource *io, *mem1, *mem2; struct resource *resource, *last; @@ -577,7 +577,7 @@ static void bridge_set_resources(device_t dev) mem2 = find_resource(dev, 2); /* See if both resources have roughly the same limits */ if (((mem1->limit <= 0xffffffff) && (mem2->limit <= 0xffffffff)) || - (mem1->limit > 0xffffffff) && (mem2->limit > 0xffffffff)) + ((mem1->limit > 0xffffffff) && (mem2->limit > 0xffffffff))) { /* If so place the one with the most stringent alignment first */ @@ -682,21 +682,34 @@ static void bridge_set_resources(device_t dev) assign_resources(&dev->link[0]); } - - -static unsigned int bridge_scan_bus(device_t root, unsigned int max) +static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max) { - struct bus *cpu_bus; unsigned reg; int i; /* Unmap all of the HT chains */ for(reg = 0xe0; reg <= 0xec; reg += 4) { f1_write_config32(reg, 0); } - max = pci_scan_bus(&root->link[0], PCI_DEVFN(0x18, 0), 0xff, max); + max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0x18, 0), 0xff, max); + return max; +} + +static struct device_operations pci_domain_ops = { + .read_resources = pci_domain_read_resources, + .set_resources = pci_domain_set_resources, + .enable_resources = enable_childrens_resources, + .init = 0, + .scan_bus = pci_domain_scan_bus, +}; + +static unsigned int scan_cpu_bus(device_t dev, unsigned int max) +{ + struct bus *cpu_bus; + unsigned reg; + int i; /* Find which cpus are present */ - cpu_bus = &dev_root.link[1]; + cpu_bus = &dev->link[0]; for(i = 0; i < 7; i++) { device_t dev, cpu; struct device_path cpu_path; @@ -732,40 +745,39 @@ static unsigned int bridge_scan_bus(device_t root, unsigned int max) dev_path(cpu), cpu->enabled?"enabled":"disabled"); } } - return max; } +static void cpu_bus_init(device_t dev) +{ + printk_debug("cpu_bus_init\n"); +#if 0 + initialize_cpus(&dev->link[0]); +#endif +} -static struct device_operations bridge_ops = { - .read_resources = bridge_read_resources, - .set_resources = bridge_set_resources, - .enable_resources = enable_childrens_resources, - .init = 0, - .scan_bus = bridge_scan_bus, +static struct device_operations cpu_bus_ops = { + .read_resources = 0, + .set_resources = 0, + .enable_resources = 0, + .init = cpu_bus_init, + .scan_bus = scan_cpu_bus, }; -static void enumerate(struct chip *chip) +static void enable_dev(struct device *dev) { struct device_path path; - device_t bridge; - chip_enumerate(chip); - /* Get the path for the bridge device */ - path.type = DEVICE_PATH_PNP; - path.u.pnp.port = 0xcf8; - path.u.pnp.device = 0; - - /* Lookup the bridge device */ - bridge = find_dev_path(&dev_root.link[0], &path); - - /* Set the bridge operations */ - if (bridge) { - bridge->ops = &bridge_ops; + /* Set the operations if it is a special bus type */ + if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { + dev->ops = &pci_domain_ops; + } + else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + dev->ops = &cpu_bus_ops; } } -struct chip_control northbridge_amd_amdk8_control = { - .name = "AMD K8 Northbridge", - .enumerate = enumerate, +struct chip_operations northbridge_amd_amdk8_ops = { + .name = "AMD K8 Northbridge", + .enable_dev = enable_dev, }; diff --git a/src/northbridge/emulation/qemu-i386/northbridge.c b/src/northbridge/emulation/qemu-i386/northbridge.c index 9a8f557302..78ec64e310 100644 --- a/src/northbridge/emulation/qemu-i386/northbridge.c +++ b/src/northbridge/emulation/qemu-i386/northbridge.c @@ -6,7 +6,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/intel/855pm/northbridge.c b/src/northbridge/intel/855pm/northbridge.c index d4f73df3d2..906617ad8e 100644 --- a/src/northbridge/intel/855pm/northbridge.c +++ b/src/northbridge/intel/855pm/northbridge.c @@ -5,7 +5,6 @@ #include <part/sizeram.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c index 452166ba28..79068310c8 100644 --- a/src/northbridge/intel/e7501/northbridge.c +++ b/src/northbridge/intel/e7501/northbridge.c @@ -5,7 +5,6 @@ #include <part/sizeram.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/intel/i855pm/northbridge.c b/src/northbridge/intel/i855pm/northbridge.c index eb03266ae1..f980c5436a 100644 --- a/src/northbridge/intel/i855pm/northbridge.c +++ b/src/northbridge/intel/i855pm/northbridge.c @@ -5,7 +5,6 @@ #include <part/sizeram.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/transmeta/tm5800/northbridge.c b/src/northbridge/transmeta/tm5800/northbridge.c index ccce795da4..af101eb64b 100644 --- a/src/northbridge/transmeta/tm5800/northbridge.c +++ b/src/northbridge/transmeta/tm5800/northbridge.c @@ -7,7 +7,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c index 5f5e5d9dd8..16a7ea8530 100644 --- a/src/northbridge/via/vt8601/northbridge.c +++ b/src/northbridge/via/vt8601/northbridge.c @@ -6,7 +6,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/hypertransport.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c index cba7278066..c026197973 100644 --- a/src/northbridge/via/vt8623/northbridge.c +++ b/src/northbridge/via/vt8623/northbridge.c @@ -7,7 +7,6 @@ #include <device/pci.h> #include <device/hypertransport.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <stdlib.h> #include <string.h> #include <bitops.h> |