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 004B5C4321E for ; Tue, 29 Nov 2022 13:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232992AbiK2NVq (ORCPT ); Tue, 29 Nov 2022 08:21:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232391AbiK2NVi (ORCPT ); Tue, 29 Nov 2022 08:21:38 -0500 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBA184FF89 for ; Tue, 29 Nov 2022 05:21:35 -0800 (PST) Received: by mail-lj1-x236.google.com with SMTP id b9so16892352ljr.5 for ; Tue, 29 Nov 2022 05:21:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=qTqB0Cx9TQ+/AdH8ZuJQ7GAbENMQcgVBmVbbVWR1xuY=; b=ExkVn/7btMn7c7EEocrrMeg7Td2aYNz+mZSi9MzJDcPM4/BtLHZopKHtrPiRYRxDQD R7UQqafRAPO4f0cOBC8L+8jNL0bXE0yMxDCDVDRvqJR51FIepN1vvXwOvUHgE0dcQVqy tup2H9Imur+Ak42MhsqzrRUyhzSUeiYBa3RRUuyz5Zo1cLSgOv/69FVoyxfquqUSW6mQ 3je7RrVcIBdNN6+jxf21vuSC4YxepGMx9Fb13i57X13rcabO5Poqobq0xO2CQq7KnSOx cOx2Fway75c+v9BKOY8ny6ZCR8ZbSz5yuuvJENghP+B/gPdeXXefXycRffci193xi30A SGUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qTqB0Cx9TQ+/AdH8ZuJQ7GAbENMQcgVBmVbbVWR1xuY=; b=N24J+E351ASaujCvEy/zyYVkZ1w5LMdgiaYee7avQfuu9W4kDBJiKwfTxMRQHWythS G3KAiHhTpsiSOlrfAs2Emvxd0FqFPCGjF7xnmbeittNdgVUr+h/h8Zce5gTe9e9czZlu 1nXzysKiOnAZWNkmjszITbrTaSWH7d4+SyjAgNZ4xZtuGkUe3kkr7OeCXPgeeDCPouJG gmehZIgwBSSsVdgmI2kSzWy7a3GUp9zq6ewx1j2I15cP8oWmUnISChJNmrJuMwfq+5Pj Y6Pkz45Z/iN+sz65EBSC7x/+TQdaDmaTeCFQdtNyDE7jM2vnI7/ZHWiJUEgcOxCvvypI uwAA== X-Gm-Message-State: ANoB5pnm8iZTmMd2Euh1glJk7Rkiu/l8JdtTwZ3XBqOAqytp9UwnrQWW WdTlSUdokX6XCGaZntq+6sNMuA== X-Google-Smtp-Source: AA0mqf5w36l0Ci6tmjvtVDe42fgeeWY1YhGWg1N9YeU7TPwfwy1jL/ywNOM7+edyvpgNSSDFYd7W2w== X-Received: by 2002:a2e:8943:0:b0:279:b56b:8ee8 with SMTP id b3-20020a2e8943000000b00279b56b8ee8mr950946ljk.184.1669728094255; Tue, 29 Nov 2022 05:21:34 -0800 (PST) Received: from [192.168.1.101] (95.49.125.236.neoplus.adsl.tpnet.pl. [95.49.125.236]) by smtp.gmail.com with ESMTPSA id c28-20020ac25f7c000000b004ae394b6a6fsm2221432lfc.246.2022.11.29.05.21.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Nov 2022 05:21:33 -0800 (PST) Message-ID: <92b39c01-1283-0b7c-6ba9-3edd2d4de002@linaro.org> Date: Tue, 29 Nov 2022 14:21:32 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH v2 3/6] soc: qcom: geni-se: add desc struct to specify clocks from device match data To: neil.armstrong@linaro.org, Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Andy Gross Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-i2c@vger.kernel.org References: <20221114-narmstrong-sm8550-upstream-i2c-master-hub-v2-0-aadaa6997b28@linaro.org> <20221114-narmstrong-sm8550-upstream-i2c-master-hub-v2-3-aadaa6997b28@linaro.org> <24a88a47-7556-20f1-ce9c-fe7bd0466a88@linaro.org> Content-Language: en-US From: Konrad Dybcio In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 29.11.2022 09:24, Neil Armstrong wrote: > On 18/11/2022 10:06, Konrad Dybcio wrote: >> >> >> On 18/11/2022 09:45, Neil Armstrong wrote: >>> The I2C Master Hub is a stripped down version of the GENI Serial Engine >>> QUP Wrapper Controller but only supporting I2C serial engines without >>> DMA support. >>> >>> Prepare support for the I2C Master Hub variant by moving the required >>> clocks list to a new desc struct then passing it through the compatible >>> match data. >>> >>> Signed-off-by: Neil Armstrong >>> Reviewed-by: Konrad Dybcio >>> --- >>>   drivers/soc/qcom/qcom-geni-se.c | 59 +++++++++++++++++++++++++++++++---------- >>>   1 file changed, 45 insertions(+), 14 deletions(-) >>> >>> diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c >>> index a0ceeede450f..ced2a2932eda 100644 >>> --- a/drivers/soc/qcom/qcom-geni-se.c >>> +++ b/drivers/soc/qcom/qcom-geni-se.c >>> @@ -81,19 +81,31 @@ >>>    */ >>>   #define MAX_CLK_PERF_LEVEL 32 >>> -#define NUM_AHB_CLKS 2 >>> +#define MAX_CLKS 2 >>>   /** >>>    * struct geni_wrapper - Data structure to represent the QUP Wrapper Core >>>    * @dev:        Device pointer of the QUP wrapper core >>>    * @base:        Base address of this instance of QUP wrapper core >>> - * @ahb_clks:        Handle to the primary & secondary AHB clocks >>> + * @clks:        Handle to the primary & optional secondary AHB clocks >>> + * @num_clks:        Count of clocks >>>    * @to_core:        Core ICC path >>>    */ >>>   struct geni_wrapper { >>>       struct device *dev; >>>       void __iomem *base; >>> -    struct clk_bulk_data ahb_clks[NUM_AHB_CLKS]; >>> +    struct clk_bulk_data clks[MAX_CLKS]; >>> +    unsigned int num_clks; >>> +}; >>> + >>> +/** >>> + * struct geni_se_desc - Data structure to represent the QUP Wrapper resources >>> + * @clks:        Name of the primary & optional secondary AHB clocks >>> + * @num_clks:        Count of clock names >>> + */ >>> +struct geni_se_desc { >>> +    unsigned int num_clks; >>> +    const char * const *clks; >>>   }; >>>   static const char * const icc_path_names[] = {"qup-core", "qup-config", >>> @@ -496,8 +508,7 @@ static void geni_se_clks_off(struct geni_se *se) >>>       struct geni_wrapper *wrapper = se->wrapper; >>>       clk_disable_unprepare(se->clk); >>> -    clk_bulk_disable_unprepare(ARRAY_SIZE(wrapper->ahb_clks), >>> -                        wrapper->ahb_clks); >>> +    clk_bulk_disable_unprepare(wrapper->num_clks, wrapper->clks); >>>   } >>>   /** >>> @@ -528,15 +539,13 @@ static int geni_se_clks_on(struct geni_se *se) >>>       int ret; >>>       struct geni_wrapper *wrapper = se->wrapper; >>> -    ret = clk_bulk_prepare_enable(ARRAY_SIZE(wrapper->ahb_clks), >>> -                        wrapper->ahb_clks); >>> +    ret = clk_bulk_prepare_enable(wrapper->num_clks, wrapper->clks); >>>       if (ret) >>>           return ret; >>>       ret = clk_prepare_enable(se->clk); >>>       if (ret) >>> -        clk_bulk_disable_unprepare(ARRAY_SIZE(wrapper->ahb_clks), >>> -                            wrapper->ahb_clks); >>> +        clk_bulk_disable_unprepare(wrapper->num_clks, wrapper->clks); >>>       return ret; >>>   } >>> @@ -887,11 +896,23 @@ static int geni_se_probe(struct platform_device *pdev) >>>           return PTR_ERR(wrapper->base); >>>       if (!has_acpi_companion(&pdev->dev)) { >>> -        wrapper->ahb_clks[0].id = "m-ahb"; >>> -        wrapper->ahb_clks[1].id = "s-ahb"; >>> -        ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks); >>> +        const struct geni_se_desc *desc; >>> +        int i; >>> + >>> +        desc = device_get_match_data(&pdev->dev); >>> +        if (!desc) >>> +            return -EINVAL; >>> + >>> +        wrapper->num_clks = min_t(unsigned int, desc->num_clks, MAX_CLKS); >>> +        if (wrapper->num_clks < desc->num_clks) >> This will never execute (except if somebody adding a third desc would make a mistake or not update MAX_CLKS), as wrapper->num_clks will only be < desc->num_clks if desc->num_clks > MAX_CLKS. > > You're right, I did read too fast. > >> >> I was thinking about getting the number of actual clocks passed to the device in the DT, but I can't find a helper function for that, so it would probably require some kind of manual looping.. I guess we can drop this. Or leave it to save somebody pulling their hair out in an unlikely event. I guess I'm fine with both. > > This would be: > > of_count_phandle_with_args(dev->of_node, "clocks", "#clock-cells") > > but ultimately if the number of clocks is lower than requested, it will fail > in the call to devm_clk_bulk_get(). > > Would we warn if the DT clocks count is higher ? or simply fail if lower ? Just "fail if lower" sounds good. Konrad > > Neil > >> >> >>> +            dev_warn(dev, "too much clocks described in DT\n") >> If you leave it, s/too much/Too many/ >> >> >> Konrad >>> + >>> +        for (i = 0; i < wrapper->num_clks; ++i) >>> +            wrapper->clks[i].id = desc->clks[i]; >>> + >>> +        ret = devm_clk_bulk_get(dev, wrapper->num_clks, wrapper->clks); >>>           if (ret) { >>> -            dev_err(dev, "Err getting AHB clks %d\n", ret); >>> +            dev_err(dev, "Err getting clks %d\n", ret); >>>               return ret; >>>           } >>>       } >>> @@ -901,8 +922,18 @@ static int geni_se_probe(struct platform_device *pdev) >>>       return devm_of_platform_populate(dev); >>>   } >>> +static const char * const qup_clks[] = { >>> +    "m-ahb", >>> +    "s-ahb", >>> +}; >>> + >>> +static const struct geni_se_desc qup_desc = { >>> +    .clks = qup_clks, >>> +    .num_clks = ARRAY_SIZE(qup_clks), >>> +}; >>> + >>>   static const struct of_device_id geni_se_dt_match[] = { >>> -    { .compatible = "qcom,geni-se-qup", }, >>> +    { .compatible = "qcom,geni-se-qup", .data = &qup_desc }, >>>       {} >>>   }; >>>   MODULE_DEVICE_TABLE(of, geni_se_dt_match); >>> >