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.
Unified · Split
| @@ -264,6 +264,7 @@ static void switchtec_ntb_mw_clr_direct(struct switchtec_ntb *sndev, int idx) · 263 unmodified lines | |||
| 264 | ctl_val &= ~NTB_CTRL_BAR_DIR_WIN_EN; | 264 | ctl_val &= ~NTB_CTRL_BAR_DIR_WIN_EN; |
| 265 | iowrite32(ctl_val, &ctl->bar_entry[bar].ctl); | 265 | iowrite32(ctl_val, &ctl->bar_entry[bar].ctl); |
| 266 | iowrite32(0, &ctl->bar_entry[bar].win_size); | 266 | iowrite32(0, &ctl->bar_entry[bar].win_size); |
| 267 | iowrite32(0, &ctl->bar_ext_entry[bar].win_size); | ||
| 267 | iowrite64(sndev->self_partition, &ctl->bar_entry[bar].xlate_addr); | 268 | iowrite64(sndev->self_partition, &ctl->bar_entry[bar].xlate_addr); |
| 268 | } | 269 | } |
| 269 | 270 | ||
| @@ -286,7 +287,9 @@ static void switchtec_ntb_mw_set_direct(struct switchtec_ntb *sndev, int idx, · 16 unmodified lines | |||
| 286 | ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN; | 287 | ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN; |
| 287 | 288 | ||
| 288 | iowrite32(ctl_val, &ctl->bar_entry[bar].ctl); | 289 | 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); | ||
| 290 | iowrite64(sndev->self_partition | addr, | 293 | iowrite64(sndev->self_partition | addr, |
| 291 | &ctl->bar_entry[bar].xlate_addr); | 294 | &ctl->bar_entry[bar].xlate_addr); |
| 292 | } | 295 | } |
| @@ -1053,7 +1056,9 @@ static int crosslink_setup_mws(struct switchtec_ntb *sndev, int ntb_lut_idx, · 760 unmodified lines | |||
| 1053 | ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN; | 1056 | ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN; |
| 1054 | 1057 | ||
| 1055 | iowrite32(ctl_val, &ctl->bar_entry[bar].ctl); | 1058 | 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); | ||
| 1057 | iowrite64(sndev->peer_partition | addr, | 1062 | iowrite64(sndev->peer_partition | addr, |
| 1058 | &ctl->bar_entry[bar].xlate_addr); | 1063 | &ctl->bar_entry[bar].xlate_addr); |
| 1059 | } | 1064 | } |
| @@ -248,7 +248,11 @@ struct ntb_ctrl_regs { · 247 unmodified lines | |||
| 248 | u32 win_size; | 248 | u32 win_size; |
| 249 | u64 xlate_addr; | 249 | u64 xlate_addr; |
| 250 | } bar_entry[6]; | 250 | } 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]; | ||
| 252 | u32 req_id_table[512]; | 256 | u32 req_id_table[512]; |
| 253 | u32 reserved3[256]; | 257 | u32 reserved3[256]; |
| 254 | u64 lut_entry[512]; | 258 | u64 lut_entry[512]; |