aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSing-Han Chen <singhanc@nvidia.com>2022-01-12 17:41:43 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-01-26 13:41:19 +0100
commit825911492eb15bf8bb7fb94bc0c0421fe7a6327d (patch)
treef679db6fdd37ae95dd597ec209f2c56bfa45d68b
parentUSB: core: Fix hang in usb_kill_urb by adding memory barriers (diff)
downloadlinux-dev-825911492eb15bf8bb7fb94bc0c0421fe7a6327d.tar.xz
linux-dev-825911492eb15bf8bb7fb94bc0c0421fe7a6327d.zip
ucsi_ccg: Check DEV_INT bit only when starting CCG4
CCGx clears Bit 0:Device Interrupt in the INTR_REG if CCGx is reset successfully. However, there might be a chance that other bits in INTR_REG are not cleared due to internal data queued in PPM. This case misleads the driver that CCGx reset failed. The commit checks bit 0 in INTR_REG and ignores other bits. The ucsi driver would reset PPM later. Fixes: 247c554a14aa ("usb: typec: ucsi: add support for Cypress CCGx") Cc: stable@vger.kernel.org Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Sing-Han Chen <singhanc@nvidia.com> Signed-off-by: Wayne Chang <waynec@nvidia.com> Link: https://lore.kernel.org/r/20220112094143.628610-1-waynec@nvidia.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/typec/ucsi/ucsi_ccg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index bff96d64dddf..6db7c8ddd51c 100644
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -325,7 +325,7 @@ static int ucsi_ccg_init(struct ucsi_ccg *uc)
if (status < 0)
return status;
- if (!data)
+ if (!(data & DEV_INT))
return 0;
status = ccg_write(uc, CCGX_RAB_INTR_REG, &data, sizeof(data));