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 2/2] net: dsa: microchip: remove KSZ9477 PHY errata handling
Date:   Fri,  2 Jun 2023 17:40:19 -0600
Message-Id: <20230602234019.436513-3-robert.hancock@calian.com>
In-Reply-To: <20230602234019.436513-1-robert.hancock@calian.com>
References: <20230602234019.436513-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?LWXO0mFHXSF8JZFJeAgjI8xXDFO3Q2wp/6nnsfrxInNl9uJALhwsvbbx+6zs?=
 =?us-ascii?Q?AquAEdzMpj1h+1sbsS7mh6Glnu4nBRKFRExfN6O0KKrOPNQuzx9UcgDeinyr?=
 =?us-ascii?Q?XSYX/e8QMCocIL7oaej/QzY8TjystNzu7o1rW5RApzfhqHA7UE8FYWwIi2CX?=
 =?us-ascii?Q?eiJrFj3mpXG2XN4JhW+W+LYwD5/M3N8nTLzX91cclKdC7gMoixuLiMqiGCqc?=
 =?us-ascii?Q?zXCw5i45jImnSKWpzbRnubI4QSkEUYfInqaPaVANjp3157vH7APK6HA335Cw?=
 =?us-ascii?Q?yOSzYSl+JbHv1qfZgE6Zqxoc1jN9x6JTnRwsDJq2cpPupevk/Y8gYASw4u1r?=
 =?us-ascii?Q?RkqdmXnlt8tdQqsu3EpYjfzWmAVnzaXju2iCevfZZ+9ocZRW2mk2VqmJI12R?=
 =?us-ascii?Q?7A1o+MG2Pb4+m9dpkDNapV9C6g2uCfOFc58QWiBQiuVagQraKeLEUDBhtCaQ?=
 =?us-ascii?Q?cdkslZGiCSs3GpCiWrabLJ9Nq/3LyZa+7r5zJrBKYNT4CRXHc5bJ2Oy7jZVI?=
 =?us-ascii?Q?vNmZowMmPK95BW/wccKZhNYv+aom36xris1c25czVjRijArCfckc7Eb7WW2m?=
 =?us-ascii?Q?8r7Kg3Lt26LpBxXrKlmekD2D6axnEdobjGDCwtXTLmeudYeOfHsIfW+7LQ9V?=
 =?us-ascii?Q?K2uHioW/PgziRCcmcdSTtAFmZwOpxOK5fhwAygMSphV5xAcY/drh8RYVcIpe?=
 =?us-ascii?Q?cSsHwf8o1BB/sluMiAfThAp/zRRA7Tq3O0jrd33W9ksX7RFBPN3lrA8tTZta?=
 =?us-ascii?Q?YpX5xSFik/gdijlMjswuudr7QraAwPtYFwDg6aFpr8fbuSHIHYioG6J4DHL3?=
 =?us-ascii?Q?L5FG57sfef1on6FNVaezpvZrqt32Qc2mLYG8SyqYyaX7I1LKeEerVIGMbckh?=
 =?us-ascii?Q?qBbu5nb9zs0bFsA7Sxh7PT6+AbKC47zr3RTd0mqL1RMWUYax9XAAgl1U/YOf?=
 =?us-ascii?Q?yuCA8lvGjy6FEs10L0AIq+yaJjGKFDUeISKo/egYVGNhJfn0c4s01MkAVbUm?=
 =?us-ascii?Q?OJtGuE6RgUymocJvilVANc6UJMzKYDKXfXw26XURLyyDdpYIvJRuZJSgpmcT?=
 =?us-ascii?Q?BP3SG7hJZ5pY71osqczjZTW4Wt+Gcgjo5rmX+MiWPg/UWb4HwvrKe/0bJ7gy?=
 =?us-ascii?Q?iFFqg2o0Bz0Nm7qL2NNTbOhUt8ADA4bKjG9GFmB1Q7kfkjbI+SM8Hud2PiRW?=
 =?us-ascii?Q?83kpf0lS+SGEQbL5UdZ2V7GvkhwDhtQK7cbmWMMRzBnrGlMrHCSQsleK7wit?=
 =?us-ascii?Q?Bhkr/FpgC2uizphJRUHuwbqjeQFDbSO7waf67DWHiz7kLjlpuixt2KpY3Gpb?=
 =?us-ascii?Q?jTN/wkFDYoMpXuN22ac6lJX8DaXlzI+n5BEgDCqKvTkgOIh4jfBtvYxYpbUz?=
 =?us-ascii?Q?V1ZDlaiUQS8ScaqW5V/RLz6f5b3eFVOdThLBbuQb7XzcdYJcBI22G5RDdLZY?=
 =?us-ascii?Q?NI9bB6+ZB41lemVkX7wjoITGQ/LGFSfLaX6jy8m8bwX0enz/duEY7egwR6Ya?=
 =?us-ascii?Q?nCmnVA0TEwHZwiZTAqd3cVqOsptfHjTwUh2wdVlOpcSgC/mvAbvZevx7pTmy?=
 =?us-ascii?Q?JLjnSdsHUb0XbpHCV3vhsDCH5ZzJKakmykkZWeQkxi8bBB31FDjWd628v8Vy?=
 =?us-ascii?Q?Sg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?1SMm6GAbaPCjU0aQGKIMTyqvcgqA0zfFvCPtyb2KVvsDQVbyCScfUfLhFquR?=
 =?us-ascii?Q?KTBErQc773GC8V65mKdjDah3zVKtSo+/x4F/KWq0uqudvrgqd+cjZd80BZVN?=
 =?us-ascii?Q?wr1nM0ISpu9hm7hJkIJNkC+lsqcTcLhHYWLsYIT2wBSZU5huw/U2gAIDV4Oj?=
 =?us-ascii?Q?k8u+MfUlPzUcOWUfEY88kKM+WLztut6KKERWeqh0oF3LvY8EQQytRu+GwX1n?=
 =?us-ascii?Q?/tpOW32JTCf2EFVqHGXwO0n8zBj8VM05nCBq4iAJ0cyG7qF6yghCMYo4xpUH?=
 =?us-ascii?Q?+nv0o/zUrVEII815UaTMgsgujpteqxDoia3w/nV3NCErWKrKyaZVQKZz9ErI?=
 =?us-ascii?Q?+Sg6YxMUAxKA2ui1L5lk/j4FwmWp0I6khjqAGSeuUe3cYvjGXiO9kpm3tmJh?=
 =?us-ascii?Q?vgJD+8+4HjHRqoj+OSnn24UB71I/VBvB7sHUEUzurv4lapgY2TFNE98cFoMi?=
 =?us-ascii?Q?VRnseZsF4vqeKOm6c4OLKx3Bqlp9tkPZCdzFyZ2TIzfqsF05bK3Utr4Ikps/?=
 =?us-ascii?Q?GogGrnL+2Z39C+IhwWvgi3AR3vcWmay6QQKydhp52O7YyCypQkx9hO5Bj2HG?=
 =?us-ascii?Q?XkFqrMoWPcvl2VdboKDAVy7ogGKwMBTqlIw/nPkikZE0qy2EbPFgiDx4Ujig?=
 =?us-ascii?Q?goH5tD/wlcDr4iHWdrOginNQv0HaDXlQKOfmI7SWBmaPHzhdGVKt8PHDxRAX?=
 =?us-ascii?Q?Puaptfa844a2Z6J2aZM+JVkgkYWTJt3ngIbD/La765MAdoFQMfK+Qz3JWedK?=
 =?us-ascii?Q?BDQ0m+3WaMoe26xA/fdEka1mXaqaeZYc1+z+1W9KOWYgb6J+UaDnLWbalZ6R?=
 =?us-ascii?Q?9AFBrKQH+VL/5kUNWKeZaidrBWM+O/BcmiPuZAcUcwftEzF3k8XVSGbCCwD1?=
 =?us-ascii?Q?zyN0xZOdnimj2K13WFPbimAruRrAfgCGNLOiuqAqfkmAuVhHojSUUHIzXaBC?=
 =?us-ascii?Q?0b7t+mhDgw6FKR0czUvoEwMmlcrfRzaYkcLECYt23MvvkvQC7kYyDJVy+OlM?=
 =?us-ascii?Q?zAfBGw8M0lOWPYMXJBWfetXRng=3D=3D?=
