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:     Paolo Abeni <pabeni@redhat.com>,
        Eric Dumazet <edumazet@google.com>,
        linux-arm-kernel@lists.infradead.org,
        Russell King <linux@armlinux.org.uk>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v3 19/47] net: fman: Get PCS node in per-mac init
Date:   Fri, 15 Jul 2022 17:59:26 -0400
Message-Id: <20220715215954.1449214-20-sean.anderson@seco.com>
In-Reply-To: <20220715215954.1449214-1-sean.anderson@seco.com>
References: <20220715215954.1449214-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?BHoGofft4MwwswWPia0OQzgIvAABhS2KJO3lFl1rZw68dSD7GlBbDhXrzzsb?=
 =?us-ascii?Q?8xSfoo9suCs+4S/50XGMGMffsEc8Vhi1v+Xpx51ue9bH68lqvxCIrrtPEJ0J?=
 =?us-ascii?Q?HV1/AhfPrTdVu7rkmGC9uBrNxXWnz5gaVHPBj5jdwDzStqMSN1hDxh7+Vnab?=
 =?us-ascii?Q?reRYB+GQNcW3Iv9/1B3LVYTrFTVO/4WtvmqQxL+/lQZX+uFOwrmoWHEH+IMI?=
 =?us-ascii?Q?L2o0Hv7RrM6A++2724ZIgLdPzOOjjc4+ZrYHunm2cI9ViSzl4R91MECB7P3m?=
 =?us-ascii?Q?PTWFeyqUy1W3WA5OK0HDdFObXMI7c9PP4ndbgt5/V+nexd2bkb9Y6MfE26Gh?=
 =?us-ascii?Q?0Qd8bVrSg/SGZ7gvBaatipxobtdm+hWG/ADTNIYV/hzGaye1hnrQtD+t1Unk?=
 =?us-ascii?Q?HvV5dDSXtSUimW5f1BiDBgHvfHvlR1UVBfhMkJ9eZ+vC3CxmA3BEEhJEv0aX?=
 =?us-ascii?Q?n8Z/gBUoSWc04qNVKmiUvMVVtMq7bCmxJrSFqu3VfNH3g/d8wmqphu67+nAl?=
 =?us-ascii?Q?6pkxVIh6olPbD4C1j4b4v++INiVKBrGAbdBrCYtkKzlFniSc06wk7o2DWi+j?=
 =?us-ascii?Q?/38XEZeJOMp6g79AVVc0120U4ONzWN1kpw5BRTND+7+4AzcurYYjuRUR9QMs?=
 =?us-ascii?Q?InktqAUtRGXr6sbsEwEeSQTApRa8VN1bzRIiWLlo8934x9prPJsE1MNx22zt?=
 =?us-ascii?Q?hDyG/RXqa4P1gKpftDVRtUM3f43iK/8hZHdT41utaO9FdPzuRuY8MJS6Xxjt?=
 =?us-ascii?Q?bxGM5kWbwpStWqncmmNI1+KenNz/zUzcpFKB167CkAa+R6ZVzf+GVwGrLUYh?=
 =?us-ascii?Q?Kp3F8/QaLPWfZ55FiMWfwPAUISkuNbXtbcloSLSVFrv18ZAECAlcujCWkXY5?=
 =?us-ascii?Q?itXcQqbXiSfNO7fIFd9SwxeHYdMR7UojPQ9jiN4UZk7dQVzQr+iNJ3eqihMJ?=
 =?us-ascii?Q?rd4jFYIBVR9jOWw/nKHVTyax6XMB2D3b7EGFMKfTpYn57oRrMw424XYSrsUy?=
 =?us-ascii?Q?amFBM1gKw/1+UqtyUqP99RD2nRxPwoV92TpIzemlsVoO0rhDgoahKoGqj97u?=
 =?us-ascii?Q?7KfSaRKmTJPajHP7XOKZTFP994JSUFyI3bTUN81zoJkz7Cwv1pbB6IN4M+oJ?=
 =?us-ascii?Q?6N7xqjILLXetQN3huLiRE2yt11G243lCJj1HU65EEQIk4kG27cRKsg5Do9gv?=
 =?us-ascii?Q?ZjiunnL8OIKc6wVXVVEVt2yD9GSVKGAnEMekC7cjOkIyOdL4RkJlNwhziAkI?=
 =?us-ascii?Q?rQAsQnBNhnQtGug/tarTjW2tQg6WhXBj534XzAO+rZMQXmwkvWPC1Xe4PdB+?=
 =?us-ascii?Q?m8NXd7pekvpzOwiItJLE8qzUfmBDoU8khuakuikc/osST8XffM81BpDY24yr?=
 =?us-ascii?Q?OjgE6Ry43gnoZODl0TJlxzH1BU1tBQPyEtjh8+QlQN5oFSkhaiCqf+XNORcr?=
 =?us-ascii?Q?9b4L7wPdzjIBYzZSotvg0HcXhcJ0I2LStDBZOavs8nBMhpMmQpGhDZRNAoYz?=
 =?us-ascii?Q?LPXRmjmFtATDvmlkcewTK33zL5zvGHSzKK7My/Edi0OOShQzHYDZpJlDfgwQ?=
 =?us-ascii?Q?sQQ8fUUSaTJmeyFm7dBz/Zea/bbHAZudU7zFJXWxI7Y0GB32D4GUNbmFi6BZ?=
 =?us-ascii?Q?1A=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 01a67b91-6fca-485a-ec0e-08da66ad7f1b
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2022 22:00:57.5195
 (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: mg2fpactM/yv81ac8BZwFpc9Wl9Gn7uHhAZ2XpmBnmV7eoAfkY5UAG/GbDg4MRQ+qmvOV0uymLeEKr1oLSN0EA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR03MB8607
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 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