From patchwork Fri Jan 11 11:57:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 49680 X-Patchwork-Delegate: ferruh.yigit@amd.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 9E31C1B9E8; Fri, 11 Jan 2019 12:57:57 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60079.outbound.protection.outlook.com [40.107.6.79]) by dpdk.org (Postfix) with ESMTP id 6D4A61B9D9; Fri, 11 Jan 2019 12:57:55 +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=LN+7svjFBmgRsw15vJupOLPp9a5SS+JI2X1eOESWi+0=; b=bu5EXFs3kY5gKDgdie9csY+69z1M1MwKYTM8ll/beB+rStZR6KKr720x1vLu5DtJX0TfOwLcTn0A5/BV7lv0bxtRzCc+t1CkEZH2oGIe4YANJOpYo75vmOCgt9luND0ubVoNMaIzkibo0w+mVz3LRFtiPGq+zt+XtOrihrJbPC0= Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (20.177.56.80) by VI1PR04MB6221.eurprd04.prod.outlook.com (20.179.26.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.18; Fri, 11 Jan 2019 11:57:54 +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:57:54 +0000 From: Shreyansh Jain To: "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , Youri Querry , "stable@dpdk.org" Thread-Topic: [PATCH v2 02/20] bus/fslmc: fix the ring mode to use correct cache settings Thread-Index: AQHUqaTi09AGHwlB5ky0TID7LlbBXQ== Date: Fri, 11 Jan 2019 11:57:54 +0000 Message-ID: <20190111115712.6482-3-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) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB6221; 6:JmaV0DPRf2JIuxYjQSA9ausktR1reHYYkNdRIrgBT4uMboXBvEcImhpFPdQIlCR8++Rfs3Mb7ExDYaAXy47hFHI5AG3x7WuJedeq+R3McliovSfc78088s3Gpod7unkErMQ2D2D4pxnxyHaoJnxArBrAuLtZss9sU7kwOXyY3j0KUhnNw01IpOLCvowexdMJIBu7WaRqveGImFXPDF5eJ3DAr0AAoOwlMN25KDmEMLyXeu9i8q6r3s63DHqC7yxR5C5UE67pFbx9UgkiywrAMpylOxaBAJAkJYOaKesTYHZkYJLzRSk8TBt6H7MN9EBYCu+qWGeCtnhP4PZCBt/unkkts/O+ktk2HF1TQFFOfT1n9haUQS4wTgKENJ+b86+EjDtd8DY7jHvWzqXk9oHW9Rz40VPwZX8iz4VU3Ge0HMDRdwaU/bpNzebA/kGCFw5uGr7LU0NzWChbK7dU3MXOzA==; 5:9rr9/rWJftGaV46fbTlWWk2bHOsfmE6z9d0SPv9YNI1t+Tz6nfY2iSDSL+t0cHWFadNohGRgvDlO1cwbrOqktaSMe9Ufir26POOjEdbpABVJV2oes/CjifeC/rrolNFNlOq2zlcZfVTMgBJvmz9KTaL5w9D/qaodlmuhA7MqejROU/MJiNNwZvZUsOLzdIxxTiGHV8KLJdS2wu9ztTCoUg==; 7:vuCoA0k2C5aygn/1jSWCErLRcJE9sBIH9UxXNuBDUdTY1qnUbejj2f7tMRUx3PiMphDYitA8JKe6IWoFPJg5TXJ0S1DizNeHmY4QxojR1ClpyAPANyTAzXY4jJMgBLufiFFfmvccen6TBX4xBnoJwQ== x-ms-office365-filtering-correlation-id: dd5d0e83-a945-422d-4c2c-08d677bc04e5 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:VI1PR04MB6221; x-ms-traffictypediagnostic: VI1PR04MB6221: x-microsoft-antispam-prvs: x-forefront-prvs: 09144DB0F7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(366004)(396003)(39860400002)(376002)(199004)(189003)(6436002)(2906002)(54906003)(478600001)(71200400001)(6486002)(97736004)(36756003)(11346002)(2616005)(476003)(78486014)(66066001)(71190400001)(446003)(575784001)(86362001)(14444005)(256004)(7736002)(305945005)(99286004)(14454004)(316002)(8936002)(81166006)(81156014)(1730700003)(50226002)(8676002)(2501003)(6116002)(6916009)(3846002)(1076003)(76176011)(52116002)(68736007)(5660300001)(6512007)(105586002)(106356001)(486006)(5640700003)(4326008)(25786009)(44832011)(6506007)(386003)(2351001)(186003)(53936002)(6346003)(102836004)(26005)(55236004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB6221; 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) authentication-results: spf=none (sender IP is ) smtp.mailfrom=shreyansh.jain@nxp.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: HUk+schoHcvEoTJUx9DKqCcaf/XRVxrhFrCy2PNaW4Kr0jcqZ/o8mJVhxiqEhIdKrhUmz3D5LzmJZ1tbVrXACYPk5hJon4Tnx8dYPLxIwz+YO2ZR4s7EbZxpwhJS7ZxhPxZea5mewWClCgqIWCzjRDx0gnzOPCS8fTYlt3utNSidsB/my6LYmvqi7gsupsNlcwjmG29cQ8sJ9EF4rZK6uheRZyLw/OzgtTJSPDNOPylYOggmQYn2SWuX1u1s+jSnv9oYlZJ3S9Y4PR7IuFGZ0IZedfX4Sm2IEbe/oXW+KZxlRogcvFSZ6N/a6nqnDizKlhdAz1PH94CZXjAhcDLn6afcpbIMLPgEugmsAajFbJv7fbLKxChuu7eRISMBoUnvRKn9hCmNzkPPPtxesXKhDBR8qMh4iSWiyy+GU6/Qv9o= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd5d0e83-a945-422d-4c2c-08d677bc04e5 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2019 11:57:51.2357 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6221 Subject: [dpdk-dev] [PATCH v2 02/20] bus/fslmc: fix the ring mode to use correct cache settings 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: Youri Querry The code was incorrectly using the cache inhibited access. It shall use cached enabled access for better performance. Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0") Cc: stable@dpdk.org Signed-off-by: Youri Querry --- drivers/bus/fslmc/qbman/qbman_portal.c | 12 ++++++------ drivers/bus/fslmc/qbman/qbman_sys.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c index 3380e54f5..bbea37efc 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -683,8 +683,8 @@ static int qbman_swp_enqueue_ring_mode_mem_back(struct qbman_swp *s, full_mask = s->eqcr.pi_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; - s->eqcr.ci = qbman_cinh_read(&s->sys, - QBMAN_CENA_SWP_EQCR_CI) & full_mask; + s->eqcr.ci = qbman_cena_read_reg(&s->sys, + QBMAN_CENA_SWP_EQCR_CI_MEMBACK) & full_mask; s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size, eqcr_ci, s->eqcr.ci); if (!s->eqcr.available) @@ -809,8 +809,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s, full_mask = s->eqcr.pi_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; - s->eqcr.ci = qbman_cinh_read(&s->sys, - QBMAN_CENA_SWP_EQCR_CI) & full_mask; + s->eqcr.ci = qbman_cena_read_reg(&s->sys, + QBMAN_CENA_SWP_EQCR_CI_MEMBACK) & full_mask; s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size, eqcr_ci, s->eqcr.ci); if (!s->eqcr.available) @@ -941,8 +941,8 @@ static int qbman_swp_enqueue_multiple_desc_mem_back(struct qbman_swp *s, full_mask = s->eqcr.pi_mask; if (!s->eqcr.available) { eqcr_ci = s->eqcr.ci; - s->eqcr.ci = qbman_cinh_read(&s->sys, - QBMAN_CENA_SWP_EQCR_CI) & full_mask; + s->eqcr.ci = qbman_cena_read_reg(&s->sys, + QBMAN_CENA_SWP_EQCR_CI_MEMBACK) & full_mask; s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size, eqcr_ci, s->eqcr.ci); if (!s->eqcr.available) diff --git a/drivers/bus/fslmc/qbman/qbman_sys.h b/drivers/bus/fslmc/qbman/qbman_sys.h index d41af8358..0571097ab 100644 --- a/drivers/bus/fslmc/qbman/qbman_sys.h +++ b/drivers/bus/fslmc/qbman/qbman_sys.h @@ -55,6 +55,7 @@ #define QBMAN_CENA_SWP_RR(vb) (0x700 + ((uint32_t)(vb) >> 1)) #define QBMAN_CENA_SWP_VDQCR 0x780 #define QBMAN_CENA_SWP_EQCR_CI 0x840 +#define QBMAN_CENA_SWP_EQCR_CI_MEMBACK 0x1840 /* CENA register offsets in memory-backed mode */ #define QBMAN_CENA_SWP_DQRR_MEM(n) (0x800 + ((uint32_t)(n) << 6))