From nobody Sun Sep 22 09:30:56 2024 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 EEC2AC433F5 for ; Sat, 5 Feb 2022 01:48:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378907AbiBEBsD (ORCPT ); Fri, 4 Feb 2022 20:48:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235242AbiBEBsB (ORCPT ); Fri, 4 Feb 2022 20:48:01 -0500 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 854D2C061346 for ; Fri, 4 Feb 2022 17:48:00 -0800 (PST) Received: by mail-oi1-x231.google.com with SMTP id r27so10607471oiw.4 for ; Fri, 04 Feb 2022 17:48:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZwqiOxP9YHS7gWZlUy/Ide8I7ik75+E4L6SkE9qurM8=; b=SX/r8oivOKBmjoQGeU3nT0z9H54wk6+8Qa7bljk+63UOjxZcK/6NnqNHZFUHg7WVWb E3v+9gEV8s3ampzbdfmLyiLQGD5ZTXFho8wem7UQMnQQiTWOFEUrjkpGoOEpqCx+tKuR LlbVGCBtSpo3XWGtEyyQOSk9MQwUuWo58mv6m0OKtfTDN1aqDxvmcdPdBHDcBe4BGS9w c3oJ2afAsToUv4Qxv2CZEBfrYiHgJLHlLYOizaFgTs/Z4ImKVsRaFwZdp1vKZc1igZyo 4RNAdg0iS5g/yVSFyRqgqdDp4C5ki0krTzMYKPBsXIhiwa5farpPM9bNzAiFVQgIEzpn iwTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=ZwqiOxP9YHS7gWZlUy/Ide8I7ik75+E4L6SkE9qurM8=; b=ORrRvReDD4mVpv1nOzxWIn/Bl6EHrW6/9WkLoeA1pvMucHf/BnOGvHz9+iOnfOB0WA 6+zg2IBzoiTbGungbc1/t+pMToAmnQXImEYWJ/8ntiEcFuDLQf6nMSb1e/utUIYWsWMH i235S9VgwmfWcJwEnBnwFOElpVTvLYqHXseXZXqGA5R1RWya6U3TEJz/RifWmAfYOhYU 5iebXBzWOKH/6nvzeaWDIfkV2TcUKXP6E8xmfqvXs5UDy4KcfxLN1Qepq0LQfTcm2Q1E iINqiB62VZH75J0EZaYA1eK5RGf3a32YmPyG830JmtGhzFnZxWX35KzBnvxjTUTTQf3Z LGNQ== X-Gm-Message-State: AOAM533JZcviUAfQk/UWVnTHyx/V1AziJUXrptizTgZEksgtzEUGsXlZ JcKeQZShblnKRc92rg/hE48= X-Google-Smtp-Source: ABdhPJxkpdnDdeyiK3lUeHlxYFtvl95BTBfOP8qe7nRcTa/6HHnRa20lNjWX7rVjOgbQPJ9grHzYhQ== X-Received: by 2002:a05:6808:17a9:: with SMTP id bg41mr852705oib.41.1644025679729; Fri, 04 Feb 2022 17:47:59 -0800 (PST) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id v31sm1422052ott.25.2022.02.04.17.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Feb 2022 17:47:58 -0800 (PST) Sender: Guenter Roeck From: Guenter Roeck To: Matthias Brugger Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Guenter Roeck , Jiasheng Jiang , Mark Brown , James Liao , Kevin Hilman , Frank Wunderlich , Daniel Golle Subject: [PATCH] Revert "ASoC: mediatek: Check for error clk pointer" Date: Fri, 4 Feb 2022 17:47:55 -0800 Message-Id: <20220205014755.699603-1-linux@roeck-us.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This reverts commit 9de2b9286a6dd16966959b3cb34fc2ddfd39213e. With this patch in the tree, Chromebooks running the affected hardware no longer boot. Bisect points to this patch, and reverting it fixes the problem. An analysis of the code with this patch applied shows: ret =3D init_clks(pdev, clk); if (ret) return ERR_PTR(ret); ... for (j =3D 0; j < MAX_CLKS && data->clk_id[j]; j++) { struct clk *c =3D clk[data->clk_id[j]]; if (IS_ERR(c)) { dev_err(&pdev->dev, "%s: clk unavailable\n", data->name); return ERR_CAST(c); } scpd->clk[j] =3D c; } Not all clocks in the clk_names array have to be present. Only the clocks in the data->clk_id array are actually needed. The code already checks if the required clocks are available and bails out if not. The assumption that all clocks have to be present is wrong, and commit 9de2b9286a6d needs to be reverted. Cc: Jiasheng Jiang Cc: Mark Brown Cc: James Liao Cc: Kevin Hilman Cc: Matthias Brugger Cc: Daniel Golle Fixes: 9de2b9286a6d ("ASoC: mediatek: Check for error clk pointer") Signed-off-by: Guenter Roeck --- drivers/soc/mediatek/mtk-scpsys.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-s= cpsys.c index 670cc82d17dc..ca75b14931ec 100644 --- a/drivers/soc/mediatek/mtk-scpsys.c +++ b/drivers/soc/mediatek/mtk-scpsys.c @@ -411,17 +411,12 @@ static int scpsys_power_off(struct generic_pm_domain = *genpd) return ret; } =20 -static int init_clks(struct platform_device *pdev, struct clk **clk) +static void init_clks(struct platform_device *pdev, struct clk **clk) { int i; =20 - for (i =3D CLK_NONE + 1; i < CLK_MAX; i++) { + for (i =3D CLK_NONE + 1; i < CLK_MAX; i++) clk[i] =3D devm_clk_get(&pdev->dev, clk_names[i]); - if (IS_ERR(clk[i])) - return PTR_ERR(clk[i]); - } - - return 0; } =20 static struct scp *init_scp(struct platform_device *pdev, @@ -431,7 +426,7 @@ static struct scp *init_scp(struct platform_device *pde= v, { struct genpd_onecell_data *pd_data; struct resource *res; - int i, j, ret; + int i, j; struct scp *scp; struct clk *clk[CLK_MAX]; =20 @@ -486,9 +481,7 @@ static struct scp *init_scp(struct platform_device *pde= v, =20 pd_data->num_domains =3D num; =20 - ret =3D init_clks(pdev, clk); - if (ret) - return ERR_PTR(ret); + init_clks(pdev, clk); =20 for (i =3D 0; i < num; i++) { struct scp_domain *scpd =3D &scp->domains[i]; --=20 2.35.1