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

Pull NTB bug fixes from Jon Mason:
 "NTB bug fixes for tasklet from spinning forever, link errors,
  translation window setup, NULL ptr dereference, and ntb-perf errors.

  Also, a modification to the driver API that makes _addr functions
  optional"

* tag 'ntb-4.6' of git://github.com/jonmason/ntb:
  NTB: Remove _addr functions from ntb_hw_amd
  NTB: Make _addr functions optional in the API
  NTB: Fix incorrect clean up routine in ntb_perf
  NTB: Fix incorrect return check in ntb_perf
  ntb: fix possible NULL dereference
  ntb: add missing setup of translation window
  ntb: stop link work when we do not have memory
  ntb: stop tasklet from spinning forever during shutdown.
  ntb: perf test: fix address space confusion

1 files changed, 8 insertions, 2 deletions

diff --git a/include/linux/ntb.h b/include/linux/ntb.h
index f798e2afba88..6f47562d477b 100644
--- a/include/linux/ntb.h
+++ b/include/linux/ntb.h
@@ -284,7 +284,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
                 /* ops->db_read_mask                    && */
                 ops->db_set_mask                        &&
                 ops->db_clear_mask                      &&
-                ops->peer_db_addr                       &&
+                /* ops->peer_db_addr                    && */
                 /* ops->peer_db_read                    && */
                 ops->peer_db_set                        &&
                 /* ops->peer_db_clear                   && */
@@ -295,7 +295,7 @@ static inline int ntb_dev_ops_is_valid(const struct ntb_dev_ops *ops)
                 ops->spad_count                         &&
                 ops->spad_read                          &&
                 ops->spad_write                         &&
-                ops->peer_spad_addr                     &&
+                /* ops->peer_spad_addr                  && */
                 /* ops->peer_spad_read                  && */
                 ops->peer_spad_write                    &&
                 1;
@@ -757,6 +757,9 @@ static inline int ntb_peer_db_addr(struct ntb_dev *ntb,
                                    phys_addr_t *db_addr,
                                    resource_size_t *db_size)
 {
+        if (!ntb->ops->peer_db_addr)
+                return -EINVAL;
+
         return ntb->ops->peer_db_addr(ntb, db_addr, db_size);
 }
 
@@ -948,6 +951,9 @@ static inline int ntb_spad_write(struct ntb_dev *ntb, int idx, u32 val)
 static inline int ntb_peer_spad_addr(struct ntb_dev *ntb, int idx,
                                      phys_addr_t *spad_addr)
 {
+        if (!ntb->ops->peer_spad_addr)
+                return -EINVAL;
+
         return ntb->ops->peer_spad_addr(ntb, idx, spad_addr);
 }