From: Vineeth Karumanchi <vineeth.karumanchi@amd.com>
To: <nicolas.ferre@microchip.com>, <claudiu.beznea@tuxon.dev>,
<davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
<pabeni@redhat.com>, <robh@kernel.org>, <krzk+dt@kernel.org>,
<conor+dt@kernel.org>, <linux@armlinux.org.uk>, <andrew@lunn.ch>
Cc: <vineeth.karumanchi@amd.com>, <netdev@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<git@amd.com>
Subject: [RFC PATCH net-next 3/5] net: macb: Update USX_CONTROL reg's bitfields and constants.
Date: Wed, 9 Oct 2024 11:09:44 +0530 [thread overview]
Message-ID: <20241009053946.3198805-4-vineeth.karumanchi@amd.com> (raw)
In-Reply-To: <20241009053946.3198805-1-vineeth.karumanchi@amd.com>
New bitfeilds of USX_CONTROL register:
- GEM_RX_SYNC: RX Reset: Reset the receive datapath.
Constants of the bitfeilds in USX_CONTROL reg:
- HS_SPEED_*: Multiple speed constants of USX_SPEED bitfeild.
- MACB_SERDES_RATE_*: Multiple serdes rate constants of
SERDES_RATE bitfeild.
Since MACB_SERDES_RATE_* and HS_SPEED_* are register constants,
move them to the header file.
Signed-off-by: Vineeth Karumanchi <vineeth.karumanchi@amd.com>
---
drivers/net/ethernet/cadence/macb.h | 12 ++++++++++++
drivers/net/ethernet/cadence/macb_main.c | 3 ---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 5740c98d8c9f..47e80fa72865 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -563,11 +563,23 @@
#define GEM_RX_SCR_BYPASS_SIZE 1
#define GEM_TX_SCR_BYPASS_OFFSET 8
#define GEM_TX_SCR_BYPASS_SIZE 1
+#define GEM_RX_SYNC_RESET_OFFSET 2
+#define GEM_RX_SYNC_RESET_SIZE 1
#define GEM_TX_EN_OFFSET 1
#define GEM_TX_EN_SIZE 1
#define GEM_SIGNAL_OK_OFFSET 0
#define GEM_SIGNAL_OK_SIZE 1
+/* Constants for USX_CONTROL */
+#define HS_SPEED_10000M 4
+#define HS_SPEED_5000M 3
+#define HS_SPEED_2500M 2
+#define HS_SPEED_1000M 1
+#define MACB_SERDES_RATE_10G 1
+#define MACB_SERDES_RATE_5G 0
+#define MACB_SERDES_RATE_2_5G 0
+#define MACB_SERDES_RATE_1G 0
+
/* Bitfields in USX_STATUS. */
#define GEM_USX_BLOCK_LOCK_OFFSET 0
#define GEM_USX_BLOCK_LOCK_SIZE 1
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 8f893f035289..3f9dc0b037c0 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -87,9 +87,6 @@ struct sifive_fu540_macb_mgmt {
#define MACB_WOL_ENABLED BIT(0)
-#define HS_SPEED_10000M 4
-#define MACB_SERDES_RATE_10G 1
-
/* Graceful stop timeouts in us. We should allow up to
* 1 frame time (10 Mbits/s, full-duplex, ignoring collisions)
*/
--
2.34.1
next prev parent reply other threads:[~2024-10-09 5:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 5:39 [RFC PATCH net-next 0/5] net: macb: Add versal2 10GBE device support Vineeth Karumanchi
2024-10-09 5:39 ` [RFC PATCH net-next 1/5] dt-bindings: net: macb: Add support for versal2 10gbe device Vineeth Karumanchi
2024-10-09 6:43 ` Krzysztof Kozlowski
2024-10-09 5:39 ` [RFC PATCH net-next 2/5] net: macb: Add versal2 10GBE device support Vineeth Karumanchi
2024-10-09 5:39 ` Vineeth Karumanchi [this message]
2024-10-09 9:04 ` [RFC PATCH net-next 3/5] net: macb: Update USX_CONTROL reg's bitfields and constants Russell King (Oracle)
2024-10-09 5:39 ` [RFC PATCH net-next 4/5] net: macb: Configure High Speed Mac for given speed Vineeth Karumanchi
2024-10-09 6:36 ` Maxime Chevallier
2024-10-10 13:53 ` Karumanchi, Vineeth
2024-10-09 9:19 ` Russell King (Oracle)
2024-10-10 14:09 ` Karumanchi, Vineeth
2024-10-10 14:17 ` Russell King (Oracle)
2024-10-09 5:39 ` [RFC PATCH net-next 5/5] net: macb: Get speed and link status runtime Vineeth Karumanchi
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=20241009053946.3198805-4-vineeth.karumanchi@amd.com \
--to=vineeth.karumanchi@amd.com \
--cc=andrew@lunn.ch \
--cc=claudiu.beznea@tuxon.dev \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=git@amd.com \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=pabeni@redhat.com \
--cc=robh@kernel.org \
/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
all inboxes | Powered by JetHome®