diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2021-02-13 01:05:56 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-02-14 20:52:03 +0000 |
| commit | dba3fe7ad168c5339535973f1ef7ff0f7f33bd5e (patch) | |
| tree | 9554492e9427733dbc464675b936b28d13ec7619 /src/soc/amd/picasso/data_fabric.c | |
| parent | 6962b6ecd395093e63824bb337bbb45492d2ce48 (diff) | |
| download | coreboot-dba3fe7ad168c5339535973f1ef7ff0f7f33bd5e.tar.gz coreboot-dba3fe7ad168c5339535973f1ef7ff0f7f33bd5e.tar.bz2 coreboot-dba3fe7ad168c5339535973f1ef7ff0f7f33bd5e.zip | |
soc/amd/picasso: move data_fabric_read32 to common code
The exact same mechanism is used on Cezanne.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I3179d8ec35efa29f9bc66854c3690b389d980bba
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50619
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/picasso/data_fabric.c')
| -rw-r--r-- | src/soc/amd/picasso/data_fabric.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/soc/amd/picasso/data_fabric.c b/src/soc/amd/picasso/data_fabric.c index 82cece975e66..7b4283aeab22 100644 --- a/src/soc/amd/picasso/data_fabric.c +++ b/src/soc/amd/picasso/data_fabric.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <acpi/acpi_device.h> +#include <amdblocks/data_fabric.h> #include <console/console.h> #include <cpu/x86/lapic_def.h> #include <device/device.h> @@ -167,26 +168,3 @@ static const struct pci_driver data_fabric_driver __pci_driver = { .vendor = PCI_VENDOR_ID_AMD, .devices = pci_device_ids, }; - -static void data_fabric_set_indirect_address(uint8_t func, uint16_t reg, uint8_t instance_id) -{ - uint32_t fabric_indirect_access_reg = DF_IND_CFG_INST_ACC_EN; - /* Register offset field [10:2] in this register corresponds to [10:2] of the - requested offset. */ - fabric_indirect_access_reg |= reg & DF_IND_CFG_ACC_REG_MASK; - fabric_indirect_access_reg |= - (func << DF_IND_CFG_ACC_FUN_SHIFT) & DF_IND_CFG_ACC_FUN_MASK; - fabric_indirect_access_reg |= instance_id << DF_IND_CFG_INST_ID_SHIFT; - pci_write_config32(SOC_DF_F4_DEV, DF_FICAA_BIOS, fabric_indirect_access_reg); -} - -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. */ - return pci_read_config32(_SOC_DEV(DF_DEV, function), reg); - - /* non-broadcast data fabric accesses need to be done via indirect access */ - data_fabric_set_indirect_address(function, reg, instance_id); - return pci_read_config32(SOC_DF_F4_DEV, DF_FICAD_LO); -} |