From: Grygorii Strashko <grygorii.strashko@ti.com>
To: "David S. Miller" <davem@davemloft.net>, <netdev@vger.kernel.org>,
Jakub Kicinski <kuba@kernel.org>
Cc: <linux-kernel@vger.kernel.org>,
Ben Hutchings <ben.hutchings@essensium.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
<linux-omap@vger.kernel.org>, Lokesh Vutla <lokeshvutla@ti.com>,
Grygorii Strashko <grygorii.strashko@ti.com>
Subject: [PATCH net-next 3/3] net: ethernet: ti: davinci_cpdma: drop frame padding
Date: Thu, 5 Aug 2021 17:55:55 +0300 [thread overview]
Message-ID: <20210805145555.12182-4-grygorii.strashko@ti.com> (raw)
In-Reply-To: <20210805145555.12182-1-grygorii.strashko@ti.com>
Hence all users of davinci_cpdma switched to skb_put_padto() the frame
padding can be removed from it.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/net/ethernet/ti/cpsw_priv.c | 1 -
drivers/net/ethernet/ti/davinci_cpdma.c | 5 -----
drivers/net/ethernet/ti/davinci_cpdma.h | 1 -
drivers/net/ethernet/ti/davinci_emac.c | 1 -
4 files changed, 8 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw_priv.c b/drivers/net/ethernet/ti/cpsw_priv.c
index ecc2a6b7e28f..d97a72c9ec53 100644
--- a/drivers/net/ethernet/ti/cpsw_priv.c
+++ b/drivers/net/ethernet/ti/cpsw_priv.c
@@ -518,7 +518,6 @@ int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs,
dma_params.num_chan = data->channels;
dma_params.has_soft_reset = true;
- dma_params.min_packet_size = CPSW_MIN_PACKET_SIZE;
dma_params.desc_mem_size = data->bd_ram_size;
dma_params.desc_align = 16;
dma_params.has_ext_regs = true;
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index d2eab5cd1e0c..753d94c9915a 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -1034,11 +1034,6 @@ static int cpdma_chan_submit_si(struct submit_info *si)
return -ENOMEM;
}
- if (len < ctlr->params.min_packet_size) {
- len = ctlr->params.min_packet_size;
- chan->stats.runt_transmit_buff++;
- }
-
mode = CPDMA_DESC_OWNER | CPDMA_DESC_SOP | CPDMA_DESC_EOP;
cpdma_desc_to_port(chan, mode, si->directed);
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.h b/drivers/net/ethernet/ti/davinci_cpdma.h
index d3cfe234d16a..62151f13c7ce 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.h
+++ b/drivers/net/ethernet/ti/davinci_cpdma.h
@@ -26,7 +26,6 @@ struct cpdma_params {
void __iomem *rxthresh, *rxfree;
int num_chan;
bool has_soft_reset;
- int min_packet_size;
dma_addr_t desc_mem_phys;
dma_addr_t desc_hw_addr;
int desc_mem_size;
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index b1c5cbe7478b..cd2ef0282f38 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1850,7 +1850,6 @@ static int davinci_emac_probe(struct platform_device *pdev)
dma_params.txcp = priv->emac_base + 0x640;
dma_params.rxcp = priv->emac_base + 0x660;
dma_params.num_chan = EMAC_MAX_TXRX_CHANNELS;
- dma_params.min_packet_size = EMAC_DEF_MIN_ETHPKTSIZE;
dma_params.desc_hw_addr = hw_ram_addr;
dma_params.desc_mem_size = pdata->ctrl_ram_size;
dma_params.desc_align = 16;
--
2.17.1
next prev parent reply other threads:[~2021-08-05 14:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-05 14:55 [PATCH net-next 0/3] net: ethernet: ti: cpsw/emac: switch to use skb_put_padto() Grygorii Strashko
2021-08-05 14:55 ` [PATCH net-next 1/3] net: ethernet: ti: cpsw: " Grygorii Strashko
2021-08-05 14:55 ` [PATCH net-next 2/3] net: ethernet: ti: davinci_emac: " Grygorii Strashko
2021-08-05 14:55 ` Grygorii Strashko [this message]
2021-08-06 9:30 ` [PATCH net-next 0/3] net: ethernet: ti: cpsw/emac: " patchwork-bot+netdevbpf
2021-08-06 10:00 ` Grygorii Strashko
2021-08-06 10:04 ` David Miller
2021-08-06 10:07 ` Grygorii Strashko
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=20210805145555.12182-4-grygorii.strashko@ti.com \
--to=grygorii.strashko@ti.com \
--cc=ben.hutchings@essensium.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lokeshvutla@ti.com \
--cc=netdev@vger.kernel.org \
--cc=vigneshr@ti.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).