diff options
author | Jon Mason <jon.mason@intel.com> | 2013-01-21 18:40:39 -0500 |
---|---|---|
committer | Jon Mason <jon.mason@intel.com> | 2013-09-03 17:48:53 -0400 |
commit | ac477afb0431386575ef453f50fa0052c3f0461b (patch) | |
tree | f32e9f650e68e345baee7919800d8b8e6da60d82 /drivers/ntb/ntb_hw.h | |
parent | be4dac0fcacd7d62e0b4f7ff51a7032e197b62af (diff) |
NTB: Enable 32bit Support
Correct the issues on NTB that prevented it from working on x86_32 and
modify the Kconfig to allow it to be permitted to be used in that
environment as well.
Signed-off-by: Jon Mason <jon.mason@intel.com>
Diffstat (limited to 'drivers/ntb/ntb_hw.h')
-rw-r--r-- | drivers/ntb/ntb_hw.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/ntb/ntb_hw.h b/drivers/ntb/ntb_hw.h index 591d4ff5d88e..d838bc13b956 100644 --- a/drivers/ntb/ntb_hw.h +++ b/drivers/ntb/ntb_hw.h | |||
@@ -62,6 +62,21 @@ | |||
62 | 62 | ||
63 | #define msix_table_size(control) ((control & PCI_MSIX_FLAGS_QSIZE)+1) | 63 | #define msix_table_size(control) ((control & PCI_MSIX_FLAGS_QSIZE)+1) |
64 | 64 | ||
65 | #ifndef readq | ||
66 | static inline u64 readq(void __iomem *addr) | ||
67 | { | ||
68 | return readl(addr) | (((u64) readl(addr + 4)) << 32LL); | ||
69 | } | ||
70 | #endif | ||
71 | |||
72 | #ifndef writeq | ||
73 | static inline void writeq(u64 val, void __iomem *addr) | ||
74 | { | ||
75 | writel(val & 0xffffffff, addr); | ||
76 | writel(val >> 32, addr + 4); | ||
77 | } | ||
78 | #endif | ||
79 | |||
65 | #define NTB_BAR_MMIO 0 | 80 | #define NTB_BAR_MMIO 0 |
66 | #define NTB_BAR_23 2 | 81 | #define NTB_BAR_23 2 |
67 | #define NTB_BAR_45 4 | 82 | #define NTB_BAR_45 4 |
@@ -226,7 +241,7 @@ int ntb_read_local_spad(struct ntb_device *ndev, unsigned int idx, u32 *val); | |||
226 | int ntb_write_remote_spad(struct ntb_device *ndev, unsigned int idx, u32 val); | 241 | int ntb_write_remote_spad(struct ntb_device *ndev, unsigned int idx, u32 val); |
227 | int ntb_read_remote_spad(struct ntb_device *ndev, unsigned int idx, u32 *val); | 242 | int ntb_read_remote_spad(struct ntb_device *ndev, unsigned int idx, u32 *val); |
228 | void __iomem *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw); | 243 | void __iomem *ntb_get_mw_vbase(struct ntb_device *ndev, unsigned int mw); |
229 | resource_size_t ntb_get_mw_size(struct ntb_device *ndev, unsigned int mw); | 244 | u64 ntb_get_mw_size(struct ntb_device *ndev, unsigned int mw); |
230 | void ntb_ring_sdb(struct ntb_device *ndev, unsigned int idx); | 245 | void ntb_ring_sdb(struct ntb_device *ndev, unsigned int idx); |
231 | void *ntb_find_transport(struct pci_dev *pdev); | 246 | void *ntb_find_transport(struct pci_dev *pdev); |
232 | 247 | ||