From patchwork Thu Nov 30 13:12:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, Ravi1" X-Patchwork-Id: 31821 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DCFB91B1F7; Thu, 30 Nov 2017 14:13:15 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0065.outbound.protection.outlook.com [104.47.38.65]) by dpdk.org (Postfix) with ESMTP id 6F9BA1B1B9 for ; Thu, 30 Nov 2017 14:13:11 +0100 (CET) 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; bh=UwnU+W0cSQd6yCgDES8mL3aCe6aSaIY8wjXnSBd3Sos=; b=ZX2AnGmELL/LRt13w2z6JVatWK88isn5LJu7gd4Hur36iAne3sSEXG4IYp4bo7PSf3cU0IiwyVtf54z0F7Ke7ZvlNMPWGAyYKMyZVaV3lhH8ub4huxs9Mh9jeillFPFC/WHN8VvsGJ5YDxeprSzFxAcjZDAS6MDh7MsVB6Gzio4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Ravi1.Kumar@amd.com; Received: from wallaby-smavila.amd.com (202.56.249.162) by BN6PR12MB1508.namprd12.prod.outlook.com (10.172.24.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Thu, 30 Nov 2017 13:13:08 +0000 From: Ravi Kumar To: dev@dpdk.org Date: Thu, 30 Nov 2017 08:12:30 -0500 Message-Id: <1512047553-118101-8-git-send-email-Ravi1.kumar@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512047553-118101-1-git-send-email-Ravi1.kumar@amd.com> References: <1512047553-118101-1-git-send-email-Ravi1.kumar@amd.com> MIME-Version: 1.0 X-Originating-IP: [202.56.249.162] X-ClientProxiedBy: MA1PR0101CA0047.INDPRD01.PROD.OUTLOOK.COM (52.134.137.33) To BN6PR12MB1508.namprd12.prod.outlook.com (10.172.24.149) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f3a12e0a-9853-4e64-8090-08d537f41a7d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603286); SRVR:BN6PR12MB1508; X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 3:1niioVi7dnqPEyr99/JLOJ6HH2CcO7VoRrpju5hcsRsvQF/mVjhFfE7vUuKR4wz6JRsVc5/RI/nOvTDlvyqDrvMRE33l0u7Bv9YPNNPICWq64WXspQa5Y9AUVsCO2bHHB7I2tOlpIWIjGeusknpdImOsADD8HbPYRDDh7szSAn7M3jYHhOVBA/l+n63OqzWrzImerXavqDEDUwm77yse9TTFTkP8YPa/juf82HkUYkHn94ggSMYDq6fO6OHcVm8E; 25:To64GQqWLKCexDS6X+ghgEAMQTPCqm0XJFAG+lLQ74FXeUfo617zoDLjJoOiB1oIGXnSE9rLVKb/easFMjY72DTGysOLzRFXvbqIqVivZH4i+lqnHGYl6foKpE7oG8ksSUyKnv43BaLXcD5NBciiMFEWxU5/bszjm0w5Lb78nvVqLNxOACVGgIMvyVWnc4EVHrVYtrTqbLE7p+UMr3LX8YoMt071N0ibIbvKhGylwmYCT3IT8yLnE+9nVVamlV43XWfsSaE4ZNcLYBu6GYSiMZ3av+RAgbbrVqwh86CdyI0K9jBtyUDh+HPRuj2QBOZjvjJmgBU0CAHNaIQgcDnbbA==; 31:pRHKjIGCUhTbWzdIIsL3wsSdQh22SDNUB3VvMKP4awLwT9ys189VFHVeWZkI/fhbttAxWgZ57WO8D44zfjTu1GLZFyDLesCRiQx/4Fdho/TMcm9ZcJJPGVpdddR0BJkani1a3HdWQDm6imXeU6gSMMfKXjOlOGfWc2y3eoIvXD2bOChRNsD45Y5ZrzbnCQ+EUl7jmcN3p/biS1ljUOkPxxZC1xBx2XGSJ/i5rLnLF74= X-MS-TrafficTypeDiagnostic: BN6PR12MB1508: X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 20:c1flJGkFjO+DXcj58F8gOQDQgA5+PXSlHs2ls302JM1iqpwInBfNZp3sVeFuOjFrxenGnaXplHQWuguKCL8G/6RIU2OsdFLvIjyaz7UZa9K4Fo8gHg2H2HXFYyAF7OI+taPBSc1KjVnxkve9eZT6RpIsPgycRriP1waeU76GDik6ij0+LbUPeJfMcILWWo0aJwlVGzedBmhfwzjPaXU3FHFkg5GJq9RQtsCK52p9zm5kNhU3FaRmnWoA0A60Hr9sJUspMIjiTp24sW5TgmT3cLqAv7SRGllWc0kpiwfHXHQThZlwhDXI5NcZMSIGBIB+btrOWMKGyPKVAQ44+2mYtb3bo88BHthb/iXA6wPtG4OADchjUWJAQ0j7PpQ5V0aL/HSCk6/F2VyvX5hEDmkntZli7Dm2lbH1B/aeTk9DjolapTjSNBzyXzPzQYL5V7Dk8r3T1Mf5wQWDe4pBFvD6pziljVzwSbypd0kWj1nwcYuHA8nlm5RKHvOkzsLzqpWh; 4:Vuh4eOdFDxuInTFKAh2Hr5Q0TJMSzbQrltnac2FhvXnW9f7O17+o0gZsXAfFMzDdYjIazK583E1iXk2JrtIFpdZhnvnIOZQ/C2adHkG6mRnUrogrBRlEPAqwyIlXuXl2LXCr9J+0tJtlnwsReJv8ytaj/5ZR7JJVv2grwWF3UupbPg06aVc5r2p39/GQ2tgjxhqYDz5ApvRh7TNEdzVvlwgbXnGsy3VyDSvu2mngZo67CDcrekxLaRKgogysekxIunuiCwQee7c56MNI6MIg/3l2yOWgHZVRbUBoAP/3GEIRcqEveJvLW2FL2Sq4MnMm X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231022)(10201501046)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011); SRVR:BN6PR12MB1508; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BN6PR12MB1508; X-Forefront-PRVS: 05079D8470 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(366004)(39860400002)(189002)(199003)(36756003)(72206003)(6486002)(16526018)(5660300001)(101416001)(50226002)(97736004)(8936002)(50986010)(76176010)(8676002)(81156014)(105586002)(81166006)(53936002)(53416004)(16586007)(6666003)(478600001)(106356001)(7736002)(6916009)(2906002)(50466002)(2950100002)(48376002)(52116002)(51416003)(2361001)(305945005)(2351001)(86362001)(68736007)(7696005)(47776003)(25786009)(316002)(3846002)(6116002)(189998001)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1508; H:wallaby-smavila.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1508; 23:GR8/oAitr1X5SGNciKxOeZJ4rzuEYn+kVpoApHSPD?= 9NTM6R3k+4GAkoNwuslz52kLKiTtLikaFUlErNCw+mV3bD/SmMmaXvn8TtLnfoncFNykJT5QstGO1Sc/RhFZrKpKwisGCc/WAmsbFL9hxs4NBE4vnmY3zZKrfz7caRo/P8D+bJ4RXd5dkHrU7YF6oxoBSypOehZiqXRHFoJVHTgXPyT2PLdCrz6rlrg/cxTLa/M73eIf6Zc3R4YtshkuEAlCb6ksGahE/w5k7QDRuCyLZRAyb8R9NrHsMTOAgdH2u2lyGU67717nVQzgo6NeR2WkdepfVtkMVdR9mWj0acFQCdcfU0HhxqI/lZeOsndmKit+63MtG99smucoRKnZWEFHxi9/9ORU4UBewSNEaFJIU76kqyBYkf/5LLHt+GIMDhjtfI3VbIc8875giV8kXFXcpsO9C8Hru8vcZzoBde96d4v93xry16/a6QlwgbG7e2kca/s47RiSvaML1NRlVVV9imjrrYdew0RflA3AES6ugDmbaCac342w7tV9HvsfjJ5EBOgKhhecIqln03erXr3xDN3V6HUjbzD7UGakBkvEi0S/OUd/9HBk9OHda0zsBPUYcybmH4dYz9O6fiwa73iiw0NI5liATjXOCVbjjHZ0fiwdasdvqAHdOR5GJ49aV46wyBv4jUSlm3iQLnpYkuKIgQDLaZQQcoPQ0UrdmoyhpoWxWGDNDVjIxz5Ma2P88tQY9DsLhAeiVXfjfygaVUjvdu5PXd+Qu6qnQC2pBr4OzbsqOrDUhMMN5M7rOSEiF9v2NbWUJLfcRzvlvJoiJIWyZwofVP0dSDZxaoCq+Ljj+C9+XcUsK7cqFndzsC344GPwhDAtTHKp83dwy//X3Zc/TY3gDuny3aRkQPBHNYuVbhcAuEyW0/R0Gy4xiVipaTdQh2aw0CzGL79MSPP1cbHAa+LwK1iubYMHooSkAXHrYRCuBkBJP0YR+uLNnfBXRIoPq377Tzv6tZa/yKmIFMTaogjzqJyaItaYNnwolKefeEQfzvIKLuc95ROIUF9SK0JCA9oxtq1tI114JiS+kTvrwyfOaYXE8gwOiM0qjzNBmn/b5pQnd38/YT3WGinHcwTIWPycB7wFz5a8d1mbn9x X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 6:7pKeuJhF39SbAOJL+Zsh8GYlOfILr+8ZYJKHQvqRA1iTBfg1Ah3v4nVIRCJ4dnfdnogMv3JfQTNJSUCrG5uXJZsrg671W+kbJb7reTB1xPmME8Gm39Xzt98EdK3dRxLZsJpZduNyuyBje1OjSU7XtQCBQGrZEzYVDwHKgnrw/RgvEkedpmKhF8XNNlsFealHxe9Sg+y+BgFL2Ih9J5ev2ne9qyREBF5zqic98UB3tiI9EVV5qaWrvzz6rKwSTYy9+2zO/8FGJyMUqoWLZS7mqMNPNxLnVQF1XDuKT4iI5NDW6sHimEpWlGlTkAxyoLzzNGESaD63cZUQrv85S3TyCt3S5MGmMZqUKDrlqX0YnLQ=; 5:JO0X81Vwqo1CzJQABNVaOglIfN0UAR69v0g34nwfV5DuVnsGJxysQBwBYhzNGAkKHet937Xizq7vJd8gcPYogNkjtfEQB+QWOalDirgdF10LUKK4miDJYmmSa4q2ZUveoEsd16wWKOzsETnNtk2BpqMffLm/5LSDczNJp3Sgv0k=; 24:SxsZSXRz24BzKjFEOm+kKkAqZLiEqikCEHqEV9nc6novyYJU3aoidhLjg346A45kpAf6jptMpQpp3tU3wotnhxza+R6had4bcJqRmKcurWE=; 7:ROa21lpaXwt0coQcWWmNCXpgCodZf01ICZmeoSu+udYRcLlXkVbTsGOZA98sMbDHgRQkuM8Ry5pxwifQCTroVYj+u5cVhEns+3M3nucCs1k3TqJKU+Kre075ayLdhCbqk7BSMGHH5k02+6KU9Xgz57RfNSHGjXpONlVyWhRZIlCMcDLPwO53uK+tJXwqvH3rQEcYvjuEMdkQ7WdBzu+DlWLwuZJMPn7RfWkYVjVvQAT79eQmjZIEJcM1kXnMmvck SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1508; 20:oI5Lux/7yvn0wEK5D7aGWMnBUhjPJF6nz0Su69cqk+lFqLL6fwfiUfrRIgAARv5mV1VhIurMmsgzY5I4nNkHVgosrkQ7hBgd7BCp3wvPWAN+95su+c2cfeN60cj9xoj9WzZ8mqvRWIr6b2ATB+C/6uF3DNeiwOv7aMWNgeuvAyjMC4cIARWsHCI9mYDg8IFnIMNacJbguiWqiX9TXRO8lVb2IZGtSuFfKWolpkbqUkVtzH9x2lCRCgq/aWl2WEyA X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2017 13:13:08.9711 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3a12e0a-9853-4e64-8090-08d537f41a7d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1508 Subject: [dpdk-dev] [PATCH 08/11] crypto/ccp: rename CCP crypto driver id X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Ravi Kumar --- drivers/crypto/ccp/ccp_crypto.c | 28 ++++++++++++++-------------- drivers/crypto/ccp/ccp_crypto.h | 2 +- drivers/crypto/ccp/rte_ccp_pmd.c | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c index 1fc6569..254fed8 100644 --- a/drivers/crypto/ccp/ccp_crypto.c +++ b/drivers/crypto/ccp/ccp_crypto.c @@ -1593,7 +1593,7 @@ ccp_perform_hmac(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); addr = session->auth.pre_compute; src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src, @@ -1766,7 +1766,7 @@ ccp_perform_sha(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src, op->sym->auth.data.offset); @@ -1855,7 +1855,7 @@ ccp_perform_sha3_hmac(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src, op->sym->auth.data.offset); @@ -1995,7 +1995,7 @@ ccp_perform_sha3(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src, op->sym->auth.data.offset); @@ -2063,7 +2063,7 @@ ccp_perform_aes_cmac(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); key_addr = rte_mem_virt2phy(session->auth.key_ccp); src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src, @@ -2215,7 +2215,7 @@ ccp_perform_aes(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); function.raw = 0; iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset); @@ -2303,7 +2303,7 @@ ccp_perform_3des(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset); switch (session->cipher.um.des_mode) { @@ -2406,7 +2406,7 @@ ccp_perform_aes_gcm(struct rte_crypto_op *op, struct ccp_queue *cmd_q) session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset); key_addr = rte_mem_virt2phy(session->cipher.key_ccp); @@ -2578,7 +2578,7 @@ ccp_crypto_cipher(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); switch (session->cipher.algo) { case CCP_CIPHER_ALGO_AES_CBC: @@ -2615,7 +2615,7 @@ ccp_crypto_auth(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); switch (session->auth.algo) { case CCP_AUTH_ALGO_SHA1: @@ -2676,7 +2676,7 @@ ccp_crypto_combined(struct rte_crypto_op *op, session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); switch (session->auth.algo) { case CCP_AUTH_ALGO_AES_GCM: @@ -2734,7 +2734,7 @@ process_ops_to_enqueue(const struct ccp_qp *qp, for (i = 0; i < nb_ops; i++) { session = (struct ccp_session *)get_session_private_data( op[i]->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); switch (session->cmd_id) { case CCP_CMD_CIPHER: result = ccp_crypto_cipher(op[i], cmd_q, b_info); @@ -2812,7 +2812,7 @@ static inline void ccp_auth_dq_prepare(struct rte_crypto_op *op) session = (struct ccp_session *)get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); if (session->cmd_id == CCP_CMD_COMBINED) { digest_data = op->sym->aead.digest.data; @@ -2889,7 +2889,7 @@ ccp_prepare_ops(struct rte_crypto_op **op_d, op_d[i] = b_info->op[b_info->op_idx++]; session = (struct ccp_session *)get_session_private_data( op_d[i]->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); switch (session->cmd_id) { case CCP_CMD_CIPHER: op_d[i]->status = RTE_CRYPTO_OP_STATUS_SUCCESS; diff --git a/drivers/crypto/ccp/ccp_crypto.h b/drivers/crypto/ccp/ccp_crypto.h index 9d8d42e..ad3251b 100644 --- a/drivers/crypto/ccp/ccp_crypto.h +++ b/drivers/crypto/ccp/ccp_crypto.h @@ -340,7 +340,7 @@ struct ccp_session { uint32_t reserved; } __rte_cache_aligned; -extern uint8_t cryptodev_driver_id; +extern uint8_t ccp_cryptodev_driver_id; struct ccp_qp; diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c index 9410470..d46c07c 100644 --- a/drivers/crypto/ccp/rte_ccp_pmd.c +++ b/drivers/crypto/ccp/rte_ccp_pmd.c @@ -44,7 +44,7 @@ * Global static parameter used to find if CCP device is already initialized. */ static unsigned int ccp_pmd_init_done; -uint8_t cryptodev_driver_id; +uint8_t ccp_cryptodev_driver_id; static struct ccp_session * get_ccp_session(struct ccp_qp *qp, struct rte_crypto_op *op) @@ -58,7 +58,7 @@ get_ccp_session(struct ccp_qp *qp, struct rte_crypto_op *op) sess = (struct ccp_session *) get_session_private_data( op->sym->session, - cryptodev_driver_id); + ccp_cryptodev_driver_id); } else { void *_sess; void *_sess_private_data = NULL; @@ -77,7 +77,7 @@ get_ccp_session(struct ccp_qp *qp, struct rte_crypto_op *op) sess = NULL; } op->sym->session = (struct rte_cryptodev_sym_session *)_sess; - set_session_private_data(op->sym->session, cryptodev_driver_id, + set_session_private_data(op->sym->session, ccp_cryptodev_driver_id, _sess_private_data); } @@ -203,7 +203,7 @@ cryptodev_ccp_create(const char *name, } printf("CCP : Crypto device count = %d\n", cryptodev_cnt); - dev->driver_id = cryptodev_driver_id; + dev->driver_id = ccp_cryptodev_driver_id; /* register rx/tx burst functions for data path */ dev->dev_ops = ccp_pmd_ops; @@ -278,4 +278,4 @@ static struct rte_vdev_driver cryptodev_ccp_pmd_drv = { RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_CCP_PMD, cryptodev_ccp_pmd_drv); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CCP_PMD, "max_nb_queue_pairs= max_nb_sessions= socket_id="); -RTE_PMD_REGISTER_CRYPTO_DRIVER(cryptodev_ccp_pmd_drv, cryptodev_driver_id); +RTE_PMD_REGISTER_CRYPTO_DRIVER(cryptodev_ccp_pmd_drv, ccp_cryptodev_driver_id);