From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE3592E628 for ; Mon, 10 Feb 2025 09:50:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739181038; cv=none; b=AIOyoyfQw05Wl0OhPSJ8HkeQyHbg6aiL+67GHu5ckhzVM2GCqfTNe/rrmTbIVdA4afc05r4HoeAmJ10x1fYdqtKsc6uovqdkumoYoKxksiLhaNAyY+8zODKUanl+0O0rAp/r93rdGlZfqDY1RoaeVWhErCgj/OWAQQY+WQfxL+0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739181038; c=relaxed/simple; bh=nqoYQwMM2yf166g9WrYNy/nouHXDvjI1xuapkbxx4ss=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=bJm+8QwmHzVlE4ox//jouQuBHI0gxKDtEP4SFh092zMNkyPkeY9agLNPFKJB9hfKSQmK6k/hZV0L+T6T/U/PRCkXuE/c/Xm00vBBLOhTeEbHBkrUkszqPNBTkrXe1p5K3rMyCQJvB11ELQWqUML8AE8ZmCz+T8yTfEP2XmOz1QQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Uwj/XD+W; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Uwj/XD+W" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43948021a45so3447215e9.1 for ; Mon, 10 Feb 2025 01:50:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739181035; x=1739785835; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=LagJi4kw7+CXMtX4h66oy5kDRSLSVOPBo3JG3mSYr8w=; b=Uwj/XD+WXmr94TFAn1LkdSa86MNUxzA3SW/22RwCzE2nmF9jGsmN9PxqqBAtyBNfzd 8UF1vrCmTL8uWfxB6FuHNgIT8dvBD1rq1XBsQNAlCTFcWyQgnsRqUfhvEu4upEu34gFq /0K7ifSKioTpN6V48jKltj/4eI3lJyn7A9HdlCwvtGCm7tYp7oK/Re2hOqL9yBM44prC ljNPWXUpB/z/LC6cWuR0WDtM+TymCmwpRtKsROvdPbAOTn8BMeWfi0haTgywBAOq0Zgw H5FSIzmonUH4UN+oSXgiBIKvmMrhrzzOXvpNEc0y+O7X7OyAZpAIKw0fiqHxFilYMAlq kNZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739181035; x=1739785835; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=LagJi4kw7+CXMtX4h66oy5kDRSLSVOPBo3JG3mSYr8w=; b=FuLvFUB9TW9d6ZpSJwd3YGM1ZSJH45F5I6+9+5VqRaB4q/9r0A2B1haUdND4/uT88s 83EpNxSDG6n6btJz9MPVZ2SVQFq5vUp8VTMQAmO/05atPMHHlGxoxTK7nnaV5vK2WdWd rVoljFKDfmz748PjgD0HfiLnSX3C9XmtePTvIfMkklILJb4DKtcDsQKGcnbjRb0tkF8I Ttll7MGei739/QKsRGilauixuZx9qVWqSKxdFRMWNuIUuEKXduePEPJPyLIz26L3DlcU ZEgNp0QIViZqJh9mRn1dn4iktnjK0bhjMr1Bcd40TXVF2NZQoiUbiHW9HN1hmy+qwYxC 5sqA== X-Forwarded-Encrypted: i=1; AJvYcCVomQEdRiXNhMx/Eb05RcXYPogYBR5n230WCSGjevyrcQwBPhFVUKvxkwr6+jY+8Tm+1MWvPu6jcK+c/oM=@vger.kernel.org X-Gm-Message-State: AOJu0YwCvEa9r94QJ8zkC9rXFeIV7LFf0d12g+oBoJ1hJ+MhJzklnMVv zMpTTSdRl1gMJj6EoGiFVr9R3xcIexD40p4WpvDEbjOUtRnag9pMuiJWXj0KE/0= X-Gm-Gg: ASbGncsfS8IXfkVkhuIoLspMVowql8awQkwwhqNjzipmpMW23hK7D7heOCYy5nlH+Fj UU+RgQM/dU/OfQjC23jPq2ZebyCAl3xAjarqNULMuSEX/11MK4pjtV6nznyd+Dept8GO4cuWQMY i2rqrrEDTkLEfBHjfp3bo4rxzANgWRb96xXTVOEdqsLF+nvQwExpn2iVixZ3tIhGWAabMje2Yx+ gYPXfUk2TbsmyOI6Q8c7VBQGl7vDBWggnNmpJ8yvKH/GRFQFA+y8dhMcjwknjBVutMVyelvOuys utHdSo0GhI+aq65JbtM/9JmMwNrWBb+rGsreYudLVYzYDgjZUGc7trFParlwc9bT+czc X-Google-Smtp-Source: AGHT+IE+Zw8vElKrozbDz9J93cx5VFxG4xf7O0Noct2EF/OGFeCzZy73gmY3TWsR9K3loN+SESU9JA== X-Received: by 2002:a05:600c:4e89:b0:439:45ce:15e9 with SMTP id 5b1f17b1804b1-43945ce19a1mr13888945e9.26.1739181034804; Mon, 10 Feb 2025 01:50:34 -0800 (PST) Received: from ?IPV6:2a01:e0a:982:cbb0:8235:1ea0:1a75:c4d5? ([2a01:e0a:982:cbb0:8235:1ea0:1a75:c4d5]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dc73c2e00sm9872571f8f.57.2025.02.10.01.50.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 10 Feb 2025 01:50:34 -0800 (PST) Message-ID: <774d1a84-cc35-418d-9a84-867888b843da@linaro.org> Date: Mon, 10 Feb 2025 10:50:33 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Reply-To: neil.armstrong@linaro.org Subject: Re: [PATCH v2] soc: amlogic: clk-measure: Optimize the memory size of clk-measure To: chuan.liu@amlogic.com, Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org References: <20250205-optimize_memory_size_of_clk_measure-v2-1-4f546053495d@amlogic.com> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20250205-optimize_memory_size_of_clk_measure-v2-1-4f546053495d@amlogic.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 05/02/2025 08:58, Chuan Liu via B4 Relay wrote: > From: Chuan Liu > > Drop "CLK_MSR_MAX" and replace it with adding a member "msr_count" in > the structure to specify the count of msr_id. > > Mark the table of msr_id as const. > > Signed-off-by: Chuan Liu > --- > The number of msr_ids for each chip is inconsistent. Defining a > fixed-size array for each chip to store msr_ids would waste memory. > --- > Changes in v2: > - Discard the global variable and restore the "priv" member in the > "struct meson_msr_id". > - Mark msr_id_table as const. > - Link to v1: https://lore.kernel.org/r/20250123-optimize_memory_size_of_clk_measure-v1-1-06aa6a01ff37@amlogic.com > --- > drivers/soc/amlogic/meson-clk-measure.c | 86 ++++++++++++++++++++++++--------- > 1 file changed, 62 insertions(+), 24 deletions(-) > > diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c > index a6453ffeb753..39638d6a593c 100644 > --- a/drivers/soc/amlogic/meson-clk-measure.c > +++ b/drivers/soc/amlogic/meson-clk-measure.c > @@ -33,23 +33,26 @@ static DEFINE_MUTEX(measure_lock); > #define DIV_STEP 32 > #define DIV_MAX 640 > > -#define CLK_MSR_MAX 128 > - > struct meson_msr_id { > struct meson_msr *priv; > unsigned int id; > const char *name; > }; > > +struct meson_msr_data { > + struct meson_msr_id *msr_table; > + unsigned int msr_count; > +}; > + > struct meson_msr { > struct regmap *regmap; > - struct meson_msr_id msr_table[CLK_MSR_MAX]; > + struct meson_msr_data data; > }; > > #define CLK_MSR_ID(__id, __name) \ > [__id] = {.id = __id, .name = __name,} > > -static struct meson_msr_id clk_msr_m8[CLK_MSR_MAX] = { > +static const struct meson_msr_id clk_msr_m8[] = { > CLK_MSR_ID(0, "ring_osc_out_ee0"), > CLK_MSR_ID(1, "ring_osc_out_ee1"), > CLK_MSR_ID(2, "ring_osc_out_ee2"), > @@ -98,7 +101,7 @@ static struct meson_msr_id clk_msr_m8[CLK_MSR_MAX] = { > CLK_MSR_ID(63, "mipi_csi_cfg"), > }; > > -static struct meson_msr_id clk_msr_gx[CLK_MSR_MAX] = { > +static const struct meson_msr_id clk_msr_gx[] = { > CLK_MSR_ID(0, "ring_osc_out_ee_0"), > CLK_MSR_ID(1, "ring_osc_out_ee_1"), > CLK_MSR_ID(2, "ring_osc_out_ee_2"), > @@ -168,7 +171,7 @@ static struct meson_msr_id clk_msr_gx[CLK_MSR_MAX] = { > CLK_MSR_ID(82, "ge2d"), > }; > > -static struct meson_msr_id clk_msr_axg[CLK_MSR_MAX] = { > +static const struct meson_msr_id clk_msr_axg[] = { > CLK_MSR_ID(0, "ring_osc_out_ee_0"), > CLK_MSR_ID(1, "ring_osc_out_ee_1"), > CLK_MSR_ID(2, "ring_osc_out_ee_2"), > @@ -242,7 +245,7 @@ static struct meson_msr_id clk_msr_axg[CLK_MSR_MAX] = { > CLK_MSR_ID(109, "audio_locker_in"), > }; > > -static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = { > +static const struct meson_msr_id clk_msr_g12a[] = { > CLK_MSR_ID(0, "ring_osc_out_ee_0"), > CLK_MSR_ID(1, "ring_osc_out_ee_1"), > CLK_MSR_ID(2, "ring_osc_out_ee_2"), > @@ -358,7 +361,7 @@ static struct meson_msr_id clk_msr_g12a[CLK_MSR_MAX] = { > CLK_MSR_ID(122, "audio_pdm_dclk"), > }; > > -static struct meson_msr_id clk_msr_sm1[CLK_MSR_MAX] = { > +static const struct meson_msr_id clk_msr_sm1[] = { > CLK_MSR_ID(0, "ring_osc_out_ee_0"), > CLK_MSR_ID(1, "ring_osc_out_ee_1"), > CLK_MSR_ID(2, "ring_osc_out_ee_2"), > @@ -489,7 +492,7 @@ static struct meson_msr_id clk_msr_sm1[CLK_MSR_MAX] = { > }; > > static int meson_measure_id(struct meson_msr_id *clk_msr_id, > - unsigned int duration) > + unsigned int duration) > { > struct meson_msr *priv = clk_msr_id->priv; > unsigned int val; > @@ -573,13 +576,14 @@ DEFINE_SHOW_ATTRIBUTE(clk_msr); > static int clk_msr_summary_show(struct seq_file *s, void *data) > { > struct meson_msr_id *msr_table = s->private; > + unsigned int msr_count = msr_table->priv->data.msr_count; > unsigned int precision = 0; > int val, i; > > seq_puts(s, " clock rate precision\n"); > seq_puts(s, "---------------------------------------------\n"); > > - for (i = 0 ; i < CLK_MSR_MAX ; ++i) { > + for (i = 0 ; i < msr_count ; ++i) { > if (!msr_table[i].name) > continue; > > @@ -604,7 +608,7 @@ static const struct regmap_config meson_clk_msr_regmap_config = { > > static int meson_msr_probe(struct platform_device *pdev) > { > - const struct meson_msr_id *match_data; > + const struct meson_msr_data *match_data; > struct meson_msr *priv; > struct dentry *root, *clks; > void __iomem *base; > @@ -621,7 +625,16 @@ static int meson_msr_probe(struct platform_device *pdev) > return -ENODEV; > } > > - memcpy(priv->msr_table, match_data, sizeof(priv->msr_table)); > + priv->data.msr_table = devm_kcalloc(&pdev->dev, > + match_data->msr_count, > + sizeof(struct meson_msr_id), > + GFP_KERNEL); > + if (!priv->data.msr_table) > + return -ENOMEM; > + > + memcpy(priv->data.msr_table, match_data->msr_table, > + match_data->msr_count * sizeof(struct meson_msr_id)); > + priv->data.msr_count = match_data->msr_count; > > base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(base)) > @@ -636,45 +649,70 @@ static int meson_msr_probe(struct platform_device *pdev) > clks = debugfs_create_dir("clks", root); > > debugfs_create_file("measure_summary", 0444, root, > - priv->msr_table, &clk_msr_summary_fops); > + priv->data.msr_table, &clk_msr_summary_fops); > > - for (i = 0 ; i < CLK_MSR_MAX ; ++i) { > - if (!priv->msr_table[i].name) > + for (i = 0 ; i < priv->data.msr_count ; ++i) { > + if (!priv->data.msr_table[i].name) > continue; > > - priv->msr_table[i].priv = priv; > + priv->data.msr_table[i].priv = priv; > > - debugfs_create_file(priv->msr_table[i].name, 0444, clks, > - &priv->msr_table[i], &clk_msr_fops); > + debugfs_create_file(priv->data.msr_table[i].name, 0444, clks, > + &priv->data.msr_table[i], &clk_msr_fops); > } > > return 0; > } > > +static const struct meson_msr_data clk_msr_gx_data = { > + .msr_table = (void *)clk_msr_gx, > + .msr_count = ARRAY_SIZE(clk_msr_gx), > +}; > + > +static const struct meson_msr_data clk_msr_m8_data = { > + .msr_table = (void *)clk_msr_m8, > + .msr_count = ARRAY_SIZE(clk_msr_m8), > +}; > + > +static const struct meson_msr_data clk_msr_axg_data = { > + .msr_table = (void *)clk_msr_axg, > + .msr_count = ARRAY_SIZE(clk_msr_axg), > +}; > + > +static const struct meson_msr_data clk_msr_g12a_data = { > + .msr_table = (void *)clk_msr_g12a, > + .msr_count = ARRAY_SIZE(clk_msr_g12a), > +}; > + > +static const struct meson_msr_data clk_msr_sm1_data = { > + .msr_table = (void *)clk_msr_sm1, > + .msr_count = ARRAY_SIZE(clk_msr_sm1), > +}; > + > static const struct of_device_id meson_msr_match_table[] = { > { > .compatible = "amlogic,meson-gx-clk-measure", > - .data = (void *)clk_msr_gx, > + .data = &clk_msr_gx_data, > }, > { > .compatible = "amlogic,meson8-clk-measure", > - .data = (void *)clk_msr_m8, > + .data = &clk_msr_m8_data, > }, > { > .compatible = "amlogic,meson8b-clk-measure", > - .data = (void *)clk_msr_m8, > + .data = &clk_msr_m8_data, > }, > { > .compatible = "amlogic,meson-axg-clk-measure", > - .data = (void *)clk_msr_axg, > + .data = &clk_msr_axg_data, > }, > { > .compatible = "amlogic,meson-g12a-clk-measure", > - .data = (void *)clk_msr_g12a, > + .data = &clk_msr_g12a_data, > }, > { > .compatible = "amlogic,meson-sm1-clk-measure", > - .data = (void *)clk_msr_sm1, > + .data = &clk_msr_sm1_data, > }, > { /* sentinel */ } > }; > > --- > base-commit: 1e1fd26ed4ca05cc1f0e5857918da4dd54967f7d > change-id: 20250123-optimize_memory_size_of_clk_measure-f9c40e815794 > > Best regards, Looks fine, thanks !!! Reviewed-by: Neil Armstrong