| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <94F2FBAB4432B54E8AACC7DFDE6C92E37E44D64B@ORSMSX110.amr.corp.intel.com>
Date: Tue, 1 Mar 2016 15:13:25 +0000
From: "Moore, Robert" <robert.moore@...el.com>
To: Toshi Kani <toshi.kani@....com>,
"rjw@...ysocki.net" <rjw@...ysocki.net>,
"Williams, Dan J" <dan.j.williams@...el.com>
CC: "Zheng, Lv" <lv.zheng@...el.com>,
"elliott@....com" <elliott@....com>,
"linux-nvdimm@...ts.01.org" <linux-nvdimm@...ts.01.org>,
"linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"devel@...ica.org" <devel@...ica.org>
Subject: RE: [PATCH v2 1/3] ACPI/NFIT: Update Control Region Structure to
comply ACPI 6.1
> -----Original Message-----
> From: Toshi Kani [mailto:toshi.kani@....com]
> Sent: Monday, February 22, 2016 1:55 PM
> To: rjw@...ysocki.net; Williams, Dan J
> Cc: Moore, Robert; Zheng, Lv; elliott@....com; linux-nvdimm@...ts.01.org;
> linux-acpi@...r.kernel.org; linux-kernel@...r.kernel.org;
> devel@...ica.org; Toshi Kani
> Subject: [PATCH v2 1/3] ACPI/NFIT: Update Control Region Structure to
> comply ACPI 6.1
>
> ACPI 6.1, Table 5-133, updates NVDIMM Control Region Structure as follows.
> - Valid Fields, Manufacturing Location, and Manufacturing Date
> are added from reserved range. No change in the structure size.
> - IDs defined as SPD values are arrays of bytes. The spec
> clarified that they need to be represented as arrays of bytes
> as well.
>
> This patch makes the following changes to support this update.
> - Change 'struct acpi_nfit_control_region' to reflect the update.
> SPD IDs are defined as arrays of bytes, so that they can be
> treated in the same way regardless of CPU endianness and are
> not miss-treated as little-endian numeric values.
I don't think we are going to start changing the ACPI tables defined in the ACPICA headers because of this. We do in fact have macros for this purpose.
> - Change the NFIT driver to show SPD ID values as array of bytes
> in sysfs.
> - Change sprintf format to use "0x" instead of "#" since "%#02x"
> does not prepend '0' in some reason.
>
> link: http://www.uefi.org/sites/default/files/resources/ACPI_6_1.pdf
> Signed-off-by: Toshi Kani <toshi.kani@....com>
> Cc: Rafael J. Wysocki <rjw@...ysocki.net>
> Cc: Dan Williams <dan.j.williams@...el.com>
> Cc: Robert Moore <robert.moore@...el.com>
> Cc: Lv Zheng <lv.zheng@...el.com>
> Cc: Robert Elliott <elliott@....com>
> Cc: <devel@...ica.org>
> ---
> drivers/acpi/nfit.c | 20 +++++++++++++-------
> include/acpi/actbl1.h | 24 +++++++++++++++---------
> 2 files changed, 28 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index
> ad6d8c6..4982a18 100644
> --- a/drivers/acpi/nfit.c
> +++ b/drivers/acpi/nfit.c
> @@ -722,7 +722,8 @@ static ssize_t vendor_show(struct device *dev, {
> struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
>
> - return sprintf(buf, "%#x\n", dcr->vendor_id);
> + return sprintf(buf, "0x%02x%02x\n",
> + dcr->vendor_id[0], dcr->vendor_id[1]);
> }
> static DEVICE_ATTR_RO(vendor);
>
> @@ -731,7 +732,8 @@ static ssize_t rev_id_show(struct device *dev, {
> struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
>
> - return sprintf(buf, "%#x\n", dcr->revision_id);
> + return sprintf(buf, "0x%02x%02x\n",
> + dcr->revision_id[0], dcr->revision_id[1]);
> }
> static DEVICE_ATTR_RO(rev_id);
>
> @@ -740,7 +742,8 @@ static ssize_t device_show(struct device *dev, {
> struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
>
> - return sprintf(buf, "%#x\n", dcr->device_id);
> + return sprintf(buf, "0x%02x%02x\n",
> + dcr->device_id[0], dcr->device_id[1]);
> }
> static DEVICE_ATTR_RO(device);
>
> @@ -749,7 +752,7 @@ static ssize_t format_show(struct device *dev, {
> struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
>
> - return sprintf(buf, "%#x\n", dcr->code);
> + return sprintf(buf, "0x%02x%02x\n", dcr->code[0], dcr->code[1]);
> }
> static DEVICE_ATTR_RO(format);
>
> @@ -758,7 +761,9 @@ static ssize_t serial_show(struct device *dev, {
> struct acpi_nfit_control_region *dcr = to_nfit_dcr(dev);
>
> - return sprintf(buf, "%#x\n", dcr->serial_number);
> + return sprintf(buf, "0x%02x%02x%02x%02x\n",
> + dcr->serial_number[0], dcr->serial_number[1],
> + dcr->serial_number[2], dcr->serial_number[3]);
> }
> static DEVICE_ATTR_RO(serial);
>
> @@ -956,7 +961,7 @@ static const struct attribute_group
> *acpi_nfit_region_attribute_groups[] = { struct nfit_set_info {
> struct nfit_set_info_map {
> u64 region_offset;
> - u32 serial_number;
> + u8 serial_number[4];
> u32 pad;
> } mapping[0];
> };
> @@ -1025,7 +1030,8 @@ static int acpi_nfit_init_interleave_set(struct
> acpi_nfit_desc *acpi_desc,
> }
>
> map->region_offset = memdev->region_offset;
> - map->serial_number = nfit_mem->dcr->serial_number;
> + memcpy(map->serial_number, nfit_mem->dcr->serial_number,
> + sizeof(map->serial_number));
> }
>
> sort(&info->mapping[0], nr, sizeof(struct nfit_set_info_map), diff -
> -git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index
> 16e0136..d8df62c 100644
> --- a/include/acpi/actbl1.h
> +++ b/include/acpi/actbl1.h
> @@ -1040,15 +1040,18 @@ struct acpi_nfit_smbios { struct
> acpi_nfit_control_region {
> struct acpi_nfit_header header;
> u16 region_index;
> - u16 vendor_id;
> - u16 device_id;
> - u16 revision_id;
> - u16 subsystem_vendor_id;
> - u16 subsystem_device_id;
> - u16 subsystem_revision_id;
> - u8 reserved[6]; /* Reserved, must be zero */
> - u32 serial_number;
> - u16 code;
> + u8 vendor_id[2];
> + u8 device_id[2];
> + u8 revision_id[2];
> + u8 subsystem_vendor_id[2];
> + u8 subsystem_device_id[2];
> + u8 subsystem_revision_id[2];
> + u8 valid_fields;
> + u8 manufacturing_location;
> + u8 manufacturing_date[2];
> + u8 reserved[2]; /* Reserved, must be zero */
> + u8 serial_number[4];
> + u8 code[2];
> u16 windows;
> u64 window_size;
> u64 command_offset;
> @@ -1059,6 +1062,9 @@ struct acpi_nfit_control_region {
> u8 reserved1[6]; /* Reserved, must be zero */
> };
>
> +/* Valid Fields */
> +#define ACPI_NFIT_CONTROL_MFG_INFO_VALID (1) /* Manufacturing fields
> are valid */
> +
> /* Flags */
>
> #define ACPI_NFIT_CONTROL_BUFFERED (1) /* Block Data Windows
> implementation is buffered */
Powered by blists - more mailing lists