From patchwork Mon Jun 24 19:29:32 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: 11014023 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 7E74D76 for ; Mon, 24 Jun 2019 19:30:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DD3628496 for ; Mon, 24 Jun 2019 19:30:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 617A6284B9; Mon, 24 Jun 2019 19:30:55 +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 E07E428496 for ; Mon, 24 Jun 2019 19:30:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729180AbfFXTar (ORCPT ); Mon, 24 Jun 2019 15:30:47 -0400 Received: from mail-eopbgr810058.outbound.protection.outlook.com ([40.107.81.58]:14990 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727947AbfFXTaq (ORCPT ); Mon, 24 Jun 2019 15:30:46 -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=EnuV2vSdaLTFayGZ51p7Bh9Eh07YERVYXzq4dP7z16A=; b=NgJh0y2Qz14Soehh4EEHBt9vXWFEJa0E7NVaQI/F/Y9sarnhfyC//52UZbimmYIsTkV7rr64a58AGd+uAVINmwT4twU4J8uaW+UZZSKi+QxNl/TYYEppc2RZnMvI/tqabpXqbfyHF39km3rU5JuSKOqRfc0QKvxagl3+oLG95cQ= Received: from DM5PR12MB1449.namprd12.prod.outlook.com (10.172.40.14) by DM5PR12MB2358.namprd12.prod.outlook.com (52.132.141.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2008.13; Mon, 24 Jun 2019 19:29:32 +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:29:32 +0000 From: "Hook, Gary" To: "linux-crypto@vger.kernel.org" CC: "Lendacky, Thomas" , "herbert@gondor.apana.org.au" , "davem@davemloft.net" Subject: [PATCH 09/11] crypto: ccp - expose pcibus module parameter in debugfs Thread-Topic: [PATCH 09/11] crypto: ccp - expose pcibus module parameter in debugfs Thread-Index: AQHVKsMmqgCCjBTLREqK0KzRDmMnqA== Date: Mon, 24 Jun 2019 19:29:32 +0000 Message-ID: <156140457094.116890.3963045455964868732.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: SN4PR0701CA0046.namprd07.prod.outlook.com (2603:10b6:803:2d::33) 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: 5679583c-5ec0-40a5-9801-08d6f8da48ba 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:DM5PR12MB2358; x-ms-traffictypediagnostic: DM5PR12MB2358: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:261; x-forefront-prvs: 007814487B x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(376002)(346002)(396003)(136003)(39860400002)(366004)(199004)(189003)(7736002)(5660300002)(26005)(2906002)(68736007)(8936002)(305945005)(186003)(386003)(66476007)(76176011)(8676002)(6506007)(64756008)(102836004)(81156014)(53936002)(52116002)(4326008)(66556008)(6486002)(66446008)(66946007)(73956011)(316002)(5640700003)(6916009)(25786009)(6436002)(81166006)(2501003)(6512007)(3846002)(2351001)(71200400001)(71190400001)(99286004)(103116003)(54906003)(6116002)(256004)(476003)(72206003)(66066001)(14454004)(446003)(478600001)(486006)(11346002)(86362001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB2358;H:DM5PR12MB1449.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: CwulD/VXiHCyzQCzyNzZuAMkNacJewSoY8T7bx08MQ8UNYLVbxtl+0YVMY/jAnAAMXkTK9W5XN1VF4uWEX8JGoW3wtQX2Uv82AqVWAQZT9plQBwH9uRIpbGTiu3zPrdkabJVRFt2c8q5mbbQhYKVfN58AApF9IUVanqd9GzjL9ClvaHkyqeiKIfBvVL6x1ynxy0ksC33uyIO0eg9KtJSDUDMG7bkDWKq8MZIM5ySI65CucZGRBfLHkeeDT4SnkoZ0bosFSif3ZmonaW4bMjWSQZ5HOxdjVFoSt/v3Nc2BCqTVjEH8vxLAtWl73lILNjPU8MIQ2Zu24H/hsxIOtTwOHKCXGH0mJYSV7Sz061xOGQ6/ax76fwhAWy4f3p31WYVLZbmnziZd7eFRR4SLSqxuM+qu4du25cbCp138fLBoWU= Content-ID: <5FA4BA70DF58CA468406DAF50FF041CE@namprd12.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5679583c-5ec0-40a5-9801-08d6f8da48ba X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jun 2019 19:29:32.9113 (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: DM5PR12MB2358 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 module parameter pcibus as a read-only variable to the CCP's debugfs info. Signed-off-by: Gary R Hook --- drivers/crypto/ccp/ccp-debugfs.c | 1 + drivers/crypto/ccp/ccp-dev.h | 1 + drivers/crypto/ccp/sp-pci.c | 47 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ccp/ccp-debugfs.c b/drivers/crypto/ccp/ccp-debugfs.c index c4cc0e60fd50..7a223b71eee8 100644 --- a/drivers/crypto/ccp/ccp-debugfs.c +++ b/drivers/crypto/ccp/ccp-debugfs.c @@ -318,6 +318,7 @@ void ccp5_debugfs_setup(struct ccp_device *ccp) } ccp_debugfs_register_modparams(ccp_debugfs_dir); + ccp_debugfs_register_buses(ccp_debugfs_dir); return; } diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h index d812446213ee..cd1bd78d95cc 100644 --- a/drivers/crypto/ccp/ccp-dev.h +++ b/drivers/crypto/ccp/ccp-dev.h @@ -683,6 +683,7 @@ typedef struct _modparam { umode_t parammode; } modparam_t; extern void ccp_debugfs_register_modparams(struct dentry *parentdir); +extern void ccp_debugfs_register_buses(struct dentry *parentdir); #endif diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index a563d85b242e..86dee2a66f00 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -62,6 +62,7 @@ static void ccp_parse_pci_buses(void) { unsigned int busno; unsigned int eos = 0; + char *busarg; int ret; char *comma; char *tok; @@ -70,7 +71,9 @@ static void ccp_parse_pci_buses(void) if (!buses) return; - comma = tok = buses; + busarg = kstrdup(buses, GFP_KERNEL); + + comma = tok = busarg; while (!eos && *tok && (n_pcibus < MAXCCPS)) { while (*comma && *comma != COMMA) comma++; @@ -81,11 +84,15 @@ static void ccp_parse_pci_buses(void) ret = kstrtouint(tok, 0, &busno); if (ret) { pr_info("%s: Parsing error (%d) '%s'\n", __func__, ret, buses); - return; + n_pcibus = 0; /* pretend there was no parameter */ + goto err; } pcibus[n_pcibus++] = busno; tok = ++comma; } + +err: + kfree(busarg); } #ifdef CONFIG_CRYPTO_DEV_CCP_DEBUGFS @@ -106,6 +113,41 @@ void ccp_debugfs_register_modparams(struct dentry *parentdir) moduleparameters[j].param); } +static ssize_t ccp_debugfs_buses_read(struct file *filp, char __user *ubuf, + size_t count, loff_t *offp) +{ + char *string = filp->private_data; + unsigned int oboff = 0; + unsigned plen = 1023; + ssize_t ret; + char *obuf; + + if (!string) + string = "(ALL)"; + obuf = kmalloc(plen + 1, GFP_KERNEL); + if (!obuf) + return -ENOMEM; + + oboff += snprintf(obuf, plen, "%s\n", string); + + ret = simple_read_from_buffer(ubuf, count, offp, obuf, oboff); + kfree(obuf); + + return ret; +} + +static const struct file_operations ccp_debugfs_char_ops = { + .owner = THIS_MODULE, + .open = simple_open, + .read = ccp_debugfs_buses_read, + .write = NULL, +}; + +void ccp_debugfs_register_buses(struct dentry *parentdir) +{ + debugfs_create_file("buses", S_IRUSR, parentdir, buses, &ccp_debugfs_char_ops); +} + #endif unsigned int ccp_get_nqueues_param(void) { @@ -457,6 +499,7 @@ static struct pci_driver sp_pci_driver = { int sp_pci_init(void) { mutex_init(&devcount_mutex); + ccp_parse_pci_buses(); return pci_register_driver(&sp_pci_driver); }