Fix boot issue

2026-04-30 13:52:11 -07:00 · 2021-11-01 23:57:21 +05:30
parent ea4c3d1a9c
commit 93bebf22c0
2 changed files with 49 additions and 1 deletions
@@ -62,6 +62,7 @@ source=(
  
  9001-bluetooth-add-disable-read-tx-power-quirk.patch
  9002-add-bluetooth-support-for-16,2.patch
+  intel-lpss.patch
 )

 validpgpkeys=(
@@ -265,4 +266,5 @@ sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8'
            '8f5f6321d90a2c4e753d993e5ec5c8ad78ddb4415f5306117b40f40dd9e42af2'
            'e9e564bdd8f45c552c0f1b32ffa142c887f449f9aadcd190f8d7d143c7567259'
            '31e414978a947bdb71f27ed364c4da73b81fcf1921250cb69ee1bcf2bbd25636'
-            '57731fa10509eb689649e6d1ea33b2c3e20a8116617bd848b565d42379b2b6b6')
+            '57731fa10509eb689649e6d1ea33b2c3e20a8116617bd848b565d42379b2b6b6'
+            '0f7b241ac9cf933cec7eecfa724d29926b2622ba2063a97ebf39256508f34184')
@@ -0,0 +1,46 @@
+  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>
+---
+ drivers/mfd/intel-lpss-acpi.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
+index 3f1d976eb67c..be81507afb5e 100644
+--- 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 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)
+@@ -149,10 +150,14 @@ static int intel_lpss_acpi_probe(struct platform_device *pdev)
+ 	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 ret;
+ }
+ 
+ static int intel_lpss_acpi_remove(struct platform_device *pdev)
+-- 
+2.33.0