Received-SPF: pass (google.com: domain of linux-kernel+bounces-123311-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Javier Carrasco <javier.carrasco@wolfvision.net>
Date: Thu, 28 Mar 2024 17:55:52 +0100
Subject: [PATCH RESEND 2/2] usb: typec: tipd: fix event checking for
 tps6598x
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240328-tps6598x_fix_event_handling-v1-2-502721ff705b@wolfvision.net>
References: <20240328-tps6598x_fix_event_handling-v1-0-502721ff705b@wolfvision.net>
In-Reply-To: <20240328-tps6598x_fix_event_handling-v1-0-502721ff705b@wolfvision.net>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>, 
 Greg Kroah-Hartman <gregkh@linuxfoundation.org>, 
 Abdel Alkuor <abdelalkuor@geotab.com>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, 
 Javier Carrasco <javier.carrasco@wolfvision.net>, stable@vger.kernel.org
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?akFyMTFvcGNTcFRsVXZNSG1FRUxEUWtPYmNhZk5PY2hyaElObmlmOUlOUHF1?=
 =?utf-8?B?aVU5bG5EbVhTamJDTTJMenZVSTIxWFN3UTZpWmVnRHBBUnUwSDhtK09ZaFZs?=
 =?utf-8?B?a0RXWW5IVFpwMWFYYTViUzNzMEMveTNTRmFEdThka3Vpci9TQWdhTlJHTC9Z?=
 =?utf-8?B?VDNteGhJVzhZUXRFblZrL1daK09jYUFkNnViMEF4Y2tJdjJSUnF6YUFaWm5s?=
 =?utf-8?B?Rkk4UkgyaENsS2svL0Fkd3dmUThOSEdaejRldGZuV3pQSUM3OU0zRDY2cVRx?=
 =?utf-8?B?QUN4ZUR0TzMxcUE0K3pNWlBpbEI4L1UydmEzZGFrMXNiOHVPVnFWMW9vRnUx?=
 =?utf-8?B?VFM4SzB1MGllN084SGpXWXZUYU4vWkF6SmJKd0NlZEo0WjE2L3RxTjQwaitk?=
 =?utf-8?B?cjhNWWYzWGxoQlkxeFFyU3NHZGVZTzRQRlJZWnRYU1Nkdm8xTE1aL1pEN2I3?=
 =?utf-8?B?RXh2N2hoODAyZkVaM0FtM3VRcStyMEY4alovMForZitOVzMwUHhCa2ptbmdU?=
 =?utf-8?B?eXV2WEVKTmM3YXBmNlR1RVlGU3VzV1pENlF1TS9jM3lpZnB0a2prZ2dmOXFk?=
 =?utf-8?B?TytnSmhJRlIrdktHdUErL2RodFpiclRoUE5YMGJDVEFBR2x2VFZpMEpRMzI1?=
 =?utf-8?B?Mnp6U3AvL3JCRUJQUHVPVmR5bGdUMzl3L3dXMkdzWmg3SXV1Z2JHOXZoYzdF?=
 =?utf-8?B?dG5icWRueC9iTGRmMUhxZkVwUitKRTZPWHk1ajh4YjFLMkhUZnNMTHpPdEVo?=
 =?utf-8?B?UlNqWTd4N0M1TjZGZ1F2cDJuTEdnUnFJSE50TUNBOU4xcHVuZnd5WW5FN0hM?=
 =?utf-8?B?NW5ldXhtTWJxOXQxbUJzUEpTbXF3UFpNY0VhZUhHV3NkYzAvTldaTDZzayth?=
 =?utf-8?B?WllrSTljMkFxVkIrUUJhcW1zaFBxMENNdzNpQUNOTnp0WnBQaWN3eWpRUWxz?=
 =?utf-8?B?eVpiWTZmUm5lSlZoSnVBUVBrN3JhYmtXQmY2SDlrbEh4SFVHbmY4cFZBcGtI?=
 =?utf-8?B?Ym5lMmxPOFJ5U2x4VFAvUGFpNHp4ZGNLU1ZDQzQvMlhVcW4wYWZHaDBxay9s?=
 =?utf-8?B?RDFTK0RHbnBlUktaR3d2NDhBK1RKYnNyNUVTc0s2WVZJL05hc2hVSXNScmVN?=
 =?utf-8?B?TVNZYUk0R0Ywajh3dHJDNnZHdXVpYlE2L3lhaTRxMG5WeTVHYlJXWVc3Qm9C?=
 =?utf-8?B?c0FrSmxYUTMxTUNLYTRsTmFGblRFZElDV0pZSnQyeUxqRW04dk9Ma3VsNk5s?=
 =?utf-8?B?eXRRMG42Q2ltQUlKOWJaWlB4VmxETUM4WWNnSDA4aDgwS0daMUNjcWloNkYv?=
 =?utf-8?B?QTNFRXc3Rmhqclk3bkhXWHNSRmhHZmhZZ3MrZUVxS21HY1h4aTJtNi9tUUty?=
 =?utf-8?B?MkZMRTFJd01aVXFyTFhWbFF2ZHFZcmNKQW9VUmQwY0JoRGR1YlNOZmFDTG5I?=
 =?utf-8?B?enJFRFhVTzBrUGlvWHk1L2ppU3lwcGtYNzVVRlh1WHVOSWJrdlA1VEtDOXVE?=
 =?utf-8?B?eFlibmh6K1ZaYWF1bGsra2xpbSt5V1JzWUlFSDdYOTB4My9Ea3VCVkZ6d1Mw?=
 =?utf-8?B?NkZFeUhNRVBaaXVYOGdkMng5UGVlZ1ZKMlMza1VLbW1NUU91UmRBTVVtc1lO?=
 =?utf-8?B?Q3VKQ053NzE1TXBjVTMvUk5UMFJYVzhkQkJrVDRHQnpFRW1XU1d3cVFPNmRk?=
 =?utf-8?B?S1RKY0Y4U3Brbjdqc1pHeWRrRjdsVlF5QWhiV21kUGFVNCtXaFlJMUgxYUpR?=
 =?utf-8?B?SGUzU1RiSVR3ajZTTFFuZlRXcDF4MWlsa21IUFovQjllUGZrcnVjcTArWkV5?=
 =?utf-8?B?U1VBRWJtWGRXNENEa0RpZHVRQXduZFJwZGZoNGJ0QVA5cjNrQWo5OVluWEFv?=
 =?utf-8?B?aFZLRHYra3F4MVk0Z2FsRHluR1lMLytNdlk3WStOQjRub2xYeEtOMmlKRFZJ?=
 =?utf-8?B?a21mUU1VYUhrZllqZFZwa3RQcXlwNjF4WHlHWUw1ZHp2ZTh3ekhWNlJvdzB2?=
 =?utf-8?B?VnQyczJwcU4rckJzU0p6ZFRVaVhHeUZWYWlOcWFSSXRvSkVvdy8vTS95UFdr?=
 =?utf-8?B?bDFjVmhxeTZVUTRqcjMzQjlydCtTUTRSdXA1eEduOXRQU3NKNmFqREEwbkh3?=
 =?utf-8?B?NVkrMTZvQjRIZ0ROc0VOeFNSNFRicW5UeGlVUVYxZ3ZkYi9ndCtpTUJGcFV6?=
 =?utf-8?Q?/11EJgkxL3mcCvsITHtSq+A=3D?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: 4d23f9f2-2756-4542-5e9e-08dc4f47f472
X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 16:56:04.3799
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: dhdyC7EGQRT4K9hEG6cRHNymtW5NRlDkROSGmiM1vehvLXJTl70rTNQTw9/JYZbumO+R4M7VBmh/1EdTxsRofmtkrZmhrgLW9w33nKsIkKo=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB10147

The current interrupt service routine of the tps6598x only reads the
first 64 bits of the INT_EVENT1 and INT_EVENT2 registers, which means
that any event above that range will be ignored, leaving interrupts
unattended. Moreover, those events will not be cleared, and the device
will keep the interrupt enabled.

This issue has been observed while attempting to load patches, and the
'ReadyForPatch' field (bit 81) of INT_EVENT1 was set.

Read the complete INT_EVENT registers to handle all interrupts generated
by the device in a similar fashion to what is already done for the
tps25750.

Fixes: 0a4c005bd171 ("usb: typec: driver for TI TPS6598x USB Power Delivery controllers")
Cc: stable@vger.kernel.org
Signed-off-by: Javier Carrasco <javier.carrasco@wolfvision.net>
---
 drivers/usb/typec/tipd/core.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 7c2f01344860..308748d6cae6 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -637,48 +637,53 @@ static irqreturn_t tps25750_interrupt(int irq, void *data)
 static irqreturn_t tps6598x_interrupt(int irq, void *data)
 {
 	struct tps6598x *tps = data;
-	u64 event1 = 0;
-	u64 event2 = 0;
+	u64 event1[2] = { };
+	u64 event2[2] = { };
 	u32 status;
 	int ret;
 
 	mutex_lock(&tps->lock);
 
-	ret = tps6598x_read64(tps, TPS_REG_INT_EVENT1, &event1);
-	ret |= tps6598x_read64(tps, TPS_REG_INT_EVENT2, &event2);
+	ret = tps6598x_block_read(tps, TPS_REG_INT_EVENT1, event1, 11);
 	if (ret) {
-		dev_err(tps->dev, "%s: failed to read events\n", __func__);
+		dev_err(tps->dev, "%s: failed to read event1\n", __func__);
 		goto err_unlock;
 	}
-	trace_tps6598x_irq(event1, event2);
+	ret = tps6598x_block_read(tps, TPS_REG_INT_EVENT2, event2, 11);
+	if (ret) {
+		dev_err(tps->dev, "%s: failed to read event2\n", __func__);
+		goto err_unlock;
+	}
+	trace_tps6598x_irq(event1[0], event2[0]);
 
-	if (!(event1 | event2))
+	if (!(event1[0] | event1[1] | event2[0] | event2[1]))
 		goto err_unlock;
 
 	if (!tps6598x_read_status(tps, &status))
 		goto err_clear_ints;
 
-	if ((event1 | event2) & TPS_REG_INT_POWER_STATUS_UPDATE)
+	if ((event1[0] | event2[0]) & TPS_REG_INT_POWER_STATUS_UPDATE)
 		if (!tps6598x_read_power_status(tps))
 			goto err_clear_ints;
 
-	if ((event1 | event2) & TPS_REG_INT_DATA_STATUS_UPDATE)
+	if ((event1[0] | event2[0]) & TPS_REG_INT_DATA_STATUS_UPDATE)
 		if (!tps6598x_read_data_status(tps))
 			goto err_clear_ints;
 
 	/* Handle plug insert or removal */
-	if ((event1 | event2) & TPS_REG_INT_PLUG_EVENT)
+	if ((event1[0] | event2[0]) & TPS_REG_INT_PLUG_EVENT)
 		tps6598x_handle_plug_event(tps, status);
 
 err_clear_ints:
-	tps6598x_write64(tps, TPS_REG_INT_CLEAR1, event1);
-	tps6598x_write64(tps, TPS_REG_INT_CLEAR2, event2);
+	tps6598x_block_write(tps, TPS_REG_INT_CLEAR1, event1, 11);
+	tps6598x_block_write(tps, TPS_REG_INT_CLEAR2, event2, 11);
 
 err_unlock:
 	mutex_unlock(&tps->lock);
 
-	if (event1 | event2)
+	if (event1[0] | event1[1] | event2[0] | event2[1])
 		return IRQ_HANDLED;
+
 	return IRQ_NONE;
 }
 

-- 
2.40.1