From: Ocean He <[email protected]>
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 <[email protected]>
---
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
On Wed, 2018-08-08 at 10:50 -0400, Ocean He wrote:
> From: Ocean He <[email protected]>
>
> 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 <[email protected]>
> ---
> 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;
> -----Original Message-----
> From: Verma, Vishal L <[email protected]>
> Sent: Thursday, August 09, 2018 1:43 AM
> To: Williams, Dan J <[email protected]>; [email protected];
> [email protected]; Jiang, Dave <[email protected]>; [email protected];
> [email protected]
> Cc: [email protected]; [email protected]; linux-
> [email protected]; Ocean HY1 He <[email protected]>
> 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 <[email protected]>
> >
> > 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 <[email protected]>
> > ---
> > 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;