Merge ~dannf/ubuntu/+source/freeipmi:merge-cosmic into ~racb/ubuntu/+source/freeipmi:merge-cosmic

[dann frazier]

Unmerged commits

0eadb51... by dann frazier on 2018-08-02

Add support to ipmi-locate for parsing ACPI/SPMI tables out of sysfs:

* Cherry-pick patches from upstream that add support to ipmi-locate
  for parsing ACPI/SPMI tables out of sysfs:
  - 0001-Fix-acpi-spmi-searching-corner-case.patch
  - 0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
  - 0003-Split-RSDT-XSDT-parsing-into-new-function.patch
  - 0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
  - 0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
  - 0006-Correct-order-of-bytes-in-specification_revision-fie.patch

diff --git a/debian/changelog b/debian/changelog
index 5a75ef2..c18bcca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 freeipmi (1.5.7-2ubuntu1) cosmic; urgency=medium
 
+  [ Robie Basak ]
   * Merge with Debian unstable. Remaining changes:
     - debian/rules: Build with "-pie,-bindnow"
     - Use dh-autoreconf to update libtool for ppc64el.
@@ -9,6 +10,16 @@ freeipmi (1.5.7-2ubuntu1) cosmic; urgency=medium
   * Drop changes:
     - Use kernel DMI table interface, when available (adopted upstream).
 
