From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0081.outbound.protection.outlook.com [104.47.34.81]) by dpdk.org (Postfix) with ESMTP id 1455169C6 for ; Sun, 9 Apr 2017 09:48:47 +0200 (CEST) Received: from BN6PR03CA0056.namprd03.prod.outlook.com (10.173.137.18) by BN6PR03MB3106.namprd03.prod.outlook.com (10.174.94.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Sun, 9 Apr 2017 07:48:45 +0000 Received: from BN1BFFO11FD020.protection.gbl (2a01:111:f400:7c10::1:159) by BN6PR03CA0056.outlook.office365.com (2603:10b6:404:4c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Sun, 9 Apr 2017 07:48:45 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD020.mail.protection.outlook.com (10.58.144.83) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Sun, 9 Apr 2017 07:48:44 +0000 Received: from DTS-02.ap.freescale.net (DTS-02.ap.freescale.net [10.232.132.223]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v397mBLU024015; Sun, 9 Apr 2017 00:48:42 -0700 From: Hemant Agrawal To: , CC: , , Date: Sun, 9 Apr 2017 13:20:14 +0530 Message-ID: <1491724224-6319-12-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491724224-6319-1-git-send-email-hemant.agrawal@nxp.com> References: <1489754838-1455-1-git-send-email-hemant.agrawal@nxp.com> <1491724224-6319-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131361977251660551; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39840400002)(39380400002)(39850400002)(39450400003)(39860400002)(39410400002)(39400400002)(2980300002)(1110001)(1109001)(339900001)(3190300001)(199003)(189002)(9170700003)(48376002)(50466002)(105606002)(106466001)(85426001)(47776003)(54906002)(76176999)(189998001)(53936002)(50986999)(8656002)(356003)(104016004)(551934003)(305945005)(33646002)(50226002)(5660300001)(6666003)(36756003)(38730400002)(4326008)(77096006)(2906002)(81166006)(8936002)(2950100002)(5003940100001)(8676002)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB3106; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD020; 1:JOjnGrbhQV80jSvGaRHYDLg3kotrO3+jAWbkQjAlz/fUXB2ndfaj6dYgGokjfG0ICn+KTHDWybFmJGiHWOvYDsFP5gniWzobGo9/8GyqF/PajHgHZvWS+CwjNgTJprp6K0FluIW2dRrhNkIsm3IFrrMbc90Ul2/rHSPdUn+rqD+efmz9kpftJxl0rn3OyqM7hC3ucy/q+XNNTZfDL88feXMhDX51ox759+JTMn9DPcfskpsLCa53JJwpGS1+afWo0ukGb5eVK0GduxjJFLprRiopq2DUVYyjzicnoqvL6XAqBsRTHxBzVgWxlVSbjjBNg/LI9lLyyhgmD8aVYMK5DIrw+21y+qs06AIwCHQHhh0m9uRXhe4LCgwauBPa9bGv7hNcKy95LsuCRHbWwTxW/3Y5sGCMPg++3fRFu49pE1fA4W4pDaTOoW449NDfXL1tUVZbLtSOrNQ+j4DoNCFys1VwhXHI0cwVF/Peu/VvE1gwsQinTE9pxhVuvPtt4/634rmbt1W5EnTH3dg56ZM7hoyPC4oQn8hd95NZI+ksY9Ug8VwRU4FFmMoHrVK/TaqPirF8+XQCHaCfeVth9QWhhk3k3ZHtoWw9sOLusu3I2LMDYs7c0jMf9OcQdE/XHWkdPS4W5Y4567EcLdMWKZ6ohomK43ithENe6prGrCaZya9j0T+6YdQ5ujEWu7Pk2ADa MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 6e2ba891-64d0-4796-0307-08d47f1cd98b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BN6PR03MB3106; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3106; 3:A9eFLFwStBWQX4usSlB56Z9cAZQmEozlx/woMfO6yWy2mEE7zODODDVO89wdfwodvFbVvL8Qbe59E+ZzdZMqLNlBf6YFInHmItJapwhTj1KZxpBM4iiJ2z6JeG3mCe8G391sEiF6EdkI77IePSw/FBiWYzM1Vxxkgl2sSmOEeRQfsRoL7uBvXx38TZReoSzqYDzcZaGW83kZDdaGqgv77xy1+RZvowr8ePivOsxp2mUZh51xgtdlzBSlDSWXDAL7Z+rtkTEMOFWZoGFtvQB8GtBXPxN3fBJ9plHvBgGYyBT1psw2FrSwIgaM6qGgkSlsm2Kj9bwRPkTQkcK5OSXP1PPifeWMYSWD3WEy0RUfgLcsW7aXvBOyqCc1Zci+13rd1JX5ARO1KGI+LfJUx0fzwODyS1wNvkEmRBtPz6pJcJTME2gW19Gv1NTu8r3YiwuN; 25:xwZ15c1tTA6HBv+VhUT3ANMaCr6eObRhLgX83NRvdyEwk+i6UCS8A0KNjSLc/UO1bJlP1C0jnDg5qXktV1wObQE2yn7pHhMkQ6T7ZIfLrrWUu2OlQhrKabKmYVT9oia/Q9dmOUuLmJavbvvSAxmXh42iM0YE6DbOn91/qkHlfbyuW7w2eCiLkFS34UGltBoetBi4SYVEe7k05xyBM/0Am8t9/7W21ngZPT+89LTckIkjA+fK6u8EtxfUUaLxPhAbup0QTAV889Su3UwdKLdhc5Qx99PMGm4v9iXe7mleVFetExi2fq1RHeqfREL0+nqRfWnjX9UkAjGZ87prudQsUpKum9api3Kmy4ixDazgepOKisQVlmLSuptO4+OIvpa0GjPeNMwYDhwNXpy1vXS1Wurr/h1MwNRI5IlZ3riulDaMWNW4/o2Z9iNeP8cA9na+gUz5Rc5q6rgY2o8RG2voJA== X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3106; 31:wFrc1PR0h5KAMoeSgnhkZX4Y5HcichcvjuofZzJUmo73P4YVvMm4s7RvbvWGzCsyZCKH7bMZ2O+4O1cOpd/zL09hxaLK5D0aiVNDPEZ8y2GRNlP74SuFKEtelfcW+hr2/QGCE4/zdEVvuFcXOfmkTlTWGIPcYefVyxVZ4NpUyWWeCyKXA2pQ0WrcuKMmvinS5DIhg5+REhUNZVBPwmlhJFLIL3CTNJaLqzwUy0TVwGDY58GEbY+KRoUm71eDvLU5iGkBVPXmYU433PlP9ypjUKHOiR2XRjdz+hRxnx5rguc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13017025)(13015025)(13024025)(13023025)(13018025)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123563025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123565025)(20161123561025)(20161123556025); SRVR:BN6PR03MB3106; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB3106; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3106; 4:ksAPt7/MLFiLoO7obgjNafx3m0RowzojN9XWaUzukpTYqzOSkDNxq3HTq+NnB0lbj+vV1OnhAWqHHxOPCtnDJlVbh8gRWrpa1FW7X5Hdn9NzSBd2d4m9t5BJrbZHCx9Ae2qBz+fkSk/oKJUnmK9RUlRuJf5yyKkDHdAI+TFhOKzXfwobu7blLs8aONJlbgVdV2xT4LAX92wGQznYF9Cw+5I+uv1UJdm4QdVoVjT8u3U74UCo7+W+jlmbzd8D81VyTJxaa7CMod+25oNRtBc83I8b4ebFg1Acd2gpMVIj21q6x+MO0657HWfCxgyR/KKOFGRGjEV9LRYW11L+FKFt50wyCI84eSATTYPW+4RG1Sc1Spx+U6bwI1aazYdAH4ROSuffSR0h/H+EBNoxO7VH3kcx+QMBsAVTjwcSbGf1bVDn4RL7axUucFQ43AMYYH++ETbVyQWIJH3t169BbbANo3EdtueQCbwEaeb7P/8KN9NE8itnVclMYMD00CA6hc2R1e3mvGMm75FIbnMINjuTC5SpGjT06ZKb9I2vtagsQFbGA/JV71E4Bn05ENmB6RX+RXZMy5LQzIJSryOxLfl2mC2Q8fhQZfc2iPBXW5SMwFyuyJ2lp8q/Y8uvp3HLwudx6ilIJx73upkyMvCdS1aV90cdNkIU+iPE9sNojVWsI0TR7jLf0whmjiZ3BUabOBroGlX5fk7RPn12F1kqcY2Wz3KwDj33gAOH0d+/nFVENdTle9ONb7oKsEuiGxtaSuW5jOwkFdZAs0wWPc5fyKgQePOKqPtHRhoQXuvjeN/m4oHNcFhNyzwRfvQNIkFh3TvOrhGrfzd3Izb0OAMdVD5H85U/kQKk4kaP/JMv/z62N7+ZidMjrFX1D4Vu2Cco/cmDc6+wJ4q9pnxNofa2SqCj+qIvOEihVOK0PhKLzOYK0dI= X-Forefront-PRVS: 02723F29C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB3106; 23:TvwdFnv6CRWr2GYZ4w8GM66SxO7hZQ4qItK8ln3T7?= =?us-ascii?Q?1ylApGgcl/6qbUS0+juVNMJEuF/6PmLM2YHSUYF7p7XGveQ28HwfSsby1nk9?= =?us-ascii?Q?dUFHpOhiMBF8Oj8pQwea6Qg7lq7F0b++6G72/z00N57tvnEusI9m6tQKoX9d?= =?us-ascii?Q?EFwG8cIs6JtcFAsLKTpNbiJJLaTDHzTMHzrGmubt05II3KnvPG1Ambvx+/3N?= =?us-ascii?Q?esBUjBsD+08dOZJPKgGUGjAhd/SLETPoSIvaWT5jaHf95W97/WO/RMkpORt+?= =?us-ascii?Q?4JqIqcOlJ2+OxUgCxSJpTOmnYFDj5i08I9dtm2+B/ZqVZxolGAaeeqj9Z0sb?= =?us-ascii?Q?UORv4hk7DjGPotmT0DOHUSRy8Gq4ojVkeWG6EfJk6FrIVa4SrLcc2q76Z6Dh?= =?us-ascii?Q?5SBWxGmQbByqhSCSL2rYuOw8w8ywDpe5HcSNO1zcfEU9DozXdU9aCpb6XJzE?= =?us-ascii?Q?66OLeQOdW/djkpT95UcPHqwOg0l8HegZqLzd8msGBTxOOiK9AzgV9puDy9rq?= =?us-ascii?Q?xg/jDsbz0iJT/Ved5+Jc95zcyTq+YLj+AJcr/rUG+iONVKLD22Q/xh7KMCnS?= =?us-ascii?Q?7QBh48Oxd98iJNCkF3BBGJ5ZDtFqn1yaZucmOuBtPglPZbBOZTuDCI/sF6JB?= =?us-ascii?Q?SZjhCZKOYwyCbu328KxLxgr5eY0vrtS+jeGp6fBHQoYR3nig9che/wd9a8M7?= =?us-ascii?Q?ihzDBcq9Ds+JWP65rWyx8KHUZVwi0ww29wNKlDi0ULCBI3bYXboy7pEbkyn0?= =?us-ascii?Q?JbNK+1+bYhWXwEhFOMfsBHV6X9nNkHqlYXsKYW6JgEyzNlBaY8DollHzoHHq?= =?us-ascii?Q?qtk6bnfZ0c/5lWkwAGd1eQVIwtTBL1tOrLYVl74JBO25kAs4rLz+hDqt0jBZ?= =?us-ascii?Q?KdxBN6J1Vv0hzFCjtMzo5nNinHSwGIHOVKKg6cFLzKXFqO7vHxPNe209URf6?= =?us-ascii?Q?2iacLMZjWfETPdliIk3+02skQXtqJbgTEWhUKd34Cs5BWdHsKXKZ9bAlUGzv?= =?us-ascii?Q?u7ytkb4Px+he5hGfkjlq1oE+Jn7Xq+zDiDWHiru/6s4xMubXm3XgaBX1290E?= =?us-ascii?Q?kn6i7ayG6IV2PilZJ3PAcbFNPUbz0H3Gk73TT5d9gYem4eIHBiPQf0gae3cp?= =?us-ascii?Q?MMkVEN5alYYptFGPWK00qNWwR2kSOLkQjciAFQweckcAS7k6s1qT9y5JtDiN?= =?us-ascii?Q?GtoTwpepfdZf0ln/dvvzR0r75DHI/G6zbu9?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3106; 6:lshdAW4CXSWdeCfobqfHEIZ9n0WaT7I/ZC08Du4Asfd45FA9PEgZ52NE9KmMbvep7QPsLt5rwY4wVhPFvHbn2b/Rl4Mb1oBnN2VtlW3iyEpnoZUC+oZ6zVkE8wAq0WodXqzCRvAoUV7NwtU8RU65YuzUMD8NjYZvmsccE7HEHViMAu54b+1kP/LffyEobfctS0HgWNdu6zmST/7aloYiVgMAUKL2lZ3f8uqZsLes1nvwiufdNmV6fGgJVD0l64CDTFv3eDW0KtoLVcBQdvOVXXe4mTFcdZygPaQjU5j0Sk5dZvcEmkyIO0231dUQ+gDfDp4X0rQRYP/p30SuVmSapWSMa0uMTXd5fxEVFVCRxd/OiMe6y5rKdLfEaOt9wHPDKg/NeFjAG2+DC4Dsq6RG2ikUtDY4vku76WlffQLkz84FkOp7jQ3hFpPeQI3R9UuGc340WiTCxgFn4U5s/A0E1UlN8ZpswtuzytDSvhKf6X/RiS6uv2321mubvsSLq8AK; 5:3026lFUB1FI2ghCNdkbY4cL1OFv7gJzzH9N/6IsqHqexRsM5uhQ5XO/KJEYm92ruEhaKAYMIaAf30ju+1p0hAlgwKVD4jtH0wAThcKcLe6bOLe+j7iFmbYfW/+vQ35oFVd0uBtwVHrl6j5aBgmsBipbTy3v9ncNhCMTMMIatLxWpkktGYrbLFRQjV7OqB/pX; 24:wbkdgpwaUjW/j5rXaCOJsOm2uQAaMmtTcFtDRUWw7j6tFCZvN0WaAcFLZvl5NKA5FjKs4dAhsx8SMredrFbjWVwF8aUognlfy8QqwWD7WMs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB3106; 7:I3UcGEODwuu0Jd64orXhf3BT0Lb0D0BgTa4lNnJd7/q8X6MJX8yBTrI1m3kXoRED7SB5f2TnqyOWGmHdWPvdhZwAVS4CxSI2C5uSa3LbgfxOadrm/HAGLWNyfkjHy9pqeyVwMY5DU98thkSS8FLhNTcfG3JBFPa6REkxSgAlgfocqL+G7WOtQxTOk8HWwev5iCl0zwMaZzIt4NEILWFNFC/ar1PtllGcwPq4EfIhGMrsvaRNNCOTRHOsEVCizn9kH2vLW5BqHusvzfx72+Pr46JxhtWWVqX5omsHfaResxYX8Ou8Px4PAZiQz8Gg5xwKgsTyJVrbUviG0iJTQAmMKQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2017 07:48:44.9788 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB3106 Subject: [dpdk-dev] [PATCH v3 11/21] bus/fslmc: dpio portal driver 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: , X-List-Received-Date: Sun, 09 Apr 2017 07:48:48 -0000 The portal driver is bound to DPIO objects discovered on the fsl-mc bus and provides services that: - allow other drivers, such as the Ethernet driver, to enqueue and dequeue frames for their respective objects A system will typically allocate 1 DPIO object per CPU to allow queuing operations to happen simultaneously across all CPUs. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/Makefile | 1 + drivers/bus/fslmc/fslmc_vfio.c | 17 +- drivers/bus/fslmc/fslmc_vfio.h | 5 + drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 366 ++++++++++++++++++++++++++++ drivers/bus/fslmc/portal/dpaa2_hw_dpio.h | 60 +++++ drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 68 ++++++ drivers/bus/fslmc/rte_bus_fslmc_version.map | 2 + 7 files changed, 518 insertions(+), 1 deletion(-) create mode 100644 drivers/bus/fslmc/portal/dpaa2_hw_dpio.c create mode 100644 drivers/bus/fslmc/portal/dpaa2_hw_dpio.h create mode 100644 drivers/bus/fslmc/portal/dpaa2_hw_pvt.h diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile index 45b545c..aef53fd 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -67,6 +67,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \ mc/dpio.c \ mc/mc_sys.c +SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 72ea6c8..7398637 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -61,6 +61,9 @@ #include "rte_fslmc.h" #include "fslmc_vfio.h" +#include "portal/dpaa2_hw_pvt.h" +#include "portal/dpaa2_hw_dpio.h" + #define VFIO_MAX_CONTAINERS 1 #define FSLMC_VFIO_LOG(level, fmt, args...) \ @@ -261,12 +264,13 @@ int fslmc_vfio_process_group(void) struct fslmc_vfio_device *vdev; struct vfio_device_info device_info = { .argsz = sizeof(device_info) }; char *temp_obj, *object_type, *mcp_obj, *dev_name; - int32_t object_id, i, dev_fd; + int32_t object_id, i, dev_fd, ret; DIR *d; struct dirent *dir; char path[PATH_MAX]; int64_t v_addr; int ndev_count; + int dpio_count = 0; struct fslmc_vfio_group *group = &vfio_groups[0]; static int process_once; @@ -410,9 +414,20 @@ int fslmc_vfio_process_group(void) fslmc_bus_add_device(dev); } + if (!strcmp(object_type, "dpio")) { + ret = dpaa2_create_dpio_device(vdev, + &device_info, + object_id); + if (!ret) + dpio_count++; + } } closedir(d); + ret = dpaa2_affine_qbman_swp(); + if (ret) + FSLMC_VFIO_LOG(DEBUG, "Error in affining qbman swp %d", ret); + return 0; FAILURE: diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h index 5e58211..39994dd 100644 --- a/drivers/bus/fslmc/fslmc_vfio.h +++ b/drivers/bus/fslmc/fslmc_vfio.h @@ -71,4 +71,9 @@ int vfio_dmamap_mem_region( int fslmc_vfio_setup_group(void); int fslmc_vfio_process_group(void); +/* create dpio device */ +int dpaa2_create_dpio_device(struct fslmc_vfio_device *vdev, + struct vfio_device_info *obj_info, + int object_id); + #endif /* _FSLMC_VFIO_H_ */ diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c new file mode 100644 index 0000000..3e1993e --- /dev/null +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -0,0 +1,366 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include "dpaa2_hw_pvt.h" +#include "dpaa2_hw_dpio.h" + +#define NUM_HOST_CPUS RTE_MAX_LCORE + +struct dpaa2_io_portal_t dpaa2_io_portal[RTE_MAX_LCORE]; +RTE_DEFINE_PER_LCORE(struct dpaa2_io_portal_t, _dpaa2_io); + +TAILQ_HEAD(dpio_device_list, dpaa2_dpio_dev); +static struct dpio_device_list *dpio_dev_list; /*!< DPIO device list */ +static uint32_t io_space_count; + +/*Stashing Macros default for LS208x*/ +static int dpaa2_core_cluster_base = 0x04; +static int dpaa2_cluster_sz = 2; + +/* For LS208X platform There are four clusters with following mapping: + * Cluster 1 (ID = x04) : CPU0, CPU1; + * Cluster 2 (ID = x05) : CPU2, CPU3; + * Cluster 3 (ID = x06) : CPU4, CPU5; + * Cluster 4 (ID = x07) : CPU6, CPU7; + */ +/* For LS108X platform There are two clusters with following mapping: + * Cluster 1 (ID = x02) : CPU0, CPU1, CPU2, CPU3; + * Cluster 2 (ID = x03) : CPU4, CPU5, CPU6, CPU7; + */ + +/* Set the STASH Destination depending on Current CPU ID. + * e.g. Valid values of SDEST are 4,5,6,7. Where, + * CPU 0-1 will have SDEST 4 + * CPU 2-3 will have SDEST 5.....and so on. + */ +static int +dpaa2_core_cluster_sdest(int cpu_id) +{ + int x = cpu_id / dpaa2_cluster_sz; + + if (x > 3) + x = 3; + + return dpaa2_core_cluster_base + x; +} + +static int +configure_dpio_qbman_swp(struct dpaa2_dpio_dev *dpio_dev) +{ + struct qbman_swp_desc p_des; + struct dpio_attr attr; + + dpio_dev->dpio = malloc(sizeof(struct fsl_mc_io)); + if (!dpio_dev->dpio) { + PMD_INIT_LOG(ERR, "Memory allocation failure\n"); + return -1; + } + + PMD_DRV_LOG(DEBUG, "\t Allocated DPIO Portal[%p]", dpio_dev->dpio); + dpio_dev->dpio->regs = dpio_dev->mc_portal; + if (dpio_open(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->hw_id, + &dpio_dev->token)) { + PMD_INIT_LOG(ERR, "Failed to allocate IO space\n"); + free(dpio_dev->dpio); + return -1; + } + + if (dpio_reset(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token)) { + PMD_INIT_LOG(ERR, "Failed to reset dpio\n"); + dpio_close(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); + free(dpio_dev->dpio); + return -1; + } + + if (dpio_enable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token)) { + PMD_INIT_LOG(ERR, "Failed to Enable dpio\n"); + dpio_close(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); + free(dpio_dev->dpio); + return -1; + } + + if (dpio_get_attributes(dpio_dev->dpio, CMD_PRI_LOW, + dpio_dev->token, &attr)) { + PMD_INIT_LOG(ERR, "DPIO Get attribute failed\n"); + dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); + dpio_close(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); + free(dpio_dev->dpio); + return -1; + } + + PMD_INIT_LOG(DEBUG, "Qbman Portal ID %d", attr.qbman_portal_id); + PMD_INIT_LOG(DEBUG, "Portal CE adr 0x%lX", attr.qbman_portal_ce_offset); + PMD_INIT_LOG(DEBUG, "Portal CI adr 0x%lX", attr.qbman_portal_ci_offset); + + /* Configure & setup SW portal */ + p_des.block = NULL; + p_des.idx = attr.qbman_portal_id; + p_des.cena_bar = (void *)(dpio_dev->qbman_portal_ce_paddr); + p_des.cinh_bar = (void *)(dpio_dev->qbman_portal_ci_paddr); + p_des.irq = -1; + p_des.qman_version = attr.qbman_version; + + dpio_dev->sw_portal = qbman_swp_init(&p_des); + if (dpio_dev->sw_portal == NULL) { + PMD_DRV_LOG(ERR, " QBMan SW Portal Init failed\n"); + dpio_close(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); + free(dpio_dev->dpio); + return -1; + } + + PMD_INIT_LOG(DEBUG, "QBMan SW Portal 0x%p\n", dpio_dev->sw_portal); + + return 0; +} + +static int +dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev) +{ + int sdest; + int cpu_id, ret; + + /* Set the Stashing Destination */ + cpu_id = rte_lcore_id(); + if (cpu_id < 0) { + cpu_id = rte_get_master_lcore(); + if (cpu_id < 0) { + RTE_LOG(ERR, PMD, "\tGetting CPU Index failed\n"); + return -1; + } + } + /* Set the STASH Destination depending on Current CPU ID. + * Valid values of SDEST are 4,5,6,7. Where, + * CPU 0-1 will have SDEST 4 + * CPU 2-3 will have SDEST 5.....and so on. + */ + + sdest = dpaa2_core_cluster_sdest(cpu_id); + PMD_DRV_LOG(DEBUG, "Portal= %d CPU= %u SDEST= %d", + dpio_dev->index, cpu_id, sdest); + + ret = dpio_set_stashing_destination(dpio_dev->dpio, CMD_PRI_LOW, + dpio_dev->token, sdest); + if (ret) { + PMD_DRV_LOG(ERR, "%d ERROR in SDEST\n", ret); + return -1; + } + + return 0; +} + +static inline struct dpaa2_dpio_dev *dpaa2_get_qbman_swp(void) +{ + struct dpaa2_dpio_dev *dpio_dev = NULL; + int ret; + + /* Get DPIO dev handle from list using index */ + TAILQ_FOREACH(dpio_dev, dpio_dev_list, next) { + if (dpio_dev && rte_atomic16_test_and_set(&dpio_dev->ref_count)) + break; + } + if (!dpio_dev) + return NULL; + + PMD_DRV_LOG(DEBUG, "New Portal=0x%x (%d) affined thread - %lu", + dpio_dev, dpio_dev->index, syscall(SYS_gettid)); + + ret = dpaa2_configure_stashing(dpio_dev); + if (ret) + PMD_DRV_LOG(ERR, "dpaa2_configure_stashing failed"); + + return dpio_dev; +} + +int +dpaa2_affine_qbman_swp(void) +{ + unsigned int lcore_id = rte_lcore_id(); + uint64_t tid = syscall(SYS_gettid); + + if (lcore_id == LCORE_ID_ANY) + lcore_id = rte_get_master_lcore(); + /* if the core id is not supported */ + else if (lcore_id >= RTE_MAX_LCORE) + return -1; + + if (dpaa2_io_portal[lcore_id].dpio_dev) { + PMD_DRV_LOG(INFO, "DPAA Portal=0x%x (%d) is being shared" + " between thread %lu and current %lu", + dpaa2_io_portal[lcore_id].dpio_dev, + dpaa2_io_portal[lcore_id].dpio_dev->index, + dpaa2_io_portal[lcore_id].net_tid, + tid); + RTE_PER_LCORE(_dpaa2_io).dpio_dev + = dpaa2_io_portal[lcore_id].dpio_dev; + rte_atomic16_inc(&dpaa2_io_portal + [lcore_id].dpio_dev->ref_count); + dpaa2_io_portal[lcore_id].net_tid = tid; + + PMD_DRV_LOG(DEBUG, "Old Portal=0x%x (%d) affined thread - %lu", + dpaa2_io_portal[lcore_id].dpio_dev, + dpaa2_io_portal[lcore_id].dpio_dev->index, + tid); + return 0; + } + + /* Populate the dpaa2_io_portal structure */ + dpaa2_io_portal[lcore_id].dpio_dev = dpaa2_get_qbman_swp(); + + if (dpaa2_io_portal[lcore_id].dpio_dev) { + RTE_PER_LCORE(_dpaa2_io).dpio_dev + = dpaa2_io_portal[lcore_id].dpio_dev; + dpaa2_io_portal[lcore_id].net_tid = tid; + + return 0; + } else { + return -1; + } +} + +int +dpaa2_create_dpio_device(struct fslmc_vfio_device *vdev, + struct vfio_device_info *obj_info, + int object_id) +{ + struct dpaa2_dpio_dev *dpio_dev; + struct vfio_region_info reg_info = { .argsz = sizeof(reg_info)}; + + if (obj_info->num_regions < NUM_DPIO_REGIONS) { + PMD_INIT_LOG(ERR, "ERROR, Not sufficient number " + "of DPIO regions.\n"); + return -1; + } + + if (!dpio_dev_list) { + dpio_dev_list = malloc(sizeof(struct dpio_device_list)); + if (!dpio_dev_list) { + PMD_INIT_LOG(ERR, "Memory alloc failed in DPIO list\n"); + return -1; + } + + /* Initialize the DPIO List */ + TAILQ_INIT(dpio_dev_list); + } + + dpio_dev = malloc(sizeof(struct dpaa2_dpio_dev)); + if (!dpio_dev) { + PMD_INIT_LOG(ERR, "Memory allocation failed for DPIO Device\n"); + return -1; + } + + PMD_DRV_LOG(INFO, "\t Aloocated DPIO [%p]", dpio_dev); + dpio_dev->dpio = NULL; + dpio_dev->hw_id = object_id; + dpio_dev->vfio_fd = vdev->fd; + rte_atomic16_init(&dpio_dev->ref_count); + /* Using single portal for all devices */ + dpio_dev->mc_portal = rte_mcp_ptr_list[MC_PORTAL_INDEX]; + + reg_info.index = 0; + if (ioctl(dpio_dev->vfio_fd, VFIO_DEVICE_GET_REGION_INFO, ®_info)) { + PMD_INIT_LOG(ERR, "vfio: error getting region info\n"); + return -1; + } + + PMD_DRV_LOG(DEBUG, "\t Region Offset = %llx", reg_info.offset); + PMD_DRV_LOG(DEBUG, "\t Region Size = %llx", reg_info.size); + dpio_dev->ce_size = reg_info.size; + dpio_dev->qbman_portal_ce_paddr = (uint64_t)mmap(NULL, reg_info.size, + PROT_WRITE | PROT_READ, MAP_SHARED, + dpio_dev->vfio_fd, reg_info.offset); + + /* Create Mapping for QBMan Cache Enabled area. This is a fix for + * SMMU fault for DQRR statshing transaction. + */ + if (vfio_dmamap_mem_region(dpio_dev->qbman_portal_ce_paddr, + reg_info.offset, reg_info.size)) { + PMD_INIT_LOG(ERR, "DMAMAP for Portal CE area failed.\n"); + return -1; + } + + reg_info.index = 1; + if (ioctl(dpio_dev->vfio_fd, VFIO_DEVICE_GET_REGION_INFO, ®_info)) { + PMD_INIT_LOG(ERR, "vfio: error getting region info\n"); + free(dpio_dev); + return -1; + } + + PMD_DRV_LOG(DEBUG, "\t Region Offset = %llx", reg_info.offset); + PMD_DRV_LOG(DEBUG, "\t Region Size = %llx", reg_info.size); + dpio_dev->ci_size = reg_info.size; + dpio_dev->qbman_portal_ci_paddr = (uint64_t)mmap(NULL, reg_info.size, + PROT_WRITE | PROT_READ, MAP_SHARED, + dpio_dev->vfio_fd, reg_info.offset); + + if (configure_dpio_qbman_swp(dpio_dev)) { + PMD_INIT_LOG(ERR, + "Fail to configure the dpio qbman portal for %d\n", + dpio_dev->hw_id); + free(dpio_dev); + return -1; + } + + io_space_count++; + dpio_dev->index = io_space_count; + TAILQ_INSERT_HEAD(dpio_dev_list, dpio_dev, next); + + return 0; +} diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.h b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.h new file mode 100644 index 0000000..682f3fa --- /dev/null +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.h @@ -0,0 +1,60 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _DPAA2_HW_DPIO_H_ +#define _DPAA2_HW_DPIO_H_ + +#include +#include + +struct dpaa2_io_portal_t { + struct dpaa2_dpio_dev *dpio_dev; + struct dpaa2_dpio_dev *sec_dpio_dev; + uint64_t net_tid; + uint64_t sec_tid; +}; + +/*! Global per thread DPIO portal */ +RTE_DECLARE_PER_LCORE(struct dpaa2_io_portal_t, _dpaa2_io); + +#define DPAA2_PER_LCORE_DPIO RTE_PER_LCORE(_dpaa2_io).dpio_dev +#define DPAA2_PER_LCORE_PORTAL DPAA2_PER_LCORE_DPIO->sw_portal + +#define DPAA2_PER_LCORE_SEC_DPIO RTE_PER_LCORE(_dpaa2_io).sec_dpio_dev +#define DPAA2_PER_LCORE_SEC_PORTAL DPAA2_PER_LCORE_SEC_DPIO->sw_portal + +/* Affine a DPIO portal to current processing thread */ +int dpaa2_affine_qbman_swp(void); + + +#endif /* _DPAA2_HW_DPIO_H_ */ diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h new file mode 100644 index 0000000..6b44314 --- /dev/null +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -0,0 +1,68 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _DPAA2_HW_PVT_H_ +#define _DPAA2_HW_PVT_H_ + +#include +#include + + +#define MC_PORTAL_INDEX 0 +#define NUM_DPIO_REGIONS 2 + +struct dpaa2_dpio_dev { + TAILQ_ENTRY(dpaa2_dpio_dev) next; + /**< Pointer to Next device instance */ + uint16_t index; /**< Index of a instance in the list */ + rte_atomic16_t ref_count; + /**< How many thread contexts are sharing this.*/ + struct fsl_mc_io *dpio; /** handle to DPIO portal object */ + uint16_t token; + struct qbman_swp *sw_portal; /** SW portal object */ + const struct qbman_result *dqrr[4]; + /**< DQRR Entry for this SW portal */ + void *mc_portal; /**< MC Portal for configuring this device */ + uintptr_t qbman_portal_ce_paddr; + /**< Physical address of Cache Enabled Area */ + uintptr_t ce_size; /**< Size of the CE region */ + uintptr_t qbman_portal_ci_paddr; + /**< Physical address of Cache Inhibit Area */ + uintptr_t ci_size; /**< Size of the CI region */ + int32_t vfio_fd; /**< File descriptor received via VFIO */ + int32_t hw_id; /**< An unique ID of this DPIO device instance */ +}; + +/*! Global MCP list */ +extern void *(*rte_mcp_ptr_list); +#endif diff --git a/drivers/bus/fslmc/rte_bus_fslmc_version.map b/drivers/bus/fslmc/rte_bus_fslmc_version.map index f64572f..026b1be 100644 --- a/drivers/bus/fslmc/rte_bus_fslmc_version.map +++ b/drivers/bus/fslmc/rte_bus_fslmc_version.map @@ -1,6 +1,7 @@ DPDK_17.05 { global: + dpaa2_affine_qbman_swp; dpbp_disable; dpbp_enable; dpbp_get_attributes; @@ -15,6 +16,7 @@ DPDK_17.05 { dpio_reset; dpio_set_stashing_destination; mc_send_command; + per_lcore__dpaa2_io; qbman_check_command_complete; qbman_eq_desc_clear; qbman_eq_desc_set_no_orp; -- 2.1.4