diff options
author | Varshit Pandya <pandyavarshit@gmail.com> | 2024-02-08 21:32:57 +0530 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2024-02-10 16:53:22 +0000 |
commit | 0452d0939e7d7ddbf24d78ad5e69408b5ad52f47 (patch) | |
tree | ef428728d58e7e955bc26cc909380a45c5a37194 /src/soc/amd/common/block | |
parent | 9f297080aa1ec6b45551f7a177a21394e627c3e2 (diff) |
soc/amd: Factor out gpp_clk_setup function
gpp_clk_setup code in most AMD SoC is similar and it can moved to common
code. The only thing which is SoC dependent in this function is the SoC
config, hence keep it in SoC code and move everything else in new
gpp_clk_setup_common function which is in soc/amd/common. Picasso and
Glinda don't have pcie_gpp_dxio_update_clk_req_config fixup function so
they are addressed in later patches.
Change-Id: I7d7da4bfe079f07e31212247dbf3acd14daa6447
Signed-off-by: Varshit Pandya <pandyavarshit@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80285
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/common/block')
-rw-r--r-- | src/soc/amd/common/block/gpp_clk/Kconfig | 4 | ||||
-rw-r--r-- | src/soc/amd/common/block/gpp_clk/Makefile.mk | 3 | ||||
-rw-r--r-- | src/soc/amd/common/block/gpp_clk/gpp_clk.c | 48 | ||||
-rw-r--r-- | src/soc/amd/common/block/include/amdblocks/pci_clk_req.h | 19 |
4 files changed, 74 insertions, 0 deletions
diff --git a/src/soc/amd/common/block/gpp_clk/Kconfig b/src/soc/amd/common/block/gpp_clk/Kconfig new file mode 100644 index 0000000000..0838df41d4 --- /dev/null +++ b/src/soc/amd/common/block/gpp_clk/Kconfig @@ -0,0 +1,4 @@ +config SOC_AMD_COMMON_BLOCK_GPP_CLK + bool + help + Select this option to use AMD common PCIe clk generator configuration. diff --git a/src/soc/amd/common/block/gpp_clk/Makefile.mk b/src/soc/amd/common/block/gpp_clk/Makefile.mk new file mode 100644 index 0000000000..4b943f4908 --- /dev/null +++ b/src/soc/amd/common/block/gpp_clk/Makefile.mk @@ -0,0 +1,3 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_GPP_CLK) += gpp_clk.c diff --git a/src/soc/amd/common/block/gpp_clk/gpp_clk.c b/src/soc/amd/common/block/gpp_clk/gpp_clk.c new file mode 100644 index 0000000000..20d768ffac --- /dev/null +++ b/src/soc/amd/common/block/gpp_clk/gpp_clk.c @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <amdblocks/acpimmio.h> +#include <amdblocks/pci_clk_req.h> +#include <types.h> + +/* configure the general purpose PCIe clock outputs according to the devicetree settings */ +void gpp_clk_setup_common(enum gpp_clk_req *gpp_clk_config, size_t gpp_clk_config_num) +{ + /* look-up table to be able to iterate over the PCIe clock output settings */ + const uint8_t gpp_clk_shift_lut[GPP_CLK_OUTPUT_COUNT] = { + GPP_CLK0_REQ_SHIFT, + GPP_CLK1_REQ_SHIFT, + GPP_CLK2_REQ_SHIFT, + GPP_CLK3_REQ_SHIFT, + GPP_CLK4_REQ_SHIFT, + GPP_CLK5_REQ_SHIFT, + GPP_CLK6_REQ_SHIFT, + }; + + uint32_t gpp_clk_ctl = misc_read32(GPP_CLK_CNTRL); + + pcie_gpp_dxio_update_clk_req_config(gpp_clk_config, gpp_clk_config_num); + for (int i = 0; i < GPP_CLK_OUTPUT_COUNT; i++) { + gpp_clk_ctl &= ~GPP_CLK_REQ_MASK(gpp_clk_shift_lut[i]); + /* + * The remapping of values is done so that the default of the enum used for the + * devicetree settings is the clock being enabled, so that a missing devicetree + * configuration for this will result in an always active clock and not an + * inactive PCIe clock output. Only the configuration for the clock outputs + * available on the package is provided via the devicetree; the rest is + * switched off unconditionally. + */ + switch (i < gpp_clk_config_num ? gpp_clk_config[i] : GPP_CLK_OFF) { + case GPP_CLK_REQ: + gpp_clk_ctl |= GPP_CLK_REQ_EXT(gpp_clk_shift_lut[i]); + break; + case GPP_CLK_OFF: + gpp_clk_ctl |= GPP_CLK_REQ_OFF(gpp_clk_shift_lut[i]); + break; + case GPP_CLK_ON: + default: + gpp_clk_ctl |= GPP_CLK_REQ_ON(gpp_clk_shift_lut[i]); + } + } + + misc_write32(GPP_CLK_CNTRL, gpp_clk_ctl); +} diff --git a/src/soc/amd/common/block/include/amdblocks/pci_clk_req.h b/src/soc/amd/common/block/include/amdblocks/pci_clk_req.h index 7c10e5d604..811fe68d10 100644 --- a/src/soc/amd/common/block/include/amdblocks/pci_clk_req.h +++ b/src/soc/amd/common/block/include/amdblocks/pci_clk_req.h @@ -5,6 +5,21 @@ #include <types.h> +/* FCH MISC Registers 0xfed80e00 */ +#define GPP_CLK_CNTRL 0x00 +#define GPP_CLK0_REQ_SHIFT 0 +#define GPP_CLK1_REQ_SHIFT 2 +#define GPP_CLK4_REQ_SHIFT 4 +#define GPP_CLK2_REQ_SHIFT 6 +#define GPP_CLK3_REQ_SHIFT 8 +#define GPP_CLK5_REQ_SHIFT 10 +#define GPP_CLK6_REQ_SHIFT 12 +#define GPP_CLK_OUTPUT_COUNT 7 +#define GPP_CLK_REQ_MASK(clk_shift) (0x3 << (clk_shift)) +#define GPP_CLK_REQ_ON(clk_shift) (0x3 << (clk_shift)) +#define GPP_CLK_REQ_EXT(clk_shift) (0x1 << (clk_shift)) +#define GPP_CLK_REQ_OFF(clk_shift) (0x0 << (clk_shift)) + enum gpp_clk_req { GPP_CLK_ON, /* GPP clock always on; default */ GPP_CLK_REQ, /* GPP clock controlled by corresponding #CLK_REQx pin */ @@ -14,4 +29,8 @@ enum gpp_clk_req { void pcie_gpp_dxio_update_clk_req_config(enum gpp_clk_req *gpp_clk_config, size_t gpp_clk_config_num); +/* configure the general purpose PCIe clock outputs according to the devicetree settings */ +void gpp_clk_setup_common(enum gpp_clk_req *gpp_clk_config, + size_t gpp_clk_config_num); + #endif |