Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76932?usp=email )
Change subject: soc/amd/*/include/data_fabric: add dst_ prefix to fabric_id field ......................................................................
soc/amd/*/include/data_fabric: add dst_ prefix to fabric_id field
Rename the fabric_id struct field in the df_mmio_control union to dst_fabric_id to both better match the register definitions and also be a bit clearer about what this is doing. Also use tabs for indentation in the struct inside the df_mmio_control union.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: I0a17d82a5d7b66a8f84854f21fbbb319da81ac43 --- M src/soc/amd/cezanne/include/soc/data_fabric.h M src/soc/amd/common/block/data_fabric/data_fabric_helper.c M src/soc/amd/glinda/include/soc/data_fabric.h M src/soc/amd/mendocino/include/soc/data_fabric.h M src/soc/amd/phoenix/include/soc/data_fabric.h M src/soc/amd/picasso/include/soc/data_fabric.h 6 files changed, 37 insertions(+), 37 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/76932/1
diff --git a/src/soc/amd/cezanne/include/soc/data_fabric.h b/src/soc/amd/cezanne/include/soc/data_fabric.h index a8d06e9..b7421ad 100644 --- a/src/soc/amd/cezanne/include/soc/data_fabric.h +++ b/src/soc/amd/cezanne/include/soc/data_fabric.h @@ -18,13 +18,13 @@
union df_mmio_control { struct { - uint32_t re : 1; /* [ 0.. 0] */ - uint32_t we : 1; /* [ 1.. 1] */ - uint32_t : 2; /* [ 3.. 2] */ - uint32_t fabric_id : 10; /* [13.. 4] */ - uint32_t : 2; /* [15..14] */ - uint32_t np : 1; /* [16..16] */ - uint32_t : 15; /* [31..17] */ + uint32_t re : 1; /* [ 0.. 0] */ + uint32_t we : 1; /* [ 1.. 1] */ + uint32_t : 2; /* [ 3.. 2] */ + uint32_t dst_fabric_id : 10; /* [13.. 4] */ + uint32_t : 2; /* [15..14] */ + uint32_t np : 1; /* [16..16] */ + uint32_t : 15; /* [31..17] */ }; uint32_t raw; }; 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 index d19711e..462ff81 100644 --- a/src/soc/amd/common/block/data_fabric/data_fabric_helper.c +++ b/src/soc/amd/common/block/data_fabric/data_fabric_helper.c @@ -67,13 +67,13 @@ control.re ? "x" : " ", control.we ? "x" : " ", control.np ? "x" : " ", - control.fabric_id); + control.dst_fabric_id); } }
void data_fabric_disable_mmio_reg(unsigned int reg) { - union df_mmio_control ctrl = { .fabric_id = IOMS0_FABRIC_ID }; + union df_mmio_control ctrl = { .dst_fabric_id = IOMS0_FABRIC_ID }; data_fabric_broadcast_write32(DF_MMIO_CONTROL(reg), ctrl.raw); data_fabric_broadcast_write32(DF_MMIO_BASE(reg), 0); data_fabric_broadcast_write32(DF_MMIO_LIMIT(reg), 0); @@ -173,7 +173,7 @@ return; }
- union df_mmio_control np_ctrl = { .fabric_id = IOMS0_FABRIC_ID, + union df_mmio_control np_ctrl = { .dst_fabric_id = IOMS0_FABRIC_ID, .np = 1, .we = 1, .re = 1 }; data_fabric_broadcast_write32(DF_MMIO_BASE(reg), np_bot); data_fabric_broadcast_write32(DF_MMIO_LIMIT(reg), np_top); diff --git a/src/soc/amd/glinda/include/soc/data_fabric.h b/src/soc/amd/glinda/include/soc/data_fabric.h index dac7e04..bdd5325 100644 --- a/src/soc/amd/glinda/include/soc/data_fabric.h +++ b/src/soc/amd/glinda/include/soc/data_fabric.h @@ -18,13 +18,13 @@
union df_mmio_control { struct { - uint32_t re : 1; /* [ 0.. 0] */ - uint32_t we : 1; /* [ 1.. 1] */ - uint32_t : 1; /* [ 2.. 2] */ - uint32_t np : 1; /* [ 3.. 3] */ - uint32_t : 12; /* [15.. 4] */ - uint32_t fabric_id : 6; /* [21..16] */ - uint32_t : 10; /* [31..22] */ + uint32_t re : 1; /* [ 0.. 0] */ + uint32_t we : 1; /* [ 1.. 1] */ + uint32_t : 1; /* [ 2.. 2] */ + uint32_t np : 1; /* [ 3.. 3] */ + uint32_t : 12; /* [15.. 4] */ + uint32_t dst_fabric_id : 6; /* [21..16] */ + uint32_t : 10; /* [31..22] */ }; uint32_t raw; }; diff --git a/src/soc/amd/mendocino/include/soc/data_fabric.h b/src/soc/amd/mendocino/include/soc/data_fabric.h index 9824544..052e913 100644 --- a/src/soc/amd/mendocino/include/soc/data_fabric.h +++ b/src/soc/amd/mendocino/include/soc/data_fabric.h @@ -23,13 +23,13 @@
union df_mmio_control { struct { - uint32_t re : 1; /* [ 0.. 0] */ - uint32_t we : 1; /* [ 1.. 1] */ - uint32_t : 2; /* [ 3.. 2] */ - uint32_t fabric_id : 4; /* [ 7.. 4] */ - uint32_t : 8; /* [15.. 8] */ - uint32_t np : 1; /* [16..16] */ - uint32_t : 15; /* [31..17] */ + uint32_t re : 1; /* [ 0.. 0] */ + uint32_t we : 1; /* [ 1.. 1] */ + uint32_t : 2; /* [ 3.. 2] */ + uint32_t dst_fabric_id : 4; /* [ 7.. 4] */ + uint32_t : 8; /* [15.. 8] */ + uint32_t np : 1; /* [16..16] */ + uint32_t : 15; /* [31..17] */ }; uint32_t raw; }; diff --git a/src/soc/amd/phoenix/include/soc/data_fabric.h b/src/soc/amd/phoenix/include/soc/data_fabric.h index 53316f3..09b204e 100644 --- a/src/soc/amd/phoenix/include/soc/data_fabric.h +++ b/src/soc/amd/phoenix/include/soc/data_fabric.h @@ -18,13 +18,13 @@
union df_mmio_control { struct { - uint32_t re : 1; /* [ 0.. 0] */ - uint32_t we : 1; /* [ 1.. 1] */ - uint32_t : 1; /* [ 2.. 2] */ - uint32_t np : 1; /* [ 3.. 3] */ - uint32_t : 12; /* [15.. 4] */ - uint32_t fabric_id : 6; /* [21..16] */ - uint32_t : 10; /* [31..22] */ + uint32_t re : 1; /* [ 0.. 0] */ + uint32_t we : 1; /* [ 1.. 1] */ + uint32_t : 1; /* [ 2.. 2] */ + uint32_t np : 1; /* [ 3.. 3] */ + uint32_t : 12; /* [15.. 4] */ + uint32_t dst_fabric_id : 6; /* [21..16] */ + uint32_t : 10; /* [31..22] */ }; uint32_t raw; }; diff --git a/src/soc/amd/picasso/include/soc/data_fabric.h b/src/soc/amd/picasso/include/soc/data_fabric.h index 880afe1..cc932a8 100644 --- a/src/soc/amd/picasso/include/soc/data_fabric.h +++ b/src/soc/amd/picasso/include/soc/data_fabric.h @@ -53,12 +53,12 @@
union df_mmio_control { struct { - uint32_t re : 1; /* [ 0.. 0] */ - uint32_t we : 1; /* [ 1.. 1] */ - uint32_t : 2; /* [ 3.. 2] */ - uint32_t fabric_id : 8; /* [11.. 4] */ - uint32_t np : 1; /* [12..12] */ - uint32_t : 19; /* [31..13] */ + uint32_t re : 1; /* [ 0.. 0] */ + uint32_t we : 1; /* [ 1.. 1] */ + uint32_t : 2; /* [ 3.. 2] */ + uint32_t dst_fabric_id : 8; /* [11.. 4] */ + uint32_t np : 1; /* [12..12] */ + uint32_t : 19; /* [31..13] */ }; uint32_t raw; };