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:   Robert Hancock <robert.hancock@calian.com>
To:     Woojung Huh <woojung.huh@microchip.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>
Cc:     netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Robert Hancock <robert.hancock@calian.com>
Subject: [PATCH net-next v2 2/2] net: dsa: microchip: remove KSZ9477 PHY errata handling
Date:   Mon,  5 Jun 2023 09:39:43 -0600
Message-Id: <20230605153943.1060444-3-robert.hancock@calian.com>
In-Reply-To: <20230605153943.1060444-1-robert.hancock@calian.com>
References: <20230605153943.1060444-1-robert.hancock@calian.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?5LCHQihWLhcKRfnQjOqpA8PhXQ9gUE7Nc4ePdq1SExPwnaiCbBCpTjK54/j2?=
 =?us-ascii?Q?pv6m1BcUykVFqQLIqJw3EXV3KzdsFxT/aHUTk2UauarknsSYQjXk3fnegtYE?=
 =?us-ascii?Q?+pZqlGfuZ7S0uKjp3W5SfURO4a2d2yYiOieiQO3Q6yoshnlaSBqughZHMH6j?=
 =?us-ascii?Q?4Yz2/wkOldl0THakL2UbL+NG5Vp01sv12iFokiBF8m98alkKv4PSNTQrD3mt?=
 =?us-ascii?Q?+mY6N9AewYx5bf/n3AUhshxHldy5eg8A03swITbNruineYGrKJC8hSWo6fbv?=
 =?us-ascii?Q?WnkXDFjFZ/GGzoucuYnYrXwDvfkGQ3BN8nh23UbDuwAYdVT36soZQNGuT1xd?=
 =?us-ascii?Q?vNlGZsvULaoghh6BN0AGSo5uVQ0SvYCBFCGHQnafFpGSejp/yckj3V8CUZhu?=
 =?us-ascii?Q?ipafV7fYuuRLVKFBmTMyJBwWTRHXojeq8gSUJPgAqClakB+PiooXuz40HF1V?=
 =?us-ascii?Q?kVlv++sYWeMpcJs26uATIdwfY3SI+nDYRSdyt0xxC2pdMD4HHb6IdT5sOAV3?=
 =?us-ascii?Q?a0pvlTAOyUex1ovBCzpziwYuDg/0maRcdmTZui9JSJHWog9BKMogbSB5BKV3?=
 =?us-ascii?Q?ia8Cn+6f40HwGcOuoaI8n2A1kl2YRxkp2NhYQPyBP1jmUDPV2uQaPRxs9tzt?=
 =?us-ascii?Q?zwQdwWa0R5p3pFT0Gao714CGmiKcF6zACM2t61xp8EtFpdBEJjvCqe8jhzC5?=
 =?us-ascii?Q?oT9Aen543i7P2Y7mCw4zsBp4K6hCCztyHjPi0B5FDjlDqnMUzDh9rzlHRPiu?=
 =?us-ascii?Q?RXWotYALi2/VsMXnvDwvIF06AhDuC202W+y4/3fzV5+z8r0k0PQm11ZprqGe?=
 =?us-ascii?Q?3dBcnZnANQAlBXq/HhWjVkAHmoDKLerGyzRW0cq6zZhr6raNeyYTZNl9mkQo?=
 =?us-ascii?Q?vuwgFPGGmQryl/esN3qDmNofNoas1ia+WlO/5MeGigCCsUt91HRnn0Y6ie66?=
 =?us-ascii?Q?pNPtATaylfdR4frEiBmOAG/IeLC6/KlM8pkVbst8RAl1jC5A9NkZN3OcuZYv?=
 =?us-ascii?Q?PpihD/FlcwnuhLAdfvs2vkTC6x2Z+ny4oERPmk7d4DxXRNE752oQHYX6ejQj?=
 =?us-ascii?Q?vwiVRD7WH3MwKwVxownNUGwz63dHo6hHp9LXy2NFrq0cRNlX6cqFlilTJONL?=
 =?us-ascii?Q?XPl1w1WHmw6hFXZ4FsGOge6oGIiFyFwbrc/Us6uyf4hHKrz+hacs4DziYtKs?=
 =?us-ascii?Q?Mqqr5WrMs9UtxuztTIFEFGuIvD9r/G9Zw1VPt3gsxxwtNRW1/PGVPwzDwXs2?=
 =?us-ascii?Q?ooAcXUsZIIxlLuMz1WBqaoJjT8cqKOv2KtxllIWf8LqCtVQgeNwuIvqvC4VS?=
 =?us-ascii?Q?cRKeOzfxcgRGPQ1oj3R0h/JE88uUxNqjfSWjmxMRCjI8GjSTySsKq3BE91Nn?=
 =?us-ascii?Q?2zp4oSbcvvprlJ6URm/wVnq1aIW3TFT6WGpKrAcbrOmNPUskdI9uoSJuwcEP?=
 =?us-ascii?Q?zwxEMd7dERFdRwFwoo7AK6zVlThn4hIvR424+pCXPe5lun6el2XiZ5lybdeR?=
 =?us-ascii?Q?GGFS3wHON0bnxuVM/t6lixvU8+aHO1ZqTtnOx9D41YYEb/zvhZPZJh0s9z4K?=
 =?us-ascii?Q?RbsbwoEVqEXbiwwr83kB+e58GFI0ONiQfiI/XIQqVVFdOZmp9b/1HzxSvWqs?=
 =?us-ascii?Q?bw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JhJMZc3FkzE4wYbOMeCEM7MnZ5bRx+94gD1h0jUs81GprtX8tH7Ws5xfxIF+?=
 =?us-ascii?Q?8HYljGTHu4Z7Lrcd/aNlqe07MVefe/MBLF64JnFUWtiRdVfsSCjf299YXPoK?=
 =?us-ascii?Q?BgvAkjcjjnEFzr5ifhIY/o/Ann0YVDAExBaPypFnM+U0I0lUDQSF3VjsitmE?=
 =?us-ascii?Q?enNzXaGAUqgzqYSyutWjNFAF2X6BECkja3TF6upL6rnaCoP1Xg/aJOABexPS?=
 =?us-ascii?Q?5EWQL31kwkr3qwPaAHU462CjwYd2Mu/3ZMUA9iftCQJX9pCTXX6MWIBqHHRn?=
 =?us-ascii?Q?3dlcbKZqouyHUCCi8oDEr9Fb7m9gJ6yO0X14HTOa5ZfCXRTS7g+NXIwQy5JU?=
 =?us-ascii?Q?FYyRENtqet+Ldxj0YHkJKi1pYOWAHQPqnGJnrGJf44XSkweV+qWzgEN2Xu2e?=
 =?us-ascii?Q?zXLkXv/v2wif5iHPgDPVLq+JC5Op+UJv990afjFrq25UpOLbms6COG43n1xX?=
 =?us-ascii?Q?zIe6RSZoZCDrxMjrRxFxs5G0osex6qT5cyR65h+Cc2OTCVVtzSBIwZK/El6t?=
 =?us-ascii?Q?7pUW4KVOu8iW0EHgxDhLMmwzpg2iy7g0MUtsl9WsxWq/lz889JWwZXR3zgIJ?=
 =?us-ascii?Q?ea36l7fb1kV5p7CdYUE7/H2srQllOOf5Az8+O2B7n8Q7MlL/rLGoufT0WXxV?=
 =?us-ascii?Q?1rRju4nrIlvYeg5bzYMuDO88bFbKG/eBEC+ehixtFdu5XhKs2p8Rjz2BNSKB?=
 =?us-ascii?Q?5NGeBUrN60t2PAICwTFUSHFIJK6zS8bAouqj1ZMQTK0ArTDkqliATnWD+f0A?=
 =?us-ascii?Q?GhWNjfH7TwkHOu67jJXYR1eXn6wHWN1/IhLRJxQMtF7WUBdHeoEIYUGvK5bf?=
 =?us-ascii?Q?el1qiXRkdj+qFC8mXBcJmw0x4tk+pOLMNFQVq+I7TSVWG26yNCNRu8YdMwH/?=
 =?us-ascii?Q?Jefmy4hFb2qYUAsTPBeBJQqBfP4GU1/cETXdqi5QL0zsoPGHFuYombnAwVz0?=
 =?us-ascii?Q?iX+x4j4mRuVvIuf8hcdiVlGMQE+T+wTiFY8VLqjdyWY9qxSsk0zkqLWFw6sc?=
 =?us-ascii?Q?T6lk5xcv7zx20yq/AcP74cODGA=3D=3D?=
