From patchwork Wed Apr 20 11:44:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 12131 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 65F075699; Wed, 20 Apr 2016 13:44:38 +0200 (CEST) Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 1723711D4 for ; Wed, 20 Apr 2016 13:44:32 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id 127so10945531wmz.0 for ; Wed, 20 Apr 2016 04:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GdrFSOXFF+7dNsT6mtCQWRw7z8bO/uJYOfUiLEb6afA=; b=qDOkeVcm0BbZamdK9SMuvRbd+d3EbAZzryukaGfNUA4o9TNHsKp8uwo9Z6JGrHhnno zK/YW1SaKyAHVIcYndPryEgTJ1o8tj7ytHZjDub1eeHV+pUhfx8dZBfX39TrH5yxruJr krMIWasvn48+NDy+24wh50uboV3fT1wyiPZoTCGQRi//WkNvSeVws0coUtADBaxy9DXy xNnYjsSDJx/m34mmhyrp97rnChgeoWwh7EovFM9kk6gKHcvHRkRtdOEXotUAV89/uFtg gAW82f8AnE3MFvGqzEwf//ItA0dYUPKkIRqrbix3bXtlF0CVHlzxV+vCAqRD46fYd3G1 laUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GdrFSOXFF+7dNsT6mtCQWRw7z8bO/uJYOfUiLEb6afA=; b=YVFAUzV10Xy8FUan3d4qaQ5t5NCFZY9/JIrA9WS9QcgKLcE0mFCBWDjrh27F2HeBOu hcbX+QOKd8cGyp9nasnjSj3Ia/jYKj/KgfEU2DAuvoWD5Anvv3voHfSd7DeFLAW1Qqq2 xJMJRxltHA5vuCiaG3oQC2BbgeFX6E/Qpi3Y+75KVS8EnXw6SwUwlE1bnNrs332qtIsK NrZzancZfSvEuB/PigtXG7nkqQz+DL+nV9GOW6nXx1X/+9DdcWZRv7PBaSFyLc9WIFg3 ABBTwK4NymlCbdI5ZCsY6WISxcYmEojVW4ZBnLEiH6Mw8O5q6+rV+BvmdBcpUXzNsHd8 R63Q== X-Gm-Message-State: AOPr4FXWWSX21IQxFuRH8LNlIESuJSeyBaCg7vvlMZg/H3fLcF7Q3yVKNyBX4AkWLntepDzT X-Received: by 10.28.46.67 with SMTP id u64mr9036440wmu.95.1461152671901; Wed, 20 Apr 2016 04:44:31 -0700 (PDT) Received: from gloops.dev.6wind.com (144.77.126.78.rev.sfr.net. [78.126.77.144]) by smtp.gmail.com with ESMTPSA id m6sm5195708wje.21.2016.04.20.04.44.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Apr 2016 04:44:31 -0700 (PDT) From: David Marchand To: dev@dpdk.org Cc: thomas.monjalon@6wind.com, viktorin@rehivetech.com Date: Wed, 20 Apr 2016 13:44:09 +0200 Message-Id: <1461152657-19969-10-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461152657-19969-1-git-send-email-david.marchand@6wind.com> References: <1454076516-21591-1-git-send-email-david.marchand@6wind.com> <1461152657-19969-1-git-send-email-david.marchand@6wind.com> Subject: [dpdk-dev] [PATCH v2 09/17] crypto: get rid of crypto driver register callback X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Now that all pdev are pci drivers, we don't need to register crypto drivers through a dedicated channel. Signed-off-by: David Marchand --- lib/librte_cryptodev/rte_cryptodev.c | 22 ------------------- lib/librte_cryptodev/rte_cryptodev_pmd.h | 30 -------------------------- lib/librte_cryptodev/rte_cryptodev_version.map | 1 - 3 files changed, 53 deletions(-) diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c index 19a9939..d9648a2 100644 --- a/lib/librte_cryptodev/rte_cryptodev.c +++ b/lib/librte_cryptodev/rte_cryptodev.c @@ -444,28 +444,6 @@ rte_cryptodev_pci_remove(struct rte_pci_device *pci_dev) return 0; } -int -rte_cryptodev_pmd_driver_register(struct rte_cryptodev_driver *cryptodrv, - enum pmd_type type) -{ - /* Call crypto device initialization directly if device is virtual */ - if (type == PMD_VDEV) - return rte_cryptodev_pci_probe((struct rte_pci_driver *)cryptodrv, - NULL); - - /* - * Register PCI driver for physical device intialisation during - * PCI probing - */ - cryptodrv->pci_drv.devinit = rte_cryptodev_pci_probe; - cryptodrv->pci_drv.devuninit = rte_cryptodev_pci_remove; - - rte_eal_pci_register(&cryptodrv->pci_drv); - - return 0; -} - - uint16_t rte_cryptodev_queue_pair_count(uint8_t dev_id) { diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h index 3fb7c7c..99fd69e 100644 --- a/lib/librte_cryptodev/rte_cryptodev_pmd.h +++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h @@ -491,36 +491,6 @@ rte_cryptodev_pmd_virtual_dev_init(const char *name, size_t dev_private_size, extern int rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev); - -/** - * Register a Crypto [Poll Mode] driver. - * - * Function invoked by the initialization function of a Crypto driver - * to simultaneously register itself as Crypto Poll Mode Driver and to either: - * - * a - register itself as PCI driver if the crypto device is a physical - * device, by invoking the rte_eal_pci_register() function to - * register the *pci_drv* structure embedded in the *crypto_drv* - * structure, after having stored the address of the - * rte_cryptodev_init() function in the *devinit* field of the - * *pci_drv* structure. - * - * During the PCI probing phase, the rte_cryptodev_init() - * function is invoked for each PCI [device] matching the - * embedded PCI identifiers provided by the driver. - * - * b, complete the initialization sequence if the device is a virtual - * device by calling the rte_cryptodev_init() directly passing a - * NULL parameter for the rte_pci_device structure. - * - * @param crypto_drv crypto_driver structure associated with the crypto - * driver. - * @param type pmd type - */ -extern int -rte_cryptodev_pmd_driver_register(struct rte_cryptodev_driver *crypto_drv, - enum pmd_type type); - /** * Executes all the user application registered callbacks for the specific * device. diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map index 8d0edfb..e0a9620 100644 --- a/lib/librte_cryptodev/rte_cryptodev_version.map +++ b/lib/librte_cryptodev/rte_cryptodev_version.map @@ -14,7 +14,6 @@ DPDK_16.04 { rte_cryptodev_info_get; rte_cryptodev_pmd_allocate; rte_cryptodev_pmd_callback_process; - rte_cryptodev_pmd_driver_register; rte_cryptodev_pmd_release_device; rte_cryptodev_pmd_virtual_dev_init; rte_cryptodev_sym_session_create;