From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC62EC636CC for ; Wed, 15 Feb 2023 11:13:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231411AbjBOLNR (ORCPT ); Wed, 15 Feb 2023 06:13:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230492AbjBOLNP (ORCPT ); Wed, 15 Feb 2023 06:13:15 -0500 Received: from mail-vs1-xe2f.google.com (mail-vs1-xe2f.google.com [IPv6:2607:f8b0:4864:20::e2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BAAF1B54C for ; Wed, 15 Feb 2023 03:13:13 -0800 (PST) Received: by mail-vs1-xe2f.google.com with SMTP id u20so3556224vsp.5 for ; Wed, 15 Feb 2023 03:13:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1676459592; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=D9lP4MvG5k1EpDumXLwfDIbMIO5VvOfCG8n4ZwEIYRA=; b=LrC6OAsRg8g1C233qVSu2aTQsjJukMSr9kJugX5eEv5xTztxZNBGMYdnJtZL4A3I20 FoLBUysjf9I+puYCWrbSuqo18hn0vqoPJL/cUrror+NRaNEDJyZ3FV73Mb3RKJ5gxrUm doCRxywsnNkhtbu6FZMJIpFRgYhTSkEwnzvw8bRm76R+noLjOzx1LDCmPmiRSHG2fvso ELFjfxQfq8GOCff+Anilfx36Xa62SovbSw6qbo8+Grwykib0TwZ2Cc5QFZJb/qgNfGhE GfmbPEfktti6g6oROelZgHi/02PwL6GGew43sdomc4f8fWfJDqXSSIFCj1u96PRDbLcp idQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676459592; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=D9lP4MvG5k1EpDumXLwfDIbMIO5VvOfCG8n4ZwEIYRA=; b=cijwaaOIYui4Iwmj8/grCulGiScTfRP2RDDn16N+neLDH9Ia5JClNb0Ljd1ymNg2KY ycVu7m9fCQPNkbuPAxbr006rCHFqo9xMq6RY3MwcHeRti2M53yCjU3Yfn9Ue4mDUM8v9 0pYMvB9MjVJ+1CKIipJnWzF202eHpNmBpjEWWSpHTCfpPofc+ecdzIoASkO3N4uBKpCS Mvx8ma/w9LfKvLUtHqfzzmVK/ydzhcObm9C9oopi1X7ogoekYdW7o36fELvnUYYbN2mH 8CsJemiWHWid3+zpBBll6QqaiWwYB0aMEzbEgA6249BgAxEkLblDgLN3sq8Xlu2Pk04e a0kA== X-Gm-Message-State: AO0yUKVofCgo23uTiquEPyA8cB0JanKM0FdkxoiG9J463447IWMuDGfs x68Z1+oyruhQ+ZMo03I0sR99O5HobFgOku423l8jsA== X-Google-Smtp-Source: AK7set+3UZH4rvUHU7q81fVFwnGAXPrl5eO9z6mdY/NTSmUYUwUrPc1QZupIIazj9JL9bT4f4FTNcpxlotuAc3guJtA= X-Received: by 2002:a67:6081:0:b0:3ee:65e3:af84 with SMTP id u123-20020a676081000000b003ee65e3af84mr325407vsb.77.1676459592133; Wed, 15 Feb 2023 03:13:12 -0800 (PST) MIME-Version: 1.0 References: <20230209223811.4993-1-mario.limonciello@amd.com> <20230209223811.4993-3-mario.limonciello@amd.com> In-Reply-To: <20230209223811.4993-3-mario.limonciello@amd.com> From: Sumit Garg Date: Wed, 15 Feb 2023 16:43:01 +0530 Message-ID: Subject: Re: [PATCH 2/6] crypto: ccp: Add a header for multiple drivers to use `__psp_pa` To: Mario Limonciello Cc: =?UTF-8?B?SmFuIETEhWJyb8Wb?= , Grzegorz Bernacki , Thomas Rijo-john , Lendacky Thomas , herbert@gondor.apana.org.au, Sean Christopherson , Paolo Bonzini , Brijesh Singh , John Allen , Jarkko Nikula , Andy Shevchenko , Mika Westerberg , linux-i2c@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "David S. Miller" , Jens Wiklander , kvm@vger.kernel.org, op-tee@lists.trustedfirmware.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 10 Feb 2023 at 04:08, Mario Limonciello wrote: > > The TEE subdriver for CCP, the amdtee driver and the i2c-designware-amdpsp > drivers all include `psp-sev.h` even though they don't use SEV > functionality. > > Move the definition of `__psp_pa` into a common header to be included > by all of these drivers. > > Signed-off-by: Mario Limonciello > --- > arch/x86/kvm/svm/sev.c | 1 + > drivers/crypto/ccp/sev-dev.c | 1 + > drivers/crypto/ccp/tee-dev.c | 2 +- > drivers/i2c/busses/i2c-designware-amdpsp.c | 2 +- > drivers/tee/amdtee/call.c | 2 +- > drivers/tee/amdtee/shm_pool.c | 2 +- For TEE subsystem bits: Acked-by: Sumit Garg -Sumit > include/linux/psp-sev.h | 8 -------- > include/linux/psp.h | 14 ++++++++++++++ > 8 files changed, 20 insertions(+), 12 deletions(-) > create mode 100644 include/linux/psp.h > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index 86d6897f48068..ee8e9053f4468 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c > index e2f25926eb514..28945ca7c8563 100644 > --- a/drivers/crypto/ccp/sev-dev.c > +++ b/drivers/crypto/ccp/sev-dev.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > > #include > #include > diff --git a/drivers/crypto/ccp/tee-dev.c b/drivers/crypto/ccp/tee-dev.c > index 5c9d47f3be375..f24fc953718a0 100644 > --- a/drivers/crypto/ccp/tee-dev.c > +++ b/drivers/crypto/ccp/tee-dev.c > @@ -13,7 +13,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include "psp-dev.h" > diff --git a/drivers/i2c/busses/i2c-designware-amdpsp.c b/drivers/i2c/busses/i2c-designware-amdpsp.c > index 8f36167bce624..80f28a1bbbef6 100644 > --- a/drivers/i2c/busses/i2c-designware-amdpsp.c > +++ b/drivers/i2c/busses/i2c-designware-amdpsp.c > @@ -4,7 +4,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > diff --git a/drivers/tee/amdtee/call.c b/drivers/tee/amdtee/call.c > index cec6e70f0ac92..e8cd9aaa34675 100644 > --- a/drivers/tee/amdtee/call.c > +++ b/drivers/tee/amdtee/call.c > @@ -8,7 +8,7 @@ > #include > #include > #include > -#include > +#include > #include "amdtee_if.h" > #include "amdtee_private.h" > > diff --git a/drivers/tee/amdtee/shm_pool.c b/drivers/tee/amdtee/shm_pool.c > index f87f96a291c99..f0303126f199d 100644 > --- a/drivers/tee/amdtee/shm_pool.c > +++ b/drivers/tee/amdtee/shm_pool.c > @@ -5,7 +5,7 @@ > > #include > #include > -#include > +#include > #include "amdtee_private.h" > > static int pool_op_alloc(struct tee_shm_pool *pool, struct tee_shm *shm, > diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h > index 1595088c428b4..7fd17e82bab43 100644 > --- a/include/linux/psp-sev.h > +++ b/include/linux/psp-sev.h > @@ -14,14 +14,6 @@ > > #include > > -#ifdef CONFIG_X86 > -#include > - > -#define __psp_pa(x) __sme_pa(x) > -#else > -#define __psp_pa(x) __pa(x) > -#endif > - > #define SEV_FW_BLOB_MAX_SIZE 0x4000 /* 16KB */ > > /** > diff --git a/include/linux/psp.h b/include/linux/psp.h > new file mode 100644 > index 0000000000000..202162487ec3b > --- /dev/null > +++ b/include/linux/psp.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#ifndef __PSP_H > +#define __PSP_H > + > +#ifdef CONFIG_X86 > +#include > + > +#define __psp_pa(x) __sme_pa(x) > +#else > +#define __psp_pa(x) __pa(x) > +#endif > + > +#endif /* __PSP_H */ > -- > 2.34.1 >