linux-kernel - [tip:efi/core] thunderbolt, efi: Fix Kconfig dependencies harder

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-5fbc89d37bb312c700dfa8121b02241a92b5df13@git.kernel.org>
Date:   Fri, 18 Nov 2016 01:05:25 -0800
From:   tip-bot for Lukas Wunner <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     andreas.noever@...il.com, tglx@...utronix.de, peterz@...radead.org,
        arnd@...db.de, torvalds@...ux-foundation.org,
        ard.biesheuvel@...aro.org, mingo@...nel.org,
        matt@...eblueprint.co.uk, hpa@...or.com,
        linux-kernel@...r.kernel.org, lukas@...ner.de
Subject: [tip:efi/core] thunderbolt, efi: Fix Kconfig dependencies harder

Commit-ID:  5fbc89d37bb312c700dfa8121b02241a92b5df13
Gitweb:     http://git.kernel.org/tip/5fbc89d37bb312c700dfa8121b02241a92b5df13
Author:     Lukas Wunner <lukas@...ner.de>
AuthorDate: Fri, 18 Nov 2016 09:22:59 +0100
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 18 Nov 2016 09:42:53 +0100

thunderbolt, efi: Fix Kconfig dependencies harder

Since commit c9cc3aaa0281 ("thunderbolt: Use Device ROM retrieved from
EFI"), the THUNDERBOLT config option selects APPLE_PROPERTIES.

This broke the build for certain configs because APPLE_PROPERTIES is
located in a menu which depends on EFI:  If EFI is not enabled, the
prerequisites needed for APPLE_PROPERTIES are not selected:  Those are
EFI_DEV_PATH_PARSER and UCS2_STRING.  Additionally EFI_DEV_PATH_PARSER
won't compile unless ACPI is enabled.

Commit 79f9cd35b05e ("thunderbolt, efi: Fix Kconfig dependencies")
sought to fix the breakage by making THUNDERBOLT select APPLE_PROPERTIES
only if EFI_STUB is enabled.  On x86, EFI_STUB depends on EFI and EFI
depends on ACPI, so this fixed the build at least on this architecture.

However on arm and arm64, EFI_STUB does not depend on EFI, so once again
the prerequisites needed for APPLE_PROPERTIES are not selected.
Additionally ACPI is not available on arm and optional on arm64,
therefore EFI_DEV_PATH_PARSER won't compile.

Fix by selecting APPLE_PROPERTIES only on x86.

Suggested-by: Arnd Bergmann <arnd@...db.de>
Signed-off-by: Lukas Wunner <lukas@...ner.de>
Acked-by: Arnd Bergmann <arnd@...db.de>
Cc: Andreas Noever <andreas.noever@...il.com>
Cc: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Matt Fleming <matt@...eblueprint.co.uk>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-efi@...r.kernel.org
Link: http://lkml.kernel.org/r/5c241cf92eb1dc2421218c1204c6a9d22c9f847b.1479456179.git.lukas@wunner.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 drivers/thunderbolt/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig
index bb0318c..de5d27e 100644
--- a/drivers/thunderbolt/Kconfig
+++ b/drivers/thunderbolt/Kconfig
@@ -1,7 +1,7 @@
 menuconfig THUNDERBOLT
 	tristate "Thunderbolt support for Apple devices"
 	depends on PCI
-	select APPLE_PROPERTIES if EFI_STUB
+	select APPLE_PROPERTIES if EFI_STUB && X86
 	select CRC32
 	help
 	  Cactus Ridge Thunderbolt Controller driver