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.

Reported-by: Boris Glimcher <boris.glimcher@emc.com>
Signed-off-by: Paul Selles <paul.selles@microchip.com>
Signed-off-by: Wesley Sheng <wesley.sheng@microchip.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
index 9916bc5b6759a93dfb7e7e5b3a80b42dc62d2b63..f6f00354047b047c641eeac6eab23db7cab4038c 100644 (file)
--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
@@ -264,6 +264,7 @@ static void switchtec_ntb_mw_clr_direct(struct switchtec_ntb *sndev, int idx)
        ctl_val &= ~NTB_CTRL_BAR_DIR_WIN_EN;
        iowrite32(ctl_val, &ctl->bar_entry[bar].ctl);
        iowrite32(0, &ctl->bar_entry[bar].win_size);
+       iowrite32(0, &ctl->bar_ext_entry[bar].win_size);
        iowrite64(sndev->self_partition, &ctl->bar_entry[bar].xlate_addr);
 }
 
@@ -286,7 +287,9 @@ static void switchtec_ntb_mw_set_direct(struct switchtec_ntb *sndev, int idx,
        ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN;
 
        iowrite32(ctl_val, &ctl->bar_entry[bar].ctl);
-       iowrite32(xlate_pos | size, &ctl->bar_entry[bar].win_size);
+       iowrite32(xlate_pos | (lower_32_bits(size) & 0xFFFFF000),
+                 &ctl->bar_entry[bar].win_size);
+       iowrite32(upper_32_bits(size), &ctl->bar_ext_entry[bar].win_size);
        iowrite64(sndev->self_partition | addr,
                  &ctl->bar_entry[bar].xlate_addr);
 }
@@ -1053,7 +1056,9 @@ static int crosslink_setup_mws(struct switchtec_ntb *sndev, int ntb_lut_idx,
                ctl_val |= NTB_CTRL_BAR_DIR_WIN_EN;
 
                iowrite32(ctl_val, &ctl->bar_entry[bar].ctl);
-               iowrite32(xlate_pos | size, &ctl->bar_entry[bar].win_size);
+               iowrite32(xlate_pos | (lower_32_bits(size) & 0xFFFFF000),
+                         &ctl->bar_entry[bar].win_size);
+               iowrite32(upper_32_bits(size), &ctl->bar_ext_entry[bar].win_size);
                iowrite64(sndev->peer_partition | addr,
                          &ctl->bar_entry[bar].xlate_addr);
        }

diff --git a/include/linux/switchtec.h b/include/linux/switchtec.h
index 32b282cd0ead220478267f8e0bc80c65fcfc4f1e..52a079b3a9a6d0d1fb889343c3d75a605a6c8f80 100644 (file)
--- a/include/linux/switchtec.h
+++ b/include/linux/switchtec.h
@@ -248,7 +248,11 @@ struct ntb_ctrl_regs {
                u32 win_size;
                u64 xlate_addr;
        } bar_entry[6];
-       u32 reserved2[216];
+       struct {
+               u32 win_size;
+               u32 reserved[3];
+       } bar_ext_entry[6];
+       u32 reserved2[192];
        u32 req_id_table[512];
        u32 reserved3[256];
        u64 lut_entry[512];