D61431.1794485534.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D61431.1794485534.diff
View Options

	diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
	--- a/sys/dev/acpica/acpi_cpu.c
	+++ b/sys/dev/acpica/acpi_cpu.c
	@@ -198,7 +198,7 @@
	DEVMETHOD(device_detach, bus_generic_detach),
	DEVMETHOD(device_shutdown, acpi_cpu_shutdown),
	DEVMETHOD(device_suspend, bus_generic_suspend),
	- DEVMETHOD(device_resume, bus_generic_resume),
	+ DEVMETHOD(device_resume, acpi_cpu_resume),

	/* Bus interface */
	DEVMETHOD(bus_add_child, acpi_cpu_add_child),
	@@ -511,13 +511,18 @@
	}

	static void
	-enable_idle(struct acpi_cpu_softc *sc)
	+set_bm_rld(struct acpi_cpu_softc *sc)
	{
	+ if (sc->cpu_cx_count > sc->cpu_non_c3 + 1 &&
	+ (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0)
	+ AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 1);
	+}

	- if (sc->cpu_cx_count > sc->cpu_non_c3 + 1 &&
	- (cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0)
	- AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 1);
	- sc->cpu_disable_idle = FALSE;
	+static void
	+enable_idle(struct acpi_cpu_softc *sc)
	+{
	+ set_bm_rld(sc):
	+ sc->cpu_disable_idle = FALSE;
	}

	#if defined(__i386__) \|\| defined(__amd64__)
	@@ -529,6 +534,13 @@
	}
	#endif

	+static int
	+acpi_cpu_resume(device_t dev)
	+{
	+ set_bm_rld(device_get_softc(dev));
	+ return (bus_generic_resume(dev));
	+}
	+
	/*
	* Find the processor associated with a given ACPI ID.
	*/