+  [ dann frazier ]
+  * Cherry-pick patches from upstream that add support to ipmi-locate
+    for parsing ACPI/SPMI tables out of sysfs (LP: #1784926):
+    - 0001-Fix-acpi-spmi-searching-corner-case.patch
+    - 0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
+    - 0003-Split-RSDT-XSDT-parsing-into-new-function.patch
+    - 0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
+    - 0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
+    - 0006-Correct-order-of-bytes-in-specification_revision-fie.patch
+
  -- Robie Basak <[e-mail]>  Thu, 26 Jul 2018 14:19:18 +0100
 
 freeipmi (1.5.7-2) unstable; urgency=medium
diff --git a/debian/patches/0001-Fix-acpi-spmi-searching-corner-case.patch b/debian/patches/0001-Fix-acpi-spmi-searching-corner-case.patch
new file mode 100644
index 0000000..37130c9
--- /dev/null
+++ b/debian/patches/0001-Fix-acpi-spmi-searching-corner-case.patch
@@ -0,0 +1,29 @@
+From d8673cf67d4cc856664f26b505a4f67a94f62d2b Mon Sep 17 00:00:00 2001
+From: Albert Chu <[e-mail]>
+Date: Tue, 31 Jul 2018 17:11:09 -0700
+Subject: [PATCH 1/6] Fix acpi spmi searching corner case
+
+---
+ ChangeLog                                  | 6 ++++++
+ libfreeipmi/locate/ipmi-locate-acpi-spmi.c | 5 ++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+index 8e2cfe5e7..9593943e5 100644
+--- a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
++++ b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+@@ -1461,7 +1461,10 @@ _ipmi_acpi_get_spmi_table (ipmi_locate_ctx_t ctx,
+ 
+       table_interface_type = val;
+       if (table_interface_type == interface_type)
+-        rv = 0;
++        {
++          rv = 0;
++          break;
++        }
+     }
+ 
+  cleanup:
+-- 
+2.18.0
+
diff --git a/debian/patches/0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch b/debian/patches/0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
new file mode 100644
index 0000000..d7e735d
--- /dev/null
+++ b/debian/patches/0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
@@ -0,0 +1,183 @@
+From 3c6fa7054ab4c1d899da9d3bacb9704f9f45c0f6 Mon Sep 17 00:00:00 2001
+From: dann frazier <[e-mail]>
+Date: Wed, 1 Aug 2018 11:01:08 -0600
+Subject: [PATCH 2/6] Don't try to separate the header from the ACPI table data
+
+_ipmi_acpi_get_spmi_table() calls _ipmi_acpi_get_firmware_table() to
+populate obj_acpi_table_hdr and table_data with the SPMI table header
+and SPMI table data, respectively. However, there appears to be an
+internal discrepancy as to whether or not the table_data should also
+contain the header as well.
+
+_ipmi_acpi_get_firmware_table() only returns the non-header data in
+table_data._ipmi_acpi_get_spmi_table() then loads that data into an
+object using the SPMI table template (tmpl_acpi_spmi_table_descriptor).
+However, you'll notice that the SPMI table template also includes the
+ACPI table header fields. So fiid_obj_set_all() is copying the headerless
+data into an object expecting header+data, corrupting it.
+
+One way to solve this problem would be removing the header fields from
+the SPMI table template, and adjusting the code appropriately. Another is
+to stop treating header and non-header data differently here, storing
+them both in table_data. That is the approach I've taken here. It also
+cleans up a layering issue where ipmi_locate_acpi_spmi_get_device_info
+was creating and passing the obj_acpi_table_hdr variable down to lower
+levels to use, while not having any use for the variable itself.
+---
+ ChangeLog                                  |  6 ++++
+ libfreeipmi/locate/ipmi-locate-acpi-spmi.c | 35 ++++------------------
+ 2 files changed, 11 insertions(+), 30 deletions(-)
+
+diff --git a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+index 9593943e5..6d4ca3e6c 100644
+--- a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
++++ b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+@@ -596,12 +596,10 @@ static int _ipmi_acpi_get_table (ipmi_locate_ctx_t ctx,
+ static int _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+                                           char *signature,
+                                           unsigned int table_instance,
+-                                          fiid_obj_t obj_acpi_table_hdr,
+                                           uint8_t **sign_table_data,
+                                           uint32_t *sign_table_data_length);
+ static int _ipmi_acpi_get_spmi_table (ipmi_locate_ctx_t ctx,
+                                       uint8_t interface_type,
+-                                      fiid_obj_t obj_acpi_table_hdr,
+                                       fiid_obj_t obj_acpi_spmi_table_descriptor);
+ 
+ #define IPMI_INTERFACE_COUNT 5
+@@ -1138,14 +1136,12 @@ _ipmi_acpi_get_table (ipmi_locate_ctx_t ctx,
+  * PARAMETERS:
+  *   signature               - ACPI signature for firmware table header
+  *   table_instance          - Which instance of the firmware table
+- *   obj_acpi_table_hdr      - Initialized ACPI table header
+  *   sign_table_data         - Initialized with malloc'ed ACPI firmware table data
+  *   sign_table_data_length  - ACPI table DATA length
+  *
+  * RETURN:
+  *   return (0) for success. ACPI table header and firmware table DATA are
+- *   returned through obj_acpi_table_hdr and signed_table_data
+- *   parameters.
++ *   returned through the signed_table_data parameter.
+  *
+  * DESCRIPTION:
+  *   Top level call for any ACPI firmware table by table signature string.
+@@ -1156,7 +1152,6 @@ static int
+ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+                                char *signature,
+                                unsigned int table_instance,
+-                               fiid_obj_t obj_acpi_table_hdr,
+                                uint8_t **sign_table_data,
+                                uint32_t *sign_table_data_length)
+ {
+@@ -1197,10 +1192,8 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+   assert (ctx);
+   assert (ctx->magic == IPMI_LOCATE_CTX_MAGIC);
+   assert (signature);
+-  assert (fiid_obj_valid (obj_acpi_table_hdr));
+   assert (sign_table_data);
+   assert (sign_table_data_length);
+-  assert (fiid_obj_template_compare (obj_acpi_table_hdr, tmpl_acpi_table_hdr) == 1);
+ 
+   *sign_table_data = NULL;
+ 
+@@ -1345,16 +1338,13 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+       goto cleanup;
+     }
+ 
+-  memcpy (obj_acpi_table_hdr, acpi_table, acpi_table_hdr_length);
+-  *sign_table_data_length = acpi_table_length - acpi_table_hdr_length;
++  *sign_table_data_length = acpi_table_length;
+   if (!(*sign_table_data = malloc (*sign_table_data_length)))
+     {
+       LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_OUT_OF_MEMORY);
+       goto cleanup;
+     }
+-  memcpy (*sign_table_data,
+-          (acpi_table + acpi_table_hdr_length),
+-          *sign_table_data_length);
++  memcpy (*sign_table_data, acpi_table, *sign_table_data_length);
+ 
+   rv = 0;
+  cleanup:
+@@ -1372,13 +1362,11 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+  *
+  * PARAMETERS:
+  *   interface_type           - Type of interface to look for (KCS, SSIF, SMIC, BT)
+- *   obj_acpi_table_hdr       - Initialized ACPI table header
+  *   acpi_table_firmware      - Initialized ACPI firmware table
+  *
+  * RETURN:
+- *   return (0) for success. ACPI table header and SPMI table is
+- *   returned through obj_acpi_table_hdr and obj_acpi_spmi_table_descriptor
+- *   parameters.
++ *   return (0) for success. ACPI SPMI table (including header) is
++ *   returned through the obj_acpi_spmi_table_descriptor parameter.
+  *
+  * DESCRIPTION:
+  *   Get SPMI table for the given interface type.
+@@ -1387,7 +1375,6 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+ static int
+ _ipmi_acpi_get_spmi_table (ipmi_locate_ctx_t ctx,
+                            uint8_t interface_type,
+-                           fiid_obj_t obj_acpi_table_hdr,
+                            fiid_obj_t obj_acpi_spmi_table_descriptor)
+ {
+   uint64_t val;
+@@ -1401,9 +1388,7 @@ _ipmi_acpi_get_spmi_table (ipmi_locate_ctx_t ctx,
+ 
+   assert (ctx);
+   assert (ctx->magic == IPMI_LOCATE_CTX_MAGIC);
+-  assert (fiid_obj_valid (obj_acpi_table_hdr));
+   assert (fiid_obj_valid (obj_acpi_spmi_table_descriptor));
+-  assert (fiid_obj_template_compare (obj_acpi_table_hdr, tmpl_acpi_table_hdr) == 1);
+   assert (fiid_obj_template_compare (obj_acpi_spmi_table_descriptor, tmpl_acpi_spmi_table_descriptor) == 1);
+ 
+   for (instance = 0; instance < IPMI_INTERFACE_COUNT; instance++)
+@@ -1411,7 +1396,6 @@ _ipmi_acpi_get_spmi_table (ipmi_locate_ctx_t ctx,
+       if (_ipmi_acpi_get_firmware_table (ctx,
+                                          IPMI_ACPI_SPMI_SIG,
+                                          instance,
+-                                         obj_acpi_table_hdr,
+                                          &table_data,
+                                          &table_data_length) < 0)
+         continue;
+@@ -1477,7 +1461,6 @@ ipmi_locate_acpi_spmi_get_device_info (ipmi_locate_ctx_t ctx,
+                                        ipmi_interface_type_t type,
+                                        struct ipmi_locate_info *info)
+ {
+-  fiid_obj_t obj_acpi_table_hdr = NULL;
+   fiid_obj_t obj_acpi_spmi_table_descriptor = NULL;
+   struct ipmi_locate_info linfo;
+   uint64_t val;
+@@ -1507,12 +1490,6 @@ ipmi_locate_acpi_spmi_get_device_info (ipmi_locate_ctx_t ctx,
+     }
+   linfo.locate_driver_type = IPMI_LOCATE_DRIVER_ACPI;
+ 
+-  if (!(obj_acpi_table_hdr = fiid_obj_create (tmpl_acpi_table_hdr)))
+-    {
+-      LOCATE_ERRNO_TO_LOCATE_ERRNUM (ctx, errno);
+-      goto cleanup;
+-    }
+-
+   if (!(obj_acpi_spmi_table_descriptor = fiid_obj_create (tmpl_acpi_spmi_table_descriptor)))
+     {
+       LOCATE_ERRNO_TO_LOCATE_ERRNUM (ctx, errno);
+@@ -1521,7 +1498,6 @@ ipmi_locate_acpi_spmi_get_device_info (ipmi_locate_ctx_t ctx,
+ 
+   if (_ipmi_acpi_get_spmi_table (ctx,
+                                  type,
+-                                 obj_acpi_table_hdr,
+                                  obj_acpi_spmi_table_descriptor) < 0)
+     goto cleanup;
+ 
+@@ -1666,7 +1642,6 @@ ipmi_locate_acpi_spmi_get_device_info (ipmi_locate_ctx_t ctx,
+   memcpy (info, &linfo, sizeof (struct ipmi_locate_info));
+   rv = 0;
+  cleanup:
+-  fiid_obj_destroy (obj_acpi_table_hdr);
+   fiid_obj_destroy (obj_acpi_spmi_table_descriptor);
+   return (rv);
+ #endif /* defined(__arm__) || defined(__aarch64__) */
+-- 
+2.18.0
+
diff --git a/debian/patches/0003-Split-RSDT-XSDT-parsing-into-new-function.patch b/debian/patches/0003-Split-RSDT-XSDT-parsing-into-new-function.patch
new file mode 100644
index 0000000..45e8a2c
--- /dev/null
+++ b/debian/patches/0003-Split-RSDT-XSDT-parsing-into-new-function.patch
@@ -0,0 +1,189 @@
+From 184c746494c332c57deab661da1e949b5fc286a7 Mon Sep 17 00:00:00 2001
+From: dann frazier <[e-mail]>
+Date: Wed, 1 Aug 2018 11:01:09 -0600
+Subject: [PATCH 3/6] Split RSDT/XSDT parsing into new function
+
+In preparation for adding a new ACPI table retrieval method, split the
+existing code that retrieves tables out of /dev/mem into a new function.
+No functional change intended.
+---
+ libfreeipmi/locate/ipmi-locate-acpi-spmi.c | 109 +++++++++++++++++----
+ 1 file changed, 88 insertions(+), 21 deletions(-)
+
+diff --git a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+index 6d4ca3e6c..4eb5adae7 100644
+--- a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
++++ b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+@@ -593,6 +593,11 @@ static int _ipmi_acpi_get_table (ipmi_locate_ctx_t ctx,
+                                  char *signature,
+                                  uint8_t **acpi_table,
+                                  uint32_t *acpi_table_length);
++static int _ipmi_acpi_get_table_dev_mem (ipmi_locate_ctx_t ctx,
++                                         char *signature,
++                                         unsigned int table_instance,
++                                         uint8_t **acpi_table,
++                                         uint32_t *acpi_table_length);
+ static int _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+                                           char *signature,
+                                           unsigned int table_instance,
+@@ -1131,16 +1136,16 @@ _ipmi_acpi_get_table (ipmi_locate_ctx_t ctx,
+ /*******************************************************************************
+  *
+  * FUNCTION:
+- *   _ipmi_acpi_get_firmware_table
++ *   _ipmi_acpi_get_firmware_table_dev_mem
+  *
+  * PARAMETERS:
+- *   signature               - ACPI signature for firmware table header
+- *   table_instance          - Which instance of the firmware table
+- *   sign_table_data         - Initialized with malloc'ed ACPI firmware table data
+- *   sign_table_data_length  - ACPI table DATA length
++ *   signature          - ACPI signature for firmware table header
++ *   table_instance     - Which instance of the firmware table
++ *   acpi_table         - Initialized with malloc'ed ACPI firmware table data
++ *   acpi_table_length  - ACPI table DATA length
+  *
+  * RETURN:
+- *   return (0) for success. ACPI table header and firmware table DATA are
++ *   return (0) for success. ACPI table (including header) is
+  *   returned through the signed_table_data parameter.
+  *
+  * DESCRIPTION:
+@@ -1149,11 +1154,11 @@ _ipmi_acpi_get_table (ipmi_locate_ctx_t ctx,
+  *
+  ******************************************************************************/
+ static int
+-_ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+-                               char *signature,
+-                               unsigned int table_instance,
+-                               uint8_t **sign_table_data,
+-                               uint32_t *sign_table_data_length)
++_ipmi_acpi_get_table_dev_mem (ipmi_locate_ctx_t ctx,
++                              char *signature,
++                              unsigned int table_instance,
++                              uint8_t **acpi_table,
++                              uint32_t *acpi_table_length)
+ {
+   uint64_t val;
+ 
+@@ -1170,8 +1175,6 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+   uint8_t *rsdt_xsdt_table_data;
+   uint32_t rsdt_xsdt_table_data_length;
+   unsigned int acpi_table_count;
+-  uint8_t *acpi_table = NULL;
+-  uint32_t acpi_table_length;
+ 
+   fiid_obj_t obj_table = NULL;
+   uint64_t table_address;
+@@ -1192,10 +1195,10 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+   assert (ctx);
+   assert (ctx->magic == IPMI_LOCATE_CTX_MAGIC);
+   assert (signature);
+-  assert (sign_table_data);
+-  assert (sign_table_data_length);
++  assert (acpi_table);
++  assert (acpi_table_length);
+ 
+-  *sign_table_data = NULL;
++  *acpi_table = NULL;
+ 
+   if ((acpi_table_hdr_length = fiid_template_len_bytes (tmpl_acpi_table_hdr)) < 0)
+     {
+@@ -1319,8 +1322,8 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+       if (_ipmi_acpi_get_table (ctx,
+                                 table_address,
+                                 signature,
+-                                &acpi_table,
+-                                &acpi_table_length) < 0)
++                                acpi_table,
++                                acpi_table_length) < 0)
+         continue;
+ 
+       signature_table_count++;
+@@ -1338,6 +1341,73 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+       goto cleanup;
+     }
+ 
++  rv = 0;
++ cleanup:
++  free (rsdt_xsdt_table);
++  fiid_obj_destroy (obj_table);
++  fiid_obj_destroy (obj_acpi_rsdp_descriptor);
++  return (rv);
++}
++
++/*******************************************************************************
++ *
++ * FUNCTION:
++ *   _ipmi_acpi_get_firmware_table
++ *
++ * PARAMETERS:
++ *   signature               - ACPI signature for firmware table header
++ *   table_instance          - Which instance of the firmware table
++ *   sign_table_data         - Initialized with malloc'ed ACPI firmware table data
++ *   sign_table_data_length  - ACPI table DATA length
++ *
++ * RETURN:
++ *   return (0) for success. ACPI table (including header) is returned
++ *   through the signed_table_data parameter.
++ *
++ * DESCRIPTION:
++ *   Top level call for any ACPI firmware table by table signature string.
++ *
++ ******************************************************************************/
++static int
++_ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
++                               char *signature,
++                               unsigned int table_instance,
++                               uint8_t **sign_table_data,
++                               uint32_t *sign_table_data_length)
++{
++  uint64_t val;
++
++  int acpi_table_hdr_length;
++  int acpi_rsdp_descriptor_length;
++
++  uint8_t *acpi_table = NULL;
++  uint32_t acpi_table_length;
++
++  int rv = -1;
++
++  assert (ctx);
++  assert (ctx->magic == IPMI_LOCATE_CTX_MAGIC);
++  assert (signature);
++  assert (sign_table_data);
++  assert (sign_table_data_length);
++
++  *sign_table_data = NULL;
++
++  if ((_ipmi_acpi_get_table_dev_mem (ctx, signature,
++                                     table_instance,
++                                     &acpi_table,
++                                     &acpi_table_length) != 0))
++    {
++      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_SYSTEM_ERROR);
++      goto cleanup;
++    }
++
++  if (!acpi_table)
++    {
++      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_SYSTEM_ERROR);
++      goto cleanup;
++    }
++
+   *sign_table_data_length = acpi_table_length;
+   if (!(*sign_table_data = malloc (*sign_table_data_length)))
+     {
+@@ -1349,9 +1419,6 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+   rv = 0;
+  cleanup:
+   free (acpi_table);
+-  free (rsdt_xsdt_table);
+-  fiid_obj_destroy (obj_table);
+-  fiid_obj_destroy (obj_acpi_rsdp_descriptor);
+   return (rv);
+ }
+ 
+-- 
+2.18.0
+
diff --git a/debian/patches/0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch b/debian/patches/0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
new file mode 100644
index 0000000..758f4e4
--- /dev/null
+++ b/debian/patches/0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
@@ -0,0 +1,159 @@
+From 158a901d74bec24b4c1c9f6737f975dd27c7eef2 Mon Sep 17 00:00:00 2001
+From: dann frazier <[e-mail]>
+Date: Wed, 1 Aug 2018 11:01:10 -0600
+Subject: [PATCH 4/6] Add support for parsing SPMI tables exposed via sysfs
+
+Since 2.6.22 (released in 2007), the Linux kernel has exposed individual
+ACPI tables under /sys/firmware/acpi/tables. When available, we can parse
+these files instead of poking around in /dev/mem, which is more portable.
+Keep the /dev/mem parsing code as a fallback for older Linux kernels.
+---
+ ChangeLog                                  |   3 +
+ libfreeipmi/locate/ipmi-locate-acpi-spmi.c | 116 ++++++++++++++++++++-
+ 2 files changed, 114 insertions(+), 5 deletions(-)
+
+diff --git a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+index 4eb5adae7..503d4528e 100644
+--- a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
++++ b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+@@ -598,6 +598,11 @@ static int _ipmi_acpi_get_table_dev_mem (ipmi_locate_ctx_t ctx,
+                                          unsigned int table_instance,
+                                          uint8_t **acpi_table,
+                                          uint32_t *acpi_table_length);
++static int _ipmi_acpi_get_table_sysfs (ipmi_locate_ctx_t ctx,
++                                       char *signature,
++                                       unsigned int table_instance,
++                                       uint8_t **acpi_table,
++                                       uint32_t *acpi_table_length);
+ static int _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+                                           char *signature,
+                                           unsigned int table_instance,
+@@ -1133,6 +1138,105 @@ _ipmi_acpi_get_table (ipmi_locate_ctx_t ctx,
+   return (rv);
+ }
+ 
++/*******************************************************************************
++ *
++ * FUNCTION:
++ *   _ipmi_acpi_get_table_sysfs
++ *
++ * PARAMETERS:
++ *   signature         - signature of the table
++ *   table_instance    - Which instance of the firmware table
++ *   acpi_table        - ACPI table in malloc'ed memory
++ *   acpi_table_length - ACPI table length
++ *
++ * RETURN:
++ *   A return value of 0 means success. ACPI table (including header) is
++ *   returned through acpi_table parameter.
++ *
++ * DESCRIPTION:
++ *   Retrieve any ACPI table (including header) from sysfs.
++ *
++ ******************************************************************************/
++static int
++_ipmi_acpi_get_table_sysfs (ipmi_locate_ctx_t ctx,
++                            char *signature,
++                            unsigned int table_instance,
++                            uint8_t **acpi_table,
++                            uint32_t *acpi_table_length)
++{
++  int sysfs_acpi_fd = -1;
++  int rv = -1;
++  static char const sysfs_fw_acpi_tables[] = "/sys/firmware/acpi/tables";
++  char *sysfs_path;
++  int instance_length;
++  int sysfs_path_length;
++  uint8_t *acpi_table_buf = NULL;
++
++  assert (ctx);
++  assert (ctx->magic == IPMI_LOCATE_CTX_MAGIC);
++  assert (signature);
++  assert (table_instance >= 0);
++  assert (acpi_table);
++  assert (acpi_table_length);
++
++  *acpi_table = NULL;
++
++  instance_length = (table_instance + 1) / 10 + 1;
++  sysfs_path_length = strlen (sysfs_fw_acpi_tables) + strlen(signature) + \
++    instance_length + 2;
++
++  if (!(sysfs_path = malloc (sysfs_path_length)))
++    {
++      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_OUT_OF_MEMORY);
++      return (-1);
++    }
++
++  snprintf (sysfs_path, sysfs_path_length, "%s/%s%d",
++            sysfs_fw_acpi_tables, signature, table_instance + 1);
++  if ((sysfs_acpi_fd = open (sysfs_path, O_RDONLY)) < 0)
++    {
++      if (table_instance > 0)
++        goto cleanup;
++      /* If there is only 1 instance of a table on the system, the sysfs
++         file will be the same as the signature, (e.g.
++         /sys/firmware/acpi/tables/SPMI). If there are multiple instances
++         of the same table, they will have the instance # as a suffix (e.g.:
++         /sys/firmware/acpi/tables/SPMI1 & /sys/firmware/acpi/tables/SPMI2).
++         So, for table_instance == 0, we need to try both */
++      snprintf (sysfs_path, sysfs_path_length, "%s/%s",
++                sysfs_fw_acpi_tables, signature);
++      if ((sysfs_acpi_fd = open (sysfs_path, O_RDONLY)) < 0)
++	  goto cleanup;
++    }
++  if ((*acpi_table_length = lseek (sysfs_acpi_fd, 0, SEEK_END)) == -1)
++    {
++      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_SYSTEM_ERROR);
++      goto cleanup;
++    }
++  if ((lseek (sysfs_acpi_fd, 0, SEEK_SET)) == -1)
++    {
++      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_SYSTEM_ERROR);
++      goto cleanup;
++    }
++  if (!(acpi_table_buf = malloc (*acpi_table_length)))
++    {
++      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_OUT_OF_MEMORY);
++      goto cleanup;
++    }
++  if ((read (sysfs_acpi_fd, acpi_table_buf, *acpi_table_length)) !=
++      *acpi_table_length)
++    {
++      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_SYSTEM_ERROR);
++      goto cleanup;
++    }
++
++  *acpi_table = acpi_table_buf;
++  rv = 0;
++ cleanup:
++  close (sysfs_acpi_fd);
++  return rv;
++}
++
+ /*******************************************************************************
+  *
+  * FUNCTION:
+@@ -1393,12 +1497,14 @@ _ipmi_acpi_get_firmware_table (ipmi_locate_ctx_t ctx,
+ 
+   *sign_table_data = NULL;
+ 
+-  if ((_ipmi_acpi_get_table_dev_mem (ctx, signature,
+-                                     table_instance,
+-                                     &acpi_table,
+-                                     &acpi_table_length) != 0))
++  if ((_ipmi_acpi_get_table_sysfs (ctx, signature, table_instance,
++				   &acpi_table, &acpi_table_length) != 0))
+     {
+-      LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_SYSTEM_ERROR);
++      if ((_ipmi_acpi_get_table_dev_mem (ctx, signature,
++                                         table_instance,
++                                         &acpi_table,
++                                         &acpi_table_length) != 0))
++        LOCATE_SET_ERRNUM (ctx, IPMI_LOCATE_ERR_SYSTEM_ERROR);
+       goto cleanup;
+     }
+ 
+-- 
+2.18.0
+
diff --git a/debian/patches/0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch b/debian/patches/0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
new file mode 100644
index 0000000..aadee84
--- /dev/null
+++ b/debian/patches/0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
@@ -0,0 +1,47 @@
+From d928881287efb663a899f37364491facbd5615ed Mon Sep 17 00:00:00 2001
+From: dann frazier <[e-mail]>
+Date: Wed, 1 Aug 2018 11:01:11 -0600
+Subject: [PATCH 5/6] Allow sysfs SPMI parsing on ARM platforms
+
+SPMI parsing has been disabled on ARM because it relied on unsafe
+trolling through /dev/mem to find ACPI tables. Now that we support
+using the sysfs interface, it is safe to enable everywhere. Keep
+the fallback /dev/mem disabled on ARM though.
+---
+ ChangeLog                                  | 3 +++
+ libfreeipmi/locate/ipmi-locate-acpi-spmi.c | 7 +++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+index 503d4528e..a89b16af6 100644
+--- a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
++++ b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+@@ -1296,6 +1296,9 @@ _ipmi_acpi_get_table_dev_mem (ipmi_locate_ctx_t ctx,
+       { 0, "", 0}
+     };
+ 
++#if defined(__arm__) || defined (__aarch64__)
++  return (-1);
++#endif
+   assert (ctx);
+   assert (ctx->magic == IPMI_LOCATE_CTX_MAGIC);
+   assert (signature);
+@@ -1639,9 +1642,6 @@ ipmi_locate_acpi_spmi_get_device_info (ipmi_locate_ctx_t ctx,
+   uint64_t val;
+   int rv = -1;
+ 
+-#if defined(__arm__) || defined(__aarch64__)
+-  return (-1);
+-#else
+   if (!ctx || ctx->magic != IPMI_LOCATE_CTX_MAGIC)
+     {
+       ERR_TRACE (ipmi_locate_ctx_errormsg (ctx), ipmi_locate_ctx_errnum (ctx));
+@@ -1817,5 +1817,4 @@ ipmi_locate_acpi_spmi_get_device_info (ipmi_locate_ctx_t ctx,
+  cleanup:
+   fiid_obj_destroy (obj_acpi_spmi_table_descriptor);
+   return (rv);
+-#endif /* defined(__arm__) || defined(__aarch64__) */
+ }
+-- 
+2.18.0
+
diff --git a/debian/patches/0006-Correct-order-of-bytes-in-specification_revision-fie.patch b/debian/patches/0006-Correct-order-of-bytes-in-specification_revision-fie.patch
new file mode 100644
index 0000000..ff8b065
--- /dev/null
+++ b/debian/patches/0006-Correct-order-of-bytes-in-specification_revision-fie.patch
@@ -0,0 +1,64 @@
+From 40ba578f898ccaeaea0488a408d63749dd979dc2 Mon Sep 17 00:00:00 2001
+From: dann frazier <[e-mail]>
+Date: Wed, 1 Aug 2018 11:01:12 -0600
+Subject: [PATCH 6/6] Correct order of bytes in specification_revision field of
+ ACPI SPMI table
+
+According to section C3-1 in the IPMI specification, the
+"Specification Revision (version)" field consistes of 2 bytes that:
+
+"Identifies the IPMI specification revision, in BCD format, to which the
+interface was designed. The first byte holds the most significant digits
+of the revision, e.g., a a value of 0x0150 indicates the interface is
+compatible with IPMI version v1.5."
+
+Based on that reading alone, the current template looks correct. However,
+earlier in the same section we have the text:
+
+"Per [ACPI 2.0], unless otherwise specified, numeric values for the table
+or structures are always encoded in little endian format."
+
+It isn't clear to me if this was intended to apply to the "Specification
+Revision" field or not. I mean, they are numeric values - but does the
+text "in BCD format" and "The first byte holds the most significant digits"
+trigger the "unless otherwise specified" exception?
+
+Luckily, a sample of several BIOS's suggests vendors have implemented this
+consistently, using little endian format:
+
++-------------------------------------------------------------------+
+| System                  | IPMI Ver (SMBIOS) | ACPI Spec Rev Bytes |
+| HiSilicon D06           |               N/A | 00 02               |
+| HP ProLiant DL165 G7[*] |               1.5 | 00 01               |
+| HP ProLiant DL385 G7    |               2.0 | 00 02               |
+| QuantaGrid D52B         |               2.0 | 00 02               |
+| Supermicro Super Server |               2.0 | 00 02               |
++-------------------------------------------------------------------+
+[*] Clearly the SMBIOS and ACPI data here are inconsistent but, IMO,
+"1.0" seems to be more likely the intent, vs. 0.1.
+
+Without this change, ipmi-locate will report specifications of 0.1 and
+0.2 instead of 1.0 and 2.0 on the sampled systems (all parsing done
+via sysfs).
+---
+ ChangeLog                                  | 3 +++
+ libfreeipmi/locate/ipmi-locate-acpi-spmi.c | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+index a89b16af6..b104869b1 100644
+--- a/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
++++ b/libfreeipmi/locate/ipmi-locate-acpi-spmi.c
+@@ -184,8 +184,8 @@ fiid_template_t tmpl_acpi_spmi_table_descriptor =
+        e.g. a value of 0x0150 indicates the interface is
+        compatible with IPMI version v1.5. */
+     /*     {16, "specification_revision", FIID_FIELD_REQUIRED | FIID_FIELD_LENGTH_FIXED},  */
+-    { 8, "specification_revision.major", FIID_FIELD_REQUIRED | FIID_FIELD_LENGTH_FIXED},
+     { 8, "specification_revision.minor", FIID_FIELD_REQUIRED | FIID_FIELD_LENGTH_FIXED},
++    { 8, "specification_revision.major", FIID_FIELD_REQUIRED | FIID_FIELD_LENGTH_FIXED},
+     /* Interrupt type(s) used by
+        the interface:
+        [0] - SCI triggered through GPE
+-- 
+2.18.0
+
diff --git a/debian/patches/series b/debian/patches/series
index b7b4f52..817e8fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,9 @@ deb_bmc-watchdog_noRUN
 dso-linking.patch
 ipv6-ipmipower
 ipv6-ipmi-discovery
+0001-Fix-acpi-spmi-searching-corner-case.patch
+0002-Don-t-try-to-separate-the-header-from-the-ACPI-table.patch
+0003-Split-RSDT-XSDT-parsing-into-new-function.patch
+0004-Add-support-for-parsing-SPMI-tables-exposed-via-sysf.patch
+0005-Allow-sysfs-SPMI-parsing-on-ARM-platforms.patch
+0006-Correct-order-of-bytes-in-specification_revision-fie.patch