[PATCH] ACPI: nfit: check dcr immediately following its assignment codes

[PATCH] ACPI: nfit: check dcr immediately following its assignment codes

[Ocean He]

From: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>

In commit 6697b2cf69d43632 ("nfit: fix multi-interface dimm handling,
acpi6.1 compatibility"), the check codes of dcr were just following its
assignment codes. But they were separated by commit ad9ac5e1957531a8
("nfit: always associate flush hints").

Just change the check codes back to original position, without function
change.

Signed-off-by: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>
---
 drivers/acpi/nfit/core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 7c47900..c9e4c9a 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1078,6 +1078,12 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
 			break;
 		}
 
+		if (dcr && !nfit_mem->dcr) {
+			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
+					spa->range_index, dcr);
+			return -ENODEV;
+		}
+
 		list_for_each_entry(nfit_flush, &acpi_desc->flushes, list) {
 			struct acpi_nfit_flush_address *flush;
 			u16 i;
@@ -1101,12 +1107,6 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
 			break;
 		}
 
-		if (dcr && !nfit_mem->dcr) {
-			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
-					spa->range_index, dcr);
-			return -ENODEV;
-		}
-
 		if (type == NFIT_SPA_DCR) {
 			struct nfit_idt *nfit_idt;
 			u16 idt_idx;
-- 
1.8.3.1

Re: [PATCH] ACPI: nfit: check dcr immediately following its assignment codes

[Verma, Vishal L]

On Wed, 2018-08-08 at 10:50 -0400, Ocean He wrote:
> From: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>
> 
> In commit 6697b2cf69d43632 ("nfit: fix multi-interface dimm handling,
> acpi6.1 compatibility"), the check codes of dcr were just following its
> assignment codes. But they were separated by commit ad9ac5e1957531a8
> ("nfit: always associate flush hints").
> 
> Just change the check codes back to original position, without function
> change.
> 
> Signed-off-by: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>
> ---
>  drivers/acpi/nfit/core.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

This seems like unnecessary churn. Does it cause any problems in
practice?

> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 7c47900..c9e4c9a 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -1078,6 +1078,12 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
>  			break;
>  		}
>  
> +		if (dcr && !nfit_mem->dcr) {
> +			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
> +					spa->range_index, dcr);
> +			return -ENODEV;
> +		}
> +
>  		list_for_each_entry(nfit_flush, &acpi_desc->flushes, list) {
>  			struct acpi_nfit_flush_address *flush;
>  			u16 i;
> @@ -1101,12 +1107,6 @@ static int __nfit_mem_init(struct acpi_nfit_desc *acpi_desc,
>  			break;
>  		}
>  
> -		if (dcr && !nfit_mem->dcr) {
> -			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
> -					spa->range_index, dcr);
> -			return -ENODEV;
> -		}
> -
>  		if (type == NFIT_SPA_DCR) {
>  			struct nfit_idt *nfit_idt;
>  			u16 idt_idx;

RE: [External] Re: [PATCH] ACPI: nfit: check dcr immediately following its assignment codes

[Ocean HY1 He]

> -----Original Message-----
> From: Verma, Vishal L <vishal.l.verma-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Sent: Thursday, August 09, 2018 1:43 AM
> To: Williams, Dan J <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; ross.zwisler-VuQAYsv1563Yd54FQh9/CA@public.gmane.org;
> oceanhehy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org; Jiang, Dave <dave.jiang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org;
> rjw-LthD3rsA81gm4RdzfppkhA@public.gmane.org
> Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org; linux-
> acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Ocean HY1 He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>
> Subject: [External] Re: [PATCH] ACPI: nfit: check dcr immediately following its
> assignment codes
> 
> 
> On Wed, 2018-08-08 at 10:50 -0400, Ocean He wrote:
> > From: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>
> >
> > In commit 6697b2cf69d43632 ("nfit: fix multi-interface dimm handling,
> > acpi6.1 compatibility"), the check codes of dcr were just following its
> > assignment codes. But they were separated by commit ad9ac5e1957531a8
> > ("nfit: always associate flush hints").
> >
> > Just change the check codes back to original position, without function
> > change.
> >
> > Signed-off-by: Ocean He <hehy1-6jq1YtArVR3QT0dZR+AlfA@public.gmane.org>
> > ---
> >  drivers/acpi/nfit/core.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> This seems like unnecessary churn. Does it cause any problems in
> practice?
> 
The original codes do not cause any problems.
Ocean.
> >
> > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> > index 7c47900..c9e4c9a 100644
> > --- a/drivers/acpi/nfit/core.c
> > +++ b/drivers/acpi/nfit/core.c
> > @@ -1078,6 +1078,12 @@ static int __nfit_mem_init(struct acpi_nfit_desc
> *acpi_desc,
> >  			break;
> >  		}
> >
> > +		if (dcr && !nfit_mem->dcr) {
> > +			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
> > +					spa->range_index, dcr);
> > +			return -ENODEV;
> > +		}
> > +
> >  		list_for_each_entry(nfit_flush, &acpi_desc->flushes, list) {
> >  			struct acpi_nfit_flush_address *flush;
> >  			u16 i;
> > @@ -1101,12 +1107,6 @@ static int __nfit_mem_init(struct acpi_nfit_desc
> *acpi_desc,
> >  			break;
> >  		}
> >
> > -		if (dcr && !nfit_mem->dcr) {
> > -			dev_err(acpi_desc->dev, "SPA %d missing DCR %d\n",
> > -					spa->range_index, dcr);
> > -			return -ENODEV;
> > -		}
> > -
> >  		if (type == NFIT_SPA_DCR) {
> >  			struct nfit_idt *nfit_idt;
> >  			u16 idt_idx;