From patchwork Thu Oct 17 07:46:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13839574 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2077.outbound.protection.outlook.com [40.107.21.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B31C1D414B for ; Thu, 17 Oct 2024 08:02:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729152158; cv=fail; b=oXxm/5tmL4VLhTyg1uoqYBSVrhkz4ofwgJAf6Dr+BzZRaL03aF9vUfdieb94fB0skE5MMbLXkYZ28Kc6b5BbuVizWbJlzMoi+pSjjbtMTQEIeRRXhgk5km10Dp/iD7Prs46cxEpkr3FjIeP8qbJtvoEqG0n04G8ieX5PsiA3hKk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729152158; c=relaxed/simple; bh=w9A1rPrGzoqvXsGMFIF7atOUKyK/GOjlnyh9QYRa5SU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Tg/oAZyi+WJTlc1dNA68cxTBU6wBUqawNrGScEIuRkiPISDk7AyeVXm2F0qa2gxwHv+aNmA3IGRHQ2utjJZXDBGAvW36Ym9inFm9KWxPAwurz2pfzzHgasgrCi4hF7Nv0QsP6t4+LVG1rH52EjWoRUQmlVdtPfQ9VRWr9CtzMqs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=PRK5HoiY; arc=fail smtp.client-ip=40.107.21.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="PRK5HoiY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z0ol8pIDlk9WXeARKOYzy/iTR2TyW77znSLARh/OxjwSofMNJl0c3N4balN1nTn5WS1Y8V2C9SGmstiOIgTCR8NU2i38k2QuxRi5sEEmAsUyw9f9Vr43KDNa4alplEMkntTvD681C4/0M/7aSgiJLFSs7h9rd4NtJOkbDSfFYF1xzMk3yXTLPoT39Bd1jwGclHfrntK5iyj2SJyWYfkPI6zaLTRhgbuwzEm6T4KafeMWlSRPUqoP3rhai1AKrTtUc3YW9YB5NiW9OhVAN7VWP5rjAIspZDc35wzA6sR0smXX0DRRqitCWhk8xC3l51ZPPD7G3/eUtzjOvsSE6Lvbfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n6rJsFXDQDlHH8QIGYt5cvSlVBPRP1S/RXEZf5RNNPM=; b=iwoVYnoTJemHrfTutBlLr9Qz1dZXHcnAy/iFDL32ej/CMYOOG63rh+VSHXJBD1QYmvnXmBzpmaaTzR9gOP1feajYD5Z092spPvBPTfuiNHRUNwv2+tWpn/eGWdmMS9kxmfgVmiFeElpO2tk0XID9UPMjrdBssZz8SRaHx0nGxhKQICfwckza/loMaoSNvlk0IOG5OIX0LPmf5SVSixtZ0H5WrZlKPSLbC8NCaS5BG3W1d2P/Ylj2ekcP9tDL7SznwLcM2+yWpoMXrrv5wIl67oimtbRnGguPOgCdpEna4y/RVBesIX5EQA9Mowjjc77tt3Sm7smUF2ACw7+RcEOpIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n6rJsFXDQDlHH8QIGYt5cvSlVBPRP1S/RXEZf5RNNPM=; b=PRK5HoiYC1CtoxpHZvuDj64H+OLZcXwzJ5XKfRDzK08XWYsrbUDNZmUEVm3R9zWXP6OPZgQf4e1FiI3EhtZ4VUzTSAEwkiWmS/5BnkzD20n/f1BtZ0CkxvWYFjI4vdqcsznFovX3Sp+bnGb+l4onu0vpS4KnxCOYnPBloGX2N9dBsM/Df9BEvIreR/413A3EyD9tr+/Cv7secXrFEKkr1w9Uoji3UzR5iicMB33Rv7hx1QOE+d0U3qJiE1PcisI+LB+SYDkLLpYk/ZscUgDca08DpJTOchxoZMw2nGj6eXwjofr5/8/Qi+O2U7n2xUrLeSKJU3JEDR6sUA2qin8i+g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DBAPR04MB7304.eurprd04.prod.outlook.com (2603:10a6:10:1ab::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.18; Thu, 17 Oct 2024 08:02:31 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%7]) with mapi id 15.20.8048.020; Thu, 17 Oct 2024 08:02:31 +0000 From: Wei Fang To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, vladimir.oltean@nxp.com, claudiu.manoil@nxp.com, xiaoning.wang@nxp.com, Frank.Li@nxp.com, christophe.leroy@csgroup.eu, linux@armlinux.org.uk, bhelgaas@google.com, horms@kernel.org Cc: imx@lists.linux.dev, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH v3 net-next 07/13] net: enetc: remove ERR050089 workaround for i.MX95 Date: Thu, 17 Oct 2024 15:46:31 +0800 Message-Id: <20241017074637.1265584-8-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241017074637.1265584-1-wei.fang@nxp.com> References: <20241017074637.1265584-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR01CA0051.apcprd01.prod.exchangelabs.com (2603:1096:4:193::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBAPR04MB7304:EE_ X-MS-Office365-Filtering-Correlation-Id: 58ed4c7e-2111-41be-a5fd-08dcee820d37 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|366016|376014|1800799024|52116014|921020|38350700014; X-Microsoft-Antispam-Message-Info: T50MQvbyD+84yCkGI3PGIhOnsADct7Obe4vB1rwi/xvoHnnlsdCxiv3RcZdMujULMjPQARjeC4YpjvwUhtGD3tFcpdZPBB7pYboXZXm+MO7bmZyUmYfD6qPtbNEBxjlTZHkUcytkqB4piNJ3yKz6kSD2mFavh/nQAeCDEblPOGNU+VJTPRctI/kVFyz2S81A+KXfJyKiTHVjX4X7losmMQL3SbSFmM/Rq3vYKEtrbNuHdVmhp+B1TjpXY1grYw0xigPw5o/0IuyAEucJsYCqQwEgWQjb6+UL1dkQhFafh1Nhv4kabQFMbbkxKVkrQc5lgGE20nUGEvpF5/unST2yEaU7Y5wpXB/BvO7OLJoipKIsaGWWoN13IUweZPH/45p9XfiH5TROIWrDtXXfFNYkX/fW2aiolPqBjlEmK+8GWzpfp8PF0DpvNdIJ4GfSCsEVwBhnX6DA2rkQxxbst+m0B1BGQJPSkk8uQ6j+S9yvG5yVKyC+PMOMjrd5/GRoo19pYLKeQ+UY5YkGU8eQjdUIpNn7JdjndlImpedf2UdKTjVEwhQOKjoQP8lUZ7H8NGhhA9wfxFmqAkvWeMl5ModHPu8+b2Uo+33R8KgMGNgUB0cHRakcNJCL9ILJl6PJ+EUKvf5m01J14y/6h4Obm3bMy61/nDaf2fELc+qQbdWtJsIG9uAbJbBm+2dEp1mRQxMWTo6pS0PzjJkNE69aaETg5x+ofIGFHgIxqYXGqPrTsNly1aYgtGZ2kID+At7trNaJ+sFo8Et7o32fdZmAc+3PVW1Icv9HDBEJpR5a5MCUprAjRkAnkln0mktmwSHGsVQG6FoFLyCDQPcW8gMZArIWmkCN0d+1oYPDfFoJrkKUiBHW6wTSH1l0V5sZN8F0OSod/yBsKshhL6aFQrWuHW9lnmYS8IjbCT4O/LrIHfqb2PGRlkghKAhpPnvfheIUJVmhU7/dQKpTxbJKBBKpKN6xes031COlCrawx268nd+CWMaPeY5jsEqAVB8OcrJLkl+p/atJfSLLVjcIms8oIFJn8cKz8nifJolW/eI3r2SVv7VSK7+00D5A5ar/9z/ZXnIblmDaenDRt8ZWqvg2oRVYgOcl7X4jxM+hQ0EUUHeyuaIO3T6aWFLgHNPLrnDHce/9IdKSQoeL1CYNOOGQqEWlHredqgZ/C9R2DJzw/YVfWAO8zg3rrIXCrRY2TNsIf9279gBcS79TAUYZd3S06TswsHZVBR9bBs5uDEcBUaolnU0L5hTYKu3CUx825Y5hcVqMW59W4hB7VbM9JGKUeXFJ7v2cLHFbWKAIsMPHC+VAuqXKkekczi3iSJut7tqfmggddlxBy9sKn/Ku/dH4hLV7qgOq6c22vl0hPqDBZBZiCyVq5PCq458fOUvmDy/GPCxQ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(366016)(376014)(1800799024)(52116014)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +9cCya68AiV3RZ1FFPbt82mXRT5GvRebmnpZncMxzOMkmxLasLee9zALYO7YY1vRO6W2P+8DvxFUaQcWLSuAyn1s9klopJkrK9L/3Puo65NnndrGvzhxaDdiI9foTtcqeSGNrxjL+D0iaKlzTtIaoxHCENlbjD+3nxDIQS8Agyq5RJpOS9enE3Pqgr0LsI/qlFJfaCwXb9Z5ZNezW7xrxKJEQfM9WCbFRPbRulheGsmSRh2NNoEcvsurJBtCRfflqG6diTMnJIX9nZ19N/4fr/B+MtMLsxkVVml4NqOoGBWlPPvXSW6iQPioKee/GITUykVJUYUSNf26rdYQqtnDQTaBd+bswPRznCoMkJBwffDfxdYHm+ldZG3MElunltt9wadPWiTzX3e4xsKlXmyMB6/K7/bfw8Hx1IGY2Rs1u03J8IypJMRnVLpKMb576ShZSZzMqKV++OOryZxM1fu8X+JMoUUSfdApUzqSaWHOnLwHGGMbV9IjDlVU7xzfK28FxJZFNIBuZrN3pqwn0JZrrHROTZKNH/p8W20wa5PiJxdJYiowNlAGYGjcNQZlAFuu7Kf9La/+fCoo/TuY/faKVT7OJaXzSWT3o8VTboUq1Tu55v0sP3U4Ulp/I0PBKTf9h8C4Ql13Yra0leUQEJQbhykl9jlFZ65lvv5XpnDV/pHBHCh1G6Wd5kDdzCDRFZEGXHSOjXXh9GfVSPJAjkpfQHS2ZD4g5nj7CSTkEuvBsX66ZzgPIhmTkz2QW1Wvx0wswSjbY7ohu33KEmt9L8rDPJVg0IyCyEaPwacgD7/AKO+lbfcjzGC3eppjqW6U6bpj7vfwtN82t2QyVQe0bP4nViNh/ZCRk/UD0udG7XS4XHZXZ9Puir2k/nhuv0jgi0RnufGodcYfWcBEkv7AdRymGOM/n2LK92qVVoUwIXYR1+H7FqYVdXwcDXh04JyfOjCax8aCUFSbnjs8QwCpbW9V7yD9yr0usEtfkcneqGMpw1MrFBGmebP9qKbHZp5s/zf5ieMXNAYuN6p5W3iEdKiAUEOuRlzTWrW4y4alTiJYiCWkSgUcSZcowgwDq9IRTu+bKQQ99obDfEhyoOAfunF2VDKP03QBp0zg2LOIRkKLOpgZZAdkvSA4cFVNNAr3BRTLY5A7XoPJGO6Cwp6dVnyBzksUcRXgxzG7Ud6YsMOgHKE4Q1mec3hPSnvlJ7WkkSnJQaqpgD3YUEhew3Q8l/+bD3IvNwbUSeqdXxAeKYWO0ESL4imUfe5lyDT/s0j5lqwY2Zdu4uYIeNEhGMzzmGC9FGbCKyqIKrtAc0pTDW9jExQ9pDZcZFm0LwYbvCkDKWHcSlIIdCFOg5xBa/bbOiIlpjKlVVYQeXKL96PUa0rL4cPjXVt20AGx8HkvwyMepLWb0vS9zbQPQko6QxU0sUSnk18sL6vrHCtELoyjZIGPEEo9Iy9BwtougqvjDZCajzRGZMb6cgyZaJDEvh+XWmNs0B5J+hco3HLZMM764r6yEBhWUW8wqUcyhFpbPZUCJXlQkI01NYNVieB1rjGdwxMsy7w5frl+Kcc3escvT4qF4UPWzAlIUFx4o5Q8SjqJ0w74 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58ed4c7e-2111-41be-a5fd-08dcee820d37 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2024 08:02:31.7459 (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: nXFgK4VhM3GVma+QIMvTrMW1FR37LwxogZP8qtLloFeFNrLaG1iw50zQa0WFMCjIHXydmzlQ9gB4AC6PRwQjVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7304 From: Vladimir Oltean The ERR050089 workaround causes performance degradation and potential functional issues (e.g., RCU stalls) under certain workloads. Since new SoCs like i.MX95 do not require this workaround, use a static key to compile out enetc_lock_mdio() and enetc_unlock_mdio() at runtime, improving performance and avoiding unnecessary logic. Signed-off-by: Vladimir Oltean Signed-off-by: Wei Fang Reviewed-by: Frank Li --- v2 changes: no changes v3 changes: Change the title and refactor the commit message. --- .../net/ethernet/freescale/enetc/enetc_hw.h | 34 +++++++++++++------ .../ethernet/freescale/enetc/enetc_pci_mdio.c | 17 ++++++++++ 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h index 1619943fb263..6a7b9b75d660 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h +++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h @@ -396,18 +396,22 @@ struct enetc_hw { */ extern rwlock_t enetc_mdio_lock; +DECLARE_STATIC_KEY_FALSE(enetc_has_err050089); + /* use this locking primitive only on the fast datapath to * group together multiple non-MDIO register accesses to * minimize the overhead of the lock */ static inline void enetc_lock_mdio(void) { - read_lock(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + read_lock(&enetc_mdio_lock); } static inline void enetc_unlock_mdio(void) { - read_unlock(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + read_unlock(&enetc_mdio_lock); } /* use these accessors only on the fast datapath under @@ -416,14 +420,16 @@ static inline void enetc_unlock_mdio(void) */ static inline u32 enetc_rd_reg_hot(void __iomem *reg) { - lockdep_assert_held(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + lockdep_assert_held(&enetc_mdio_lock); return ioread32(reg); } static inline void enetc_wr_reg_hot(void __iomem *reg, u32 val) { - lockdep_assert_held(&enetc_mdio_lock); + if (static_branch_unlikely(&enetc_has_err050089)) + lockdep_assert_held(&enetc_mdio_lock); iowrite32(val, reg); } @@ -452,9 +458,13 @@ static inline u32 _enetc_rd_mdio_reg_wa(void __iomem *reg) unsigned long flags; u32 val; - write_lock_irqsave(&enetc_mdio_lock, flags); - val = ioread32(reg); - write_unlock_irqrestore(&enetc_mdio_lock, flags); + if (static_branch_unlikely(&enetc_has_err050089)) { + write_lock_irqsave(&enetc_mdio_lock, flags); + val = ioread32(reg); + write_unlock_irqrestore(&enetc_mdio_lock, flags); + } else { + val = ioread32(reg); + } return val; } @@ -463,9 +473,13 @@ static inline void _enetc_wr_mdio_reg_wa(void __iomem *reg, u32 val) { unsigned long flags; - write_lock_irqsave(&enetc_mdio_lock, flags); - iowrite32(val, reg); - write_unlock_irqrestore(&enetc_mdio_lock, flags); + if (static_branch_unlikely(&enetc_has_err050089)) { + write_lock_irqsave(&enetc_mdio_lock, flags); + iowrite32(val, reg); + write_unlock_irqrestore(&enetc_mdio_lock, flags); + } else { + iowrite32(val, reg); + } } #ifdef ioread64 diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c index a1b595bd7993..2445e35a764a 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c @@ -9,6 +9,9 @@ #define ENETC_MDIO_BUS_NAME ENETC_MDIO_DEV_NAME " Bus" #define ENETC_MDIO_DRV_NAME ENETC_MDIO_DEV_NAME " driver" +DEFINE_STATIC_KEY_FALSE(enetc_has_err050089); +EXPORT_SYMBOL_GPL(enetc_has_err050089); + static int enetc_pci_mdio_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -62,6 +65,12 @@ static int enetc_pci_mdio_probe(struct pci_dev *pdev, goto err_pci_mem_reg; } + if (pdev->vendor == PCI_VENDOR_ID_FREESCALE && + pdev->device == ENETC_MDIO_DEV_ID) { + static_branch_inc(&enetc_has_err050089); + dev_info(&pdev->dev, "Enabled ERR050089 workaround\n"); + } + err = of_mdiobus_register(bus, dev->of_node); if (err) goto err_mdiobus_reg; @@ -88,6 +97,14 @@ static void enetc_pci_mdio_remove(struct pci_dev *pdev) struct enetc_mdio_priv *mdio_priv; mdiobus_unregister(bus); + + if (pdev->vendor == PCI_VENDOR_ID_FREESCALE && + pdev->device == ENETC_MDIO_DEV_ID) { + static_branch_dec(&enetc_has_err050089); + if (!static_key_enabled(&enetc_has_err050089.key)) + dev_info(&pdev->dev, "Disabled ERR050089 workaround\n"); + } + mdio_priv = bus->priv; iounmap(mdio_priv->hw->port); pci_release_region(pdev, 0);