- kill typo so resources are not mixed up in amdk8/northbridge.c

- Enable resources on the lpc bus.  PCI now longer do this by
  default for their children unless they are bridges.


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1703 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Eric Biederman 2004-10-22 02:33:51 +00:00
parent 23c3d9321f
commit 4f9265fdc6
4 changed files with 34 additions and 50 deletions

View File

@ -590,7 +590,7 @@ static void pci_domain_set_resources(device_t dev)
struct resource *tmp; struct resource *tmp;
tmp = mem1; tmp = mem1;
mem1 = mem2; mem1 = mem2;
mem2 = mem1; mem2 = tmp;
} }
/* Now place the memory as high up as it will go */ /* Now place the memory as high up as it will go */
mem2->base = resource_max(mem2); mem2->base = resource_max(mem2);

View File

@ -170,6 +170,12 @@ static void amd8111_lpc_read_resources(device_t dev)
res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED; res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
} }
static void amd8111_lpc_enable_resoruces(device_t dev)
{
pci_dev_enable_resources(dev);
enable_childrens_resources(dev);
}
static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
{ {
@ -182,7 +188,7 @@ static struct pci_operations lops_pci = {
static struct device_operations lpc_ops = { static struct device_operations lpc_ops = {
.read_resources = amd8111_lpc_read_resources, .read_resources = amd8111_lpc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = amd8111_lpc_enable_resources,
.init = lpc_init, .init = lpc_init,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.enable = amd8111_enable, .enable = amd8111_enable,

View File

@ -172,40 +172,29 @@ static void lpc_init(struct device *dev)
static void i82801dbm_lpc_read_resources(device_t dev) static void i82801dbm_lpc_read_resources(device_t dev)
{ {
unsigned int reg; struct resource *res;
/* Get the normal pci resources of this device */ /* Get the normal pci resources of this device */
pci_dev_read_resources(dev); pci_dev_read_resources(dev);
/* Find my place in the resource list */
reg = dev->resources;
/* Add an extra subtractive resource for both memory and I/O */ /* Add an extra subtractive resource for both memory and I/O */
dev->resource[reg].base = 0; res = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
dev->resource[reg].size = 0; res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
dev->resource[reg].align = 0;
dev->resource[reg].gran = 0; res = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
dev->resource[reg].limit = 0; res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
dev->resource[reg].flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED; }
dev->resource[reg].index = 0;
reg++; static void i82801dbm_lpc_enable_resources(device_t dev)
{
dev->resource[reg].base = 0; pci_dev_enable_resources(dev);
dev->resource[reg].size = 0; enable_childrens_resources(dev);
dev->resource[reg].align = 0;
dev->resource[reg].gran = 0;
dev->resource[reg].limit = 0;
dev->resource[reg].flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
dev->resource[reg].index = 0;
reg++;
dev->resources = reg;
} }
static struct device_operations lpc_ops = { static struct device_operations lpc_ops = {
.read_resources = i82801dbm_lpc_read_resources, .read_resources = i82801dbm_lpc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = i82801dbm_lpc_enable_resources,
.init = lpc_init, .init = lpc_init,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.enable = i82801dbm_enable, .enable = i82801dbm_enable,

View File

@ -172,40 +172,29 @@ static void lpc_init(struct device *dev)
static void i82801er_lpc_read_resources(device_t dev) static void i82801er_lpc_read_resources(device_t dev)
{ {
unsigned int reg; struct resource *res;
/* Get the normal pci resources of this device */ /* Get the normal pci resources of this device */
pci_dev_read_resources(dev); pci_dev_read_resources(dev);
/* Find my place in the resource list */
reg = dev->resources;
/* Add an extra subtractive resource for both memory and I/O */ /* Add an extra subtractive resource for both memory and I/O */
dev->resource[reg].base = 0; res = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
dev->resource[reg].size = 0; res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
dev->resource[reg].align = 0;
dev->resource[reg].gran = 0; res = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
dev->resource[reg].limit = 0; res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
dev->resource[reg].flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED; }
dev->resource[reg].index = 0;
reg++; static void i82801er_lpc_enable_resources(device_t dev)
{
dev->resource[reg].base = 0; pci_dev_enable_resources(dev);
dev->resource[reg].size = 0; enable_childrens_resources(dev);
dev->resource[reg].align = 0;
dev->resource[reg].gran = 0;
dev->resource[reg].limit = 0;
dev->resource[reg].flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED;
dev->resource[reg].index = 0;
reg++;
dev->resources = reg;
} }
static struct device_operations lpc_ops = { static struct device_operations lpc_ops = {
.read_resources = i82801er_lpc_read_resources, .read_resources = i82801er_lpc_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = i82801er_lpc_enable_resources,
.init = lpc_init, .init = lpc_init,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.enable = i82801er_enable, .enable = i82801er_enable,