* [PATCH 0/2] Thunderbolt Kbuild fixes
@ 2016-11-18 8:22 Lukas Wunner
2016-11-18 8:22 ` [PATCH 2/2] thunderbolt: Compile on x86 only Lukas Wunner
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Lukas Wunner @ 2016-11-18 8:22 UTC (permalink / raw)
To: Ingo Molnar
Cc: Arnd Bergmann, Andreas Noever, Matt Fleming, x86, linux-kernel
Dear Ingo,
please consider applying the following two patches to efi/core for 4.10,
based on the discussion with Arnd:
The first one fixes a build breakage for certain configs on arm and arm64,
the second one excludes thunderbolt from the build on non-x86 except for
compile tests.
Feel free to squash the first one with the existing commit 79f9cd35b05e
("thunderbolt, efi: Fix Kconfig dependencies") on this branch, or squash
both with c9cc3aaa0281 ("thunderbolt: Use Device ROM retrieved from EFI")
if you want.
Thank you!
Lukas
Lukas Wunner (2):
thunderbolt, efi: Fix Kconfig dependencies harder
thunderbolt: Compile on x86 only
drivers/thunderbolt/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
2.10.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/2] thunderbolt: Compile on x86 only 2016-11-18 8:22 [PATCH 0/2] Thunderbolt Kbuild fixes Lukas Wunner @ 2016-11-18 8:22 ` Lukas Wunner 2016-11-18 9:05 ` [tip:efi/core] " tip-bot for Lukas Wunner 2016-11-18 8:22 ` [PATCH 1/2] thunderbolt, efi: Fix Kconfig dependencies harder Lukas Wunner 2016-11-18 8:30 ` [PATCH 0/2] Thunderbolt Kbuild fixes Arnd Bergmann 2 siblings, 1 reply; 6+ messages in thread From: Lukas Wunner @ 2016-11-18 8:22 UTC (permalink / raw) To: Ingo Molnar Cc: Arnd Bergmann, Andreas Noever, Matt Fleming, x86, linux-kernel So far Thunderbolt is (unfortunately) an Intel proprietary technology that is only available on x86, so compiling on other arches is pointless except for testing purposes. Amend Kconfig accordingly. Suggested-by: Arnd Bergmann <arnd@arndb.de> Cc: Andreas Noever <andreas.noever@gmail.com> Cc: Matt Fleming <matt@codeblueprint.co.uk> Signed-off-by: Lukas Wunner <lukas@wunner.de> --- drivers/thunderbolt/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig index de5d27e..d35db16 100644 --- a/drivers/thunderbolt/Kconfig +++ b/drivers/thunderbolt/Kconfig @@ -1,6 +1,7 @@ menuconfig THUNDERBOLT tristate "Thunderbolt support for Apple devices" depends on PCI + depends on X86 || COMPILE_TEST select APPLE_PROPERTIES if EFI_STUB && X86 select CRC32 help -- 2.10.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip:efi/core] thunderbolt: Compile on x86 only 2016-11-18 8:22 ` [PATCH 2/2] thunderbolt: Compile on x86 only Lukas Wunner @ 2016-11-18 9:05 ` tip-bot for Lukas Wunner 0 siblings, 0 replies; 6+ messages in thread From: tip-bot for Lukas Wunner @ 2016-11-18 9:05 UTC (permalink / raw) To: linux-tip-commits Cc: torvalds, peterz, hpa, tglx, ard.biesheuvel, arnd, mingo, lukas, linux-kernel, andreas.noever, matt Commit-ID: b2c74191f4672c4b3265d0335910792b4f72026b Gitweb: http://git.kernel.org/tip/b2c74191f4672c4b3265d0335910792b4f72026b Author: Lukas Wunner <lukas@wunner.de> AuthorDate: Fri, 18 Nov 2016 09:22:59 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Fri, 18 Nov 2016 09:42:59 +0100 thunderbolt: Compile on x86 only So far Thunderbolt is (unfortunately) an Intel proprietary technology that is only available on x86, so compiling on other arches is pointless except for testing purposes. Amend Kconfig accordingly. Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Lukas Wunner <lukas@wunner.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Andreas Noever <andreas.noever@gmail.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/7dfda728d3ee8a33c80c49b224da7359c6015eea.1479456179.git.lukas@wunner.de Signed-off-by: Ingo Molnar <mingo@kernel.org> --- drivers/thunderbolt/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig index de5d27e..d35db16 100644 --- a/drivers/thunderbolt/Kconfig +++ b/drivers/thunderbolt/Kconfig @@ -1,6 +1,7 @@ menuconfig THUNDERBOLT tristate "Thunderbolt support for Apple devices" depends on PCI + depends on X86 || COMPILE_TEST select APPLE_PROPERTIES if EFI_STUB && X86 select CRC32 help ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] thunderbolt, efi: Fix Kconfig dependencies harder 2016-11-18 8:22 [PATCH 0/2] Thunderbolt Kbuild fixes Lukas Wunner 2016-11-18 8:22 ` [PATCH 2/2] thunderbolt: Compile on x86 only Lukas Wunner @ 2016-11-18 8:22 ` Lukas Wunner 2016-11-18 9:05 ` [tip:efi/core] " tip-bot for Lukas Wunner 2016-11-18 8:30 ` [PATCH 0/2] Thunderbolt Kbuild fixes Arnd Bergmann 2 siblings, 1 reply; 6+ messages in thread From: Lukas Wunner @ 2016-11-18 8:22 UTC (permalink / raw) To: Ingo Molnar Cc: Arnd Bergmann, Andreas Noever, Matt Fleming, x86, linux-kernel 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@arndb.de> Cc: Andreas Noever <andreas.noever@gmail.com> Cc: Matt Fleming <matt@codeblueprint.co.uk> Signed-off-by: Lukas Wunner <lukas@wunner.de> --- 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 -- 2.10.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip:efi/core] thunderbolt, efi: Fix Kconfig dependencies harder 2016-11-18 8:22 ` [PATCH 1/2] thunderbolt, efi: Fix Kconfig dependencies harder Lukas Wunner @ 2016-11-18 9:05 ` tip-bot for Lukas Wunner 0 siblings, 0 replies; 6+ messages in thread From: tip-bot for Lukas Wunner @ 2016-11-18 9:05 UTC (permalink / raw) To: linux-tip-commits Cc: andreas.noever, tglx, peterz, arnd, torvalds, ard.biesheuvel, mingo, matt, hpa, linux-kernel, lukas Commit-ID: 5fbc89d37bb312c700dfa8121b02241a92b5df13 Gitweb: http://git.kernel.org/tip/5fbc89d37bb312c700dfa8121b02241a92b5df13 Author: Lukas Wunner <lukas@wunner.de> AuthorDate: Fri, 18 Nov 2016 09:22:59 +0100 Committer: Ingo Molnar <mingo@kernel.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@arndb.de> Signed-off-by: Lukas Wunner <lukas@wunner.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Andreas Noever <andreas.noever@gmail.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/5c241cf92eb1dc2421218c1204c6a9d22c9f847b.1479456179.git.lukas@wunner.de Signed-off-by: Ingo Molnar <mingo@kernel.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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] Thunderbolt Kbuild fixes 2016-11-18 8:22 [PATCH 0/2] Thunderbolt Kbuild fixes Lukas Wunner 2016-11-18 8:22 ` [PATCH 2/2] thunderbolt: Compile on x86 only Lukas Wunner 2016-11-18 8:22 ` [PATCH 1/2] thunderbolt, efi: Fix Kconfig dependencies harder Lukas Wunner @ 2016-11-18 8:30 ` Arnd Bergmann 2 siblings, 0 replies; 6+ messages in thread From: Arnd Bergmann @ 2016-11-18 8:30 UTC (permalink / raw) To: Lukas Wunner; +Cc: Ingo Molnar, Andreas Noever, Matt Fleming, x86, linux-kernel On Friday, November 18, 2016 9:22:59 AM CET Lukas Wunner wrote: > Dear Ingo, > > please consider applying the following two patches to efi/core for 4.10, > based on the discussion with Arnd: > > The first one fixes a build breakage for certain configs on arm and arm64, > the second one excludes thunderbolt from the build on non-x86 except for > compile tests. > > Feel free to squash the first one with the existing commit 79f9cd35b05e > ("thunderbolt, efi: Fix Kconfig dependencies") on this branch, or squash > both with c9cc3aaa0281 ("thunderbolt: Use Device ROM retrieved from EFI") > if you want. Both patches Acked-by: Arnd Bergmann <arnd@arndb.de> Thanks for following up, Arnd ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-18 9:08 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-18 8:22 [PATCH 0/2] Thunderbolt Kbuild fixes Lukas Wunner 2016-11-18 8:22 ` [PATCH 2/2] thunderbolt: Compile on x86 only Lukas Wunner 2016-11-18 9:05 ` [tip:efi/core] " tip-bot for Lukas Wunner 2016-11-18 8:22 ` [PATCH 1/2] thunderbolt, efi: Fix Kconfig dependencies harder Lukas Wunner 2016-11-18 9:05 ` [tip:efi/core] " tip-bot for Lukas Wunner 2016-11-18 8:30 ` [PATCH 0/2] Thunderbolt Kbuild fixes Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).