Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Madalin Bucur <madalin.bucur@nxp.com>, netdev@vger.kernel.org
Cc:     Russell King <linux@armlinux.org.uk>,
        Paolo Abeni <pabeni@redhat.com>,
        linux-arm-kernel@lists.infradead.org,
        Eric Dumazet <edumazet@google.com>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v2 09/35] net: fman: Get PCS node in per-mac init
Date:   Tue, 28 Jun 2022 18:13:38 -0400
Message-Id: <20220628221404.1444200-10-sean.anderson@seco.com>
In-Reply-To: <20220628221404.1444200-1-sean.anderson@seco.com>
References: <20220628221404.1444200-1-sean.anderson@seco.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?2JW76E8upatzGyOJc1lGdxijCapAdzhNOG5i9a7LZiYrenEc8+HjiVwDp5ei?=
 =?us-ascii?Q?z+7mJYkfWrAkktNub0O9dAXQul7p1Zq6O2dJI+dVNpOqWMWLTtlinBTafsQT?=
 =?us-ascii?Q?+9WY18VbXixmVf4a8rUyHdgDIK2TvItYbmgTIVAtAPemb9HlVItBxCS/t6jw?=
 =?us-ascii?Q?eGGSVOyrdrnM7Hy9K0oFMzO0Gpqoa6bTMNpMWxnmI6eebFlidF7Z4wFABxwr?=
 =?us-ascii?Q?DmqQhNkfgHPv/m/t2PsxRxkGKj6+FMePkVPqHFpzivy7bBSGToBJYjHg5hCP?=
 =?us-ascii?Q?ws1FCLMVvSs1aRo9OyztUJBLGrVcInOmvR70zSap/s8iDgvstxUKnuOs1tv+?=
 =?us-ascii?Q?OWvV0KXKtAdQfmdW54vRsuLGIkrRh1a9mSzMydS3hAIJuBLwRr0AQDwcyV7y?=
 =?us-ascii?Q?td1Z3f8p1Uw9tb0JRkIuoMW/UyS2tc+MftMkNJRhBNtzrdyv9bAj3EGfwdKL?=
 =?us-ascii?Q?NFFrnSX6ePPYJF3RrJ5iK1GCTTgqdjqD8b2orZKPe1GSypPoDPr/sooE3Gv2?=
 =?us-ascii?Q?XXSiny3OvdTd1lbA6c14Px75zXNHdroVKB3gDo5zSYkuYTwlRJu5cyw4mV/y?=
 =?us-ascii?Q?QDRgzRftlzVLjGM01WQV+iweDPa/D+1js0BwbSrYfqN2CY5lJ7mq93RP/arM?=
 =?us-ascii?Q?QAhHIJi0w7xS5tX8ammpywz1DuCDu3QWC4SLcG+EGIN0V6O/3klnPXDQB/wk?=
 =?us-ascii?Q?1byIZcAJEFL6QC7oWsFKY89PYngaAlQ0JJxSlWqEuJBu1qlfR+tMWtLPpBa1?=
 =?us-ascii?Q?bTdy/DSF6BvmKwmT6OqYiJYkWw+TNU7yasY6FiRTaFKh3DJKMrGOkyhaiCg4?=
 =?us-ascii?Q?xQbLaRJMxZFoLwIOx7n75pYLojXlLgVajvnYGe6Bus/gi9du7Du/zH9RZzCk?=
 =?us-ascii?Q?0f8yFPJfmNRB95yNU3PMQzdcudqK5hpZxfFP32SneEYpyvf4EHOiH7Nm1rfL?=
 =?us-ascii?Q?l8YRmfwrakPMrl3LJrZ96x1QfJ2efSL+VfTCilxzP1NbZDgICshRJOZIjvLR?=
 =?us-ascii?Q?FrKVReXXd1ciWuN5p14Avvk+LEgtix6bsph+pfPA5TlDbpEBRTRflgirf6np?=
 =?us-ascii?Q?CtACr2iuHayEeVrkWWA8z5SOYT/FLJHN4sRVoNfXtYcards1VIXV0AGsv8X0?=
 =?us-ascii?Q?ISB8wci4h2V8Ptj1SpqIp8d0Cr9j9Sk4BrUxiB+0UmQk6k31GNpV5BpeEO3O?=
 =?us-ascii?Q?DRSUh9w3+p6jalUWsHe+TulWcnWPgps4VLJ/88aDteuo7vuQmFi7JZAir/K8?=
 =?us-ascii?Q?XsNr6r3nHEK7W7sln8weSihwMNXGRJtpyP/Uvl3WEtMa+b8mECl/nI/RbkqK?=
 =?us-ascii?Q?tbEjWeWPCNgRWxI/6fxUgioKIRP3uT4qw8uTJoBcuHU+JoPdQ8pZwv52UxzL?=
 =?us-ascii?Q?H4fT7C5F/hadBn0R/fkMiOr38wvz1qgrcT1sJXAYSCFoiSYz0WZEEDQA775l?=
 =?us-ascii?Q?G2UxV99HSwmcqvOnF+ekNO3avzcTKTY22+RZ3Fjt5lo8fAZc1OfNMCk1R7Mn?=
 =?us-ascii?Q?SMywBuAHpshHVHY5c65Mvj324nmpnIH8shlerAHvpo3Mf3ZefMeETGfJe6JB?=
 =?us-ascii?Q?SB65sP0ZMGmCFqKebf/KU+vJ/wnCcvCGGwpbmTDsQSLyBNBXmc6mh8EK8rTE?=
 =?us-ascii?Q?bg=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6ff96db7-9063-4b5c-1098-08da595394ef
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 22:14:34.3605
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: icMy9mXW8sJh1oJSxPhTGwd31n87BgdnWdWvSNhmZy7RNU5z+P6PLNbcVxDCrVLeGacItse8MjvbtbZC0kyW9A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7399
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This moves the reading of the PCS property out of the generic probe and
into the mac-specific initialization function. This reduces the
mac-specific jobs done in the top-level probe function.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

