diff options
| author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-10-17 04:36:47 -0500 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2015-10-24 02:01:17 +0200 |
| commit | acbdade5cd02c0abed1f1a6c65501893bc6bd679 (patch) | |
| tree | cb9e0c3df6584bcce04b48fe36070d841d7d664b /src/southbridge/amd/sb700/sm.c | |
| parent | cab71b638f6bd9d8c7e6d7955d4527c5236177cb (diff) | |
| download | coreboot-acbdade5cd02c0abed1f1a6c65501893bc6bd679.tar.xz | |
southbridge/amd/sb700: Allow use of auxiliary SMBUS controller
Change-Id: I29ece10eeefc2c75a3829c169f1e1aede7194ec2
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/12079
Reviewed-by: Peter Stuge <peter@stuge.se>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/southbridge/amd/sb700/sm.c')
| -rw-r--r-- | src/southbridge/amd/sb700/sm.c | 47 |
1 files changed, 38 insertions, 9 deletions
diff --git a/src/southbridge/amd/sb700/sm.c b/src/southbridge/amd/sb700/sm.c index f544c88c03..16958a2620 100644 --- a/src/southbridge/amd/sb700/sm.c +++ b/src/southbridge/amd/sb700/sm.c @@ -40,6 +40,11 @@ #define CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL MAINBOARD_POWER_ON #endif +#define PRIMARY_SMBUS_RESOURCE_NUMBER 0x90 +#define AUXILIARY_SMBUS_RESOURCE_NUMBER 0x58 + +uint8_t amd_sb700_aux_smbus = 0; + /* * SB700 enables all USB controllers by default in SMBUS Control. * SB700 enables SATA by default in SMBUS Control. @@ -312,7 +317,10 @@ static int lsmbus_recv_byte(device_t dev) device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); - res = find_resource(pbus->dev, 0x90); + if (!amd_sb700_aux_smbus) + res = find_resource(pbus->dev, PRIMARY_SMBUS_RESOURCE_NUMBER); + else + res = find_resource(pbus->dev, AUXILIARY_SMBUS_RESOURCE_NUMBER); return do_smbus_recv_byte(res->base, device); } @@ -326,7 +334,10 @@ static int lsmbus_send_byte(device_t dev, u8 val) device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); - res = find_resource(pbus->dev, 0x90); + if (!amd_sb700_aux_smbus) + res = find_resource(pbus->dev, PRIMARY_SMBUS_RESOURCE_NUMBER); + else + res = find_resource(pbus->dev, AUXILIARY_SMBUS_RESOURCE_NUMBER); return do_smbus_send_byte(res->base, device, val); } @@ -340,7 +351,10 @@ static int lsmbus_read_byte(device_t dev, u8 address) device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); - res = find_resource(pbus->dev, 0x90); + if (!amd_sb700_aux_smbus) + res = find_resource(pbus->dev, PRIMARY_SMBUS_RESOURCE_NUMBER); + else + res = find_resource(pbus->dev, AUXILIARY_SMBUS_RESOURCE_NUMBER); return do_smbus_read_byte(res->base, device, address); } @@ -354,7 +368,10 @@ static int lsmbus_write_byte(device_t dev, u8 address, u8 val) device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); - res = find_resource(pbus->dev, 0x90); + if (!amd_sb700_aux_smbus) + res = find_resource(pbus->dev, PRIMARY_SMBUS_RESOURCE_NUMBER); + else + res = find_resource(pbus->dev, AUXILIARY_SMBUS_RESOURCE_NUMBER); return do_smbus_write_byte(res->base, device, address, val); } @@ -393,9 +410,18 @@ static void sb700_sm_read_resources(device_t dev) /* dev->command |= PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER; */ - /* smbus */ - res = new_resource(dev, 0x90); - res->base = 0xB00; + /* primary smbus */ + res = new_resource(dev, PRIMARY_SMBUS_RESOURCE_NUMBER); + res->base = SMBUS_IO_BASE; + res->size = 0x10; + res->limit = 0xFFFFUL; /* res->base + res->size -1; */ + res->align = 8; + res->gran = 8; + res->flags = IORESOURCE_IO | IORESOURCE_FIXED | IORESOURCE_RESERVE | IORESOURCE_ASSIGNED; + + /* auxiliary smbus */ + res = new_resource(dev, AUXILIARY_SMBUS_RESOURCE_NUMBER); + res->base = SMBUS_AUX_IO_BASE; res->size = 0x10; res->limit = 0xFFFFUL; /* res->base + res->size -1; */ res->align = 8; @@ -439,8 +465,11 @@ static void sb700_sm_set_resources(struct device *dev) pci_write_config8(dev, 0x65, byte); /* TODO: End of test hpet */ - res = find_resource(dev, 0x90); - pci_write_config32(dev, 0x90, res->base | 1); + res = find_resource(dev, PRIMARY_SMBUS_RESOURCE_NUMBER); + pci_write_config32(dev, PRIMARY_SMBUS_RESOURCE_NUMBER, res->base | 1); + + res = find_resource(dev, AUXILIARY_SMBUS_RESOURCE_NUMBER); + pci_write_config32(dev, AUXILIARY_SMBUS_RESOURCE_NUMBER, res->base | 1); } static struct pci_operations lops_pci = { |