sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/picasso: Allow modification of i2c base addresses in PSP

Browse Source 
BUG=b:158124527
TEST=Build & boot psp_verstage on trembyle

Signed-off-by: Martin Roth <martin@coreboot.org>
Change-Id: I45380e0c61e1bb7a94a96630e5867b7ffca0909c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42064
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Martin Roth 2020-06-14 17:24:12 -06:00 committed by Martin Roth
parent ab70d0ff66
commit ac41f58235
2 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/soc/amd/picasso/i2c.c
View File

@ -13,9 +13,7 @@
#include <soc/southbridge.h> #include <soc/southbridge.h>
#include "chip.h" #include "chip.h"
/* #if ENV_X86
* We don't have addresses for I2C0-1.
*/
static const uintptr_t i2c_bus_address[I2C_MASTER_DEV_COUNT + I2C_SLAVE_DEV_COUNT] = { static const uintptr_t i2c_bus_address[I2C_MASTER_DEV_COUNT + I2C_SLAVE_DEV_COUNT] = {
0, 0,
0, 0,
@ -23,6 +21,9 @@ static const uintptr_t i2c_bus_address[I2C_MASTER_DEV_COUNT + I2C_SLAVE_DEV_COUN
APU_I2C3_BASE, APU_I2C3_BASE,
APU_I2C4_BASE, /* Can only be used in slave mode */ APU_I2C4_BASE, /* Can only be used in slave mode */
}; };
#else
static uintptr_t i2c_bus_address[I2C_MASTER_DEV_COUNT + I2C_SLAVE_DEV_COUNT];
#endif
uintptr_t dw_i2c_base_address(unsigned int bus) uintptr_t dw_i2c_base_address(unsigned int bus)
{ {
@ -32,6 +33,18 @@ uintptr_t dw_i2c_base_address(unsigned int bus)
return i2c_bus_address[bus]; return i2c_bus_address[bus];
} }
#if !ENV_X86
void i2c_set_bar(unsigned int bus, uintptr_t bar)
{
if (bus >= ARRAY_SIZE(i2c_bus_address)) {
printk(BIOS_ERR, "Error: i2c index out of bounds: %u.", bus);
return;
}
i2c_bus_address[bus] = bar;
}
#endif
const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus) const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
{ {
const struct soc_amd_picasso_config *config; const struct soc_amd_picasso_config *config;
@ -47,28 +60,23 @@ const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
static const char *i2c_acpi_name(const struct device *dev) static const char *i2c_acpi_name(const struct device *dev)
{ {
switch (dev->path.mmio.addr) { if ((uintptr_t)dev->path.mmio.addr == i2c_bus_address[2])
case APU_I2C2_BASE:
return "I2C2"; return "I2C2";
case APU_I2C3_BASE: else if ((uintptr_t)dev->path.mmio.addr == i2c_bus_address[3])
return "I2C3"; return "I2C3";
case APU_I2C4_BASE: else if ((uintptr_t)dev->path.mmio.addr == i2c_bus_address[4])
return "I2C4"; return "I2C4";
default:
return NULL; return NULL;
}
} }
int dw_i2c_soc_dev_to_bus(const struct device *dev) int dw_i2c_soc_dev_to_bus(const struct device *dev)
{ {
switch (dev->path.mmio.addr) { if ((uintptr_t)dev->path.mmio.addr == i2c_bus_address[2])
case APU_I2C2_BASE:
return 2; return 2;
case APU_I2C3_BASE: else if ((uintptr_t)dev->path.mmio.addr == i2c_bus_address[3])
return 3; return 3;
case APU_I2C4_BASE: else if ((uintptr_t)dev->path.mmio.addr == i2c_bus_address[4])
return 4; return 4;
}
return -1; return -1;
} }

3
src/soc/amd/picasso/include/soc/i2c.h
View File

@ -22,4 +22,7 @@ struct soc_amd_i2c_save {
void sb_reset_i2c_slaves(void); void sb_reset_i2c_slaves(void);
/* Sets the base address for the specific I2C bus. */
void i2c_set_bar(unsigned int bus, uintptr_t bar);
#endif /* __PICASSO_I2C_H__ */ #endif /* __PICASSO_I2C_H__ */