From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        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>,
        Ioana Ciornei <ioana.ciornei@nxp.com>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        Lars Povlsen <lars.povlsen@microchip.com>,
        Steen Hegelund <Steen.Hegelund@microchip.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [RFC PATCH v4 net-next 05/23] net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Date:   Mon, 15 Nov 2021 22:23:10 -0800
Message-Id: <20211116062328.1949151-6-colin.foster@in-advantage.com>
In-Reply-To: <20211116062328.1949151-1-colin.foster@in-advantage.com>
References: <20211116062328.1949151-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?Q4HE21y+flLrmutA2vHKeSWMBqCAHu/BQVxWMBpWq+FfwDKQmfJW3VdwTVYn?=
 =?us-ascii?Q?QuA8HsNSlO42s/gNDdP+3AK52/qIOnuoUAcx80NzYrfXdiX3ZnewN1jiX31P?=
 =?us-ascii?Q?zQHqSBx14ZTaV56CbvjJS168V++g9Jva45jmoPRyoPJJbNkoBXYsyGZg9ubw?=
 =?us-ascii?Q?VUQo8E4JblJkzwoOKAHzH4hSupWufieQe1FqIX+Ltj3n+o5DyL5nh68Ul6yR?=
 =?us-ascii?Q?UegX5hUHFRsON4SZ9OXbvCITytQ3KPnMPrk2VyN0KSGcjbZjsoh4gYLNF6vR?=
 =?us-ascii?Q?mt9UogsrtKbtPWPSQOnBexmt1m25p8vKLgx3ZwG9SHDjDiwLKX7xCYU3B5zo?=
 =?us-ascii?Q?wKdQxmRmLefu5XmHQlAj+Xje+kzcgtfBeHpZwSeIcT7IJxnpyHD7lcxoL4DU?=
 =?us-ascii?Q?L2c27yHppAaeXfE23DFobfKjtzHHT/KUESbPsM5O6gpNQdiE2m1XyP3xH6Bm?=
 =?us-ascii?Q?s1BLQuiow8TXLYTFmplZkNVFV5RsRNmtXHkXUasAYWew9v6PqNl3n4jGQ4gj?=
 =?us-ascii?Q?vqLbcaAir7d8Al31VCnufG86tVfBjRwyBuXJdE1C8Jbxd2yoGFVmcWtIHk38?=
 =?us-ascii?Q?bhIHEeyW/tXOfAfcrQXBeDAH2ZMmSt0P8qro5iQUloVpArv/gsn6aUVo+IZk?=
 =?us-ascii?Q?/rQll9RMisuhNpHh0R1craW2GU9CSQiucL3axfbUibVGsDT6paTJSgdOIuGM?=
 =?us-ascii?Q?9/x4r7ZZug4Zug2YguUI2RVA3N9mdpmGbAlRGjAeFI8rJsNFdhyQ9dDdQ4tm?=
 =?us-ascii?Q?JgGdHSCLI8zAskl4VjYob5N/IGexDT/gsj3v2PPHwCYQCLMn0lW3ilAmLKIF?=
 =?us-ascii?Q?bGbhEnoSl/d291UvdvKYC2iMFwEVBA5LWPnr7nxonRxjfKBAfh8/ylFgRy/4?=
 =?us-ascii?Q?FTmBbBlUFVOduHlJTUyBr47ifdM0m0muv1LlHeHnnkltmRC/5zD5F8MLOF0H?=
 =?us-ascii?Q?IFGW51p3GBYIiCuvG1NZPE0e8o77MC5rCVgBHdD/9Nipc/n2ZFfoIWZlVmJ6?=
 =?us-ascii?Q?tXX/hFqHqNL4CVpSJNcx0MU05gGb4Z9VT4kvLA9vihFHhqARctBlwqoeV4nd?=
 =?us-ascii?Q?ank+fCZVl71b1mXlYbotFCH5A18pYNBPbJZ/Q0XJIv6L+da6LJ3JKl4SV3ij?=
 =?us-ascii?Q?EsRZ2aj+OTuFYr5ZrOEAV7aEYaEnSiBIpPa5l6Ue/9MQQ69vBNvv93mUClk2?=
 =?us-ascii?Q?QM+NEx0/EQHlMj9kJ/n+xUlJ83iLJ7ajjdUVLfxk6bsF9Xh11C1bOuk2kzGK?=
 =?us-ascii?Q?oD7z4bPKVQX/I23rqaJZBLsBdUeNW2w6lXE+ml9mkUovNp1pBGMmzC0JnYpI?=
 =?us-ascii?Q?AOaUduFFXM1L7CuG75eYl1Ym1p4tih1FQrrBrUHB7mV9bCXZCsuWUFcYKkVB?=
 =?us-ascii?Q?oAHbGjqhgE9yIsgKz/loRuQuFVFZK6MBCLS+eeNqxyUTJ3EZLIoaNFWEppOC?=
 =?us-ascii?Q?5qGeXTJYJ6taqW/vzTjGiBtRtZvzso8BZuFsfwglDa6MgpwF5btNkKNscH4v?=
 =?us-ascii?Q?Tb3GH85hiXl4ONJnIarSj6ej9iYDXjn74uB1pgKu+/PH3ZE7PTFVBE4caTp8?=
 =?us-ascii?Q?LGjBS0u7g+pTAbTNFlrG/d0cJpSXoMvFnJ2wFRsyc9RFS0J70QG2yK7U0BFH?=
 =?us-ascii?Q?HBpHJTOTEqqtOInIsl4jSs/2XsDMMxxScZ2NjUUR67if8qKQauZklq5qrXiY?=
 =?us-ascii?Q?zOLZUkOpBm0TavwTh5tKymywgIo=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b8b16ef4-2d3e-40c8-aef9-08d9a8c9a4fc
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 06:23:46.1300
 (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: jIMUoFIvcDTew9fHwKdmaYZiof0uAolbpj3EyaBmnhDSWFvmMsuIqDep2SBoddOI7NkB9lMtOvzQ40FifKB1ecv96Gbgz+hCP+xght3NLUQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2383
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 327cc4654806..94702042246c 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