lkml.org 
[lkml]   [2021]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH v2 net-next 2/5] net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Date
On Fri, Dec 03, 2021 at 05:00:47PM -0800, Colin Foster wrote:
> Existing felix devices all have an initialized pcs array. Future devices
> might not, so running a NULL check on the array before dereferencing it
> will allow those future drivers to not crash at this point
>
> Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
> ---

Actually, it looks like split pcs ops (via struct phylink_pcs) are the
future, and since the vsc7512 still has a PCS1G block, you should still
consider creating a phylink_pcs for it, and then this patch won't be
needed. But anyway, to make some progress, this shouldn't hurt right now.

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

> drivers/net/dsa/ocelot/felix.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
> index 0e102caddb73..4ead3ebe947b 100644
> --- a/drivers/net/dsa/ocelot/felix.c
> +++ b/drivers/net/dsa/ocelot/felix.c
> @@ -828,7 +828,7 @@ static void felix_phylink_mac_config(struct dsa_switch *ds, int port,
> struct felix *felix = ocelot_to_felix(ocelot);
> struct dsa_port *dp = dsa_to_port(ds, port);
>
> - if (felix->pcs[port])
> + if (felix->pcs && felix->pcs[port])
> phylink_set_pcs(dp->pl, &felix->pcs[port]->pcs);
> }
>
> --
> 2.25.1
>
\
 
 \ /
  Last update: 2021-12-04 12:57    [W:0.070 / U:3.940 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site