lkml.org 
[lkml]   [2022]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 29/41] mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe()
    Date
    From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    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: 4b45efe85263 ("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>
    ---
    drivers/mfd/intel-lpss-acpi.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/drivers/mfd/intel-lpss-acpi.c
    +++ b/drivers/mfd/intel-lpss-acpi.c
    @@ -136,6 +136,7 @@ static int intel_lpss_acpi_probe(struct
    {
    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)
    @@ -149,10 +150,14 @@ static int intel_lpss_acpi_probe(struct
    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 intel_lpss_probe(&pdev->dev, info);
    + return 0;
    }

    static int intel_lpss_acpi_remove(struct platform_device *pdev)

    \
     
     \ /
      Last update: 2022-01-14 09:23    [W:4.514 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site