From patchwork Fri Mar 31 21:22:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shenwei Wang X-Patchwork-Id: 13196591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 201ADC761A6 for ; Fri, 31 Mar 2023 21:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Jq4cmyMAjYK6QeJey15wicWLuKJwwMpbAihCHHfSCkM=; b=bGZa2kDnrSc/qH WsiSmG3u+EYCm2qEiMhXoVlCx1+GIFyS+DuVh+vTe+eSo7QkDocD2Zhs/yahI0mbuioXewBM7L0Wb QpUjD9xhs4QFD4+JjBUEhdhNtiDF0VY6y+PSGsnvufDEAxrr26kAYaRh31FncIpov0vGcREKaDjcj ZhWP2Ujm1IzA0iKZCl/toCUh9FWL7AdzwhvoV04b6LAhhS003iFJZ+PII3yLf69pvbDC2gZt7LurX +uyIGF29Ljhd9B0qDvDeAWe8rquMbg3qXr5m6i8xhd0FWaFyDtVoATxsawcO9L9Dz8BoQ7Ehk5bEd fCsbuIan9nzUh+2GFYzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1piMSX-008wBa-1l; Fri, 31 Mar 2023 21:38:57 +0000 Received: from mail-vi1eur04on0623.outbound.protection.outlook.com ([2a01:111:f400:fe0e::623] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1piMSU-008wAo-1w for linux-arm-kernel@lists.infradead.org; Fri, 31 Mar 2023 21:38:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oPpS0jf20+V6Jbacjuf44G0H27iJ2y+mzBGvwe6LqvXb2MANE9AlFzgxT2yI1UQOzwMHCP3eUIbNUnCHbqqwR2ufV5YgTYf9I80uG7OTvHWnb3cSnKKtwegQOYQ+5PKC9+sL8UKa5DF8zZW0msC3V7EYItoSfkzj1oW4N7Staj73pspjPe+PZHlCImUeM32wJfW0jJneoleL1U6c8AQBNhnT74eNG4ci6uaOrlbnZPQ9EJNfO5GIWv+1P/wVnWNr8399KDL+45BNZ0lO0T4e6RbOFuOYlrT+e+6iSn/3OBrN6gwmg4OP2Y9/JSPkmY0SUQarb9+YeF/wjKhCrRHKbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=PzX5IizI2Jc4ZZs9cujs/cT91HuZ7dWYYHToIHfm538=; b=kHUgdMaOLWieu5oAJjxnGEN7su/CjyL+5EhenfASr91v7EdNmimiwj9vXbVq/WiFlkGqzYJqvyIdiEHkh6vdmukXYyOxlTAxB7F6sTqh+aW23NMJydivo9Hp0j/xBaBK5Hi3/WKq22dUksPw//xHppXWB0CYIlq+QgpDicaOMQApz1BVKsqLedCCqJqDORrxFDPKP9UeSjdhocpY2RM7K5pQnsXqgEHZhyOasv0+Py8Y9CHXdE+5dB42A7oLZ/dzeOcQW+n+ub8zTiwTtA+p4UxK2ISC6CQFS0vvA6K+TtfGpR9r6HVnOTH2jVJ0Aqxq7bOduk7bOe5M/Gd7c6Ygfg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PzX5IizI2Jc4ZZs9cujs/cT91HuZ7dWYYHToIHfm538=; b=BQze+ygGNrWoDpCDNZoq0meKAoTcg0W2uW94GOsTSuRryFJAC1uZih/+45bl6gePaPmRLMA/5vxOrlEH0k2NDV80npjaTx+DSOu4OomiYkeU01WXjMQZeeLqL53wo+MvGbtEyDERN6fuAc0kWMaUqERdlBQrqCza9iPDH7BjO0s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) by DB9PR04MB9992.eurprd04.prod.outlook.com (2603:10a6:10:4c1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.26; Fri, 31 Mar 2023 21:23:00 +0000 Received: from PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3]) by PAXPR04MB9185.eurprd04.prod.outlook.com ([fe80::28fb:82ec:7a6:62f3%3]) with mapi id 15.20.6254.023; Fri, 31 Mar 2023 21:23:00 +0000 From: Shenwei Wang To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shawn Guo , Sascha Hauer , Maxime Coquelin Cc: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Wong Vee Khee , Kurt Kanzenbach , Revanth Kumar Uppala , Andrey Konovalov , Shenwei Wang , Tan Tee Min , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, imx@lists.linux.dev Subject: [PATCH v4 1/2] net: stmmac: add support for platform specific reset Date: Fri, 31 Mar 2023 16:22:49 -0500 Message-Id: <20230331212250.103017-1-shenwei.wang@nxp.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: SJ0PR03CA0194.namprd03.prod.outlook.com (2603:10b6:a03:2ef::19) To PAXPR04MB9185.eurprd04.prod.outlook.com (2603:10a6:102:231::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9185:EE_|DB9PR04MB9992:EE_ X-MS-Office365-Filtering-Correlation-Id: 9b99af03-1f2f-4cc0-8f81-08db322e1aa2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o2v/2h5jUhoHDJfCA+AU358Gc2DLDy+JXAR18maKfbbhU2lDPurHEsTEK6Q3ofc+qz0zR4BlWSKTLaZsLCzKkLBtFbH+xpjaaMAfOS3biQX+1I9jtT1kWq7a/rWhypovJLXrDqmK5yBFoNPuzjDi6MzwS5OM+j+AxGx/Xn+MgALQMfgIGPt8V9/z59wF6fOTs6zjYb9RC/rqaPxWN7wlhAQyYYA/pYIGV/asQwGiasqRcn/k2h4LNzli5I+xFFe92RARihFT0FC8TDr8K/dHqAzzce4P7pX2nR1YDcj0CDg8zdqXLVa5zdtQux6ffpRdw69N0N3NTq+pzkxv9pIbzXlbgLPZQwKsYv1J98+fWOdOuxUblItXAhI6mH+s+ucKCpbz6y4Sz56tB7nqKvHVYr6KgVug/tKB5StxP/80eyNvk79tct6MGx7Uze1FFRCyVtSgHZ1JQ6A0vZbwyBeuFvOrKvmRjrsN3nZjxIymsm6zDOFwBlBBxsnqaFsDxUPQ+ahYbuReSzSHwrmfxrqQC5VEG7W/O8mOnRXY/PDwfRbF73I5B6Elv8IXrGyg2mULAS8kNZIHliX7PI5lj/WGrSH4Tx+wm20aRAYocwoHsPaKPiLL/ZV4E9aD0PgvPspJ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9185.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(366004)(346002)(136003)(376002)(396003)(39860400002)(451199021)(110136005)(44832011)(6666004)(316002)(55236004)(6506007)(6512007)(1076003)(54906003)(38100700002)(4326008)(36756003)(66476007)(26005)(8676002)(66556008)(66946007)(186003)(38350700002)(478600001)(2906002)(7416002)(83380400001)(6486002)(41300700001)(5660300002)(86362001)(2616005)(52116002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CacxmvYwAqXMnML8W/E0brNVTWXjNd7/rmPUV0tBgjg8onF3lgwyljWpdekPA+2jIzCQRIg39TdMD0ghCAXZY965ZxbrYp0OWOvC3udXGeKd+HAiPRzu6bXd1wkrCkxVtZV484entNAPL9eAa5A6qNFSzjrdOdR/wOhk47KDiy8qK7nEI0RKx4juSdWSwX/NgXvqDoB88icN5zbc7m2NSPLg+8HJ4r5lEqB8hQswJHjDTpfCQs660vkno9io/6NWXPuXGD1OI7J1FtxXQ5K1T3p9iPA0Np+/vFV+8mVaKWZxHK2CSu5mamJ1ufYpmFKWkW79Tn4wmDB/UUz7iUVovz/KUP78ooo9pYeZu8kG4inNdpD7hNFHN8RiJRrrUXnmr1mfzotAmG36TkRkiT5NkYYSsk9OVgs95NZ1oVZWubfepGK6UVW7t34WC66N020+7RiTFLDhQ3KIip3mQXcTdFzv91f2itfVVahLSDN2tap0a4tUquNTT1y+irWfTExQS43RngnjMNVZz5qXc5qfWgBaxmD65GBH7/VE/mc7z5Hav30YonYtg9ShvUM+n97TKt+xzmoRGE01y1Orpexo7nlmMoNywZkAHg79p2uqqk9zbP8ad5IqW+K3V9IbA0TVPDZWg6OHumNHfG00Epb1v9DZ6zPXnDtSJQxB3lg+iuvnF2BQ5LSw94jMKR+vtIhwNIayyvOVHaauOr4sttuqjgIf9anzdB/Ec1Rf5cEy37jugLT6LEs1MOX16DGZXhzReh//aZyc6dSeCt++BHMqHJZ4NERAiE5ASuB8Emcc7KYBvXYbb/6RevTzMW+ykYqWAJmFMLKolJl2/Uq/Xz5XmgDcg+6m8/OZOlhlNOCZgkxFHZ97rY634wz3jxg7IqH3t1k5C4u0EA6gd+O5hdPttFxi2i8neADV7Hm4eHMhNSwfPnFN0H704KFRMBz+u/KluxOqoIMR2rPO3QdmHj6TLP59H7xSxVViaf7Cg3DjKf5CLs2XZZGWtRgAQF9dbDoQOLABR6LXJFyhCdjZ3WeXahVeHF1BPo262WLtw6ZESRXNQ5Ubyvay1ujM/WqNWbalJzkF7wszoclUpAgnumkn5ISNVw47xGEwba+wfoXzF1pYb6Gpgs0gbP8/uys8cVeShV7K1eHgszTnalzzTDjQ5fNB1+mpl8CvOSYQVoG20M7Bs0JpwFpVC1Aj/j5v6CHjwt024WofOT0KqF9Ms0NkRKjNcD+rc7FncW+/nBLhoHuoVNi4uG7T0/Re0pkTQ9nbNXV1a2IPuO0ouLVwHGzBS6K8rEwL1UGsrFeDmB+rdqhGwVXoxJnXsviUEPtu0uFcm/ZjpqrQue+e8klDrdwz2BayQ+2ijvuBWrz0+pMU156XTecL2UhT9l71pN7U+VbgJAh3sQjznROCVBu3nNV+bqXgjKtFAmVdNpRluzR9XzrQlFAl8MRxSgt1UgJ5SttJ+NeeI9oq8CMUc/A9zX1IMfaVes/FNiR3FYePj6xtStq4zyacQtYk6oLOF1k0L0O52xwofEU9ZZaICVIAkL9uEjXYrzkFQF8ZQu8s75KJj64Yxhj3K4Lll+7ZgFvLDV2Z X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b99af03-1f2f-4cc0-8f81-08db322e1aa2 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 21:23:00.2941 (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: 2mvnVJYlTKlCxVsnzoEGy2NF0kck8DenSh2aQNq66lWv/bHquJb53jUp51tIz8a64juTstgyVClRT7P3ebHqcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9992 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230331_143854_664143_60A15CED X-CRM114-Status: GOOD ( 16.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch adds support for platform-specific reset logic in the stmmac driver. Some SoCs require a different reset mechanism than the standard dwmac IP reset. To support these platforms, a new function pointer 'fix_soc_reset' is added to the plat_stmmacenet_data structure. The stmmac_reset macro in hwif.h is modified to call the 'fix_soc_reset' function if it exists. This enables the driver to use the platform-specific reset logic when necessary. Reviewed-by: Fabio Estevam Signed-off-by: Shenwei Wang --- drivers/net/ethernet/stmicro/stmmac/hwif.c | 10 ++++++++++ drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 +-- include/linux/stmmac.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) -- 2.34.1 diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c index bb7114f970f8..0eefa697ffe8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -87,6 +87,16 @@ static int stmmac_dwxlgmac_quirks(struct stmmac_priv *priv) return 0; } +int stmmac_reset(struct stmmac_priv *priv, void __iomem *ioaddr) +{ + struct plat_stmmacenet_data *plat = priv ? priv->plat : NULL; + + if (plat && plat->fix_soc_reset) + return plat->fix_soc_reset(plat, ioaddr); + + return stmmac_do_callback(priv, dma, reset, ioaddr); +} + static const struct stmmac_hwif_entry { bool gmac; bool gmac4; diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index 16a7421715cb..47a68f506c10 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -214,8 +214,6 @@ struct stmmac_dma_ops { int (*enable_tbs)(void __iomem *ioaddr, bool en, u32 chan); }; -#define stmmac_reset(__priv, __args...) \ - stmmac_do_callback(__priv, dma, reset, __args) #define stmmac_dma_init(__priv, __args...) \ stmmac_do_void_callback(__priv, dma, init, __args) #define stmmac_init_chan(__priv, __args...) \ @@ -640,6 +638,7 @@ extern const struct stmmac_mmc_ops dwxgmac_mmc_ops; #define GMAC_VERSION 0x00000020 /* GMAC CORE Version */ #define GMAC4_VERSION 0x00000110 /* GMAC4+ CORE Version */ +int stmmac_reset(struct stmmac_priv *priv, void *ioaddr); int stmmac_hwif_init(struct stmmac_priv *priv); #endif /* __STMMAC_HWIF_H__ */ diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index a152678b82b7..9044477fad61 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -223,6 +223,7 @@ struct plat_stmmacenet_data { struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES]; struct stmmac_txq_cfg tx_queues_cfg[MTL_MAX_TX_QUEUES]; void (*fix_mac_speed)(void *priv, unsigned int speed); + int (*fix_soc_reset)(void *priv, void __iomem *ioaddr); int (*serdes_powerup)(struct net_device *ndev, void *priv); void (*serdes_powerdown)(struct net_device *ndev, void *priv); void (*speed_mode_2500)(struct net_device *ndev, void *priv);