summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2026-06-12 11:01:02 +0300
committerAlexandre Belloni <alexandre.belloni@bootlin.com>2026-06-14 21:49:11 +0200
commitad7fba5cbd6d7ff139a08e7c83edec4536314430 (patch)
treebe17b38e6bb24e5c117f7a2c062bfdb599a687ac /drivers
parent650716f23eac488c6696babdc7805f6a6b7427ad (diff)
downloadlinux-next-ad7fba5cbd6d7ff139a08e7c83edec4536314430.tar.gz
linux-next-ad7fba5cbd6d7ff139a08e7c83edec4536314430.zip
i3c: mipi-i3c-hci: Ignore DISEC failures when disabling IBIs
Disabling IBIs currently returns the result of the DISEC CCC, causing i3c_hci_disable_ibi() to fail if the transfer errors out. However, the controller has already been programmed to reject IBIs by setting DAT_0_SIR_REJECT, so the target’s IBIs are effectively disabled from the host side regardless of the outcome of the DISEC command. At this point, teardown of the IBI infrastructure can safely proceed even if DISEC fails. Note, from then on, the MIPI I3C HCI not only NACKs the target's IBI but automatically sends another DISEC command. Make i3c_hci_disable_ibi() resilient by ignoring the return value of i3c_master_disec_locked() and always returning success. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Link: https://patch.msgid.link/20260612080107.11606-3-adrian.hunter@intel.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i3c/master/mipi-i3c-hci/core.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/i3c/master/mipi-i3c-hci/core.c b/drivers/i3c/master/mipi-i3c-hci/core.c
index 1e1f05aff092..fffbc1775ef9 100644
--- a/drivers/i3c/master/mipi-i3c-hci/core.c
+++ b/drivers/i3c/master/mipi-i3c-hci/core.c
@@ -697,7 +697,13 @@ static int i3c_hci_disable_ibi(struct i3c_dev_desc *dev)
struct i3c_hci *hci = to_i3c_hci(m);
__i3c_hci_disable_ibi(hci, dev);
- return i3c_master_disec_locked(m, dev->info.dyn_addr, I3C_CCC_EVENT_SIR);
+ /*
+ * The DAT entry is now set to NACK and DISEC this target's IBIs, so
+ * the IBI teardown can proceed even if DISEC below fails, so ignore
+ * errors.
+ */
+ i3c_master_disec_locked(m, dev->info.dyn_addr, I3C_CCC_EVENT_SIR);
+ return 0;
}
static void i3c_hci_recycle_ibi_slot(struct i3c_dev_desc *dev,