From patchwork Fri Feb 15 17:26:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 10815597 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD57F139A for ; Fri, 15 Feb 2019 17:26:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD2672EA35 for ; Fri, 15 Feb 2019 17:26:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0F672EF24; Fri, 15 Feb 2019 17:26:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 296482EA35 for ; Fri, 15 Feb 2019 17:26:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726634AbfBOR0g (ORCPT ); Fri, 15 Feb 2019 12:26:36 -0500 Received: from mail-eopbgr710074.outbound.protection.outlook.com ([40.107.71.74]:23680 "EHLO NAM05-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725939AbfBOR0g (ORCPT ); Fri, 15 Feb 2019 12:26:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TIfbS+zqHTOyykh9TTb6JkvLVRtOd7P/SmsxVs9YkmY=; b=EXzPU1VCanULTXCXQe54qcmxGA7qvi6K5/tmuHwLUPWwetsu8yF6LcHXhBp4BHtHXmDHhVIrmI6XYw2Umnee+zdaAc27QDqIqdsGggWyi+Wba6ciHDKqmBZBXkPbih2dKOI8dXO7yE1J8rju/NmBlaYZSLMPmKOCEXLmbRhytkU= Received: from DM6PR12MB3163.namprd12.prod.outlook.com (20.179.104.150) by DM6PR12MB3385.namprd12.prod.outlook.com (20.178.198.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Fri, 15 Feb 2019 17:26:33 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::2809:46:d708:b9c1]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::2809:46:d708:b9c1%5]) with mapi id 15.20.1622.016; Fri, 15 Feb 2019 17:26:33 +0000 From: "Lendacky, Thomas" To: "linux-crypto@vger.kernel.org" CC: Borislav Petkov , "Singh, Brijesh" , "Hook, Gary" , Herbert Xu , David Miller Subject: [PATCH] crypto: ccp - Update driver messages to remove some confusion Thread-Topic: [PATCH] crypto: ccp - Update driver messages to remove some confusion Thread-Index: AQHUxVOYyF+ESvknhEyViohsVlKHFg== Date: Fri, 15 Feb 2019 17:26:33 +0000 Message-ID: <155025159161.22636.12469459044882251074.stgit@tlendack-t1.amdoffice.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN6PR16CA0071.namprd16.prod.outlook.com (2603:10b6:805:ca::48) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:182::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [165.204.78.1] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8574a893-a87e-411f-356b-08d6936abae6 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020);SRVR:DM6PR12MB3385; x-ms-traffictypediagnostic: DM6PR12MB3385: x-microsoft-exchange-diagnostics: 1;DM6PR12MB3385;20:elpNVuGMNc2HbQQZLRCRLrjjwTFCQr05VUHJUPuouDot89UvmQffymJJaTpR/cQlW34F+wstaRrXunDkIyMHqTPFrtV8wTt1ut+l6cgegxL5PEB8xpFoWi0DDlp/T/ZduUlMIYMIYbC+ajSpTm+KICDIcL+7D329YIsUPG+x/pMtnH8IgwF51m7l+6M3lT1TPb55e5zl4AJlukdQLmk+Z7T2lkm+aDdagCEKY9DvXNHFszOlz4KBfusmYjWJDLsR x-microsoft-antispam-prvs: x-forefront-prvs: 09497C15EB x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(346002)(396003)(376002)(136003)(39860400002)(199004)(189003)(105586002)(7736002)(81166006)(8676002)(68736007)(305945005)(8936002)(54906003)(14444005)(81156014)(6486002)(2906002)(316002)(103116003)(66066001)(3846002)(478600001)(6916009)(14454004)(6116002)(186003)(72206003)(15650500001)(33896004)(102836004)(26005)(6506007)(486006)(86362001)(25786009)(2501003)(256004)(6512007)(476003)(9686003)(386003)(2351001)(6436002)(53936002)(5640700003)(99286004)(71190400001)(52116002)(71200400001)(4326008)(106356001)(97736004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3385;H:DM6PR12MB3163.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: A6c2mEDL5EioLGGSegXHHvuSfndHxvGDysrxNmRJEkcK0NpRDJ/vNTMsCm4i/WTyOc6yDncQwbG7Eo/zgGmoeYZZCT3lOFi/D2JrfCU9RQKe/ezZlGngGmb8ZM1pRIr95NSr+3Yt0itoKCjSq0BftlDOBvk2/ovS8cGMgpFPDAonCj44zRAys4do6VZqyzU2lBiRyNU0QCTRErG8Gtk4CXEZNmeJ1oguCgOw1RWeQOreimV5iXgE7zIj4lxZuBd0cFZtblL1oAXG08ceMryH4WRa2n0/8kdTebRZlwsfGHwaoPKqIFA9NtsCgUpPYO618QpujDOQ/MvwoWvInJN/k8ptLEK4+dYHaUhcWTkAwKqw4QDOAKWdQA169OuSbpgGn+FJK9RSOvbAfIOhowFffBt0wNgQ7nJb/pkRfC5mXPI= Content-ID: <8C0A0B566C45304DBB3311800F77FDFB@namprd12.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8574a893-a87e-411f-356b-08d6936abae6 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Feb 2019 17:26:32.6856 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3385 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current content of some of the driver messages and the way that they are issued results in some confusion, especially in the area of the PSP as it relates to SEV support. If SEV is not supported, a message is issued that says "psp initialization failed." This makes it seem like there was a problem, when in fact, the PSP support is just disabled if SEV is not supported. Update the driver to check SEV support a bit earlier and issue a debug- level message if SEV is not supported, followed by a debug-level message that the PSP is disabled. This way you will only see PSP messages if SEV is supported or if debug information is desired. Also, remove the overall "enabled" and "disabled" messages for the driver and rely on the CCP and PSP support to issue component-specific messages. Signed-off-by: Tom Lendacky --- drivers/crypto/ccp/psp-dev.c | 19 ++++++++++++++----- drivers/crypto/ccp/sp-pci.c | 4 ---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index 638f138debd7..fadf859a14b8 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -858,15 +858,15 @@ static int sev_misc_init(struct psp_device *psp) return 0; } -static int sev_init(struct psp_device *psp) +static int psp_check_sev_support(struct psp_device *psp) { /* Check if device supports SEV feature */ if (!(ioread32(psp->io_regs + psp->vdata->feature_reg) & 1)) { - dev_dbg(psp->dev, "device does not support SEV\n"); - return 1; + dev_dbg(psp->dev, "psp does not support SEV\n"); + return -ENODEV; } - return sev_misc_init(psp); + return 0; } int psp_dev_init(struct sp_device *sp) @@ -891,6 +891,10 @@ int psp_dev_init(struct sp_device *sp) psp->io_regs = sp->io_map; + ret = psp_check_sev_support(psp); + if (ret) + goto e_disable; + /* Disable and clear interrupts until ready */ iowrite32(0, psp->io_regs + psp->vdata->inten_reg); iowrite32(-1, psp->io_regs + psp->vdata->intsts_reg); @@ -902,7 +906,7 @@ int psp_dev_init(struct sp_device *sp) goto e_err; } - ret = sev_init(psp); + ret = sev_misc_init(psp); if (ret) goto e_irq; @@ -923,6 +927,11 @@ int psp_dev_init(struct sp_device *sp) dev_notice(dev, "psp initialization failed\n"); + return ret; + +e_disable: + sp->psp_data = NULL; + return ret; } diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index 6d730d3e3f6f..41bce0a3f4bb 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -226,8 +226,6 @@ static int sp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (ret) goto e_err; - dev_notice(dev, "enabled\n"); - return 0; e_err: @@ -246,8 +244,6 @@ static void sp_pci_remove(struct pci_dev *pdev) sp_destroy(sp); sp_free_irqs(sp); - - dev_notice(dev, "disabled\n"); } #ifdef CONFIG_PM