From: Kate Hsuan Date: Fri, 20 Aug 2021 11:04:48 +0000 (+0300) Subject: platform/x86: intel-smartconnect: Move to intel sub-directory X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=47bbe03eaf4493c1c7cc7ac9e24c633ef291f767;p=linux.git platform/x86: intel-smartconnect: Move to intel sub-directory Move Intel Smart Connect driver to intel sub-directory to improve readability and rename it from intel-smartconnect.c to smartconnect.c. Signed-off-by: Kate Hsuan Reviewed-by: Hans de Goede Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210820110458.73018-11-andriy.shevchenko@linux.intel.com Signed-off-by: Hans de Goede --- diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index a78678dede176..7820f4e63d017 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1110,20 +1110,6 @@ config INTEL_IPS functionality. If in doubt, say Y here; it will only load on supported platforms. -config INTEL_SMARTCONNECT - tristate "Intel Smart Connect disabling driver" - depends on ACPI - help - Intel Smart Connect is a technology intended to permit devices to - update state by resuming for a short period of time at regular - intervals. If a user enables this functionality under Windows and - then reboots into Linux, the system may remain configured to resume - on suspend. In the absence of any userspace to support it, the system - will then remain awake until something triggers another suspend. - - This driver checks to determine whether the device has Intel Smart - Connect enabled, and if so disables it. - source "drivers/platform/x86/intel_speed_select_if/Kconfig" config INTEL_TURBO_MAX_3 diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 2d8b2528b0abe..44f990f7c2c4c 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -120,7 +120,6 @@ obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o # Intel uncore drivers obj-$(CONFIG_INTEL_IPS) += intel_ips.o -obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/ obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o diff --git a/drivers/platform/x86/intel-smartconnect.c b/drivers/platform/x86/intel-smartconnect.c deleted file mode 100644 index 64c2dc93472f4..0000000000000 --- a/drivers/platform/x86/intel-smartconnect.c +++ /dev/null @@ -1,44 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2013 Matthew Garrett - */ - -#include -#include - -MODULE_LICENSE("GPL"); - -static int smartconnect_acpi_init(struct acpi_device *acpi) -{ - unsigned long long value; - acpi_status status; - - status = acpi_evaluate_integer(acpi->handle, "GAOS", NULL, &value); - if (ACPI_FAILURE(status)) - return -EINVAL; - - if (value & 0x1) { - dev_info(&acpi->dev, "Disabling Intel Smart Connect\n"); - status = acpi_execute_simple_method(acpi->handle, "SAOS", 0); - } - - return 0; -} - -static const struct acpi_device_id smartconnect_ids[] = { - {"INT33A0", 0}, - {"", 0} -}; -MODULE_DEVICE_TABLE(acpi, smartconnect_ids); - -static struct acpi_driver smartconnect_driver = { - .owner = THIS_MODULE, - .name = "intel_smart_connect", - .class = "intel_smart_connect", - .ids = smartconnect_ids, - .ops = { - .add = smartconnect_acpi_init, - }, -}; - -module_acpi_driver(smartconnect_driver); diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig index fb1d1175fd092..24cd26579d524 100644 --- a/drivers/platform/x86/intel/Kconfig +++ b/drivers/platform/x86/intel/Kconfig @@ -73,4 +73,18 @@ config INTEL_RST firmware will copy the memory contents back to RAM and resume the OS as usual. +config INTEL_SMARTCONNECT + tristate "Intel Smart Connect disabling driver" + depends on ACPI + help + Intel Smart Connect is a technology intended to permit devices to + update state by resuming for a short period of time at regular + intervals. If a user enables this functionality under Windows and + then reboots into Linux, the system may remain configured to resume + on suspend. In the absence of any userspace to support it, the system + will then remain awake until something triggers another suspend. + + This driver checks to determine whether the device has Intel Smart + Connect enabled, and if so disables it. + endif # X86_PLATFORM_DRIVERS_INTEL diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile index d0ab3202c1ac1..cefcc92d93f59 100644 --- a/drivers/platform/x86/intel/Makefile +++ b/drivers/platform/x86/intel/Makefile @@ -24,3 +24,5 @@ obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o # Intel Uncore drivers intel-rst-y := rst.o obj-$(CONFIG_INTEL_RST) += intel-rst.o +intel-smartconnect-y := smartconnect.o +obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o diff --git a/drivers/platform/x86/intel/smartconnect.c b/drivers/platform/x86/intel/smartconnect.c new file mode 100644 index 0000000000000..64c2dc93472f4 --- /dev/null +++ b/drivers/platform/x86/intel/smartconnect.c @@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2013 Matthew Garrett + */ + +#include +#include + +MODULE_LICENSE("GPL"); + +static int smartconnect_acpi_init(struct acpi_device *acpi) +{ + unsigned long long value; + acpi_status status; + + status = acpi_evaluate_integer(acpi->handle, "GAOS", NULL, &value); + if (ACPI_FAILURE(status)) + return -EINVAL; + + if (value & 0x1) { + dev_info(&acpi->dev, "Disabling Intel Smart Connect\n"); + status = acpi_execute_simple_method(acpi->handle, "SAOS", 0); + } + + return 0; +} + +static const struct acpi_device_id smartconnect_ids[] = { + {"INT33A0", 0}, + {"", 0} +}; +MODULE_DEVICE_TABLE(acpi, smartconnect_ids); + +static struct acpi_driver smartconnect_driver = { + .owner = THIS_MODULE, + .name = "intel_smart_connect", + .class = "intel_smart_connect", + .ids = smartconnect_ids, + .ops = { + .add = smartconnect_acpi_init, + }, +}; + +module_acpi_driver(smartconnect_driver);