Commit 5f7b8415 authored by David S. Miller's avatar David S. Miller

xilinx: Fix build on x86.

CONFIG_64BIT is not sufficient for checking for availability of
iowrite64() and friends.

Also, the out_addr helpers need to be inline.

Fixes: b690f8df ("net: axienet: Use iowrite64 to write all 64b descriptor pointers")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7ffce95
...@@ -563,7 +563,7 @@ static inline void axienet_dma_out32(struct axienet_local *lp, ...@@ -563,7 +563,7 @@ static inline void axienet_dma_out32(struct axienet_local *lp,
iowrite32(value, lp->dma_regs + reg); iowrite32(value, lp->dma_regs + reg);
} }
#ifdef CONFIG_64BIT #if defined(CONFIG_64BIT) && defined(iowrite64)
/** /**
* axienet_dma_out64 - Memory mapped Axi DMA register write. * axienet_dma_out64 - Memory mapped Axi DMA register write.
* @lp: Pointer to axienet local structure * @lp: Pointer to axienet local structure
...@@ -579,8 +579,8 @@ static inline void axienet_dma_out64(struct axienet_local *lp, ...@@ -579,8 +579,8 @@ static inline void axienet_dma_out64(struct axienet_local *lp,
iowrite64(value, lp->dma_regs + reg); iowrite64(value, lp->dma_regs + reg);
} }
static void axienet_dma_out_addr(struct axienet_local *lp, off_t reg, static inline void axienet_dma_out_addr(struct axienet_local *lp, off_t reg,
dma_addr_t addr) dma_addr_t addr)
{ {
if (lp->features & XAE_FEATURE_DMA_64BIT) if (lp->features & XAE_FEATURE_DMA_64BIT)
axienet_dma_out64(lp, reg, addr); axienet_dma_out64(lp, reg, addr);
...@@ -590,7 +590,7 @@ static void axienet_dma_out_addr(struct axienet_local *lp, off_t reg, ...@@ -590,7 +590,7 @@ static void axienet_dma_out_addr(struct axienet_local *lp, off_t reg,
#else /* CONFIG_64BIT */ #else /* CONFIG_64BIT */
static void axienet_dma_out_addr(struct axienet_local *lp, off_t reg, static inline void axienet_dma_out_addr(struct axienet_local *lp, off_t reg,
dma_addr_t addr) dma_addr_t addr)
{ {
axienet_dma_out32(lp, reg, lower_32_bits(addr)); axienet_dma_out32(lp, reg, lower_32_bits(addr));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment