Merge tag 'ntb-5.1' of git://github.com/jonmason/ntb

Pull NTB updates from Jon Mason:

 - fixes for switchtec debugability and mapping table entries

 - NTB transport improvements

 - a reworking of the peer_db_addr for better abstraction

* tag 'ntb-5.1' of git://github.com/jonmason/ntb:
  NTB: add new parameter to peer_db_addr() db_bit and db_data
  NTB: ntb_transport: Ensure the destination buffer is mapped for TX DMA
  NTB: ntb_transport: Free MWs in ntb_transport_link_cleanup()
  ntb_hw_switchtec: Added support of >=4G memory windows
  ntb_hw_switchtec: NT req id mapping table register entry number should be 512
  ntb_hw_switchtec: debug print 64bit aligned crosslink BAR Numbers

4 files changed, 70 insertions, 13 deletions

diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c
index 2ad263f708da..bb57ec239029 100644
--- a/drivers/ntb/hw/intel/ntb_hw_gen1.c
+++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c
@@ -180,7 +180,7 @@ int ndev_mw_to_bar(struct intel_ntb_dev *ndev, int idx)
         return ndev->reg->mw_bar[idx];
 }
 
-static inline int ndev_db_addr(struct intel_ntb_dev *ndev,
+void ndev_db_addr(struct intel_ntb_dev *ndev,
                                phys_addr_t *db_addr, resource_size_t *db_size,
                                phys_addr_t reg_addr, unsigned long reg)
 {
@@ -196,8 +196,6 @@ static inline int ndev_db_addr(struct intel_ntb_dev *ndev,
                 *db_size = ndev->reg->db_size;
                 dev_dbg(&ndev->ntb.pdev->dev, "Peer db size %llx\n", *db_size);
         }
-
-        return 0;
 }
 
 u64 ndev_db_read(struct intel_ntb_dev *ndev,
@@ -1111,13 +1109,28 @@ int intel_ntb_db_clear_mask(struct ntb_dev *ntb, u64 db_bits)
                                   ndev->self_reg->db_mask);
 }
 
-int intel_ntb_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
-                           resource_size_t *db_size)
+static int intel_ntb_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
+                           resource_size_t *db_size, u64 *db_data, int db_bit)
 {
+        u64 db_bits;
         struct intel_ntb_dev *ndev = ntb_ndev(ntb);
 
-        return ndev_db_addr(ndev, db_addr, db_size, ndev->peer_addr,
+        if (unlikely(db_bit >= BITS_PER_LONG_LONG))
+                return -EINVAL;
+
+        db_bits = BIT_ULL(db_bit);
+
+        if (unlikely(db_bits & ~ntb_ndev(ntb)->db_valid_mask))
+                return -EINVAL;
+
+        ndev_db_addr(ndev, db_addr, db_size, ndev->peer_addr,
                             ndev->peer_reg->db_bell);
+
+        if (db_data)
+                *db_data = db_bits;
+
+
+        return 0;
 }
 
 static int intel_ntb_peer_db_set(struct ntb_dev *ntb, u64 db_bits)
diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.h b/drivers/ntb/hw/intel/ntb_hw_gen1.h
index ad8ec1444436..544cf5c06f4d 100644
--- a/drivers/ntb/hw/intel/ntb_hw_gen1.h
+++ b/drivers/ntb/hw/intel/ntb_hw_gen1.h
@@ -147,6 +147,9 @@ extern struct intel_b2b_addr xeon_b2b_dsd_addr;
 int ndev_init_isr(struct intel_ntb_dev *ndev, int msix_min, int msix_max,
                 int msix_shift, int total_shift);
 enum ntb_topo xeon_ppd_topo(struct intel_ntb_dev *ndev, u8 ppd);
+void ndev_db_addr(struct intel_ntb_dev *ndev,
+                                phys_addr_t *db_addr, resource_size_t *db_size,
+                                phys_addr_t reg_addr, unsigned long reg);
 u64 ndev_db_read(struct intel_ntb_dev *ndev, void __iomem *mmio);
 int ndev_db_write(struct intel_ntb_dev *ndev, u64 db_bits,
                                 void __iomem *mmio);
@@ -166,8 +169,6 @@ int intel_ntb_db_vector_count(struct ntb_dev *ntb);
 u64 intel_ntb_db_vector_mask(struct ntb_dev *ntb, int db_vector);
 int intel_ntb_db_set_mask(struct ntb_dev *ntb, u64 db_bits);
 int intel_ntb_db_clear_mask(struct ntb_dev *ntb, u64 db_bits);
-int intel_ntb_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
-                resource_size_t *db_size);
 int intel_ntb_spad_is_unsafe(struct ntb_dev *ntb);
 int intel_ntb_spad_count(struct ntb_dev *ntb);
 u32 intel_ntb_spad_read(struct ntb_dev *ntb, int idx);
