Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <62c6b218.1c69fb81.e948d.0de6@mx.google.com>
Date:   Thu, 7 Jul 2022 12:14:47 +0200
From:   Christian Marangi <ansuelsmth@gmail.com>
To:     Bjorn Andersson <bjorn.andersson@linaro.org>
Cc:     Andy Gross <agross@kernel.org>,
        Konrad Dybcio <konrad.dybcio@somainline.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Ohad Ben-Cohen <ohad@wizery.com>,
        Baolin Wang <baolin.wang7@gmail.com>,
        linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org
Subject: Re: [PATCH 1/3] hwspinlock: qcom: Add support for mmio usage to
 sfpb-mutex
References: <20220707013017.26654-1-ansuelsmth@gmail.com>
 <YsZKuUAc2iHWg9kN@builder.lan>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <YsZKuUAc2iHWg9kN@builder.lan>
Precedence: bulk

On Wed, Jul 06, 2022 at 09:53:45PM -0500, Bjorn Andersson wrote:
> On Wed 06 Jul 20:30 CDT 2022, Christian Marangi wrote:
> 
> > Allow sfpb-mutex to use mmio in addition to syscon.
> > 
> 
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> > ---
> >  drivers/hwspinlock/qcom_hwspinlock.c | 32 ++++++++++++++++++++++------
> >  1 file changed, 25 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c
> > index 364710966665..23c913095bd0 100644
> > --- a/drivers/hwspinlock/qcom_hwspinlock.c
> > +++ b/drivers/hwspinlock/qcom_hwspinlock.c
> > @@ -19,6 +19,11 @@
> >  #define QCOM_MUTEX_APPS_PROC_ID	1
> >  #define QCOM_MUTEX_NUM_LOCKS	32
> >  
> > +struct qcom_hwspinlock_of_data {
> > +	u32 offset;
> > +	u32 stride;
> > +};
> > +
> >  static int qcom_hwspinlock_trylock(struct hwspinlock *lock)
> >  {
> >  	struct regmap_field *field = lock->priv;
> > @@ -63,9 +68,20 @@ static const struct hwspinlock_ops qcom_hwspinlock_ops = {
> >  	.unlock		= qcom_hwspinlock_unlock,
> >  };
> >  
> > +static const struct qcom_hwspinlock_of_data of_sfpb_mutex = {
> > +	.offset = 0x4,
> > +	.stride = 0x4,
> > +};
> > +
> > +/* All modern platform has offset 0 and stride of 4k */
> > +static const struct qcom_hwspinlock_of_data of_tcsr_mutex = {
> > +	.offset = 0,
> > +	.stride = 0x1000,
> > +};
> > +
> >  static const struct of_device_id qcom_hwspinlock_of_match[] = {
> > -	{ .compatible = "qcom,sfpb-mutex" },
> > -	{ .compatible = "qcom,tcsr-mutex" },
> > +	{ .compatible = "qcom,sfpb-mutex", .data = &of_sfpb_mutex },
> > +	{ .compatible = "qcom,tcsr-mutex", .data = &of_tcsr_mutex },
> >  	{ }
> >  };
> >  MODULE_DEVICE_TABLE(of, qcom_hwspinlock_of_match);
> > @@ -101,7 +117,7 @@ static struct regmap *qcom_hwspinlock_probe_syscon(struct platform_device *pdev,
> >  	return regmap;
> >  }
> >  
> > -static const struct regmap_config tcsr_mutex_config = {
> > +static const struct regmap_config qcom_hwspinlock_mmio_config = {
> 
> Any objections against me skipping this rename when applying the patch?
> Just to keep the patch to the point?
> 
> Regards,
> Bjorn
>

I will send v2 with the name reverted and another fix. 

> >  	.reg_bits		= 32,
> >  	.reg_stride		= 4,
> >  	.val_bits		= 32,
> > @@ -112,18 +128,20 @@ static const struct regmap_config tcsr_mutex_config = {
> >  static struct regmap *qcom_hwspinlock_probe_mmio(struct platform_device *pdev,
> >  						 u32 *offset, u32 *stride)
> >  {
> > +	const struct qcom_hwspinlock_of_data *data;
> >  	struct device *dev = &pdev->dev;
> >  	void __iomem *base;
> >  
> > -	/* All modern platform has offset 0 and stride of 4k */
> > -	*offset = 0;
> > -	*stride = 0x1000;
> > +	data = of_device_get_match_data(dev);
> > +
> > +	*offset = data->offset;
> > +	*stride = data->stride;
> >  
> >  	base = devm_platform_ioremap_resource(pdev, 0);
> >  	if (IS_ERR(base))
> >  		return ERR_CAST(base);
> >  
> > -	return devm_regmap_init_mmio(dev, base, &tcsr_mutex_config);
> > +	return devm_regmap_init_mmio(dev, base, &qcom_hwspinlock_mmio_config);
> >  }
> >  
> >  static int qcom_hwspinlock_probe(struct platform_device *pdev)
> > -- 
> > 2.36.1
> > 

-- 
	Ansuel