Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 3 Sep 2019 15:28:49 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Lendacky, Thomas" <Thomas.Lendacky@amd.com>
Cc:     Joerg Roedel <joro@8bytes.org>,
        Thiago Jung Bauermann <bauerman@linux.ibm.com>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the iommu tree
Message-ID: <20190903152849.770ae819@canb.auug.org.au>
In-Reply-To: <d2493e6b-08fa-9ea8-a0a4-076def54e91b@amd.com>
References: <20190902163951.6280e030@canb.auug.org.au>
        <20190902140347.GA23482@8bytes.org>
        <d2493e6b-08fa-9ea8-a0a4-076def54e91b@amd.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/QC/nbyo+M/koxzSVz3tcjkr";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/QC/nbyo+M/koxzSVz3tcjkr
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 2 Sep 2019 14:26:40 +0000 "Lendacky, Thomas" <Thomas.Lendacky@amd.c=
om> wrote:
>
> On 9/2/19 9:03 AM, Joerg Roedel wrote:
> >=20
> > tl;dr: And IOMMU commit introduces a new user for sme_active() in
> >         generic code, and commit
> >=20
> >         	284e21fab2cf x86, s390/mm: Move sme_active() and sme_me_mask t=
o x86-specific header
> >=20
> >         breaks the build of drivers/iommu/ for all architectures not
> >         implementing sme_active().
> >=20
> > On Mon, Sep 02, 2019 at 04:39:51PM +1000, Stephen Rothwell wrote: =20
> >> drivers/iommu/iommu.c: In function 'iommu_subsys_init':
> >> drivers/iommu/iommu.c:123:38: error: implicit declaration of function =
'sme_active'; did you mean 'cpu_active'? [-Werror=3Dimplicit-function-decla=
ration]
> >>    123 |   if (iommu_default_passthrough() && sme_active()) { =20
>=20
> Maybe we should make this mem_encrypt_active(), since this will probably
> be needed if/when an IOMMU device is eventually added to a guest, and the
> referenced commit below doesn't remove that call.

I have done that for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Sep 2019 15:19:34 +1000
Subject: [PATCH] iommu: use mem_encrypt_active() instead of sme_active()

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/iommu/iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 66cfacaa483d..b870044ecd49 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -120,7 +120,7 @@ static int __init iommu_subsys_init(void)
 		else
 			iommu_set_default_translated(false);
=20
-		if (iommu_default_passthrough() && sme_active()) {
+		if (iommu_default_passthrough() && mem_encrypt_active()) {
 			pr_info("SME detected - Disabling default IOMMU Passthrough\n");
 			iommu_set_default_translated(false);
 		}
--=20
2.23.0.rc1

--=20
Cheers,
Stephen Rothwell

--Sig_/QC/nbyo+M/koxzSVz3tcjkr
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1t+hEACgkQAVBC80lX
0GwcpAf+JfutCmod1dRdGPit/CwvcXnxjPi230q7rPjbytPpnAJMfx8GcpgR+ZNk
y4JkL4WqKVDr1+txFZMWzwYj9/wiZjCllo0MXX0gGzaC+LZO1ZnLbMhxPNk54b6e
g++atpHeOcUnGWFwcTpHeLo/E6q7z0zz9M8eE5NU2MIxc61ahRjqj0q2SMLI9omo
4EnqlnYzXu9jQ5pXcO2vrng2Ri2jLBlt9LkIVCUOPhfEmW2q1/TbGVu9YvAQQvPY
YTS++V2q12CKBlLBPPsH7fFGDmBJgSDOVL/SvPgnny8hpenO9XCT7SRFe0elA3Cs
boCD8NbN/p7CYFj+mfMd7KboUC+gIw==
=5WxQ
-----END PGP SIGNATURE-----

--Sig_/QC/nbyo+M/koxzSVz3tcjkr--