From patchwork Wed Apr 8 09:26:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 1998 Return-Path: X-Original-To: noreply@patchwork.local Delivered-To: noreply@patchwork.local Received: from tor.lore.kernel.org (tor.lore.kernel.org [172.105.105.114]) by mxe881.netcup.net (Postfix) with ESMTPS id 94A251C00BE for ; Wed, 8 Apr 2026 11:27:50 +0200 (CEST) Authentication-Results: mxe881; dkim=fail header.d=armlinux.org.uk; spf=pass (sender IP is 172.105.105.114) smtp.mailfrom=linux-sunxi+bounces-22805-noreply=patchwork.local@lists.linux.dev smtp.helo=tor.lore.kernel.org Received-SPF: pass (mxe881: domain of lists.linux.dev designates 172.105.105.114 as permitted sender) client-ip=172.105.105.114; envelope-from=linux-sunxi+bounces-22805-noreply=patchwork.local@lists.linux.dev; helo=tor.lore.kernel.org; Received: from smtp.subspace.kernel.org (conduit.subspace.kernel.org [100.90.174.1]) by tor.lore.kernel.org (Postfix) with ESMTP id A5A84300A12C for ; Wed, 8 Apr 2026 09:27:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 596F039DBF4; Wed, 8 Apr 2026 09:27:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="lSwyiH4l" X-Original-To: linux-sunxi@lists.linux.dev Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [78.32.30.218]) (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 090412EACF2 for ; Wed, 8 Apr 2026 09:27:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.32.30.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775640435; cv=none; b=uBJfTlC9xS1Mc5K5kCz7kgtqX2Kesf8CElal858bMDCFrwhkZtXt+P/LSCYYMkqkB1V6Q3cH+p5qjglCDeyiT8EY3t0ptAmbOINL7EyUMMyn2t6h2mekIWuJb4SOv+P0b5mKZRwGE/D2fvtlE/KBHbR3gX9aMZAdCMYbCz7y2fs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775640435; c=relaxed/simple; bh=QD1hmmO1cyoUsUck2QKM+8wErs8ZaoXgtPVgG8mgXv4=; h=In-Reply-To:References:From:To:Cc:Subject:MIME-Version: Content-Disposition:Content-Type:Message-Id:Date; b=pJCIDQCEvzSB1kLkpEGR8cz84/b84nXOT96jDNCZsjxz6AvMgnkvwkmBEb1cUcMQPsMoCCZ2weuOYeU6eQwe4GUlFX5Ztb8dTZRhpM3qG1+STL62OYoFpSVgkEJQ2zqsbOpIxjrJtZMOKecNoyotRQbvpld/qburejuDIpxCMdE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk; spf=none smtp.mailfrom=armlinux.org.uk; dkim=pass (2048-bit key) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b=lSwyiH4l; arc=none smtp.client-ip=78.32.30.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=armlinux.org.uk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=armlinux.org.uk DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=MVPIQsgXNzDIVzZb7L4g65zcVReNq7T7sAr8ZW6erb4=; b=lSwyiH4lcPtm2ZaH5eI5HlAO4j 8x582wyp8D0+XiaTrgjbVdhKPS+I/aI+ellLhqKBMuvKPmvbc3c6hM1NhY24L6yar8Pt+dRR8zHl6 DaP4FdBByBXZIeCuNvJrt42X/X7xnJ+WVslyhAPHWFn8F3KSJLoSY+pu8WsREw2koXVAVHpZSghyh ukm5CKPeWhfpMelT7osVZEuTeImtypXKdaQ4BYtJ/qnc/wR21WAFR9QqisQU20CUDd6dcjBb2liJ6 TfLo3byg3vwDEkDR+A9P/TrHsxtOxfJmr3m7zqld2YjCnkL/eXG3uXvTg0jOGBaYV02YDgfxsbN3J d6R3eC9Q==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:39662 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1wAPBN-0000000022o-13aq; Wed, 08 Apr 2026 10:26:45 +0100 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.98.2) (envelope-from ) id 1wAPBM-0000000F7jo-1DIY; Wed, 08 Apr 2026 10:26:44 +0100 In-Reply-To: References: From: "Russell King (Oracle)" To: Andrew Lunn Cc: Alexandre Torgue , Andrew Lunn , Chen-Yu Tsai , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Jitendra Vegiraju , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-sunxi@lists.linux.dev, netdev@vger.kernel.org, Paolo Abeni , Samuel Holland Subject: [PATCH RFC net-next 01/10] net: stmmac: rename min_id to min_snpsver Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Wed, 08 Apr 2026 10:26:44 +0100 X-Rspamd-Server: rspamd-worker-8404 X-Spamd-Result: default: False [-0.16 / 15.00]; BAYES_HAM(-5.50)[100.00%]; RBL_SENDERSCORE(2.00)[172.105.105.114:from]; SUSPICIOUS_RECIPS(1.50)[]; DMARC_POLICY_SOFTFAIL(1.00)[armlinux.org.uk : SPF not aligned (relaxed),none]; R_DKIM_REJECT(1.00)[armlinux.org.uk:s=pandora-2019]; MAILLIST(-0.15)[generic]; MIME_GOOD(-0.10)[text/plain]; BAD_REP_POLICIES(0.10)[]; HAS_LIST_UNSUB(-0.01)[]; PRECEDENCE_BULK(0.00)[]; FROM_HAS_DN(0.00)[]; TAGGED_RCPT(0.00)[netdev]; FUZZY_BLOCKED(0.00)[rspamd.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[tor.lore.kernel.org:rdns,tor.lore.kernel.org:helo,armlinux.org.uk:email]; FORGED_SENDER_MAILLIST(0.00)[]; RCPT_COUNT_TWELVE(0.00)[14]; RCVD_COUNT_FIVE(0.00)[6]; TAGGED_FROM(0.00)[bounces-22805-noreply=patchwork.local,kernel]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[armlinux.org.uk:-]; R_SPF_ALLOW(0.00)[+ip4:172.105.105.114]; TO_DN_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[rmk@armlinux.org.uk,linux-sunxi@lists.linux.dev]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:63949, ipnet:172.105.96.0/20, country:SG]; ARC_ALLOW(0.00)[subspace.kernel.org:s=arc-20240116:i=1]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Queue-Id: 94A251C00BE X-MORS-Enabled: yes X-MORS-DOMAIN: patchwork.local X-MORS-HOSTING: hosting172546 X-MORS-USER: hosting172546 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= min_id is the minimum Synopsys IP version that the hwif entry will match. Name it min_snpsver so that it's clear which part of the version ID it is related to. Signed-off-by: Russell King (Oracle) --- drivers/net/ethernet/stmicro/stmmac/hwif.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.c b/drivers/net/ethernet/stmicro/stmmac/hwif.c index 511b0fd5e834..3774af66db48 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.c +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.c @@ -110,7 +110,7 @@ int stmmac_reset(struct stmmac_priv *priv) static const struct stmmac_hwif_entry { enum dwmac_core_type core_type; - u32 min_id; + u32 min_snpsver; u32 dev_id; const struct stmmac_regs_off regs; const void *desc; @@ -129,7 +129,7 @@ static const struct stmmac_hwif_entry { /* NOTE: New HW versions shall go to the end of this table */ { .core_type = DWMAC_CORE_MAC100, - .min_id = 0, + .min_snpsver = 0, .regs = { .ptp_off = PTP_GMAC3_X_OFFSET, .mmc_off = MMC_GMAC3_X_OFFSET, @@ -146,7 +146,7 @@ static const struct stmmac_hwif_entry { .quirks = stmmac_dwmac1_quirks, }, { .core_type = DWMAC_CORE_GMAC, - .min_id = 0, + .min_snpsver = 0, .regs = { .ptp_off = PTP_GMAC3_X_OFFSET, .mmc_off = MMC_GMAC3_X_OFFSET, @@ -163,7 +163,7 @@ static const struct stmmac_hwif_entry { .quirks = stmmac_dwmac1_quirks, }, { .core_type = DWMAC_CORE_GMAC4, - .min_id = 0, + .min_snpsver = 0, .regs = { .ptp_off = PTP_GMAC4_OFFSET, .mmc_off = MMC_GMAC4_OFFSET, @@ -183,7 +183,7 @@ static const struct stmmac_hwif_entry { .quirks = stmmac_dwmac4_quirks, }, { .core_type = DWMAC_CORE_GMAC4, - .min_id = DWMAC_CORE_4_00, + .min_snpsver = DWMAC_CORE_4_00, .regs = { .ptp_off = PTP_GMAC4_OFFSET, .mmc_off = MMC_GMAC4_OFFSET, @@ -204,7 +204,7 @@ static const struct stmmac_hwif_entry { .quirks = NULL, }, { .core_type = DWMAC_CORE_GMAC4, - .min_id = DWMAC_CORE_4_10, + .min_snpsver = DWMAC_CORE_4_10, .regs = { .ptp_off = PTP_GMAC4_OFFSET, .mmc_off = MMC_GMAC4_OFFSET, @@ -225,7 +225,7 @@ static const struct stmmac_hwif_entry { .quirks = NULL, }, { .core_type = DWMAC_CORE_GMAC4, - .min_id = DWMAC_CORE_5_10, + .min_snpsver = DWMAC_CORE_5_10, .regs = { .ptp_off = PTP_GMAC4_OFFSET, .mmc_off = MMC_GMAC4_OFFSET, @@ -246,7 +246,7 @@ static const struct stmmac_hwif_entry { .quirks = NULL, }, { .core_type = DWMAC_CORE_XGMAC, - .min_id = DWXGMAC_CORE_2_10, + .min_snpsver = DWXGMAC_CORE_2_10, .dev_id = DWXGMAC_ID, .regs = { .ptp_off = PTP_XGMAC_OFFSET, @@ -268,7 +268,7 @@ static const struct stmmac_hwif_entry { .quirks = NULL, }, { .core_type = DWMAC_CORE_XGMAC, - .min_id = DWXLGMAC_CORE_2_00, + .min_snpsver = DWXLGMAC_CORE_2_00, .dev_id = DWXLGMAC_ID, .regs = { .ptp_off = PTP_XGMAC_OFFSET, @@ -302,7 +302,7 @@ stmmac_hwif_find(enum dwmac_core_type core_type, u8 snpsver, u8 dev_id) if (core_type != entry->core_type) continue; /* Use synopsys_id var because some setups can override this */ - if (snpsver < entry->min_id) + if (snpsver < entry->min_snpsver) continue; if (core_type == DWMAC_CORE_XGMAC && dev_id != entry->dev_id)