diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /drivers/net/ethernet/cadence/macb.h | |
parent | 62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff) | |
parent | 6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence/macb.h')
-rw-r--r-- | drivers/net/ethernet/cadence/macb.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 94ddedd2d83e..a2cf91223003 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -426,6 +426,8 @@ /* Bitfields in DCFG6. */ #define GEM_PBUF_LSO_OFFSET 27 #define GEM_PBUF_LSO_SIZE 1 +#define GEM_DAW64_OFFSET 23 +#define GEM_DAW64_SIZE 1 /* Bitfields in TISUBN */ #define GEM_SUBNSINCR_OFFSET 0 @@ -540,11 +542,19 @@ struct macb_dma_desc { u32 addr; u32 ctrl; +}; + #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT - u32 addrh; - u32 resvd; -#endif +enum macb_hw_dma_cap { + HW_DMA_CAP_32B, + HW_DMA_CAP_64B, +}; + +struct macb_dma_desc_64 { + u32 addrh; + u32 resvd; }; +#endif /* DMA descriptor bitfields */ #define MACB_RX_USED_OFFSET 0 @@ -943,6 +953,9 @@ struct macb { u32 wol; struct macb_ptp_info *ptp_info; /* macb-ptp interface */ +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT + enum macb_hw_dma_cap hw_dma_cap; +#endif }; static inline bool macb_is_gem(struct macb *bp) |