diff options
| author | Camelia Groza <camelia.groza@nxp.com> | 2017-09-04 11:35:21 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-09-25 07:25:49 (GMT) |
| commit | 291bafd9a4c355cec95ba07bbd6c028c52dc611e (patch) | |
| tree | 85a884aaa6ee38d65bfe1ebcb793ecd9485a5d6e /drivers/net/ethernet | |
| parent | 0181f24ddf06f6d33a9307f35fa90cb529060210 (diff) | |
| download | linux-291bafd9a4c355cec95ba07bbd6c028c52dc611e.tar.xz | |
sdk_dpaa: ls1043a errata: fix arm32 build
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h index d2ce6e6..b1703bc 100644 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.h @@ -689,12 +689,10 @@ static inline void _dpa_bp_free_pf(void *addr) #ifndef CONFIG_PPC extern bool dpaa_errata_a010022; /* SoC affected by A010022 errata */ - #define NONREC_MARK 0x01 #define HAS_DMA_ISSUE(start, size) \ - (((u64)(start) + (size)) > (((u64)(start) + 0x1000) & ~0xFFF)) -#define BOUNDARY_4K(start, size) (((u64)(start) + (u64)(size)) & ~0xFFF) - + (((uintptr_t)(start) + (size)) > \ + (((uintptr_t)(start) + 0x1000) & ~0xFFF)) #endif /* !CONFIG_PPC */ #endif /* __DPA_H */ diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c index 4dd8bf1..45fd796 100644 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c @@ -761,7 +761,7 @@ static bool a010022_check_skb(struct sk_buff *skb, struct dpa_priv_s *priv) skb_frag_t *frag; /* Check if the headroom is aligned */ - if (((u16)skb->data - priv->tx_headroom) % + if (((uintptr_t)skb->data - priv->tx_headroom) % priv->buf_layout[TX].data_align != 0) return true; |