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 v1 net-next 2/6] net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Date:   Fri, 19 Nov 2021 14:43:09 -0800
Message-Id: <20211119224313.2803941-3-colin.foster@in-advantage.com>
In-Reply-To: <20211119224313.2803941-1-colin.foster@in-advantage.com>
References: <20211119224313.2803941-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?xNwn8ti+dqTu8zKwSm9ZmUZhR6DD+8XW9L69tlJ6f41MlKj6osfiyYdV9Urh?=
 =?us-ascii?Q?+whBivUh0lAbpwwl0P3LgFIAlRvCJZpYOX8Xt8MC7QEzBZFaoSqUf24ilpjD?=
 =?us-ascii?Q?mVjkT8zC7zeMUkWYoNs18LXsCQJoemJG3C8yhpPuYS9VrhXxoJN6EofKqKFm?=
 =?us-ascii?Q?NzekzqABa2tOsv65jX8iQNT3/54g4PTFjuBZRAOrRwYQ9eEwttILMdo8pBeD?=
 =?us-ascii?Q?Y/vm9NrywSUlQME1oKZ5b19ePPuVeX6FxLriIRCy2O7ukAoDb8oQSbZ0pSCm?=
 =?us-ascii?Q?QKUyij1C1oR6WmKy0taZECXUyb+V1BbMonsQfpHtfslqmy3k1VOaS36dBXrO?=
 =?us-ascii?Q?BS8jymYK/70sgkevwpQk3XQCTvwXbM1ANoPqfs1wEOYNHn85y0EHF3G7jHAW?=
 =?us-ascii?Q?olm32StHd4/RVNAx6PjiVXKfC5GBoZdWvqwpkn0AWWMiDmofB2UF4K05KLBP?=
 =?us-ascii?Q?dStwy+XXwkPjME2h5YlqbOka2rxjhKMxF0YUuDF0qD6b2TShg7XQvv25yGFS?=
 =?us-ascii?Q?qOBtpZxM5uVdtk3QtXk86dy5/tkzW0XnD5PWXm2rGvvGJoBFSdqxGHr3yDc3?=
 =?us-ascii?Q?veGMXCqmzXi3vKw1sdlBDMr+oAAytdWTJ7uGasVsb0U+gZunt0x5QeJAUA4u?=
 =?us-ascii?Q?dX69i3m06b9Li4YG4YSJCrf0UGiuU8wtyM5CiJLEKOrjXjZ9dSC8s8AUsk8d?=
 =?us-ascii?Q?ggKgmZE07o530HBmOf3Ty0pJ7t+2vrZqC8boMpRHgzhFshyckASvA2mUnmq5?=
 =?us-ascii?Q?zY/GReU0JjbOPRyeJ6DBBKvSFz8Dj0COtdUMlH4MFAoHFLKpUgY5ZY5Uh/q9?=
 =?us-ascii?Q?qxo/dTVjcj6Yb6U8zMm1LZlqiQ5lTlNTN+Y4b301vYNPxIGStG9h+t9BV55X?=
 =?us-ascii?Q?mDc0Pab/vhQVPd7/mUFsgwo/mOVxzBCg2KFwHd8JAFqDA6r6XbvOsnUGuUtb?=
 =?us-ascii?Q?X8ik0z0rEYAOQC1Ho/SS+1eH97PbahpdgqAMMunfcMvTEoXtfAgtMhIFNm/N?=
 =?us-ascii?Q?Lu+cTsa9Fe+fZ9Xa6dRPK9RaM05s44aV244wR0U4lHMWaKvoHwkxJBVUNA+0?=
 =?us-ascii?Q?LwsJGJESAseJuC7S3GAMWg7K/MnnfNk1XFBcNxW31K9iik16tnKrsuaolS1Y?=
 =?us-ascii?Q?rpKBUruuRyT65WxGTih3tE/HBPMpEsMlFD7hwBo6G8mkO5ee4vJwrHNQBc1R?=
 =?us-ascii?Q?+Ky1J78fQsVQDO427zkbimcMXPX6ggenA5zaT9j48uKg8R1dmrNfHXBKCpMY?=
 =?us-ascii?Q?Z0bJVub72Tn4MDIUvniqYjGflgZ3/vt9ojWdQJ+ZUETMCCk+yYsOl+1MI/rB?=
 =?us-ascii?Q?SZQKKWZJiPgqzHMdH2XE2H47YZj5WDsuJZbEagzK3PEzxWG0RJeDxOcUeVA3?=
 =?us-ascii?Q?3rTVE4ve+YL5iVJS86wh+kmypwQs3SZYacWV8yJkzOHCXKmb2YLPKFMEsycn?=
 =?us-ascii?Q?/0sApMMHcu3aKvGjhvJ8Fyjx7MZuwW+YsV6PRPQWJxq4e6EfKoTb6ntY0mKw?=
 =?us-ascii?Q?jcMXsbtpz6G7oWXl4W+I0GxcENJXAuQWgWR/QSkpu4SYfO+4lrm4U0fm9MVX?=
 =?us-ascii?Q?H6VdLZpvlp7yETm4FL+Ef182N5//r5MYhSUx5TTrLtqmDLG4zqHBsy6s7UTB?=
 =?us-ascii?Q?nYG9amFyvsEjpE+DGWC/6XKJPeQOrONZrpvRobDr6xLH1qIlgfL8z07hW5h/?=
 =?us-ascii?Q?T6WFlOhqyl5ozFRXxhYEaEKBjTE=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 02a61b92-4999-4837-3a90-08d9abadff7f
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 22:43:25.5345
 (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: QKWFqjTPmscBtSMSYJionEtP3WbUiyTGt1aTn3jpiL668PQP1W/c+L1hasmFDLRJbqDgYUW1KncGB3UFgl67qbgotpskB+t5hTxZlXHmJjE=
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 e487143709da..7b42d219545c 100644
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -820,7 +820,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