summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2021-11-24 11:32:39 +0100
committerFelix Held <felix-coreboot@felixheld.de>2021-11-25 18:46:11 +0000
commit2f5cb2e3556db4b5fc7e372488e194646893e4fa (patch)
tree2e452d565f380bcad2e24d7f08fd2d41a45397e6
parentf80f32b0e5b183f5ef269b94598dcef58a73a657 (diff)
soc/amd/*/include/data_fabric: make MMIO_NP definition SoC-specific
On Picasso the MMIO_NP bit in the D18F0_MMIO_CTRL0 data fabric register is bit 12, but that has changed to bit 16 in Cezanne. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I64c06b84e2c0737b259077e7932f418306638e19 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59626 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
-rw-r--r--src/soc/amd/cezanne/include/soc/data_fabric.h3
-rw-r--r--src/soc/amd/common/block/include/amdblocks/data_fabric.h2
-rw-r--r--src/soc/amd/picasso/include/soc/data_fabric.h4
3 files changed, 8 insertions, 1 deletions
diff --git a/src/soc/amd/cezanne/include/soc/data_fabric.h b/src/soc/amd/cezanne/include/soc/data_fabric.h
index 5dcbdd07ce..13a96e0488 100644
--- a/src/soc/amd/cezanne/include/soc/data_fabric.h
+++ b/src/soc/amd/cezanne/include/soc/data_fabric.h
@@ -5,6 +5,9 @@
#include <types.h>
+/* SoC-specific bits in D18F0_MMIO_CTRL0 */
+#define MMIO_NP BIT(16)
+
#define IOMS0_FABRIC_ID 10
#define NUM_NB_MMIO_REGS 8
diff --git a/src/soc/amd/common/block/include/amdblocks/data_fabric.h b/src/soc/amd/common/block/include/amdblocks/data_fabric.h
index 6df778d54c..ede507564a 100644
--- a/src/soc/amd/common/block/include/amdblocks/data_fabric.h
+++ b/src/soc/amd/common/block/include/amdblocks/data_fabric.h
@@ -15,7 +15,7 @@
#define D18F0_MMIO_LIMIT0 0x204
#define D18F0_MMIO_SHIFT 16
#define D18F0_MMIO_CTRL0 0x208
-#define MMIO_NP BIT(12)
+/* The MMIO_NP bit is SoC-specific */
#define MMIO_DST_FABRIC_ID_SHIFT 4
#define MMIO_WE BIT(1)
#define MMIO_RE BIT(0)
diff --git a/src/soc/amd/picasso/include/soc/data_fabric.h b/src/soc/amd/picasso/include/soc/data_fabric.h
index 3a1f2c714a..d652d1957c 100644
--- a/src/soc/amd/picasso/include/soc/data_fabric.h
+++ b/src/soc/amd/picasso/include/soc/data_fabric.h
@@ -6,6 +6,10 @@
#include <types.h>
/* D18F0 - Fabric Configuration registers */
+
+/* SoC-specific bits in D18F0_MMIO_CTRL0 */
+#define MMIO_NP BIT(12)
+
#define IOMS0_FABRIC_ID 9
#define NUM_NB_MMIO_REGS 8