From mboxrd@z Thu Jan 1 00:00:00 1970 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 1183AEB64DA for ; Fri, 16 Jun 2023 08:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343643AbjFPIn1 (ORCPT ); Fri, 16 Jun 2023 04:43:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343578AbjFPInU (ORCPT ); Fri, 16 Jun 2023 04:43:20 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FA1813E for ; Fri, 16 Jun 2023 01:43:18 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-519f6e1a16cso508727a12.2 for ; Fri, 16 Jun 2023 01:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1686904997; x=1689496997; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ze8cwbEimRlhZaK9EBJVsnPzOeV3nshtg9J9yVTNzbA=; b=0CwPdM23oJvOKoQrf2K1oFtch1GUVvuQqMOPzi5DMDq0TjmyNC8LGVZg6WCwDXV1Vs NYGCTgf0wcd3f2jgapURz07b342frjb+t+j0LfpkA2rqE50GyGKVze91Wk4/mY6fDOlb m+dv9X2ENUCWaTbwtJXXtyFzVTs52sG0Kg0nRkdqeD+LTQSAVHemhVAtdGQScTED246S Hvz+wXORJe7+Lc/uj4YV8LoS9SKCFE4KGTnYl0nB9EwZfT2eDN/Q2dRaqk61HeHPcyW+ Hv+78e1DOE69nDXeWq9ZwFkvZpI36XyvNpoodqGxYmoz2DND6kIBR9uSFjHPn2ZKj2iD T+jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686904997; x=1689496997; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ze8cwbEimRlhZaK9EBJVsnPzOeV3nshtg9J9yVTNzbA=; b=Zyipf23Ens5PorhUck145XmSnwc/2YGrDQrom5V8Fm0yDJreflcaqytRZSR7fgMdQu StDDVjV9TE9pbLG1zDVZVH+f3kBvc7z//L/AxkRefoeXyKyYPKhU6ozcJftkveKMa1BT stBOLUrACjcupNcRR8YJQyODFaaHNoifH+9kMtWpvAPa3FiteiS0jlFoxHacfGMzYuWO m5IKOnjieXIlK6Rc99oZcZ71JawTNzf7If+WXoadI74fe1Ylpe0viH3dPL3AGEIRSqCj Kv3WB2wwE26BIIAm6OpUWWl+ZgcGvEYbpDf+2/hgU0EgIuxK4++SdF9u9URWRJHe1/g9 Exow== X-Gm-Message-State: AC+VfDycGZWG6uw44zMnCcUQDysYvb82Tnxgr+7kgu+2ZM2DtqjyuasC SjvpAL3ciiH+e0PlOLgF18IQ1Q== X-Google-Smtp-Source: ACHHUZ7MWFdjFMx/4EedaJmP35jyhkR6ud9o/ugYs5MNHQ34vWYGN4HLEeom/PdQ5fLBLp+o2C6xZg== X-Received: by 2002:aa7:d6d3:0:b0:518:79da:911e with SMTP id x19-20020aa7d6d3000000b0051879da911emr665898edr.39.1686904996944; Fri, 16 Jun 2023 01:43:16 -0700 (PDT) Received: from blmsp ([2001:4090:a245:802c:7f03:2fe0:bd27:d746]) by smtp.gmail.com with ESMTPSA id c13-20020aa7c74d000000b0051823c1a10bsm8004786eds.54.2023.06.16.01.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jun 2023 01:43:16 -0700 (PDT) Date: Fri, 16 Jun 2023 10:43:14 +0200 From: Markus Schneider-Pargmann To: AngeloGioacchino Del Regno Cc: sboyd@kernel.org, mturquette@baylibre.com, matthias.bgg@gmail.com, wenst@chromium.org, u.kleine-koenig@pengutronix.de, miles.chen@mediatek.com, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com Subject: Re: [PATCH 1/3] clk: mediatek: clk-mtk: Grab iomem pointer for divider clocks Message-ID: <20230616084314.vfx5gcoxupcq3mgl@blmsp> References: <20230615122051.546985-1-angelogioacchino.delregno@collabora.com> <20230615122051.546985-2-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230615122051.546985-2-angelogioacchino.delregno@collabora.com> Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org On Thu, Jun 15, 2023 at 02:20:49PM +0200, AngeloGioacchino Del Regno wrote: > In the rare case in which one of the clock drivers has divider clocks > but not composite clocks, mtk_clk_simple_probe() would not io(re)map, > hence passing a NULL pointer to mtk_clk_register_dividers(). > > To fix this issue, extend the `if` conditional to also check if any > divider clocks are present. While at it, also make sure the iomem > pointer is NULL if no composite/divider clocks are declared, as we > are checking for that when iounmapping it in the error path. > > This hasn't been seen on any MediaTek clock driver as the current ones > always declare composite clocks along with divider clocks, but this is > still an important fix for a future potential KP. > > Fixes: 1fe074b1f112 ("clk: mediatek: Add divider clocks to mtk_clk_simple_{probe,remove}()") > Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Markus Schneider-Pargmann > --- > drivers/clk/mediatek/clk-mtk.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c > index cf3514c8e97e..b00ef4213335 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -469,7 +469,7 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, > const struct platform_device_id *id; > const struct mtk_clk_desc *mcd; > struct clk_hw_onecell_data *clk_data; > - void __iomem *base; > + void __iomem *base = NULL; > int num_clks, r; > > mcd = device_get_match_data(&pdev->dev); > @@ -483,8 +483,8 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, > return -EINVAL; > } > > - /* Composite clocks needs us to pass iomem pointer */ > - if (mcd->composite_clks) { > + /* Composite and divider clocks needs us to pass iomem pointer */ > + if (mcd->composite_clks || mcd->divider_clks) { > if (!mcd->shared_io) > base = devm_platform_ioremap_resource(pdev, 0); > else > -- > 2.40.1 >