(no changes since v1)

 drivers/net/ethernet/freescale/fman/mac.c | 19 +++++++++----------
 drivers/net/ethernet/freescale/fman/mac.h |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 6a4eaca83700..0af6f6c49284 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -32,7 +32,6 @@ struct mac_priv_s {
 	void __iomem			*vaddr;
 	u8				cell_index;
 	struct fman			*fman;
-	struct device_node		*internal_phy_node;
 	/* List of multicast addresses */
 	struct list_head		mc_addr_list;
 	struct platform_device		*eth_dev;
@@ -85,12 +84,12 @@ static int set_fman_mac_params(struct mac_device *mac_dev,
 	params->exception_cb	= mac_exception;
 	params->event_cb	= mac_exception;
 	params->dev_id		= mac_dev;
-	params->internal_phy_node = priv->internal_phy_node;
 
 	return 0;
 }
 
-static int tgec_initialization(struct mac_device *mac_dev)
+static int tgec_initialization(struct mac_device *mac_dev,
+			       struct device_node *mac_node)
 {
 	int err;
 	struct mac_priv_s	*priv;
@@ -138,7 +137,8 @@ static int tgec_initialization(struct mac_device *mac_dev)
 	return err;
 }
 
-static int dtsec_initialization(struct mac_device *mac_dev)
+static int dtsec_initialization(struct mac_device *mac_dev,
+				struct device_node *mac_node)
 {
 	int			err;
 	struct mac_priv_s	*priv;
@@ -150,6 +150,7 @@ static int dtsec_initialization(struct mac_device *mac_dev)
 	err = set_fman_mac_params(mac_dev, &params);
 	if (err)
 		goto _return;
+	params.internal_phy_node = of_parse_phandle(mac_node, "tbi-handle", 0);
 
 	mac_dev->fman_mac = dtsec_config(&params);
 	if (!mac_dev->fman_mac) {
@@ -190,7 +191,8 @@ static int dtsec_initialization(struct mac_device *mac_dev)
 	return err;
 }
 
-static int memac_initialization(struct mac_device *mac_dev)
+static int memac_initialization(struct mac_device *mac_dev,
+				struct device_node *mac_node)
 {
 	int			 err;
 	struct mac_priv_s	*priv;
@@ -201,6 +203,7 @@ static int memac_initialization(struct mac_device *mac_dev)
 	err = set_fman_mac_params(mac_dev, &params);
 	if (err)
 		goto _return;
+	params.internal_phy_node = of_parse_phandle(mac_node, "pcsphy-handle", 0);
 
 	if (priv->max_speed == SPEED_10000)
 		params.phy_if = PHY_INTERFACE_MODE_XGMII;
@@ -583,14 +586,10 @@ static int mac_probe(struct platform_device *_of_dev)
 
 	if (of_device_is_compatible(mac_node, "fsl,fman-dtsec")) {
 		setup_dtsec(mac_dev);
-		priv->internal_phy_node = of_parse_phandle(mac_node,
-							  "tbi-handle", 0);
 	} else if (of_device_is_compatible(mac_node, "fsl,fman-xgec")) {
 		setup_tgec(mac_dev);
 	} else if (of_device_is_compatible(mac_node, "fsl,fman-memac")) {
 		setup_memac(mac_dev);
-		priv->internal_phy_node = of_parse_phandle(mac_node,
-							  "pcsphy-handle", 0);
 	} else {
 		dev_err(dev, "MAC node (%pOF) contains unsupported MAC\n",
 			mac_node);
@@ -783,7 +782,7 @@ static int mac_probe(struct platform_device *_of_dev)
 		put_device(&phy->mdio.dev);
 	}
 
-	err = mac_dev->init(mac_dev);
+	err = mac_dev->init(mac_dev, mac_node);
 	if (err < 0) {
 		dev_err(dev, "mac_dev->init() = %d\n", err);
 		of_node_put(mac_dev->phy_node);
diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h
index 95f67b4efb61..e4329c7d5001 100644
--- a/drivers/net/ethernet/freescale/fman/mac.h
+++ b/drivers/net/ethernet/freescale/fman/mac.h
@@ -35,7 +35,7 @@ struct mac_device {
 	bool promisc;
 	bool allmulti;
 
-	int (*init)(struct mac_device *mac_dev);
+	int (*init)(struct mac_device *mac_dev, struct device_node *mac_node);
 	int (*enable)(struct fman_mac *mac_dev);
 	int (*disable)(struct fman_mac *mac_dev);
 	void (*adjust_link)(struct mac_device *mac_dev);
-- 
2.35.1.1320.gc452695387.dirty