X-OriginatorOrg: calian.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6df65780-0a57-45fc-c425-08db63c2edbf
X-MS-Exchange-CrossTenant-AuthSource: YT2PR01MB8838.CANPRD01.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 23:41:46.8006
 (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: yYj7m8UUwMt9UIU7zyrp4uoqTgmueMcvjemgXdoObv4blrAL08Vk2HZK+ACY9wkokYzn0ive0OIDTcqCptwSeAE9wrBRDt44zmhdVkRo68k=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: YT1PR01MB8763
X-Proofpoint-ORIG-GUID: LXRadyIcEb0xV-d4heWE9l24ZsFLJNz7
X-Proofpoint-GUID: LXRadyIcEb0xV-d4heWE9l24ZsFLJNz7
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-02_17,2023-06-02_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 mlxlogscore=999
 bulkscore=0 impostorscore=0 clxscore=1015 priorityscore=1501
 malwarescore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 phishscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2306020187
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,URIBL_BLOCKED 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>
---
 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 47b54ecf2c6f..7720d53dc7a9 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)
 {
@@ -1011,20 +955,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 423f944cc34c..42cb5742f552 100644
--- a/drivers/net/dsa/microchip/ksz_common.c
+++ b/drivers/net/dsa/microchip/ksz_common.c
@@ -1212,7 +1212,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.port_cnt = 7,		/* total physical port count */
 		.port_nirqs = 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,
@@ -1244,7 +1243,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.port_cnt = 6,		/* total physical port count */
 		.port_nirqs = 2,
 		.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,
@@ -1276,7 +1274,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.port_cnt = 7,		/* total physical port count */
 		.port_nirqs = 2,
 		.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,
@@ -1356,7 +1353,6 @@ const struct ksz_chip_data ksz_switch_chips[] = {
 		.port_cnt = 7,		/* total physical port count */
 		.port_nirqs = 3,
 		.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 055d61ff3fb8..9c5e8ea229fa 100644
--- a/drivers/net/dsa/microchip/ksz_common.h
+++ b/drivers/net/dsa/microchip/ksz_common.h
@@ -47,7 +47,6 @@ struct ksz_chip_data {
 	int port_cnt;
 	u8 port_nirqs;
 	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