From patchwork Fri Dec 9 15:56:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13069914 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C29DCC4167B for ; Fri, 9 Dec 2022 15:56:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230117AbiLIP4g (ORCPT ); Fri, 9 Dec 2022 10:56:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbiLIP4e (ORCPT ); Fri, 9 Dec 2022 10:56:34 -0500 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A0FE56162; Fri, 9 Dec 2022 07:56:33 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,230,1665414000"; d="scan'208";a="142845614" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 10 Dec 2022 00:56:32 +0900 Received: from localhost.localdomain (unknown [10.226.92.54]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 2F2F64010ADA; Sat, 10 Dec 2022 00:56:29 +0900 (JST) From: Biju Das To: Rob Herring , Krzysztof Kozlowski Cc: Biju Das , Greg Kroah-Hartman , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, Geert Uytterhoeven , Fabrizio Castro , linux-renesas-soc@vger.kernel.org Subject: [PATCH 1/4] dt-bindings: usb: ti,hd3ss3220: Update interrupt property as optional Date: Fri, 9 Dec 2022 15:56:20 +0000 Message-Id: <20221209155623.29147-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> References: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org On some platforms(rg: RZ/V2M EVK), interrupt is not populated. Update the binding to make interrupt property as optional. Signed-off-by: Biju Das --- Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml b/Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml index b86bf6bc9cd6..a1cffb70c621 100644 --- a/Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml +++ b/Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml @@ -46,7 +46,6 @@ properties: required: - compatible - reg - - interrupts additionalProperties: false From patchwork Fri Dec 9 15:56:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13069915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3810C04FDE for ; Fri, 9 Dec 2022 15:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230143AbiLIP4i (ORCPT ); Fri, 9 Dec 2022 10:56:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230136AbiLIP4h (ORCPT ); Fri, 9 Dec 2022 10:56:37 -0500 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 51EC160D1; Fri, 9 Dec 2022 07:56:36 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,230,1665414000"; d="scan'208";a="145648819" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 10 Dec 2022 00:56:36 +0900 Received: from localhost.localdomain (unknown [10.226.92.54]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 7DA984010ADA; Sat, 10 Dec 2022 00:56:33 +0900 (JST) From: Biju Das To: Heikki Krogerus Cc: Biju Das , Greg Kroah-Hartman , Biju Das , linux-usb@vger.kernel.org, Geert Uytterhoeven , Fabrizio Castro , linux-renesas-soc@vger.kernel.org Subject: [PATCH 2/4] usb: typec: hd3ss3220: Fix NULL pointer crash Date: Fri, 9 Dec 2022 15:56:21 +0000 Message-Id: <20221209155623.29147-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> References: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The value returned by usb_role_switch_get() can be NULL and it leads to NULL pointer crash. This patch fixes this issue by adding NULL check for the role switch handle. [ 25.336613] Hardware name: Silicon Linux RZ/G2E evaluation kit EK874 (CAT874 + CAT875) (DT) [ 25.344991] Workqueue: events_unbound deferred_probe_work_func [ 25.350869] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 25.357854] pc : renesas_usb3_role_switch_get+0x40/0x80 [renesas_usb3] [ 25.364428] lr : renesas_usb3_role_switch_get+0x24/0x80 [renesas_usb3] [ 25.370986] sp : ffff80000a4b3a40 [ 25.374311] x29: ffff80000a4b3a40 x28: 0000000000000000 x27: 0000000000000000 [ 25.381476] x26: ffff80000a3ade78 x25: ffff00000a809005 x24: ffff80000117f178 [ 25.388641] x23: ffff00000a8d7810 x22: ffff00000a8d8410 x21: 0000000000000000 [ 25.395805] x20: ffff000011cd7080 x19: ffff000011cd7080 x18: 0000000000000020 [ 25.402969] x17: ffff800076196000 x16: ffff800008004000 x15: 0000000000004000 [ 25.410133] x14: 000000000000022b x13: 0000000000000001 x12: 0000000000000001 [ 25.417291] x11: 0000000000000000 x10: 0000000000000a40 x9 : ffff80000a4b3770 [ 25.424452] x8 : ffff00007fbc9000 x7 : 0040000000000008 x6 : ffff00000a8d8590 [ 25.431615] x5 : ffff80000a4b3960 x4 : 0000000000000000 x3 : ffff00000a8d84f4 [ 25.438776] x2 : 0000000000000218 x1 : ffff80000a715218 x0 : 0000000000000218 [ 25.445942] Call trace: [ 25.448398] renesas_usb3_role_switch_get+0x40/0x80 [renesas_usb3] [ 25.454613] renesas_usb3_role_switch_set+0x4c/0x440 [renesas_usb3] [ 25.460908] usb_role_switch_set_role+0x44/0xa4 [ 25.465468] hd3ss3220_set_role+0xa0/0x100 [hd3ss3220] [ 25.470635] hd3ss3220_probe+0x118/0x2fc [hd3ss3220] [ 25.475621] i2c_device_probe+0x338/0x384 Fixes: 5a9a8a4c5058 ("usb: typec: hd3ss3220: hd3ss3220_probe() warn: passing zero to 'PTR_ERR'") Signed-off-by: Biju Das --- This issue triggered on RZ/G2E board, where there is no USB3 firmware and it returned a null role switch handle. --- drivers/usb/typec/hd3ss3220.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c index 2a58185fb14c..c24bbccd14f9 100644 --- a/drivers/usb/typec/hd3ss3220.c +++ b/drivers/usb/typec/hd3ss3220.c @@ -186,7 +186,10 @@ static int hd3ss3220_probe(struct i2c_client *client, hd3ss3220->role_sw = usb_role_switch_get(hd3ss3220->dev); } - if (IS_ERR(hd3ss3220->role_sw)) { + if (!hd3ss3220->role_sw) { + ret = -ENODEV; + goto err_put_fwnode; + } else if (IS_ERR(hd3ss3220->role_sw)) { ret = PTR_ERR(hd3ss3220->role_sw); goto err_put_fwnode; } From patchwork Fri Dec 9 15:56:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13069916 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4A4AC04FDE for ; Fri, 9 Dec 2022 15:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230273AbiLIP4m (ORCPT ); Fri, 9 Dec 2022 10:56:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230205AbiLIP4k (ORCPT ); Fri, 9 Dec 2022 10:56:40 -0500 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8A777201B6; Fri, 9 Dec 2022 07:56:39 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,230,1665414000"; d="scan'208";a="145648829" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 10 Dec 2022 00:56:38 +0900 Received: from localhost.localdomain (unknown [10.226.92.54]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id AE1CE4010ADA; Sat, 10 Dec 2022 00:56:36 +0900 (JST) From: Biju Das To: Heikki Krogerus Cc: Biju Das , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Geert Uytterhoeven , Fabrizio Castro , linux-renesas-soc@vger.kernel.org Subject: [PATCH 3/4] usb: typec: hd3ss3220: Sort header files Date: Fri, 9 Dec 2022 15:56:22 +0000 Message-Id: <20221209155623.29147-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> References: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org This patch sorts the header files alphabetically. Signed-off-by: Biju Das --- drivers/usb/typec/hd3ss3220.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c index c24bbccd14f9..666a93f7ec65 100644 --- a/drivers/usb/typec/hd3ss3220.c +++ b/drivers/usb/typec/hd3ss3220.c @@ -5,15 +5,15 @@ * Copyright (C) 2019 Renesas Electronics Corp. */ -#include +#include #include -#include -#include #include +#include +#include #include #include +#include #include -#include #define HD3SS3220_REG_CN_STAT_CTRL 0x09 #define HD3SS3220_REG_GEN_CTRL 0x0A From patchwork Fri Dec 9 15:56:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 13069917 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD28DC4167B for ; Fri, 9 Dec 2022 15:56:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229521AbiLIP4o (ORCPT ); Fri, 9 Dec 2022 10:56:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbiLIP4n (ORCPT ); Fri, 9 Dec 2022 10:56:43 -0500 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 430BCF008; Fri, 9 Dec 2022 07:56:42 -0800 (PST) X-IronPort-AV: E=Sophos;i="5.96,230,1665414000"; d="scan'208";a="145648838" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 10 Dec 2022 00:56:41 +0900 Received: from localhost.localdomain (unknown [10.226.92.54]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 81C414010EBA; Sat, 10 Dec 2022 00:56:39 +0900 (JST) From: Biju Das To: Heikki Krogerus Cc: Biju Das , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Geert Uytterhoeven , Fabrizio Castro , linux-renesas-soc@vger.kernel.org Subject: [PATCH 4/4] usb: typec: hd3ss3220: Add polling support Date: Fri, 9 Dec 2022 15:56:23 +0000 Message-Id: <20221209155623.29147-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> References: <20221209155623.29147-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Some platforms(for eg: RZ/V2M EVK) does not have interrupt pin connected to HD3SS3220. Add polling support for role detection. Signed-off-by: Biju Das --- drivers/usb/typec/hd3ss3220.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c index 666a93f7ec65..9894fa96cc5f 100644 --- a/drivers/usb/typec/hd3ss3220.c +++ b/drivers/usb/typec/hd3ss3220.c @@ -14,6 +14,7 @@ #include #include #include +#include #define HD3SS3220_REG_CN_STAT_CTRL 0x09 #define HD3SS3220_REG_GEN_CTRL 0x0A @@ -37,6 +38,9 @@ struct hd3ss3220 { struct regmap *regmap; struct usb_role_switch *role_sw; struct typec_port *port; + struct delayed_work output_poll_work; + enum usb_role role_state; + bool poll; }; static int hd3ss3220_set_source_pref(struct hd3ss3220 *hd3ss3220, int src_pref) @@ -118,6 +122,22 @@ static void hd3ss3220_set_role(struct hd3ss3220 *hd3ss3220) default: break; } + + hd3ss3220->role_state = role_state; +} + +static void output_poll_execute(struct work_struct *work) +{ + struct delayed_work *delayed_work = to_delayed_work(work); + struct hd3ss3220 *hd3ss3220 = container_of(delayed_work, + struct hd3ss3220, + output_poll_work); + enum usb_role role_state = hd3ss3220_get_attached_state(hd3ss3220); + + if (hd3ss3220->role_state != role_state) + hd3ss3220_set_role(hd3ss3220); + + schedule_delayed_work(&hd3ss3220->output_poll_work, HZ); } static irqreturn_t hd3ss3220_irq(struct hd3ss3220 *hd3ss3220) @@ -227,6 +247,9 @@ static int hd3ss3220_probe(struct i2c_client *client, "hd3ss3220", &client->dev); if (ret) goto err_unreg_port; + } else { + INIT_DELAYED_WORK(&hd3ss3220->output_poll_work, output_poll_execute); + hd3ss3220->poll = true; } ret = i2c_smbus_read_byte_data(client, HD3SS3220_REG_DEV_REV); @@ -235,6 +258,9 @@ static int hd3ss3220_probe(struct i2c_client *client, fwnode_handle_put(connector); + if (hd3ss3220->poll) + schedule_delayed_work(&hd3ss3220->output_poll_work, HZ); + dev_info(&client->dev, "probed revision=0x%x\n", ret); return 0; @@ -252,6 +278,9 @@ static void hd3ss3220_remove(struct i2c_client *client) { struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client); + if (hd3ss3220->poll) + cancel_delayed_work_sync(&hd3ss3220->output_poll_work); + typec_unregister_port(hd3ss3220->port); usb_role_switch_put(hd3ss3220->role_sw); }