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 v3 net-next 2/5] net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Date:   Sat,  4 Dec 2021 10:21:26 -0800
Message-Id: <20211204182129.1044899-3-colin.foster@in-advantage.com>
In-Reply-To: <20211204182129.1044899-1-colin.foster@in-advantage.com>
References: <20211204182129.1044899-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?y7v8dJd85vDPiKM2UwFL00tvqwP5PBJ+RnoHcRtcoGdDBwuEMjwMyZFtNVEQ?=
 =?us-ascii?Q?RjLnw6Pbmfj4pT7KZrFdQ3825UW66rCYh/FhYqebuPZcSHvmyydOpTYM4JCJ?=
 =?us-ascii?Q?ZCo0qUqTjoWie7R93NlImastEWezmUA9HKSKqggf7Y5C7P9Qg9n5VD58j4+A?=
 =?us-ascii?Q?R2G9za5DefBuiRrJu+2umjscmZ+0ePvFZrDteB7HhtEsFIq6dYalzavV7Q1p?=
 =?us-ascii?Q?TTZVSVhEbICcsOdBz3NEoZT71u16qc16ZS/JUDAW2SN0+lK+aFSGTUIn+Bpv?=
 =?us-ascii?Q?tbEYKJEbajAo9RhoCfFdtEUPO6A3EXwwvaVzXvPU1nvIwzo8KBoYGRiEqBxi?=
 =?us-ascii?Q?cFNyl/E9J5Lqsw2fqEpI2dk2uJDgakt2QA/Syf8SiCTmcedfKiRW9mD9qQL4?=
 =?us-ascii?Q?FIvKedifJCznfInx2ycbiqKdQ1Z9ghIH42xAW/y2somOnKk4CMxAcQbVfg10?=
 =?us-ascii?Q?4T1hHwSVYDu6efLjWXOgTVTWw/HGREaNdXeskTewXC89vb+CQjeI9L/3V7Ho?=
 =?us-ascii?Q?k+y/SeN6orV1/8dNrxpJMt1El3Zm96GtIoS+bgoHAfHeq5hAcU2Kn0EyrMcy?=
 =?us-ascii?Q?h3ce/1iBRxbJ2GIT7Uj4ZR2HYC6k4NsouBJmRK90o6xPyCdajUUFyc3aPzAB?=
 =?us-ascii?Q?h7GMZTxfrRIEqi93TlcggSmHEVcWUr89kbkjPJm215ntLxJwxlu9GicAwz7M?=
 =?us-ascii?Q?jvNaAvl4Smge2UfHMWuOkh3AjXimFcwHC31rLvTQQ57MumVXSUUFTjCFIfMY?=
 =?us-ascii?Q?XBKGkrR/gdsITbV2Pewv2FsF3JBycjwTFXpJm8Dk8u+IEfODtWr+FdAMR5Yj?=
 =?us-ascii?Q?ekRoankWxoZt9aIFub8ykmghck7Q8fKbA1aiM7Rijlqt6Rybq31KsmPARqS6?=
 =?us-ascii?Q?pFOHWvSHdnRw+aflw0KUCFJqJVVUUV3NxGsmxE1e/yhXgvMtRbTq2/6SdVRU?=
 =?us-ascii?Q?SlIg9mNyz7/9YsabkI8Yx1QGjlkfZOc/W7eRw8HZ/Z13+vSBhXCqr9+Pdduz?=
 =?us-ascii?Q?ilZiyIY/9SKJuVm2sIMeBDjXCAKZKP0LuORLLX6R+Jyn6yNxdroK84vXOzr+?=
 =?us-ascii?Q?12yEGWx3mBiWLBF7v4ClvTzytBjHizJ84cHXePtetSorRRouEaV9XtlEA6Q/?=
 =?us-ascii?Q?OFE8RgA9+LMjmlIA7SGI0ogu5KCPlVWDadtUL064hwU7L+NZ5xR0lakWDbox?=
 =?us-ascii?Q?L3AaLXM89juYN9Su2dzfX+KOfWbFpbppZ20pgwSwqeXttWeGNIlTOQSmsb0t?=
 =?us-ascii?Q?ZMthCKrLurxOqsDAUChG44eCJrlTBJpGUekdWwPvyb5PcVOwjlxZzdJl12Gh?=
 =?us-ascii?Q?Y8zam/FTywpml9m5zx3/TAlYOOeNzO2kte+jx3Dfer7uRXRe4WMySTVtiYym?=
 =?us-ascii?Q?O/hdq23rfyxrxNK4c4ImyRukekYWUsJ1Igf9v92wl8FkhkP0fUVhW6mv07N/?=
 =?us-ascii?Q?4ry1jGrodXtCvNItcQqSuv+/6+EZVvYuofp87I5PuZ0agz0DEiwaYIC8YRzT?=
 =?us-ascii?Q?NoZRn4Rt+6gfkRtzVx4gjIhcRtaNyvhJY/T07SqLJm9QHK81zNCyloQachpq?=
 =?us-ascii?Q?sSttYBUQE1ALO8whRtvvIcgyrKA4WVDR0LOXNHOd3PrmhJKNpUsyRNahkAxD?=
 =?us-ascii?Q?A0WQEbsE2MfpNdptNojD75JgC5VFeTnJpQBx5cwuZCxdAermF5czfp9fQeTP?=
 =?us-ascii?Q?g6HYpTv65GLZRjGVYD1FAoHFeLA=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2f122ce5-7496-46e4-b1ae-08d9b752eb95
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 18:21:41.9222
 (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: lRLN9aQagRL1naLGU5qk5k8RxgChDIsGWdhAqnDcx6KIoiLKp0rfjNKIER2w/+jC5BUPv2qXrqmNpva3Lgq4d5wrtgjg1F2q3M54Wuis7lM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2061
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>
---
 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