From patchwork Tue Feb 18 15:29:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13980169 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E7F622309B5; Tue, 18 Feb 2025 15:29:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892580; cv=none; b=rxPh8PrCRTM4mvDQ/Wntf2TKDIFUhLRjv61ZZgp+DzTCJQdUhnX283PJtd0K5XgQM/K1/ElRmkLjJcJ/PC6AUyBm1GWGfU4UxHYorbJy2wSSQuvEOG8NRiWdC3Kho4mcSJn/j6JA4x3xQ1oyh6LB0u42PFNdm3TZP32fOid15Y4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892580; c=relaxed/simple; bh=sGfbobmv+MO11TXcaAQCUU3566O6HBRy+Pat48SZLhI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NqOdmttlUvc/QbEtzGANnfU/QPResU1RCVeFykL3OS5G4tbMemjzBq6qTTo/ACI/tKYjMfV2wXP8e5xk1QwhD5vIEiMiavu23OAfa7UR/UsUvehlggkkOb3f3qDuVKNrFcV4fqFoBpnYqbYmv0brJ5wuTAaa/U2RTnFTSVypveA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=civ8LLFD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="civ8LLFD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE822C4CEE7; Tue, 18 Feb 2025 15:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739892579; bh=sGfbobmv+MO11TXcaAQCUU3566O6HBRy+Pat48SZLhI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=civ8LLFDMzn6PYlTFI3a+5dJW2x+PVxdkmFF7ggR3rmQZpkbMOMbldDxK4+K1V6rM gaaanN1/jLTddwY1/QjLrUMucL/xssJNoAAhUiTBFNOyoh3npBp9pma8Bxd0sdb4yK dBDx2YCMYxtli+tthejl0aas8ECVl5Ic+J23shHHd63AwG/gxSJYXdus+ghrPnCWoH O7JiZkckIxIn5hXZ2d9c1T0p6XjVFqwwGpqIn1FClMQWpshnSI/2iJp+twCwxEKKN8 Qj4cjSQOWpKxmEZpKdAdse4g1eG9GIXXypEaZIlyYJJMAEZqWP/kh3F3+Kvoddb1sK pkmkpp/J0gB/A== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1tkPXg-000000005zI-122Y; Tue, 18 Feb 2025 16:29:48 +0100 From: Johan Hovold To: Heikki Krogerus , Greg Kroah-Hartman Cc: Abel Vesa , Stephan Gerhold , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 1/3] usb: typec: ps883x: fix registration race Date: Tue, 18 Feb 2025 16:29:31 +0100 Message-ID: <20250218152933.22992-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250218152933.22992-1-johan+linaro@kernel.org> References: <20250218152933.22992-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Make sure that the retimer is fully setup before registering it to avoid having consumers try to access it while it is being reset. Fixes: 257a087c8b52 ("usb: typec: Add support for Parade PS8830 Type-C Retimer") Cc: Abel Vesa Signed-off-by: Johan Hovold --- drivers/usb/typec/mux/ps883x.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/usb/typec/mux/ps883x.c b/drivers/usb/typec/mux/ps883x.c index ef086989231f..274de7abe585 100644 --- a/drivers/usb/typec/mux/ps883x.c +++ b/drivers/usb/typec/mux/ps883x.c @@ -346,6 +346,22 @@ static int ps883x_retimer_probe(struct i2c_client *client) goto err_vregs_disable; } + /* skip resetting if already configured */ + if (regmap_test_bits(retimer->regmap, REG_USB_PORT_CONN_STATUS_0, + CONN_STATUS_0_CONNECTION_PRESENT) == 1) { + gpiod_direction_output(retimer->reset_gpio, 0); + } else { + gpiod_direction_output(retimer->reset_gpio, 1); + + /* VDD IO supply enable to reset release delay */ + usleep_range(4000, 14000); + + gpiod_set_value(retimer->reset_gpio, 0); + + /* firmware initialization delay */ + msleep(60); + } + sw_desc.drvdata = retimer; sw_desc.fwnode = dev_fwnode(dev); sw_desc.set = ps883x_sw_set; @@ -368,21 +384,6 @@ static int ps883x_retimer_probe(struct i2c_client *client) goto err_switch_unregister; } - /* skip resetting if already configured */ - if (regmap_test_bits(retimer->regmap, REG_USB_PORT_CONN_STATUS_0, - CONN_STATUS_0_CONNECTION_PRESENT) == 1) - return gpiod_direction_output(retimer->reset_gpio, 0); - - gpiod_direction_output(retimer->reset_gpio, 1); - - /* VDD IO supply enable to reset release delay */ - usleep_range(4000, 14000); - - gpiod_set_value(retimer->reset_gpio, 0); - - /* firmware initialization delay */ - msleep(60); - return 0; err_switch_unregister: From patchwork Tue Feb 18 15:29:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13980172 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4731826B978; Tue, 18 Feb 2025 15:29:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892580; cv=none; b=gzOwjqBxa9JHNmgB2nTENIauyMmLAWwRuEgm3hATlR5tfRyyksR2dTaOPT9gebwruypc/nBwQomzCbcK9EehJAWdbYlOnT7M/kUZ6gkI88wwQjQycY+o2ArOzigSaXpzpO2bpRai+Y3cVFMzsvEVWzPfq6HLNU0MhS2zJLGqDX4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892580; c=relaxed/simple; bh=N1ayEV7sL5Sq3gWnWdmX3KdAdqSXVHGCkXIl9Q1DMfI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oHL99KQiTyvm1uYMuYQz930myuch9wfCB4xZ1DBuhMB9aPXMD7wg4lXfZEZWzY3YjNtu7zFe3dxuaeBzPDm5Anov2c6wPJRjpGFmAcxLGSLNS8KCXEspP1yW1OTZC4rf51aDnvG71qTmZMkmh6AASiScnE8dE3iDAo8Z7p26+oI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eFW7hUdC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eFW7hUdC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C24E4C4CEE9; Tue, 18 Feb 2025 15:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739892579; bh=N1ayEV7sL5Sq3gWnWdmX3KdAdqSXVHGCkXIl9Q1DMfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eFW7hUdCmnmH2YimY9U672MtcYiBUQiQilqowPAGeLQJrC1yuddIJQRRlQCozkugE mkfrI/kfPMXpYiLIvBAMd7wY0D7hMVMjucrO5psDXFlIaCJ3dtszLcfPIEkeT+wRHr Yua9VfFBTNU+N8AKaGZChhvPZIqlFDgflu0m2zGsJO/8xhya4rEKU/l5KFkwMDeWMM hLyzDZCCXNxeUV5vjNrHO4/xcj962tmDuCRgArx9WUIiVYLEPfaAz7Hpr9ZbbR4Sii mE4o4Lt2GYBbRtAoMAeJja8fawYoVzmaDoSPvwT19gMSsW3Z3s0XNaswKdXm/ql9fL 16b+K00UgF7Gw== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1tkPXg-000000005zK-1RoY; Tue, 18 Feb 2025 16:29:48 +0100 From: Johan Hovold To: Heikki Krogerus , Greg Kroah-Hartman Cc: Abel Vesa , Stephan Gerhold , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/3] usb: typec: ps883x: fix missing accessibility check Date: Tue, 18 Feb 2025 16:29:32 +0100 Message-ID: <20250218152933.22992-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250218152933.22992-1-johan+linaro@kernel.org> References: <20250218152933.22992-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Make sure that the retimer is accessible before registering to avoid having later consumer calls fail to configure it, something which, for example, can lead to a hotplugged display not being recognised: [drm:msm_dp_panel_read_sink_caps [msm]] *ERROR* read dpcd failed -110 Fixes: 257a087c8b52 ("usb: typec: Add support for Parade PS8830 Type-C Retimer") Cc: Abel Vesa Signed-off-by: Johan Hovold --- drivers/usb/typec/mux/ps883x.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/usb/typec/mux/ps883x.c b/drivers/usb/typec/mux/ps883x.c index 274de7abe585..f8b47187f4cf 100644 --- a/drivers/usb/typec/mux/ps883x.c +++ b/drivers/usb/typec/mux/ps883x.c @@ -291,6 +291,7 @@ static int ps883x_retimer_probe(struct i2c_client *client) struct typec_switch_desc sw_desc = { }; struct typec_retimer_desc rtmr_desc = { }; struct ps883x_retimer *retimer; + unsigned int val; int ret; retimer = devm_kzalloc(dev, sizeof(*retimer), GFP_KERNEL); @@ -360,6 +361,16 @@ static int ps883x_retimer_probe(struct i2c_client *client) /* firmware initialization delay */ msleep(60); + + /* make sure device is accessible */ + ret = regmap_read(retimer->regmap, REG_USB_PORT_CONN_STATUS_0, + &val); + if (ret) { + dev_err(dev, "failed to read conn_status_0: %d\n", ret); + if (ret == -ENXIO) + ret = -EIO; + goto err_clk_disable; + } } sw_desc.drvdata = retimer; From patchwork Tue Feb 18 15:29:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13980170 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4739026B97A; Tue, 18 Feb 2025 15:29:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892580; cv=none; b=ubaXwu7wnrjQ9v/4U4PWesQQfpN2haguZBPizu5G04j+4wmO/QuuGvG5TfnCcc9Qr4xXXl8lrRkr2UMTDuHKFKBHc52lP9JS2PEsOUCf5dbhJ7VEWGijf4EB3u370eNPc2OjPT5gYvGFVkWa/WgyfMJitgUIQFv3k5b2QpcYXes= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739892580; c=relaxed/simple; bh=0PhbzpB9u8D3S2MXUBj+nfqwYX8xKnp3orMPWwddbMY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iKNZNsdHxfqXPUnoUVlnxsfiagIVsTs1px0NuXpijLjW2zF7/nR9Nz82guJdO6TenO6WR6FzwTY3FJCJi/THsy1umzLvK9Z4msEejYiVbpsQPPGROHOnRIV0CocEy4kxbGgfMsuemjJdbVeRv6+yxVI9yoixf+TdELT9R6yEwmY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uujVYSSf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uujVYSSf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9640C4CEE8; Tue, 18 Feb 2025 15:29:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739892579; bh=0PhbzpB9u8D3S2MXUBj+nfqwYX8xKnp3orMPWwddbMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uujVYSSfLTqej3fODQzZaSya4QDk7isjWVEORPkqZ5q7SgP+StLcrwOCJVYszTUZ8 khZAvFXYc67CEd+UQ0kHRk7g1R+woLRHq9j73t8d7ii/oeYgFR/24z//7EfOQfEK3d RQZgUbKZnj1QsLjxw/IRwwJM4Hu9RqRCp8VmD1uaP/nlfNsIQD1/QxE4OQRBIt3spe 2Hp1emlv2v2WCIfv+he9NhlqIOe9MdkXgPvXPPjPpXzMewkYd4qQwUryvrKSn0Pa/L FSvSQM/cY7os9XSsTOt+NJtMvf3tm+0xG1hVckWwd/W8YAuR9dDACPOTNV1vMSu6Dl CLivnd8WUwwHQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1tkPXg-000000005zN-1p2N; Tue, 18 Feb 2025 16:29:48 +0100 From: Johan Hovold To: Heikki Krogerus , Greg Kroah-Hartman Cc: Abel Vesa , Stephan Gerhold , linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/3] usb: typec: ps883x: fix configuration error handling Date: Tue, 18 Feb 2025 16:29:33 +0100 Message-ID: <20250218152933.22992-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250218152933.22992-1-johan+linaro@kernel.org> References: <20250218152933.22992-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Propagate errors to the consumers when configuring the retimer so that they can act on any failures as intended, for example: ps883x_retimer 2-0008: failed to write conn_status_0: -5 pmic_glink_altmode.pmic_glink_altmode pmic_glink.altmode.0: failed to setup retimer to DP: -5 Fixes: 257a087c8b52 ("usb: typec: Add support for Parade PS8830 Type-C Retimer") Cc: Abel Vesa Signed-off-by: Johan Hovold --- drivers/usb/typec/mux/ps883x.c | 36 ++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/drivers/usb/typec/mux/ps883x.c b/drivers/usb/typec/mux/ps883x.c index f8b47187f4cf..ad59babf7cce 100644 --- a/drivers/usb/typec/mux/ps883x.c +++ b/drivers/usb/typec/mux/ps883x.c @@ -58,12 +58,31 @@ struct ps883x_retimer { unsigned int svid; }; -static void ps883x_configure(struct ps883x_retimer *retimer, int cfg0, - int cfg1, int cfg2) +static int ps883x_configure(struct ps883x_retimer *retimer, int cfg0, + int cfg1, int cfg2) { - regmap_write(retimer->regmap, REG_USB_PORT_CONN_STATUS_0, cfg0); - regmap_write(retimer->regmap, REG_USB_PORT_CONN_STATUS_1, cfg1); - regmap_write(retimer->regmap, REG_USB_PORT_CONN_STATUS_2, cfg2); + struct device *dev = &retimer->client->dev; + int ret; + + ret = regmap_write(retimer->regmap, REG_USB_PORT_CONN_STATUS_0, cfg0); + if (ret) { + dev_err(dev, "failed to write conn_status_0: %d\n", ret); + return ret; + } + + ret = regmap_write(retimer->regmap, REG_USB_PORT_CONN_STATUS_1, cfg1); + if (ret) { + dev_err(dev, "failed to write conn_status_1: %d\n", ret); + return ret; + } + + ret = regmap_write(retimer->regmap, REG_USB_PORT_CONN_STATUS_2, cfg2); + if (ret) { + dev_err(dev, "failed to write conn_status_2: %d\n", ret); + return ret; + } + + return 0; } static int ps883x_set(struct ps883x_retimer *retimer) @@ -74,8 +93,7 @@ static int ps883x_set(struct ps883x_retimer *retimer) if (retimer->orientation == TYPEC_ORIENTATION_NONE || retimer->mode == TYPEC_STATE_SAFE) { - ps883x_configure(retimer, cfg0, cfg1, cfg2); - return 0; + return ps883x_configure(retimer, cfg0, cfg1, cfg2); } if (retimer->mode != TYPEC_STATE_USB && retimer->svid != USB_TYPEC_DP_SID) @@ -113,9 +131,7 @@ static int ps883x_set(struct ps883x_retimer *retimer) return -EOPNOTSUPP; } - ps883x_configure(retimer, cfg0, cfg1, cfg2); - - return 0; + return ps883x_configure(retimer, cfg0, cfg1, cfg2); } static int ps883x_sw_set(struct typec_switch_dev *sw,