From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0054.outbound.protection.outlook.com [104.47.32.54]) by dpdk.org (Postfix) with ESMTP id 14194F94B for ; Mon, 23 Jan 2017 13:01:05 +0100 (CET) Received: from BN6PR03CA0036.namprd03.prod.outlook.com (10.175.124.22) by CY1PR0301MB0746.namprd03.prod.outlook.com (10.160.159.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13; Mon, 23 Jan 2017 12:01:03 +0000 Received: from BN1BFFO11FD035.protection.gbl (2a01:111:f400:7c10::1:142) by BN6PR03CA0036.outlook.office365.com (2603:10b6:404:10c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.13 via Frontend Transport; Mon, 23 Jan 2017 12:01:03 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; 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 BN1BFFO11FD035.mail.protection.outlook.com (10.58.144.98) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Mon, 23 Jan 2017 12:01:02 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v0NC07ed019311; Mon, 23 Jan 2017 05:00:59 -0700 From: Hemant Agrawal To: CC: , , , , , , Hemant Agrawal Date: Mon, 23 Jan 2017 17:29:45 +0530 Message-ID: <1485172803-17288-16-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1485172803-17288-1-git-send-email-hemant.agrawal@nxp.com> References: <1484832240-2048-1-git-send-email-hemant.agrawal@nxp.com> <1485172803-17288-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131296464627769987; (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)(7916002)(336005)(39840400002)(39860400002)(39410400002)(39380400002)(39450400003)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(47776003)(38730400001)(2351001)(626004)(77096006)(551934003)(6916009)(53936002)(2950100002)(92566002)(305945005)(5660300001)(36756003)(50466002)(54906002)(68736007)(6666003)(110136003)(48376002)(106466001)(356003)(8656002)(50986999)(105606002)(76176999)(8676002)(85426001)(8936002)(4326007)(86362001)(50226002)(104016004)(5003940100001)(2906002)(97736004)(33646002)(575784001)(189998001)(81166006)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0746; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD035; 1:1UMubafNRQmQhEdVYB2vx2wGOfPeAazc4gdSn8uq38lxKarhBKNWnxKFhJV0q1GZOG0Yxj/c+4nnwqKlMfPNHUCZ0Swhe4/VB3E2gVgxAvjY5BmLti5ogaxgx3YOa6LFcMQGLJAVxmch8x2g1cLtKCm1cKh2yzuq46Dm6t8ZZoLg9tcTDiCQZu5IvciwSFJZTINb4Q46ygcIQCPVP+IaKYFgM6Fjv9nn+DY5SkzsZaO5PSkEWd4u6hObEzNmHBBF5GbaomfwEwahmWbgiNoP2dGihdbbDNrN1xkhY/ozxotd8C+oLnK3Jgu0vN4g0yLT3FvbxkAewK6wwObgrgwrmfTqsgstjHulq6UI/e9+w/WbzD14Zoo6Gu7CSTEKdLt3moo/zrmaoaCBkKZMuS68a4K1mjsWU+3SbIb59pWUTduailldmgOQAyEZ+hrNaWFuRU7jwnyhxjojAgQ/SqZRZDTqfbqE4r4fQeIJKfMzMW09oYkpTOnf/Lly3tHrDyqgyxk5LhUmH+TOMZNSCMBGHtCnROqwOnHKQYEXqqGphX7iPOs8qj3UipJn67MV7hkRLSUGL91ekBzMLNJiuZcCitXFHdm1q4EnOe5VgH85tJKx54/lqp8+4UIu2TGNy3Zb3IlCG9wIeYF4zIezDFSn1PgaQmAzw75lGjTt1GeqbEwL5KhsB4OqxR8uxEDDAeo5pJrkj+4Lfxd2fqSCIjrS3P9nuXVLlrDXz1Kjw+66+BwrgAVRk27VOd0+Co0tE8KQ MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 2d51fe36-da30-4abb-c125-08d4438780db X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0746; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 3:vKhMp3kqk442SwGnvJs8d0ZhpLoqeNNR+MYFtIoDKMFqUlDZOGnh7UuLTyKVvtLiUuzerQyhxIHvu8dmcm8ydIomQ7nakFJFlPPJwqRTg7M7irI8qKyM5+NEKjhpswVcscGfITLxkE9Yz4NoBu5dRkeTBREJ7Ylox6xvX9NywcfSSspD5iGIqD1mka8U2GuZAefwXT3sGzHOxBdROVNA6a5wM8MzQmM7IA7e06jGzZsziQy2zJWFUuJOqZzt5NfMt/yAzUb96jn9GPy23AhctVtZx2M44etRGXIsfXP4WRRbTPm+KKosrZqypD0uaTprKn5W5Wj1wWoGowYk5WOGuicM0sAhTEiVX/+s7/eK/deRlU8EPtNt66+OPYBC/YG9; 25:9VmVQT0LRSJEbsNGkDl4C7poItlop378FW2RdsexVwA/lUKNp1SnyBq05sUA+CwjzRzbWiK+V3zuQ/CoREaVswFHDK+V2pRoMErM+nVCnTDoTtHH+dXo/jv5Q8xxtLRYp9W62XEt/GwuymTlTU8N4YiKWHQG2C1fLgGmpwZvj+x0aU1efJYGHtRFc5149H3zrUVMd0/S8pZHzQpw3i8Xv4zX8+PhplgPv4CxwPfLL1sGcyjJt7mGdhJ84J7p/4gMB05eY2nKUqc38ZH6Rb2ydpBB9oIsV/DherZl9U+4pJwBjN4cXoszhtND2ENRvpYYWlXu44wLOj7R1/LvsTP77KuIz44cC7bbM0BgNB4KsnBfAMzqDeuV/ayldpfcWsiqdK9LRkew/1F7U+V69VXX5vQx9J+CD4aHLqe3dcMq9EznDrshO/l47bzcpqQaZCyW7tDDrZfCK4E4iv0Z75bGfQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 31:pEzyQ+loTBrjNBj9JVzOwG5rni3mA4Yto4SfIpll5oqb8fozOMOtkFm72m4eWYGx9+P6yVqQp39tXXbx4GARv7idsDBML6cOV5IB6CcyqgQEmkY2MA/qoUUsfoMQiqf9maOEbC32IeIaJUuL14hwKme+lS8zMqj0jlxL4HNs4V/R/H3uwreky68UMqFUf/9cTOynHsZBMyGxT7kPAQ8A8gzTnhqZeUL/qSFrnWdlOXbJ2r4LwcSJ7thFWhxec6gaCSsBoAPnhpAgCjBvZITeBg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:CY1PR0301MB0746; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0746; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 4:BYPw6D0DgZHhJ0QpWc5HflOzWkYaNdDO5+QtKTNWo+K5aQ9aUcKAh6rLEnqTazYQ9A54MC9s2d8qP1gvIcZklIWYXnmPG8N+8cOGO0+5F6CGuLQ60shK2aNSMh19q+DQgUnb36rpKfhbgX1yuMq72fGoVkY6wG4Go3uI1wlYGaRpnbIVi4FTT/zoYyeXwRQh2Zmuj2R+O0k2YmScpO+Mw0aYD3P1TztAZLxGNhbNHAKtjQNA8ZAc0437kXuXc0nBDeneaLSTIFW/aOQUOv7EV8Wkx0FkOThPA5cqNZ/iRIhwuQFrdvWczRl9Ic8+xV6PO8qzT2VtSLW9fPy66vseRrEVBK+igHpOb4aP7FyEaEHAkGaoKII/7Kv6qk30IBCEh/ChSw4bGYGNK2MiwmzMcZBeDre+kA++7o869D80J0C77RnXhJQjF6T2aGG6iCcNY1hUUyDrvzgPCueajAc1Md9+EXNMeJF+uZeYPAUerfP0ORgqfse75zIeah9NbSW13UApT0ut/dB0g3zr5aq2N2/YVg6H1YLRgfDeKQZhNWz3LULFxQ7gmr3tI4rkOqEWT0zd+MZ9tyLmWWCxPRcBGRRtNAC1WqC7tH5jClPsQkxfcVJWoh80mVTqMALvAcz81ykaUN3ZepJm4T5UtMNz0+v/qC+u8VBh4Aq++x7WjDZQo+LU3Ms0m8eX6L2LIJ/HYa5iupXD2hnOeJ6tDuW3ZJr0fUpUIOPanpR+0sERJngPvhuGBPfnmfw5xT7dk7zVFOue0ZHIsi2+IxpT087E+A== X-Forefront-PRVS: 0196A226D1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0746; 23:SL78KfFR8jN18mTQYgO0D+hRDxfGh4hUDYnZzAj?= =?us-ascii?Q?fGw4/pnB0g3NV3u4yGAVYtmQvASqZp2ng+R8Dt3s/GW6s5GQ3yJ1oYWh2NOH?= =?us-ascii?Q?oaOGfn9dTjGSAs43KTDdL4VqDKjjct0hU+DhAb8pVeHT6h6GeLPIpngxNTL7?= =?us-ascii?Q?jxH6gBUt1pjUFjLxTUS0N/5YgbwS2zE+Oygvh2dRu3ABs1GB25xhvpQ76ms1?= =?us-ascii?Q?+AUOZv3ndar7jqocqOjk8eqxAJqLp/jr1A1xzZDWH/li+qIRT3vWfjMF2wV9?= =?us-ascii?Q?uOlVWY1yckn18r/cNnq9vDKAir3gbMUO6R2xXF7TuVVWQzdAZ+oxlXAC+siM?= =?us-ascii?Q?VrVWhRsQqNjzqv4U/k5hSb7zQbSCQFxXXxZ1JjAR0krawa/6Ak/si9TYau38?= =?us-ascii?Q?GyrxSOKVL3mIYtTlauB2THnS1PNPF4rNa0dbbwOH3lOjrtQoYzcNb25lMxzv?= =?us-ascii?Q?DiB2KFO5NHemOX8SF7NOqDZXcVqAzxS2Xf/UjsN9/EvZDapuhhNFu/4n/qZW?= =?us-ascii?Q?E7YKJCT+tD8sIjc+7/80pb7+ayxyCWVPcaFfhyVUKzakgPK9z6K3M6zOyivV?= =?us-ascii?Q?g9yGsaXOMB4oYScU2rsM7T66AGYiFiz4eIB2KNMhDqb1CTGruc7QlpYpaMzb?= =?us-ascii?Q?F0MIweRHE56ZSfD8SOUwdH2+RDiL97hVPH3vnMQCFmaICcuB57NuvsDQioUX?= =?us-ascii?Q?M0BNnsdzOO5xZWdSPOCp8qzxUies47uA1vJq5XQ0DatU3QxWn5IgkmhKtyZs?= =?us-ascii?Q?NRHJAyYJNmeNlVvoefJ6xiozIFvzTZzmAbOXWnhieYPmRBMb+VpiDNJObttQ?= =?us-ascii?Q?F9K8wyArCQ8BW176KIRqSmY9/ExXXdOYb7pT54FuqeANEQaj8i6USM8fnQ6J?= =?us-ascii?Q?0iQRhgdS3vRcdreKhjhTclThzbfnXusQ0PHn3yZfp5EE8HKLNLa3seZ+mWH8?= =?us-ascii?Q?cH7aipeZgKza2ihaAiYcSsNcZhDMFZxYA9wUyOmGl02ExyNeuvFJe3tDJQcg?= =?us-ascii?Q?D55LMbDTzPN/XfgbtnbJLVBhokJdwMviVZL7LGHcdaA7N4T+f9upDKSRU7KJ?= =?us-ascii?Q?nElQ0mVfDeC/RSBLrTOsHfM3EueOJPJU9NPqAdHzoCIy35ph6nDcZTkHYaRb?= =?us-ascii?Q?oplLINBq3OSlLhdM04bdc94T5cthPUh4sd6lYCv/Hbw2c+Q6hSA+nXjVOtE1?= =?us-ascii?Q?gyrWGo4Zv1FetJnOi/Hgt5i6Mot8fGH5SZYe4sdSUCPzdAFCtZzQsx8vgqi5?= =?us-ascii?Q?78oF7A0u+EVYTOxEze25TqGHVlS4KGi6KWDmuBsDsssPxPA7vCSMAoUInZMd?= =?us-ascii?Q?Wt1FPPdAVQn2V3Tfi0IA5arUwAvmf+xdW2WD2o5SbME6UVVIReWJDPRVmlua?= =?us-ascii?Q?u701BtA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 6:y/gV/Q/Gone86ekMNnuQY71Hf/rTLlRksiomHc0IwEatZhOftN1syhpy3PQuPWjewwkc97zdhyjGUd4haeLNexnR862EKw2JVRY2qKVYLwBuVcQmUiQaO7Oh3dL36QY7SzMF+dFMxKFilkObSOKA/N2FeKpB1QiOJjy56WTsIxtgO/1dyl7QvkQJRV8mpZ1xrWKtosWB9rutXRZ/WKzRswo2EHx/OJgDA8ZGwoWZKJ92tOe7PSbg3NglDiyjSVpZvrUxVVevx94kY2QAIErpi9QYSeZsPDPLAkq4U3TBu1LvpE6mBCtMC/qtIRhaEQcZD0zJQIXFJEdUHSLEwoDdZga9OUZiPO3SU+LgYajj1YSo7D6iE/krsIB5OxhWCJM0GOyjMWVZJfop9PtXisIr/KICkyTAtDXDGKlWda89+GokrZYDwTdWoq/dyH+Y0AmC; 5:wm3GX50A8pcapHwG2SSUx5qMg9m92Xvj353X9l2O6nDy8Wpi8gLP9zml5LBwtiunFXmV7oSlTSWPZgPw0ay82An+1Qu+34PfFfVTouxEySquITa22rRZ2yFonVVHawZ7qjeb+WhjQfWtTQ9L90222kR/bHQcHGuyoE3UWUEnoi184p6gnSlVGIugi5lIHeU/; 24:HkgOi3LlAzuOHQPibEYH2EtD5ToUGCK8SvZDl7etxPhbTzBw11UlLhFC044oxHlAWCFEbpPVVQq7qJnEJ5PFDDIo9Sqr9iRIr6KpuDM9+IA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0746; 7:N8R/UTH2uYynRF+Spa0hP5uw7NiFjW1J0o6Fk6WDsfV2igGNvoW2DqNGBm97iKmrrW3kpumU+8MsnoY1n82WE+/B/c3/ZyjTzz8SnV8BzTgrqScQ5YbnXGVYhjrNAiJeq1rgIvPzZUA59pkOvT0hBGee2sAYZXGtlJP+m4yvRY3WnC9L6uodRkaER+1343R/JZJ3/rAmz5YvyhZrUFtss/qrGKC4aYGFkqVcJ9wlSikN1mPqhN7b5APlFp1s0X7jSChUJ/Y3dPhF8EAcOREds08yDU7SUoCkv7mPR46Ug5vmaOakHlQXuIrTsO2zmW7+qwwahLetaYMfKjQpsh7I0WvsTwu3F0zKwjsSBbyHInG7bLpKTfbJHHezQAN+xKUwAbVg9aTXW7EKKk3pz4mIA/D/UvgVHnJ9Sf6sCfV7P9zWQf6Qn9Fv3tALhrAIEOKb2IlNrIf2PDfR+KjXxRxmyQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2017 12:01:02.5430 (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: CY1PR0301MB0746 Subject: [dpdk-dev] [PATCHv6 15/33] drivers/common/dpaa2: 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: Mon, 23 Jan 2017 12:01:06 -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 | 3 + drivers/bus/fslmc/fslmc_vfio.c | 17 +- drivers/bus/fslmc/fslmc_vfio.h | 5 + drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 364 ++++++++++++++++++++++++++++ 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 77e0a1b..311e0e9 100644 --- a/drivers/bus/fslmc/Makefile +++ b/drivers/bus/fslmc/Makefile @@ -50,6 +50,7 @@ CFLAGS += "-Wno-strict-aliasing" CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc +CFLAGS += -I$(RTE_SDK)/drivers/common/dpaa2/qbman/include CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal # versioning export map @@ -65,10 +66,12 @@ 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 # library dependencies DEPDIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += lib/librte_common_dpaa2_qbman include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 0d4c0a2..2d7bcd9 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; @@ -409,9 +413,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..dd6de4c --- /dev/null +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -0,0 +1,364 @@ +/*- + * 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"); + 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); + 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 23aff2e..48d776e 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.02 { global: + dpaa2_affine_qbman_swp; dpbp_disable; dpbp_enable; dpbp_get_attributes; @@ -45,6 +46,7 @@ DPDK_17.02 { dpseci_open; dpseci_reset; dpseci_set_rx_queue; + per_lcore__dpaa2_io; rte_fslmc_driver_register; rte_fslmc_driver_unregister; rte_mcp_ptr_list; -- 1.9.1