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/common | |
| parent | 6962b6ecd395093e63824bb337bbb45492d2ce48 (diff) | |
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/common')
5 files changed, 73 insertions, 0 deletions
diff --git a/src/soc/amd/common/block/data_fabric/Kconfig b/src/soc/amd/common/block/data_fabric/Kconfig new file mode 100644 index 0000000000..42cd6ec070 --- /dev/null +++ b/src/soc/amd/common/block/data_fabric/Kconfig @@ -0,0 +1,5 @@ +config SOC_AMD_COMMON_BLOCK_DATA_FABRIC + bool + help + Select this option to add data fabric configuration related + functionality to the build. diff --git a/src/soc/amd/common/block/data_fabric/Makefile.inc b/src/soc/amd/common/block/data_fabric/Makefile.inc new file mode 100644 index 0000000000..3938af122e --- /dev/null +++ b/src/soc/amd/common/block/data_fabric/Makefile.inc @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_DATA_FABRIC),y) + +ramstage-y += data_fabric_helper.c + +endif # CONFIG_SOC_AMD_COMMON_BLOCK_DATA_FABRIC diff --git a/src/soc/amd/common/block/data_fabric/data_fabric_def.h b/src/soc/amd/common/block/data_fabric/data_fabric_def.h new file mode 100644 index 0000000000..2076d1633c --- /dev/null +++ b/src/soc/amd/common/block/data_fabric/data_fabric_def.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef AMD_BLOCK_DATA_FABRIC_DEF_H +#define AMD_BLOCK_DATA_FABRIC_DEF_H + +#define DF_FICAA_BIOS 0x5C +#define DF_FICAD_LO 0x98 +#define DF_FICAD_HI 0x9C + +#define DF_IND_CFG_INST_ACC_EN (1 << 0) +#define DF_IND_CFG_ACC_REG_SHIFT 2 +#define DF_IND_CFG_ACC_REG_MASK (0x1ff << DF_IND_CFG_ACC_REG_SHIFT) +#define DF_IND_CFG_ACC_FUN_SHIFT 11 +#define DF_IND_CFG_ACC_FUN_MASK (0x7 << DF_IND_CFG_ACC_FUN_SHIFT) +#define DF_IND_CFG_64B_EN_SHIFT 14 +#define DF_IND_CFG_64B_EN (0x1 << DF_IND_CFG_64B_EN_SHIFT) +#define DF_IND_CFG_INST_ID_SHIFT 16 +#define DF_IND_CFG_INST_ID_MASK (0xff << DF_IND_CFG_INST_ID_SHIFT) + +#endif /* AMD_BLOCK_DATA_FABRIC_DEF_H */ diff --git a/src/soc/amd/common/block/data_fabric/data_fabric_helper.c b/src/soc/amd/common/block/data_fabric/data_fabric_helper.c new file mode 100644 index 0000000000..e8e02d8eb1 --- /dev/null +++ b/src/soc/amd/common/block/data_fabric/data_fabric_helper.c @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <amdblocks/data_fabric.h> +#include <amdblocks/pci_devs.h> +#include <device/pci_ops.h> +#include <soc/pci_devs.h> +#include <types.h> +#include "data_fabric_def.h" + +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); +} diff --git a/src/soc/amd/common/block/include/amdblocks/data_fabric.h b/src/soc/amd/common/block/include/amdblocks/data_fabric.h new file mode 100644 index 0000000000..606d56419f --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/data_fabric.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef AMD_BLOCK_DATA_FABRIC_H +#define AMD_BLOCK_DATA_FABRIC_H + +#include <stdint.h> + +#define BROADCAST_FABRIC_ID 0xff + +uint32_t data_fabric_read32(uint8_t function, uint16_t reg, uint8_t instance_id); + +#endif /* AMD_BLOCK_DATA_FABRIC_H */ |