[PATCH] ntb: fix peer_spad_read() returning -EINVAL instead of 0
From: zhangjiao2
Date: Fri Nov 20 2026 - 03:51:20 EST
From: zhang jiao <zhangjiao2@xxxxxxxxxxxxxxxxxxxx>
The amd_ntb_peer_spad_read(), ntb_epf_peer_spad_read() and
switchtec_ntb_peer_spad_read() functions have a return type of u32
but return -EINVAL on error, which results in a garbage value
(0xFFFFFFEA) being returned to callers. Other NTB hardware drivers
(e.g. Intel's ndev_spad_read) correctly return 0 for out-of-range
scratchpad indices.
Fix all three functions to return 0 on error, matching the
established convention in the NTB subsystem.
Signed-off-by: zhang jiao <zhangjiao2@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ntb/hw/amd/ntb_hw_amd.c | 2 +-
drivers/ntb/hw/epf/ntb_hw_epf.c | 4 ++--
drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index 36bee0d8ac6c..40ced4043340 100644
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -529,7 +529,7 @@ static u32 amd_ntb_peer_spad_read(struct ntb_dev *ntb, int pidx, int sidx)
u32 offset;
if (sidx < 0 || sidx >= ndev->spad_count)
- return -EINVAL;
+ return 0;
offset = ndev->peer_spad + (sidx << 2);
return readl(mmio + AMD_SPAD_OFFSET + offset);
diff --git a/drivers/ntb/hw/epf/ntb_hw_epf.c b/drivers/ntb/hw/epf/ntb_hw_epf.c
index c47607d4f8a7..dcc5eb4bea74 100644
--- a/drivers/ntb/hw/epf/ntb_hw_epf.c
+++ b/drivers/ntb/hw/epf/ntb_hw_epf.c
@@ -273,12 +273,12 @@ static u32 ntb_epf_peer_spad_read(struct ntb_dev *ntb, int pidx, int idx)
if (pidx != NTB_DEF_PEER_IDX) {
dev_err(dev, "Unsupported Peer ID %d\n", pidx);
- return -EINVAL;
+ return 0;
}
if (idx < 0 || idx >= ndev->spad_count) {
dev_err(dev, "WRITE: Invalid Peer ScratchPad Index %d\n", idx);
- return -EINVAL;
+ return 0;
}
offset = (idx << 2);
diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
index e38540b92716..a9fc94869aeb 100644
--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
@@ -762,7 +762,7 @@ static u32 switchtec_ntb_peer_spad_read(struct ntb_dev *ntb, int pidx,
struct switchtec_ntb *sndev = ntb_sndev(ntb);
if (pidx != NTB_DEF_PEER_IDX)
- return -EINVAL;
+ return 0;
if (sidx < 0 || sidx >= ARRAY_SIZE(sndev->peer_shared->spad))
return 0;
--
2.33.0