On 2/22/20 6:35 AM, Ang, Chee Hong wrote: >> From: Chee Hong Ang <[email protected]> >> >> Allow access to System Manager's EMAC control register from non-secure mode >> during PHY mode setup. >> >> Signed-off-by: Chee Hong Ang <[email protected]> >> --- >> arch/arm/mach-socfpga/misc_s10.c | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach- >> socfpga/misc_s10.c >> index 25c3ff6..6593308 100644 >> --- a/arch/arm/mach-socfpga/misc_s10.c >> +++ b/arch/arm/mach-socfpga/misc_s10.c >> @@ -18,6 +18,7 @@ >> #include <asm/pl310.h> >> #include <linux/libfdt.h> >> #include <asm/arch/mailbox_s10.h> >> +#include <asm/arch/secure_reg_helper.h> >> >> #include <dt-bindings/reset/altr,rst-mgr-s10.h> >> >> @@ -65,9 +66,9 @@ static u32 socfpga_phymode_setup(u32 gmac_index, >> const char *phymode) >> else >> return -EINVAL; >> >> - clrsetbits_le32(socfpga_get_sysmgr_addr() + SYSMGR_SOC64_EMAC0 + >> - gmac_index, >> - SYSMGR_EMACGRP_CTRL_PHYSEL_MASK, modereg); >> + socfpga_secure_reg_update32(socfpga_get_sysmgr_addr() + >> + SYSMGR_SOC64_EMAC0 + gmac_index, >> + SYSMGR_EMACGRP_CTRL_PHYSEL_MASK, >> modereg); >> >> return 0; >> } >> -- >> 2.7.4 > Looks like this PHY setup is redundant and no longer needed because it is > already being taken care in 'drivers/net/dwmac_socfpga.c' which is written > by Marek. > Will check with Ley Foon whether this socfpga_phymode_setup() can be safely > removed.
Nice
