Skip to content

Commit 0db68ec

Browse files
JC-WVgregkh
authored andcommitted
usb: typec: tipd: fix event checking for tps25750
commit d64adb0 upstream. In its current form, the interrupt service routine of the tps25750 checks the event flags in the lowest 64 bits of the interrupt event register (event[0]), but also in the upper part (event[1]). Given that all flags are defined as BIT() or BIT_ULL(), they are restricted to the first 64 bits of the INT_EVENT1 register. Including the upper part of the register can lead to false positives e.g. if the event 64 bits above the one being checked is set, but the one being checked is not. Restrict the flag checking to the first 64 bits of the INT_EVENT1 register. Fixes: 7e7a3c8 ("USB: typec: tps6598x: Add TPS25750 support") Cc: stable@vger.kernel.org Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Javier Carrasco <javier.carrasco@wolfvision.net> Link: https://lore.kernel.org/r/20240429-tps6598x_fix_event_handling-v3-1-4e8e58dce489@wolfvision.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b9828fd commit 0db68ec

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/usb/typec/tipd/core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -604,11 +604,11 @@ static irqreturn_t tps25750_interrupt(int irq, void *data)
604604
if (!tps6598x_read_status(tps, &status))
605605
goto err_clear_ints;
606606

607-
if ((event[0] | event[1]) & TPS_REG_INT_POWER_STATUS_UPDATE)
607+
if (event[0] & TPS_REG_INT_POWER_STATUS_UPDATE)
608608
if (!tps6598x_read_power_status(tps))
609609
goto err_clear_ints;
610610

611-
if ((event[0] | event[1]) & TPS_REG_INT_DATA_STATUS_UPDATE)
611+
if (event[0] & TPS_REG_INT_DATA_STATUS_UPDATE)
612612
if (!tps6598x_read_data_status(tps))
613613
goto err_clear_ints;
614614

@@ -617,7 +617,7 @@ static irqreturn_t tps25750_interrupt(int irq, void *data)
617617
* a plug event. Therefore, we need to check
618618
* for pr/dr status change to set TypeC dr/pr accordingly.
619619
*/
620-
if ((event[0] | event[1]) & TPS_REG_INT_PLUG_EVENT ||
620+
if (event[0] & TPS_REG_INT_PLUG_EVENT ||
621621
tps6598x_has_role_changed(tps, status))
622622
tps6598x_handle_plug_event(tps, status);
623623

0 commit comments

Comments
 (0)