X-OriginatorOrg: calian.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3b09b854-3316-49f3-ead5-08db65db2313
X-MS-Exchange-CrossTenant-AuthSource: YT2PR01MB8838.CANPRD01.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2023 15:40:06.5461
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 23b57807-562f-49ad-92c4-3bb0f07a1fdf
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 3I1k1TqDidHK1tcAIG6UB3k9ZxaY+22ER9p/WUuAuqqxqrvJ+xWtIIubCXLgEbga0IQ5q8dyjkuAHmunjESnVeTO0YPbX5/aCSUTZqj7cdA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT3PR01MB10571
X-Proofpoint-GUID: zTksXJQcBL-E_F3EbeKs2VrsR_w3EnAO
X-Proofpoint-ORIG-GUID: zTksXJQcBL-E_F3EbeKs2VrsR_w3EnAO
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-06-05_31,2023-06-02_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0
 malwarescore=0 clxscore=1015 bulkscore=0 mlxscore=0 suspectscore=0
 lowpriorityscore=0 priorityscore=1501 mlxlogscore=999 phishscore=0
 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2306050135
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,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

The KSZ9477 PHY errata handling code has now been moved into the Micrel
PHY driver, so it is no longer needed inside the DSA switch driver.
Remove it.

Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/net/dsa/microchip/ksz9477.c    | 74 ++------------------------
 drivers/net/dsa/microchip/ksz_common.c |  4 --
 drivers/net/dsa/microchip/ksz_common.h |  1 -
 3 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c
