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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 2CE75C54E67 for ; Wed, 27 Mar 2024 22:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CXCGteaQzzW0HSnM/EqK71YjoUbDkDMIKR9dgywEHLk=; b=SM/APdnNPbUQRy kjul671qqOZiagDRTAH23VPscE89w58VwIvdDI8WQc7Yn0NVxte/1n8eHjG1NImgDKUX6+W9ErHpY RIZvG5K0WsTqOm97R/ERFjCGptkb9PLQXg3ZF3y09uJzA7F1PRCGCSEtf30iIA0VqpP2FunfJ1tdx kJ6sP5hBu+tpTSC9x2jxqvAJQfL5AcaiAp9iVzgklwUlIy9ACNd2065jLCqi93NzA8KS0DNk5oEpL 7Jyf6qB1gueaaPNMoG03BXet3bVuHJ2pEP5H/GNjfvGBbdOkpLbKJrJKItgjYdU55IN2m1Ilj3hFs EQrcKEtsoZIfnE4tMSwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpbpo-0000000BR11-3ncY; Wed, 27 Mar 2024 22:33:28 +0000 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpagN-0000000BBwy-1Im9 for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 21:19:42 +0000 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a4e0a65f37bso37707166b.0 for ; Wed, 27 Mar 2024 14:19:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711574376; x=1712179176; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vNx42+cIO6IvI6CYL4IXG6mJqHn6Rg/EjQqC8SupC2Y=; b=Gs5Su6sWJD2aAy/MmQ8DPk0mgQRGuHp1yFJPS9pHQDIK+lj2+Gr+7ddZsbPnngQB8o 5VOTi+1aI+qiChwipLjZZjf95v5snAwm8OroKH240ugoqIJ/SPlPAXtJsJIBtMzyCfs0 AecJVoF+hKq03PZs+67DbeLKikqrEN+8EKJfErW2Nmtea6GjIVbf+u7PlsEYKXnKolnE XoNyV4IJUc/r+nQYTD9x+Er1HSlS/LZiiDmI7yTuQu4v3WMVnzTZ4nXtF1QDoQiYXMmb z1Hgcljd4TFT4eddcEi+JJy63ZgXSO1fRSdnmJEhH2rG3TOMuEdjw/SQraMjVVR59MlB URzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711574376; x=1712179176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vNx42+cIO6IvI6CYL4IXG6mJqHn6Rg/EjQqC8SupC2Y=; b=eNfCEfpwKS4FMwNi9qdZpVI0CP3RZcoVjz2MPy807DvjGzg8DDDlkManT7zceuwKlQ 4ZB31ux//xEaP0JXz41QKJseQjaDpaByjZudOcymFceKVqR11Y48cVnWoYzqHxgleOQe rGJTn8aCKjZPcJ7O9nUxpQg/wMlmupI0glMTWdy5TQW7NBzDBsEf+vb2uUjW5FCK1Wgi bWlu6ekT9yBxRMANfSTTuIfYWTbs1P0E2F27zq2iF171DaVlcl2VYd/hjdSxXGukKpSD ukXSaX52WowaKFgErIehhLzdZK213POlNtddv02IKef6VBt1PDvRUU5BKkRXfbZOMwDT FMtg== X-Forwarded-Encrypted: i=1; AJvYcCWF5a27zL2kut/KTbmi8suiSEgLVKsOUlg4/Ryo5ClwjztnaBxQfgEo5MEdvPQSBqW1O24JzPYBQ8oM7cmRwz3rNGvet2rOLonxAhb35xnuWStUqh0= X-Gm-Message-State: AOJu0YzxYKOL/pcmedx7cjHZvZOH4bCZgFjs8jru+dZa/3Q/CRkDhBYR Q//7u5sAC3u8cwndXL2IgI+pSjeYwtDCpyLZQWwp4uAV0+pnIhsJ X-Google-Smtp-Source: AGHT+IF/B2H4KrboR8kefyqZkwERsOjnhoaDXBWKE4J0pfvunYYrk/JmiIGNVxhTOFgtD+Mh7a9TNQ== X-Received: by 2002:a17:906:fa16:b0:a47:34b2:ca4b with SMTP id lo22-20020a170906fa1600b00a4734b2ca4bmr366675ejb.50.1711574375890; Wed, 27 Mar 2024 14:19:35 -0700 (PDT) Received: from jernej-laptop.localnet (86-58-6-171.dynamic.telemach.net. [86.58.6.171]) by smtp.gmail.com with ESMTPSA id c19-20020a170906171300b00a45be04f00fsm5982718eje.171.2024.03.27.14.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 14:19:35 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: Yangtao Li , Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Samuel Holland , "Rafael J . Wysocki" , Andre Przywara Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Brandon Cheo Fusi , Martin Botka , Martin Botka , Chris Morgan , Ryan Walklin Subject: Re: [PATCH v3 4/8] cpufreq: sun50i: Refactor speed bin decoding Date: Wed, 27 Mar 2024 22:19:34 +0100 Message-ID: <3738303.MHq7AAxBmi@jernej-laptop> In-Reply-To: <20240326114743.712167-5-andre.przywara@arm.com> References: <20240326114743.712167-1-andre.przywara@arm.com> <20240326114743.712167-5-andre.przywara@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_141939_580559_DAA3D6AA X-CRM114-Status: GOOD ( 29.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dne torek, 26. marec 2024 ob 12:47:39 CET je Andre Przywara napisal(a): > From: Brandon Cheo Fusi > > Make converting the speed bin value into a speed grade generic and > determined by a platform specific callback. Also change the prototypes > involved to encode the speed bin directly in the return value. > > This allows to extend the driver more easily to support more SoCs. > > Signed-off-by: Brandon Cheo Fusi > [Andre: merge output into return value] > Signed-off-by: Andre Przywara > --- > drivers/cpufreq/sun50i-cpufreq-nvmem.c | 74 +++++++++++++++++--------- > 1 file changed, 49 insertions(+), 25 deletions(-) > > diff --git a/drivers/cpufreq/sun50i-cpufreq-nvmem.c b/drivers/cpufreq/sun50i-cpufreq-nvmem.c > index 32a9c88f8ff6d..7b44f3b13e7d2 100644 > --- a/drivers/cpufreq/sun50i-cpufreq-nvmem.c > +++ b/drivers/cpufreq/sun50i-cpufreq-nvmem.c > @@ -25,19 +25,52 @@ > > static struct platform_device *cpufreq_dt_pdev, *sun50i_cpufreq_pdev; > > +struct sunxi_cpufreq_data { > + u32 (*efuse_xlate)(u32 speedbin); > +}; > + > +static u32 sun50i_h6_efuse_xlate(u32 speedbin) > +{ > + u32 efuse_value; > + > + efuse_value = (speedbin >> NVMEM_SHIFT) & NVMEM_MASK; > + > + /* > + * We treat unexpected efuse values as if the SoC was from > + * the slowest bin. Expected efuse values are 1-3, slowest > + * to fastest. > + */ > + if (efuse_value >= 1 && efuse_value <= 3) > + return efuse_value - 1; > + else > + return 0; > +} > + > +static struct sunxi_cpufreq_data sun50i_h6_cpufreq_data = { > + .efuse_xlate = sun50i_h6_efuse_xlate, > +}; > + > +static const struct of_device_id cpu_opp_match_list[] = { > + { .compatible = "allwinner,sun50i-h6-operating-points", > + .data = &sun50i_h6_cpufreq_data, > + }, > + {} > +}; > + > /** > * sun50i_cpufreq_get_efuse() - Determine speed grade from efuse value > - * @versions: Set to the value parsed from efuse > * > - * Returns 0 if success. > + * Returns non-negative speed bin index on success, a negative error > + * value otherwise. > */ > -static int sun50i_cpufreq_get_efuse(u32 *versions) > +static int sun50i_cpufreq_get_efuse(void) > { > struct nvmem_cell *speedbin_nvmem; > struct device_node *np; > struct device *cpu_dev; > - u32 *speedbin, efuse_value; > - size_t len; > + const struct of_device_id *match; > + const struct sunxi_cpufreq_data *opp_data; > + u32 *speedbin; nit: reverse christmas tree Other than that, Reviewed-by: Jernej Skrabec Best regards, Jernej > int ret; > > cpu_dev = get_cpu_device(0); > @@ -48,12 +81,12 @@ static int sun50i_cpufreq_get_efuse(u32 *versions) > if (!np) > return -ENOENT; > > - ret = of_device_is_compatible(np, > - "allwinner,sun50i-h6-operating-points"); > - if (!ret) { > + match = of_match_node(cpu_opp_match_list, np); > + if (!match) { > of_node_put(np); > return -ENOENT; > } > + opp_data = match->data; > > speedbin_nvmem = of_nvmem_cell_get(np, NULL); > of_node_put(np); > @@ -61,25 +94,16 @@ static int sun50i_cpufreq_get_efuse(u32 *versions) > return dev_err_probe(cpu_dev, PTR_ERR(speedbin_nvmem), > "Could not get nvmem cell\n"); > > - speedbin = nvmem_cell_read(speedbin_nvmem, &len); > + speedbin = nvmem_cell_read(speedbin_nvmem, NULL); > nvmem_cell_put(speedbin_nvmem); > if (IS_ERR(speedbin)) > return PTR_ERR(speedbin); > > - efuse_value = (*speedbin >> NVMEM_SHIFT) & NVMEM_MASK; > - > - /* > - * We treat unexpected efuse values as if the SoC was from > - * the slowest bin. Expected efuse values are 1-3, slowest > - * to fastest. > - */ > - if (efuse_value >= 1 && efuse_value <= 3) > - *versions = efuse_value - 1; > - else > - *versions = 0; > + ret = opp_data->efuse_xlate(*speedbin); > > kfree(speedbin); > - return 0; > + > + return ret; > }; > > static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev) > @@ -87,7 +111,7 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev) > int *opp_tokens; > char name[MAX_NAME_LEN]; > unsigned int cpu; > - u32 speed = 0; > + int speed; > int ret; > > opp_tokens = kcalloc(num_possible_cpus(), sizeof(*opp_tokens), > @@ -95,10 +119,10 @@ static int sun50i_cpufreq_nvmem_probe(struct platform_device *pdev) > if (!opp_tokens) > return -ENOMEM; > > - ret = sun50i_cpufreq_get_efuse(&speed); > - if (ret) { > + speed = sun50i_cpufreq_get_efuse(); > + if (speed < 0) { > kfree(opp_tokens); > - return ret; > + return speed; > } > > snprintf(name, MAX_NAME_LEN, "speed%d", speed); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel