Merge tag 'ceph-for-6.8-rc5' of https://github.com/ceph/ceph-client

[linux-2.6-microblaze.git] / lib / fw_table.c

diff --git a/lib/fw_table.c b/lib/fw_table.c
index c49a09e..c3569d2 100644 (file)
--- a/lib/fw_table.c
+++ b/lib/fw_table.c
@@ -12,12 +12,14 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/fw_table.h>
 
 enum acpi_subtable_type {
        ACPI_SUBTABLE_COMMON,
        ACPI_SUBTABLE_HMAT,
        ACPI_SUBTABLE_PRMT,
        ACPI_SUBTABLE_CEDT,
+       CDAT_SUBTABLE,
 };
 
 struct acpi_subtable_entry {
@@ -25,7 +27,7 @@ struct acpi_subtable_entry {
        enum acpi_subtable_type type;
 };
 
-static unsigned long __init_or_acpilib
+static unsigned long __init_or_fwtbl_lib
 acpi_get_entry_type(struct acpi_subtable_entry *entry)
 {
        switch (entry->type) {
@@ -37,11 +39,13 @@ acpi_get_entry_type(struct acpi_subtable_entry *entry)
                return 0;
        case ACPI_SUBTABLE_CEDT:
                return entry->hdr->cedt.type;
+       case CDAT_SUBTABLE:
+               return entry->hdr->cdat.type;
        }
        return 0;
 }
 
-static unsigned long __init_or_acpilib
+static unsigned long __init_or_fwtbl_lib
 acpi_get_entry_length(struct acpi_subtable_entry *entry)
 {
        switch (entry->type) {
@@ -53,11 +57,16 @@ acpi_get_entry_length(struct acpi_subtable_entry *entry)
                return entry->hdr->prmt.length;
        case ACPI_SUBTABLE_CEDT:
                return entry->hdr->cedt.length;
+       case CDAT_SUBTABLE: {
+               __le16 length = (__force __le16)entry->hdr->cdat.length;
+
+               return le16_to_cpu(length);
+       }
        }
        return 0;
 }
 
-static unsigned long __init_or_acpilib
+static unsigned long __init_or_fwtbl_lib
 acpi_get_subtable_header_length(struct acpi_subtable_entry *entry)
 {
        switch (entry->type) {
@@ -69,11 +78,13 @@ acpi_get_subtable_header_length(struct acpi_subtable_entry *entry)
                return sizeof(entry->hdr->prmt);
        case ACPI_SUBTABLE_CEDT:
                return sizeof(entry->hdr->cedt);
+       case CDAT_SUBTABLE:
+               return sizeof(entry->hdr->cdat);
        }
        return 0;
 }
 
-static enum acpi_subtable_type __init_or_acpilib
+static enum acpi_subtable_type __init_or_fwtbl_lib
 acpi_get_subtable_type(char *id)
 {
        if (strncmp(id, ACPI_SIG_HMAT, 4) == 0)
@@ -82,12 +93,27 @@ acpi_get_subtable_type(char *id)
                return ACPI_SUBTABLE_PRMT;
        if (strncmp(id, ACPI_SIG_CEDT, 4) == 0)
                return ACPI_SUBTABLE_CEDT;
+       if (strncmp(id, ACPI_SIG_CDAT, 4) == 0)
+               return CDAT_SUBTABLE;
        return ACPI_SUBTABLE_COMMON;
 }
 
-static __init_or_acpilib int call_handler(struct acpi_subtable_proc *proc,
-                                         union acpi_subtable_headers *hdr,
-                                         unsigned long end)
+static unsigned long __init_or_fwtbl_lib
+acpi_table_get_length(enum acpi_subtable_type type,
+                     union fw_table_header *header)
+{
+       if (type == CDAT_SUBTABLE) {
+               __le32 length = (__force __le32)header->cdat.length;
+
+               return le32_to_cpu(length);
+       }
+
+       return header->acpi.length;
+}
+
+static __init_or_fwtbl_lib int call_handler(struct acpi_subtable_proc *proc,
+                                           union acpi_subtable_headers *hdr,
+                                           unsigned long end)
 {
        if (proc->handler)
                return proc->handler(hdr, end);
@@ -119,22 +145,25 @@ static __init_or_acpilib int call_handler(struct acpi_subtable_proc *proc,
  * On success returns sum of all matching entries for all proc handlers.
  * Otherwise, -ENODEV or -EINVAL is returned.
  */
-int __init_or_acpilib
+int __init_or_fwtbl_lib
 acpi_parse_entries_array(char *id, unsigned long table_size,
-                        struct acpi_table_header *table_header,
+                        union fw_table_header *table_header,
                         struct acpi_subtable_proc *proc,
                         int proc_num, unsigned int max_entries)
 {
        unsigned long table_end, subtable_len, entry_len;
        struct acpi_subtable_entry entry;
+       enum acpi_subtable_type type;
        int count = 0;
        int i;
 
-       table_end = (unsigned long)table_header + table_header->length;
+       type = acpi_get_subtable_type(id);
+       table_end = (unsigned long)table_header +
+                   acpi_table_get_length(type, table_header);
 
        /* Parse all entries looking for a match. */
 
-       entry.type = acpi_get_subtable_type(id);
+       entry.type = type;
        entry.hdr = (union acpi_subtable_headers *)
            ((unsigned long)table_header + table_size);
        subtable_len = acpi_get_subtable_header_length(&entry);
@@ -174,3 +203,25 @@ acpi_parse_entries_array(char *id, unsigned long table_size,
 
        return count;
 }
+
+int __init_or_fwtbl_lib
+cdat_table_parse(enum acpi_cdat_type type,
+                acpi_tbl_entry_handler_arg handler_arg,
+                void *arg,
+                struct acpi_table_cdat *table_header)
+{
+       struct acpi_subtable_proc proc = {
+               .id             = type,
+               .handler_arg    = handler_arg,
+               .arg            = arg,
+       };
+
+       if (!table_header)
+               return -EINVAL;
+
+       return acpi_parse_entries_array(ACPI_SIG_CDAT,
+                                       sizeof(struct acpi_table_cdat),
+                                       (union fw_table_header *)table_header,
+                                       &proc, 1, 0);
+}
+EXPORT_SYMBOL_FWTBL_LIB(cdat_table_parse);