Skip to content

Commit 0a8b43b

Browse files
jbeptxkuba-moo
authored andcommitted
net: fec: limit register access on i.MX6UL
Using 'ethtool -d […]' on an i.MX6UL leads to a kernel crash: Unhandled fault: external abort on non-linefetch (0x1008) at […] due to this SoC has less registers in its FEC implementation compared to other i.MX6 variants. Thus, a run-time decision is required to avoid access to non-existing registers. Fixes: a51d3ab ("net: fec: use a more proper compatible string for i.MX6UL type device") Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Link: https://lore.kernel.org/r/20221024080552.21004-1-jbe@pengutronix.de Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 8b9d377 commit 0a8b43b

File tree

1 file changed

+44
-2
lines changed

1 file changed

+44
-2
lines changed

drivers/net/ethernet/freescale/fec_main.c

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,6 +2432,31 @@ static u32 fec_enet_register_offset[] = {
24322432
IEEE_R_DROP, IEEE_R_FRAME_OK, IEEE_R_CRC, IEEE_R_ALIGN, IEEE_R_MACERR,
24332433
IEEE_R_FDXFC, IEEE_R_OCTETS_OK
24342434
};
2435+
/* for i.MX6ul */
2436+
static u32 fec_enet_register_offset_6ul[] = {
2437+
FEC_IEVENT, FEC_IMASK, FEC_R_DES_ACTIVE_0, FEC_X_DES_ACTIVE_0,
2438+
FEC_ECNTRL, FEC_MII_DATA, FEC_MII_SPEED, FEC_MIB_CTRLSTAT, FEC_R_CNTRL,
2439+
FEC_X_CNTRL, FEC_ADDR_LOW, FEC_ADDR_HIGH, FEC_OPD, FEC_TXIC0, FEC_RXIC0,
2440+
FEC_HASH_TABLE_HIGH, FEC_HASH_TABLE_LOW, FEC_GRP_HASH_TABLE_HIGH,
2441+
FEC_GRP_HASH_TABLE_LOW, FEC_X_WMRK, FEC_R_DES_START_0,
2442+
FEC_X_DES_START_0, FEC_R_BUFF_SIZE_0, FEC_R_FIFO_RSFL, FEC_R_FIFO_RSEM,
2443+
FEC_R_FIFO_RAEM, FEC_R_FIFO_RAFL, FEC_RACC,
2444+
RMON_T_DROP, RMON_T_PACKETS, RMON_T_BC_PKT, RMON_T_MC_PKT,
2445+
RMON_T_CRC_ALIGN, RMON_T_UNDERSIZE, RMON_T_OVERSIZE, RMON_T_FRAG,
2446+
RMON_T_JAB, RMON_T_COL, RMON_T_P64, RMON_T_P65TO127, RMON_T_P128TO255,
2447+
RMON_T_P256TO511, RMON_T_P512TO1023, RMON_T_P1024TO2047,
2448+
RMON_T_P_GTE2048, RMON_T_OCTETS,
2449+
IEEE_T_DROP, IEEE_T_FRAME_OK, IEEE_T_1COL, IEEE_T_MCOL, IEEE_T_DEF,
2450+
IEEE_T_LCOL, IEEE_T_EXCOL, IEEE_T_MACERR, IEEE_T_CSERR, IEEE_T_SQE,
2451+
IEEE_T_FDXFC, IEEE_T_OCTETS_OK,
2452+
RMON_R_PACKETS, RMON_R_BC_PKT, RMON_R_MC_PKT, RMON_R_CRC_ALIGN,
2453+
RMON_R_UNDERSIZE, RMON_R_OVERSIZE, RMON_R_FRAG, RMON_R_JAB,
2454+
RMON_R_RESVD_O, RMON_R_P64, RMON_R_P65TO127, RMON_R_P128TO255,
2455+
RMON_R_P256TO511, RMON_R_P512TO1023, RMON_R_P1024TO2047,
2456+
RMON_R_P_GTE2048, RMON_R_OCTETS,
2457+
IEEE_R_DROP, IEEE_R_FRAME_OK, IEEE_R_CRC, IEEE_R_ALIGN, IEEE_R_MACERR,
2458+
IEEE_R_FDXFC, IEEE_R_OCTETS_OK
2459+
};
24352460
#else
24362461
static __u32 fec_enet_register_version = 1;
24372462
static u32 fec_enet_register_offset[] = {
@@ -2456,7 +2481,24 @@ static void fec_enet_get_regs(struct net_device *ndev,
24562481
u32 *buf = (u32 *)regbuf;
24572482
u32 i, off;
24582483
int ret;
2484+
#if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \
2485+
defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
2486+
defined(CONFIG_ARM64) || defined(CONFIG_COMPILE_TEST)
2487+
u32 *reg_list;
2488+
u32 reg_cnt;
24592489

2490+
if (!of_machine_is_compatible("fsl,imx6ul")) {
2491+
reg_list = fec_enet_register_offset;
2492+
reg_cnt = ARRAY_SIZE(fec_enet_register_offset);
2493+
} else {
2494+
reg_list = fec_enet_register_offset_6ul;
2495+
reg_cnt = ARRAY_SIZE(fec_enet_register_offset_6ul);
2496+
}
2497+
#else
2498+
/* coldfire */
2499+
static u32 *reg_list = fec_enet_register_offset;
2500+
static const u32 reg_cnt = ARRAY_SIZE(fec_enet_register_offset);
2501+
#endif
24602502
ret = pm_runtime_resume_and_get(dev);
24612503
if (ret < 0)
24622504
return;
@@ -2465,8 +2507,8 @@ static void fec_enet_get_regs(struct net_device *ndev,
24652507

24662508
memset(buf, 0, regs->len);
24672509

2468-
for (i = 0; i < ARRAY_SIZE(fec_enet_register_offset); i++) {
2469-
off = fec_enet_register_offset[i];
2510+
for (i = 0; i < reg_cnt; i++) {
2511+
off = reg_list[i];
24702512

24712513
if ((off == FEC_R_BOUND || off == FEC_R_FSTART) &&
24722514
!(fep->quirks & FEC_QUIRK_HAS_FRREG))

0 commit comments

Comments
 (0)