forked from luck/tmp_suning_uos_patched
f68e600017
commit c9e143084d1a602f829115612e1ec79df3727c8b upstream.
The runtime PM callback may be called as soon as the runtime PM facility
is enabled and activated. It means that ->suspend() may be called before
we finish probing the device in the ACPI case. Hence, NULL pointer
dereference:
intel-lpss INT34BA:00: IRQ index 0 not found
BUG: kernel NULL pointer dereference, address: 0000000000000030
...
Workqueue: pm pm_runtime_work
RIP: 0010:intel_lpss_suspend+0xb/0x40 [intel_lpss]
To fix this, first try to register the device and only after that enable
runtime PM facility.
Fixes: 4b45efe852 ("mfd: Add support for Intel Sunrisepoint LPSS devices")
Reported-by: Orlando Chamberlain <redecorating@protonmail.com>
Reported-by: Aditya Garg <gargaditya08@live.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Aditya Garg <gargaditya08@live.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211101190008.86473-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
155 lines
4.1 KiB
C
155 lines
4.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Intel LPSS ACPI support.
|
|
*
|
|
* Copyright (C) 2015, Intel Corporation
|
|
*
|
|
* Authors: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
* Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
*/
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pm_runtime.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/property.h>
|
|
|
|
#include "intel-lpss.h"
|
|
|
|
static const struct intel_lpss_platform_info spt_info = {
|
|
.clk_rate = 120000000,
|
|
};
|
|
|
|
static struct property_entry spt_i2c_properties[] = {
|
|
PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 230),
|
|
{ },
|
|
};
|
|
|
|
static const struct intel_lpss_platform_info spt_i2c_info = {
|
|
.clk_rate = 120000000,
|
|
.properties = spt_i2c_properties,
|
|
};
|
|
|
|
static struct property_entry uart_properties[] = {
|
|
PROPERTY_ENTRY_U32("reg-io-width", 4),
|
|
PROPERTY_ENTRY_U32("reg-shift", 2),
|
|
PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible"),
|
|
{ },
|
|
};
|
|
|
|
static const struct intel_lpss_platform_info spt_uart_info = {
|
|
.clk_rate = 120000000,
|
|
.clk_con_id = "baudclk",
|
|
.properties = uart_properties,
|
|
};
|
|
|
|
static const struct intel_lpss_platform_info bxt_info = {
|
|
.clk_rate = 100000000,
|
|
};
|
|
|
|
static struct property_entry bxt_i2c_properties[] = {
|
|
PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 42),
|
|
PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171),
|
|
PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 208),
|
|
{ },
|
|
};
|
|
|
|
static const struct intel_lpss_platform_info bxt_i2c_info = {
|
|
.clk_rate = 133000000,
|
|
.properties = bxt_i2c_properties,
|
|
};
|
|
|
|
static struct property_entry apl_i2c_properties[] = {
|
|
PROPERTY_ENTRY_U32("i2c-sda-hold-time-ns", 207),
|
|
PROPERTY_ENTRY_U32("i2c-sda-falling-time-ns", 171),
|
|
PROPERTY_ENTRY_U32("i2c-scl-falling-time-ns", 208),
|
|
{ },
|
|
};
|
|
|
|
static const struct intel_lpss_platform_info apl_i2c_info = {
|
|
.clk_rate = 133000000,
|
|
.properties = apl_i2c_properties,
|
|
};
|
|
|
|
static const struct acpi_device_id intel_lpss_acpi_ids[] = {
|
|
/* SPT */
|
|
{ "INT3440", (kernel_ulong_t)&spt_info },
|
|
{ "INT3441", (kernel_ulong_t)&spt_info },
|
|
{ "INT3442", (kernel_ulong_t)&spt_i2c_info },
|
|
{ "INT3443", (kernel_ulong_t)&spt_i2c_info },
|
|
{ "INT3444", (kernel_ulong_t)&spt_i2c_info },
|
|
{ "INT3445", (kernel_ulong_t)&spt_i2c_info },
|
|
{ "INT3446", (kernel_ulong_t)&spt_i2c_info },
|
|
{ "INT3447", (kernel_ulong_t)&spt_i2c_info },
|
|
{ "INT3448", (kernel_ulong_t)&spt_uart_info },
|
|
{ "INT3449", (kernel_ulong_t)&spt_uart_info },
|
|
{ "INT344A", (kernel_ulong_t)&spt_uart_info },
|
|
/* BXT */
|
|
{ "80860AAC", (kernel_ulong_t)&bxt_i2c_info },
|
|
{ "80860ABC", (kernel_ulong_t)&bxt_info },
|
|
{ "80860AC2", (kernel_ulong_t)&bxt_info },
|
|
/* APL */
|
|
{ "80865AAC", (kernel_ulong_t)&apl_i2c_info },
|
|
{ "80865ABC", (kernel_ulong_t)&bxt_info },
|
|
{ "80865AC2", (kernel_ulong_t)&bxt_info },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(acpi, intel_lpss_acpi_ids);
|
|
|
|
static int intel_lpss_acpi_probe(struct platform_device *pdev)
|
|
{
|
|
struct intel_lpss_platform_info *info;
|
|
const struct acpi_device_id *id;
|
|
int ret;
|
|
|
|
id = acpi_match_device(intel_lpss_acpi_ids, &pdev->dev);
|
|
if (!id)
|
|
return -ENODEV;
|
|
|
|
info = devm_kmemdup(&pdev->dev, (void *)id->driver_data, sizeof(*info),
|
|
GFP_KERNEL);
|
|
if (!info)
|
|
return -ENOMEM;
|
|
|
|
info->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
info->irq = platform_get_irq(pdev, 0);
|
|
|
|
ret = intel_lpss_probe(&pdev->dev, info);
|
|
if (ret)
|
|
return ret;
|
|
|
|
pm_runtime_set_active(&pdev->dev);
|
|
pm_runtime_enable(&pdev->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int intel_lpss_acpi_remove(struct platform_device *pdev)
|
|
{
|
|
intel_lpss_remove(&pdev->dev);
|
|
pm_runtime_disable(&pdev->dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static INTEL_LPSS_PM_OPS(intel_lpss_acpi_pm_ops);
|
|
|
|
static struct platform_driver intel_lpss_acpi_driver = {
|
|
.probe = intel_lpss_acpi_probe,
|
|
.remove = intel_lpss_acpi_remove,
|
|
.driver = {
|
|
.name = "intel-lpss",
|
|
.acpi_match_table = intel_lpss_acpi_ids,
|
|
.pm = &intel_lpss_acpi_pm_ops,
|
|
},
|
|
};
|
|
|
|
module_platform_driver(intel_lpss_acpi_driver);
|
|
|
|
MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
|
|
MODULE_AUTHOR("Mika Westerberg <mika.westerberg@linux.intel.com>");
|
|
MODULE_DESCRIPTION("Intel LPSS ACPI driver");
|
|
MODULE_LICENSE("GPL v2");
|