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 v4 net-next 2/5] net: dsa: ocelot: felix: Remove requirement for PCS in felix devices
Date:   Sat,  4 Dec 2021 10:28:55 -0800
Message-Id: <20211204182858.1052710-3-colin.foster@in-advantage.com>
In-Reply-To: <20211204182858.1052710-1-colin.foster@in-advantage.com>
References: <20211204182858.1052710-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?LXmMlpyfmBszqzVjw2ri5ZDvFZcpCLze1SpOer0f8osT4tGXkmVvl83I7UIn?=
 =?us-ascii?Q?n0BJjQ8uduYZ5V0bjYj6A3BL3IDRhLxDF+fDaLHsnWfggWcUCQyNGHdZQsCo?=
 =?us-ascii?Q?dI42XXigCbruDk8aX3p8PcAOoZZATjyNt+kx21XJ0akdUpwXa61lndYVHBz4?=
 =?us-ascii?Q?xCq8Jq7tSd2JdDwIU19tncri1MzsagOhWS0PvJYsuhPkCsvun6cLCRVNwXSP?=
 =?us-ascii?Q?+YdNBP6WiREcdkR1EefZiXRfpKEPozMB4JQaV5UEGiJK7J5xij81yezWxwh9?=
 =?us-ascii?Q?0UMUhzemSWKSrL9Qq7xcTfGvrCaRP0jItlDQeC2smBepnvU6AE1ANUGa9/d5?=
 =?us-ascii?Q?dlUOuBqquK+uv9vOtYMnUXgerf9gycs/Z7WL/ZVBcJ23I5lD5nBuH95nuoK0?=
 =?us-ascii?Q?fMH62xcoKijCDX0g1pwHgvwGnbyB2WVPlYFheaiEHRkmsP6uJfqK+gby+zOt?=
 =?us-ascii?Q?RGW4/dtuxJy+HvIz37clYsWzyHc9foQYR9OKSbwipkEq6Pduv63iQFw0F8Ev?=
 =?us-ascii?Q?F2rMc801UXMmegBdtFRC4kzlxKsrm7x7J4VnRFKwmGxSg0eeCI5KLmuokG2h?=
 =?us-ascii?Q?nGrfZQf6kqxQaA6Duo956KXqZ1o+X6GMZn1bJYOP83rxE43IzWfx82/bn/Hz?=
 =?us-ascii?Q?8r1kYgkKn+MncNUi8IK01jHP3WRyL94G+mnGuUsLGfDRhKLWw9K41YS4fkrI?=
 =?us-ascii?Q?u0fiI9stuMWZXBfIzEWn9ajfKs0PqfeIzmQAie1rsf9qH4WeMfIqifNaIxd8?=
 =?us-ascii?Q?Dmb5HvZfZAVFNO/u43GRa4vfm+ONBVuXzlyIkArv9vUyOnkNrknWK9rjqfil?=
 =?us-ascii?Q?bmijfnAZLhpKE4wjX9eDQUS/pquE17otNTxYitO2fvPa7BntuR3V1gjoZBYX?=
 =?us-ascii?Q?Z4BNeVCIDOK9I+Nh9NNNBeQApHQYzN+5sRIUB/A29XLdSluVZY2vb8oTTdIL?=
 =?us-ascii?Q?o8zEFXXcF2j5Kn0YkwjvSKNNz1tKSkqXJ01C2Eo0G0uY5+F4k6RuF8d1ma6O?=
 =?us-ascii?Q?4s1KF25fCkdzrwnt++qAF/9DpYHDhn7g8SzGuOl+blFtwtoodIAfT3ES8AC1?=
 =?us-ascii?Q?WTRiWoeQ+3vjuMCI7cwEvxtFIMiI3IcAJS0PXFc/IZ7E9cFWbj5aK04CQt6q?=
 =?us-ascii?Q?dpTUxHDPEeS0g0h19VJZlfGrlZgOX2WpU9VxF3mr5ouXnb36vm1zbsNdKG7w?=
 =?us-ascii?Q?SY74+Z4lkvRARi8e3jgTWLZQJ8OCgW2tl1JL+hr3dyjzCtgY+MDwau2bVg2y?=
 =?us-ascii?Q?OcfZMnlrgUaAyOQRcXEGO7KkZB+tFDw5o00LddAK7V+1KDfnusneNh3mxr7F?=
 =?us-ascii?Q?loK1ARf7gUXLMXVP8mkfHc8P3CmeEjbI1Xri0T0QOWtGAY3BsmXiLLqX5XtR?=
 =?us-ascii?Q?143qFmDbsB4TiL1QYYqa00wNjpsDfkenEIZ8P4T1oi5QbFlIuZczsA2ELU5X?=
 =?us-ascii?Q?bkKhcCKeG3NkcDkJc8rgp+3BiNAcNTWoxdrliEQvE9lVUudo6KN7GSYkg6n9?=
 =?us-ascii?Q?tE7QL0Hoq5l0sV/zj9Pf7Q8oii7hvLVgsmyzhiX/7TVcWgLoqubDBVpiGSUf?=
 =?us-ascii?Q?GrvjJDwQ7o4BVvjgU0E3UB23VaKgGKKx9Xb/pQlpFHPu6f4lZZ/RoC5GfGss?=
 =?us-ascii?Q?XHTO5EdQ0wcudYnOXIP3Qwu/MfIY18AWT6GL39ImfDIyx8gSGzJk4WDJRTtR?=
 =?us-ascii?Q?AU17El6plrIjrpLLw6lIec3CB2E=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c8685568-f2c7-45f4-473b-08d9b753f669
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:29:09.4848
 (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: tatz5AZuca8erRA6CegRvIuiQJoDobkAuY6Om7GzSLE6RIGZ5xYjGqImW+X8dpfCIk32jHNuUHrS2FeaJHRNSobYyp/1DuZ7aRXNm/XWzbk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2063
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