From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Vladimir Oltean <vladimir.oltean@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Russell King <linux@armlinux.org.uk>
Subject: [PATCH v5 net-next 2/4] net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Date:   Tue,  7 Dec 2021 09:00:28 -0800
Message-Id: <20211207170030.1406601-3-colin.foster@in-advantage.com>
In-Reply-To: <20211207170030.1406601-1-colin.foster@in-advantage.com>
References: <20211207170030.1406601-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FRLXpGTyXne/nTmZIGfs3GQYa4WXjb+LVQl6AUwqjuWbTm8HwaqXAXcHFjtm?=
 =?us-ascii?Q?rTYa+nj610s8Uzmrk228V2SCMj77CfOXjL7s2hacE5eDXDOlx6nDmwgSZpYb?=
 =?us-ascii?Q?NvJe+ulth0VZdWZhmUqHI+OMcWxlZ/zhJQDVr3+GGE9KXw34S4e37CBu39F7?=
 =?us-ascii?Q?viOqhMQMXSK3vVvJ83dG5h/cKNB3H0YSH7Ahi3kBfKcjgsSq0BmwG6ZaZFRt?=
 =?us-ascii?Q?cQtZwIPIpxaGkioIDxgxslOzOyefRohJ7H8IL7OYFgFBidsGhWt7BuECobUV?=
 =?us-ascii?Q?T9sx3RlpG8rqEgGQzBFGiSd5FUo+HSaRhu8aSgI84D5N6hXWDGoAeYgs6cbi?=
 =?us-ascii?Q?MV8mzAZF7LFRt7skZ6O9pyYsny8EKcDiVix3z0qVSM5ejzmqUwnOFlgD7aqP?=
 =?us-ascii?Q?aaLxfMFelzbf4rqfnC3c+3Wh8LygoiEb1NF+ubAUeMx+0gNOJ3p2owlB73GZ?=
 =?us-ascii?Q?I64ETPmNi8Gte99dDoO1UwSX8rGIySSIihi0vEFeg6XGbirFjun+6arvjvtH?=
 =?us-ascii?Q?vf6KMoylqFoJI4825zJPZmrkLZYKyJsy3vWYw0lkJSPAQ7gxBkDij99JX5gW?=
 =?us-ascii?Q?FJbviyCmo6V+Q6Voi2cnH9qx91egqrMioeg8sRzF1GTZ+SyfJjGLnmpPw1+X?=
 =?us-ascii?Q?9G+ZlP03JpyrwsVhMjPHdupFR9FO+hzoIKHEiD+x6y6niTkoNl3KukTrLSG3?=
 =?us-ascii?Q?jlAo0GYLozojAEzYYwbHOkanriPblhkQSt/oXnhu/s/SjBFOXyk0MN8F0BDh?=
 =?us-ascii?Q?Hm32BQXcm9mRdvce851dClZKoKhEBtvdPWbWZu3SLrfbKtv2iTyE4VhyaQnM?=
 =?us-ascii?Q?qugmgZGdefwcVXJvCL26lluHL26k4y0A17HBOwAeBrgl7fQHin1ax1zLjT2S?=
 =?us-ascii?Q?kZq1Pt0VsY3Tn/jwkvdWxYTZRQImOHv3RNzeYRUdvdV3CtGRikE2gqHo5Mae?=
 =?us-ascii?Q?ggCDmEbnNp1BfMaUGKqR9kewTv2ft6L3bjcskqPWf2snMZrZAm9s1vlxcDUz?=
 =?us-ascii?Q?EbePClGk3SZSsYl6wFPUdogefk2SQ1gPTD1dDHfLtBFeVirA94cXEBhCM0ll?=
 =?us-ascii?Q?j8Z4oWHJ/CKvLpRrF7imxQJ7QlGm0Fnwfqy5Nrna41WaRNHLypXRgZ2E1YYp?=
 =?us-ascii?Q?PaI5qgtbcKOb4VbLr1HnMVk9YSLsZMVn0WfcdTGvmb4S9dxWIwTJ80F1WTIU?=
 =?us-ascii?Q?Ti5Si8QpRRby7r/lUiWUAVHfR5bX7e3GSVMGHb3nPFTk29PGw94Jhpm6aeIV?=
 =?us-ascii?Q?z0K1Pdza0mEj9Ml+wJkhQNnPZ93KYJ1uJoJMozzCRmtK6ApcUUKhnZggCIa9?=
 =?us-ascii?Q?UYb/z4hTkQhEyzoSdTtq2Dro/CVsT1eTspUCMcCcWpqcXC4l837F4xDoOGwR?=
 =?us-ascii?Q?ECVppOK0Nzfy0W2O9yQnj7QhcVUFVGfALIBh0WXofjtsZYWzQnFAEDmsaFW8?=
 =?us-ascii?Q?cgUqdkypEU4qLHBFfOX/BV7DsPPoqMYIrGV1pZ0MGg/eCXFsJ23IQkESuvad?=
 =?us-ascii?Q?3eBBFYpFoISJBnsEvD5Zirtbm8EPxyWWuZror9Yt/CFdi4xlklSrY5fzFz36?=
 =?us-ascii?Q?bDe4WCg2LXSTWuvjgnaYR/+lqRboe0wDZXtcE0hN3hWrLUOY1Ug0INYC6g8E?=
 =?us-ascii?Q?Vw1FjP6HkUsfX+on89rnZ5/dfc7m0wvlQPMITayJHBT9VW8Iz47CftYzOGus?=
 =?us-ascii?Q?0bYQ7w=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d3161152-e32e-4db6-92e1-08d9b9a31a3d
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 17:00:42.3135
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: DjJG1GTydxn8cG4Bv1cd7/PT4zgusI+87dhb36RwE1revH1OJk/fLk8a2prN0rj6BgBeVlhtKYn4QrpxSCasSW/NN8+NJBR5B6I7IPT6yf8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5441
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
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