From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Krzysztof Kozlowski <krzk@kernel.org>,
Joerg Roedel <joro@8bytes.org>,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Cc: virtualization@lists.linux-foundation.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org,
Michael Ellerman <mpe@ellerman.id.au>
Subject: Re: [PATCH] iommu: spapr_tce: Disable compile testing to fix build on book3s_32 config
Date: Sat, 18 Apr 2020 15:14:02 +0000 [thread overview]
Message-ID: <a99ee461-664c-51ae-cb3a-cf5d87048d86@c-s.fr> (raw)
In-Reply-To: <20200414142630.21153-1-krzk@kernel.org>
On 04/14/2020 02:26 PM, Krzysztof Kozlowski wrote:
> Although SPAPR_TCE_IOMMU itself can be compile tested on certain PowerPC
> configurations, its presence makes arch/powerpc/kvm/Makefile to select
> modules which do not build in such configuration.
>
> The arch/powerpc/kvm/ modules use kvm_arch.spapr_tce_tables which exists
> only with CONFIG_PPC_BOOK3S_64. However these modules are selected when
> COMPILE_TEST and SPAPR_TCE_IOMMU are chosen leading to build failures:
>
> In file included from arch/powerpc/include/asm/book3s/64/mmu-hash.h:20:0,
> from arch/powerpc/kvm/book3s_64_vio_hv.c:22:
> arch/powerpc/include/asm/book3s/64/pgtable.h:17:0: error: "_PAGE_EXEC" redefined [-Werror]
> #define _PAGE_EXEC 0x00001 /* execute permission */
>
> In file included from arch/powerpc/include/asm/book3s/32/pgtable.h:8:0,
> from arch/powerpc/include/asm/book3s/pgtable.h:8,
> from arch/powerpc/include/asm/pgtable.h:18,
> from include/linux/mm.h:95,
> from arch/powerpc/include/asm/io.h:29,
> from include/linux/io.h:13,
> from include/linux/irq.h:20,
> from arch/powerpc/include/asm/hardirq.h:6,
> from include/linux/hardirq.h:9,
> from include/linux/kvm_host.h:7,
> from arch/powerpc/kvm/book3s_64_vio_hv.c:12:
> arch/powerpc/include/asm/book3s/32/hash.h:29:0: note: this is the location of the previous definition
> #define _PAGE_EXEC 0x200 /* software: exec allowed */
>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Fixes: e93a1695d7fb ("iommu: Enable compile testing for some of drivers")
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
> ---
> drivers/iommu/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> index 58b4a4dbfc78..3532b1ead19d 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -362,7 +362,7 @@ config IPMMU_VMSA
>
> config SPAPR_TCE_IOMMU
> bool "sPAPR TCE IOMMU Support"
> - depends on PPC_POWERNV || PPC_PSERIES || (PPC && COMPILE_TEST)
> + depends on PPC_POWERNV || PPC_PSERIES
> select IOMMU_API
> help
> Enables bits of IOMMU API required by VFIO. The iommu_ops
>
Should it be fixed the other way round, something like:
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index 2bfeaa13befb..906707d15810 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -135,4 +135,4 @@ obj-$(CONFIG_KVM_BOOK3S_32) += kvm.o
obj-$(CONFIG_KVM_BOOK3S_64_PR) += kvm-pr.o
obj-$(CONFIG_KVM_BOOK3S_64_HV) += kvm-hv.o
-obj-y += $(kvm-book3s_64-builtin-objs-y)
+obj-$(CONFIG_KVM_BOOK3S_64) += $(kvm-book3s_64-builtin-objs-y)
Christophe
next prev parent reply other threads:[~2020-04-18 15:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 14:26 [PATCH] iommu: spapr_tce: Disable compile testing to fix build on book3s_32 config Krzysztof Kozlowski
2020-04-18 12:46 ` Joerg Roedel
2020-04-18 15:14 ` Christophe Leroy [this message]
2020-04-20 3:04 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a99ee461-664c-51ae-cb3a-cf5d87048d86@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=geert@linux-m68k.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).