ACPI6.1 clarifies that DCR fields are stored as an array of bytes, update the format interface code constants to match. Cc: Toshi Kani <toshi.kani(a)hpe.com&gt; Signed-off-by: Dan Williams <dan.j.williams(a)intel.com&gt; --- drivers/acpi/nfit.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h index c75576b2d50e..92ea5d06c7fe 100644 --- a/drivers/acpi/nfit.h +++ b/drivers/acpi/nfit.h @@ -41,11 +41,13 @@ enum nfit_uuids { NFIT_UUID_MAX, }; -enum nfit_fic { - NFIT_FIC_BYTE = 0x101, /* byte-addressable energy backed */ - NFIT_FIC_BLK = 0x201, /* block-addressable non-energy backed */ - NFIT_FIC_BYTEN = 0x301, /* byte-addressable non-energy backed */ -}; +/* + * Region format interface codes are stored as an array of bytes in the + * NFIT DIMM Control Region structure + */ +#define NFIT_FIC_BYTE cpu_to_be16(0x101) /* byte-addressable energy */

+#define NFIT_FIC_BLK cpu_to_be16(0x201) /* block-addressable non-energy backed */ +#define NFIT_FIC_BYTEN cpu_to_be16(0x301) /* byte-addressable non-energy backed */ enum { NFIT_BLK_READ_FLUSH = 1, _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm(a)lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm

On Fri, Apr 29, 2016 at 6:53 AM, Linda Knippers <linda.knippers(a)hpe.com&gt; wrote: >  > On 4/28/2016 10:11 PM, Dan Williams wrote: > > > > ACPI6.1 clarifies that DCR fields are stored as an array of bytes, > > update the format interface code constants to match. > > > > Cc: Toshi Kani <toshi.kani(a)hpe.com&gt; > > Signed-off-by: Dan Williams <dan.j.williams(a)intel.com&gt; > > --- > >  drivers/acpi/nfit.h |   12 +++++++----- > >  1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h > > index c75576b2d50e..92ea5d06c7fe 100644 > > --- a/drivers/acpi/nfit.h > > +++ b/drivers/acpi/nfit.h > > @@ -41,11 +41,13 @@ enum nfit_uuids { > >       NFIT_UUID_MAX, > >  }; > > > > -enum nfit_fic { > > -     NFIT_FIC_BYTE = 0x101, /* byte-addressable energy backed */ > > -     NFIT_FIC_BLK = 0x201, /* block-addressable non-energy backed */ > > -     NFIT_FIC_BYTEN = 0x301, /* byte-addressable non-energy backed > > */ > > -}; > > +/* > > + * Region format interface codes are stored as an array of bytes in > > the > > + * NFIT DIMM Control Region structure > > + */ > > +#define NFIT_FIC_BYTE cpu_to_be16(0x101) /* byte-addressable energy > > */ > energy backed? Yup, will fix.