ACPI: OSL: Use spin locks without disabling interrupts

rafaeljw · rafaeljw · commit 8e57de430764 · 2023-12-28T14:13:52.000+01:00
After commit 7a36b90 ("ACPI: OSL: Use a threaded interrupt handler for SCI") any ACPICA code never runs in a hardirq handler, so it need not dissable interrupts on the local CPU when acquiring a spin lock. Make it use spin locks without disabling interrupts. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
@@ -1515,20 +1515,18 @@ void acpi_os_delete_lock(acpi_spinlock handle)
 acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock lockp)
 	__acquires(lockp)
 {
-	acpi_cpu_flags flags;
-
-	spin_lock_irqsave(lockp, flags);
-	return flags;
+	spin_lock(lockp);
+	return 0;
 }
 
 /*
  * Release a spinlock. See above.
  */
 
-void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)
+void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags not_used)
 	__releases(lockp)
 {
-	spin_unlock_irqrestore(lockp, flags);
+	spin_unlock(lockp);
 }
 
 #ifndef ACPI_USE_LOCAL_CACHE

Original file line number	Diff line number	Diff line change
`@@ -1515,20 +1515,18 @@ void acpi_os_delete_lock(acpi_spinlock handle)`
`1515`	`1515`	`acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock lockp)`
`1516`	`1516`	`__acquires(lockp)`
`1517`	`1517`	`{`
`1518`		`- acpi_cpu_flags flags;`
`1519`		`-`
`1520`		`- spin_lock_irqsave(lockp, flags);`
`1521`		`- return flags;`
	`1518`	`+ spin_lock(lockp);`
	`1519`	`+ return 0;`
`1522`	`1520`	`}`
`1523`	`1521`
`1524`	`1522`	`/*`
`1525`	`1523`	`* Release a spinlock. See above.`
`1526`	`1524`	`*/`
`1527`	`1525`
`1528`		`-void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)`
	`1526`	`+void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags not_used)`
`1529`	`1527`	`__releases(lockp)`
`1530`	`1528`	`{`
`1531`		`- spin_unlock_irqrestore(lockp, flags);`
	`1529`	`+ spin_unlock(lockp);`
`1532`	`1530`	`}`
`1533`	`1531`
`1534`	`1532`	`#ifndef ACPI_USE_LOCAL_CACHE`