From patchwork Mon Apr 29 13:35:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 793282 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2111.outbound.protection.outlook.com [40.107.7.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4853C70CAA; Mon, 29 Apr 2024 13:36:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.111 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714397776; cv=fail; b=KvqtDJkXN5zLnBCs0u65dz/Yw2RHUZvBsxteqi7s2kjP5Y5+x2HoR+MAvbhu8lvTFL+wRMOZml9MXabqHELgbEpqS3BLE9zTi7ZlBBmrVlzmI7T5O/5kRO/5pccT6puXapcXHSM3MiSoiVxlCuV76tfFTw83qDavUHkQrtN04Kk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714397776; c=relaxed/simple; bh=mPz17j8a4IHEa0xQ3LIdo6bFeELnHmA0q6rbRgSPqyc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=BwnUTMtdhi98L4HOeJTxw2Wyav0VzIoKryrFSOkdhT4Z+GcbHo9JqTXZvkJp25GQXZI4YdpcTffLuXrWmsWRDW8CmwEj02JjNuN+rvVQZTd6AhvOiTmtwJur8U2/cF/8u99sbFgZdT0VRdQr7hp3DgImNEKnRGg1Dbjuub5bAig= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net; spf=pass smtp.mailfrom=wolfvision.net; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b=cF11eXIJ; arc=fail smtp.client-ip=40.107.7.111 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b="cF11eXIJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tb6tKmkrUONOxqwVdaJAuQpbiZI/H1F6kYs9i9TErdG7ULjUrAWj069lErpyTDVRROP109jR5Lp0xLXkgWclL4vblYVUREaxDLkT8zGHaJYN2TXmtOPEmewrsUsURD9Z9P+TbwhXVK0mGP1cnnhjQ+vul6dWZRn9i47la7t/T2xVp4/QWPaZGhb0BCw8Cb6pJOza9mj0GOLT0u4W1iF9XzkkbUK3iVaEj4lvex6dJwpmZV0lZPLojLd15vI22CY6IpU4eI7s142LVX+Mi8fOiis7Xz/MAGHF3i332GQOhsXznUxZeY6AFgL0gYbuDOotHVYGT+FvQdGu5ZPy4TtH+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ncjrC3kUTsgVty4+sjzIsJ+cO+ZALoxrpo3b3eMhqM0=; b=ny2eep901htm7oFbrQVtp+5sbVsBZfndimNNer2Y7jD22S7TRbYcLQ+I6yicAAB5tsVZRB7g5P6Sj5hAx+T5M9tXfr06su/cWk+pQOZ9JMtfl6GaKobf4eMI2JAnO4K8ttTLHNOLKvCSgEqcGnvC0KZDvLihnPuZCreDuBp2vFD2hndfrYdzZptM5fjfWIYeU1/Ivnpsgnw5v2qr2HPScgMKwG59uuSRRILE7P2m3YAqQmBXa4voGz17/klnXokEN1KnBPVlDQU70T0LWaO4SBoxtafxmGIUkjkt7faBs+15Zpve1we+beTvSozzU+sq+krmZ182+N+XVgfgZwsERQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ncjrC3kUTsgVty4+sjzIsJ+cO+ZALoxrpo3b3eMhqM0=; b=cF11eXIJ+bxHWzp+HZwrWsTWqY8lwQdN07RaM49c1/+eCj0mV2zIMZZs4YxPpTu180R1iGsQbhC+CGUbOBzTeCOwllssJqXUT4cHa3evxWsvjP52gzYaAuBaGB3lGUD/SpaQdHLNyKqj0Rr3mAYC+SsHLUZi40oePtyJof3unAc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) by AS8PR08MB6087.eurprd08.prod.outlook.com (2603:10a6:20b:29c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 13:36:11 +0000 Received: from VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::6621:68a6:ab00:c040]) by VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::6621:68a6:ab00:c040%6]) with mapi id 15.20.7519.021; Mon, 29 Apr 2024 13:36:10 +0000 From: Javier Carrasco Date: Mon, 29 Apr 2024 15:35:57 +0200 Subject: [PATCH v3 1/3] usb: typec: tipd: fix event checking for tps25750 Message-Id: <20240429-tps6598x_fix_event_handling-v3-1-4e8e58dce489@wolfvision.net> References: <20240429-tps6598x_fix_event_handling-v3-0-4e8e58dce489@wolfvision.net> In-Reply-To: <20240429-tps6598x_fix_event_handling-v3-0-4e8e58dce489@wolfvision.net> To: Heikki Krogerus , Greg Kroah-Hartman , Abdel Alkuor Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco , stable@vger.kernel.org X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1714397770; l=2021; i=javier.carrasco@wolfvision.net; s=20240320; h=from:subject:message-id; bh=mPz17j8a4IHEa0xQ3LIdo6bFeELnHmA0q6rbRgSPqyc=; b=zm/dkARaTTq5ui496GhXZdoMyCKpZqc6SvpP0mvKOdmivcIgsvJC/Xfw/mAypt+SEmEaG66mV tA42EgNcm98DehkhDIJv9MiTtIXqcXOQ4+HkhIg9idWqukNcEwoP07M X-Developer-Key: i=javier.carrasco@wolfvision.net; a=ed25519; pk=Vxk2/0sGIxM8rsKnceszFuSuHVfQwa1Yo8+is7BX2nY= X-ClientProxiedBy: VE1PR03CA0005.eurprd03.prod.outlook.com (2603:10a6:802:a0::17) To VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR08MB4974:EE_|AS8PR08MB6087:EE_ X-MS-Office365-Filtering-Correlation-Id: dada9d60-776a-4daa-8b8a-08dc685154e0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|52116005|366007|38350700005; X-Microsoft-Antispam-Message-Info: =?utf-8?q?lAeYfhS390oooNSmdpjrVlb3hDI0RGK?= =?utf-8?q?GxTdMTLPSkafBI21pAN0/c1o1H7kKj3B7eDVbp8pgDyBIIPwF/RH+foVElZ0h0azG?= =?utf-8?q?5Z7RGOCOifiCIdt+suVnroh+cCY17E6Ujr7oUpV8oHJUo8ScfdlKCO9e7e3njw6oZ?= =?utf-8?q?mx+usSQlz8y1YRht8w3TW7rGnkHQDf0tAZHdeqHwrKbkWxldfx6b9L2CPcXAc6VgH?= =?utf-8?q?3HmIrCKONlzckUuX8i9uzndmefKIz3mYj0BKjezE2+VzJAuWUOQvMcaNAwvLRMYTY?= =?utf-8?q?TmHF5aLnyvo7xCPMipYKKJuZPOnnTdiV0lPyys75kZsde9F9p7OPmMdr6bUUivcF7?= =?utf-8?q?hoCXQGpAOdTJZ2a4oLElNLItQrdCw26KAAcC0ZtMnI410FZsD7IR8KhTu0I7zULts?= =?utf-8?q?JKyL0pm50/k6yUA6FK/rKW4DLNOfUcrswHnywFjYASTHCTBfkbjpaOmhF9KhBDaBX?= =?utf-8?q?xxOWNdP64bENsu123WLdiyAfmYpTUvD6ZxEDc5SuruBMuaRnvGslvGNuhpvyRWlGc?= =?utf-8?q?A7RH3BW/TkQcByrVtjvLILz4WanyukxUehTUWErgFnR/HYN9nruwzeS489W2qUBq5?= =?utf-8?q?K57AbCRpITY2/+K2TlOFLTW+lqXDl1XnheOfqAhskiXDUw2PEe7eXc5so8dqEAwQc?= =?utf-8?q?pO9qZzNaW3v9aVLyxf6OZnHDam21B/y2i8UmLuJkCLhP9BXNc5ixVuWDnjlQI8eAe?= =?utf-8?q?x4FP/pJnNYkn46RQJ6LWT6lzFeOz28V5dv9YuHmHxsaWdtnkpvLnGTaCszUA17PxT?= =?utf-8?q?YjY2KepSE4zq8XrIfeDjUMZ3P8dLiMBA6sTBRBlOkJBdwCBD0Voe9IrhX2XDz1XSY?= =?utf-8?q?pmJ6sq7YTAbpqrw5hRxORm1rpqYYQVQoI1dD0/QhZ5uIzYEFwGEAiCUlUN7JuhWTa?= =?utf-8?q?XY3PhFbm/bh/7IO5KawC0Ri6KRjwq79gh8KVWysaeOV3D7jM/xea+aYpMWoro0jgH?= =?utf-8?q?UvXABWGscBo1QGf0IwtCky+6Eck+zZ6ANaxYESBoCsjIGwD7AlxTAu5sJSoxn073k?= =?utf-8?q?+7awemrVADl7mn3ZYPn0Wy4a41V99o55zURiIXoRFkgHyfA81Cu30jUNSTRDg/ZRi?= =?utf-8?q?ETirjvI6evJC/XZ3ykui3vgGCplopisyXOebxBA8hilsSXu2HXb54mRINrMkjFF0B?= =?utf-8?q?GRqSNzDUnSnCAfQfR2m0MIqMxvDATwshnApt38fvVzMTaBgSNjKU1JXuolMWPJffq?= =?utf-8?q?qKU61EG2Q2IpB0yXcugmrgchNI1zCG/Mm09i+gbrWzZypmhSYA1QLsD6VMANGutQF?= =?utf-8?q?yC6LmuNc3mpC6KSmAbp7Hn+e+WzQZny1A/w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR08MB4974.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(52116005)(366007)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?5HahmmXtEpc0N0/jLRWedO+Nvos2?= =?utf-8?q?/Yy6NymedR+uFn+4oxfamm0nv/xOkfdY8LYZ7Zu8eiSL0M4URAZsa2VBZ89mFg5EX?= =?utf-8?q?ViS2rm65PI97WnxQA4bifJuTEJpL4F1DcQMzUQk0B7v5BIHOOHoLWrZ+Ob8jtXy8K?= =?utf-8?q?hmTNH/6De8yPBB24IuVVYq/x+oSHnbk3+CbO8OiIA8eDTPev/KXF8wIDunD3XaKCF?= =?utf-8?q?gImTp5XenNqTZPJPm74agdar8IMqOGCPbGuKugY+XjffTmMgAdT6nNhLmnxaju+LB?= =?utf-8?q?jbuRkqaFeVlSBiBHd1BON/k2WWR78QdeOpnGbHS31r9HHmXcVOiGdb3OlMDKfPBmR?= =?utf-8?q?MXTwfEgpsFZQTKvBKaY4ZeNxGNY3hhfP0xEhDK47xMkANyEUGUx7fEdmrzxjmCjVV?= =?utf-8?q?x/1wTB8rNiNkFW0ke+rFw9kpbNkLePYE4bENMJ5ja7sasLFrY9QeQA4qwv56gYpvB?= =?utf-8?q?yxeEedoKq6wx8JbP6FLIEnEsHJav1leVNtTK/hNrw7aWYS6xIoJGUeKQq4LQv3Hwk?= =?utf-8?q?kdhUduwrABj6FU22CmPXMuB/Y/rhbz+weyfp/KoDgX8gg/81hY4P0DT6NKKOvxaRe?= =?utf-8?q?vumn7zFe7Dsg/E5SQyokn9YnACF4Bi1geNJEOjQuSf5GNzxNRVuvY2cd4xjX6sCTK?= =?utf-8?q?V0c0EclRnO/pwtU6hYaFW4jA4wd0yAu6EXKaPsb2+4CUIwTEPdfj95mW8RUBoagXi?= =?utf-8?q?/Qg2QzAEg5fCL4V5H0iX31GQALt9KuavixOToq9Z871C6oKtVKM+mbGT+fcj+5HiV?= =?utf-8?q?1vvOXLYgoDR0o+h7OZKAaJNgC6uJcmsypsq3cjO49BzCD8y4y13qGjs47wbGJBfNS?= =?utf-8?q?jL8eSxWpMoPkTG4rHLywafnw82cnJ9vUwv/xTmxRfUlczWrSrkdlXsuoVPVaTIfaP?= =?utf-8?q?v7FMRPL5jmQE5cYB6MPJJWvNtXpDptHAYcInNwl1oKmlzWGKHVeRQoS4gDFQLhclI?= =?utf-8?q?6+btp+8freMIds4zh3lBfqMoWfL0FnUBeSsXjlXs2UByNz1JLdYaqJIHUQkcuZ9mh?= =?utf-8?q?39UdfhVjxGCMaCNOgqQ4p9MkpmsEAowpCUBtsxpeenA3Ld/c08Gss1HK3scvc4VY3?= =?utf-8?q?aguXhDG9K9Ox7u7ftBgV0U4g13rs24O49bCG+eZMishO3A+o0+6ZVYzDNDXioQl5w?= =?utf-8?q?aQQM5dZa/N0JWOiu0OsgZcp6YuNy1wFdxOBHCBo0jDyWG3NOg3OLZb9LswFSOxU1v?= =?utf-8?q?FY4SuCLiOJXhKuuIkyHNg2kV1LcVBRy+EbKVYAeBH0UcKTBfOpKeMgtC4gpusQ86/?= =?utf-8?q?SNd3UwwIZpXrVNoXQKc/tXWj0gbYFsHrpMXS5aNuIMMc5I4uxbXUkHio2Ik9FoWNa?= =?utf-8?q?O4oUR2UGfeeipwfEz3gSRNrPbrcLO2/ZU6LVoKCIJ41jYlP1C/aWWw2jYKYumYhB7?= =?utf-8?q?/VkI9y2lVmf8fvbxB0aTIMUqUXmK5ZTgEanQnbymecNY2M1F9EOnzzq16PoAXffhS?= =?utf-8?q?/Lul+kpyZmx+pdSwSQv1xyArUpPOQp4ufJ5s2o6ome4J4NUCtv81/ME5DxPDJ2qZH?= =?utf-8?q?8+VukcxUgumZmNwGaYeAvxhrMmosckse74+3eHVi+cwxaEm5/wvnaU4=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: dada9d60-776a-4daa-8b8a-08dc685154e0 X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 13:36:10.6985 (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: Z3T0eUb2Ti6bdIFRkyjXXEzAVQNrKic49/vdvbBXWufbDpoeX4gsHv4mkAvG9LJFhjTeZFjKncW42l5oHhmgRUDfSCfUi/LRWptaam9bwR0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6087 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: 7e7a3c815d22 ("USB: typec: tps6598x: Add TPS25750 support") Cc: stable@vger.kernel.org Acked-by: Heikki Krogerus Signed-off-by: Javier Carrasco --- drivers/usb/typec/tipd/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index 0717cfcd9f8c..7c2f01344860 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -604,11 +604,11 @@ static irqreturn_t tps25750_interrupt(int irq, void *data) if (!tps6598x_read_status(tps, &status)) goto err_clear_ints; - if ((event[0] | event[1]) & TPS_REG_INT_POWER_STATUS_UPDATE) + if (event[0] & TPS_REG_INT_POWER_STATUS_UPDATE) if (!tps6598x_read_power_status(tps)) goto err_clear_ints; - if ((event[0] | event[1]) & TPS_REG_INT_DATA_STATUS_UPDATE) + if (event[0] & TPS_REG_INT_DATA_STATUS_UPDATE) if (!tps6598x_read_data_status(tps)) goto err_clear_ints; @@ -617,7 +617,7 @@ static irqreturn_t tps25750_interrupt(int irq, void *data) * a plug event. Therefore, we need to check * for pr/dr status change to set TypeC dr/pr accordingly. */ - if ((event[0] | event[1]) & TPS_REG_INT_PLUG_EVENT || + if (event[0] & TPS_REG_INT_PLUG_EVENT || tps6598x_has_role_changed(tps, status)) tps6598x_handle_plug_event(tps, status); From patchwork Mon Apr 29 13:35:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 793281 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2103.outbound.protection.outlook.com [40.107.7.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DAD576402; Mon, 29 Apr 2024 13:36:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714397782; cv=fail; b=J3PBto5wcwFiJSmTy++QmGnLHiE4xH26ov2Ekig7e385Mi1/O5V+BsCcT+e1irFadqoCcbGuMuvS/nf+8xVHfuEMVW769i+dqbVtdLXHHEJfNnNyQRC3ukIAV3NYbWVxIlS4cGVvioB1e4QMVvlq5ANVYUFW7IsLpYomGQ4zirA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714397782; c=relaxed/simple; bh=bgOHDWll20OXbxbVCnkRidPFr3wlVbZXxMT8U2i82b8=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=EuRhSygEGzAdvuCigcDyruyxu1p6O+wg6JkVGpoDoLULvX0cAIrNOWODamGIxEplNMpNrI3DgZcf0u++QWwagP06Im/b7fD780LoPJoR0iE4P2awrnae5lm65dfcqTH7kea4QsKfTzhVA47ktLBOUaYJWZNammNUNFY6dwNcYRI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net; spf=pass smtp.mailfrom=wolfvision.net; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b=SqVmu+kX; arc=fail smtp.client-ip=40.107.7.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b="SqVmu+kX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KK62in1NjPVzAp1XayJBhqpH1YRag3qwPCBXMD2RSaH2a01Q7Qgt1jlgGVxTIwRfE+VJwkIGzU1tXMxLFJCANauDlRO9Sr23YNfUDMz9qt8YE6iWR5obpSmnJmMKxhZPbVPV57w3aDXJmfPvylTTYF+GulNgGbRXFSvRbgtUxaMm9rivu1hfFJ0QBHoz6mkDATQQbHjs7rD62/p5ipN53QC+jZY7ohAemcOVTBX2qIPqmfdawtdsFYAzieR6IRxFobzAX7lNNvkX9XOGm73hXn5YCpV7x8Frn1kzRso0B2gNJJq0Uf+l7rTSX1KCqIyzZq73h0sdqKJ2NA++8r5HIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gASvPyVMsR2M8oPAZmb+jwmiIGkcsvi1O5hbrVZn3wY=; b=FqUcdbx+0YIxIo6k4wyk3pqgnTmq934EwpjDuKFrZ5mtsMPxZ24O9oqZWnY1B6PGwC0vbgoSFBX4RPaAf8kNDqfyJQGSdKhMVt15KJ98ObjFMIidzXIrXN3XbCqNhE2Sg9v4OznMrzvbbWgX+fKCR8Up/wS61jS3h9OhC+A6rVQwCNJxT90/QaG8yHARk8R9UWSxH4Cusm8qCd2mB7ghQcXupTxWaPGwwg/OxwwVXK3BDqhsNiOSaDh1wtxUkCKFjXIo0idl+gtxNQONv8Xx2gUWLQ3O04wkhz5MEffH6NwVHYk5zDy6O01xX3Zt15PS3uRl5+FmMUtPrjcIsnscsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gASvPyVMsR2M8oPAZmb+jwmiIGkcsvi1O5hbrVZn3wY=; b=SqVmu+kXC3HC6F/UUcGe/X5FG39Pt/GPORlCBP5I+xUx/edubgN24ng+3R16X0gT6zCn1wDhv24tqNgOrDZuEF8bWiYwy3Le9Q8ePV1DV+6XYpwyL53XimjUc4TMRMxZEuHviKLjWLDasXK3unw1366n8FqhjKlUsntv8M0w5Ag= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) by AS8PR08MB6087.eurprd08.prod.outlook.com (2603:10a6:20b:29c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 13:36:11 +0000 Received: from VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::6621:68a6:ab00:c040]) by VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::6621:68a6:ab00:c040%6]) with mapi id 15.20.7519.021; Mon, 29 Apr 2024 13:36:11 +0000 From: Javier Carrasco Date: Mon, 29 Apr 2024 15:35:58 +0200 Subject: [PATCH v3 2/3] usb: typec: tipd: fix event checking for tps6598x Message-Id: <20240429-tps6598x_fix_event_handling-v3-2-4e8e58dce489@wolfvision.net> References: <20240429-tps6598x_fix_event_handling-v3-0-4e8e58dce489@wolfvision.net> In-Reply-To: <20240429-tps6598x_fix_event_handling-v3-0-4e8e58dce489@wolfvision.net> To: Heikki Krogerus , Greg Kroah-Hartman , Abdel Alkuor Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco , stable@vger.kernel.org X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1714397770; l=5423; i=javier.carrasco@wolfvision.net; s=20240320; h=from:subject:message-id; bh=bgOHDWll20OXbxbVCnkRidPFr3wlVbZXxMT8U2i82b8=; b=z3u4gdGc2Bv7xGUIeLJnRhDRcJ0D8jOUrRdSj8+UcsaXhAqgxXb42MF9KfqZlZz4aF4KT1Zec DDsqMzdgV9ABkZZNL9iBbO0uINbPIGMhL0aCZ+Zf4+zXyiqXGhIB+U1 X-Developer-Key: i=javier.carrasco@wolfvision.net; a=ed25519; pk=Vxk2/0sGIxM8rsKnceszFuSuHVfQwa1Yo8+is7BX2nY= X-ClientProxiedBy: VE1PR03CA0005.eurprd03.prod.outlook.com (2603:10a6:802:a0::17) To VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR08MB4974:EE_|AS8PR08MB6087:EE_ X-MS-Office365-Filtering-Correlation-Id: 35938dd5-6487-4789-53d1-08dc68515518 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|52116005|366007|38350700005; X-Microsoft-Antispam-Message-Info: =?utf-8?q?PkUfvzGO1ZKd5s7l+0hPqi246ThPxWj?= =?utf-8?q?zA8GlC9zKxwhnlgCyhxXxJB/fizIsdW7phtYHYmnLllPiIySnWFsHaNtpmp+M8A9F?= =?utf-8?q?gL9ZybbTMzVLeVHqIT4Cfnn5b2m41bq144c2Rx6DsviLDe2fu6Mc2mtAjTiJ2gTXD?= =?utf-8?q?PomlCenUMeHveV6hws5CGc/I+U6lwsdYJXY8CLgB1rcK3Znbl9sXsrrtOxr2ZQvWx?= =?utf-8?q?1KdrgCu1fMRHI7fAonrel86jls1gRsRUMkJSutELLmFO9H1G/ZKcZX0nCP4srkLqR?= =?utf-8?q?omLLIhh9eq1mB6St/2lT0tYaX3k/gWbRt7+yCSocmXdW6OyXw2DNwubvfwOo0UI1t?= =?utf-8?q?szWmx1ypjvG/15GrPf3erxtNir/kkXQ2zN0durTuuXhA0limuB441oab9W1o9qrvb?= =?utf-8?q?NDP5fDEEB61CqdgUTvxHTFWKA4HgRw5LwRajr9yajvaf72nQm5FrinnRuOlKy3+s/?= =?utf-8?q?7maZfoR1MnF84sFHNIcIaVKIr4W27TCTlkXQsC5BYa84fjRi/Ge2hpz0CXax4P2gs?= =?utf-8?q?xGi632qIK0vbnTWjNNllHIkmZa5/jfPEoBNRSgJTjLvBg5VZCObW4k6sI+b4m1XWO?= =?utf-8?q?stjNbPg7ioQQ5FU9AcwZqLKZJzW06wj+09qrkFvbspF0UECIYkrkcfy7B0fu+8VE0?= =?utf-8?q?XeAVPWJxVgjr5htleu1LdehRgYYoTavcoJqsxyjRqvYD2if33JyTAQ18WNuKRvCLq?= =?utf-8?q?xI4U9FP+Y4PQehmrb+H7nOSA9pHS5DavhevdP0DBd5bEYY/EA7czQjDgbNurbDsVt?= =?utf-8?q?dL7/hSJiiVg7A53SD6GljMf7dCjJCjSOpgxh2ZVVO77YvK0iRTLWSzA8hFdGoel2Z?= =?utf-8?q?bLIH4STnFgIq+TgDrM7gEwW+TgrSdOgk60eN9j1Qirf7gBAxqKhFMG+gPYYmOYAai?= =?utf-8?q?h80cdSdYNM8VPKsF94rf9wqXyb55BgxXFG+jBsnrWFu7edfYujQ3LzxfVtG0xsRBK?= =?utf-8?q?QEiOSlSzo/x1MeJA71B+EFLSU9MRnbVc3l3jGXK1xpDrSvpbc4hAJYx1FsITgaBN9?= =?utf-8?q?piyfOX10IR5pMRRQhSdM6iksPgs2snHNniV4rXSKCQdmyRY92WH70RfLowv3sL+Z6?= =?utf-8?q?Zh0BOI20uYRdWYU48cm69zpiyBs1LYFUBDS+zvNXfveBMVg0ROc7trNkBX+WjDtfm?= =?utf-8?q?FiO6/XCK8CbDgdCWZtvoHd3wlQbuVl00gc9VUnt5v9w/CQSCdOVvxCsaewa1OaV9o?= =?utf-8?q?6y/TCtbl0MJYOOfCPWct4v8r3T4CIFt+cqsg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR08MB4974.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(52116005)(366007)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?SuYY0qIgoahu8RrmE8K3ikkK8RT5?= =?utf-8?q?85p11e8QrvWkyNHVf8JwHZiLJCcsr6IUOeYmTXjXuyZo9hkvRSCe7O0R6EiAw3rGB?= =?utf-8?q?zV5wK6SbB4K54TVduMy/b2S6WzgOgVu7hwi9vuM6WWV4HUf2UpHjWWynnb4NZEJDq?= =?utf-8?q?3ioJBJeAJJo4bol7SzTIpj1pgK9hfI3R+vi650Wc4KgiwTwtUlWZLoTicJSSsFiZe?= =?utf-8?q?lwO2ctHLhM2546K5b7kp0MuLEPLcgqqU56Jp+SQHK1xUol1ffXaPLbyt+9Rcbj38g?= =?utf-8?q?/G1F+RPEVFkg9yGkwVi3TQ3rCxyAmjGMDr0TOhOofI6lxjZ5x9o69P8htDbVgjbsu?= =?utf-8?q?LsJlteifPqeW9l7qUQ4uDO7dgFvB1GD1dyjViTqdAxfAf33/iRx6aV2qtmOuJMBKN?= =?utf-8?q?vfvp4Eigvo0E50NWxQZLy5LsPdeLQXMaSaFDrbojXRNKYHCqJ6UvDMnA9+vZQJuc3?= =?utf-8?q?xgU3HLx7ELW1Sb1Z7WY2i19WNV741MH+Uk1juHrrm8yQOZChTrYEz6UDHt/ytHteO?= =?utf-8?q?714SZGfhcemKGorH40jPRVRRTGZj58tIDFLXMHZfzs4tsXN1FK4hplzJ82Z8/RkF9?= =?utf-8?q?VEacgMLPXEhxbs1y9a63cdwfn1fMkNrbE3OobPLzIS+KUFF66SlLXHMTRlnbCauu3?= =?utf-8?q?3rAuX6Q6hjpgFbgqnpQYLKQSLa0IcxBJ0SNQwe2PprEZ0XuLVCTmy6K4KV8SRPJBv?= =?utf-8?q?GRTwZDTyCUz9boLa7PzMrvKPu0h+ZjhUbdBle93h8LAyGn9wNlr3Y64wQpXLOwaLn?= =?utf-8?q?+atNCCKM8yoA6lMv/Pf3uaZDW/Dk/d82zHyYhqbjMzjZdudFZdVZL9MItEYf8rLLc?= =?utf-8?q?xXK2m0eHbqvG9nqVLu2nvzMk9b3Rm7kz5cIivgq22UNrtIhRIvG1TQZ8GFOw153+U?= =?utf-8?q?nD//0AYNX//38h2+4H531huymnzKPsUwQ+pSEPa6kTW4nH9/DXWrESXybywT6OCAb?= =?utf-8?q?WfcbzO6zkd1UvU6nGvPQPaX04y7OsMVr1p3hU0nDaNXz8U9n35/nZyWt86iTVOpMQ?= =?utf-8?q?kUT67rRQPkR1Npm/mo9w//kRSoHF8Nue5435gvdV5jOLK8dZK9+E2rfKVqZ379fo5?= =?utf-8?q?RqjphSDlGPcs6ci6hvUg2bEl1uGty608C5otP01GCzaXFPqYcDOaFZSsqVexDwAWP?= =?utf-8?q?7MXk93lQl9bohXaAHC5pIFJdJp9LcyyNTB86g9vEVfgid3DzEM7z42C3IgjtLYd0d?= =?utf-8?q?aRgMPHBBHsNCK66ABvvLUBtfRuifQV/bl8w8uVzaqqOqDdoql1g2hOWwIs2G26/SB?= =?utf-8?q?W5PRooJ/uxeDAlp4urMTRzN/6gbbwCITBdvY4FOJS5q5MYrbc0UBfa0+0pFPNV3EI?= =?utf-8?q?hTCssGP+kZS92qsJPR3x90hEzzxy+Pf9WWa5AuZDACPCkNeeu+ozk90vzCPhFmKTW?= =?utf-8?q?69j24+Xu38JEsvI/CIPjT0j64A0g5uwdiLbXFtr24cP4thfFopF9SJpAupsC1tGri?= =?utf-8?q?oQp5/uC025wnuEZ7HaAf4GNq6PtdhFd4MqchQTu/22A3udGzs30NI7WJfr/YXPGiE?= =?utf-8?q?4TwERxTy6gfBO5IRVMdbgEqzQ56XVmFhi2ZgVRG7Z2iWwkbPspg3Ehs=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 35938dd5-6487-4789-53d1-08dc68515518 X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 13:36:11.0973 (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: j94+CeNgWGtxS7o2fYqW/fC2YP5o3acYRQgJ86r+JzNulWA6HGnGqddaCrp0/rYhOhbg7BMWmlCItujdZTkLvUt9jX2n3xtVS2bDzPcmsNY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6087 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. Given that older versions of the tps6598x (1, 2 and 6) provide 8-byte registers, a mechanism based on the upper byte of the version register (0x0F) has been included. The manufacturer has confirmed [1] that this byte is always 0 for older versions, and either 0xF7 (DH parts) or 0xF9 (DK parts) is returned in newer versions (7 and 8). Read the complete INT_EVENT registers to handle all interrupts generated by the device and account for the hardware version to select the register size. Link: https://e2e.ti.com/support/power-management-group/power-management/f/power-management-forum/1346521/tps65987d-register-command-to-distinguish-between-tps6591-2-6-and-tps65987-8 [1] Fixes: 0a4c005bd171 ("usb: typec: driver for TI TPS6598x USB Power Delivery controllers") Cc: stable@vger.kernel.org Signed-off-by: Javier Carrasco --- drivers/usb/typec/tipd/core.c | 45 ++++++++++++++++++++++++++++----------- drivers/usb/typec/tipd/tps6598x.h | 11 ++++++++++ 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index 7c2f01344860..191f86da283d 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -28,6 +28,7 @@ #define TPS_REG_MODE 0x03 #define TPS_REG_CMD1 0x08 #define TPS_REG_DATA1 0x09 +#define TPS_REG_VERSION 0x0F #define TPS_REG_INT_EVENT1 0x14 #define TPS_REG_INT_EVENT2 0x15 #define TPS_REG_INT_MASK1 0x16 @@ -636,49 +637,67 @@ static irqreturn_t tps25750_interrupt(int irq, void *data) static irqreturn_t tps6598x_interrupt(int irq, void *data) { + int intev_len = TPS_65981_2_6_INTEVENT_LEN; struct tps6598x *tps = data; - u64 event1 = 0; - u64 event2 = 0; + u64 event1[2] = { }; + u64 event2[2] = { }; + u32 version; 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_read32(tps, TPS_REG_VERSION, &version); + if (ret) + dev_warn(tps->dev, "%s: failed to read version (%d)\n", + __func__, ret); + + if (TPS_VERSION_HW_VERSION(version) == TPS_VERSION_HW_65987_8_DH || + TPS_VERSION_HW_VERSION(version) == TPS_VERSION_HW_65987_8_DK) + intev_len = TPS_65987_8_INTEVENT_LEN; + + ret = tps6598x_block_read(tps, TPS_REG_INT_EVENT1, event1, intev_len); + + ret = tps6598x_block_read(tps, TPS_REG_INT_EVENT1, event1, intev_len); 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, intev_len); + 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, intev_len); + tps6598x_block_write(tps, TPS_REG_INT_CLEAR2, event2, intev_len); err_unlock: mutex_unlock(&tps->lock); - if (event1 | event2) + if (event1[0] | event1[1] | event2[0] | event2[1]) return IRQ_HANDLED; + return IRQ_NONE; } diff --git a/drivers/usb/typec/tipd/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h index 89b24519463a..9b23e9017452 100644 --- a/drivers/usb/typec/tipd/tps6598x.h +++ b/drivers/usb/typec/tipd/tps6598x.h @@ -253,4 +253,15 @@ #define TPS_PTCC_DEV 2 #define TPS_PTCC_APP 3 +/* Version Register */ +#define TPS_VERSION_HW_VERSION_MASK GENMASK(31, 24) +#define TPS_VERSION_HW_VERSION(x) TPS_FIELD_GET(TPS_VERSION_HW_VERSION_MASK, (x)) +#define TPS_VERSION_HW_65981_2_6 0x00 +#define TPS_VERSION_HW_65987_8_DH 0xF7 +#define TPS_VERSION_HW_65987_8_DK 0xF9 + +/* Int Event Register length */ +#define TPS_65981_2_6_INTEVENT_LEN 8 +#define TPS_65987_8_INTEVENT_LEN 11 + #endif /* __TPS6598X_H__ */ From patchwork Mon Apr 29 13:35:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Carrasco X-Patchwork-Id: 794083 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2103.outbound.protection.outlook.com [40.107.7.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AE4F74C09; Mon, 29 Apr 2024 13:36:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.7.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714397779; cv=fail; b=Nsfe7ettFa7ZdOrJHU670qInesU8v6r01K+ZZjbzV7+mRpQoa3t2/BIGk7XSXC0j9mK4zmfdWat+1FvX8MAj6gbmcyVWOL5XiYqlxK/s3ua2YTh8RM8LXGC8qaEakP6y8Ps/3BnlxEW5DfZU27YOjng0AhIGJ8xE1yDIeLWw5Ik= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714397779; c=relaxed/simple; bh=q4UvIumVFP5q+c4yFcY/2fIewoFcwcIboWMu/T5kPTM=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Ut4ubtDhF1g+Kbz8Thm5swEAF64SG5nwqj0TRuqUmzE10V490nICQ25YXxyfwL4DeuQQ2TUQmwt/rBJaiNBNuzIpvVNzlT8fBpuS+1Au1v8BtpIdetyKeBLtlaRbQSG34Ay90UHbMVjNtX5R+mEBRz2jRJkeQXHVYBxnT/7kcgo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net; spf=pass smtp.mailfrom=wolfvision.net; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b=uuI0Y/gD; arc=fail smtp.client-ip=40.107.7.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wolfvision.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=wolfvision.net header.i=@wolfvision.net header.b="uuI0Y/gD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iE9m1SZif8iFUztkUVkhLjRXzpPwv3fDs5lFaveBeEcPu3ZzryM1kqIu5YDucObZepNIQe035V5odEvrZPiZ6sAtvemCTAufarZ3AZHnwHSpVwOrA95DAzz8MS8shOZjpnmaNUAznhoITOYIqKaNFu6dnamI0tlIim1TsIi4lsLNw0ciqL1VGTyJ0Y+g1N3iIq+WyKxXXD5A7YPS4B5/4oR/Geh2eY1bAg1m3BYHL22C7IxQH2UmOl3h9z6mp/wSPndUePCkoR2yGP94lXJt/uVV90BUu61ZIH4uWvedpFgRskRvzSKT8bd+RNSgCcAwzhlwW2i/A+55WehmxmjSIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=utAkVU0RUYSHJMl20rCi1kQ8dNgRQicmHyxvIktcldY=; b=YgBvi3mcR1/HV2YmsaajUVqU+zG/hvmjjJ90O/rqmEX7k3VdYpmoKcVQ0gMlMZh0pdq0kZd6nh+RZ0aeIvAgHAzZpmJy40/izzSmXplQIDwrMOjxiPnQ9WuAdaawOMwTCzJnIa8PMXvHmzekqrrE0RhVRHT57c9PE9eKf7DU5Dkr6oMib5nApJg5WGSLZ19cSQZsDr7UNuYKfI8hjI9+8AGE1x/Y8rKSH1u+pNH2fHuGgKVilVA2ZCYvgtOxYSij+xdCkAWTWRawfzRqz9h1uuY85QJ5PZn7y+gqjYk6DA6P09Z5WsKij13dxdinoaLTOWpfIPCyY9LoV+ydRIuBSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=utAkVU0RUYSHJMl20rCi1kQ8dNgRQicmHyxvIktcldY=; b=uuI0Y/gDFFIMHL7wmNP5g6B9gixQYcd8q5sQk4bF4z5Q5kgd70Rn7769r4TyBUOjp70X9JU5+XMxx916UWn45EF1Ij1DE8fFBsg6ev2B5l3DqT+PA/Dt3VdZyTlo5w0+9KqZllWRINQvFhJbnslEeS3CAMdJeAHf3Nk0kB16KGM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) by AS8PR08MB6087.eurprd08.prod.outlook.com (2603:10a6:20b:29c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 13:36:12 +0000 Received: from VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::6621:68a6:ab00:c040]) by VE1PR08MB4974.eurprd08.prod.outlook.com ([fe80::6621:68a6:ab00:c040%6]) with mapi id 15.20.7519.021; Mon, 29 Apr 2024 13:36:12 +0000 From: Javier Carrasco Date: Mon, 29 Apr 2024 15:35:59 +0200 Subject: [PATCH v3 3/3] usb: typec: tipd: rely on i2c_get_match_data() Message-Id: <20240429-tps6598x_fix_event_handling-v3-3-4e8e58dce489@wolfvision.net> References: <20240429-tps6598x_fix_event_handling-v3-0-4e8e58dce489@wolfvision.net> In-Reply-To: <20240429-tps6598x_fix_event_handling-v3-0-4e8e58dce489@wolfvision.net> To: Heikki Krogerus , Greg Kroah-Hartman , Abdel Alkuor Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=ed25519-sha256; t=1714397770; l=927; i=javier.carrasco@wolfvision.net; s=20240320; h=from:subject:message-id; bh=q4UvIumVFP5q+c4yFcY/2fIewoFcwcIboWMu/T5kPTM=; b=ZZNF2iqO+9kezb5j0O2E1knqIkvkmF8v5qxtxlvmbrj2ylHO9CMDZHlh234dDEVS9xct+6VhX pa5yLtH6+ikCP+0V12VtpGyWLG1CFlgu6zjxnRDQJBCtX1BD0x7dy4R X-Developer-Key: i=javier.carrasco@wolfvision.net; a=ed25519; pk=Vxk2/0sGIxM8rsKnceszFuSuHVfQwa1Yo8+is7BX2nY= X-ClientProxiedBy: VE1PR03CA0005.eurprd03.prod.outlook.com (2603:10a6:802:a0::17) To VE1PR08MB4974.eurprd08.prod.outlook.com (2603:10a6:803:111::15) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR08MB4974:EE_|AS8PR08MB6087:EE_ X-MS-Office365-Filtering-Correlation-Id: 111cd21e-6f02-49a1-d541-08dc68515552 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|52116005|366007|38350700005; X-Microsoft-Antispam-Message-Info: =?utf-8?q?ACnntpcLY/lqUGdlE6HOJ8rKzCj9PGJ?= =?utf-8?q?KzYUQU8XjJ+BejjOt9mENtrQu6N4HLyOsmm7XSdTsqO+Eq/T6c5TVnI4PVod4Ods8?= =?utf-8?q?UiixAlTKaAAIbdBkgSUbzYMqSHaIENyVuv13V+cgFnvoss5uiwp2kA1Wm7DqIjPQq?= =?utf-8?q?DraMQrqAS9xAh/e0WOYj8Cd4f/VlIkN387oFoMyoORZKPcwKYPEo4tjBCEePNCs8r?= =?utf-8?q?t1+8RcHRNrCPlezdfu983Gmih4vkcUIIlUl2KMCdG3VN8gzfzjvFK+ytsYClcLL45?= =?utf-8?q?9lXVqCrY/fFP2TDfoW6vyzDy5V9JgZWQ2G4a+9sxIgMOpDbRFvG7RQKZ7opPktj7D?= =?utf-8?q?4Ge3Q1vcQ6P1WFHpzWCFj6MTdlb2BfoKDNldAQjH8fJOPEZiQCjXpg1b98rTB4q+B?= =?utf-8?q?Y3KeFFHhmwjHjPfpGhB4/w6L16lyOwZE3aew0XgQ5DQIgj/W+FFsxUylAT5tVdM5c?= =?utf-8?q?J+kVR1NwkX56gr5uQu0iGTO94HypmpOIlj26MueQszj0iOAqvE9U33kw7KwgNk/0E?= =?utf-8?q?JU4GFjpuUupTfPtDRHkM0qkEuHCPUu06Ord5WAey0h4dw3JL76IFEFuQrtrsX0MOe?= =?utf-8?q?HKzTaj9wa5u8QuADVHSg3Qvu9kDi6ednDef4eGpoAy0oweYKFQG4oEoHxNeDXgDvN?= =?utf-8?q?bFxv5VNFJJMe6Onuke0aCsk3Pw0eEqDLfSyrklmgQEVLVQA1pfzCWVyReeJ2OE4nQ?= =?utf-8?q?ySpTSmzVlfvGt2Qaz+AlZbVZKqNXp8+qcQ2kKZjAMR1PrtbcBnn3OZjLBoraRS4qn?= =?utf-8?q?hrZbwirU7fdUVcVaS9+lHijJyRypk2VRTSpZ5TMr2WoHZLwUIyxg4QhXQQbo+gl/X?= =?utf-8?q?MovZTw0so4w2L48MCK7qOnNW1gDeeFuqNzRQCsT9yr9LI6l+b4sY47WWkEpNOOUVe?= =?utf-8?q?DAzNCe7q276aDpj8wI01i4MB0vwGLmT0B/HnxLDjlze9iJtn8Zm+P6SUGbtV/q8xZ?= =?utf-8?q?FpR2eprOcmJJOIRmWnJdtNykFfSkXhA98YNctPEPjBfGwjStdWyjwQ1ZYeZQ6PETs?= =?utf-8?q?0Zn5xzMTKqltkxET6vC4nnG+QFtNqjtrnDV798GflmVKHCzWKZs9NNbTiTbJQ1QoM?= =?utf-8?q?UVGYy+cRDr1QzavU2J+xk1PFozQeVhTt4S3ukxUVooE4y/FK9pz+V+pUqQg5T0s2N?= =?utf-8?q?2GXIX0r4gpBk/zwK2sir6oXUVbxv3IbmOL9cCV8A/dY9PQC7EBDy3/Lbz60v3nnw6?= =?utf-8?q?GBrvPaVebzc/v+KrONs9OFfiAkGmD8yyZES+GnnxCBeMxQwJ8DIoZR2135f3p8uRm?= =?utf-8?q?8J4x/w00u5ChxmnyhbizK1sY+AYg+yN3TPw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR08MB4974.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(52116005)(366007)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?92ctmBjfcNjLwfnpKSHFqxVpAJc4?= =?utf-8?q?WQ9jAx53qQvUURO65J0a3iE5WTkF9vZNQLhdceNW96LrbwjB4wY8I4Wdycq4jBbf4?= =?utf-8?q?HlhTzdVJoRPr0iJsyswwRONYxJjFBrh1wDDzwgFd0l/GzGXYHdqmLHKIBAKalNWG/?= =?utf-8?q?N9hTyGJCB7CsfomRb8AyXtEv+l5S79OFdnHdnKBoeUGTXGMle4HBTBhmSOq50yAIY?= =?utf-8?q?i03WQcBeqcdI2LzT1Ewt0DQ8g8Pojkt3hqZxqzX/8VHkMvA8voaAn0jh3au/kuxAU?= =?utf-8?q?NcSim2Bvxt7bONzlRowpD9qdayNEBim9dZ51Kbjkow7+kGFK9l/0+9XyQ1X5XqIoU?= =?utf-8?q?bW/ac01/94xhZlRoiUxnhPSS++5iVf+Tjdy75W74W18q46HjbfU/AjFEq/mf7uN6G?= =?utf-8?q?8R/I9olA2YoOOVGs+BqPOnnXpA6WymvOOSFtLnrdQCBHCQeliqIvKlC0zamCKk8FD?= =?utf-8?q?55Sfg8lIsK17nBDZEU8YF9w2rEAXBar6WuQI1xVME5JqhPTwvUJ7OW2yP/T+SmPoU?= =?utf-8?q?J7WAq/lgBdhU0xOD6MLHw876pgd4bWSfyHKhZQLPt6+/BfCfCZGgxf3NOl6xNk6mh?= =?utf-8?q?Kk2pRlUsQdDeo5Qt5Ytcs/JDdM5ZUKl2wK//nKZ6Or4xT2MFIEm1x8JGcnl/r1OKt?= =?utf-8?q?cTL9/45avDZl+JEYkJ80HkMgVpY9alqnXHBkTLriLvV/eTRTdV1Y3Jf/T5mzrLRNf?= =?utf-8?q?2jZ7K3aZ363FnWXS3bHW7biwy3rwvtMLXH0IDOiNTcBDb9xX7abth6Tu+qhqUuapu?= =?utf-8?q?xe0nNkfUeFw5MIZBRzjempkT8/xat/Bq6Cu2EZ6m+MJYO+626bHI5xaEYjch4vKyG?= =?utf-8?q?Lflog+6ENgW13tAqVo6REa1BxKWNtUyov0PLSlh6wTUUopCFBfBD86HdS3GWZw4uE?= =?utf-8?q?Md6+Avtj0KMlg/nADkyv6OnRCbOl1HsTe30m3GnESW9xnzmMP3oHJuQFkNPD9Vrzf?= =?utf-8?q?Fmvh+mT5iSb8qj4KnKa7lgfcadUmvBcc/jztADgVvcv0UY2D6D0yuZ77Qwsf0IjCF?= =?utf-8?q?kJCultlaxikORtZqNyNMPq208K/skeAdWYDpqebzWj4SM9I1HqcPMvrnBCCFdgcie?= =?utf-8?q?p3zjwsotQVsAajnR+eioKl1gqmhKuW5thFQVUu3/3PUR1ksEJ5o2wusC+eyMF9X+f?= =?utf-8?q?PqVdkGNVz2iGbAZ83Ktf+WPwH8fD5iVYGuZIkh9ZDL0ggekMmfJeHi8r/Ow+08Yyb?= =?utf-8?q?7xPzE5bhwa1jZ8XcW2Zfkki8tdMks9D7jOlXu51ASdWQ+CtWUDrX0hJMLiV4ZyXqa?= =?utf-8?q?52OpXLbOVat13rCR2D4rTjhEwY1j7KcPgLWl/qcHVblZAW8EILEA3UwY//IuRHBLa?= =?utf-8?q?QZIAoc8aoH7zaTfE4xfAU6ujh9hnGoXiDZwZ39+uxTBHRp2ytJ5e9VQdc0Or5704Z?= =?utf-8?q?r/lxVd2idaeCTHNlQMyBLJXnje/tzdWbUvYKdFp/SciAJnBQFksL8WQEnlXXy4xP2?= =?utf-8?q?sqELxlySVpZCEW8daqkb16acwoYR85qUQALSTCGnP9dI1KWwsHaoHRg5k13/KoXvm?= =?utf-8?q?LzBz+nbvPcVj+KfzqRSOntllrl0wyElClOxJzDgTB6l4z5owUAnRb3A=3D?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 111cd21e-6f02-49a1-d541-08dc68515552 X-MS-Exchange-CrossTenant-AuthSource: VE1PR08MB4974.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 13:36:11.4096 (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: ZN2gDpkEJaPHEWGryp4Am9PHVgtP1P4bETuMaNbhBrSBVjgMQyG2Dvjxi3hRGJHCdVZcxmjCTnc7ln6LH9E8gUG0L62oj6JwIVbj71D065o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6087 The first thing i2c_get_match_data() does is calling device_get_match_data(), which already checks if there is a fwnode. Remove explicit usage of device_get_match_data() as it is already included in i2c_get_match_data(). Signed-off-by: Javier Carrasco Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tipd/core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index 191f86da283d..ad76dbd20e65 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -1365,10 +1365,7 @@ static int tps6598x_probe(struct i2c_client *client) TPS_REG_INT_PLUG_EVENT; } - if (dev_fwnode(tps->dev)) - tps->data = device_get_match_data(tps->dev); - else - tps->data = i2c_get_match_data(client); + tps->data = i2c_get_match_data(client); if (!tps->data) return -EINVAL;