| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | From 211d0b5127a468cf0e2db20b4854252e6784cf08 Mon Sep 17 00:00:00 2001 |
| 2 | From: Camelia Groza <camelia.groza@nxp.com> |
| 3 | Date: Mon, 4 Sep 2017 14:35:21 +0300 |
| 4 | Subject: [PATCH] sdk_dpaa: ls1043a errata: fix arm32 build |
| 5 | |
| 6 | Signed-off-by: Camelia Groza <camelia.groza@nxp.com> |
| 7 | --- |
| 8 | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h | 6 ++---- |
| 9 | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 2 +- |
| 10 | 2 files changed, 3 insertions(+), 5 deletions(-) |
| 11 | |
| 12 | --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h |
| 13 | +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h |
| 14 | @@ -689,12 +689,10 @@ static inline void _dpa_bp_free_pf(void |
| 15 | |
| 16 | #ifndef CONFIG_PPC |
| 17 | extern bool dpaa_errata_a010022; /* SoC affected by A010022 errata */ |
| 18 | - |
| 19 | #define NONREC_MARK 0x01 |
| 20 | #define HAS_DMA_ISSUE(start, size) \ |
| 21 | - (((u64)(start) + (size)) > (((u64)(start) + 0x1000) & ~0xFFF)) |
| 22 | -#define BOUNDARY_4K(start, size) (((u64)(start) + (u64)(size)) & ~0xFFF) |
| 23 | - |
| 24 | + (((uintptr_t)(start) + (size)) > \ |
| 25 | + (((uintptr_t)(start) + 0x1000) & ~0xFFF)) |
| 26 | #endif /* !CONFIG_PPC */ |
| 27 | |
| 28 | #endif /* __DPA_H */ |
| 29 | --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c |
| 30 | +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c |
| 31 | @@ -757,7 +757,7 @@ static bool a010022_check_skb(struct sk_ |
| 32 | skb_frag_t *frag; |
| 33 | |
| 34 | /* Check if the headroom is aligned */ |
| 35 | - if (((u16)skb->data - priv->tx_headroom) % |
| 36 | + if (((uintptr_t)skb->data - priv->tx_headroom) % |
| 37 | priv->buf_layout[TX].data_align != 0) |
| 38 | return true; |
| 39 | |