index 3019f54049fc..fc5157a10af5 100644
--- a/drivers/net/dsa/microchip/ksz9477.c
+++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -889,62 +889,6 @@ static phy_interface_t ksz9477_get_interface(struct ksz_device *dev, int port)
 	return interface;
 }
 
-static void ksz9477_port_mmd_write(struct ksz_device *dev, int port,
-				   u8 dev_addr, u16 reg_addr, u16 val)
-{
-	ksz_pwrite16(dev, port, REG_PORT_PHY_MMD_SETUP,
-		     MMD_SETUP(PORT_MMD_OP_INDEX, dev_addr));
-	ksz_pwrite16(dev, port, REG_PORT_PHY_MMD_INDEX_DATA, reg_addr);
-	ksz_pwrite16(dev, port, REG_PORT_PHY_MMD_SETUP,
-		     MMD_SETUP(PORT_MMD_OP_DATA_NO_INCR, dev_addr));
-	ksz_pwrite16(dev, port, REG_PORT_PHY_MMD_INDEX_DATA, val);
-}
-
-static void ksz9477_phy_errata_setup(struct ksz_device *dev, int port)
-{
-	/* Apply PHY settings to address errata listed in
-	 * KSZ9477, KSZ9897, KSZ9896, KSZ9567, KSZ8565
-	 * Silicon Errata and Data Sheet Clarification documents:
-	 *
-	 * Register settings are needed to improve PHY receive performance
-	 */
-	ksz9477_port_mmd_write(dev, port, 0x01, 0x6f, 0xdd0b);
-	ksz9477_port_mmd_write(dev, port, 0x01, 0x8f, 0x6032);
-	ksz9477_port_mmd_write(dev, port, 0x01, 0x9d, 0x248c);
-	ksz9477_port_mmd_write(dev, port, 0x01, 0x75, 0x0060);
-	ksz9477_port_mmd_write(dev, port, 0x01, 0xd3, 0x7777);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x06, 0x3008);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x08, 0x2001);
-
-	/* Transmit waveform amplitude can be improved
-	 * (1000BASE-T, 100BASE-TX, 10BASE-Te)
-	 */
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x04, 0x00d0);
-
-	/* Energy Efficient Ethernet (EEE) feature select must
-	 * be manually disabled (except on KSZ8565 which is 100Mbit)
-	 */
-	if (dev->info->gbit_capable[port])
-		ksz9477_port_mmd_write(dev, port, 0x07, 0x3c, 0x0000);
-
-	/* Register settings are required to meet data sheet
-	 * supply current specifications
-	 */
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x13, 0x6eff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x14, 0xe6ff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x15, 0x6eff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x16, 0xe6ff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x17, 0x00ff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x18, 0x43ff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x19, 0xc3ff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x1a, 0x6fff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x1b, 0x07ff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x1c, 0x0fff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x1d, 0xe7ff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x1e, 0xefff);
-	ksz9477_port_mmd_write(dev, port, 0x1c, 0x20, 0xeeee);
-}
-
 void ksz9477_get_caps(struct ksz_device *dev, int port,
 		      struct phylink_config *config)
 {
@@ -1029,20 +973,10 @@ void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)
 	/* enable 802.1p priority */
 	ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_PRIO_ENABLE, true);
 
