arch: arm: dts: socfpga: Fix SoC64 TCU SCR span and sysmgr grant masks
v2 cover arch: arm: dts: socfpga: Fix SoC64 TCU SCR span and sysmgr grant masks
This series cleans up two issues in the shared SoC64 U-Boot firewall overlay (intel,socfpga-dtreg) for Agilex7/7M and Stratix10. Patch 1 corrects the noc_fw_tcu_tcu_scr reg span from 0x4 to 0x100 so it matches the documented 256-byte decode window (0xFFD21400-0xFFD214FF), updating both nodes that describe this register for consistency. This is a device-tree correctness change; runtime behaviour is unchanged because the dtreg driver only programs offset 0x0.
Patch 2 narrows the intel,offset-settings masks for the system manager L3-master grant registers (EMAC0-2, NAND, SDMMC, USB0/1). The previous wide masks (e.g. 0xffff0103) caused clrsetbits_le32() to clear unrelated bits before setting the intended grant bit, corrupting the GMAC configuration. This surfaced as a DomU ethernet-passthrough failure under Xen (NETDEV watchdog TX timeouts, link flapping). Narrowing the masks to only the intended bits fixes it.
Alif Zakuan Yuslaimi (2):
arch: arm: dts: socfpga: Update L4_SYS Security Control Register size
arch: arm: dts: socfpga: Update system manager core registers masking
bits
arch/arm/dts/socfpga_soc64_u-boot.dtsi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
Signature · 16 lines
Changelog v2: - patch 1: also update the duplicate noc_fw_tcu_tcu_scr node under socfpga-l3interconnect-firewall (was only updated under socfpga-smmu-secure-config in v1). - Added cover letter v1: Link: https://patchwork.ozlabs.org/project/uboot/patch/ [email protected]/ https://patchwork.ozlabs.org/project/uboot/patch/ [email protected]/ 2.43.7
PATCH v2 1/2 arch: arm: dts: socfpga: Update L4_SYS Security Control Register size
From: Alif Zakuan Yuslaimi <[email protected]>
The noc_fw_tcu_tcu_scr register has a base address of 0xFFD21400 and an end address of 0xFFD214FF for Agilex7/7M and Stratix10, i.e. a 256-byte address block per the HPS address map.
This register appears in two intel,socfpga-dtreg nodes (socfpga-l3interconnect-firewall and socfpga-smmu-secure-config). Update the reg span from 0x4 to 0x100 in both nodes so the described decode window matches hardware and the two nodes stay consistent.
--- arch/arm/dts/socfpga_soc64_u-boot.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/socfpga_soc64_u-boot.dtsi +2 -2
@@ -109,7 +109,7 @@ }; noc_fw_tcu_tcu_scr@ffd21400 { - reg = <0xffd21400 0x00000004>; + reg = <0xffd21400 0x00000100>; /* Disable DMA ECC security access, for SMMU use */ intel,offset-settings = <0x00000000 0x01010001 0x01010001>; bootph-all;
@@ -132,7 +132,7 @@ /* TCU */ noc_fw_tcu_tcu_scr@ffd21400 { - reg = <0xffd21400 0x00000004>; + reg = <0xffd21400 0x00000100>; intel,offset-settings = <0x00000000 0x01010001 0x01010001>; bootph-all;
Signature · 1 line
2.43.7
PATCH v2 2/2 arch: arm: dts: socfpga: Update system manager core registers masking bits
In reply to Boon Khai NgFrom: Alif Zakuan Yuslaimi <[email protected]>
Using wide masks may modify unintended bits, which could break the system.
Updating the mask values to only modify intended bits set by the value to fix this.
--- arch/arm/dts/socfpga_soc64_u-boot.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/arm/dts/socfpga_soc64_u-boot.dtsi +7 -7
@@ -143,19 +143,19 @@ reg = <0xffd12000 0x00000500>; intel,offset-settings = /* i_sys_mgr_core_emac0 */ - <0x00000044 0x0a000000 0xffff0103>, + <0x00000044 0x0a000000 0x0a000000>, /* i_sys_mgr_core_emac1 */ - <0x00000048 0x0a000000 0xffff0103>, + <0x00000048 0x0a000000 0x0a000000>, /* i_sys_mgr_core_emac2 */ - <0x0000004c 0x0a000000 0xffff0103>, + <0x0000004c 0x0a000000 0x0a000000>, /* i_sys_mgr_core_nand_l3master */ - <0x00000034 0x00220000 0x007733ff>, + <0x00000034 0x00220000 0x00220000>, /* i_sys_mgr_core_sdmmc_l3master */ - <0x0000002c 0x00000020 0x03ff03ff>, + <0x0000002c 0x00000020 0x00000020>, /* i_sys_mgr_core_usb0_l3master */ - <0x00000038 0x00000200 0x03ff30ff>, + <0x00000038 0x00000200 0x00000200>, /* i_sys_mgr_core_usb1_l3master */ - <0x0000003c 0x00000200 0x03ff30ff>; + <0x0000003c 0x00000200 0x00000200>; bootph-all; }; };
Signature · 1 line
2.43.7