* [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support
@ 2021-10-01 16:42 Biju Das
2021-10-01 16:42 ` [PATCH 1/8] ravb: Add rx_max_buf_size to struct ravb_hw_info Biju Das
` (8 more replies)
0 siblings, 9 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:42 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergey Shtylyov, Lad Prabhakar, Andrew Lunn,
Sergei Shtylyov, Geert Uytterhoeven, Adam Ford,
Yoshihiro Shimoda, netdev, linux-renesas-soc, Chris Paterson,
Biju Das
The DMAC and EMAC blocks of Gigabit Ethernet IP found on RZ/G2L SoC are
similar to the R-Car Ethernet AVB IP.
The Gigabit Ethernet IP consists of Ethernet controller (E-MAC), Internal
TCP/IP Offload Engine (TOE) and Dedicated Direct memory access controller
(DMAC).
With a few changes in the driver we can support both IPs.
This patch series is for adding Gigabit ethernet driver support to RZ/G2L SoC.
The number of patches after incorporatng RFC review comments is 18.
So split the patches into 2 patchsets (10 + 8).
This series is the second patchset, aims to fillup all the stubs for the
Gigabit Ethernet driver.
This patch series depend upon [1]
[1] https://lore.kernel.org/linux-renesas-soc/20211001150636.7500-1-biju.das.jz@bp.renesas.com/T/#t
RFC->V1:
* used rx_max_buf_size instead of rx_2k_buffers feature bit.
* renamed "rgeth" to "gbeth".
* renamed ravb_rx_ring_free to ravb_rx_ring_free_rcar
* renamed ravb_rx_ring_format to ravb_rx_ring_format_rcar
* renamed ravb_alloc_rx_desc to ravb_alloc_rx_desc_rcar
* renamed ravb_rcar_rx to ravb_rx_rcar
* Added Sergey's Rb tag for patch #6.
* Moved CSR0 initialization to patch #8.
Biju Das (8):
ravb: Add rx_max_buf_size to struct ravb_hw_info
ravb: Fillup ravb_rx_ring_free_gbeth() stub
ravb: Fillup ravb_rx_ring_format_gbeth() stub
ravb: Fillup ravb_alloc_rx_desc_gbeth() stub
ravb: Fillup ravb_rx_gbeth() stub
ravb: Add carrier_counters to struct ravb_hw_info
ravb: Add support to retrieve stats for GbEthernet
ravb: Fillup ravb_set_features_gbeth() stub
drivers/net/ethernet/renesas/ravb.h | 47 ++++
drivers/net/ethernet/renesas/ravb_main.c | 327 +++++++++++++++++++++--
2 files changed, 352 insertions(+), 22 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/8] ravb: Add rx_max_buf_size to struct ravb_hw_info
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
@ 2021-10-01 16:42 ` Biju Das
2021-10-01 16:42 ` [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub Biju Das
` (7 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:42 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
R-Car AVB-DMAC has maximum 2K size on RX buffer, whereas on RZ/G2L
it is 8K. We need to allow for changing the MTU within the limit
of the maximum size of a descriptor.
Add a rx_max_buf_size variable to struct ravb_hw_info to handle
this difference.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
RFC->v1:
* used buffer_size instead of feature bit.
---
drivers/net/ethernet/renesas/ravb.h | 1 +
drivers/net/ethernet/renesas/ravb_main.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 5dc1324786e0..b147c4a0dc0b 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -1010,6 +1010,7 @@ struct ravb_hw_info {
int stats_len;
size_t max_rx_len;
u32 tsrq;
+ u32 rx_max_buf_size;
unsigned aligned_tx: 1;
/* hardware features */
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 9a4888543384..0d1e3f7d8c33 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2188,6 +2188,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
.stats_len = ARRAY_SIZE(ravb_gstrings_stats),
.max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,
.tsrq = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,
+ .rx_max_buf_size = SZ_2K,
.internal_delay = 1,
.tx_counters = 1,
.multi_irqs = 1,
@@ -2212,6 +2213,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = {
.stats_len = ARRAY_SIZE(ravb_gstrings_stats),
.max_rx_len = RX_BUF_SZ + RAVB_ALIGN - 1,
.tsrq = TCCR_TSRQ0 | TCCR_TSRQ1 | TCCR_TSRQ2 | TCCR_TSRQ3,
+ .rx_max_buf_size = SZ_2K,
.aligned_tx = 1,
.gptp = 1,
.nc_queue = 1,
@@ -2229,6 +2231,7 @@ static const struct ravb_hw_info gbeth_hw_info = {
.emac_init = ravb_emac_init_gbeth,
.max_rx_len = GBETH_RX_BUFF_MAX + RAVB_ALIGN - 1,
.tsrq = TCCR_TSRQ0,
+ .rx_max_buf_size = SZ_8K,
.aligned_tx = 1,
.tx_counters = 1,
.half_duplex = 1,
@@ -2452,7 +2455,7 @@ static int ravb_probe(struct platform_device *pdev)
}
clk_prepare_enable(priv->refclk);
- ndev->max_mtu = 2048 - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);
+ ndev->max_mtu = info->rx_max_buf_size - (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN);
ndev->min_mtu = ETH_MIN_MTU;
/* FIXME: R-Car Gen2 has 4byte alignment restriction for tx buffer
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
2021-10-01 16:42 ` [PATCH 1/8] ravb: Add rx_max_buf_size to struct ravb_hw_info Biju Das
@ 2021-10-01 16:42 ` Biju Das
2021-10-04 20:29 ` Sergey Shtylyov
2021-10-01 16:43 ` [PATCH 3/8] ravb: Fillup ravb_rx_ring_format_gbeth() stub Biju Das
` (6 subsequent siblings)
8 siblings, 1 reply; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:42 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
Fillup ravb_rx_ring_free_gbeth() function to support RZ/G2L.
This patch also renames ravb_rx_ring_free to ravb_rx_ring_free_rcar
to be consistent with the naming convention used in sh_eth driver.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
RFC->v1:
* renamed "rgeth" to "gbeth".
* renamed ravb_rx_ring_free to ravb_rx_ring_free_rcar
---
drivers/net/ethernet/renesas/ravb.h | 1 +
drivers/net/ethernet/renesas/ravb_main.c | 41 ++++++++++++++++++++----
2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index b147c4a0dc0b..1a73f960d918 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -1077,6 +1077,7 @@ struct ravb_private {
unsigned int num_tx_desc; /* TX descriptors per packet */
int duplex;
+ struct ravb_rx_desc *gbeth_rx_ring[NUM_RX_QUEUE];
const struct ravb_hw_info *info;
struct reset_control *rstc;
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 0d1e3f7d8c33..6ef55f1cf306 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -236,10 +236,30 @@ static int ravb_tx_free(struct net_device *ndev, int q, bool free_txed_only)
static void ravb_rx_ring_free_gbeth(struct net_device *ndev, int q)
{
- /* Place holder */
+ struct ravb_private *priv = netdev_priv(ndev);
+ unsigned int ring_size;
+ unsigned int i;
+
+ if (!priv->gbeth_rx_ring[q])
+ return;
+
+ for (i = 0; i < priv->num_rx_ring[q]; i++) {
+ struct ravb_rx_desc *desc = &priv->gbeth_rx_ring[q][i];
+
+ if (!dma_mapping_error(ndev->dev.parent,
+ le32_to_cpu(desc->dptr)))
+ dma_unmap_single(ndev->dev.parent,
+ le32_to_cpu(desc->dptr),
+ GBETH_RX_BUFF_MAX,
+ DMA_FROM_DEVICE);
+ }
+ ring_size = sizeof(struct ravb_rx_desc) * (priv->num_rx_ring[q] + 1);
+ dma_free_coherent(ndev->dev.parent, ring_size, priv->gbeth_rx_ring[q],
+ priv->rx_desc_dma[q]);
+ priv->gbeth_rx_ring[q] = NULL;
}
-static void ravb_rx_ring_free(struct net_device *ndev, int q)
+static void ravb_rx_ring_free_rcar(struct net_device *ndev, int q)
{
struct ravb_private *priv = netdev_priv(ndev);
unsigned int ring_size;
@@ -1084,16 +1104,25 @@ static int ravb_poll(struct napi_struct *napi, int budget)
struct net_device *ndev = napi->dev;
struct ravb_private *priv = netdev_priv(ndev);
const struct ravb_hw_info *info = priv->info;
+ struct ravb_rx_desc *desc;
unsigned long flags;
int q = napi - priv->napi;
int mask = BIT(q);
int quota = budget;
+ unsigned int entry;
+ bool non_gptp = !(info->gptp || info->ccc_gac);
+ if (non_gptp) {
+ entry = priv->cur_rx[q] % priv->num_rx_ring[q];
+ desc = &priv->gbeth_rx_ring[q][entry];
+ }
/* Processing RX Descriptor Ring */
/* Clear RX interrupt */
ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0);
- if (ravb_rx(ndev, "a, q))
- goto out;
+ if (!non_gptp || desc->die_dt != DT_FEMPTY) {
+ if (ravb_rx(ndev, "a, q))
+ goto out;
+ }
/* Processing TX Descriptor Ring */
spin_lock_irqsave(&priv->lock, flags);
@@ -2173,7 +2202,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
}
static const struct ravb_hw_info ravb_gen3_hw_info = {
- .rx_ring_free = ravb_rx_ring_free,
+ .rx_ring_free = ravb_rx_ring_free_rcar,
.rx_ring_format = ravb_rx_ring_format,
.alloc_rx_desc = ravb_alloc_rx_desc,
.receive = ravb_rcar_rx,
@@ -2198,7 +2227,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
};
static const struct ravb_hw_info ravb_gen2_hw_info = {
- .rx_ring_free = ravb_rx_ring_free,
+ .rx_ring_free = ravb_rx_ring_free_rcar,
.rx_ring_format = ravb_rx_ring_format,
.alloc_rx_desc = ravb_alloc_rx_desc,
.receive = ravb_rcar_rx,
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 3/8] ravb: Fillup ravb_rx_ring_format_gbeth() stub
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
2021-10-01 16:42 ` [PATCH 1/8] ravb: Add rx_max_buf_size to struct ravb_hw_info Biju Das
2021-10-01 16:42 ` [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub Biju Das
@ 2021-10-01 16:43 ` Biju Das
2021-10-01 16:43 ` [PATCH 4/8] ravb: Fillup ravb_alloc_rx_desc_gbeth() stub Biju Das
` (5 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:43 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
Fillup ravb_rx_ring_format_gbeth() function to support RZ/G2L.
This patch also renames ravb_rx_ring_format to ravb_rx_ring_format_rcar
to be consistent with the naming convention used in sh_eth driver.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
RFC->v1:
* renamed "rgeth" to "gbeth".
* renamed ravb_rx_ring_format to ravb_rx_ring_format_rcar
---
drivers/net/ethernet/renesas/ravb.h | 1 +
drivers/net/ethernet/renesas/ravb_main.c | 33 +++++++++++++++++++++---
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 1a73f960d918..bbf9da7cc9a4 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -970,6 +970,7 @@ enum CXR31_BIT {
#define RX_BUF_SZ (2048 - ETH_FCS_LEN + sizeof(__sum16))
#define GBETH_RX_BUFF_MAX 8192
+#define GBETH_RX_DESC_DATA_SIZE 4080
struct ravb_tstamp_skb {
struct list_head list;
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 6ef55f1cf306..d4642783afc9 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -327,10 +327,35 @@ static void ravb_ring_free(struct net_device *ndev, int q)
static void ravb_rx_ring_format_gbeth(struct net_device *ndev, int q)
{
- /* Place holder */
+ struct ravb_private *priv = netdev_priv(ndev);
+ struct ravb_rx_desc *rx_desc;
+ unsigned int rx_ring_size = sizeof(*rx_desc) * priv->num_rx_ring[q];
+ dma_addr_t dma_addr;
+ unsigned int i;
+
+ memset(priv->gbeth_rx_ring[q], 0, rx_ring_size);
+ /* Build RX ring buffer */
+ for (i = 0; i < priv->num_rx_ring[q]; i++) {
+ /* RX descriptor */
+ rx_desc = &priv->gbeth_rx_ring[q][i];
+ rx_desc->ds_cc = cpu_to_le16(GBETH_RX_DESC_DATA_SIZE);
+ dma_addr = dma_map_single(ndev->dev.parent, priv->rx_skb[q][i]->data,
+ GBETH_RX_BUFF_MAX,
+ DMA_FROM_DEVICE);
+ /* We just set the data size to 0 for a failed mapping which
+ * should prevent DMA from happening...
+ */
+ if (dma_mapping_error(ndev->dev.parent, dma_addr))
+ rx_desc->ds_cc = cpu_to_le16(0);
+ rx_desc->dptr = cpu_to_le32(dma_addr);
+ rx_desc->die_dt = DT_FEMPTY;
+ }
+ rx_desc = &priv->gbeth_rx_ring[q][i];
+ rx_desc->dptr = cpu_to_le32((u32)priv->rx_desc_dma[q]);
+ rx_desc->die_dt = DT_LINKFIX; /* type */
}
-static void ravb_rx_ring_format(struct net_device *ndev, int q)
+static void ravb_rx_ring_format_rcar(struct net_device *ndev, int q)
{
struct ravb_private *priv = netdev_priv(ndev);
struct ravb_ex_rx_desc *rx_desc;
@@ -2203,7 +2228,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
static const struct ravb_hw_info ravb_gen3_hw_info = {
.rx_ring_free = ravb_rx_ring_free_rcar,
- .rx_ring_format = ravb_rx_ring_format,
+ .rx_ring_format = ravb_rx_ring_format_rcar,
.alloc_rx_desc = ravb_alloc_rx_desc,
.receive = ravb_rcar_rx,
.set_rate = ravb_set_rate_rcar,
@@ -2228,7 +2253,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
static const struct ravb_hw_info ravb_gen2_hw_info = {
.rx_ring_free = ravb_rx_ring_free_rcar,
- .rx_ring_format = ravb_rx_ring_format,
+ .rx_ring_format = ravb_rx_ring_format_rcar,
.alloc_rx_desc = ravb_alloc_rx_desc,
.receive = ravb_rcar_rx,
.set_rate = ravb_set_rate_rcar,
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 4/8] ravb: Fillup ravb_alloc_rx_desc_gbeth() stub
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
` (2 preceding siblings ...)
2021-10-01 16:43 ` [PATCH 3/8] ravb: Fillup ravb_rx_ring_format_gbeth() stub Biju Das
@ 2021-10-01 16:43 ` Biju Das
2021-10-01 16:43 ` [PATCH 5/8] ravb: Fillup ravb_rx_gbeth() stub Biju Das
` (4 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:43 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
Fillup ravb_alloc_rx_desc_gbeth() function to support RZ/G2L.
This patch also renames ravb_alloc_rx_desc to ravb_alloc_rx_desc_rcar
to be consistent with the naming convention used in sh_eth driver.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
RFC->v1:
* renamed "rgeth" to "gbeth".
* renamed ravb_alloc_rx_desc to ravb_alloc_rx_desc_rcar
---
drivers/net/ethernet/renesas/ravb_main.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index d4642783afc9..899a7f29046b 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -430,11 +430,18 @@ static void ravb_ring_format(struct net_device *ndev, int q)
static void *ravb_alloc_rx_desc_gbeth(struct net_device *ndev, int q)
{
- /* Place holder */
- return NULL;
+ struct ravb_private *priv = netdev_priv(ndev);
+ unsigned int ring_size;
+
+ ring_size = sizeof(struct ravb_rx_desc) * (priv->num_rx_ring[q] + 1);
+
+ priv->gbeth_rx_ring[q] = dma_alloc_coherent(ndev->dev.parent, ring_size,
+ &priv->rx_desc_dma[q],
+ GFP_KERNEL);
+ return priv->gbeth_rx_ring[q];
}
-static void *ravb_alloc_rx_desc(struct net_device *ndev, int q)
+static void *ravb_alloc_rx_desc_rcar(struct net_device *ndev, int q)
{
struct ravb_private *priv = netdev_priv(ndev);
unsigned int ring_size;
@@ -2229,7 +2236,7 @@ static int ravb_mdio_release(struct ravb_private *priv)
static const struct ravb_hw_info ravb_gen3_hw_info = {
.rx_ring_free = ravb_rx_ring_free_rcar,
.rx_ring_format = ravb_rx_ring_format_rcar,
- .alloc_rx_desc = ravb_alloc_rx_desc,
+ .alloc_rx_desc = ravb_alloc_rx_desc_rcar,
.receive = ravb_rcar_rx,
.set_rate = ravb_set_rate_rcar,
.set_feature = ravb_set_features_rcar,
@@ -2254,7 +2261,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
static const struct ravb_hw_info ravb_gen2_hw_info = {
.rx_ring_free = ravb_rx_ring_free_rcar,
.rx_ring_format = ravb_rx_ring_format_rcar,
- .alloc_rx_desc = ravb_alloc_rx_desc,
+ .alloc_rx_desc = ravb_alloc_rx_desc_rcar,
.receive = ravb_rcar_rx,
.set_rate = ravb_set_rate_rcar,
.set_feature = ravb_set_features_rcar,
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/8] ravb: Fillup ravb_rx_gbeth() stub
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
` (3 preceding siblings ...)
2021-10-01 16:43 ` [PATCH 4/8] ravb: Fillup ravb_alloc_rx_desc_gbeth() stub Biju Das
@ 2021-10-01 16:43 ` Biju Das
2021-10-01 16:43 ` [PATCH 6/8] ravb: Add carrier_counters to struct ravb_hw_info Biju Das
` (3 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:43 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
Fillup ravb_rx_gbeth() function to support RZ/G2L.
This patch also renames ravb_rcar_rx to ravb_rx_rcar to be
consistent with the naming convention used in sh_eth driver.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
RFC->v1:
* renamed "rgeth" to "gbeth".
* renamed ravb_rcar_rx to ravb_rx_rcar
---
drivers/net/ethernet/renesas/ravb.h | 1 +
drivers/net/ethernet/renesas/ravb_main.c | 163 ++++++++++++++++++++++-
2 files changed, 159 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index bbf9da7cc9a4..1d50897a27f1 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -1079,6 +1079,7 @@ struct ravb_private {
int duplex;
struct ravb_rx_desc *gbeth_rx_ring[NUM_RX_QUEUE];
+ struct sk_buff *rxtop_skb;
const struct ravb_hw_info *info;
struct reset_control *rstc;
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 899a7f29046b..e1465b09cea2 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -718,6 +718,23 @@ static void ravb_get_tx_tstamp(struct net_device *ndev)
}
}
+static void ravb_rx_csum_gbeth(struct sk_buff *skb)
+{
+ u8 *hw_csum;
+
+ /* The hardware checksum is contained in sizeof(__sum16) (2) bytes
+ * appended to packet data
+ */
+ if (unlikely(skb->len < sizeof(__sum16)))
+ return;
+ hw_csum = skb_tail_pointer(skb) - sizeof(__sum16);
+
+ if (*hw_csum == 0)
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+ else
+ skb->ip_summed = CHECKSUM_NONE;
+}
+
static void ravb_rx_csum(struct sk_buff *skb)
{
u8 *hw_csum;
@@ -733,15 +750,151 @@ static void ravb_rx_csum(struct sk_buff *skb)
skb_trim(skb, skb->len - sizeof(__sum16));
}
+static struct sk_buff *ravb_get_skb_gbeth(struct net_device *ndev, int q,
+ int entry, struct ravb_rx_desc *desc)
+{
+ struct ravb_private *priv = netdev_priv(ndev);
+ struct sk_buff *skb;
+
+ skb = priv->rx_skb[q][entry];
+ priv->rx_skb[q][entry] = NULL;
+ dma_unmap_single(ndev->dev.parent, le32_to_cpu(desc->dptr),
+ ALIGN(GBETH_RX_BUFF_MAX, 16), DMA_FROM_DEVICE);
+
+ return skb;
+}
+
/* Packet receive function for Gigabit Ethernet */
static bool ravb_rx_gbeth(struct net_device *ndev, int *quota, int q)
{
- /* Place holder */
- return true;
+ struct ravb_private *priv = netdev_priv(ndev);
+ int entry = priv->cur_rx[q] % priv->num_rx_ring[q];
+ int boguscnt = priv->dirty_rx[q] + priv->num_rx_ring[q] - priv->cur_rx[q];
+ struct net_device_stats *stats = &priv->stats[q];
+ struct ravb_rx_desc *desc;
+ struct sk_buff *skb;
+ dma_addr_t dma_addr;
+ u8 desc_status;
+ u8 die_dt;
+ u16 pkt_len;
+ int limit;
+
+ boguscnt = min(boguscnt, *quota);
+ limit = boguscnt;
+ desc = &priv->gbeth_rx_ring[q][entry];
+ while (desc->die_dt != DT_FEMPTY) {
+ /* Descriptor type must be checked before all other reads */
+ dma_rmb();
+ desc_status = desc->msc;
+ pkt_len = le16_to_cpu(desc->ds_cc) & RX_DS;
+
+ if (--boguscnt < 0)
+ break;
+
+ /* We use 0-byte descriptors to mark the DMA mapping errors */
+ if (!pkt_len)
+ continue;
+
+ if (desc_status & MSC_MC)
+ stats->multicast++;
+
+ if (desc_status & (MSC_CRC | MSC_RFE | MSC_RTSF | MSC_RTLF | MSC_CEEF)) {
+ stats->rx_errors++;
+ if (desc_status & MSC_CRC)
+ stats->rx_crc_errors++;
+ if (desc_status & MSC_RFE)
+ stats->rx_frame_errors++;
+ if (desc_status & (MSC_RTLF | MSC_RTSF))
+ stats->rx_length_errors++;
+ if (desc_status & MSC_CEEF)
+ stats->rx_missed_errors++;
+ } else {
+ die_dt = desc->die_dt & 0xF0;
+ switch (die_dt) {
+ case DT_FSINGLE:
+ skb = ravb_get_skb_gbeth(ndev, q, entry, desc);
+ skb_put(skb, pkt_len);
+ skb->protocol = eth_type_trans(skb, ndev);
+ if (ndev->features & NETIF_F_RXCSUM)
+ ravb_rx_csum_gbeth(skb);
+ napi_gro_receive(&priv->napi[q], skb);
+ stats->rx_packets++;
+ stats->rx_bytes += pkt_len;
+ break;
+ case DT_FSTART:
+ priv->rxtop_skb = ravb_get_skb_gbeth(ndev, q, entry, desc);
+ skb_put(priv->rxtop_skb, pkt_len);
+ break;
+ case DT_FMID:
+ skb = ravb_get_skb_gbeth(ndev, q, entry, desc);
+ skb_copy_to_linear_data_offset(priv->rxtop_skb,
+ priv->rxtop_skb->len,
+ skb->data,
+ pkt_len);
+ skb_put(priv->rxtop_skb, pkt_len);
+ dev_kfree_skb(skb);
+ break;
+ case DT_FEND:
+ skb = ravb_get_skb_gbeth(ndev, q, entry, desc);
+ skb_copy_to_linear_data_offset(priv->rxtop_skb,
+ priv->rxtop_skb->len,
+ skb->data,
+ pkt_len);
+ skb_put(priv->rxtop_skb, pkt_len);
+ dev_kfree_skb(skb);
+ priv->rxtop_skb->protocol =
+ eth_type_trans(priv->rxtop_skb, ndev);
+ if (ndev->features & NETIF_F_RXCSUM)
+ ravb_rx_csum_gbeth(skb);
+ napi_gro_receive(&priv->napi[q],
+ priv->rxtop_skb);
+ stats->rx_packets++;
+ stats->rx_bytes += priv->rxtop_skb->len;
+ break;
+ }
+ }
+
+ entry = (++priv->cur_rx[q]) % priv->num_rx_ring[q];
+ desc = &priv->gbeth_rx_ring[q][entry];
+ }
+
+ /* Refill the RX ring buffers. */
+ for (; priv->cur_rx[q] - priv->dirty_rx[q] > 0; priv->dirty_rx[q]++) {
+ entry = priv->dirty_rx[q] % priv->num_rx_ring[q];
+ desc = &priv->gbeth_rx_ring[q][entry];
+ desc->ds_cc = cpu_to_le16(GBETH_RX_DESC_DATA_SIZE);
+
+ if (!priv->rx_skb[q][entry]) {
+ skb = netdev_alloc_skb(ndev,
+ GBETH_RX_BUFF_MAX + RAVB_ALIGN - 1);
+ if (!skb)
+ break;
+ ravb_set_buffer_align(skb);
+ dma_addr = dma_map_single(ndev->dev.parent,
+ skb->data,
+ GBETH_RX_BUFF_MAX,
+ DMA_FROM_DEVICE);
+ skb_checksum_none_assert(skb);
+ /* We just set the data size to 0 for a failed mapping
+ * which should prevent DMA from happening...
+ */
+ if (dma_mapping_error(ndev->dev.parent, dma_addr))
+ desc->ds_cc = cpu_to_le16(0);
+ desc->dptr = cpu_to_le32(dma_addr);
+ priv->rx_skb[q][entry] = skb;
+ }
+ /* Descriptor type must be set after all the above writes */
+ dma_wmb();
+ desc->die_dt = DT_FEMPTY;
+ }
+
+ *quota -= limit - (++boguscnt);
+
+ return boguscnt <= 0;
}
/* Packet receive function for Ethernet AVB */
-static bool ravb_rcar_rx(struct net_device *ndev, int *quota, int q)
+static bool ravb_rx_rcar(struct net_device *ndev, int *quota, int q)
{
struct ravb_private *priv = netdev_priv(ndev);
const struct ravb_hw_info *info = priv->info;
@@ -2237,7 +2390,7 @@ static const struct ravb_hw_info ravb_gen3_hw_info = {
.rx_ring_free = ravb_rx_ring_free_rcar,
.rx_ring_format = ravb_rx_ring_format_rcar,
.alloc_rx_desc = ravb_alloc_rx_desc_rcar,
- .receive = ravb_rcar_rx,
+ .receive = ravb_rx_rcar,
.set_rate = ravb_set_rate_rcar,
.set_feature = ravb_set_features_rcar,
.dmac_init = ravb_dmac_init_rcar,
@@ -2262,7 +2415,7 @@ static const struct ravb_hw_info ravb_gen2_hw_info = {
.rx_ring_free = ravb_rx_ring_free_rcar,
.rx_ring_format = ravb_rx_ring_format_rcar,
.alloc_rx_desc = ravb_alloc_rx_desc_rcar,
- .receive = ravb_rcar_rx,
+ .receive = ravb_rx_rcar,
.set_rate = ravb_set_rate_rcar,
.set_feature = ravb_set_features_rcar,
.dmac_init = ravb_dmac_init_rcar,
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 6/8] ravb: Add carrier_counters to struct ravb_hw_info
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
` (4 preceding siblings ...)
2021-10-01 16:43 ` [PATCH 5/8] ravb: Fillup ravb_rx_gbeth() stub Biju Das
@ 2021-10-01 16:43 ` Biju Das
2021-10-01 16:43 ` [PATCH 7/8] ravb: Add support to retrieve stats for GbEthernet Biju Das
` (2 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:43 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
RZ/G2L E-MAC supports carrier counters.
Add a carrier_counter hw feature bit to struct ravb_hw_info
to add this feature only for RZ/G2L.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
RFC->v1:
* Added Sergey's Rb tag.
---
drivers/net/ethernet/renesas/ravb.h | 5 +++++
drivers/net/ethernet/renesas/ravb_main.c | 13 +++++++++++++
2 files changed, 18 insertions(+)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 1d50897a27f1..04aedde608e3 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -196,11 +196,15 @@ enum ravb_reg {
MAHR = 0x05c0,
MALR = 0x05c8,
TROCR = 0x0700, /* R-Car Gen3 and RZ/G2L only */
+ CXR41 = 0x0708, /* RZ/G2L only */
+ CXR42 = 0x0710, /* RZ/G2L only */
CEFCR = 0x0740,
FRECR = 0x0748,
TSFRCR = 0x0750,
TLFRCR = 0x0758,
RFCR = 0x0760,
+ CXR55 = 0x0768, /* RZ/G2L only */
+ CXR56 = 0x0770, /* RZ/G2L only */
MAFCR = 0x0778,
};
@@ -1023,6 +1027,7 @@ struct ravb_hw_info {
unsigned nc_queue:1; /* AVB-DMAC has NC queue */
unsigned magic_pkt:1; /* E-MAC supports magic packet detection */
unsigned half_duplex:1; /* E-MAC supports half duplex mode */
+ unsigned carrier_counters:1; /* E-MAC has carrier counters */
};
struct ravb_private {
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index e1465b09cea2..bbb996e52f72 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2069,6 +2069,18 @@ static struct net_device_stats *ravb_get_stats(struct net_device *ndev)
ravb_write(ndev, 0, TROCR); /* (write clear) */
}
+ if (info->carrier_counters) {
+ nstats->collisions += ravb_read(ndev, CXR41);
+ ravb_write(ndev, 0, CXR41); /* (write clear) */
+ nstats->tx_carrier_errors += ravb_read(ndev, CXR42);
+ ravb_write(ndev, 0, CXR42); /* (write clear) */
+
+ nstats->tx_carrier_errors += ravb_read(ndev, CXR55);
+ ravb_write(ndev, 0, CXR55); /* (write clear) */
+ nstats->tx_carrier_errors += ravb_read(ndev, CXR56);
+ ravb_write(ndev, 0, CXR56); /* (write clear) */
+ }
+
nstats->rx_packets = stats0->rx_packets;
nstats->tx_packets = stats0->tx_packets;
nstats->rx_bytes = stats0->rx_bytes;
@@ -2449,6 +2461,7 @@ static const struct ravb_hw_info gbeth_hw_info = {
.aligned_tx = 1,
.tx_counters = 1,
.half_duplex = 1,
+ .carrier_counters = 1,
};
static const struct of_device_id ravb_match_table[] = {
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 7/8] ravb: Add support to retrieve stats for GbEthernet
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
` (5 preceding siblings ...)
2021-10-01 16:43 ` [PATCH 6/8] ravb: Add carrier_counters to struct ravb_hw_info Biju Das
@ 2021-10-01 16:43 ` Biju Das
2021-10-01 16:43 ` [PATCH 8/8] ravb: Fillup ravb_set_features_gbeth() stub Biju Das
2021-10-01 18:45 ` [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Jakub Kicinski
8 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:43 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
Add support for retrieving stats information for GbEthernet.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
RFC->v1:
* New patch.
---
drivers/net/ethernet/renesas/ravb_main.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index bbb996e52f72..ee4153831158 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1509,6 +1509,24 @@ static void ravb_set_msglevel(struct net_device *ndev, u32 value)
priv->msg_enable = value;
}
+static const char ravb_gstrings_stats_gbeth[][ETH_GSTRING_LEN] = {
+ "rx_queue_0_current",
+ "tx_queue_0_current",
+ "rx_queue_0_dirty",
+ "tx_queue_0_dirty",
+ "rx_queue_0_packets",
+ "tx_queue_0_packets",
+ "rx_queue_0_bytes",
+ "tx_queue_0_bytes",
+ "rx_queue_0_mcast_packets",
+ "rx_queue_0_errors",
+ "rx_queue_0_crc_errors",
+ "rx_queue_0_frame_errors",
+ "rx_queue_0_length_errors",
+ "rx_queue_0_csum_offload_errors",
+ "rx_queue_0_over_errors",
+};
+
static const char ravb_gstrings_stats[][ETH_GSTRING_LEN] = {
"rx_queue_0_current",
"tx_queue_0_current",
@@ -2455,6 +2473,9 @@ static const struct ravb_hw_info gbeth_hw_info = {
.set_feature = ravb_set_features_gbeth,
.dmac_init = ravb_dmac_init_gbeth,
.emac_init = ravb_emac_init_gbeth,
+ .gstrings_stats = ravb_gstrings_stats_gbeth,
+ .gstrings_size = sizeof(ravb_gstrings_stats_gbeth),
+ .stats_len = ARRAY_SIZE(ravb_gstrings_stats_gbeth),
.max_rx_len = GBETH_RX_BUFF_MAX + RAVB_ALIGN - 1,
.tsrq = TCCR_TSRQ0,
.rx_max_buf_size = SZ_8K,
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 8/8] ravb: Fillup ravb_set_features_gbeth() stub
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
` (6 preceding siblings ...)
2021-10-01 16:43 ` [PATCH 7/8] ravb: Add support to retrieve stats for GbEthernet Biju Das
@ 2021-10-01 16:43 ` Biju Das
2021-10-01 18:45 ` [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Jakub Kicinski
8 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-01 16:43 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Biju Das, Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov,
Adam Ford, Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda,
netdev, linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
Fillup ravb_set_features_gbeth() function to support RZ/G2L.
Also set the net_hw_features bits supported by GbEthernet
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
RFC->v1:
* moved stats to patch #7.
* Added CSR0 initilization
---
drivers/net/ethernet/renesas/ravb.h | 38 ++++++++++++++++++++++++
drivers/net/ethernet/renesas/ravb_main.c | 34 ++++++++++++++++++++-
2 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 04aedde608e3..11a40ea0dfd2 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -206,6 +206,9 @@ enum ravb_reg {
CXR55 = 0x0768, /* RZ/G2L only */
CXR56 = 0x0770, /* RZ/G2L only */
MAFCR = 0x0778,
+ CSR0 = 0x0800, /* RZ/G2L only */
+ CSR1 = 0x0804, /* RZ/G2L only */
+ CSR2 = 0x0808, /* RZ/G2L only */
};
@@ -966,6 +969,41 @@ enum CXR31_BIT {
CXR31_SEL_LINK1 = 0x00000008,
};
+enum CSR0_BIT {
+ CSR0_TPE = 0x00000010,
+ CSR0_RPE = 0x00000020,
+};
+
+enum CSR1_BIT {
+ CSR1_TIP4 = 0x00000001,
+ CSR1_TTCP4 = 0x00000010,
+ CSR1_TUDP4 = 0x00000020,
+ CSR1_TICMP4 = 0x00000040,
+ CSR1_TTCP6 = 0x00100000,
+ CSR1_TUDP6 = 0x00200000,
+ CSR1_TICMP6 = 0x00400000,
+ CSR1_THOP = 0x01000000,
+ CSR1_TROUT = 0x02000000,
+ CSR1_TAHD = 0x04000000,
+ CSR1_TDHD = 0x08000000,
+ CSR1_ALL = 0x0F700071,
+};
+
+enum CSR2_BIT {
+ CSR2_RIP4 = 0x00000001,
+ CSR2_RTCP4 = 0x00000010,
+ CSR2_RUDP4 = 0x00000020,
+ CSR2_RICMP4 = 0x00000040,
+ CSR2_RTCP6 = 0x00100000,
+ CSR2_RUDP6 = 0x00200000,
+ CSR2_RICMP6 = 0x00400000,
+ CSR2_RHOP = 0x01000000,
+ CSR2_RROUT = 0x02000000,
+ CSR2_RAHD = 0x04000000,
+ CSR2_RDHD = 0x08000000,
+ CSR2_ALL = 0x0F700071,
+};
+
#define DBAT_ENTRY_NUM 22
#define RX_QUEUE_OFFSET 4
#define NUM_RX_QUEUE 2
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index ee4153831158..a2c07efdb2f5 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -533,6 +533,7 @@ static void ravb_emac_init_gbeth(struct net_device *ndev)
/* E-MAC status register clear */
ravb_write(ndev, ECSR_ICD | ECSR_LCHNG | ECSR_PFRI, ECSR);
+ ravb_write(ndev, CSR0_TPE | CSR0_RPE, CSR0);
/* E-MAC interrupt enable register */
ravb_write(ndev, ECSIPR_ICDIP, ECSIPR);
@@ -2330,7 +2331,37 @@ static void ravb_set_rx_csum(struct net_device *ndev, bool enable)
static int ravb_set_features_gbeth(struct net_device *ndev,
netdev_features_t features)
{
- /* Place holder */
+ netdev_features_t changed = features ^ ndev->features;
+ int error;
+ u32 csr0;
+
+ csr0 = ravb_read(ndev, CSR0);
+ ravb_write(ndev, csr0 & ~(CSR0_RPE | CSR0_TPE), CSR0);
+ error = ravb_wait(ndev, CSR0, CSR0_RPE | CSR0_TPE, 0);
+ if (error) {
+ ravb_write(ndev, csr0, CSR0);
+ return error;
+ }
+
+ if (changed & NETIF_F_RXCSUM) {
+ if (features & NETIF_F_RXCSUM)
+ ravb_write(ndev, CSR2_ALL, CSR2);
+ else
+ ravb_write(ndev, 0, CSR2);
+ }
+
+ if (changed & NETIF_F_HW_CSUM) {
+ if (features & NETIF_F_HW_CSUM) {
+ ravb_write(ndev, CSR1_ALL, CSR1);
+ ndev->features |= NETIF_F_CSUM_MASK;
+ } else {
+ ravb_write(ndev, 0, CSR1);
+ }
+ }
+ ravb_write(ndev, csr0, CSR0);
+
+ ndev->features = features;
+
return 0;
}
@@ -2473,6 +2504,7 @@ static const struct ravb_hw_info gbeth_hw_info = {
.set_feature = ravb_set_features_gbeth,
.dmac_init = ravb_dmac_init_gbeth,
.emac_init = ravb_emac_init_gbeth,
+ .net_hw_features = (NETIF_F_HW_CSUM | NETIF_F_RXCSUM),
.gstrings_stats = ravb_gstrings_stats_gbeth,
.gstrings_size = sizeof(ravb_gstrings_stats_gbeth),
.stats_len = ARRAY_SIZE(ravb_gstrings_stats_gbeth),
--
2.17.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
` (7 preceding siblings ...)
2021-10-01 16:43 ` [PATCH 8/8] ravb: Fillup ravb_set_features_gbeth() stub Biju Das
@ 2021-10-01 18:45 ` Jakub Kicinski
2021-10-01 19:16 ` Sergey Shtylyov
2021-10-02 7:28 ` Biju Das
8 siblings, 2 replies; 14+ messages in thread
From: Jakub Kicinski @ 2021-10-01 18:45 UTC (permalink / raw)
To: Biju Das
Cc: David S. Miller, Sergey Shtylyov, Lad Prabhakar, Andrew Lunn,
Sergei Shtylyov, Geert Uytterhoeven, Adam Ford,
Yoshihiro Shimoda, netdev, linux-renesas-soc, Chris Paterson,
Biju Das
On Fri, 1 Oct 2021 17:42:57 +0100 Biju Das wrote:
> This patch series depend upon [1]
> [1] https://lore.kernel.org/linux-renesas-soc/20211001150636.7500-1-biju.das.jz@bp.renesas.com/T/#t
Post it as an RFC, then, please.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support
2021-10-01 18:45 ` [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Jakub Kicinski
@ 2021-10-01 19:16 ` Sergey Shtylyov
2021-10-02 7:28 ` Biju Das
1 sibling, 0 replies; 14+ messages in thread
From: Sergey Shtylyov @ 2021-10-01 19:16 UTC (permalink / raw)
To: Jakub Kicinski, Biju Das
Cc: David S. Miller, Lad Prabhakar, Andrew Lunn, Sergei Shtylyov,
Geert Uytterhoeven, Adam Ford, Yoshihiro Shimoda, netdev,
linux-renesas-soc, Chris Paterson, Biju Das
On 10/1/21 9:45 PM, Jakub Kicinski wrote:
>> This patch series depend upon [1]
>> [1] https://lore.kernel.org/linux-renesas-soc/20211001150636.7500-1-biju.das.jz@bp.renesas.com/T/#t
>
> Post it as an RFC, then, please.
Please don't merge the above 10 patches until I have a chance to review them. I'll try to start reviewing
them today.
MBR, Sergey
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support
2021-10-01 18:45 ` [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Jakub Kicinski
2021-10-01 19:16 ` Sergey Shtylyov
@ 2021-10-02 7:28 ` Biju Das
1 sibling, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-02 7:28 UTC (permalink / raw)
To: Jakub Kicinski
Cc: David S. Miller, Sergey Shtylyov, Prabhakar Mahadev Lad,
Andrew Lunn, Sergei Shtylyov, Geert Uytterhoeven, Adam Ford,
Yoshihiro Shimoda, netdev, linux-renesas-soc, Chris Paterson,
Biju Das
Hi Jakub Kicinski,
Thanks for the feedback.
> -----Original Message-----
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: 01 October 2021 19:46
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Cc: David S. Miller <davem@davemloft.net>; Sergey Shtylyov
> <s.shtylyov@omp.ru>; Prabhakar Mahadev Lad <prabhakar.mahadev-
> lad.rj@bp.renesas.com>; Andrew Lunn <andrew@lunn.ch>; Sergei Shtylyov
> <sergei.shtylyov@gmail.com>; Geert Uytterhoeven <geert+renesas@glider.be>;
> Adam Ford <aford173@gmail.com>; Yoshihiro Shimoda
> <yoshihiro.shimoda.uh@renesas.com>; netdev@vger.kernel.org; linux-renesas-
> soc@vger.kernel.org; Chris Paterson <Chris.Paterson2@renesas.com>; Biju
> Das <biju.das@bp.renesas.com>
> Subject: Re: [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support
>
> On Fri, 1 Oct 2021 17:42:57 +0100 Biju Das wrote:
> > This patch series depend upon [1]
> > [1]
> https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.ker
> nel.org%2Flinux-renesas-soc%2F20211001150636.7500-1-
> biju.das.jz%40bp.renesas.com%2FT%2F%23t&data=04%7C01%7Cbiju.das.jz%40b
> p.renesas.com%7C05175e47a5464f89a02f08d9850bb7cb%7C53d82571da1947e49cb4625
> a166a4a2a%7C0%7C0%7C637687107650777424%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4
> wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=T
> fSvrZyyc9%2B%2BOWglDr4Dx0wLqx%2B1tv4toP%2BKaCclp%2FE%3D&reserved=0
>
> Post it as an RFC, then, please.
Agreed. Will post this patch series as RFC.
Regards,
Biju
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub
2021-10-01 16:42 ` [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub Biju Das
@ 2021-10-04 20:29 ` Sergey Shtylyov
2021-10-05 6:06 ` Biju Das
0 siblings, 1 reply; 14+ messages in thread
From: Sergey Shtylyov @ 2021-10-04 20:29 UTC (permalink / raw)
To: Biju Das, David S. Miller, Jakub Kicinski
Cc: Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov, Adam Ford,
Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda, netdev,
linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
On 10/1/21 7:42 PM, Biju Das wrote:
> Fillup ravb_rx_ring_free_gbeth() function to support RZ/G2L.
>
> This patch also renames ravb_rx_ring_free to ravb_rx_ring_free_rcar
> to be consistent with the naming convention used in sh_eth driver.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> RFC->v1:
> * renamed "rgeth" to "gbeth".
> * renamed ravb_rx_ring_free to ravb_rx_ring_free_rcar
> ---
> drivers/net/ethernet/renesas/ravb.h | 1 +
> drivers/net/ethernet/renesas/ravb_main.c | 41 ++++++++++++++++++++----
> 2 files changed, 36 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
> index b147c4a0dc0b..1a73f960d918 100644
> --- a/drivers/net/ethernet/renesas/ravb.h
> +++ b/drivers/net/ethernet/renesas/ravb.h
> @@ -1077,6 +1077,7 @@ struct ravb_private {
> unsigned int num_tx_desc; /* TX descriptors per packet */
>
> int duplex;
> + struct ravb_rx_desc *gbeth_rx_ring[NUM_RX_QUEUE];
GBEther only has 1 RX queue, right?
And please move the declaration closer to ravb_private::rx_ring.
[...]
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index 0d1e3f7d8c33..6ef55f1cf306 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
[...]
> @@ -1084,16 +1104,25 @@ static int ravb_poll(struct napi_struct *napi, int budget)
> struct net_device *ndev = napi->dev;
> struct ravb_private *priv = netdev_priv(ndev);
> const struct ravb_hw_info *info = priv->info;
> + struct ravb_rx_desc *desc;
> unsigned long flags;
> int q = napi - priv->napi;
> int mask = BIT(q);
> int quota = budget;
> + unsigned int entry;
> + bool non_gptp = !(info->gptp || info->ccc_gac);
Just no_gptp? Or maybe gptp, seems even better?
>
> + if (non_gptp) {
> + entry = priv->cur_rx[q] % priv->num_rx_ring[q];
> + desc = &priv->gbeth_rx_ring[q][entry];
> + }
> /* Processing RX Descriptor Ring */
> /* Clear RX interrupt */
> ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0);
> - if (ravb_rx(ndev, "a, q))
> - goto out;
> + if (!non_gptp || desc->die_dt != DT_FEMPTY) {
> + if (ravb_rx(ndev, "a, q))
> + goto out;
> + }
>
> /* Processing TX Descriptor Ring */
> spin_lock_irqsave(&priv->lock, flags);
[...]
MBR, Sergey
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub
2021-10-04 20:29 ` Sergey Shtylyov
@ 2021-10-05 6:06 ` Biju Das
0 siblings, 0 replies; 14+ messages in thread
From: Biju Das @ 2021-10-05 6:06 UTC (permalink / raw)
To: Sergey Shtylyov, David S. Miller, Jakub Kicinski
Cc: Sergei Shtylyov, Geert Uytterhoeven, Sergey Shtylyov, Adam Ford,
Andrew Lunn, Yuusuke Ashizuka, Yoshihiro Shimoda, netdev,
linux-renesas-soc, Chris Paterson, Biju Das,
Prabhakar Mahadev Lad
Hi Sergey,
> Subject: Re: [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub
>
> On 10/1/21 7:42 PM, Biju Das wrote:
>
> > Fillup ravb_rx_ring_free_gbeth() function to support RZ/G2L.
> >
> > This patch also renames ravb_rx_ring_free to ravb_rx_ring_free_rcar to
> > be consistent with the naming convention used in sh_eth driver.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > ---
> > RFC->v1:
> > * renamed "rgeth" to "gbeth".
> > * renamed ravb_rx_ring_free to ravb_rx_ring_free_rcar
> > ---
> > drivers/net/ethernet/renesas/ravb.h | 1 +
> > drivers/net/ethernet/renesas/ravb_main.c | 41
> > ++++++++++++++++++++----
> > 2 files changed, 36 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/renesas/ravb.h
> > b/drivers/net/ethernet/renesas/ravb.h
> > index b147c4a0dc0b..1a73f960d918 100644
> > --- a/drivers/net/ethernet/renesas/ravb.h
> > +++ b/drivers/net/ethernet/renesas/ravb.h
> > @@ -1077,6 +1077,7 @@ struct ravb_private {
> > unsigned int num_tx_desc; /* TX descriptors per packet */
> >
> > int duplex;
> > + struct ravb_rx_desc *gbeth_rx_ring[NUM_RX_QUEUE];
>
> GBEther only has 1 RX queue, right?
> And please move the declaration closer to ravb_private::rx_ring.
Ok. Will move it and declare it as struct ravb_rx_desc *gbeth_rx_ring;
Also I am planning to add alloc patch first then free. So this change will go to
alloc patch.
>
> [...]
> > diff --git a/drivers/net/ethernet/renesas/ravb_main.c
> > b/drivers/net/ethernet/renesas/ravb_main.c
> > index 0d1e3f7d8c33..6ef55f1cf306 100644
> > --- a/drivers/net/ethernet/renesas/ravb_main.c
> > +++ b/drivers/net/ethernet/renesas/ravb_main.c
> [...]
> > @@ -1084,16 +1104,25 @@ static int ravb_poll(struct napi_struct *napi,
> int budget)
> > struct net_device *ndev = napi->dev;
> > struct ravb_private *priv = netdev_priv(ndev);
> > const struct ravb_hw_info *info = priv->info;
> > + struct ravb_rx_desc *desc;
> > unsigned long flags;
> > int q = napi - priv->napi;
> > int mask = BIT(q);
> > int quota = budget;
> > + unsigned int entry;
> > + bool non_gptp = !(info->gptp || info->ccc_gac);
>
> Just no_gptp? Or maybe gptp, seems even better?
OK. Will use gptp.
Regards,
Biju
>
> >
> > + if (non_gptp) {
> > + entry = priv->cur_rx[q] % priv->num_rx_ring[q];
> > + desc = &priv->gbeth_rx_ring[q][entry];
> > + }
> > /* Processing RX Descriptor Ring */
> > /* Clear RX interrupt */
> > ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0);
> > - if (ravb_rx(ndev, "a, q))
> > - goto out;
> > + if (!non_gptp || desc->die_dt != DT_FEMPTY) {
> > + if (ravb_rx(ndev, "a, q))
> > + goto out;
> > + }
> >
> > /* Processing TX Descriptor Ring */
> > spin_lock_irqsave(&priv->lock, flags);
> [...]
>
> MBR, Sergey
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2021-10-05 6:06 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-01 16:42 [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Biju Das
2021-10-01 16:42 ` [PATCH 1/8] ravb: Add rx_max_buf_size to struct ravb_hw_info Biju Das
2021-10-01 16:42 ` [PATCH 2/8] ravb: Fillup ravb_rx_ring_free_gbeth() stub Biju Das
2021-10-04 20:29 ` Sergey Shtylyov
2021-10-05 6:06 ` Biju Das
2021-10-01 16:43 ` [PATCH 3/8] ravb: Fillup ravb_rx_ring_format_gbeth() stub Biju Das
2021-10-01 16:43 ` [PATCH 4/8] ravb: Fillup ravb_alloc_rx_desc_gbeth() stub Biju Das
2021-10-01 16:43 ` [PATCH 5/8] ravb: Fillup ravb_rx_gbeth() stub Biju Das
2021-10-01 16:43 ` [PATCH 6/8] ravb: Add carrier_counters to struct ravb_hw_info Biju Das
2021-10-01 16:43 ` [PATCH 7/8] ravb: Add support to retrieve stats for GbEthernet Biju Das
2021-10-01 16:43 ` [PATCH 8/8] ravb: Fillup ravb_set_features_gbeth() stub Biju Das
2021-10-01 18:45 ` [PATCH 0/8] Fillup stubs for Gigabit Ethernet driver support Jakub Kicinski
2021-10-01 19:16 ` Sergey Shtylyov
2021-10-02 7:28 ` Biju Das
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.