From d165d8b50f4db3e90044551e82fb108f268fa004 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 20 May 2018 15:40:24 +0200 Subject: [PATCH] Enable GPIO_AMDPT, PINCTRL_AMD and X86_AMD_PLATFORM_DEVICE Kconfig options This fixes i2c and GPIOs not working on AMD based laptops (rhbz#1510649) --- baseconfig/x86/CONFIG_GPIO_AMDPT | 1 + baseconfig/x86/CONFIG_PINCTRL_AMD | 2 +- baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE | 2 +- kernel-i686-PAE.config | 6 +++--- kernel-i686-PAEdebug.config | 6 +++--- kernel-i686-debug.config | 6 +++--- kernel-i686.config | 6 +++--- kernel-x86_64-debug.config | 6 +++--- kernel-x86_64.config | 6 +++--- kernel.spec | 4 ++++ 10 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 baseconfig/x86/CONFIG_GPIO_AMDPT diff --git a/baseconfig/x86/CONFIG_GPIO_AMDPT b/baseconfig/x86/CONFIG_GPIO_AMDPT new file mode 100644 index 000000000..04ac1ad2c --- /dev/null +++ b/baseconfig/x86/CONFIG_GPIO_AMDPT @@ -0,0 +1 @@ +CONFIG_GPIO_AMDPT=m diff --git a/baseconfig/x86/CONFIG_PINCTRL_AMD b/baseconfig/x86/CONFIG_PINCTRL_AMD index 02626b835..a1f44d876 100644 --- a/baseconfig/x86/CONFIG_PINCTRL_AMD +++ b/baseconfig/x86/CONFIG_PINCTRL_AMD @@ -1 +1 @@ -# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_AMD=m diff --git a/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE b/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE index 15b9c575b..4da780aa7 100644 --- a/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE +++ b/baseconfig/x86/CONFIG_X86_AMD_PLATFORM_DEVICE @@ -1 +1 @@ -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 093f6363f..385b67908 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -1632,7 +1632,7 @@ CONFIG_GPD_POCKET_FAN=m # CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set -# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_AMDPT=m CONFIG_GPIO_BD9571MWV=m # CONFIG_GPIO_BT8XX is not set CONFIG_GPIO_CRYSTAL_COVE=y @@ -3974,7 +3974,7 @@ CONFIG_PHYSICAL_START=0x400000 # CONFIG_PI433 is not set CONFIG_PID_NS=y CONFIG_PINCONF=y -# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_AMD=m # CONFIG_PINCTRL_AXP209 is not set CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m @@ -6190,7 +6190,7 @@ CONFIG_X86_32_IRIS=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y # CONFIG_X86_ANCIENT_MCE is not set CONFIG_X86_BIGSMP=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index b2a174304..e0eb563f3 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -1651,7 +1651,7 @@ CONFIG_GPD_POCKET_FAN=m # CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set -# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_AMDPT=m CONFIG_GPIO_BD9571MWV=m # CONFIG_GPIO_BT8XX is not set CONFIG_GPIO_CRYSTAL_COVE=y @@ -3995,7 +3995,7 @@ CONFIG_PHYSICAL_START=0x400000 # CONFIG_PI433 is not set CONFIG_PID_NS=y CONFIG_PINCONF=y -# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_AMD=m # CONFIG_PINCTRL_AXP209 is not set CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m @@ -6213,7 +6213,7 @@ CONFIG_X86_32_IRIS=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y # CONFIG_X86_ANCIENT_MCE is not set CONFIG_X86_BIGSMP=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 5257af701..5ef8742d1 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -1651,7 +1651,7 @@ CONFIG_GPD_POCKET_FAN=m # CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set -# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_AMDPT=m CONFIG_GPIO_BD9571MWV=m # CONFIG_GPIO_BT8XX is not set CONFIG_GPIO_CRYSTAL_COVE=y @@ -3995,7 +3995,7 @@ CONFIG_PHYSICAL_START=0x400000 # CONFIG_PI433 is not set CONFIG_PID_NS=y CONFIG_PINCONF=y -# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_AMD=m # CONFIG_PINCTRL_AXP209 is not set CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m @@ -6213,7 +6213,7 @@ CONFIG_X86_32_IRIS=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y # CONFIG_X86_ANCIENT_MCE is not set CONFIG_X86_BIGSMP=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y diff --git a/kernel-i686.config b/kernel-i686.config index 6edbc07ab..4f4ffb3de 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1632,7 +1632,7 @@ CONFIG_GPD_POCKET_FAN=m # CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set -# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_AMDPT=m CONFIG_GPIO_BD9571MWV=m # CONFIG_GPIO_BT8XX is not set CONFIG_GPIO_CRYSTAL_COVE=y @@ -3974,7 +3974,7 @@ CONFIG_PHYSICAL_START=0x400000 # CONFIG_PI433 is not set CONFIG_PID_NS=y CONFIG_PINCONF=y -# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_AMD=m # CONFIG_PINCTRL_AXP209 is not set CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m @@ -6190,7 +6190,7 @@ CONFIG_X86_32_IRIS=m CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y # CONFIG_X86_ANCIENT_MCE is not set CONFIG_X86_BIGSMP=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 7cbff2c9a..12d1e4365 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1694,7 +1694,7 @@ CONFIG_GPD_POCKET_FAN=m # CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set -# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_AMDPT=m # CONFIG_GPIO_AXP209 is not set CONFIG_GPIO_BD9571MWV=m # CONFIG_GPIO_BT8XX is not set @@ -4045,7 +4045,7 @@ CONFIG_PHYSICAL_START=0x1000000 # CONFIG_PI433 is not set CONFIG_PID_NS=y CONFIG_PINCONF=y -# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_AMD=m # CONFIG_PINCTRL_AXP209 is not set CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m @@ -6308,7 +6308,7 @@ CONFIG_X86_64_ACPI_NUMA=y CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_CPUID=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index e8a89d750..1ffe9d093 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -1675,7 +1675,7 @@ CONFIG_GPD_POCKET_FAN=m # CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ALTERA is not set # CONFIG_GPIO_AMD8111 is not set -# CONFIG_GPIO_AMDPT is not set +CONFIG_GPIO_AMDPT=m # CONFIG_GPIO_AXP209 is not set CONFIG_GPIO_BD9571MWV=m # CONFIG_GPIO_BT8XX is not set @@ -4024,7 +4024,7 @@ CONFIG_PHYSICAL_START=0x1000000 # CONFIG_PI433 is not set CONFIG_PID_NS=y CONFIG_PINCONF=y -# CONFIG_PINCTRL_AMD is not set +CONFIG_PINCTRL_AMD=m # CONFIG_PINCTRL_AXP209 is not set CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_BROXTON=m @@ -6285,7 +6285,7 @@ CONFIG_X86_64_ACPI_NUMA=y CONFIG_X86_ACPI_CPUFREQ_CPB=y CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_AMD_FREQ_SENSITIVITY=m -# CONFIG_X86_AMD_PLATFORM_DEVICE is not set +CONFIG_X86_AMD_PLATFORM_DEVICE=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_CPUID=y diff --git a/kernel.spec b/kernel.spec index a4bdc7d2d..9586f633a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1927,6 +1927,10 @@ fi # # %changelog +* Sun May 20 2018 Hans de Goede +- Enable GPIO_AMDPT, PINCTRL_AMD and X86_AMD_PLATFORM_DEVICE Kconfig options + to fix i2c and GPIOs not working on AMD based laptops (rhbz#1510649) + * Thu May 17 2018 Justin M. Forbes - Fix CVE-2018-1120 (rhbz 1575472 1579542)