aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion/vxge/vxge-config.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/neterion/vxge/vxge-config.h')
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-config.h22
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
index cfa970417f81..e678ba379598 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
@@ -127,7 +127,7 @@ enum vxge_hw_status {
127 VXGE_HW_ERR_INVALID_TCODE = VXGE_HW_BASE_ERR + 14, 127 VXGE_HW_ERR_INVALID_TCODE = VXGE_HW_BASE_ERR + 14,
128 VXGE_HW_ERR_INVALID_BLOCK_SIZE = VXGE_HW_BASE_ERR + 15, 128 VXGE_HW_ERR_INVALID_BLOCK_SIZE = VXGE_HW_BASE_ERR + 15,
129 VXGE_HW_ERR_INVALID_STATE = VXGE_HW_BASE_ERR + 16, 129 VXGE_HW_ERR_INVALID_STATE = VXGE_HW_BASE_ERR + 16,
130 VXGE_HW_ERR_PRIVILAGED_OPEARATION = VXGE_HW_BASE_ERR + 17, 130 VXGE_HW_ERR_PRIVILEGED_OPERATION = VXGE_HW_BASE_ERR + 17,
131 VXGE_HW_ERR_INVALID_PORT = VXGE_HW_BASE_ERR + 18, 131 VXGE_HW_ERR_INVALID_PORT = VXGE_HW_BASE_ERR + 18,
132 VXGE_HW_ERR_FIFO = VXGE_HW_BASE_ERR + 19, 132 VXGE_HW_ERR_FIFO = VXGE_HW_BASE_ERR + 19,
133 VXGE_HW_ERR_VPATH = VXGE_HW_BASE_ERR + 20, 133 VXGE_HW_ERR_VPATH = VXGE_HW_BASE_ERR + 20,
@@ -2011,26 +2011,6 @@ enum vxge_hw_status vxge_hw_vpath_mtu_set(
2011void 2011void
2012vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp); 2012vxge_hw_vpath_rx_doorbell_init(struct __vxge_hw_vpath_handle *vp);
2013 2013
2014#ifndef readq
2015static inline u64 readq(void __iomem *addr)
2016{
2017 u64 ret = 0;
2018 ret = readl(addr + 4);
2019 ret <<= 32;
2020 ret |= readl(addr);
2021
2022 return ret;
2023}
2024#endif
2025
2026#ifndef writeq
2027static inline void writeq(u64 val, void __iomem *addr)
2028{
2029 writel((u32) (val), addr);
2030 writel((u32) (val >> 32), (addr + 4));
2031}
2032#endif
2033
2034static inline void __vxge_hw_pio_mem_write32_upper(u32 val, void __iomem *addr) 2014static inline void __vxge_hw_pio_mem_write32_upper(u32 val, void __iomem *addr)
2035{ 2015{
2036 writel(val, addr + 4); 2016 writel(val, addr + 4);