diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/cezanne/include/soc/data_fabric.h | 14 | ||||
| -rw-r--r-- | src/soc/amd/common/block/data_fabric/data_fabric_helper.c | 6 | ||||
| -rw-r--r-- | src/soc/amd/glinda/include/soc/data_fabric.h | 14 | ||||
| -rw-r--r-- | src/soc/amd/mendocino/include/soc/data_fabric.h | 14 | ||||
| -rw-r--r-- | src/soc/amd/phoenix/include/soc/data_fabric.h | 14 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/data_fabric.h | 12 |
6 files changed, 37 insertions, 37 deletions
diff --git a/src/soc/amd/cezanne/include/soc/data_fabric.h b/src/soc/amd/cezanne/include/soc/data_fabric.h index 5aabc2308b..3cb0fd71ed 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 e19b278cc0..d1ba5c84e3 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 @@ void data_fabric_print_mmio_conf(void) 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 @@ void data_fabric_set_mmio_np(void) 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 9ebb74f96b..acacb0ea6e 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 4a399eb34f..3249a8538b 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 e950817cbe..bfe49d58e9 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 98648774e6..1e0b28a3a3 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; }; |