diff options
| -rw-r--r-- | src/soc/amd/common/block/pci/amd_pci_util.c | 15 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/include/soc/nvs.h | 2 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/northbridge.c | 28 |
3 files changed, 23 insertions, 22 deletions
diff --git a/src/soc/amd/common/block/pci/amd_pci_util.c b/src/soc/amd/common/block/pci/amd_pci_util.c index 812760189a..983cead894 100644 --- a/src/soc/amd/common/block/pci/amd_pci_util.c +++ b/src/soc/amd/common/block/pci/amd_pci_util.c @@ -98,14 +98,15 @@ void write_pci_int_table(void) void write_pci_cfg_irqs(void) { struct device *dev = NULL; /* Our current device to route IRQs */ - struct device *target_dev = NULL; /* to bridge a device may be connected to */ - u16 int_pin = 0; /* Value of the INT_PIN register 0x3D */ - u16 target_pin = 0; /* Pin we will search our tables for */ - u16 int_line = 0; /* IRQ # read from PCI_INTR tbl and write to 3C */ + struct device *target_dev = NULL; /* the bridge a device may be + * connected to */ + u16 int_pin = 0; + u16 target_pin = 0; + u16 int_line = 0; u16 pci_intr_idx = 0; /* Index into PCI_INTR table, 0xC00/0xC01 */ - u8 bus = 0; /* A PCI Device Bus number */ - u16 devfn = 0; /* A PCI Device and Function number */ - u8 bridged_device = 0; /* This device is on a PCI bridge */ + u8 bus = 0; /* TODO: no longer used, remove it */ + u16 devfn = 0; + u8 bridged_device = 0; /* TODO: Remove this */ u32 i = 0; size_t limit; const struct irq_idx_name *idx_name; diff --git a/src/soc/amd/stoneyridge/include/soc/nvs.h b/src/soc/amd/stoneyridge/include/soc/nvs.h index 3e6ef3042b..08d46973c0 100644 --- a/src/soc/amd/stoneyridge/include/soc/nvs.h +++ b/src/soc/amd/stoneyridge/include/soc/nvs.h @@ -43,7 +43,7 @@ typedef struct global_nvs_t { uint32_t nhll; /* 0x21 - 0x24 - NHLT Length */ uint32_t prt0; /* 0x25 - 0x28 - PERST_0 Address */ uint8_t scdp; /* 0x29 - SD_CD GPIO portid */ - uint8_t scdo; /* 0x2A - GPIO pad offset relative to the community */ + uint8_t scdo; /* 0x2A - GPIO pad relative offset */ uint8_t tmps; /* 0x2B - Temperature Sensor ID */ uint8_t tlvl; /* 0x2C - Throttle Level Limit */ uint8_t flvl; /* 0x2D - Current FAN Level */ diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index d7a20a3288..b57113bed8 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -86,48 +86,48 @@ static void read_resources(struct device *dev) res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; } -static void set_resource(struct device *dev, struct resource *resource, u32 nodeid) +static void set_resource(struct device *dev, struct resource *res, u32 nodeid) { resource_t rbase, rend; unsigned int reg, link_num; char buf[50]; /* Make certain the resource has actually been set */ - if (!(resource->flags & IORESOURCE_ASSIGNED)) + if (!(res->flags & IORESOURCE_ASSIGNED)) return; /* If I have already stored this resource don't worry about it */ - if (resource->flags & IORESOURCE_STORED) + if (res->flags & IORESOURCE_STORED) return; /* Only handle PCI memory and IO resources */ - if (!(resource->flags & (IORESOURCE_MEM | IORESOURCE_IO))) + if (!(res->flags & (IORESOURCE_MEM | IORESOURCE_IO))) return; /* Ensure I am actually looking at a resource of function 1 */ - if ((resource->index & 0xffff) < 0x1000) + if ((res->index & 0xffff) < 0x1000) return; /* Get the base address */ - rbase = resource->base; + rbase = res->base; /* Get the limit (rounded up) */ - rend = resource_end(resource); + rend = resource_end(res); /* Get the register and link */ - reg = resource->index & 0xfff; /* 4k */ - link_num = IOINDEX_LINK(resource->index); + reg = res->index & 0xfff; /* 4k */ + link_num = IOINDEX_LINK(res->index); - if (resource->flags & IORESOURCE_IO) + if (res->flags & IORESOURCE_IO) set_io_addr_reg(dev, nodeid, link_num, reg, rbase>>8, rend>>8); - else if (resource->flags & IORESOURCE_MEM) + else if (res->flags & IORESOURCE_MEM) set_mmio_addr_reg(nodeid, link_num, reg, - (resource->index >> 24), rbase >> 8, rend >> 8); + (res->index >> 24), rbase >> 8, rend >> 8); - resource->flags |= IORESOURCE_STORED; + res->flags |= IORESOURCE_STORED; snprintf(buf, sizeof(buf), " <node %x link %x>", nodeid, link_num); - report_resource_stored(dev, resource, buf); + report_resource_stored(dev, res, buf); } /** |