From patchwork Fri Jan 11 11:58:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 155335 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp489296jaa; Fri, 11 Jan 2019 04:00:00 -0800 (PST) X-Google-Smtp-Source: ALg8bN5ELE51eXUx3Lt6CqbfXilGGVwvlP/SF1BC4DiwIuUmjQB/ZopzlouRaUPyT8g/IqHwV6gL X-Received: by 2002:adf:e54a:: with SMTP id z10mr12772997wrm.238.1547207999999; Fri, 11 Jan 2019 03:59:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547207999; cv=none; d=google.com; s=arc-20160816; b=hRjepSxPMUwxAxi4N/m1LQsw9WacQ6MqmT2qpLxBDooWzwwzj67fXY9myhwkP+bN9d 1L7wU07QAqK/xnz5/lJwTfwTSBLMPz6h1MZ7e/Yq8mMAPzVeR4ovcnoAIHlaG9qoPQ3/ 4D/pbJ1Q0c2uGlLNKK4dS3phsr5qhQNrrgINXMfvyNY1kIpfcSaKY73exNUUxpjJqBu1 LXZuTY3dch4t64MQ9qNWdBhP2IclTwsOtgohJjy8zCBIGRk6YNGDfg1BOeINtCOCOCW4 T95qw8yBfY6V3nRl5mPzNYuPsR0K4ow2a18W20nCR5JbEjSJd5EUz5jBEiGbgXuA0Fob o/WA== 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:mime-version :content-transfer-encoding:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:cc:to:from :dkim-signature; bh=ZwIGfMC7Pa/Rr0Bbbfx996w9wTR9OZI77X6uZhXmIT4=; b=nfCvXmj3F56jJgPtWku9ZWYkXwHaH8yBT8gywkkvn+PRmEzjqsjhHNVDsjEqzxoaUA nve8PtuSkg73WP1c05dYkCtQSl6YT2F7w81B+inWpaSbbnHMcs+Mb6KIr9PKdotkUsiD o/M4z2WMPtcdkjM/DYh+ILUa6cRIY1ddogP2VDLGieWsy8YZpPMO7Dx4P+WO1TW0Pw+a 3zVLu98JnaGvOnbMDr4HrABnOfLMkpIRE5xMNrw2bZjgBSkya/ocKqTIWDM+54QcEgNE Em/bUGrtTEUsoVr5I7Gdm08UlAaPYCoBb2MZ1FsHoRbEzc58C/jG/W24MQVKZhER0wrd wA2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=VzxAd7Bi; 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 o1si38107680wro.136.2019.01.11.03.59.59; Fri, 11 Jan 2019 03:59:59 -0800 (PST) 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; dkim=fail header.i=@nxp.com header.s=selector1 header.b=VzxAd7Bi; 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 A868B1B9E0; Fri, 11 Jan 2019 12:58:30 +0100 (CET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00067.outbound.protection.outlook.com [40.107.0.67]) by dpdk.org (Postfix) with ESMTP id E8FAD1B9C0 for ; Fri, 11 Jan 2019 12:58:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZwIGfMC7Pa/Rr0Bbbfx996w9wTR9OZI77X6uZhXmIT4=; b=VzxAd7BiDQ5UmFuBjApwVXodfqAbJyGYUHhlEof5Exfo1SRWqGt2Fz734IWNjfH512arLotb/PrUEveBpEQo80o3es7c1Frbrp8Fo5dRDJO8tmMdwKo4lPkghb2B/uIciNe9zxjKAV0ZWoHa8x5qp8sZ74FiR029H7Wjn6cdiy0= Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (20.177.56.80) by VI1PR04MB6173.eurprd04.prod.outlook.com (20.179.27.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.11; Fri, 11 Jan 2019 11:58:27 +0000 Received: from VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::b1eb:7e7e:7b90:7b4]) by VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::b1eb:7e7e:7b90:7b4%4]) with mapi id 15.20.1516.016; Fri, 11 Jan 2019 11:58:27 +0000 From: Shreyansh Jain To: "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , Hemant Agrawal , Youri Querry Thread-Topic: [PATCH v2 11/20] bus/fslmc: rename portal pi index to consumer index Thread-Index: AQHUqaT2HMkggT9UQkS4i4ua6hqUSQ== Date: Fri, 11 Jan 2019 11:58:27 +0000 Message-ID: <20190111115712.6482-12-shreyansh.jain@nxp.com> References: <20181227062233.30781-1-hemant.agrawal@nxp.com> <20190111115712.6482-1-shreyansh.jain@nxp.com> In-Reply-To: <20190111115712.6482-1-shreyansh.jain@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [14.143.254.130] x-mailer: git-send-email 2.17.1 x-clientproxiedby: TY2PR01CA0030.jpnprd01.prod.outlook.com (2603:1096:404:ce::18) To VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:71::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB6173; 6:wXSuosuZNzDFd9MiFxxpTl4f9Q/oBfKiTzoGw+rgqYgSiPFYy3vLYVeqowknmr9iUX95ZIqTjtbuIbNPrAxFRUKZer7oKgF6isUsaQALE0h4SpfOgJl6s2V+3Iz3PjddEkmeVi86dmMNqQ+zyasepU94qGeDu0AT6WSHP7zsArAaoiDOmwSQBLtxi3b1AFqzspN8Um3uWl1qk9IsCcm3cBHHdrYfGUBJhPdBjK1KAFRaFSfbnaw0qIa2KDQ42PV7OFSjoX0g+vOPsG5RUqAscfm6NQhe3ha07lt0qkZMAIkRC7PalSqlbVcxW7VM1i0HjHBgb18KFqmp8E/HJGCJYFji6przW0Fr+YB0wnXWuU7J3pSwO3JToAKeQqIh0uHAdSQZg5vuwdozA+azX+GvVldN8lYcKcjgZD0IX7n2SLpb2Vw8EQQ+B5hnNQRPXhfhUO6QzIht/lEG4zS1jUkFGw==; 5:JKtbJneuldRrv+GqrR3oYxwUWcxPv0Gc4rSq37H9V9AqltHAzAwAjcCjOecKQbvqa3YIvg1z6HKzmxX3wDkxAMBKNfunFgFOIg7UoKadrc+tiHlF2qWC3o1u8cUx9wim2ILoP/Kv3Ssrg2uzDXUib1qCRRnReT6veF26Vd7+9PXt6PjgLKBNqj2+iZvZw3BKASROAWZVbg6SXlVfemQKJA==; 7:Lpn1VO9ZnaGCZl1SeDOI+gdjxgsaoUMGOa33ZdfaKtRQdK2//2HeZqmYxNgddWbGCtYtcQxrGgw7oOlsrnezeG/CTKjedzgDGtWR7ny7Hzr0cjhCua4TZBpZHHyPhSOQW//c73WSVbvMQN0sOqzsSg== x-ms-office365-filtering-correlation-id: 88589a15-7411-4d00-ed16-08d677bc1897 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB6173; x-ms-traffictypediagnostic: VI1PR04MB6173: x-microsoft-antispam-prvs: x-forefront-prvs: 09144DB0F7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(346002)(366004)(136003)(39860400002)(396003)(199004)(189003)(6512007)(25786009)(1076003)(26005)(68736007)(3846002)(66066001)(6116002)(11346002)(6916009)(6486002)(486006)(54906003)(5660300001)(6436002)(2906002)(53936002)(36756003)(44832011)(316002)(14454004)(256004)(106356001)(446003)(105586002)(97736004)(102836004)(476003)(2351001)(2616005)(6506007)(50226002)(386003)(99286004)(575784001)(86362001)(478600001)(52116002)(76176011)(55236004)(71200400001)(71190400001)(78486014)(81166006)(186003)(14444005)(2501003)(8676002)(1730700003)(8936002)(4326008)(5640700003)(81156014)(7736002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB6173; H:VI1PR04MB4688.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: OCpkt7jksdfNgK3CMRp8rRdQJiM+wf7Hsw9XAvvl+VDSbokJXp4Z6NDVGcB5LDuMWeFKsohITAcM4j560WQJYeXZenFDOtVNklUDXtN3rmlqIH14kMnAX1uKE00YI3lSTfmy1tONNp4FGpnk/+K/CoUCTQt7O1++DT+tygGLbvWar/zm98lou13GU27lmMIzcjeSJwwWC92w7cRzJ1UTOglg+icUNp0ZLw5gsiIttIHOic8DCk9dY8e1SIBDb5/ImXYYRB7+uhYHTjr/Jl3QxTadK5dN4HZHGV6I4guR6xcXQzavhzYRORscmNBcOny6eYMPBHbC4yijq98hD03zYBOYxoBXKlqguR5yOcmQXGPAVs3x8vhZiT3SKi4iSDPrbKJppFJhZYusS11sXhsDCcAbqObuF7gGejGs7CtldyA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88589a15-7411-4d00-ed16-08d677bc1897 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2019 11:58:24.2841 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6173 Subject: [dpdk-dev] [PATCH v2 11/20] bus/fslmc: rename portal pi index to consumer index 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" From: Hemant Agrawal This is to align with the latest qbman hw library Signed-off-by: Youri Querry Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/qbman_portal.c | 51 +++++++++++--------------- drivers/bus/fslmc/qbman/qbman_portal.h | 2 +- 2 files changed, 23 insertions(+), 30 deletions(-) -- 2.17.1 diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c index 08bfdc9f8..14f4b0344 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -251,21 +251,21 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d) } for (mask_size = p->eqcr.pi_ring_size; mask_size > 0; mask_size >>= 1) - p->eqcr.pi_mask = (p->eqcr.pi_mask<<1) + 1; + p->eqcr.pi_ci_mask = (p->eqcr.pi_ci_mask<<1) + 1; eqcr_pi = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI); - p->eqcr.pi = eqcr_pi & p->eqcr.pi_mask; + p->eqcr.pi = eqcr_pi & p->eqcr.pi_ci_mask; p->eqcr.pi_vb = eqcr_pi & QB_VALID_BIT; if ((p->desc.qman_version & QMAN_REV_MASK) >= QMAN_REV_5000 && (d->cena_access_mode == qman_cena_fastest_access)) - p->eqcr.ci = qbman_cinh_read(&p->sys, - QBMAN_CINH_SWP_EQCR_CI) & p->eqcr.pi_mask; + p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI) + & p->eqcr.pi_ci_mask; else - p->eqcr.ci = qbman_cinh_read(&p->sys, - QBMAN_CINH_SWP_EQCR_PI) & p->eqcr.pi_mask; + p->eqcr.ci = qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_CI) + & p->eqcr.pi_ci_mask; p->eqcr.available = p->eqcr.pi_ring_size - qm_cyc_diff(p->eqcr.pi_ring_size, - p->eqcr.ci & (p->eqcr.pi_mask<<1), - p->eqcr.pi & (p->eqcr.pi_mask<<1)); + p->eqcr.ci & (p->eqcr.pi_ci_mask<<1), + p->eqcr.pi & (p->eqcr.pi_ci_mask<<1)); portal_idx_map[p->desc.idx] = p; return p; @@ -646,8 +646,8 @@ static int qbman_swp_enqueue_ring_mode_direct(struct qbman_swp *s, const uint32_t *cl = qb_cl(d); uint32_t eqcr_ci, full_mask, half_mask; - half_mask = (s->eqcr.pi_mask>>1); - full_mask = s->eqcr.pi_mask; + half_mask = (s->eqcr.pi_ci_mask>>1); + full_mask = s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; s->eqcr.ci = qbman_cena_read_reg(&s->sys, @@ -685,8 +685,8 @@ static int qbman_swp_enqueue_ring_mode_mem_back(struct qbman_swp *s, const uint32_t *cl = qb_cl(d); uint32_t eqcr_ci, full_mask, half_mask; - half_mask = (s->eqcr.pi_mask>>1); - full_mask = s->eqcr.pi_mask; + half_mask = (s->eqcr.pi_ci_mask>>1); + full_mask = s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; s->eqcr.ci = qbman_cena_read_reg(&s->sys, @@ -743,8 +743,8 @@ static int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s, int i, num_enqueued = 0; uint64_t addr_cena; - half_mask = (s->eqcr.pi_mask>>1); - full_mask = s->eqcr.pi_mask; + half_mask = (s->eqcr.pi_ci_mask>>1); + full_mask = s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; s->eqcr.ci = qbman_cena_read_reg(&s->sys, @@ -811,8 +811,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; int i, num_enqueued = 0; - half_mask = (s->eqcr.pi_mask>>1); - full_mask = s->eqcr.pi_mask; + half_mask = (s->eqcr.pi_ci_mask>>1); + full_mask = s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; s->eqcr.ci = qbman_cena_read_reg(&s->sys, @@ -833,15 +833,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask)); memcpy(&p[1], &cl[1], 28); memcpy(&p[8], &fd[i], sizeof(*fd)); - eqcr_pi++; - } - - /* Set the verb byte, have to substitute in the valid-bit */ - eqcr_pi = s->eqcr.pi; - for (i = 0; i < num_enqueued; i++) { - p = qbman_cena_write_start_wo_shadow(&s->sys, - QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask)); - p[0] = cl[0] | s->eqcr.pi_vb; if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) { struct qbman_eq_desc *d = (struct qbman_eq_desc *)p; @@ -849,6 +840,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, ((flags[i]) & QBMAN_EQCR_DCA_IDXMASK); } eqcr_pi++; + p[0] = cl[0] | s->eqcr.pi_vb; + if (!(eqcr_pi & half_mask)) s->eqcr.pi_vb ^= QB_VALID_BIT; } @@ -880,8 +873,8 @@ static int qbman_swp_enqueue_multiple_desc_direct(struct qbman_swp *s, int i, num_enqueued = 0; uint64_t addr_cena; - half_mask = (s->eqcr.pi_mask>>1); - full_mask = s->eqcr.pi_mask; + half_mask = (s->eqcr.pi_ci_mask>>1); + full_mask = s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; s->eqcr.ci = qbman_cena_read_reg(&s->sys, @@ -943,8 +936,8 @@ static int qbman_swp_enqueue_multiple_desc_mem_back(struct qbman_swp *s, uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; int i, num_enqueued = 0; - half_mask = (s->eqcr.pi_mask>>1); - full_mask = s->eqcr.pi_mask; + half_mask = (s->eqcr.pi_ci_mask>>1); + full_mask = s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; s->eqcr.ci = qbman_cena_read_reg(&s->sys, diff --git a/drivers/bus/fslmc/qbman/qbman_portal.h b/drivers/bus/fslmc/qbman/qbman_portal.h index 3b0fc540b..e54f2661c 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.h +++ b/drivers/bus/fslmc/qbman/qbman_portal.h @@ -98,7 +98,7 @@ struct qbman_swp { uint32_t pi; uint32_t pi_vb; uint32_t pi_ring_size; - uint32_t pi_mask; + uint32_t pi_ci_mask; uint32_t ci; int available; } eqcr;