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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57DDDC47257 for ; Mon, 4 May 2020 18:30:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3572620721 for ; Mon, 4 May 2020 18:30:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VE9+J/pG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731072AbgEDSat (ORCPT ); Mon, 4 May 2020 14:30:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1729937AbgEDSat (ORCPT ); Mon, 4 May 2020 14:30:49 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0CA6C061A0E for ; Mon, 4 May 2020 11:30:48 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id w3so87756plz.5 for ; Mon, 04 May 2020 11:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=RUuhz5xBXoG/K++UXih0s5Rf57mKbAsAQqA2QvzhMX0=; b=VE9+J/pGfedeUYNhxncR25PbyH2KgXLb9iFqS2vrp+LhM9Ldl6j6fvdCx/cuy0lJ+Z o05/fWn274uca1WTTjfHHFIkpO3OZOiv2m0chUE4mDek9D2tf/iMzqpq0mLyC1Qim9gx l84kxHl02tcw8Tw85j9yg/ozTLkMNpegnvK7h9nxAR+dYMhdmD995G8RVzczrhu7i3ak oYgtdubob2IUAYsAn4pcsuwluwRF/hy6B3oXbW8w7LbctMbZ2gMiemVGIjPb8yRVY3O2 sySiD+hY3FNSWUmhovFdK4eKYqP3nASRfLfNjrPG7pZSfisImDGqerAqeN42sUqMo98K KgzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=RUuhz5xBXoG/K++UXih0s5Rf57mKbAsAQqA2QvzhMX0=; b=YD2t1OGMUu66qHCB5P+/ZYbq+bte1ILsfLVqlNCeikitsWjETGZoxSW3/vqJEl6rRe tXNN7ZVgACnP9soQFQRXk4sYHWNow3raxGntVvvDQXLumEcxhcOnWoK9atKlUKj5r2SF LTVw8LqX9i3FUCtK36Hck5uD9AtnXv5JFPysz6sfaE+1qSJg2rYO88AXBO9tFdriSSt3 F+0sCdmj9E/kFBOYE6ryiUlQWT+Amsm09cMjjycMlHfmPZSxNs3bjs2rk6/c1S3K5sbo j2hpNSRyQs+JFMuMV+1i/vx2MgKBZEn8jKxQ7FLi0v2Ih6AP1OWxgdOrTeIuUs7Lzg9M THQw== X-Gm-Message-State: AGi0PuYE9HmHZRlJZU+7kL9vRVuSy8lU+EUlyAPdZig7kOj0q94RYaVD 0L96jr4dszpjEkSL5gLkTYkQUA== X-Google-Smtp-Source: APiQypIh26Lt/DvfPRknImxFEZNPZCn4JiJiuLq0Z6UhZb81SXNl/e3axflzPok9SfvAt0pT0eCEnw== X-Received: by 2002:a17:902:8b82:: with SMTP id ay2mr521992plb.94.1588617048311; Mon, 04 May 2020 11:30:48 -0700 (PDT) Received: from builder.lan (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id a142sm9325183pfa.6.2020.05.04.11.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:30:47 -0700 (PDT) Date: Mon, 4 May 2020 11:31:31 -0700 From: Bjorn Andersson To: Alex Elder Cc: davem@davemloft.net, evgreen@chromium.org, subashab@codeaurora.org, cpratapa@codeaurora.org, agross@kernel.org, robh+dt@kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next v2 2/4] net: ipa: redefine struct ipa_mem_data Message-ID: <20200504183131.GE20625@builder.lan> References: <20200504175859.22606-1-elder@linaro.org> <20200504175859.22606-3-elder@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200504175859.22606-3-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 04 May 10:58 PDT 2020, Alex Elder wrote: > The ipa_mem_data structure type was never actually used. Instead, > the IPA memory regions were defined using the ipa_mem structure. > > Redefine struct ipa_mem_data so it encapsulates the array of IPA-local > memory region descriptors along with the count of entries in that > array. Pass just an ipa_mem structure pointer to ipa_mem_init(). > > Rename the ipa_mem_data[] array ipa_mem_local_data[] to emphasize > that the memory regions it defines are IPA-local memory. > > Signed-off-by: Alex Elder Reviewed-by: Bjorn Andersson Regards, Bjorn > --- > drivers/net/ipa/ipa_data-sc7180.c | 10 +++++++--- > drivers/net/ipa/ipa_data-sdm845.c | 10 +++++++--- > drivers/net/ipa/ipa_data.h | 13 +++++-------- > drivers/net/ipa/ipa_main.c | 2 +- > drivers/net/ipa/ipa_mem.c | 9 +++++---- > drivers/net/ipa/ipa_mem.h | 3 ++- > 6 files changed, 27 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ipa/ipa_data-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c > index 042b5fc3c135..f97e7e4e61c1 100644 > --- a/drivers/net/ipa/ipa_data-sc7180.c > +++ b/drivers/net/ipa/ipa_data-sc7180.c > @@ -193,7 +193,7 @@ static const struct ipa_resource_data ipa_resource_data = { > }; > > /* IPA-resident memory region configuration for the SC7180 SoC. */ > -static const struct ipa_mem ipa_mem_data[] = { > +static const struct ipa_mem ipa_mem_local_data[] = { > [IPA_MEM_UC_SHARED] = { > .offset = 0x0000, > .size = 0x0080, > @@ -296,12 +296,16 @@ static const struct ipa_mem ipa_mem_data[] = { > }, > }; > > +static struct ipa_mem_data ipa_mem_data = { > + .local_count = ARRAY_SIZE(ipa_mem_local_data), > + .local = ipa_mem_local_data, > +}; > + > /* Configuration data for the SC7180 SoC. */ > const struct ipa_data ipa_data_sc7180 = { > .version = IPA_VERSION_4_2, > .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), > .endpoint_data = ipa_gsi_endpoint_data, > .resource_data = &ipa_resource_data, > - .mem_count = ARRAY_SIZE(ipa_mem_data), > - .mem_data = ipa_mem_data, > + .mem_data = &ipa_mem_data, > }; > diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c > index 0d9c36e1e806..c55507e94559 100644 > --- a/drivers/net/ipa/ipa_data-sdm845.c > +++ b/drivers/net/ipa/ipa_data-sdm845.c > @@ -235,7 +235,7 @@ static const struct ipa_resource_data ipa_resource_data = { > }; > > /* IPA-resident memory region configuration for the SDM845 SoC. */ > -static const struct ipa_mem ipa_mem_data[] = { > +static const struct ipa_mem ipa_mem_local_data[] = { > [IPA_MEM_UC_SHARED] = { > .offset = 0x0000, > .size = 0x0080, > @@ -318,12 +318,16 @@ static const struct ipa_mem ipa_mem_data[] = { > }, > }; > > +static struct ipa_mem_data ipa_mem_data = { > + .local_count = ARRAY_SIZE(ipa_mem_local_data), > + .local = ipa_mem_local_data, > +}; > + > /* Configuration data for the SDM845 SoC. */ > const struct ipa_data ipa_data_sdm845 = { > .version = IPA_VERSION_3_5_1, > .endpoint_count = ARRAY_SIZE(ipa_gsi_endpoint_data), > .endpoint_data = ipa_gsi_endpoint_data, > .resource_data = &ipa_resource_data, > - .mem_count = ARRAY_SIZE(ipa_mem_data), > - .mem_data = ipa_mem_data, > + .mem_data = &ipa_mem_data, > }; > diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h > index 7110de2de817..51d8e5a6f23a 100644 > --- a/drivers/net/ipa/ipa_data.h > +++ b/drivers/net/ipa/ipa_data.h > @@ -246,14 +246,12 @@ struct ipa_resource_data { > > /** > * struct ipa_mem - IPA-local memory region description > - * @offset: offset in IPA memory space to base of the region > - * @size: size in bytes base of the region > - * @canary_count: number of 32-bit "canary" values that precede region > + * @local_count: number of regions defined in the local[] array > + * @local: array of IPA-local memory region descriptors > */ > struct ipa_mem_data { > - u32 offset; > - u16 size; > - u16 canary_count; > + u32 local_count; > + const struct ipa_mem *local; > }; > > /** > @@ -270,8 +268,7 @@ struct ipa_data { > u32 endpoint_count; /* # entries in endpoint_data[] */ > const struct ipa_gsi_endpoint_data *endpoint_data; > const struct ipa_resource_data *resource_data; > - u32 mem_count; /* # entries in mem_data[] */ > - const struct ipa_mem *mem_data; > + const struct ipa_mem_data *mem_data; > }; > > extern const struct ipa_data ipa_data_sdm845; > diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c > index 28998dcce3d2..9295a9122e8e 100644 > --- a/drivers/net/ipa/ipa_main.c > +++ b/drivers/net/ipa/ipa_main.c > @@ -778,7 +778,7 @@ static int ipa_probe(struct platform_device *pdev) > if (ret) > goto err_kfree_ipa; > > - ret = ipa_mem_init(ipa, data->mem_count, data->mem_data); > + ret = ipa_mem_init(ipa, data->mem_data); > if (ret) > goto err_reg_exit; > > diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c > index 42d2c29d9f0c..fb4de2a12796 100644 > --- a/drivers/net/ipa/ipa_mem.c > +++ b/drivers/net/ipa/ipa_mem.c > @@ -12,6 +12,7 @@ > > #include "ipa.h" > #include "ipa_reg.h" > +#include "ipa_data.h" > #include "ipa_cmd.h" > #include "ipa_mem.h" > #include "ipa_data.h" > @@ -266,15 +267,15 @@ int ipa_mem_zero_modem(struct ipa *ipa) > } > > /* Perform memory region-related initialization */ > -int ipa_mem_init(struct ipa *ipa, u32 count, const struct ipa_mem *mem) > +int ipa_mem_init(struct ipa *ipa, const struct ipa_mem_data *mem_data) > { > struct device *dev = &ipa->pdev->dev; > struct resource *res; > int ret; > > - if (count > IPA_MEM_COUNT) { > + if (mem_data->local_count > IPA_MEM_COUNT) { > dev_err(dev, "to many memory regions (%u > %u)\n", > - count, IPA_MEM_COUNT); > + mem_data->local_count, IPA_MEM_COUNT); > return -EINVAL; > } > > @@ -302,7 +303,7 @@ int ipa_mem_init(struct ipa *ipa, u32 count, const struct ipa_mem *mem) > ipa->mem_size = resource_size(res); > > /* The ipa->mem[] array is indexed by enum ipa_mem_id values */ > - ipa->mem = mem; > + ipa->mem = mem_data->local; > > return 0; > } > diff --git a/drivers/net/ipa/ipa_mem.h b/drivers/net/ipa/ipa_mem.h > index 065cb499ebe5..f99180f84f0d 100644 > --- a/drivers/net/ipa/ipa_mem.h > +++ b/drivers/net/ipa/ipa_mem.h > @@ -7,6 +7,7 @@ > #define _IPA_MEM_H_ > > struct ipa; > +struct ipa_mem_data; > > /** > * DOC: IPA Local Memory > @@ -84,7 +85,7 @@ void ipa_mem_teardown(struct ipa *ipa); > > int ipa_mem_zero_modem(struct ipa *ipa); > > -int ipa_mem_init(struct ipa *ipa, u32 count, const struct ipa_mem *mem); > +int ipa_mem_init(struct ipa *ipa, const struct ipa_mem_data *mem_data); > void ipa_mem_exit(struct ipa *ipa); > > #endif /* _IPA_MEM_H_ */ > -- > 2.20.1 >