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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58CBFC433EF for ; Thu, 19 May 2022 12:05:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9CE7111A278; Thu, 19 May 2022 12:05:10 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C8EA11A278 for ; Thu, 19 May 2022 12:05:08 +0000 (UTC) Received: from [127.0.0.1] (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 8291883C97; Thu, 19 May 2022 14:05:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1652961907; bh=gss0sGGTUyMGvzUHuPqLQoqzCxPRMF5kS9CqBUHgdjU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=pyL16232Uvie7+aBcdSQ9bIXc75wui3QcyNyfMPAEzsuvE9h6uIxrjgBaYXYu7FCh GR1XgCtaROumq4kjIF6nB8x4nYKVRH2IvB+9dYyf8nZ+BZlhPgFWtLpyS85zQL3lPT yoK/+qVyUuPmgmHHTixYZ8b6hWjQDAZmryGC4ImyHgmKGjqKvL/oo9FJDGOBFO5MyQ zu0GEkwtZf/59hv3skRalpqMPokhLq/XVJR9r5vBdsyC4eM+6T4fHZG+ONhXUAcQRf iwRhfezZ+GXkFmzK2lBpzlnMzJplddM1ExLBgiyCA+sBAq/2fDxzAhUSeYuhAAUKTM vyxeVNrd1tqRw== Message-ID: Date: Thu, 19 May 2022 14:05:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: Re: [PATCH 3/3] drm/bridge: tc358767: Make sure Refclk clock are enabled Content-Language: en-US To: Lucas Stach , dri-devel@lists.freedesktop.org References: <20220518233602.248185-1-marex@denx.de> <20220518233602.248185-3-marex@denx.de> From: Marek Vasut In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , Jonas Karlman , robert.foss@linaro.org, Maxime Ripard , Sam Ravnborg , Laurent Pinchart Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 5/19/22 09:57, Lucas Stach wrote: > Am Donnerstag, dem 19.05.2022 um 01:36 +0200 schrieb Marek Vasut: >> The Refclk may be supplied by SoC clock output instead of crystal >> oscillator, make sure the clock are enabled before any other action >> is performed with the bridge chip, otherwise it may either fail to >> operate at all, or miss reset GPIO toggle. >> >> Fixes: 7caff0fc4296e ("drm/bridge: tc358767: Add DPI to eDP bridge driver") >> Signed-off-by: Marek Vasut >> Cc: Jonas Karlman >> Cc: Laurent Pinchart >> Cc: Lucas Stach >> Cc: Marek Vasut >> Cc: Maxime Ripard >> Cc: Neil Armstrong >> Cc: Robert Foss >> Cc: Sam Ravnborg >> --- >> drivers/gpu/drm/bridge/tc358767.c | 51 ++++++++++++++++++++----------- >> 1 file changed, 33 insertions(+), 18 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c >> index a8bb6de9e600a..4b15acbc73c4e 100644 >> --- a/drivers/gpu/drm/bridge/tc358767.c >> +++ b/drivers/gpu/drm/bridge/tc358767.c >> @@ -2055,10 +2055,24 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) >> if (ret) >> return ret; >> >> + tc->refclk = devm_clk_get(dev, "ref"); >> + if (IS_ERR(tc->refclk)) { >> + ret = PTR_ERR(tc->refclk); >> + dev_err(dev, "Failed to get refclk: %d\n", ret); >> + return ret; >> + } >> + >> + clk_prepare_enable(tc->refclk); >> + >> + /* tRSTW = 100 cycles , at 13 MHz that is ~7.69 us */ >> + usleep_range(10, 15); >> + >> /* Shut down GPIO is optional */ >> tc->sd_gpio = devm_gpiod_get_optional(dev, "shutdown", GPIOD_OUT_HIGH); >> - if (IS_ERR(tc->sd_gpio)) >> - return PTR_ERR(tc->sd_gpio); >> + if (IS_ERR(tc->sd_gpio)) { >> + ret = PTR_ERR(tc->sd_gpio); >> + goto err_clk; >> + } >> >> if (tc->sd_gpio) { >> gpiod_set_value_cansleep(tc->sd_gpio, 0); >> @@ -2067,26 +2081,21 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) >> >> /* Reset GPIO is optional */ >> tc->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); >> - if (IS_ERR(tc->reset_gpio)) >> - return PTR_ERR(tc->reset_gpio); >> + if (IS_ERR(tc->reset_gpio)) { >> + ret = PTR_ERR(tc->reset_gpio); >> + goto err_clk; >> + } >> >> if (tc->reset_gpio) { >> gpiod_set_value_cansleep(tc->reset_gpio, 1); >> usleep_range(5000, 10000); >> } >> >> - tc->refclk = devm_clk_get(dev, "ref"); >> - if (IS_ERR(tc->refclk)) { >> - ret = PTR_ERR(tc->refclk); >> - dev_err(dev, "Failed to get refclk: %d\n", ret); >> - return ret; >> - } >> - >> tc->regmap = devm_regmap_init_i2c(client, &tc_regmap_config); >> if (IS_ERR(tc->regmap)) { >> ret = PTR_ERR(tc->regmap); >> dev_err(dev, "Failed to initialize regmap: %d\n", ret); >> - return ret; >> + goto err_clk; >> } >> >> ret = of_property_read_u32(dev->of_node, "toshiba,hpd-pin", >> @@ -2096,7 +2105,7 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) >> } else { >> if (tc->hpd_pin < 0 || tc->hpd_pin > 1) { >> dev_err(dev, "failed to parse HPD number\n"); >> - return ret; >> + goto err_clk; >> } >> } >> >> @@ -2110,7 +2119,7 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) >> "tc358767-irq", tc); >> if (ret) { >> dev_err(dev, "failed to register dp interrupt\n"); >> - return ret; >> + goto err_clk; >> } >> >> tc->have_irq = true; >> @@ -2119,12 +2128,13 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) >> ret = regmap_read(tc->regmap, TC_IDREG, &tc->rev); >> if (ret) { >> dev_err(tc->dev, "can not read device ID: %d\n", ret); >> - return ret; >> + goto err_clk; >> } >> >> if ((tc->rev != 0x6601) && (tc->rev != 0x6603)) { >> dev_err(tc->dev, "invalid device ID: 0x%08x\n", tc->rev); >> - return -EINVAL; >> + ret = -EINVAL; >> + goto err_clk; >> } >> >> tc->assr = (tc->rev == 0x6601); /* Enable ASSR for eDP panels */ >> @@ -2164,7 +2174,7 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) >> if (tc->bridge.type != DRM_MODE_CONNECTOR_DPI) { /* (e)DP output */ >> ret = tc_aux_link_setup(tc); >> if (ret) >> - return ret; >> + goto err_clk; >> } >> >> tc->bridge.of_node = dev->of_node; >> @@ -2176,11 +2186,15 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) >> ret = tc_mipi_dsi_host_attach(tc); >> if (ret) { >> drm_bridge_remove(&tc->bridge); >> - return ret; >> + goto err_clk; >> } >> } >> >> return 0; >> + >> +err_clk: >> + clk_disable_unprepare(tc->refclk); >> + return ret; > > That's a lot of error paths to disable a effectively always-on clock > when something goes wrong. Could you maybe simplify this by using > devm_add_action_or_reset for the clock disable? Seems like lots of > watchdog drivers do this already if you need some inspiration. I sent V2 as a separate patch.