cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
82 lines
2.8 KiB
Diff
82 lines
2.8 KiB
Diff
From bfc02cc199dc6259c2f4e2af8f77c88fe8ba4cc5 Mon Sep 17 00:00:00 2001
|
|
From: Camelia Groza <camelia.groza@nxp.com>
|
|
Date: Tue, 5 Mar 2019 11:55:54 +0200
|
|
Subject: [PATCH] sdk_dpaa: ls1043a errata: impose S/G frame realignment
|
|
|
|
Scatter/Gather frames are not support on LS1043A beacuse they trigger
|
|
the A010022 errata.
|
|
|
|
Even though we do not advertise S/G support to the stack, we need to
|
|
make sure that if S/G frames do reach the driver somehow, they trigger
|
|
the errata workaround.
|
|
|
|
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
|
|
---
|
|
drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h | 7 ++++---
|
|
.../net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 23 +++++-----------------
|
|
2 files changed, 9 insertions(+), 21 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h
|
|
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h
|
|
@@ -653,9 +653,10 @@ static inline void _dpa_bp_free_pf(void
|
|
|
|
/* LS1043A SoC has a HW issue regarding FMan DMA transactions; The issue
|
|
* manifests itself at high traffic rates when frames cross 4K memory
|
|
- * boundaries or when they are not aligned to 16 bytes; For the moment, we
|
|
- * use a SW workaround that realigns frames to 256 bytes. Scatter/Gather
|
|
- * frames aren't supported on egress.
|
|
+ * boundaries, when they are not aligned to 16 bytes or when they have
|
|
+ * Scatter/Gather fragments; For the moment, we use a SW workaround that
|
|
+ * realigns frames to 256 bytes. Scatter/Gather frames aren't supported
|
|
+ * on egress.
|
|
*/
|
|
|
|
#ifndef CONFIG_PPC
|
|
--- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
|
|
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c
|
|
@@ -772,18 +772,19 @@ EXPORT_SYMBOL(skb_to_contig_fd);
|
|
|
|
#ifndef CONFIG_PPC
|
|
/* Verify the conditions that trigger the A010022 errata: data unaligned to
|
|
- * 16 bytes and 4K memory address crossings.
|
|
+ * 16 bytes, 4K memory address crossings and S/G fragments.
|
|
*/
|
|
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 (((uintptr_t)skb->data - priv->tx_headroom) %
|
|
priv->buf_layout[TX].data_align != 0)
|
|
return true;
|
|
|
|
+ /* Check for paged data in the skb. We do not support S/G fragments */
|
|
+ if (skb_is_nonlinear(skb))
|
|
+ return true;
|
|
+
|
|
/* Check if the headroom crosses a boundary */
|
|
if (HAS_DMA_ISSUE(skb->head, skb_headroom(skb)))
|
|
return true;
|
|
@@ -796,20 +797,6 @@ static bool a010022_check_skb(struct sk_
|
|
if (HAS_DMA_ISSUE(skb->head, skb_end_offset(skb)))
|
|
return true;
|
|
|
|
- nr_frags = skb_shinfo(skb)->nr_frags;
|
|
-
|
|
- while (i < nr_frags) {
|
|
- frag = &skb_shinfo(skb)->frags[i];
|
|
-
|
|
- /* Check if a paged fragment crosses a boundary from its
|
|
- * offset to its end.
|
|
- */
|
|
- if (HAS_DMA_ISSUE(frag->page_offset, frag->size))
|
|
- return true;
|
|
-
|
|
- i++;
|
|
- }
|
|
-
|
|
return false;
|
|
}
|
|
|