diff --git a/drivers/ntb/hw/intel/ntb_hw_gen3.c b/drivers/ntb/hw/intel/ntb_hw_gen3.c
index b3fa24778f94..f475b56a3f49 100644
--- a/drivers/ntb/hw/intel/ntb_hw_gen3.c
+++ b/drivers/ntb/hw/intel/ntb_hw_gen3.c
@@ -532,6 +532,37 @@ static int intel_ntb3_mw_set_trans(struct ntb_dev *ntb, int pidx, int idx,
         return 0;
 }
 
+int intel_ntb3_peer_db_addr(struct ntb_dev *ntb, phys_addr_t *db_addr,
+                                resource_size_t *db_size,
+                                u64 *db_data, int db_bit)
+{
+        phys_addr_t db_addr_base;
+        struct intel_ntb_dev *ndev = ntb_ndev(ntb);
+
+        if (unlikely(db_bit >= BITS_PER_LONG_LONG))
+                return -EINVAL;
+
+        if (unlikely(BIT_ULL(db_bit) & ~ntb_ndev(ntb)->db_valid_mask))
+                return -EINVAL;
+
+        ndev_db_addr(ndev, &db_addr_base, db_size, ndev->peer_addr,
+                                ndev->peer_reg->db_bell);
+
+        if (db_addr) {
+                *db_addr = db_addr_base + (db_bit * 4);
+                dev_dbg(&ndev->ntb.pdev->dev, "Peer db addr %llx db bit %d\n",
+                                *db_addr, db_bit);
+        }
+
+        if (db_data) {
+                *db_data = 1;
+                dev_dbg(&ndev->ntb.pdev->dev, "Peer db data %llx db bit %d\n",
+                                *db_data, db_bit);
+        }
+
+        return 0;
+}
+
 static int intel_ntb3_peer_db_set(struct ntb_dev *ntb, u64 db_bits)
 {
         struct intel_ntb_dev *ndev = ntb_ndev(ntb);
@@ -584,7 +615,7 @@ const struct ntb_dev_ops intel_ntb3_ops = {
         .db_clear               = intel_ntb3_db_clear,
         .db_set_mask            = intel_ntb_db_set_mask,
         .db_clear_mask          = intel_ntb_db_clear_mask,
-        .peer_db_addr           = intel_ntb_peer_db_addr,
+        .peer_db_addr           = intel_ntb3_peer_db_addr,
         .peer_db_set            = intel_ntb3_peer_db_set,
         .spad_is_unsafe         = intel_ntb_spad_is_unsafe,
         .spad_count             = intel_ntb_spad_count,
diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
index f2df2d39c65b..d905d368d28c 100644
--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
@@ -236,6 +236,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);
 }
 
@@ -258,7 +259,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);
 }
@@ -679,11 +682,16 @@ static u64 switchtec_ntb_db_read_mask(struct ntb_dev *ntb)
 
 static int switchtec_ntb_peer_db_addr(struct ntb_dev *ntb,
                                       phys_addr_t *db_addr,
-                                      resource_size_t *db_size)
+                                      resource_size_t *db_size,
+                                      u64 *db_data,
+                                      int db_bit)
 {
         struct switchtec_ntb *sndev = ntb_sndev(ntb);
         unsigned long offset;
 
+        if (unlikely(db_bit >= BITS_PER_LONG_LONG))
+                return -EINVAL;
+
         offset = (unsigned long)sndev->mmio_peer_dbmsg->odb -
                 (unsigned long)sndev->stdev->mmio;
 
@@ -693,6 +701,8 @@ static int switchtec_ntb_peer_db_addr(struct ntb_dev *ntb,
                 *db_addr = pci_resource_start(ntb->pdev, 0) + offset;
         if (db_size)
                 *db_size = sizeof(u32);
+        if (db_data)
+                *db_data = BIT_ULL(db_bit) << sndev->db_peer_shift;
 
         return 0;
 }
@@ -1025,7 +1035,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);
         }
@@ -1092,7 +1104,7 @@ static int crosslink_enum_partition(struct switchtec_ntb *sndev,
 
                 dev_dbg(&sndev->stdev->dev,
                         "Crosslink BAR%d addr: %llx\n",
-                        i, bar_addr);
+                        i*2, bar_addr);
 
                 if (bar_addr != bar_space * i)
                         continue;