diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/smn.h | 11 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/smu.h | 4 | ||||
| -rw-r--r-- | src/soc/amd/common/block/smn/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/amd/common/block/smn/Makefile.inc | 8 | ||||
| -rw-r--r-- | src/soc/amd/common/block/smn/smn.c | 22 | ||||
| -rw-r--r-- | src/soc/amd/common/block/smu/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/amd/common/block/smu/smu.c | 25 |
7 files changed, 52 insertions, 23 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/smn.h b/src/soc/amd/common/block/include/amdblocks/smn.h new file mode 100644 index 0000000000..962c8acd82 --- /dev/null +++ b/src/soc/amd/common/block/include/amdblocks/smn.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef AMD_BLOCK_SMN_H +#define AMD_BLOCK_SMN_H + +#include <types.h> + +uint32_t smn_read32(uint32_t reg); +void smn_write32(uint32_t reg, uint32_t val); + +#endif /* AMD_BLOCK_SMN_H */ diff --git a/src/soc/amd/common/block/include/amdblocks/smu.h b/src/soc/amd/common/block/include/amdblocks/smu.h index ca5e37a7ee..eeca3c6e7f 100644 --- a/src/soc/amd/common/block/include/amdblocks/smu.h +++ b/src/soc/amd/common/block/include/amdblocks/smu.h @@ -6,10 +6,6 @@ #include <types.h> #include <soc/smu.h> /* SoC-dependent definitions for SMU access */ -/* SMU registers accessed indirectly using an index/data pair in D0F00 config space */ -#define SMU_INDEX_ADDR 0xb8 /* 32 bit */ -#define SMU_DATA_ADDR 0xbc /* 32 bit */ - /* Arguments indexed locations are contiguous; the number is SoC-dependent */ #define REG_ADDR_MESG_ARG(x) (REG_ADDR_MESG_ARGS_BASE + ((x) * sizeof(uint32_t))) diff --git a/src/soc/amd/common/block/smn/Kconfig b/src/soc/amd/common/block/smn/Kconfig new file mode 100644 index 0000000000..a076bba63e --- /dev/null +++ b/src/soc/amd/common/block/smn/Kconfig @@ -0,0 +1,4 @@ +config SOC_AMD_COMMON_BLOCK_SMN + bool + help + Select this option to add functions to access the SMN register space to the build. diff --git a/src/soc/amd/common/block/smn/Makefile.inc b/src/soc/amd/common/block/smn/Makefile.inc new file mode 100644 index 0000000000..01de303606 --- /dev/null +++ b/src/soc/amd/common/block/smn/Makefile.inc @@ -0,0 +1,8 @@ +ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_SMN),y) + +bootblock-y += smn.c +romstage-y += smn.c +ramstage-y += smn.c +smm-y += smn.c + +endif # CONFIG_SOC_AMD_COMMON_BLOCK_SMN diff --git a/src/soc/amd/common/block/smn/smn.c b/src/soc/amd/common/block/smn/smn.c new file mode 100644 index 0000000000..055f732cf7 --- /dev/null +++ b/src/soc/amd/common/block/smn/smn.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <amdblocks/smn.h> +#include <device/pci_ops.h> +#include <soc/pci_devs.h> +#include <types.h> + +/* SMN registers accessed indirectly using an index/data pair in D0F00 config space */ +#define SMN_INDEX_ADDR 0xb8 /* 32 bit */ +#define SMN_DATA_ADDR 0xbc /* 32 bit */ + +uint32_t smn_read32(uint32_t reg) +{ + pci_write_config32(SOC_GNB_DEV, SMN_INDEX_ADDR, reg); + return pci_read_config32(SOC_GNB_DEV, SMN_DATA_ADDR); +} + +void smn_write32(uint32_t reg, uint32_t val) +{ + pci_write_config32(SOC_GNB_DEV, SMN_INDEX_ADDR, reg); + pci_write_config32(SOC_GNB_DEV, SMN_DATA_ADDR, val); +} diff --git a/src/soc/amd/common/block/smu/Kconfig b/src/soc/amd/common/block/smu/Kconfig index fe2687ad97..40195c9db3 100644 --- a/src/soc/amd/common/block/smu/Kconfig +++ b/src/soc/amd/common/block/smu/Kconfig @@ -1,4 +1,5 @@ config SOC_AMD_COMMON_BLOCK_SMU bool + select SOC_AMD_COMMON_BLOCK_SMN help Select this option to add functions to communicate with the SMU to the build. diff --git a/src/soc/amd/common/block/smu/smu.c b/src/soc/amd/common/block/smu/smu.c index 4f9c1d1abe..5e1ad0a737 100644 --- a/src/soc/amd/common/block/smu/smu.c +++ b/src/soc/amd/common/block/smu/smu.c @@ -2,24 +2,11 @@ #include <timer.h> #include <console/console.h> -#include <device/pci_ops.h> +#include <amdblocks/smn.h> #include <amdblocks/smu.h> -#include <soc/pci_devs.h> #include <soc/smu.h> #include <types.h> -static uint32_t smu_read32(uint32_t reg) -{ - pci_write_config32(SOC_GNB_DEV, SMU_INDEX_ADDR, reg); - return pci_read_config32(SOC_GNB_DEV, SMU_DATA_ADDR); -} - -static void smu_write32(uint32_t reg, uint32_t val) -{ - pci_write_config32(SOC_GNB_DEV, SMU_INDEX_ADDR, reg); - pci_write_config32(SOC_GNB_DEV, SMU_DATA_ADDR, val); -} - #define SMU_MESG_RESP_TIMEOUT 0x00 #define SMU_MESG_RESP_OK 0x01 @@ -33,7 +20,7 @@ static int32_t smu_poll_response(bool print_command_duration) stopwatch_init_msecs_expire(&sw, timeout_ms); do { - result = smu_read32(REG_ADDR_MESG_RESP); + result = smn_read32(REG_ADDR_MESG_RESP); if (result) { if (print_command_duration) printk(BIOS_SPEW, "SMU command consumed %ld usecs\n", @@ -59,14 +46,14 @@ enum cb_err send_smu_message(enum smu_message_id message_id, struct smu_payload return CB_ERR; /* clear response register */ - smu_write32(REG_ADDR_MESG_RESP, 0); + smn_write32(REG_ADDR_MESG_RESP, 0); /* populate arguments */ for (i = 0 ; i < SMU_NUM_ARGS ; i++) - smu_write32(REG_ADDR_MESG_ARG(i), arg->msg[i]); + smn_write32(REG_ADDR_MESG_ARG(i), arg->msg[i]); /* send message to SMU */ - smu_write32(REG_ADDR_MESG_ID, message_id); + smn_write32(REG_ADDR_MESG_ID, message_id); /* wait until SMU has processed the message and check if it was successful */ if (smu_poll_response(true) != SMU_MESG_RESP_OK) @@ -74,7 +61,7 @@ enum cb_err send_smu_message(enum smu_message_id message_id, struct smu_payload /* copy returned values */ for (i = 0 ; i < SMU_NUM_ARGS ; i++) - arg->msg[i] = smu_read32(REG_ADDR_MESG_ARG(i)); + arg->msg[i] = smn_read32(REG_ADDR_MESG_ARG(i)); return CB_SUCCESS; } |