Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Sean Anderson <sean.anderson@seco.com>
To:     netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>, linux-kernel@vger.kernel.org
Cc:     Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        Sean Anderson <sean.anderson@seco.com>,
        Claudiu Beznea <claudiu.beznea@microchip.com>,
        Nicolas Ferre <nicolas.ferre@microchip.com>
Subject: [RFC net-next PATCH 09/16] net: macb: Move most of mac_prepare to mac_config
Date:   Mon,  4 Oct 2021 15:15:20 -0400
Message-Id: <20211004191527.1610759-10-sean.anderson@seco.com>
In-Reply-To: <20211004191527.1610759-1-sean.anderson@seco.com>
References: <20211004191527.1610759-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?VoyvYH+dilqBF9kihCWdHvLtwBIIwfevLdGtL4uI9d5U7pNYOXSGcjVixGgP?=
 =?us-ascii?Q?FC9XAKxhjFk3Ssxtw1GcvRBWNGjKdMLWfFlF0tIE4MIYEPevdHefv+S7lief?=
 =?us-ascii?Q?6ar86AVRv9kIsscrbJjibD+gYv4AwIObH+k0jJ2IsI7TrfRRh2giDScG7VCX?=
 =?us-ascii?Q?zk1Qc8rOidTWuoXS7L2MjacHTzYEAlP5tcF74FSqi1OUqCS3IvchredJlyzf?=
 =?us-ascii?Q?w2J8VU3qGevSjWgC8/FKVElb9LnPLOMYUTCbpalgG1vVKGWlvjyG8xcCh/oN?=
 =?us-ascii?Q?3IhRZsJjRhdocm0CIg+LPeDr/SxtoOFpNCkcuavtaVDHldTuC78X/RZpOf6N?=
 =?us-ascii?Q?AyGpt4oieLzySQe4t/qt5YDhbmhqHlXOBzk3y3IC28icxo2uQiPo6YcTPKFy?=
 =?us-ascii?Q?/QfHuoNNfP8qvc3Gn4OW0gP422kDCERIhlVxxuFnRI0hf1WArYoyU4xyNMG3?=
 =?us-ascii?Q?t/Dh0DNPwgtyz2WKtSj0/GYDED/tU7RLxX+zvTcYAOd7FTdYJM4g0OEcGWJf?=
 =?us-ascii?Q?GWkf1y+2v+0sv499pKJ909c8tDYEnuUvGpYHN5omKKBmai/zxC2D1DhcpryI?=
 =?us-ascii?Q?oAfLTHS+8nTTjC3X9IfAVZLBqeBg1goJzAlkDjonyDJAAWGqpg+8XuLVSL6q?=
 =?us-ascii?Q?T4tHkK17gdJ2uOHFlGRR6GsLE6LYRipw/PfWLozWzGcsfxo/GR1WUjYlN0q2?=
 =?us-ascii?Q?PJfkg29/9rA1XrEkweOmJgdR9tnbQpKlRjK5R69NHZCSZrPopx3Lu0XqZFXp?=
 =?us-ascii?Q?YbXeaP7W0Iv0WfEFaIjZpeQfFBonQAPPHL7wgrTj4tcFZ9rT+y5H3TvJLU9T?=
 =?us-ascii?Q?miAMpLgQKFqWHACIanPrWQj+TvqbuSskbFUpMYlQhZhqAIvcikuUQ9zLPKo1?=
 =?us-ascii?Q?BWqt0OUET3+5zu71nY4S1bkSnEm9joyMgxjNA6o4+3clrGKH2kp3c1C/bVuf?=
 =?us-ascii?Q?1EQ52nKCuHtdaW3xlo5P0JN/MMIdcgoypi2AqxqNb/QvONCDhURpHxFQoXHC?=
 =?us-ascii?Q?Y3Kz15cVZo8zwVwMu0oxO3f5oaE7bKKUzsYcUKF9U4ixZ+7McXMw2jKJ12vK?=
 =?us-ascii?Q?e4fA1AKir5lASqsKpjDfDpn2O7o7XX9KI/ujEc5YRI4yTFTWtszGsqlpzugy?=
 =?us-ascii?Q?HpP+aXrjSAUX25038o8fOrQ+OG7DPIfNr8+OzxsB06XFoUrDkJ9MYt32jVhO?=
 =?us-ascii?Q?fq0uQ4GOZnwcnX3glfPFHz9LL2Ntzzdni2QKRP3ObiyX81WUjvBR2wcay/+/?=
 =?us-ascii?Q?rjFjzfs0JMibsVkyyoNk/Mo8cn/ib2TiggDzT5ytZa3iEI6AaTfLx9YvFGNt?=
 =?us-ascii?Q?m9l2WrR7rPcsHVy3V6aQga1r?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 01029646-a41a-48a7-4a82-08d9876b672f
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2021 19:16:01.2732
 (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: 7AWGk8Lztci63Bd2QFV9Iie6C9ter5WT/e5WqjiasnZjtUVMlrSNnViQlImD6AtCpzuaPc40gouPB6IWULnczQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR03MB7434
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

mac_prepare is called every time the interface is changed, so we can do
all of our configuration there, instead of in mac_config. This will be
useful for the next patch where we will set the PCS bit based on whether
we are using our internal PCS. No functional change intended.

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

 drivers/net/ethernet/cadence/macb_main.c | 67 +++++++++++++-----------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 18afa544b623..db7acce42a27 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -652,42 +652,10 @@ static const struct phylink_pcs_ops macb_phylink_pcs_ops = {
 static void macb_mac_config(struct phylink_config *config, unsigned int mode,
 			    const struct phylink_link_state *state)
 {
-	struct net_device *ndev = to_net_dev(config->dev);
-	struct macb *bp = netdev_priv(ndev);
 	unsigned long flags;
-	u32 old_ctrl, ctrl;
-	u32 old_ncr, ncr;
 
 	spin_lock_irqsave(&bp->lock, flags);
 
-	old_ctrl = ctrl = macb_or_gem_readl(bp, NCFGR);
-	old_ncr = ncr = macb_or_gem_readl(bp, NCR);
-
-	if (bp->caps & MACB_CAPS_MACB_IS_EMAC) {
-		if (state->interface == PHY_INTERFACE_MODE_RMII)
-			ctrl |= MACB_BIT(RM9200_RMII);
-	} else if (macb_is_gem(bp)) {
-		ctrl &= ~(GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL));
-		ncr &= ~GEM_BIT(ENABLE_HS_MAC);
-
-		if (state->interface == PHY_INTERFACE_MODE_SGMII) {
-			ctrl |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL);
-		} else if (state->interface == PHY_INTERFACE_MODE_10GBASER) {
-			ctrl |= GEM_BIT(PCSSEL);
-			ncr |= GEM_BIT(ENABLE_HS_MAC);
-		} else if (bp->caps & MACB_CAPS_MIIONRGMII &&
-			   bp->phy_interface == PHY_INTERFACE_MODE_MII) {
-			ncr |= MACB_BIT(MIIONRGMII);
-		}
-	}
-
-	/* Apply the new configuration, if any */
-	if (old_ctrl ^ ctrl)
-		macb_or_gem_writel(bp, NCFGR, ctrl);
-
-	if (old_ncr ^ ncr)
-		macb_or_gem_writel(bp, NCR, ncr);
-
 	/* Disable AN for SGMII fixed link configuration, enable otherwise.
 	 * Must be written after PCSSEL is set in NCFGR,
 	 * otherwise writes will not take effect.
@@ -797,6 +765,9 @@ static int macb_mac_prepare(struct phylink_config *config, unsigned int mode,
 {
 	struct net_device *ndev = to_net_dev(config->dev);
 	struct macb *bp = netdev_priv(ndev);
+	unsigned long flags;
+	u32 old_ctrl, ctrl;
+	u32 old_ncr, ncr;
 
 	if (interface == PHY_INTERFACE_MODE_10GBASER)
 		bp->phylink_pcs.ops = &macb_phylink_usx_pcs_ops;
@@ -808,6 +779,38 @@ static int macb_mac_prepare(struct phylink_config *config, unsigned int mode,
 	if (bp->phylink_pcs.ops)
 		phylink_set_pcs(bp->phylink, &bp->phylink_pcs);
 
+	spin_lock_irqsave(&bp->lock, flags);
+
+	old_ctrl = ctrl = macb_or_gem_readl(bp, NCFGR);
+	old_ncr = ncr = macb_or_gem_readl(bp, NCR);
+
+	if (bp->caps & MACB_CAPS_MACB_IS_EMAC) {
+		if (interface == PHY_INTERFACE_MODE_RMII)
+			ctrl |= MACB_BIT(RM9200_RMII);
+	} else if (macb_is_gem(bp)) {
+		ctrl &= ~(GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL));
+		ncr &= ~GEM_BIT(ENABLE_HS_MAC);
+
+		if (state->interface == PHY_INTERFACE_MODE_SGMII) {
+			ctrl |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL);
+		} else if (state->interface == PHY_INTERFACE_MODE_10GBASER) {
+			ctrl |= GEM_BIT(PCSSEL);
+			ncr |= GEM_BIT(ENABLE_HS_MAC);
+		} else if (bp->caps & MACB_CAPS_MIIONRGMII &&
+			   bp->phy_interface == PHY_INTERFACE_MODE_MII) {
+			ncr |= MACB_BIT(MIIONRGMII);
+		}
+	}
+
+	/* Apply the new configuration, if any */
+	if (old_ctrl ^ ctrl)
+		macb_or_gem_writel(bp, NCFGR, ctrl);
+
+	if (old_ncr ^ ncr)
+		macb_or_gem_writel(bp, NCR, ncr);
+
+	spin_unlock_irqrestore(&bp->lock, flags);
+
 	return 0;
 }
 
-- 
2.25.1