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>
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
From bd9aa7c077105fda307bbc685949d5bb01ed1bd8 Mon Sep 17 00:00:00 2001
|
||
From: Dong Aisheng <aisheng.dong@nxp.com>
|
||
Date: Sun, 29 Sep 2019 22:38:34 +0800
|
||
Subject: [PATCH] net: dpaa: fix build failure due to skb_frag_t struct change
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
We met below build break due to new kernel change:
|
||
8842d285bafa ("net: Convert skb_frag_t to bio_vec")
|
||
|
||
../drivers/net/ethernet/freescale/dpaa/dpaa_eth.c: In function ‘dpaa_errata_a010022_has_dma_issue’:
|
||
../drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:2137:37: error: ‘skb_frag_t’ has no member named ‘page_offset’
|
||
if (CROSS_4K_BOUND((uintptr_t)frag->page_offset, frag->bv_len))
|
||
^
|
||
../drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:2105:5: note: in definition of macro ‘CROSS_4K_BOUND’
|
||
(((start) + (size)) > (((start) + 0x1000) & ~0xFFF))
|
||
^
|
||
../drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:2137:37: error: ‘skb_frag_t’ has no member named ‘page_offset’
|
||
if (CROSS_4K_BOUND((uintptr_t)frag->page_offset, frag->bv_len))
|
||
^
|
||
../drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:2105:27: note: in definition of macro ‘CROSS_4K_BOUND’
|
||
(((start) + (size)) > (((start) + 0x1000) & ~0xFFF))
|
||
|
||
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
|
||
---
|
||
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
|
||
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
|
||
@@ -2141,7 +2141,7 @@ static bool dpaa_errata_a010022_has_dma_
|
||
/* Check if a paged fragment crosses a boundary from its
|
||
* offset to its end.
|
||
*/
|
||
- if (CROSS_4K_BOUND((uintptr_t)frag->page_offset, frag->bv_len))
|
||
+ if (CROSS_4K_BOUND(skb_frag_off(frag), skb_frag_size(frag)))
|
||
return true;
|
||
|
||
i++;
|