| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <c09105f0-17db-4179-be2e-cd96b7f282b7@ieee.org>
Date: Tue, 13 May 2025 07:53:54 -0500
From: Alex Elder <elder@...e.org>
To: Konrad Dybcio <konradybcio@...nel.org>, Alex Elder <elder@...nel.org>,
Andrew Lunn <andrew+netdev@...n.ch>, "David S. Miller"
<davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Bjorn Andersson <bjorn.andersson@....qualcomm.com>
Cc: Marijn Suijten <marijn.suijten@...ainline.org>,
Luca Weiss <luca@...aweiss.eu>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, Konrad Dybcio <konrad.dybcio@....qualcomm.com>
Subject: Re: [PATCH] net: ipa: Make the SMEM item ID constant
On 5/12/25 1:07 PM, Konrad Dybcio wrote:
> From: Konrad Dybcio <konrad.dybcio@....qualcomm.com>
>
> It can't vary, stop storing the same magic number everywhere.
>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@....qualcomm.com>
Good idea.
Reviewed-by: Alex Elder <elder@...nel.org>
> ---
> drivers/net/ipa/data/ipa_data-v3.1.c | 1 -
> drivers/net/ipa/data/ipa_data-v3.5.1.c | 1 -
> drivers/net/ipa/data/ipa_data-v4.11.c | 1 -
> drivers/net/ipa/data/ipa_data-v4.2.c | 1 -
> drivers/net/ipa/data/ipa_data-v4.5.c | 1 -
> drivers/net/ipa/data/ipa_data-v4.7.c | 1 -
> drivers/net/ipa/data/ipa_data-v4.9.c | 1 -
> drivers/net/ipa/data/ipa_data-v5.0.c | 1 -
> drivers/net/ipa/data/ipa_data-v5.5.c | 1 -
> drivers/net/ipa/ipa_data.h | 2 --
> drivers/net/ipa/ipa_mem.c | 21 +++++++++++----------
> 11 files changed, 11 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/net/ipa/data/ipa_data-v3.1.c b/drivers/net/ipa/data/ipa_data-v3.1.c
> index e902d731776da784cdf312a301daefe54db1ef7f..65dba47291552dc8ef15fbb07e04d0510cb88e44 100644
> --- a/drivers/net/ipa/data/ipa_data-v3.1.c
> +++ b/drivers/net/ipa/data/ipa_data-v3.1.c
> @@ -493,7 +493,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x146bd000,
> .imem_size = 0x00002000,
> - .smem_id = 497,
> .smem_size = 0x00002000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v3.5.1.c b/drivers/net/ipa/data/ipa_data-v3.5.1.c
> index f632aab56f4c346e5cfc406034fce1b4b5cc67b3..315e617a8eebecd3a00d1eeed4b978db2f2ba251 100644
> --- a/drivers/net/ipa/data/ipa_data-v3.5.1.c
> +++ b/drivers/net/ipa/data/ipa_data-v3.5.1.c
> @@ -374,7 +374,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x146bd000,
> .imem_size = 0x00002000,
> - .smem_id = 497,
> .smem_size = 0x00002000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v4.11.c b/drivers/net/ipa/data/ipa_data-v4.11.c
> index c1428483ca34d91ad13e8875ff93ab639ee03ff8..f5d66779c2fb19464caa82bea28bf0a259394dc9 100644
> --- a/drivers/net/ipa/data/ipa_data-v4.11.c
> +++ b/drivers/net/ipa/data/ipa_data-v4.11.c
> @@ -367,7 +367,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x146a8000,
> .imem_size = 0x00002000,
> - .smem_id = 497,
> .smem_size = 0x00009000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v4.2.c b/drivers/net/ipa/data/ipa_data-v4.2.c
> index 2c7e8cb429b9c2048498fe8d86df55d490a1235d..f5ed5d745aeb19c770fc9f1955e29d26c26794e0 100644
> --- a/drivers/net/ipa/data/ipa_data-v4.2.c
> +++ b/drivers/net/ipa/data/ipa_data-v4.2.c
> @@ -340,7 +340,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x146a8000,
> .imem_size = 0x00002000,
> - .smem_id = 497,
> .smem_size = 0x00002000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v4.5.c b/drivers/net/ipa/data/ipa_data-v4.5.c
> index 57dc78c526b06c96439155f9c4133c575bdeb6ba..730d8c43a45c37250f3641ac2a4d578c6ad6414c 100644
> --- a/drivers/net/ipa/data/ipa_data-v4.5.c
> +++ b/drivers/net/ipa/data/ipa_data-v4.5.c
> @@ -418,7 +418,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x14688000,
> .imem_size = 0x00003000,
> - .smem_id = 497,
> .smem_size = 0x00009000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v4.7.c b/drivers/net/ipa/data/ipa_data-v4.7.c
> index 41f212209993f10fee338e28027739a7402d5089..5e1d9049c62bd7a451669b1f3941e10661e078eb 100644
> --- a/drivers/net/ipa/data/ipa_data-v4.7.c
> +++ b/drivers/net/ipa/data/ipa_data-v4.7.c
> @@ -360,7 +360,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x146a8000,
> .imem_size = 0x00002000,
> - .smem_id = 497,
> .smem_size = 0x00009000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v4.9.c b/drivers/net/ipa/data/ipa_data-v4.9.c
> index 4eb9c909d5b3fa813b800e9d16ca7d0d73651f2e..da472a2a2e2914ccb026654ccbaf8ffaf5a6d4f4 100644
> --- a/drivers/net/ipa/data/ipa_data-v4.9.c
> +++ b/drivers/net/ipa/data/ipa_data-v4.9.c
> @@ -416,7 +416,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x146bd000,
> .imem_size = 0x00002000,
> - .smem_id = 497,
> .smem_size = 0x00009000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v5.0.c b/drivers/net/ipa/data/ipa_data-v5.0.c
> index 050580c99b65cf178bcd5e90ef832d2288a1a803..bc5722e4b053114621c099273782cdc694098934 100644
> --- a/drivers/net/ipa/data/ipa_data-v5.0.c
> +++ b/drivers/net/ipa/data/ipa_data-v5.0.c
> @@ -442,7 +442,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x14688000,
> .imem_size = 0x00003000,
> - .smem_id = 497,
> .smem_size = 0x00009000,
> };
>
> diff --git a/drivers/net/ipa/data/ipa_data-v5.5.c b/drivers/net/ipa/data/ipa_data-v5.5.c
> index 0e6663e225333c1ffa67fa324bf430172789fd0c..741ae21d9d78520466f4994b68109e0c07409c1d 100644
> --- a/drivers/net/ipa/data/ipa_data-v5.5.c
> +++ b/drivers/net/ipa/data/ipa_data-v5.5.c
> @@ -448,7 +448,6 @@ static const struct ipa_mem_data ipa_mem_data = {
> .local = ipa_mem_local_data,
> .imem_addr = 0x14688000,
> .imem_size = 0x00002000,
> - .smem_id = 497,
> .smem_size = 0x0000b000,
> };
>
> diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h
> index d88cbbbf18b749e22bb09b472dcfa59d44a9dca4..2fd03f0799b207833f9f2b421ce043534720d718 100644
> --- a/drivers/net/ipa/ipa_data.h
> +++ b/drivers/net/ipa/ipa_data.h
> @@ -180,7 +180,6 @@ struct ipa_resource_data {
> * @local: array of IPA-local memory region descriptors
> * @imem_addr: physical address of IPA region within IMEM
> * @imem_size: size in bytes of IPA IMEM region
> - * @smem_id: item identifier for IPA region within SMEM memory
> * @smem_size: size in bytes of the IPA SMEM region
> */
> struct ipa_mem_data {
> @@ -188,7 +187,6 @@ struct ipa_mem_data {
> const struct ipa_mem *local;
> u32 imem_addr;
> u32 imem_size;
> - u32 smem_id;
> u32 smem_size;
> };
>
> diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c
> index dee985eb08cba29d5d7d6418ed6c187ce3d2fb5d..835a3c9c1fd47167da3396424a1653ebcae81d40 100644
> --- a/drivers/net/ipa/ipa_mem.c
> +++ b/drivers/net/ipa/ipa_mem.c
> @@ -26,6 +26,8 @@
> /* SMEM host id representing the modem. */
> #define QCOM_SMEM_HOST_MODEM 1
>
> +#define SMEM_IPA_FILTER_TABLE 497
> +
> const struct ipa_mem *ipa_mem_find(struct ipa *ipa, enum ipa_mem_id mem_id)
> {
> u32 i;
> @@ -509,7 +511,6 @@ static void ipa_imem_exit(struct ipa *ipa)
> /**
> * ipa_smem_init() - Initialize SMEM memory used by the IPA
> * @ipa: IPA pointer
> - * @item: Item ID of SMEM memory
> * @size: Size (bytes) of SMEM memory region
> *
> * SMEM is a managed block of shared DRAM, from which numbered "items"
> @@ -523,7 +524,7 @@ static void ipa_imem_exit(struct ipa *ipa)
> *
> * Note: @size and the item address are is not guaranteed to be page-aligned.
> */
> -static int ipa_smem_init(struct ipa *ipa, u32 item, size_t size)
> +static int ipa_smem_init(struct ipa *ipa, size_t size)
> {
> struct device *dev = ipa->dev;
> struct iommu_domain *domain;
> @@ -545,25 +546,25 @@ static int ipa_smem_init(struct ipa *ipa, u32 item, size_t size)
> * The item might have already been allocated, in which case we
> * use it unless the size isn't what we expect.
> */
> - ret = qcom_smem_alloc(QCOM_SMEM_HOST_MODEM, item, size);
> + ret = qcom_smem_alloc(QCOM_SMEM_HOST_MODEM, SMEM_IPA_FILTER_TABLE, size);
> if (ret && ret != -EEXIST) {
> - dev_err(dev, "error %d allocating size %zu SMEM item %u\n",
> - ret, size, item);
> + dev_err(dev, "error %d allocating size %zu SMEM item\n",
> + ret, size);
> return ret;
> }
>
> /* Now get the address of the SMEM memory region */
> - virt = qcom_smem_get(QCOM_SMEM_HOST_MODEM, item, &actual);
> + virt = qcom_smem_get(QCOM_SMEM_HOST_MODEM, SMEM_IPA_FILTER_TABLE, &actual);
> if (IS_ERR(virt)) {
> ret = PTR_ERR(virt);
> - dev_err(dev, "error %d getting SMEM item %u\n", ret, item);
> + dev_err(dev, "error %d getting SMEM item\n", ret);
> return ret;
> }
>
> /* In case the region was already allocated, verify the size */
> if (ret && actual != size) {
> - dev_err(dev, "SMEM item %u has size %zu, expected %zu\n",
> - item, actual, size);
> + dev_err(dev, "SMEM item has size %zu, expected %zu\n",
> + actual, size);
> return -EINVAL;
> }
>
> @@ -659,7 +660,7 @@ int ipa_mem_init(struct ipa *ipa, struct platform_device *pdev,
> if (ret)
> goto err_unmap;
>
> - ret = ipa_smem_init(ipa, mem_data->smem_id, mem_data->smem_size);
> + ret = ipa_smem_init(ipa, mem_data->smem_size);
> if (ret)
> goto err_imem_exit;
>
>
> ---
> base-commit: edef457004774e598fc4c1b7d1d4f0bcd9d0bb30
> change-id: 20250512-topic-ipa_smem-cee4c5bad903
>
> Best regards,
Powered by blists - more mailing lists