From patchwork Tue May 12 14:00:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 186546 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp3112028ill; Tue, 12 May 2020 07:05:17 -0700 (PDT) X-Google-Smtp-Source: APiQypKa04bCsLA3yWYWm7wclSwBksrlmacgYuXxgdgO3mLDZMOuu1EX89s2rjsxm9pTErzApOPw X-Received: by 2002:a05:6402:21cc:: with SMTP id bi12mr18041574edb.294.1589292316922; Tue, 12 May 2020 07:05:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589292316; cv=none; d=google.com; s=arc-20160816; b=Omn/IhMOOnfVzfXDIgCUF1CW+eClZdeFeXY1eOOdQRhnjbj3KjPM99uzuWYdNWK3Tk goLGdE6KNDK6Q6HZVbtta5TYLZVLthn4Mw9YvogpbccGQXADMTlcEHbehz2/71ySyjVJ dHhzARBPmy5lB1o0AVSAxbcZj7FKd74hG1LD8OzmhoRqG+rVkmH8zOEkENh2fMI8GkJ3 IemrrXu9egWK1EgNvWMiepE7GrfN7P8AXroVkVbQH9SSLdXvfm/5XDNg+3Pcw0s8Akeb qE4QY8Ydq5c11RUhOMKdNe/HYWNppBhq5NzJVyuOrsVGuAgUip/FGTEtpBsbb3gohRU3 zbUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=14FqiY9yc25eLywBDIbkf3a8eskTLrQApSYt/r8/Y3Y=; b=eB2b3H0r5uBHrvVHKyml3FTEsNytxtz3GvcA3jZhgVuyIHyjfW7KtpjWQ194yt1vfz CcELLWm8noBKTudB1gPhCbgL0DUzXteZlvi3NxOJxUnBPPrTVDqbkARwWSovJbtOvdRD Uumpj/YXhoakOMDMzqnfhJDuS/VuleJrciur8SyIdyjViufgRBC6kjFbD//PBJhGxBiT 0QuoqQ1KGiZ9hO27M9eEr12HatpSNHUuQb77vdAjGSItlDcTN4PzusExCg4PeBVhB5Uo xtD6UY3zqeTJQViSe9jUoqeI1HcMHETZOWLRcDC8qcL0hVJETOa+2cmjUE0zEY17ks+F B39g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id dn1si4033203ejc.7.2020.05.12.07.05.16; Tue, 12 May 2020 07:05:16 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB84D1C1EC; Tue, 12 May 2020 16:03:39 +0200 (CEST) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by dpdk.org (Postfix) with ESMTP id 3F6071BFE4 for ; Tue, 12 May 2020 16:03:29 +0200 (CEST) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 24BEC1A10C1; Tue, 12 May 2020 16:03:29 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 7615F1A10D4; Tue, 12 May 2020 16:03:27 +0200 (CEST) Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.133.63]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id C51E740314; Tue, 12 May 2020 22:03:24 +0800 (SGT) From: Hemant Agrawal To: dev@dpdk.org, david.marchand@redhat.com Cc: Hemant Agrawal Date: Tue, 12 May 2020 19:30:58 +0530 Message-Id: <20200512140100.26803-10-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200512140100.26803-1-hemant.agrawal@nxp.com> References: <20200505140832.646-1-hemant.agrawal@nxp.com> <20200512140100.26803-1-hemant.agrawal@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH v2 10/12] bus/dpaa: share qman portal ids as function calls 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" qman caam and pool portal ids are only used in control path. This patch changes their inter library access to function call instead of direct shared variable. Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/qbman/qman_driver.c | 10 ++++++++++ drivers/bus/dpaa/include/fsl_qman.h | 8 +++++++- drivers/bus/dpaa/rte_bus_dpaa_version.map | 4 ++-- drivers/crypto/dpaa_sec/dpaa_sec.c | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c index 69244ef701..1166d68e21 100644 --- a/drivers/bus/dpaa/base/qbman/qman_driver.c +++ b/drivers/bus/dpaa/base/qbman/qman_driver.c @@ -30,6 +30,16 @@ static __thread struct dpaa_ioctl_portal_map map = { .type = dpaa_portal_qman }; +u16 dpaa_get_qm_channel_caam(void) +{ + return qm_channel_caam; +} + +u16 dpaa_get_qm_channel_pool(void) +{ + return qm_channel_pool1; +} + static int fsl_qman_portal_init(uint32_t index, int is_shared) { struct qman_portal *portal; diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h index 4411bb0a79..78b698f393 100644 --- a/drivers/bus/dpaa/include/fsl_qman.h +++ b/drivers/bus/dpaa/include/fsl_qman.h @@ -44,6 +44,12 @@ enum qm_dc_portal { qm_dc_portal_pme = 3 }; +__rte_internal +u16 dpaa_get_qm_channel_caam(void); + +__rte_internal +u16 dpaa_get_qm_channel_pool(void); + /* Portal processing (interrupt) sources */ #define QM_PIRQ_CCSCI 0x00200000 /* CEETM Congestion State Change */ #define QM_PIRQ_CSCI 0x00100000 /* Congestion State Change */ @@ -65,7 +71,7 @@ enum qm_dc_portal { /* for conversion from n of qm_channel */ static inline u32 QM_SDQCR_CHANNELS_POOL_CONV(u16 channel) { - return QM_SDQCR_CHANNELS_POOL(channel + 1 - qm_channel_pool1); + return QM_SDQCR_CHANNELS_POOL(channel + 1 - dpaa_get_qm_channel_pool()); } /* For qman_volatile_dequeue(); Choose one PRECEDENCE. EXACT is optional. Use diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map index f4947fac41..220fc32da1 100644 --- a/drivers/bus/dpaa/rte_bus_dpaa_version.map +++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map @@ -8,6 +8,8 @@ INTERNAL { bman_query_free_buffers; bman_release; bman_thread_irq; + dpaa_get_qm_channel_caam; + dpaa_get_qm_channel_pool; dpaa_logtype_eventdev; dpaa_logtype_mempool; dpaa_logtype_pmd; @@ -46,8 +48,6 @@ INTERNAL { netcfg_release; per_lcore_dpaa_io; per_lcore_held_bufs; - qm_channel_caam; - qm_channel_pool1; qman_alloc_cgrid_range; qman_alloc_pool_range; qman_create_cgr; diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 25dcbd259a..4af9024a00 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -123,7 +123,7 @@ dpaa_sec_init_rx(struct qman_fq *fq_in, rte_iova_t hwdesc, qm_fqd_context_a_set64(&fq_opts.fqd, hwdesc); fq_opts.fqd.context_b = fqid_out; - fq_opts.fqd.dest.channel = qm_channel_caam; + fq_opts.fqd.dest.channel = dpaa_get_qm_channel_caam(); fq_opts.fqd.dest.wq = 0; fq_in->cb.ern = ern_sec_fq_handler;