diff mbox series

[net-next] net: mscc: ocelot: add missing VCAP ES0 and IS1 regmaps for VSC7514

Message ID 20201006150248.1911469-1-vladimir.oltean@nxp.com
State Accepted
Delegated to: David Miller
Headers show
Series [net-next] net: mscc: ocelot: add missing VCAP ES0 and IS1 regmaps for VSC7514 | expand

Commit Message

Vladimir Oltean Oct. 6, 2020, 3:02 p.m. UTC
Without these definitions, the driver will crash in:
mscc_ocelot_probe
-> ocelot_init
   -> ocelot_vcap_init
     -> __ocelot_target_read_ix

I missed this because I did not have the VSC7514 hardware to test, only
the VSC9959 and VSC9953, and the probing part is different.

Fixes: e3aea296d86f ("net: mscc: ocelot: add definitions for VCAP ES0 keys, actions and target")
Fixes: a61e365d7c18 ("net: mscc: ocelot: add definitions for VCAP IS1 keys, actions and target")
Reported-by: Divya Koppera <Divya.Koppera@microchip.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/mscc/ocelot_vsc7514.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jakub Kicinski Oct. 9, 2020, 12:53 a.m. UTC | #1
On Tue,  6 Oct 2020 18:02:48 +0300 Vladimir Oltean wrote:
> Without these definitions, the driver will crash in:
> mscc_ocelot_probe
> -> ocelot_init
>    -> ocelot_vcap_init
>      -> __ocelot_target_read_ix  
> 
> I missed this because I did not have the VSC7514 hardware to test, only
> the VSC9959 and VSC9953, and the probing part is different.
> 
> Fixes: e3aea296d86f ("net: mscc: ocelot: add definitions for VCAP ES0 keys, actions and target")
> Fixes: a61e365d7c18 ("net: mscc: ocelot: add definitions for VCAP IS1 keys, actions and target")
> Reported-by: Divya Koppera <Divya.Koppera@microchip.com>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Applied, thanks!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mscc/ocelot_vsc7514.c b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
index ef350f34fb95..aee76730a736 100644
--- a/drivers/net/ethernet/mscc/ocelot_vsc7514.c
+++ b/drivers/net/ethernet/mscc/ocelot_vsc7514.c
@@ -320,6 +320,8 @@  static const u32 *ocelot_regmap[TARGET_MAX] = {
 	[QSYS] = ocelot_qsys_regmap,
 	[REW] = ocelot_rew_regmap,
 	[SYS] = ocelot_sys_regmap,
+	[S0] = ocelot_vcap_regmap,
+	[S1] = ocelot_vcap_regmap,
 	[S2] = ocelot_vcap_regmap,
 	[PTP] = ocelot_ptp_regmap,
 	[DEV_GMII] = ocelot_dev_gmii_regmap,