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 v2 net-next 2/5] net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Date:   Fri,  3 Dec 2021 17:00:47 -0800
Message-Id: <20211204010050.1013718-3-colin.foster@in-advantage.com>
In-Reply-To: <20211204010050.1013718-1-colin.foster@in-advantage.com>
References: <20211204010050.1013718-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?+icTlKLnYIHQ/Nt1VrPu9US7AwQOJhWH6xHEDgF4zK6yxA7FKqrQfYNfHAwP?=
 =?us-ascii?Q?1iD65AJ57+B6kqKFJAjpahT11t6seLUtUJg8x5j3o9Mn9wpG8IlJJ5/1lswB?=
 =?us-ascii?Q?iVZ1/44nKwgkHHW2BjpvI2GHKH7chALEH/8J2yqp6CVf2Fcnbp+sQUEmo18n?=
 =?us-ascii?Q?/jklWENqNKH2StULE2mEuYkYaT9g7xpaiOuREP1iNmwyWSEhIpGxo57WQAVc?=
 =?us-ascii?Q?6FKogH/e0NYlvvo4Zg8q0Sf9+uveus7qq/82O/dRxJioIdd5PDeRun1lBG+z?=
 =?us-ascii?Q?OBzsf0uRQZBJA/HU8qsO1+DkiLTIUvRWabpxadu+rZKhJKDNkaRsBb8rXKFq?=
 =?us-ascii?Q?pUJD/LV9FkefUgVWE7t/sV9GQnwHHBuY0RT7Mn5yXEQ1GITU2hhZliJgExTq?=
 =?us-ascii?Q?egH729lMkD7V14/wMono5JM3FvqBI9k+53ycakSaEBymVV4CdAh9JGRaHAet?=
 =?us-ascii?Q?rfsptr6TCQsZGOPg9a5BEzXjHZai41LPsZ8MTtbFL31xlwMQ31F6kow/S16K?=
 =?us-ascii?Q?eDmxCKYzVoEhVpkl2V8X36hwIerKJq7QEp67qFaxcNPp+E8DvDT6WjiFgyPB?=
 =?us-ascii?Q?0LnQjT/HgqcOfOTilF67gXLFySw5O2EOaZzxFl2ag2qFO261XYsP8AQ69Qwe?=
 =?us-ascii?Q?yHYiPnoeN9DiCZ4VK6fJk4iEsd9I8G6z8NgMjWyfmzJZJQqWxLUX5KTN/RJ+?=
 =?us-ascii?Q?/hVa3rHmp/pYlFzYaRG6f3ApmFnXxAJqAQE2jvV/HXqhYn9ehqSMtDVG8vTm?=
 =?us-ascii?Q?6ehHSMPMbguhmnb0u/9nAU/gA1OW/cyQAatjdmL6yDzpHAPld5kH8mvozxUY?=
 =?us-ascii?Q?T7bwfssuESm43o5kiPt7KygfH107xF8F6iRyYAtkySMYJqEQn/USIg30mAKM?=
 =?us-ascii?Q?WPiy6vMf8ZdPtrWDSwS9LPThNBsc9knTgoMxjBbDBITMjCcNkRhQyidxt6Ft?=
 =?us-ascii?Q?N3fd91FsEMX/HIQ+NYidU2QkorUvHVn0l0GshiaECvfgTDz7NvVysZgnMXxO?=
 =?us-ascii?Q?7NfSSdQzCjG2D04gXjMIMURVcXt1zZPADcOZEqGESguNmGSupx4VnGK4KeVp?=
 =?us-ascii?Q?ehCVYmbcoUcrWJkAtF2AXjDREVaocoFjM3hXf2aWDS27WXnc3cmCJ3pinzxK?=
 =?us-ascii?Q?yAFQ6dK/f8rkagnE0ygmpDFUNiVm34NzIjug4E86ViBwt3r2SaBD3nrOzaif?=
 =?us-ascii?Q?WapT96OaOSvd0QBoodf3InH8RIHUgOE77MFALFXFLqMnCW7+8Iw4n/uqNhZi?=
 =?us-ascii?Q?qD0sfH8W7dLcSj0TctMtbVUZAb8DfZ4OM5qWLGO7+hVyYX3EzsGJaj2MYEry?=
 =?us-ascii?Q?wvhotmyL3Z6GMT10xBt8QhZ2xQgapUbTkCLSe9WwPjWd8DLdOiZAV/xKN6Tv?=
 =?us-ascii?Q?oSj8L9m/PPXvYGwiem4lNzGL4Tmbl0PG+MXDgADUPKSEKJ28brWIRwr5ugof?=
 =?us-ascii?Q?mMTczK+zoEfu4ZCK+H2ysPHcAvrUPjmjuF3jrm48bxFaWMxi1P+hlYPZbIU7?=
 =?us-ascii?Q?8PfEBGZnICda+qwwjnR4Su1GUBSDNfJjR9dYVA8TIY8GByKtuqQTUW+dPCqp?=
 =?us-ascii?Q?/Y9IzVcXW2R5EAR8tgCUblK3L3TRJWwWcINc0LutPtVV+iVZvzpuXAdI02b1?=
 =?us-ascii?Q?1u5YG+si2NZSxw/izr4/R/1h9hnneE+QkQW2PprAuQdVEjqVxGHhbng5D9At?=
 =?us-ascii?Q?FBP3tg=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7c82dc95-0883-41c8-cf70-08d9b6c18b91
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 01:01:03.7787
 (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: l8G0FSAJCz7yTJja5bLQGr3jdZJ+UcbcUzje/9Eq7TjJAVZyfkpRAZ3O3gnCgCAKNxbzIgEiLs4cVc+FxqR+YR8u/hIaOAwZqCbl4rf/1aU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
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