From: Doug Berger <opendmb@gmail.com>
To: Florian Fainelli <florian.fainelli@broadcom.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Broadcom internal kernel review list
<bcm-kernel-feedback-list@broadcom.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Doug Berger <opendmb@gmail.com>
Subject: [PATCH net-next 04/14] net: bcmgenet: BCM7712 is GENETv5 compatible
Date: Thu, 6 Mar 2025 11:26:32 -0800 [thread overview]
Message-ID: <20250306192643.2383632-5-opendmb@gmail.com> (raw)
In-Reply-To: <20250306192643.2383632-1-opendmb@gmail.com>
The major revision of the GENET core in the BCM7712 SoC was bumped
to 7 but it is compatible with the GENETv5 implementation. This
commit maps the version accordingly to avoid a warning.
Signed-off-by: Doug Berger <opendmb@gmail.com>
---
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 48830942afa8..e6b2a0499edb 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3825,7 +3825,7 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv)
/* Read GENET HW version */
reg = bcmgenet_sys_readl(priv, SYS_REV_CTRL);
major = (reg >> 24 & 0x0f);
- if (major == 6)
+ if (major == 6 || major == 7)
major = 5;
else if (major == 5)
major = 4;
--
2.34.1
next prev parent reply other threads:[~2025-03-06 19:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-06 19:26 [PATCH net-next 00/14] net: bcmgenet: revise suspend/resume Doug Berger
2025-03-06 19:26 ` [PATCH net-next 01/14] net: bcmgenet: bcmgenet_hw_params clean up Doug Berger
2025-03-06 19:41 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 02/14] net: bcmgenet: add bcmgenet_has_* helpers Doug Berger
2025-03-06 19:41 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 03/14] net: bcmgenet: move feature flags to bcmgenet_priv Doug Berger
2025-03-06 19:41 ` Florian Fainelli
2025-03-06 19:26 ` Doug Berger [this message]
2025-03-06 19:41 ` [PATCH net-next 04/14] net: bcmgenet: BCM7712 is GENETv5 compatible Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 05/14] net: bcmgenet: extend bcmgenet_hfb_* API Doug Berger
2025-03-06 19:41 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 06/14] net: bcmgenet: move DESC_INDEX flow to ring 0 Doug Berger
2025-03-06 20:17 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 07/14] net: bcmgenet: add support for RX_CLS_FLOW_DISC Doug Berger
2025-03-06 20:17 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 08/14] net: bcmgenet: remove dma_ctrl argument Doug Berger
2025-03-06 20:17 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 09/14] net: bcmgenet: consolidate dma initialization Doug Berger
2025-03-06 20:20 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 10/14] net: bcmgenet: introduce bcmgenet_[r|t]dma_disable Doug Berger
2025-03-06 20:21 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 11/14] net: bcmgenet: support reclaiming unsent Tx packets Doug Berger
2025-03-06 20:22 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 12/14] net: bcmgenet: move bcmgenet_power_up into resume_noirq Doug Berger
2025-03-06 20:24 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 13/14] net: bcmgenet: allow return of power up status Doug Berger
2025-03-06 20:24 ` Florian Fainelli
2025-03-06 19:26 ` [PATCH net-next 14/14] net: bcmgenet: revise suspend/resume Doug Berger
2025-03-06 20:29 ` Florian Fainelli
2025-03-08 3:40 ` [PATCH net-next 00/14] " patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250306192643.2383632-5-opendmb@gmail.com \
--to=opendmb@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).