Move the v3 resource allocator to v2.
Major changes:
1. Separate resource allocation into:
A. Read Resources
B. Avoid fixed resources (constrain limits)
C. Allocate resources
D. Set resources
Usage notes:
Resources which have IORESOURCE_FIXED set in the flags constrain the placement
of other resources. All fixed resources will end up outside (above or below)
the allocated resources.
Domains usually start with base = 0 and limit = 2^address_bits - 1.
I've added an IOAPIC to all platforms so that the old limit of 0xfec00000 is
still there for resources. Some platforms may want to change that, but I didn't
want to break anyone's board.
Resources are allocated in a single block for memory and another for I/O.
Currently the resource allocator doesn't support holes.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4394 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index 2531bfd..4a7a2cd 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -15,12 +15,12 @@
*/
/*
- * PCI Bus Services, see include/linux/pci.h for further explanation.
+ * PCI Bus Services, see include/linux/pci.h for further explanation.
*
- * Copyright 1993 -- 1997 Drew Eckhardt, Frederic Potter,
- * David Mosberger-Tang
+ * Copyright 1993 -- 1997 Drew Eckhardt, Frederic Potter,
+ * David Mosberger-Tang
*
- * Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+ * Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
*/
#include <console/console.h>
@@ -51,9 +51,9 @@
#include <device/cardbus.h>
#endif
-uint8_t pci_moving_config8(struct device *dev, unsigned reg)
+u8 pci_moving_config8(struct device *dev, unsigned int reg)
{
- uint8_t value, ones, zeroes;
+ u8 value, ones, zeroes;
value = pci_read_config8(dev, reg);
pci_write_config8(dev, reg, 0xff);
@@ -67,9 +67,9 @@
return ones ^ zeroes;
}
-uint16_t pci_moving_config16(struct device *dev, unsigned reg)
+u16 pci_moving_config16(struct device * dev, unsigned int reg)
{
- uint16_t value, ones, zeroes;
+ u16 value, ones, zeroes;
value = pci_read_config16(dev, reg);
pci_write_config16(dev, reg, 0xffff);
@@ -83,9 +83,9 @@
return ones ^ zeroes;
}
-uint32_t pci_moving_config32(struct device *dev, unsigned reg)
+u32 pci_moving_config32(struct device * dev, unsigned int reg)
{
- uint32_t value, ones, zeroes;
+ u32 value, ones, zeroes;
value = pci_read_config32(dev, reg);
pci_write_config32(dev, reg, 0xffffffff);
@@ -99,7 +99,16 @@
return ones ^ zeroes;
}
-unsigned pci_find_next_capability(device_t dev, unsigned cap, unsigned last)
+/**
+ * Given a device, a capability type, and a last position, return the next
+ * matching capability. Always start at the head of the list.
+ *
+ * @param dev Pointer to the device structure.
+ * @param cap_type PCI_CAP_LIST_ID of the PCI capability we're looking for.
+ * @param last Location of the PCI capability register to start from.
+ */
+unsigned pci_find_next_capability(struct device *dev, unsigned cap,
+ unsigned last)
{
unsigned pos;
unsigned status;
@@ -109,7 +118,7 @@
if (!(status & PCI_STATUS_CAP_LIST)) {
return 0;
}
- switch(dev->hdr_type & 0x7f) {
+ switch (dev->hdr_type & 0x7f) {
case PCI_HEADER_TYPE_NORMAL:
case PCI_HEADER_TYPE_BRIDGE:
pos = PCI_CAPABILITY_LIST;
@@ -121,11 +130,12 @@
return 0;
}
pos = pci_read_config8(dev, pos);
- while(reps-- && (pos >= 0x40)) { /* loop through the linked list */
+ while (reps-- && (pos >= 0x40)) { /* Loop through the linked list. */
int this_cap;
pos &= ~3;
this_cap = pci_read_config8(dev, pos + PCI_CAP_LIST_ID);
- printk_spew("Capability: 0x%02x @ 0x%02x\n", cap, pos);
+ printk_spew("Capability: type 0x%02x @ 0x%02x\n", this_cap,
+ pos);
if (this_cap == 0xff) {
break;
}
@@ -140,64 +150,71 @@
return 0;
}
+/**
+ * Given a device, and a capability type, return the next matching
+ * capability. Always start at the head of the list.
+ *
+ * @param dev Pointer to the device structure.
+ * @param cap_type PCI_CAP_LIST_ID of the PCI capability we're looking for.
+ */
unsigned pci_find_capability(device_t dev, unsigned cap)
{
return pci_find_next_capability(dev, cap, 0);
-
}
-/** Given a device and register, read the size of the BAR for that register.
- * @param dev Pointer to the device structure
- * @param resource Pointer to the resource structure
- * @param index Address of the pci configuration register
+/**
+ * Given a device and register, read the size of the BAR for that register.
+ *
+ * @param dev Pointer to the device structure.
+ * @param index Address of the PCI configuration register.
*/
struct resource *pci_get_resource(struct device *dev, unsigned long index)
{
struct resource *resource;
unsigned long value, attr;
- resource_t moving, limit;
+ resource_t moving, limit;
- /* Initialize the resources to nothing */
+ /* Initialize the resources to nothing. */
resource = new_resource(dev, index);
- /* Get the initial value */
+ /* Get the initial value. */
value = pci_read_config32(dev, index);
- /* See which bits move */
+ /* See which bits move. */
moving = pci_moving_config32(dev, index);
- /* Initialize attr to the bits that do not move */
+ /* Initialize attr to the bits that do not move. */
attr = value & ~moving;
- /* If it is a 64bit resource look at the high half as well */
+ /* If it is a 64bit resource look at the high half as well. */
if (((attr & PCI_BASE_ADDRESS_SPACE_IO) == 0) &&
- ((attr & PCI_BASE_ADDRESS_MEM_LIMIT_MASK) == PCI_BASE_ADDRESS_MEM_LIMIT_64))
- {
- /* Find the high bits that move */
- moving |= ((resource_t)pci_moving_config32(dev, index + 4)) << 32;
+ ((attr & PCI_BASE_ADDRESS_MEM_LIMIT_MASK) ==
+ PCI_BASE_ADDRESS_MEM_LIMIT_64)) {
+ /* Find the high bits that move. */
+ moving |=
+ ((resource_t) pci_moving_config32(dev, index + 4)) << 32;
}
/* Find the resource constraints.
- *
* Start by finding the bits that move. From there:
* - Size is the least significant bit of the bits that move.
* - Limit is all of the bits that move plus all of the lower bits.
- * See PCI Spec 6.2.5.1 ...
+ * See PCI Spec 6.2.5.1.
*/
limit = 0;
if (moving) {
resource->size = 1;
resource->align = resource->gran = 0;
- while(!(moving & resource->size)) {
+ while (!(moving & resource->size)) {
resource->size <<= 1;
resource->align += 1;
- resource->gran += 1;
+ resource->gran += 1;
}
resource->limit = limit = moving | (resource->size - 1);
}
- /*
- * some broken hardware has read-only registers that do not
+
+ /* Some broken hardware has read-only registers that do not
* really size correctly.
- * Example: the acer m7229 has BARs 1-4 normally read-only.
+ * Example: the Acer M7229 has BARs 1-4 normally read-only.
* so BAR1 at offset 0x10 reads 0x1f1. If you size that register
* by writing 0xffffffff to it, it will read back as 0x1f1 -- a
* violation of the spec.
@@ -207,21 +224,19 @@
*/
if (moving == 0) {
if (value != 0) {
- printk_debug(
- "%s register %02lx(%08lx), read-only ignoring it\n",
- dev_path(dev), index, value);
+ printk_debug
+ ("%s register %02lx(%08lx), read-only ignoring it\n",
+ dev_path(dev), index, value);
}
resource->flags = 0;
- }
- else if (attr & PCI_BASE_ADDRESS_SPACE_IO) {
- /* An I/O mapped base address */
+ } else if (attr & PCI_BASE_ADDRESS_SPACE_IO) {
+ /* An I/O mapped base address. */
attr &= PCI_BASE_ADDRESS_IO_ATTR_MASK;
resource->flags |= IORESOURCE_IO;
- /* I don't want to deal with 32bit I/O resources */
+ /* I don't want to deal with 32bit I/O resources. */
resource->limit = 0xffff;
- }
- else {
- /* A Memory mapped base address */
+ } else {
+ /* A Memory mapped base address. */
attr &= PCI_BASE_ADDRESS_MEM_ATTR_MASK;
resource->flags |= IORESOURCE_MEM;
if (attr & PCI_BASE_ADDRESS_MEM_PREFETCH) {
@@ -229,73 +244,65 @@
}
attr &= PCI_BASE_ADDRESS_MEM_LIMIT_MASK;
if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_32) {
- /* 32bit limit */
+ /* 32bit limit. */
resource->limit = 0xffffffffUL;
- }
- else if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_1M) {
- /* 1MB limit */
+ } else if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_1M) {
+ /* 1MB limit. */
resource->limit = 0x000fffffUL;
- }
- else if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_64) {
- /* 64bit limit */
+ } else if (attr == PCI_BASE_ADDRESS_MEM_LIMIT_64) {
+ /* 64bit limit. */
resource->limit = 0xffffffffffffffffULL;
resource->flags |= IORESOURCE_PCI64;
- }
- else {
- /* Invalid value */
+ } else {
+ /* Invalid value. */
+ printk_err("Broken BAR with value %lx\n", attr);
+ printk_err(" on dev %s at index %02lx\n",
+ dev_path(dev), index);
resource->flags = 0;
}
}
- /* Don't let the limit exceed which bits can move */
+ /* Don't let the limit exceed which bits can move. */
if (resource->limit > limit) {
resource->limit = limit;
}
-#if 0
- if (resource->flags) {
- printk_debug("%s %02x ->",
- dev_path(dev), resource->index);
- printk_debug(" value: 0x%08Lx zeroes: 0x%08Lx ones: 0x%08Lx attr: %08lx\n",
- value, zeroes, ones, attr);
- printk_debug(
- "%s %02x -> size: 0x%08Lx max: 0x%08Lx %s\n ",
- dev_path(dev),
- resource->index,
- resource->size, resource->limit,
- resource_type(resource));
- }
-#endif
return resource;
}
+/**
+ * Given a device and an index, read the size of the BAR for that register.
+ *
+ * @param dev Pointer to the device structure.
+ * @param index Address of the PCI configuration register.
+ */
static void pci_get_rom_resource(struct device *dev, unsigned long index)
{
struct resource *resource;
unsigned long value;
- resource_t moving;
+ resource_t moving;
- if ((dev->on_mainboard) && (dev->rom_address == 0)) {
- //skip it if rom_address is not set in MB Config.lb
- return;
- }
+ if ((dev->on_mainboard) && (dev->rom_address == 0)) {
+ /* Skip it if rom_address is not set in the MB Config.lb. */
+ return;
+ }
- /* Initialize the resources to nothing */
+ /* Initialize the resources to nothing. */
resource = new_resource(dev, index);
- /* Get the initial value */
+ /* Get the initial value. */
value = pci_read_config32(dev, index);
- /* See which bits move */
+ /* See which bits move. */
moving = pci_moving_config32(dev, index);
- /* clear the Enable bit */
+
+ /* Clear the Enable bit. */
moving = moving & ~PCI_ROM_ADDRESS_ENABLE;
/* Find the resource constraints.
- *
* Start by finding the bits that move. From there:
* - Size is the least significant bit of the bits that move.
* - Limit is all of the bits that move plus all of the lower bits.
- * See PCI Spec 6.2.5.1 ...
+ * See PCI Spec 6.2.5.1.
*/
if (moving) {
resource->size = 1;
@@ -303,59 +310,57 @@
while (!(moving & resource->size)) {
resource->size <<= 1;
resource->align += 1;
- resource->gran += 1;
+ resource->gran += 1;
}
resource->limit = moving | (resource->size - 1);
- }
-
- if (moving == 0) {
+ resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY;
+ } else {
if (value != 0) {
- printk_debug("%s register %02lx(%08lx), read-only ignoring it\n",
- dev_path(dev), index, value);
+ printk_debug
+ ("%s register %02lx(%08lx), read-only ignoring it\n",
+ dev_path(dev), index, value);
}
resource->flags = 0;
- } else {
- resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY;
}
- /* for on board device with embedded ROM image, the ROM image is at
+ /* For on board device with embedded ROM image, the ROM image is at
* fixed address specified in the Config.lb, the dev->rom_address is
* inited by driver_pci_onboard_ops::enable_dev() */
if ((dev->on_mainboard) && (dev->rom_address != 0)) {
- resource->base = dev->rom_address;
+ resource->base = dev->rom_address;
resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY |
- IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+ IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
}
compact_resources(dev);
}
-/** Read the base address registers for a given device.
- * @param dev Pointer to the dev structure
- * @param howmany How many registers to read (6 for device, 2 for bridge)
+/**
+ * Read the base address registers for a given device.
+ *
+ * @param dev Pointer to the dev structure.
+ * @param howmany How many registers to read (6 for device, 2 for bridge).
*/
static void pci_read_bases(struct device *dev, unsigned int howmany)
{
unsigned long index;
- for(index = PCI_BASE_ADDRESS_0; (index < PCI_BASE_ADDRESS_0 + (howmany << 2)); ) {
+ for (index = PCI_BASE_ADDRESS_0;
+ (index < PCI_BASE_ADDRESS_0 + (howmany << 2));) {
struct resource *resource;
resource = pci_get_resource(dev, index);
- index += (resource->flags & IORESOURCE_PCI64)?8:4;
+ index += (resource->flags & IORESOURCE_PCI64) ? 8 : 4;
}
compact_resources(dev);
}
-static void pci_set_resource(struct device *dev, struct resource *resource);
-
-static void pci_record_bridge_resource(
- struct device *dev, resource_t moving,
- unsigned index, unsigned long mask, unsigned long type)
+static void pci_record_bridge_resource(struct device *dev, resource_t moving,
+ unsigned index, unsigned long type)
{
- /* Initiliaze the constraints on the current bus */
+ /* Initialize the constraints on the current bus. */
struct resource *resource;
- resource = 0;
+ resource = NULL;
if (moving) {
unsigned long gran;
resource_t step;
@@ -363,29 +368,15 @@
resource->size = 0;
gran = 0;
step = 1;
- while((moving & step) == 0) {
+ while ((moving & step) == 0) {
gran += 1;
step <<= 1;
}
resource->gran = gran;
resource->align = gran;
resource->limit = moving | (step - 1);
- resource->flags = type | IORESOURCE_PCI_BRIDGE;
- compute_allocate_resource(&dev->link[0], resource, mask, type);
- /* If there is nothing behind the resource,
- * clear it and forget it.
- */
- if (resource->size == 0) {
-#if CONFIG_PCI_64BIT_PREF_MEM == 1
- resource->base = moving;
-#else
- resource->base = moving & 0xffffffff;
-#endif
- resource->flags |= IORESOURCE_ASSIGNED;
- resource->flags &= ~IORESOURCE_STORED;
- pci_set_resource(dev, resource);
- resource->flags = 0;
- }
+ resource->flags = type | IORESOURCE_PCI_BRIDGE |
+ IORESOURCE_BRIDGE;
}
return;
}
@@ -394,47 +385,48 @@
{
resource_t moving_base, moving_limit, moving;
- /* See if the bridge I/O resources are implemented */
- moving_base = ((uint32_t)pci_moving_config8(dev, PCI_IO_BASE)) << 8;
- moving_base |= ((uint32_t)pci_moving_config16(dev, PCI_IO_BASE_UPPER16)) << 16;
+ /* See if the bridge I/O resources are implemented. */
+ moving_base = ((u32) pci_moving_config8(dev, PCI_IO_BASE)) << 8;
+ moving_base |=
+ ((u32) pci_moving_config16(dev, PCI_IO_BASE_UPPER16)) << 16;
- moving_limit = ((uint32_t)pci_moving_config8(dev, PCI_IO_LIMIT)) << 8;
- moving_limit |= ((uint32_t)pci_moving_config16(dev, PCI_IO_LIMIT_UPPER16)) << 16;
+ moving_limit = ((u32) pci_moving_config8(dev, PCI_IO_LIMIT)) << 8;
+ moving_limit |=
+ ((u32) pci_moving_config16(dev, PCI_IO_LIMIT_UPPER16)) << 16;
moving = moving_base & moving_limit;
- /* Initialize the io space constraints on the current bus */
- pci_record_bridge_resource(
- dev, moving, PCI_IO_BASE,
- IORESOURCE_IO, IORESOURCE_IO);
+ /* Initialize the I/O space constraints on the current bus. */
+ pci_record_bridge_resource(dev, moving, PCI_IO_BASE, IORESOURCE_IO);
+ /* See if the bridge prefmem resources are implemented. */
+ moving_base =
+ ((resource_t) pci_moving_config16(dev, PCI_PREF_MEMORY_BASE)) << 16;
+ moving_base |=
+ ((resource_t) pci_moving_config32(dev, PCI_PREF_BASE_UPPER32)) <<
+ 32;
- /* See if the bridge prefmem resources are implemented */
- moving_base = ((resource_t)pci_moving_config16(dev, PCI_PREF_MEMORY_BASE)) << 16;
- moving_base |= ((resource_t)pci_moving_config32(dev, PCI_PREF_BASE_UPPER32)) << 32;
-
- moving_limit = ((resource_t)pci_moving_config16(dev, PCI_PREF_MEMORY_LIMIT)) << 16;
- moving_limit |= ((resource_t)pci_moving_config32(dev, PCI_PREF_LIMIT_UPPER32)) << 32;
+ moving_limit =
+ ((resource_t) pci_moving_config16(dev, PCI_PREF_MEMORY_LIMIT)) <<
+ 16;
+ moving_limit |=
+ ((resource_t) pci_moving_config32(dev, PCI_PREF_LIMIT_UPPER32)) <<
+ 32;
moving = moving_base & moving_limit;
- /* Initiliaze the prefetchable memory constraints on the current bus */
- pci_record_bridge_resource(
- dev, moving, PCI_PREF_MEMORY_BASE,
- IORESOURCE_MEM | IORESOURCE_PREFETCH,
- IORESOURCE_MEM | IORESOURCE_PREFETCH);
+ /* Initialize the prefetchable memory constraints on the current bus. */
+ pci_record_bridge_resource(dev, moving, PCI_PREF_MEMORY_BASE,
+ IORESOURCE_MEM | IORESOURCE_PREFETCH);
-
- /* See if the bridge mem resources are implemented */
- moving_base = ((uint32_t)pci_moving_config16(dev, PCI_MEMORY_BASE)) << 16;
- moving_limit = ((uint32_t)pci_moving_config16(dev, PCI_MEMORY_LIMIT)) << 16;
+ /* See if the bridge mem resources are implemented. */
+ moving_base = ((u32) pci_moving_config16(dev, PCI_MEMORY_BASE)) << 16;
+ moving_limit = ((u32) pci_moving_config16(dev, PCI_MEMORY_LIMIT)) << 16;
moving = moving_base & moving_limit;
- /* Initialize the memory resources on the current bus */
- pci_record_bridge_resource(
- dev, moving, PCI_MEMORY_BASE,
- IORESOURCE_MEM | IORESOURCE_PREFETCH,
- IORESOURCE_MEM);
+ /* Initialize the memory resources on the current bus. */
+ pci_record_bridge_resource(dev, moving, PCI_MEMORY_BASE,
+ IORESOURCE_MEM);
compact_resources(dev);
}
@@ -452,34 +444,50 @@
pci_get_rom_resource(dev, PCI_ROM_ADDRESS1);
}
+void pci_domain_read_resources(struct device *dev)
+{
+ struct resource *res;
+
+ /* Initialize the system-wide I/O space constraints. */
+ res = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
+ res->limit = 0xffffUL;
+ res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
+ IORESOURCE_ASSIGNED;
+
+ /* Initialize the system-wide memory resources constraints. */
+ res = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
+ res->limit = 0xffffffffULL;
+ res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
+ IORESOURCE_ASSIGNED;
+}
+
static void pci_set_resource(struct device *dev, struct resource *resource)
{
resource_t base, end;
- /* Make certain the resource has actually been set */
+ /* Make certain the resource has actually been assigned a value. */
if (!(resource->flags & IORESOURCE_ASSIGNED)) {
- printk_err("ERROR: %s %02lx %s size: 0x%010Lx not assigned\n",
- dev_path(dev), resource->index,
- resource_type(resource),
- resource->size);
+ printk_err("ERROR: %s %02lx %s size: 0x%010llx not assigned\n",
+ dev_path(dev), resource->index,
+ resource_type(resource), resource->size);
return;
}
- /* If I have already stored this resource don't worry about it */
+ /* If I have already stored this resource don't worry about it. */
if (resource->flags & IORESOURCE_STORED) {
return;
}
- /* If the resources is substractive don't worry about it */
+ /* If the resource is subtractive don't worry about it. */
if (resource->flags & IORESOURCE_SUBTRACTIVE) {
return;
}
- /* Only handle PCI memory and IO resources for now */
- if (!(resource->flags & (IORESOURCE_MEM |IORESOURCE_IO)))
+ /* Only handle PCI memory and I/O resources for now. */
+ if (!(resource->flags & (IORESOURCE_MEM | IORESOURCE_IO)))
return;
- /* Enable the resources in the command register */
+ /* Enable the resources in the command register. */
if (resource->size) {
if (resource->flags & IORESOURCE_MEM) {
dev->command |= PCI_COMMAND_MEMORY;
@@ -491,19 +499,29 @@
dev->command |= PCI_COMMAND_MASTER;
}
}
- /* Get the base address */
+ /* Get the base address. */
base = resource->base;
- /* Get the end */
+ /* Get the end. */
end = resource_end(resource);
- /* Now store the resource */
+ /* Now store the resource. */
resource->flags |= IORESOURCE_STORED;
+
+ /* PCI Bridges have no enable bit. They are disabled if the base of
+ * the range is greater than the limit. If the size is zero, disable
+ * by setting the base = limit and end = limit - 2^gran.
+ */
+ if (resource->size == 0 && (resource->flags & IORESOURCE_PCI_BRIDGE)) {
+ base = resource->limit;
+ end = resource->limit - (1 << resource->gran);
+ resource->base = base;
+ }
+
if (!(resource->flags & IORESOURCE_PCI_BRIDGE)) {
unsigned long base_lo, base_hi;
- /*
- * some chipsets allow us to set/clear the IO bit.
- * (e.g. VIA 82c686a.) So set it to be safe)
+ /* Some chipsets allow us to set/clear the I/O bit
+ * (e.g. VIA 82c686a). So set it to be safe.
*/
base_lo = base & 0xffffffff;
base_hi = (base >> 32) & 0xffffffff;
@@ -514,39 +532,27 @@
if (resource->flags & IORESOURCE_PCI64) {
pci_write_config32(dev, resource->index + 4, base_hi);
}
- }
- else if (resource->index == PCI_IO_BASE) {
- /* set the IO ranges */
- compute_allocate_resource(&dev->link[0], resource,
- IORESOURCE_IO, IORESOURCE_IO);
- pci_write_config8(dev, PCI_IO_BASE, base >> 8);
+ } else if (resource->index == PCI_IO_BASE) {
+ /* Set the I/O ranges. */
+ pci_write_config8(dev, PCI_IO_BASE, base >> 8);
pci_write_config16(dev, PCI_IO_BASE_UPPER16, base >> 16);
- pci_write_config8(dev, PCI_IO_LIMIT, end >> 8);
+ pci_write_config8(dev, PCI_IO_LIMIT, end >> 8);
pci_write_config16(dev, PCI_IO_LIMIT_UPPER16, end >> 16);
- }
- else if (resource->index == PCI_MEMORY_BASE) {
- /* set the memory range */
- compute_allocate_resource(&dev->link[0], resource,
- IORESOURCE_MEM | IORESOURCE_PREFETCH,
- IORESOURCE_MEM);
+ } else if (resource->index == PCI_MEMORY_BASE) {
+ /* Set the memory range. */
pci_write_config16(dev, PCI_MEMORY_BASE, base >> 16);
pci_write_config16(dev, PCI_MEMORY_LIMIT, end >> 16);
- }
- else if (resource->index == PCI_PREF_MEMORY_BASE) {
- /* set the prefetchable memory range */
- compute_allocate_resource(&dev->link[0], resource,
- IORESOURCE_MEM | IORESOURCE_PREFETCH,
- IORESOURCE_MEM | IORESOURCE_PREFETCH);
+ } else if (resource->index == PCI_PREF_MEMORY_BASE) {
+ /* Set the prefetchable memory range. */
pci_write_config16(dev, PCI_PREF_MEMORY_BASE, base >> 16);
pci_write_config32(dev, PCI_PREF_BASE_UPPER32, base >> 32);
pci_write_config16(dev, PCI_PREF_MEMORY_LIMIT, end >> 16);
pci_write_config32(dev, PCI_PREF_LIMIT_UPPER32, end >> 32);
- }
- else {
- /* Don't let me think I stored the resource */
+ } else {
+ /* Don't let me think I stored the resource. */
resource->flags &= ~IORESOURCE_STORED;
printk_err("ERROR: invalid resource->index %lx\n",
- resource->index);
+ resource->index);
}
report_resource_stored(dev, resource, "");
return;
@@ -556,14 +562,14 @@
{
struct resource *resource, *last;
unsigned link;
- uint8_t line;
+ u8 line;
last = &dev->resource[dev->resources];
- for(resource = &dev->resource[0]; resource < last; resource++) {
+ for (resource = &dev->resource[0]; resource < last; resource++) {
pci_set_resource(dev, resource);
}
- for(link = 0; link < dev->links; link++) {
+ for (link = 0; link < dev->links; link++) {
struct bus *bus;
bus = &dev->link[link];
if (bus->children) {
@@ -571,60 +577,64 @@
}
}
- /* set a default latency timer */
+ /* Set a default latency timer. */
pci_write_config8(dev, PCI_LATENCY_TIMER, 0x40);
- /* set a default secondary latency timer */
+ /* Set a default secondary latency timer. */
if ((dev->hdr_type & 0x7f) == PCI_HEADER_TYPE_BRIDGE) {
pci_write_config8(dev, PCI_SEC_LATENCY_TIMER, 0x40);
}
- /* zero the irq settings */
+ /* Zero the IRQ settings. */
line = pci_read_config8(dev, PCI_INTERRUPT_PIN);
if (line) {
pci_write_config8(dev, PCI_INTERRUPT_LINE, 0);
}
- /* set the cache line size, so far 64 bytes is good for everyone */
+ /* Set the cache line size, so far 64 bytes is good for everyone. */
pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 64 >> 2);
}
void pci_dev_enable_resources(struct device *dev)
{
const struct pci_operations *ops;
- uint16_t command;
+ u16 command;
- /* Set the subsystem vendor and device id for mainboard devices */
+ /* Set the subsystem vendor and device id for mainboard devices. */
ops = ops_pci(dev);
if (dev->on_mainboard && ops && ops->set_subsystem) {
printk_debug("%s subsystem <- %02x/%02x\n",
- dev_path(dev),
- CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
- CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
+ dev_path(dev),
+ CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
+ CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
ops->set_subsystem(dev,
- CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
- CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
+ CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
+ CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
}
command = pci_read_config16(dev, PCI_COMMAND);
command |= dev->command;
+ /* v3 has
+ * command |= (PCI_COMMAND_PARITY + PCI_COMMAND_SERR); // Error check.
+ */
printk_debug("%s cmd <- %02x\n", dev_path(dev), command);
pci_write_config16(dev, PCI_COMMAND, command);
}
void pci_bus_enable_resources(struct device *dev)
{
- uint16_t ctrl;
- /* enable IO in command register if there is VGA card
- * connected with (even it does not claim IO resource) */
+ u16 ctrl;
+
+ /* Enable I/O in command register if there is VGA card
+ * connected with (even it does not claim I/O resource).
+ */
if (dev->link[0].bridge_ctrl & PCI_BRIDGE_CTL_VGA)
dev->command |= PCI_COMMAND_IO;
ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
ctrl |= dev->link[0].bridge_ctrl;
- ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* error check */
+ ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* Error check. */
printk_debug("%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);
pci_dev_enable_resources(dev);
-
enable_childrens_resources(dev);
}
@@ -640,17 +650,17 @@
delay(1);
}
-void pci_dev_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+void pci_dev_set_subsystem(struct device *dev, unsigned vendor, unsigned device)
{
pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,
- ((device & 0xffff) << 16) | (vendor & 0xffff));
+ ((device & 0xffff) << 16) | (vendor & 0xffff));
}
/** default handler: only runs the relevant pci bios. */
void pci_dev_init(struct device *dev)
{
#if CONFIG_PCI_ROM_RUN == 1 || CONFIG_VGA_ROM_RUN == 1
- void run_bios(struct device * dev, unsigned long addr);
+ void run_bios(struct device *dev, unsigned long addr);
struct rom_header *rom, *ram;
#if CONFIG_PCI_ROM_RUN != 1
@@ -658,7 +668,7 @@
* is set but CONFIG_PCI_ROM_RUN is not. In this case we skip
* all other option ROM types.
*/
- if ((dev->class>>8)!=PCI_CLASS_DISPLAY_VGA)
+ if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
return;
#endif
@@ -685,13 +695,13 @@
};
struct device_operations default_pci_ops_dev = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
+ .read_resources = pci_dev_read_resources,
+ .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
- .init = pci_dev_init,
- .scan_bus = 0,
- .enable = 0,
- .ops_pci = &pci_dev_ops_pci,
+ .init = pci_dev_init,
+ .scan_bus = 0,
+ .enable = 0,
+ .ops_pci = &pci_dev_ops_pci,
};
/** Default device operations for PCI bridges */
@@ -700,32 +710,29 @@
};
struct device_operations default_pci_ops_bus = {
- .read_resources = pci_bus_read_resources,
- .set_resources = pci_dev_set_resources,
+ .read_resources = pci_bus_read_resources,
+ .set_resources = pci_dev_set_resources,
.enable_resources = pci_bus_enable_resources,
- .init = 0,
- .scan_bus = pci_scan_bridge,
- .enable = 0,
- .reset_bus = pci_bus_reset,
- .ops_pci = &pci_bus_ops_pci,
+ .init = 0,
+ .scan_bus = pci_scan_bridge,
+ .enable = 0,
+ .reset_bus = pci_bus_reset,
+ .ops_pci = &pci_bus_ops_pci,
};
/**
* @brief Detect the type of downstream bridge
*
- * This function is a heuristic to detect which type
- * of bus is downstream of a pci to pci bridge. This
- * functions by looking for various capability blocks
- * to figure out the type of downstream bridge. PCI-X
- * PCI-E, and Hypertransport all seem to have appropriate
- * capabilities.
+ * This function is a heuristic to detect which type of bus is downstream
+ * of a PCI-to-PCI bridge. This functions by looking for various capability
+ * blocks to figure out the type of downstream bridge. PCI-X, PCI-E, and
+ * Hypertransport all seem to have appropriate capabilities.
*
* When only a PCI-Express capability is found the type
* is examined to see which type of bridge we have.
*
- * @param dev
- *
- * @return appropriate bridge operations
+ * @param dev Pointer to the device structure of the bridge.
+ * @return Appropriate bridge operations.
*/
static struct device_operations *get_pci_bridge_ops(device_t dev)
{
@@ -743,13 +750,13 @@
#endif
#if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT == 1
pos = 0;
- while((pos = pci_find_next_capability(dev, PCI_CAP_ID_HT, pos))) {
+ while ((pos = pci_find_next_capability(dev, PCI_CAP_ID_HT, pos))) {
unsigned flags;
flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
if ((flags >> 13) == 1) {
/* Host or Secondary Interface */
printk_debug("%s subbordinate bus Hypertransport\n",
- dev_path(dev));
+ dev_path(dev));
return &default_ht_ops_bus;
}
}
@@ -759,16 +766,15 @@
if (pos) {
unsigned flags;
flags = pci_read_config16(dev, pos + PCI_EXP_FLAGS);
- switch((flags & PCI_EXP_FLAGS_TYPE) >> 4) {
+ switch ((flags & PCI_EXP_FLAGS_TYPE) >> 4) {
case PCI_EXP_TYPE_ROOT_PORT:
case PCI_EXP_TYPE_UPSTREAM:
case PCI_EXP_TYPE_DOWNSTREAM:
printk_debug("%s subbordinate bus PCI Express\n",
- dev_path(dev));
+ dev_path(dev));
return &default_pciexp_ops_bus;
case PCI_EXP_TYPE_PCI_BRIDGE:
- printk_debug("%s subbordinate PCI\n",
- dev_path(dev));
+ printk_debug("%s subbordinate PCI\n", dev_path(dev));
return &default_pci_ops_bus;
default:
break;
@@ -779,11 +785,10 @@
}
/**
- * @brief Set up PCI device operation
+ * Set up PCI device operation. Check if it already has a driver. If not, use
+ * find_device_operations, or set to a default based on type.
*
- *
- * @param dev
- *
+ * @param dev Pointer to the device whose pci_ops you want to set.
* @see pci_drivers
*/
static void set_pci_ops(struct device *dev)
@@ -794,23 +799,22 @@
}
/* Look through the list of setup drivers and find one for
- * this pci device
+ * this PCI device.
*/
- for(driver = &pci_drivers[0]; driver != &epci_drivers[0]; driver++) {
+ for (driver = &pci_drivers[0]; driver != &epci_drivers[0]; driver++) {
if ((driver->vendor == dev->vendor) &&
- (driver->device == dev->device))
- {
+ (driver->device == dev->device)) {
dev->ops = driver->ops;
printk_spew("%s [%04x/%04x] %sops\n",
- dev_path(dev),
- driver->vendor, driver->device,
- (driver->ops->scan_bus?"bus ":""));
+ dev_path(dev),
+ driver->vendor, driver->device,
+ (driver->ops->scan_bus ? "bus " : ""));
return;
}
}
/* If I don't have a specific driver use the default operations */
- switch(dev->hdr_type & 0x7f) { /* header type */
+ switch (dev->hdr_type & 0x7f) { /* header type */
case PCI_HEADER_TYPE_NORMAL: /* standard header */
if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)
goto bad;
@@ -827,20 +831,18 @@
break;
#endif
default:
- bad:
+ bad:
if (dev->enabled) {
printk_err("%s [%04x/%04x/%06x] has unknown header "
- "type %02x, ignoring.\n",
- dev_path(dev),
- dev->vendor, dev->device,
- dev->class >> 8, dev->hdr_type);
+ "type %02x, ignoring.\n",
+ dev_path(dev),
+ dev->vendor, dev->device,
+ dev->class >> 8, dev->hdr_type);
}
}
return;
}
-
-
/**
* @brief See if we have already allocated a device structure for a given devfn.
*
@@ -848,42 +850,43 @@
* device structure correspond to the devfn, if present. This function also
* removes the device structure from the linked list.
*
- * @param list the device structure list
- * @param devfn a device/function number
+ * @param list The device structure list.
+ * @param devfn A device/function number.
*
- * @return pointer to the device structure found or null of we have not
+ * @return Pointer to the device structure found or NULL if we have not
* allocated a device for this devfn yet.
*/
static struct device *pci_scan_get_dev(struct device **list, unsigned int devfn)
{
struct device *dev;
dev = 0;
- for(; *list; list = &(*list)->sibling) {
+ for (; *list; list = &(*list)->sibling) {
if ((*list)->path.type != DEVICE_PATH_PCI) {
printk_err("child %s not a pci device\n",
- dev_path(*list));
+ dev_path(*list));
continue;
}
if ((*list)->path.pci.devfn == devfn) {
- /* Unlink from the list */
+ /* Unlink from the list. */
dev = *list;
*list = (*list)->sibling;
- dev->sibling = 0;
+ dev->sibling = NULL;
break;
}
}
- /* Just like alloc_dev add the device to the list of device on the bus.
- * When the list of devices was formed we removed all of the parents
- * children, and now we are interleaving static and dynamic devices in
- * order on the bus.
+
+ /* Just like alloc_dev() add the device to the list of devices on the
+ * bus. When the list of devices was formed we removed all of the
+ * parents children, and now we are interleaving static and dynamic
+ * devices in order on the bus.
*/
if (dev) {
- device_t child;
- /* Find the last child of our parent */
- for(child = dev->bus->children; child && child->sibling; ) {
+ struct device *child;
+ /* Find the last child of our parent. */
+ for (child = dev->bus->children; child && child->sibling;) {
child = child->sibling;
}
- /* Place the device on the list of children of it's parent. */
+ /* Place the device on the list of children of its parent. */
if (child) {
child->sibling = dev;
} else {
@@ -897,7 +900,8 @@
/**
* @brief Scan a PCI bus.
*
- * Determine the existence of a given PCI device.
+ * Determine the existence of a given PCI device. Allocate a new struct device
+ * if dev==NULL was passed in and the device exists in hardware.
*
* @param bus pointer to the bus structure
* @param devfn to look at
@@ -905,107 +909,94 @@
* @return The device structure for hte device (if found)
* or the NULL if no device is found.
*/
-device_t pci_probe_dev(device_t dev, struct bus *bus, unsigned devfn)
+device_t pci_probe_dev(device_t dev, struct bus * bus, unsigned devfn)
{
- uint32_t id, class;
- uint8_t hdr_type;
+ u32 id, class;
+ u8 hdr_type;
- /* Detect if a device is present */
+ /* Detect if a device is present. */
if (!dev) {
struct device dummy;
- dummy.bus = bus;
- dummy.path.type = DEVICE_PATH_PCI;
+ dummy.bus = bus;
+ dummy.path.type = DEVICE_PATH_PCI;
dummy.path.pci.devfn = devfn;
id = pci_read_config32(&dummy, PCI_VENDOR_ID);
- /* Have we found somthing?
+ /* Have we found something?
* Some broken boards return 0 if a slot is empty.
*/
- if ( (id == 0xffffffff) || (id == 0x00000000) ||
- (id == 0x0000ffff) || (id == 0xffff0000))
- {
+ if ((id == 0xffffffff) || (id == 0x00000000) ||
+ (id == 0x0000ffff) || (id == 0xffff0000)) {
printk_spew("%s, bad id 0x%x\n", dev_path(&dummy), id);
return NULL;
}
dev = alloc_dev(bus, &dummy.path);
- }
- else {
- /* Enable/disable the device. Once we have
- * found the device specific operations this
- * operations we will disable the device with
- * those as well.
+ } else {
+ /* Enable/disable the device. Once we have found the device-
+ * specific operations this operations we will disable the
+ * device with those as well.
*
* This is geared toward devices that have subfunctions
* that do not show up by default.
*
* If a device is a stuff option on the motherboard
- * it may be absent and enable_dev must cope.
- *
+ * it may be absent and enable_dev() must cope.
*/
- /* Run the magice enable sequence for the device */
+ /* Run the magic enable sequence for the device. */
if (dev->chip_ops && dev->chip_ops->enable_dev) {
dev->chip_ops->enable_dev(dev);
}
- /* Now read the vendor and device id */
+ /* Now read the vendor and device ID. */
id = pci_read_config32(dev, PCI_VENDOR_ID);
-
- /* If the device does not have a pci id disable it.
- * Possibly this is because we have already disabled
- * the device. But this also handles optional devices
- * that may not always show up.
+ /* If the device does not have a PCI ID disable it. Possibly
+ * this is because we have already disabled the device. But
+ * this also handles optional devices that may not always
+ * show up.
*/
/* If the chain is fully enumerated quit */
- if ( (id == 0xffffffff) || (id == 0x00000000) ||
- (id == 0x0000ffff) || (id == 0xffff0000))
- {
+ if ((id == 0xffffffff) || (id == 0x00000000) ||
+ (id == 0x0000ffff) || (id == 0xffff0000)) {
if (dev->enabled) {
printk_info("Disabling static device: %s\n",
- dev_path(dev));
+ dev_path(dev));
dev->enabled = 0;
}
return dev;
}
}
- /* Read the rest of the pci configuration information */
+ /* Read the rest of the PCI configuration information. */
hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
class = pci_read_config32(dev, PCI_CLASS_REVISION);
- /* Store the interesting information in the device structure */
+ /* Store the interesting information in the device structure. */
dev->vendor = id & 0xffff;
dev->device = (id >> 16) & 0xffff;
dev->hdr_type = hdr_type;
- /* class code, the upper 3 bytes of PCI_CLASS_REVISION */
+
+ /* Class code, the upper 3 bytes of PCI_CLASS_REVISION. */
dev->class = class >> 8;
-
- /* Architectural/System devices always need to
- * be bus masters.
- */
+ /* Architectural/System devices always need to be bus masters. */
if ((dev->class >> 16) == PCI_BASE_CLASS_SYSTEM) {
dev->command |= PCI_COMMAND_MASTER;
}
- /* Look at the vendor and device id, or at least the
- * header type and class and figure out which set of
- * configuration methods to use. Unless we already
- * have some pci ops.
+ /* Look at the vendor and device ID, or at least the header type and
+ * class and figure out which set of configuration methods to use.
+ * Unless we already have some PCI ops.
*/
set_pci_ops(dev);
- /* Now run the magic enable/disable sequence for the device */
+ /* Now run the magic enable/disable sequence for the device. */
if (dev->ops && dev->ops->enable) {
dev->ops->enable(dev);
}
-
- /* Display the device and error if we don't have some pci operations
- * for it.
- */
+ /* Display the device. */
printk_debug("%s [%04x/%04x] %s%s\n",
- dev_path(dev),
- dev->vendor, dev->device,
- dev->enabled?"enabled": "disabled",
- dev->ops?"" : " No operations"
- );
+ dev_path(dev),
+ dev->vendor, dev->device,
+ dev->enabled ? "enabled" : "disabled",
+ dev->ops ? "" : " No operations");
return dev;
}
@@ -1027,73 +1018,69 @@
* @return The maximum bus number found, after scanning all subordinate busses
*/
unsigned int pci_scan_bus(struct bus *bus,
- unsigned min_devfn, unsigned max_devfn,
- unsigned int max)
+ unsigned min_devfn, unsigned max_devfn,
+ unsigned int max)
{
unsigned int devfn;
- device_t old_devices;
- device_t child;
+ struct device *old_devices;
+ struct device *child;
#if CONFIG_PCI_BUS_SEGN_BITS
- printk_debug("PCI: pci_scan_bus for bus %04x:%02x\n", bus->secondary >> 8, bus->secondary & 0xff);
+ printk_debug("PCI: pci_scan_bus for bus %04x:%02x\n",
+ bus->secondary >> 8, bus->secondary & 0xff);
#else
printk_debug("PCI: pci_scan_bus for bus %02x\n", bus->secondary);
#endif
old_devices = bus->children;
- bus->children = 0;
+ bus->children = NULL;
post_code(0x24);
- /* probe all devices/functions on this bus with some optimization for
- * non-existence and single funcion devices
+ /* Probe all devices/functions on this bus with some optimization for
+ * non-existence and single function devices.
*/
for (devfn = min_devfn; devfn <= max_devfn; devfn++) {
- device_t dev;
+ struct device *dev;
/* First thing setup the device structure */
dev = pci_scan_get_dev(&old_devices, devfn);
- /* See if a device is present and setup the device
- * structure.
- */
+ /* See if a device is present and setup the device structure. */
dev = pci_probe_dev(dev, bus, devfn);
- /* if this is not a multi function device,
- * or the device is not present don't waste
- * time probing another function.
+ /* If this is not a multi function device, or the device is
+ * not present don't waste time probing another function.
* Skip to next device.
*/
if ((PCI_FUNC(devfn) == 0x00) &&
- (!dev || (dev->enabled && ((dev->hdr_type & 0x80) != 0x80))))
- {
+ (!dev
+ || (dev->enabled && ((dev->hdr_type & 0x80) != 0x80)))) {
devfn += 0x07;
}
}
post_code(0x25);
- /* Die if any left over static devices are are found.
+ /* Warn if any leftover static devices are are found.
* There's probably a problem in the Config.lb.
- */
- if(old_devices) {
+ */
+ if (old_devices) {
device_t left;
- for(left = old_devices; left; left = left->sibling) {
- printk_err("%s\n", dev_path(left));
+ printk_warning("PCI: Left over static devices:\n");
+ for (left = old_devices; left; left = left->sibling) {
+ printk_warning("%s\n", dev_path(left));
}
- printk_warning("PCI: Left over static devices. Check your mainboard Config.lb\n");
+ printk_warning("PCI: Check your mainboard Config.lb.\n");
}
- /* For all children that implement scan_bus (i.e. bridges)
+ /* For all children that implement scan_bus() (i.e. bridges)
* scan the bus behind that child.
*/
- for(child = bus->children; child; child = child->sibling) {
+ for (child = bus->children; child; child = child->sibling) {
max = scan_bus(child, max);
}
- /*
- * We've scanned the bus and so we know all about what's on
- * the other side of any bridges that may be on this bus plus
- * any devices.
- *
+ /* We've scanned the bus and so we know all about what's on the other
+ * side of any bridges that may be on this bus plus any devices.
* Return how far we've got finding sub-buses.
*/
printk_debug("PCI: pci_scan_bus returning with max=%03x\n", max);
@@ -1101,7 +1088,6 @@
return max;
}
-
/**
* @brief Scan a PCI bridge and the buses behind the bridge.
*
@@ -1110,18 +1096,19 @@
*
* This function is the default scan_bus() method for PCI bridge devices.
*
- * @param dev pointer to the bridge device
- * @param max the highest bus number assgined up to now
- *
- * @return The maximum bus number found, after scanning all subordinate busses
+ * @param dev Pointer to the bridge device.
+ * @param max The highest bus number assigned up to now.
+ * @return The maximum bus number found, after scanning all subordinate buses.
*/
unsigned int do_pci_scan_bridge(struct device *dev, unsigned int max,
- unsigned int (*do_scan_bus)(struct bus *bus,
- unsigned min_devfn, unsigned max_devfn, unsigned int max))
+ unsigned int (*do_scan_bus) (struct bus * bus,
+ unsigned min_devfn,
+ unsigned max_devfn,
+ unsigned int max))
{
struct bus *bus;
- uint32_t buses;
- uint16_t cr;
+ u32 buses;
+ u16 cr;
printk_spew("%s for %s\n", __func__, dev_path(dev));
@@ -1141,8 +1128,7 @@
pci_write_config16(dev, PCI_COMMAND, 0x0000);
pci_write_config16(dev, PCI_STATUS, 0xffff);
- /*
- * Read the existing primary/secondary/subordinate bus
+ /* Read the existing primary/secondary/subordinate bus
* number configuration.
*/
buses = pci_read_config32(dev, PCI_PRIMARY_BUS);
@@ -1152,9 +1138,9 @@
* correctly configured.
*/
buses &= 0xff000000;
- buses |= (((unsigned int) (dev->bus->secondary) << 0) |
- ((unsigned int) (bus->secondary) << 8) |
- ((unsigned int) (bus->subordinate) << 16));
+ buses |= (((unsigned int)(dev->bus->secondary) << 0) |
+ ((unsigned int)(bus->secondary) << 8) |
+ ((unsigned int)(bus->subordinate) << 16));
pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
/* Now we can scan all subordinate buses
@@ -1166,8 +1152,7 @@
* bus number to its real value.
*/
bus->subordinate = max;
- buses = (buses & 0xff00ffff) |
- ((unsigned int) (bus->subordinate) << 16);
+ buses = (buses & 0xff00ffff) | ((unsigned int)(bus->subordinate) << 16);
pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
pci_write_config16(dev, PCI_COMMAND, cr);
@@ -1183,90 +1168,109 @@
*
* This function is the default scan_bus() method for PCI bridge devices.
*
- * @param dev pointer to the bridge device
- * @param max the highest bus number assgined up to now
- *
- * @return The maximum bus number found, after scanning all subordinate busses
+ * @param dev Pointer to the bridge device.
+ * @param max The highest bus number assigned up to now.
+ * @return The maximum bus number found, after scanning all subordinate buses.
*/
unsigned int pci_scan_bridge(struct device *dev, unsigned int max)
{
return do_pci_scan_bridge(dev, max, pci_scan_bus);
}
-/*
- Tell the EISA int controller this int must be level triggered
- THIS IS A KLUDGE -- sorry, this needs to get cleaned up.
-*/
+/**
+ * @brief Scan a PCI domain.
+ *
+ * This function is the default scan_bus() method for PCI domains.
+ *
+ * @param dev pointer to the domain
+ * @param max the highest bus number assgined up to now
+ *
+ * @return The maximum bus number found, after scanning all subordinate busses
+ */
+unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
+{
+ max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
+ return max;
+}
+
+/**
+ * Tell the EISA int controller this int must be level triggered.
+ *
+ * THIS IS A KLUDGE -- sorry, this needs to get cleaned up.
+ */
void pci_level_irq(unsigned char intNum)
{
- unsigned short intBits = inb(0x4d0) | (((unsigned) inb(0x4d1)) << 8);
+ unsigned short intBits = inb(0x4d0) | (((unsigned)inb(0x4d1)) << 8);
printk_spew("%s: current ints are 0x%x\n", __func__, intBits);
intBits |= (1 << intNum);
printk_spew("%s: try to set ints 0x%x\n", __func__, intBits);
- // Write new values
- outb((unsigned char) intBits, 0x4d0);
- outb((unsigned char) (intBits >> 8), 0x4d1);
+ /* Write new values. */
+ outb((unsigned char)intBits, 0x4d0);
+ outb((unsigned char)(intBits >> 8), 0x4d1);
- /* this seems like an error but is not ... */
-#if 1
+ /* This seems like an error but is not. */
if (inb(0x4d0) != (intBits & 0xff)) {
- printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
- __func__, intBits &0xff, inb(0x4d0));
+ printk_err(
+ "%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
+ __func__, intBits & 0xff, inb(0x4d0));
}
if (inb(0x4d1) != ((intBits >> 8) & 0xff)) {
- printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
- __func__, (intBits>>8) &0xff, inb(0x4d1));
+ printk_err(
+ "%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
+ __func__, (intBits >> 8) & 0xff, inb(0x4d1));
}
-#endif
}
-/*
- This function assigns IRQs for all functions contained within
- the indicated device address. If the device does not exist or does
- not require interrupts then this function has no effect.
-
- This function should be called for each PCI slot in your system.
-
- pIntAtoD is an array of IRQ #s that are assigned to PINTA through PINTD of
- this slot.
- The particular irq #s that are passed in depend on the routing inside
- your southbridge and on your motherboard.
-
- -kevinh@ispiri.com
+/**
+ * This function assigns IRQs for all functions contained within the
+ * indicated device address. If the device does not exist or does not
+ * require interrupts then this function has no effect.
+ *
+ * This function should be called for each PCI slot in your system.
+ *
+ * pIntAtoD is an array of IRQ #s that are assigned to PINTA through PINTD of
+ * this slot.
+ *
+ * The particular irq #s that are passed in depend on the routing inside
+ * your southbridge and on your motherboard.
+ *
+ * -kevinh@ispiri.com
+ *
*/
void pci_assign_irqs(unsigned bus, unsigned slot,
- const unsigned char pIntAtoD[4])
+ const unsigned char pIntAtoD[4])
{
unsigned functNum;
- device_t pdev;
+ struct device *pdev;
unsigned char line;
unsigned char irq;
unsigned char readback;
- /* Each slot may contain up to eight functions */
+ /* Each slot may contain up to eight functions. */
for (functNum = 0; functNum < 8; functNum++) {
pdev = dev_find_slot(bus, (slot << 3) + functNum);
if (pdev) {
- line = pci_read_config8(pdev, PCI_INTERRUPT_PIN);
+ line = pci_read_config8(pdev, PCI_INTERRUPT_PIN);
- // PCI spec says all other values are reserved
+ /* PCI spec says all other values are reserved. */
if ((line >= 1) && (line <= 4)) {
irq = pIntAtoD[line - 1];
- printk_debug("Assigning IRQ %d to %d:%x.%d\n", \
- irq, bus, slot, functNum);
+ printk_debug("Assigning IRQ %d to %d:%x.%d\n",
+ irq, bus, slot, functNum);
- pci_write_config8(pdev, PCI_INTERRUPT_LINE,\
- pIntAtoD[line - 1]);
+ pci_write_config8(pdev, PCI_INTERRUPT_LINE,
+ pIntAtoD[line - 1]);
- readback = pci_read_config8(pdev, PCI_INTERRUPT_LINE);
+ readback =
+ pci_read_config8(pdev, PCI_INTERRUPT_LINE);
printk_debug(" Readback = %d\n", readback);
- // Change to level triggered
+ // Change to level triggered.
pci_level_irq(pIntAtoD[line - 1]);
}
}