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:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Michal Kubecek <mkubecek@suse.cz>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 1/2] net: enetc: fix MAC Merge layer remaining enabled until a link down event
Date:   Sat, 15 Apr 2023 20:34:53 +0300
Message-Id: <20230415173454.3970647-2-vladimir.oltean@nxp.com>
In-Reply-To: <20230415173454.3970647-1-vladimir.oltean@nxp.com>
References: <20230415173454.3970647-1-vladimir.oltean@nxp.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?E+ks8fsNouY4ldrdvEDGzBPaLSpgn52X4+HicP2ZyOrl9aIeKfRXmiyCr0Q3?=
 =?us-ascii?Q?GIdHsWOHEVz0Rtd66ZEbuxTmMN7+7ZleKeTC+4hXateyZ3dpqzlhCXeXrYbL?=
 =?us-ascii?Q?E+XQgVhHyKwRNf0AGpuxY4u91Yt6L4/q7TgG8tBlwhfNPyB0WgYxjb5nSYKA?=
 =?us-ascii?Q?OkHi7Te7lUo5Rkld+/Gp0CKCZ2j+yhZ5RT7miR10FiLQsSUgTc2uRXMd0ld3?=
 =?us-ascii?Q?w+CjTxTR6/TBMnkYcoNZWGIRxH/XfkIsu2V5fMK+nWazIzTjGY3foxtLCpRS?=
 =?us-ascii?Q?87cedldk2GJTtE0/Qsmdawv9ySTTO6SaW52eVdvalKNK6nQjBIsa6jYk005S?=
 =?us-ascii?Q?HdxJDxGjR2GNGlnvF1tO6V1RLJ5eWxGoJbTevpLojMEBwht3Pg8Kve2IbxDm?=
 =?us-ascii?Q?bcZT4456u47gCprNVxcHtLvKdfThHug6mUXDWNdj5fVNGZ/WI1sYzlgtYiFJ?=
 =?us-ascii?Q?WEeKANHdmsq1uHK6jjr39xyJndhIM+RnwrFjsijpJ4qz3X4nLToBuxwuWPf9?=
 =?us-ascii?Q?6AGGnJ1vCCH0qsVnG6mLUXBRTA081hFqpKeBukw4kFsiuAF6OqZpYa31booc?=
 =?us-ascii?Q?qTocsj+qFbbq98OSHnvvrUGWZze3/bjO7VMgPgce/Gihp5855ki+4dEHCFgi?=
 =?us-ascii?Q?SBRcexnbw/6hbZRnapBCPUU3fO7ak27b4Sae6DduGbLQekLL6+tgAmcnT9Fy?=
 =?us-ascii?Q?ifEKCdi7Vv6r1L+84lmk5k/KO9ptLRIZtTS/kIgj4BT9oO/Qn9HxLAF9wdRw?=
 =?us-ascii?Q?9GUBPZnL4g3sGYD0hHiSMM2a3moQjEkDYSasHtA5aP7YvkLEOqJyn1PjQ54t?=
 =?us-ascii?Q?vF4OojMTn4OlOFyJitJeIJUvtiWBLFh5SsmvJrbptaIThnYx0s0EimQSfhuE?=
 =?us-ascii?Q?Bohx159wI+FrUl+qE3dYV0IkWDIupHm0w3uZ+WSizsXsD/hSN5e0VLlwwBnt?=
 =?us-ascii?Q?py963YjtVy1ZHaof0kaJ4hI0ZLyI+aZAwLhLxHBEcSHlpwwWdcASVkSlh0XE?=
 =?us-ascii?Q?1CwURrShZyoVIedAuIflJuSKfkCIzc+oOWBdVUdUT7t4lI8060XgaZU1xgAr?=
 =?us-ascii?Q?wvc2kXAVtaO4dtCKgNw+Jv5gCYDWBVLtF+kU2Ob4h+mXXpVt6Rd7LQCxZM+Z?=
 =?us-ascii?Q?4Bo6FA6dMLQEHVJ3XnyWjpZCAKkvHaRnKZdujJxzhLLcU3wubXJtSiiKF2pd?=
 =?us-ascii?Q?Xee1UV800uEiPo27JYYdFTJTTRC/Qi8ZPMScNY0rRUVb4Z44Ng12AGVDEhft?=
 =?us-ascii?Q?Ae6Swu3U5a6965pwSLl7T7hVxIuB+aIpUNVbYdvGvuLkmCxgPmOkWciRabXg?=
 =?us-ascii?Q?WVO/2usBBPlLxCHsfg95httQ6nNBMPB/4PBwMXRl3cVzPWJiFlHwBtNdfMje?=
 =?us-ascii?Q?fgNIGpjmyE/yvL4u0m0/2yKPzZCVqstqb0fM72v4ilObNPltxz8uVybeyyU/?=
 =?us-ascii?Q?ZmEG2FESCwICRzncz+QHhkQnro/axRPrfPn8GhnO5o+vdjnPUKGliJJ88Lv9?=
 =?us-ascii?Q?w1wNnnXoGXC4TO6j/SlgSK6I7h0l+JC00cv9ssUaCXKaGa30i6ADlphdfiIK?=
 =?us-ascii?Q?9+aPNDQBLZxq/hqbARfLS+0LAiLRQgqYfQW0+iZF88jlV7UJ8zyZPCD8thSC?=
 =?us-ascii?Q?uQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e656bbfb-1672-4b2c-2478-08db3dd7dec7
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2023 17:35:56.9770
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: blcHeQwRUYxRXkFNVB3FmSzYKPeaUlnJ+BjJekFhQkrX8QrzDpdr1NA8wCtaYM/k3vfcUE4pvUSftYqJmT5fPQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8322
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,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

Current enetc_set_mm() is designed to set the priv->active_offloads bit
ENETC_F_QBU for enetc_mm_link_state_update() to act on, but if the link
is already up, it modifies the ENETC_MMCSR_ME ("Merge Enable") bit
directly.

The problem is that it only *sets* ENETC_MMCSR_ME if the link is up, it
doesn't *clear* it if needed. So subsequent enetc_get_mm() calls still
see tx-enabled as true, up until a link down event, which is when
enetc_mm_link_state_update() will get called.

This is not a functional issue as far as I can assess. It has only come
up because I'd like to uphold a simple API rule in core ethtool code:
the pMAC cannot be disabled if TX is going to be enabled. Currently,
the fact that TX remains enabled for longer than expected (after the
enetc_set_mm() call that disables it) is going to violate that rule,
which is how it was caught.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
index 838750a03cf6..ee1ea71fe79e 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
@@ -1041,10 +1041,13 @@ static int enetc_set_mm(struct net_device *ndev, struct ethtool_mm_cfg *cfg,
 	else
 		priv->active_offloads &= ~ENETC_F_QBU;
 
-	/* If link is up, enable MAC Merge right away */
-	if (!!(priv->active_offloads & ENETC_F_QBU) &&
-	    !(val & ENETC_MMCSR_LINK_FAIL))
-		val |= ENETC_MMCSR_ME;
+	/* If link is up, enable/disable MAC Merge right away */
+	if (!(val & ENETC_MMCSR_LINK_FAIL)) {
+		if (!!(priv->active_offloads & ENETC_F_QBU))
+			val |= ENETC_MMCSR_ME;
+		else
+			val &= ~ENETC_MMCSR_ME;
+	}
 
 	val &= ~ENETC_MMCSR_VT_MASK;
 	val |= ENETC_MMCSR_VT(cfg->verify_time);
-- 
2.34.1