From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0089.outbound.protection.outlook.com [104.47.32.89]) by dpdk.org (Postfix) with ESMTP id CE2D1CF80 for ; Tue, 11 Apr 2017 15:38:17 +0200 (CEST) Received: from DM5PR03CA0009.namprd03.prod.outlook.com (10.175.104.19) by CY1PR0301MB1290.namprd03.prod.outlook.com (10.161.213.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Tue, 11 Apr 2017 13:38:15 +0000 Received: from BN1BFFO11FD030.protection.gbl (2a01:111:f400:7c10::1:178) by DM5PR03CA0009.outlook.office365.com (2603:10b6:3:118::19) 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; Tue, 11 Apr 2017 13:38:15 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.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 BN1BFFO11FD030.mail.protection.outlook.com (10.58.144.93) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Tue, 11 Apr 2017 13:38:14 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v3BDbY38023442; Tue, 11 Apr 2017 06:38:11 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Tue, 11 Apr 2017 19:07:17 +0530 Message-ID: <1491917847-3935-12-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491917847-3935-1-git-send-email-hemant.agrawal@nxp.com> References: <1491917847-3935-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131363914951035529; (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)(39380400002)(39450400003)(39410400002)(39840400002)(39400400002)(39850400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(189998001)(77096006)(50986999)(97736004)(53936002)(8936002)(36756003)(76176999)(54906002)(104016004)(8656002)(50226002)(2906002)(105606002)(86362001)(85426001)(48376002)(551934003)(33646002)(110136004)(38730400002)(50466002)(356003)(2351001)(305945005)(106466001)(5003940100001)(47776003)(81166006)(4326008)(6916009)(8676002)(2950100002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1290; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD030; 1:X0PxiRRqi/+P0sSSglEld/oM5EsQbTSDzrdS29HA/ZGhSpAbeRIzczsMB6WmpK+YOzlKjkC+Z5vNEa9pca3uOt4/Td+gxVISBzR01/d3vHK4Q9TRJEzjjWtfDqoqWvq+dwX/I4lD+Ivjc0ULgtMwQ36nxwXNZpw6+NFLgfvvzerOlUyNzyLgzlhAB8IvyY2DCWZmfPGe6cq8HC4CSbf+afBfxqz88jedaF7Qew2yDHDjsxer0zswgiegFAUw8xibEC2G5EH52IMGSKoIUT9nZgeO20JCz7F4G0FQP/7AgDlBFx5+j7uCyyKX8SYyj6ufAeCWnZub8QmlMHYWGaWJ23IVHzCnerZHwcElnwMn8Ux4412XBNZcABdNqCLtPzmNJ29/mNn4Kxwv16JZA6ibz9A9AnoH64YVQQrrKkr4GpGWYoOvtRT7vriXBQsv5WdyZNWcZePSmKxDWog2QU/axUuC31HgMiYNRuLc0Y4WPpryX9OgQzlSPLoUhkTYAbYK6y/ooVxzawEPuvzBcI3HpDkAaiXEY1YAESN/F5nLYVK8uFJktJNMW6jZKgy21TdvKMrNzq97Hdkx8fh4knN3B8XfdrBeaHegr0N2OsuqCj7AmGAnavQDXkMItOBFPJ0xNqItSWsbguxdglnwWO/nZ3jy/V84YlGzhYkZYfyD61c= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: a187c372-7b30-4dd8-0a89-08d480e0016d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255120)(201703131430075)(201703131517081); SRVR:CY1PR0301MB1290; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 3:VcOsVKao9ChLzvsbiON0bTc9zYZ4WpxNmsTn4LwY1apBMnvE2lY5vIdxcB6TaQIw9+dqCmYcr6L+z6WXt077hmnC+d8Z5r0fQVtT+7yK6t0HgHsATBfRfk2fVeKzBo08TQ2qQfh84Ti6rhH/1GqmFvYPJwlMwtBCNBeg+g4NQeQ6cbVx2GG/wnXM0HZ0P9I7GMwrDL4PN4kN7FE9kqdd6+/TnukEtGMYOo2lT0mx05tv6sTAhyonewEAMsINBgje7QCfc2z9w/yvRg+B1o8uym5FzFppjl116Qtp0+v0czFrMlOytxMOuIgSinByGASc9FmBWS1IPyY6YaOsWw4yQK4ippxD7s24W7ZV9s6/CxrZXUiZR6759xZBdPwYQCEBe6OwVDQH1MBcw3ilFPRsYuss3HaYLicCxhkBYSKBUuX8qYgW2/kktr7z4IrMCO6r3QvFX9orcq6D+qRdG6/WaA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 25:h/1jMqUDYfDEdqRN+mdqHDAX1ZPhsgWZVHGkhT8VUwYGmbPk8evnEp1jsylcBdE2skWLOxCp65eLU1xCgBoHQHug9j4boBSfmykgTY3Tv5sYJcdhQH4ryELQAp18Lbcm4piTgobrBe+tA3cgPhfcSCSBwYSD8Dn22eYFc6BOM1gxe/5Vqog6aTarE5LaiwrpO2VPHXsbA+5O8At9SKUJFwJGLAKHQC7RXyEKppGt1iGrfW1MyOahVD080baGifYQWffEufNu9X4IJyhaZy6IP1bMcp1s3u75cd3TsBodAsyXWfU+MGGrSwSIFx5RuQ/12fD6NGRmwIUtKGqdp/yKW9iy6bg1bVap1OdNH9bUG9Vyj9Z74kNYCA5mM2xKA5RMitSXTR2zzQ4RVgqzxsIS6hkJUDjBaObwyaDVcREKe4wriftzUPVycwLdSQUtK4CyD4pHMJeYzE+pS9bAX8gjdQ==; 31:1n76uL1EACW7GaBfQH3LdNp9XpWK1XW3r+XysUcxxIeo62glm0tbxSabtDiK1bI3qB9yh+EVi/y59ppTyDWgsjfg9oOGM3eaNm/aExGaoRYrlr9VM+d8EtkeIIfdsTZZEqk+0SMAAoScev8gHfNwTi4Ferih+9sHoQ2+sLEwXnWNeedmvBafBpEG1BI+S7xM97a09D+agygfx9KjsSNdkxWSFjNkhJiHIfT72DLqfbmix+7J5FvE2H7RhEy23WWedxEBjV/vQryBjjyAclY2v5uCwqeJK8i/YpMCXhSRKCU= 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)(13024025)(13023025)(13018025)(13015025)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703161259108)(20161123563025)(20161123561025)(20161123565025)(20161123556025); SRVR:CY1PR0301MB1290; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1290; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 4:HC6lnuWu/RpAMQtxCu12zXVDPZopi2bWmBkoPWHxMZ5gROq2bzoPEBL8u6uWZFfsZhMW9wmVALkpcq5bwD6ERkIletO30j1+8vIBbtPpkKOxJdRIf4G3I4SZ5EMM97p3dqjwhvOoXvlhXzudTF1x/jgyumKlZl0stAsU8KgZdarBxQ0VanKs0U2Veat2uIc/Zasx1BKxvFQTLJkKwbNHj80FY7JAvdgKG3oPI0V6vpzNhPx1AIV/6k//57a4ZkrM0BXgpAMxEepc0NIQGddG3hoDkL6sWhctImB04GcrQHkGxBjQo1jJFk/QWMomuAwro0o7eogFgmCTGl6LS3vTKYaVJAWXIe9ErbX2baBnsM16Ocsdp7Pp7xnU8k5bsLEk9rKMOmawjY1Kx0KeoksEcdPln4OhKtR0M89dGVzG9KV0p67JxDw40DiNKBQF687PEGouo9OYOJ6mx0suk8o86hNiWIvPjCZMLNUg1gAu0eoSSkpC8bP8szpwr2R/QL8gEzJh8BgU65yx2yLCsMPYAYqFB7tNtKTkrRQRo+nszQiv56vs4GOKRyLArP41X6nX05eH2D9zt0tncX4JZMEY+Vp7jNRJHdnvtyvgnZTmVHpLOrMsNatudg+lBgW2Dgg3nlxYmh0029sp/UsvOtGYeYMFq/SIwfnYI879ODTYFwM/o8vB5kwohWlQrXOZmd821xf9KRdtAeINQEFJ+AaEWJJI7DiidjvxuonauQA861R7+ryr58mJHT9GmoRnCn0thPntxghfmrl6Es4IFjc03CzKdAuwhW6bhE2atYp7bSnvw5aMgEJkCVCNQObobwtfNUPFYkaqv+3nftIPzL3RKLLmicmO4MRv0lwwdt7D7MTQI6kaLSRTEGX/WquT16fqHgTxRd0Lvv6rSY+IKVjBd5vT63uYx/Cuk31mCmO3NBs= X-Forefront-PRVS: 0274272F87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1290; 23:ymFTXmgaz5IhySpSMwRBlsF5t5qL1lLoICxrwW3?= =?us-ascii?Q?EuN7blgCsrYXPIPJAhAFak6IV11HHf4U6lbbYDn10nmVQ2eFx9Cij8uSQ54K?= =?us-ascii?Q?h2m5ws6v7PWE1ARTB0H8v7T/qsqEBgomJ0dqaNM6MbKBk+zsHecUMvu+xCuG?= =?us-ascii?Q?94f6jY/J67hCBhdT2YhMMp+6wg5L6gKQ42Nx19hNoOO4jvHedggb0Pu7CFA/?= =?us-ascii?Q?dx66I61DropaZwiQ2eGKQw2BWLcxMSw7HPQO4I30pgfGeAqIS1nlgVn7YH0z?= =?us-ascii?Q?PnxbjNC+C2Py1qqE70w5+giqPDWUF4Ti39nB6+iRKKjw0rMZuwXpKooZvfB/?= =?us-ascii?Q?6dSEJ7sf6AZL42HR5bwiSSBXhrkKDeJN98Ei5ezcP4TXxuz89ECdGJL2ShmF?= =?us-ascii?Q?fKrYdGA3A4zqNerVUK7qLWFagCe4LRabvf8MlGjeLfyo99PRHNI/QUKZy5gt?= =?us-ascii?Q?Gb3TWqfb0firogTNcayRwYhTleS/Lm0RE46JgYDATcNTyRukVrIrIU9ZUKa3?= =?us-ascii?Q?JlTGybLoBSofJxBEU5kH41Aifvdb0zEABe2hYzIy67c3GLfZTmIVHH3xhdf9?= =?us-ascii?Q?TrXGOrbv5PNYn0H33rciAU613IUFO4kdq3m8ENZPIa0I+FIMaNlpDaWloA56?= =?us-ascii?Q?/F/Q5zljMg5fdGAM8mRg56d3TzCBZT1p3fnSOv3OqMVuV8X/eiwNhQprj4r/?= =?us-ascii?Q?I+Abn050zdvgrwGgKyr6QQC6L3IBgKDrH8juOEJDatoEnWbcKnzw09xAZUHa?= =?us-ascii?Q?3ShE8F5UKgvnpJf0e+8/X7ZKIAuqDIL+i6koIY9A4c9LRH9eRG5LW+jOSery?= =?us-ascii?Q?JxwK7YiGG+KXe68BiaGruV+WqmYJj71FOxYMl9Qblk4vUK3a8g3KAt68I21C?= =?us-ascii?Q?CXd4+mABsIFREeqWOrIISZKSBILuDutFN6PY0NemCiszlbyW6pDny1TXk4oP?= =?us-ascii?Q?OsR9597kaOYUiXNfV1XqG24d/ZDk+8kPZcj55fi57Fe2uxgChTvmZZWf1A25?= =?us-ascii?Q?RU4nmp9oxI3XXiLC6v+aW41x6Ff3WC/xUo8JWV5mrl1AA91TsgCTOYpgIFcm?= =?us-ascii?Q?kh24TNPJN0OR5POyCN+DznJRwQN2+tHe0KUqYX2vGmdNKmz/Htyy969bQ8y9?= =?us-ascii?Q?Pd37Ilw3n0H10qwoflMfEHV//8G5Mu2HxVzXtURu7pIrxovmg+086Uz2Lkxf?= =?us-ascii?Q?3Yr5iuPu+BUcJdM2CpjjhD8nmyhC/woZV0XTq1RSK45krYmhIiAsrNif+aWV?= =?us-ascii?Q?VMhXVXVYxC08spDozoa8=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 6:v35FPzn9dhxmGKT7nIydfp5meaKpNrY/oxOVMr8FejkB4U1yUEggL7PkE4bAevuTPOseHFKluG9QbTKo72UYVTUvpcPNXhQr5YX+YwPwBNGcY2UMj/ldddEo6/SXdxj9bpRgqrLnHMO5u0tpewEhJFlpyw0S/sM9aUj2C7lLlNvTtBtP6dNZLeYAj0y+GgboC3C/NEdDWCFHXRK0XSdNP32ye0IABMlQDgaG0/DiHKPQh6n9T2bqMTDumhZbJ1JgekcSYMXWoBYAfrjnpyIku0VEZXY2DaKk0L3HD53YpIBq29Oej3gW7n8jtDRNdLdOlYg7FiLrbnC4zs6B/dQrx1GLRXtF4vyoJgVfc7W+TXANCYipjLvotHcXk7JSBLpy95YGpjaX/R7rO2I2zjQlZsKN8ouGRnevkQpmbvtjnnCDrB4W+7lBvdHqHxrB3GwGv0XphHG0NOnHL3lAZRIGpA==; 5:aiG6ELzRqQOMuzS1tpNWtNhzgWBCLFmCIQ5/ULhsvMDOf4Y//NrJ+OWbz/OePzHQI2xPBlXTEbrCV5Yej+LzRj66zRx9bbIO+TWAsHjQ2sLUdSBmXq0XI2M8ZtYkvvNy6mRpkpg7mxqgPwhgMu1bzVf/QZc8Xo34KUhx/4wRI+cZhb1JwJKDpFl7eHv0wfrZ; 24:hVNMixQ7IT3Qr0oI2OMGD3F+ETlb2JBxdQENFZgTSSAAUwbuOje3NlbnPDVvFgJSO9TuRuOAltO9Ols2Zov1IOlQIIidE6hhKP/gctDaNng= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1290; 7:0NTeaXHs/8JTjC3HOkPtvPS2CnvUkyyXCVcuJ/tlL7N5B8myvhKwn/mU14DMCTLwYz3kpFP9P5XKAC/ia7EDI0Z8PQHrnIcj3MTcPk4gQYJYvaRMkgqpe8NplsWmydoyp1BsKOmSFml5OOIXmqYYwf5xDvFnQuKU1AkbmxMPKoI4JrVl5jKeT5GtQrfS7zaIoHVH/arju/ca/+cbFXEUJ9qunsIkCSstYBkJ+9HqW6n09Q5OmirTp0eILHIQMh9v6kdqhH1VbHNpIy8yB5gObyCU0TPJdjRpaatZFBmK2yFWD+HLsItHFjx9F2mxELonRYOP0Hjhi6RSfSVY7cMytQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2017 13:38:14.9163 (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: CY1PR0301MB1290 Subject: [dpdk-dev] [PATCH v4 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: Tue, 11 Apr 2017 13:38:18 -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 | 368 ++++++++++++++++++++++++++++ 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, 520 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 b99a4f0..00572d7 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..16313cc --- /dev/null +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -0,0 +1,368 @@ +/*- + * 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"); + 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->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"); + free(dpio_dev); + 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; -- 1.9.1