From patchwork Mon Jun 24 19:28:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary R Hook X-Patchwork-Id: 11014003 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 12CC576 for ; Mon, 24 Jun 2019 19:28:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 004EE28A4C for ; Mon, 24 Jun 2019 19:28:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E589A28A5D; Mon, 24 Jun 2019 19:28:42 +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 6BA3328A4C for ; Mon, 24 Jun 2019 19:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729529AbfFXT2k (ORCPT ); Mon, 24 Jun 2019 15:28:40 -0400 Received: from mail-eopbgr760080.outbound.protection.outlook.com ([40.107.76.80]:15593 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725881AbfFXT2k (ORCPT ); Mon, 24 Jun 2019 15:28:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pTvVxcC/HX/+KWMoA83lphgOxFcU6a/vTCmbOr2fpn4=; b=ScRMtxHSKSAEpSSbFZqyZfbtWY94o0LeeXV17JsveYHl+9VC2PJCs6wZjnAiEYY2eJDrZhjoCqpsusibIkZChgvz/qSTiV1oVCWxha91Q+JsWIw+G/fOqhdCYfjqwKKKOk93oxDrkD/K21IBvKkGIFZ6LeBxgcIT0J1ty8tgTsA= Received: from DM5PR12MB1449.namprd12.prod.outlook.com (10.172.40.14) by DM5PR12MB1786.namprd12.prod.outlook.com (10.175.91.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.16; Mon, 24 Jun 2019 19:28:37 +0000 Received: from DM5PR12MB1449.namprd12.prod.outlook.com ([fe80::180c:ff0c:37e6:a482]) by DM5PR12MB1449.namprd12.prod.outlook.com ([fe80::180c:ff0c:37e6:a482%10]) with mapi id 15.20.2008.014; Mon, 24 Jun 2019 19:28:37 +0000 From: "Hook, Gary" To: "linux-crypto@vger.kernel.org" CC: "Lendacky, Thomas" , "herbert@gondor.apana.org.au" , "davem@davemloft.net" Subject: [PATCH 01/11] crypto: ccp - Make CCP debugfs support optional Thread-Topic: [PATCH 01/11] crypto: ccp - Make CCP debugfs support optional Thread-Index: AQHVKsMF6pSyl4ZSUEasMQctnMWnyA== Date: Mon, 24 Jun 2019 19:28:37 +0000 Message-ID: <156140451586.116890.10264836198229403397.stgit@sosrh3.amd.com> References: <156140365456.116890.15736288493305066708.stgit@sosrh3.amd.com> In-Reply-To: <156140365456.116890.15736288493305066708.stgit@sosrh3.amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN1PR12CA0059.namprd12.prod.outlook.com (2603:10b6:802:20::30) To DM5PR12MB1449.namprd12.prod.outlook.com (2603:10b6:4:10::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Gary.Hook@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [165.204.78.2] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 476c49fb-9f1f-4a21-e847-08d6f8da27b1 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:DM5PR12MB1786; x-ms-traffictypediagnostic: DM5PR12MB1786: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6108; x-forefront-prvs: 007814487B x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(396003)(39860400002)(346002)(136003)(376002)(189003)(199004)(2906002)(103116003)(7736002)(26005)(6506007)(6916009)(53936002)(86362001)(6512007)(316002)(256004)(76176011)(73956011)(2351001)(5660300002)(64756008)(66476007)(66556008)(66066001)(6436002)(66446008)(102836004)(4326008)(66946007)(25786009)(6486002)(186003)(305945005)(5640700003)(52116002)(386003)(8936002)(68736007)(478600001)(2501003)(3846002)(71190400001)(446003)(6116002)(476003)(81166006)(54906003)(72206003)(81156014)(71200400001)(11346002)(8676002)(99286004)(486006)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1786;H:DM5PR12MB1449.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A: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: +RlO3XbblMPh7wKSFE28Iw5gy5VWUKEhxDzOe4tkFOSqmGw9ECMLpwMDMCypkWIX4CtNJTWAgh0319jE7gCDiPPcHTGiz8mfoIzptIGxboMXfBwT6rQgt2QK9qYRnj06V0eOeXwVJOThdA6u9YXAITOvMyb5z88YcB2J+qXK2mmqc3Dw9f7+j688jmOikGS/ULJtNp6LNZ74AvsrogxCQ6YbtNYnG44b8LAMfXetAqX3OJ+y5vhIoorN58P6q4/vwRskhuzJuz/rLFbfBy1ylLqvkeImcZUnpxD73wMcGoWjSyXw9rCQ0T4hGB4WMo/5eonGfoh7EvSl3AHtE41CV4211d1JnYXUjQ2Y9ILmK+Gr876SWywqbEaSldGDaDRSa2nsvuQg5YWeKh3lCwJjdo6U3dBYoB9H9uSD9uypZNM= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 476c49fb-9f1f-4a21-e847-08d6f8da27b1 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jun 2019 19:28:37.4896 (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: ghook@amd.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1786 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 Add a config option to exclude DebugFS support in the CCP driver. Signed-off-by: Gary R Hook --- drivers/crypto/ccp/Kconfig | 9 +++++++++ drivers/crypto/ccp/Makefile | 4 ++-- drivers/crypto/ccp/ccp-dev-v5.c | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index b9dfae47aefd..6fcedd7b0d42 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -44,3 +44,12 @@ config CRYPTO_DEV_SP_PSP management commands in Secure Encrypted Virtualization (SEV) mode, along with software-based Trusted Execution Environment (TEE) to enable third-party trusted applications. + +config CRYPTO_DEV_CCP_DEBUGFS + bool "Enable CCP Internals in DebugFS" + default n + depends on CRYPTO_DEV_SP_CCP + help + Expose CCP device information such as operation statistics, feature + information, descriptor queue contents, and module parameter values set + at load time. diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile index 51d1c0cf66c7..6b86f1e6d634 100644 --- a/drivers/crypto/ccp/Makefile +++ b/drivers/crypto/ccp/Makefile @@ -5,8 +5,8 @@ ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \ ccp-ops.o \ ccp-dev-v3.o \ ccp-dev-v5.o \ - ccp-dmaengine.o \ - ccp-debugfs.o + ccp-dmaengine.o +ccp-$(CONFIG_CRYPTO_DEV_CCP_DEBUGFS) += ccp-debugfs.o ccp-$(CONFIG_PCI) += sp-pci.o ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += psp-dev.o diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c index c9bfd4f439ce..a5bd11831b80 100644 --- a/drivers/crypto/ccp/ccp-dev-v5.c +++ b/drivers/crypto/ccp/ccp-dev-v5.c @@ -973,8 +973,10 @@ static int ccp5_init(struct ccp_device *ccp) if (ret) goto e_hwrng; +#ifdef CONFIG_CRYPTO_DEV_CCP_DEBUGFS /* Set up debugfs entries */ ccp5_debugfs_setup(ccp); +#endif return 0; @@ -1012,11 +1014,13 @@ static void ccp5_destroy(struct ccp_device *ccp) /* Remove this device from the list of available units first */ ccp_del_device(ccp); +#ifdef CONFIG_CRYPTO_DEV_CCP_DEBUGFS /* We're in the process of tearing down the entire driver; * when all the devices are gone clean up debugfs */ if (ccp_present()) ccp5_debugfs_destroy(); +#endif /* Disable and clear interrupts */ ccp5_disable_queue_interrupts(ccp);