Merge tag 'fixes-rcu-fiq-signed' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / platform / chrome / chromeos_pstore.c

diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
index 3474920..308a853 100644 (file)
--- a/drivers/platform/chrome/chromeos_pstore.c
+++ b/drivers/platform/chrome/chromeos_pstore.c
@@ -8,6 +8,7 @@
  *  the Free Software Foundation, version 2 of the License.
  */
 
+#include <linux/acpi.h>
 #include <linux/dmi.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -58,7 +59,7 @@ MODULE_DEVICE_TABLE(dmi, chromeos_pstore_dmi_table);
 static struct ramoops_platform_data chromeos_ramoops_data = {
        .mem_size       = 0x100000,
        .mem_address    = 0xf00000,
-       .record_size    = 0x20000,
+       .record_size    = 0x40000,
        .console_size   = 0x20000,
        .ftrace_size    = 0x20000,
        .dump_oops      = 1,
@@ -71,9 +72,59 @@ static struct platform_device chromeos_ramoops = {
        },
 };
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id cros_ramoops_acpi_match[] = {
+       { "GOOG9999", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(acpi, cros_ramoops_acpi_match);
+
+static struct platform_driver chromeos_ramoops_acpi = {
+       .driver         = {
+               .name   = "chromeos_pstore",
+               .acpi_match_table = ACPI_PTR(cros_ramoops_acpi_match),
+       },
+};
+
+static int __init chromeos_probe_acpi(struct platform_device *pdev)
+{
+       struct resource *res;
+       resource_size_t len;
+
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res)
+               return -ENOMEM;
+
+       len = resource_size(res);
+       if (!res->start || !len)
+               return -ENOMEM;
+
+       pr_info("chromeos ramoops using acpi device.\n");
+
+       chromeos_ramoops_data.mem_size = len;
+       chromeos_ramoops_data.mem_address = res->start;
+
+       return 0;
+}
+
+static bool __init chromeos_check_acpi(void)
+{
+       if (!platform_driver_probe(&chromeos_ramoops_acpi, chromeos_probe_acpi))
+               return true;
+       return false;
+}
+#else
+static inline bool chromeos_check_acpi(void) { return false; }
+#endif
+
 static int __init chromeos_pstore_init(void)
 {
-       if (dmi_check_system(chromeos_pstore_dmi_table))
+       bool acpi_dev_found;
+
+       /* First check ACPI for non-hardcoded values from firmware. */
+       acpi_dev_found = chromeos_check_acpi();
+
+       if (acpi_dev_found || dmi_check_system(chromeos_pstore_dmi_table))
                return platform_device_register(&chromeos_ramoops);
 
        return -ENODEV;