Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [RFC PATCH v3 4/6] crypto: ccp - check whether PSP supports SEV
 or TEE before initialization
To:     Rijo Thomas <Rijo-john.Thomas@amd.com>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        Herbert Xu <herbert@gondor.apana.org.au>,
        "David S . Miller" <davem@davemloft.net>,
        linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org
Cc:     Nimesh Easow <Nimesh.Easow@amd.com>,
        Devaraj Rangasamy <Devaraj.Rangasamy@amd.com>,
        Jens Wiklander <jens.wiklander@linaro.org>,
        Ard Biesheuvel <ard.biesheuvel@linaro.org>
References: <cover.1575438845.git.Rijo-john.Thomas@amd.com>
 <6a7be399d095373d2677440ff1fef406f97bf0d0.1575438845.git.Rijo-john.Thomas@amd.com>
From:   Gary R Hook <gary.hook@amd.com>
Message-ID: <1e1aecde-7c1a-3d5b-be38-c4cfecfd16aa@amd.com>
Date:   Thu, 19 Dec 2019 16:56:52 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.2.2
In-Reply-To: <6a7be399d095373d2677440ff1fef406f97bf0d0.1575438845.git.Rijo-john.Thomas@amd.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
Received-SPF: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
X-MS-Exchange-CrossTenant-Network-Message-Id: 5e502df2-112f-4f0f-3a58-08d784d6be2d
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2019 22:56:54.7766
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: OMQRLg2awUEVLk3fzyeNL28h6vwCoufsr6GO/zoAs3ihWALukwGrQbcp8TLEvNz/
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2421
Sender: linux-crypto-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

On 12/4/19 12:19 AM, Rijo Thomas wrote:
> Read PSP feature register to check for TEE (Trusted Execution Environment)
> support.
> 
> If neither SEV nor TEE is supported by PSP, then skip PSP initialization.
> 
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Cc: Jens Wiklander <jens.wiklander@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Co-developed-by: Devaraj Rangasamy <Devaraj.Rangasamy@amd.com>
> Signed-off-by: Devaraj Rangasamy <Devaraj.Rangasamy@amd.com>
> Signed-off-by: Rijo Thomas <Rijo-john.Thomas@amd.com>

Acked-by: Gary R Hook <gary.hook@amd.com>

> ---
>   drivers/crypto/ccp/psp-dev.c | 46 +++++++++++++++++++++++++++++++++++++++-----
>   1 file changed, 41 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c
> index 2cd7a5e..3bedf72 100644
> --- a/drivers/crypto/ccp/psp-dev.c
> +++ b/drivers/crypto/ccp/psp-dev.c
> @@ -53,7 +53,7 @@ static irqreturn_t psp_irq_handler(int irq, void *data)
>   	return IRQ_HANDLED;
>   }
>   
> -static int psp_check_sev_support(struct psp_device *psp)
> +static unsigned int psp_get_capability(struct psp_device *psp)
>   {
>   	unsigned int val = ioread32(psp->io_regs + psp->vdata->feature_reg);
>   
> @@ -66,11 +66,17 @@ static int psp_check_sev_support(struct psp_device *psp)
>   	 */
>   	if (val == 0xffffffff) {
>   		dev_notice(psp->dev, "psp: unable to access the device: you might be running a broken BIOS.\n");
> -		return -ENODEV;
> +		return 0;
>   	}
>   
> -	if (!(val & 1)) {
> -		/* Device does not support the SEV feature */
> +	return val;
> +}
> +
> +static int psp_check_sev_support(struct psp_device *psp,
> +				 unsigned int capability)
> +{
> +	/* Check if device supports SEV feature */
> +	if (!(capability & 1)) {
>   		dev_dbg(psp->dev, "psp does not support SEV\n");
>   		return -ENODEV;
>   	}
> @@ -78,10 +84,36 @@ static int psp_check_sev_support(struct psp_device *psp)
>   	return 0;
>   }
>   
> +static int psp_check_tee_support(struct psp_device *psp,
> +				 unsigned int capability)
> +{
> +	/* Check if device supports TEE feature */
> +	if (!(capability & 2)) {
> +		dev_dbg(psp->dev, "psp does not support TEE\n");
> +		return -ENODEV;
> +	}
> +
> +	return 0;
> +}
> +
> +static int psp_check_support(struct psp_device *psp,
> +			     unsigned int capability)
> +{
> +	int sev_support = psp_check_sev_support(psp, capability);
> +	int tee_support = psp_check_tee_support(psp, capability);
> +
> +	/* Return error if device neither supports SEV nor TEE */
> +	if (sev_support && tee_support)
> +		return -ENODEV;
> +
> +	return 0;
> +}
> +
>   int psp_dev_init(struct sp_device *sp)
>   {
>   	struct device *dev = sp->dev;
>   	struct psp_device *psp;
> +	unsigned int capability;
>   	int ret;
>   
>   	ret = -ENOMEM;
> @@ -100,7 +132,11 @@ int psp_dev_init(struct sp_device *sp)
>   
>   	psp->io_regs = sp->io_map;
>   
> -	ret = psp_check_sev_support(psp);
> +	capability = psp_get_capability(psp);
> +	if (!capability)
> +		goto e_disable;
> +
> +	ret = psp_check_support(psp, capability);
>   	if (ret)
>   		goto e_disable;
>   
>