Merge tag 'driver-core-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core/kobject updates from Greg KH:
 "Here is the "big" set of driver core patches for 5.2-rc1

  There are a number of ACPI patches in here as well, as Rafael said
  they should go through this tree due to the driver core changes they
  required. They have all been acked by the ACPI developers.

  There are also a number of small subsystem-specific changes in here,
  due to some changes to the kobject core code. Those too have all been
  acked by the various subsystem maintainers.

  As for content, it's pretty boring outside of the ACPI changes:
   - spdx cleanups
   - kobject documentation updates
   - default attribute groups for kobjects
   - other minor kobject/driver core fixes

  All have been in linux-next for a while with no reported issues"

* tag 'driver-core-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (47 commits)
  kobject: clean up the kobject add documentation a bit more
  kobject: Fix kernel-doc comment first line
  kobject: Remove docstring reference to kset
  firmware_loader: Fix a typo ("syfs" -> "sysfs")
  kobject: fix dereference before null check on kobj
  Revert "driver core: platform: Fix the usage of platform device name(pdev->name)"
  init/config: Do not select BUILD_BIN2C for IKCONFIG
  Provide in-kernel headers to make extending kernel easier
  kobject: Improve doc clarity kobject_init_and_add()
  kobject: Improve docs for kobject_add/del
  driver core: platform: Fix the usage of platform device name(pdev->name)
  livepatch: Replace klp_ktype_patch's default_attrs with groups
  cpufreq: schedutil: Replace default_attrs field with groups
  padata: Replace padata_attr_type default_attrs field with groups
  irqdesc: Replace irq_kobj_type's default_attrs field with groups
  net-sysfs: Replace ktype default_attrs field with groups
  block: Replace all ktype default_attrs with groups
  samples/kobject: Replace foo_ktype's default_attrs field with groups
  kobject: Add support for default attribute groups to kobj_type
  driver core: Postpone DMA tear-down until after devres release for probe failure
  ...

1 files changed, 66 insertions, 10 deletions

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index d7bf936b1646..3b5d04fd5e3e 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -49,6 +49,16 @@ static struct acpi_table_desc initial_tables[ACPI_MAX_TABLES] __initdata;
 
 static int acpi_apic_instance __initdata;
 
+enum acpi_subtable_type {
+        ACPI_SUBTABLE_COMMON,
+        ACPI_SUBTABLE_HMAT,
+};
+
+struct acpi_subtable_entry {
+        union acpi_subtable_headers *hdr;
+        enum acpi_subtable_type type;
+};
+
 /*
  * Disable table checksum verification for the early stage due to the size
  * limitation of the current x86 early mapping implementation.
@@ -217,6 +227,50 @@ void acpi_table_print_madt_entry(struct acpi_subtable_header *header)
         }
 }
 
+static unsigned long __init
+acpi_get_entry_type(struct acpi_subtable_entry *entry)
+{
+        switch (entry->type) {
+        case ACPI_SUBTABLE_COMMON:
+                return entry->hdr->common.type;
+        case ACPI_SUBTABLE_HMAT:
+                return entry->hdr->hmat.type;
+        }
+        return 0;
+}
+
+static unsigned long __init
+acpi_get_entry_length(struct acpi_subtable_entry *entry)
+{
+        switch (entry->type) {
+        case ACPI_SUBTABLE_COMMON:
+                return entry->hdr->common.length;
+        case ACPI_SUBTABLE_HMAT:
+                return entry->hdr->hmat.length;
+        }
+        return 0;
+}
+
+static unsigned long __init
+acpi_get_subtable_header_length(struct acpi_subtable_entry *entry)
+{
+        switch (entry->type) {
+        case ACPI_SUBTABLE_COMMON:
+                return sizeof(entry->hdr->common);
+        case ACPI_SUBTABLE_HMAT:
+                return sizeof(entry->hdr->hmat);
+        }
+        return 0;
+}
+
+static enum acpi_subtable_type __init
+acpi_get_subtable_type(char *id)
+{
+        if (strncmp(id, ACPI_SIG_HMAT, 4) == 0)
+                return ACPI_SUBTABLE_HMAT;
+        return ACPI_SUBTABLE_COMMON;
+}
+
 /**
  * acpi_parse_entries_array - for each proc_num find a suitable subtable
  *
@@ -245,8 +299,8 @@ static int __init acpi_parse_entries_array(char *id, unsigned long table_size,
                 struct acpi_subtable_proc *proc, int proc_num,
                 unsigned int max_entries)
 {
-        struct acpi_subtable_header *entry;
-        unsigned long table_end;
+        struct acpi_subtable_entry entry;
+        unsigned long table_end, subtable_len, entry_len;
         int count = 0;
         int errs = 0;
         int i;
@@ -269,19 +323,20 @@ static int __init acpi_parse_entries_array(char *id, unsigned long table_size,
 
         /* Parse all entries looking for a match. */
 
-        entry = (struct acpi_subtable_header *)
+        entry.type = acpi_get_subtable_type(id);
+        entry.hdr = (union acpi_subtable_headers *)
             ((unsigned long)table_header + table_size);
+        subtable_len = acpi_get_subtable_header_length(&entry);
 
-        while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) <
-               table_end) {
+        while (((unsigned long)entry.hdr) + subtable_len  < table_end) {
                 if (max_entries && count >= max_entries)
                         break;
 
                 for (i = 0; i < proc_num; i++) {
-                        if (entry->type != proc[i].id)
+                        if (acpi_get_entry_type(&entry) != proc[i].id)
                                 continue;
                         if (!proc[i].handler ||
-                             (!errs && proc[i].handler(entry, table_end))) {
+                             (!errs && proc[i].handler(entry.hdr, table_end))) {
                                 errs++;
                                 continue;
                         }
@@ -296,13 +351,14 @@ static int __init acpi_parse_entries_array(char *id, unsigned long table_size,
                  * If entry->length is 0, break from this loop to avoid
                  * infinite loop.
                  */
-                if (entry->length == 0) {
+                entry_len = acpi_get_entry_length(&entry);
+                if (entry_len == 0) {
                         pr_err("[%4.4s:0x%02x] Invalid zero length\n", id, proc->id);
                         return -EINVAL;
                 }
 
-                entry = (struct acpi_subtable_header *)
-                    ((unsigned long)entry + entry->length);
+                entry.hdr = (union acpi_subtable_headers *)
+                    ((unsigned long)entry.hdr + entry_len);
         }
 
         if (max_entries && count > max_entries) {