summaryrefslogtreecommitdiff
path: root/src/soc/intel/alderlake
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/intel/alderlake')
-rw-r--r--src/soc/intel/alderlake/include/soc/systemagent.h19
-rw-r--r--src/soc/intel/alderlake/systemagent.c4
2 files changed, 10 insertions, 13 deletions
diff --git a/src/soc/intel/alderlake/include/soc/systemagent.h b/src/soc/intel/alderlake/include/soc/systemagent.h
index 36d339884b..b7a2957c18 100644
--- a/src/soc/intel/alderlake/include/soc/systemagent.h
+++ b/src/soc/intel/alderlake/include/soc/systemagent.h
@@ -64,17 +64,14 @@ static const struct sa_mmio_descriptor soc_vtd_resources[] = {
#define LT_SECURITY_SIZE (128 * KiB)
#define APIC_SIZE (1 * MiB)
-#define MASK_PCIEXBAR_LENGTH 0x0000000E // bits [3:1]
-#define PCIEXBAR_LENGTH_LSB 1 // used to shift right
-
-#define DSM_BASE_ADDR_REG 0xB0
-#define MASK_DSM_LENGTH 0xFF00 // [15:8]
-#define MASK_DSM_LENGTH_LSB 8 // used to shift right
-#define MASK_GSM_LENGTH 0xC0 // [7:6]
-#define MASK_GSM_LENGTH_LSB 6 // used to shift right
-#define DPR_REG 0x5C
-#define MASK_DPR_LENGTH 0xFF0 // [11:4]
-#define MASK_DPR_LENGTH_LSB 4 // used to shift right
+#define MASK_PCIEXBAR_LENGTH 0xE /* bits [3:1] */
+#define PCIEXBAR_LENGTH_LSB 1 /* used to shift right */
+#define MASK_DSM_LENGTH 0xFF00 /* bits [15:8] */
+#define MASK_DSM_LENGTH_LSB 8 /* used to shift right */
+#define MASK_GSM_LENGTH 0xC0 /* bits [7:6] */
+#define MASK_GSM_LENGTH_LSB 6 /* used to shift right */
+#define MASK_DPR_LENGTH 0xFF0 /* bits [11:4] */
+#define MASK_DPR_LENGTH_LSB 4 /* used to shift right */
uint64_t get_mmcfg_size(const struct device *dev);
uint64_t get_dsm_size(const struct device *dev);
diff --git a/src/soc/intel/alderlake/systemagent.c b/src/soc/intel/alderlake/systemagent.c
index 36fa45b9e5..ecd704e569 100644
--- a/src/soc/intel/alderlake/systemagent.c
+++ b/src/soc/intel/alderlake/systemagent.c
@@ -111,7 +111,7 @@ void soc_add_configurable_mmio_resources(struct device *dev, int *resource_cnt)
/* DSM */
size = get_dsm_size(dev);
if (size > 0) {
- base = pci_read_config32(dev, DSM_BASE_ADDR_REG) & 0xFFF00000;
+ base = pci_read_config32(dev, BDSM) & 0xFFF00000;
set_mmio_resource(&(cfg_rsrc[count++]), base, size, "DSM");
}
@@ -316,7 +316,7 @@ uint64_t get_gsm_size(const struct device *dev)
uint64_t get_dpr_size(const struct device *dev)
{
uint64_t size;
- uint32_t dpr_reg = pci_read_config32(dev, DPR_REG);
+ uint32_t dpr_reg = pci_read_config32(dev, DPR);
uint32_t size_field = (dpr_reg & MASK_DPR_LENGTH) >> MASK_DPR_LENGTH_LSB;
size = (uint64_t)size_field * MiB;
return size;