History

ntb_hw_switchtec: Added support of >=4G memory windows

Current Switchtec's BAR setup registers are limited to 32bits, corresponding to the maximum MW (memory window) size is <4G. Increase the MW sizes with the addition of the BAR Setup Extension Register for the upper 32bits of a 64bits MW size. This increases the MW range to between 4K and 2^63.

Paul Selles committed 7 years ago

Commit a2585cd1 parent d123fab2 files · +12 −3Browse files

Unified · Split

2 files
  1. drivers/ntb/hw/mscc/ntb_hw_switchtec.c +7 −2
  2. include/linux/switchtec.h +5 −1
drivers/ntb/hw/mscc/ntb_hw_switchtec.c+7−2
@@ -264,6 +264,7 @@ static void switchtec_ntb_mw_clr_direct(struct switchtec_ntb *sndev, int idx) · 263 unmodified lines
264264 ctl_val &= ~NTB_CTRL_BAR_DIR_WIN_EN;
265265 iowrite32(ctl_val, &ctl->bar_entry[bar].ctl);
266266 iowrite32(0, &ctl->bar_entry[bar].win_size);
267+ iowrite32(0, &ctl->bar_ext_entry[bar].win_size);
267268 iowrite64(sndev->self_partition, &ctl->bar_entry[bar].xlate_addr);
268269 }
269270
@@ -286,7 +287,9 @@ static void switchtec_ntb_mw_set_direct(struct switchtec_ntb *sndev, int idx, · 16 unmodified lines
286287 ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN;
287288
288289 iowrite32(ctl_val, &ctl->bar_entry[bar].ctl);
289− iowrite32(xlate_pos | size, &ctl->bar_entry[bar].win_size);
290+ iowrite32(xlate_pos | (lower_32_bits(size) & 0xFFFFF000),
291+ &ctl->bar_entry[bar].win_size);
292+ iowrite32(upper_32_bits(size), &ctl->bar_ext_entry[bar].win_size);
290293 iowrite64(sndev->self_partition | addr,
291294 &ctl->bar_entry[bar].xlate_addr);
292295 }
@@ -1053,7 +1056,9 @@ static int crosslink_setup_mws(struct switchtec_ntb *sndev, int ntb_lut_idx, · 760 unmodified lines
10531056 ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN;
10541057
10551058 iowrite32(ctl_val, &ctl->bar_entry[bar].ctl);
1056− iowrite32(xlate_pos | size, &ctl->bar_entry[bar].win_size);
1059+ iowrite32(xlate_pos | (lower_32_bits(size) & 0xFFFFF000),
1060+ &ctl->bar_entry[bar].win_size);
1061+ iowrite32(upper_32_bits(size), &ctl->bar_ext_entry[bar].win_size);
10571062 iowrite64(sndev->peer_partition | addr,
10581063 &ctl->bar_entry[bar].xlate_addr);
10591064 }
include/linux/switchtec.h+5−1
@@ -248,7 +248,11 @@ struct ntb_ctrl_regs { · 247 unmodified lines
248248 u32 win_size;
249249 u64 xlate_addr;
250250 } bar_entry[6];
251− u32 reserved2[216];
251+ struct {
252+ u32 win_size;
253+ u32 reserved[3];
254+ } bar_ext_entry[6];
255+ u32 reserved2[192];
252256 u32 req_id_table[512];
253257 u32 reserved3[256];
254258 u64 lut_entry[512];

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t