diff options
author | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 01:16:48 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 13:11:56 +0000 |
commit | 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch) | |
tree | 926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/701-net-0024-sdk_dpaa-ls1043a-errata-verify-and-resize-headroom-a.patch | |
parent | 9470160c350d15f765c33d6c1db15d6c4709a64c (diff) | |
download | upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2 upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip |
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all
kernel configuration as well as patches for Linux 5.4.
There were no targets still actively using Linux 5.4.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0024-sdk_dpaa-ls1043a-errata-verify-and-resize-headroom-a.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0024-sdk_dpaa-ls1043a-errata-verify-and-resize-headroom-a.patch | 106 |
1 files changed, 0 insertions, 106 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0024-sdk_dpaa-ls1043a-errata-verify-and-resize-headroom-a.patch b/target/linux/layerscape/patches-5.4/701-net-0024-sdk_dpaa-ls1043a-errata-verify-and-resize-headroom-a.patch deleted file mode 100644 index 6014de951f..0000000000 --- a/target/linux/layerscape/patches-5.4/701-net-0024-sdk_dpaa-ls1043a-errata-verify-and-resize-headroom-a.patch +++ /dev/null @@ -1,106 +0,0 @@ -From f6413a7e32d1f98a258e0ed9abd4df3159902fd3 Mon Sep 17 00:00:00 2001 -From: Camelia Groza <camelia.groza@nxp.com> -Date: Mon, 4 Sep 2017 13:57:21 +0300 -Subject: [PATCH] sdk_dpaa: ls1043a errata: verify and resize headroom - alignment - -If the skb's headroom isn't aligned to 16 bytes, reallocate the entire -skb and resize its headroom to priv->tx_headroom. Update the pointers -to the network and transport headers accordingly. - -Signed-off-by: Camelia Groza <camelia.groza@nxp.com> ---- - .../net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 38 +++++++++++++++------- - 1 file changed, 27 insertions(+), 11 deletions(-) - ---- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c -+++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c -@@ -742,14 +742,19 @@ int __hot skb_to_contig_fd(struct dpa_pr - EXPORT_SYMBOL(skb_to_contig_fd); - - #ifndef CONFIG_PPC --/* Verify the conditions that trigger the A010022 errata: 4K memory address -- * crossings. -+/* Verify the conditions that trigger the A010022 errata: data unaligned to -+ * 16 bytes and 4K memory address crossings. - */ --bool a010022_check_skb(struct sk_buff *skb) -+static bool a010022_check_skb(struct sk_buff *skb, struct dpa_priv_s *priv) - { - int nr_frags, i = 0; - skb_frag_t *frag; - -+ /* Check if the headroom is aligned */ -+ if (((u16)skb->data - priv->tx_headroom) % -+ priv->buf_layout[TX].data_align != 0) -+ return true; -+ - /* Check if the headroom crosses a boundary */ - if (HAS_DMA_ISSUE(skb->head, skb_headroom(skb))) - return true; -@@ -767,7 +772,7 @@ bool a010022_check_skb(struct sk_buff *s - while (i < nr_frags) { - frag = &skb_shinfo(skb)->frags[i]; - -- /* Check if the paged fragment crosses a boundary from its -+ /* Check if a paged fragment crosses a boundary from its - * offset to its end. - */ - if (HAS_DMA_ISSUE(frag->page_offset, frag->size)) -@@ -783,13 +788,17 @@ bool a010022_check_skb(struct sk_buff *s - * page. Build a new skb around the new buffer and release the old one. - * A performance drop should be expected. - */ --struct sk_buff *a010022_realign_skb(struct sk_buff *skb) -+static struct sk_buff *a010022_realign_skb(struct sk_buff *skb, -+ struct dpa_priv_s *priv) - { -- int headroom = skb_headroom(skb); -+ int trans_offset = skb_transport_offset(skb); -+ int net_offset = skb_network_offset(skb); - struct sk_buff *nskb = NULL; -+ int nsize, headroom; - struct page *npage; - void *npage_addr; -- int nsize; -+ -+ headroom = priv->tx_headroom; - - npage = alloc_page(GFP_ATOMIC); - if (unlikely(!npage)) { -@@ -822,6 +831,13 @@ struct sk_buff *a010022_realign_skb(stru - } - copy_skb_header(nskb, skb); - -+ /* We move the headroom when we align it so we have to reset the -+ * network and transport header offsets relative to the new data -+ * pointer. The checksum offload relies on these offsets. -+ */ -+ skb_set_network_header(nskb, net_offset); -+ skb_set_transport_header(nskb, trans_offset); -+ - dev_kfree_skb(skb); - return nskb; - -@@ -1024,8 +1040,8 @@ int __hot dpa_tx_extended(struct sk_buff - #endif /* CONFIG_FSL_DPAA_TS */ - - #ifndef CONFIG_PPC -- if (unlikely(dpaa_errata_a010022) && a010022_check_skb(skb)) { -- skb = a010022_realign_skb(skb); -+ if (unlikely(dpaa_errata_a010022) && a010022_check_skb(skb, priv)) { -+ skb = a010022_realign_skb(skb, priv); - if (!skb) - goto skb_to_fd_failed; - } -@@ -1072,8 +1088,8 @@ int __hot dpa_tx_extended(struct sk_buff - skb = nskb; - #ifndef CONFIG_PPC - if (unlikely(dpaa_errata_a010022) && -- a010022_check_skb(skb)) { -- skb = realign_skb(skb); -+ a010022_check_skb(skb, priv)) { -+ skb = a010022_realign_skb(skb, priv); - if (!skb) - goto skb_to_fd_failed; - } |