-	if (dev->info->internal_phy[port]) {
-		/* do not force flow control */
-		ksz_port_cfg(dev, port, REG_PORT_CTRL_0,
-			     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,
-			     false);
-
-		if (dev->info->phy_errata_9477)
-			ksz9477_phy_errata_setup(dev, port);
-	} else {
-		/* force flow control */
-		ksz_port_cfg(dev, port, REG_PORT_CTRL_0,
-			     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,
-			     true);
-	}
+	/* force flow control for non-PHY ports only */
+	ksz_port_cfg(dev, port, REG_PORT_CTRL_0,
+		     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,
+		     !dev->info->internal_phy[port]);
 
 	if (cpu_port)
 		member = dsa_user_ports(ds);
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
index 768f649d2f40..813b91a816bb 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -1270,7 +1270,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.tc_cbs_supported = true,
 		.tc_ets_supported = true,
 		.ops = &ksz9477_dev_ops,
-		.phy_errata_9477 = true,
 		.mib_names = ksz9477_mib_names,
 		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
 		.reg_mib_cnt = MIB_COUNTER_NUM,
@@ -1303,7 +1302,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.port_nirqs = 2,
 		.num_tx_queues = 4,
 		.ops = &ksz9477_dev_ops,
-		.phy_errata_9477 = true,
 		.mib_names = ksz9477_mib_names,
 		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
 		.reg_mib_cnt = MIB_COUNTER_NUM,
@@ -1336,7 +1334,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.port_nirqs = 2,
 		.num_tx_queues = 4,
 		.ops = &ksz9477_dev_ops,
-		.phy_errata_9477 = true,
 		.mib_names = ksz9477_mib_names,
 		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
 		.reg_mib_cnt = MIB_COUNTER_NUM,
@@ -1423,7 +1420,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.tc_cbs_supported = true,
 		.tc_ets_supported = true,
 		.ops = &ksz9477_dev_ops,
-		.phy_errata_9477 = true,
 		.mib_names = ksz9477_mib_names,
 		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),
 		.reg_mib_cnt = MIB_COUNTER_NUM,
diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
index 5aa58aac3e07..a66b56857ec6 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -60,7 +60,6 @@ struct ksz_chip_data {
 	bool tc_cbs_supported;
 	bool tc_ets_supported;
 	const struct ksz_dev_ops *ops;
-	bool phy_errata_9477;
 	bool ksz87xx_eee_link_erratum;
 	const struct ksz_mib_names *mib_names;
 	int mib_cnt;
-- 
2.40.1