diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/amd/picasso/agesa_acpi.c | 6 | ||||
| -rw-r--r-- | src/soc/amd/picasso/data_fabric.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/data_fabric.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index 23d10ff039..6020ec0017 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -543,10 +543,10 @@ static unsigned long gen_crat_memory_entries(struct acpi_crat_header *crat, for (size_t dram_map_idx = 0; dram_map_idx < PICASSO_NUM_DRAM_REG; dram_map_idx++) { dram_base_reg = - data_fabric_read_reg32(0, DF_DRAM_BASE(dram_map_idx), IOMS0_FABRIC_ID); + data_fabric_read32(0, DF_DRAM_BASE(dram_map_idx), IOMS0_FABRIC_ID); if (dram_base_reg & DRAM_BASE_REG_VALID) { - dram_limit_reg = data_fabric_read_reg32(0, DF_DRAM_LIMIT(dram_map_idx), + dram_limit_reg = data_fabric_read32(0, DF_DRAM_LIMIT(dram_map_idx), IOMS0_FABRIC_ID); memory_length = ((dram_limit_reg & DRAM_LIMIT_ADDR) >> DRAM_LIMIT_ADDR_SHFT) + 1 @@ -564,7 +564,7 @@ static unsigned long gen_crat_memory_entries(struct acpi_crat_header *crat, } if (dram_base_reg & DRAM_BASE_HOLE_EN) { - dram_hole_ctl = data_fabric_read_reg32(0, D18F0_DRAM_HOLE_CTL, + dram_hole_ctl = data_fabric_read32(0, D18F0_DRAM_HOLE_CTL, IOMS0_FABRIC_ID); hole_base = (dram_hole_ctl & DRAM_HOLE_CTL_BASE); size_below_hole = hole_base - memory_base; diff --git a/src/soc/amd/picasso/data_fabric.c b/src/soc/amd/picasso/data_fabric.c index 9f83a62a8c..82cece975e 100644 --- a/src/soc/amd/picasso/data_fabric.c +++ b/src/soc/amd/picasso/data_fabric.c @@ -180,7 +180,7 @@ static void data_fabric_set_indirect_address(uint8_t func, uint16_t reg, uint8_t pci_write_config32(SOC_DF_F4_DEV, DF_FICAA_BIOS, fabric_indirect_access_reg); } -uint32_t data_fabric_read_reg32(uint8_t function, uint16_t reg, uint8_t instance_id) +uint32_t data_fabric_read32(uint8_t function, uint16_t reg, uint8_t instance_id) { if (instance_id == BROADCAST_FABRIC_ID) /* No bit masking required. Macros will apply mask to values. */ diff --git a/src/soc/amd/picasso/include/soc/data_fabric.h b/src/soc/amd/picasso/include/soc/data_fabric.h index d64c67a2bd..4ee1dd9056 100644 --- a/src/soc/amd/picasso/include/soc/data_fabric.h +++ b/src/soc/amd/picasso/include/soc/data_fabric.h @@ -72,6 +72,6 @@ #define DF_IND_CFG_INST_ID_MASK (0xff << DF_IND_CFG_ACC_REG_SHIFT) void data_fabric_set_mmio_np(void); -uint32_t data_fabric_read_reg32(uint8_t function, uint16_t reg, uint8_t instance_id); +uint32_t data_fabric_read32(uint8_t function, uint16_t reg, uint8_t instance_id); #endif /* AMD_PICASSO_DATA_FABRIC_H */ |