From patchwork Tue Jan 31 08:07:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Savolainen X-Patchwork-Id: 92954 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1817358qgi; Tue, 31 Jan 2017 00:16:15 -0800 (PST) X-Received: by 10.55.80.136 with SMTP id e130mr14992225qkb.52.1485850575137; Tue, 31 Jan 2017 00:16:15 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n63si11453183qka.173.2017.01.31.00.16.14; Tue, 31 Jan 2017 00:16:15 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B97D160C2A; Tue, 31 Jan 2017 08:16:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4CF8062DAA; Tue, 31 Jan 2017 08:08:44 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 52FCD60C43; Tue, 31 Jan 2017 08:07:59 +0000 (UTC) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0111.outbound.protection.outlook.com [104.47.1.111]) by lists.linaro.org (Postfix) with ESMTPS id 300DF608AB for ; Tue, 31 Jan 2017 08:07:52 +0000 (UTC) Received: from VI1PR07CA0123.eurprd07.prod.outlook.com (10.165.229.177) by VI1PR07MB0815.eurprd07.prod.outlook.com (10.161.107.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.5; Tue, 31 Jan 2017 08:07:50 +0000 Received: from DB3FFO11FD020.protection.gbl (2a01:111:f400:7e04::122) by VI1PR07CA0123.outlook.office365.com (2a01:111:e400:7a52::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.874.6 via Frontend Transport; Tue, 31 Jan 2017 08:07:50 +0000 Received-SPF: SoftFail (protection.outlook.com: domain of transitioning linaro.org discourages use of 131.228.2.35 as permitted sender) Received: from hybrid2.ext.net.nokia.com (131.228.2.35) by DB3FFO11FD020.mail.protection.outlook.com (10.47.217.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.874.2 via Frontend Transport; Tue, 31 Jan 2017 08:07:49 +0000 Received: from fihe3nok1346.nsn-intra.net (10.158.36.134) by fihe3nok1346.nsn-intra.net (10.158.36.134) with Microsoft SMTP Server (TLS) id 15.1.466.34; Tue, 31 Jan 2017 10:07:46 +0200 Received: from mailrelay.int.nokia.com (10.130.128.21) by fihe3nok1346.nsn-intra.net (10.158.36.134) with Microsoft SMTP Server (TLS) id 15.1.466.34 via Frontend Transport; Tue, 31 Jan 2017 10:07:46 +0200 Received: from fihe3nok0734.emea.nsn-net.net (localhost [127.0.0.1]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v0V87QUg032672 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 31 Jan 2017 10:07:26 +0200 Received: from 10.144.19.15 ([10.144.104.219]) by fihe3nok0734.emea.nsn-net.net (8.14.9/8.14.5) with ESMTP id v0V87Qas032638 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Tue, 31 Jan 2017 10:07:26 +0200 X-HPESVCS-Source-Ip: 10.144.104.219 From: Petri Savolainen To: Date: Tue, 31 Jan 2017 10:07:25 +0200 Message-ID: <1485850046-28457-8-git-send-email-petri.savolainen@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1485850046-28457-1-git-send-email-petri.savolainen@linaro.org> References: <1485850046-28457-1-git-send-email-petri.savolainen@linaro.org> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.35; IPV:NLI; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(7916002)(39860400002)(39840400002)(39850400002)(39450400003)(39410400002)(2980300002)(199003)(189002)(5660300001)(5003940100001)(107886002)(6916009)(22756006)(2950100002)(33646002)(110136003)(50466002)(626004)(2906002)(68736007)(189998001)(77096006)(48376002)(5890100001)(38730400001)(50226002)(92566002)(450100001)(50986999)(81156014)(2351001)(86362001)(356003)(8936002)(53936002)(305945005)(97736004)(105596002)(106466001)(81166006)(36756003)(8676002)(47776003)(76176999); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR07MB0815; H:hybrid2.ext.net.nokia.com; FPR:; SPF:SoftFail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB3FFO11FD020; 1:CBxw1VBX6f65/dQ2fA8GkxBck+bOr4b3oH4j7/Np2XitAiei+89RqymV2G8rVdYQD5/pKseiU3cxF/hKe7BA9BSt42kLIn9eCeyiPxp8PCKsonAPKhLC6u6UsKlzfq8SwUojNzxzxNnqfsaQpak55505++1cFrlhk2VRqHAdg6JboLyeWn8qFI3beklSbeiqPbibq6Jd1VDffGqg0DrrhD74l1D/rvkMEO21yPeDBhxjvrrvdqVl4gUKVVcZb3bJylG2EB6g0ou2HKv/AiAGUfY/OryOWgzjrTKs4KKYqGwhZAZTQpJI7+LobcmEEH55TEy6nx9eGQr282qCvxDncncQeXuvkHf7qj4x27DuEshZ6FizHuf1mEtwPgOzhDlgdGBgzHX0N40VzKG3nI0KTVa8PMNqnF4sBtFuX0XUY2FjT8LQHDtpn6MS8U4d+pc0F5nSZcEmy9zMzcKjweTMtA== X-MS-Office365-Filtering-Correlation-Id: fedde468-7aaa-4441-d548-08d449b03fd1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:VI1PR07MB0815; X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0815; 3:MoHhtvcSrHnhWv4hLSO9tO0wvS2jOXEbSY+q3jN2KK2jlsWoEvE7LBJ12EVtFV0rGpPtriJf9Q4lHcnh+BipNYjxD6hpaNIr4vJ8Xzz6Erhqh0BoYxl0dKCBE2ydt3LdFpTjGJ4KGT5GM8ZAm9tqb7JlcayN5BDeQtxiBCBChU7am4g/k0ktI5ANRnBDx+sZY+DsRlUHCiEYucRAdnNfXU9l2AL2Wb2NURIkzMZVfhmjzywuPJ7gqfgEpIt2AIOjB1lk5nFMVQEcBTrbm/3y+KD3a5JZibXHDbTxT75lAPG3+Gw0FDc8Jzty89Zo/NMNSiWC33MvPL8UapInKFLN+mEG0RmpMkRnyFcdL2c9nA8= X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0815; 25:SUwEhsQF3fteL7jZFRtBgkZNdWwwSdZvG0uFdFbobh9Tc9RJZAdebxvPremCG5r0OWPyD6dXOXkfU22Iobe7KG6eW7WZ2zF57bFjdl5u3dHAJ4LP8pw0h4RwcopDJvA8OXypbZgSO0cSus8gnGRwsng1y8h66cSiHh6qrygqSdEDISqPvV/D5CslcXbY39OCX3+71BGt0XHNXss6uqQzEYlZ+XhAqiNaa2QJ0/nOQ5KtNsb5pEmzDEswKWVvGf0ykkQyo2GKBp9oWdVeru4HnM9MaNCN2PNgegBSqWq2tuRJIF/ZL4QQq+nRTNERqWAIJ3PYyFEjVHJHCED+sRVSjEB/AzJp63dYrl9tBBYJBaSqLW6t2oL6tOufPKX4NsGA+BfInE4iHikOVICcLW59fNxBq2vH9CJ2JWBNto1I7AQKhzEDszu9HnV5NuKJvzc0FQeDtfbLmLLcZWURLNuOZ2jEna5KLmcwO7MFZ2Plkaet3MuvBstxzwGnrXgP5yXcy+wxxgc7z81qko1LCH+AQSDUYKbBKbd2Ewu3+11qz3oDszzz5dQJ5GLfx8MFPftkz1NgNGvqAuQsMXfm9f+nOtPUUnsaQZ9nt23q+NIcvrNR3MDu7JuqS+BligUOyaNa4BoBE8OjH7KYC+dK8vVfiIpIMdKRprEL8fJKikuEZW/5M7VFWGbTVn6TQ3ZQkumhd0wq/OVrYtWbUr582SYViUbDZQOfPRC1uoN5Y7hJPkvr94vUxwbIuwOV7sbHjmDxDby2RCQ6mS2vc21nrA7cjw== X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0815; 31:sFwlhXwTWB1cz/jWNNO3sgLnOyx8yF7j+GkiZD7UqJgAWFInXoDNyCxDuHOPy4/Z+iWpq8hpMVyB7rGNgnnpF+qnl1TsWG2sybUuq6UuZ7JG8SoNvqmLnAFmqQ7KNS6gEw2+frpNPwkASvErZ5mVsMTHnSEpJ3y/SlmItd7FRc3h/9b4aCcrpLEGI0nzFG3ZcKMrj1n7Cm3HU1dZhxs0quWogqS6pZJia28ypgQTOhuKvT9yG54Bi14gS7ueXB27UJuRupg+27EPy38C+a5bfIYUS1jXtARaesLZkQTNqEk=; 20:AWZinKDqKfrtP3YgI1GPa/j0G29Qc4aLdP1i0GMY/5DW0+xdTewtLy/NnXBWXh0ZvbqLhgVby2rOs5eQLDAaBPrEpFptLzQ+ecOt63q3zUvP0/a1KBSpWKAfaNuKcG2dCoxl2rPnV82TBAuUn7VN8VDb6T6Te2nsd72qVjzcO8q2GJC3Mv6zhiCk98ESMsVVXn3hEwI9lUBrR+crTVkTAmUNHmmQZGnLUJgZCJNQBPBolQmdnyPTmDkyoqufNK0ntkLGzvAuFMTELQeitNs5/eYkBzIknG8QVhGhWX6Rao3pqMIQXqINgMZ+hQhLoXwXT5WAq+PWBt4W78yOb87fj7L+7RZ8pzZxnyYRjzssCLdmpRj0rpW5D6z3g1Es6CqpxpYDO/+xxJfVhuTsun1rkWhWCAr9ImqR/oeDDeGNdYwEpjUpgHkBx0TTJGmLSdGFEcm1I3lRVsok0KOUWK6nOTlwAuo+RXPez2at8CuiglK3y5IbngaXC17z1MTtXPlps+mWG0hskEAXJwnjtn3TZR1Nqmuw9h7Y5yBnWuOsKFltroaAmHEZZ6+cblgxGETL1FTQAchKP1hDoQx4/SteV8Qxxw+EjEtoBt8ft9MlB24= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(13018025)(13016025)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123562025)(20161123560025)(20161123564025)(20161123558021)(6072148); SRVR:VI1PR07MB0815; BCL:0; PCL:0; RULEID:; SRVR:VI1PR07MB0815; X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0815; 4:3Yx4OgBxsF627LignpPpKGngJ6o9Tf3iTM6NY4B4jEpHg10yNxx9gd+UchDNZD4yz8bB6CcjDQaYjBwcZOzInrq/EGTXrDHntovHjp8sLmfk2cby/zZG5TDWrN/tb9XGLmIkPSIapUy/LtqtIcp9yURgiS7DRZeLpo150TiRSi5R+tawMyWHjVOF6QV2RpOjE1ObIbudshrSDET5pKRZAGrzSb/+dQDva6ItzGnC1HVNeRCp8+3hUXs4wwX1jJuyt3Xsg0mLKOIURa8yRfgvBdpRpNyrrGUKgt8j1vzGqR9KYp9f8qd1ooG8AyvWQSxiKqEGteo7YNwapmds6+836k2/GiL4IP715EsRbC+dNw1X47dApm/I7FKbkYTECZwfLEY7a4DP+7pGUcIGFwCJ4z4/ywgsOGDhCTbTq85hNMU5dBYz+AXLx/OMD+C6pnpZXCKMauVhklvvthxIxz49Lif6GG5NitXIJVu3bp1jILKvCahv5yUCzyYtapRIzXQjaJo5fe1/SEPzn34B/CjjNLmNtEk8lLjQzwaon6RB9YBiMevXUH0p6ZafISrTWhaf7GlpfcMZVty6al8tur6dAJl1MRJjalHj/y43hHnGQBQ/ICW3WgnLgX/lcq6kYLmKJpTHqbpk+7WkLAs+u2x3NSH7LedB0VZfkLC5g4TaFYY= X-Forefront-PRVS: 0204F0BDE2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR07MB0815; 23:b52RyurDR1AIO4LL+wyq2O7975aQPCOAOVTqvd2Km?= xxTBnRAVE1raBDTo4PK8EPnS6jBC/JkvYEoPEsPySqxVbL9I50tcKJv5uuaHSAMA962uyEOebmcUkpr11fUJZwdNSws7wseOdCyfj3g/5JmDLAkEVtqdzbi/xUzAGgxKEwljo+EKrSxTc1yXvkDomteaDXhmo+PuX2Km51YRDOqFfDNUuypAEUSWWgdCTf4JycDpqR/+wZXGWOZVt+erfQiHd2OmrMq1x/XRuqAPppkjS77NAR2vbx9uEqBp1pVzMrCDkacUCQG9UbYz1Z5ZxjyUZG9ILtgz3weH/LKVE7AOTNYl9aqxq8cYTvviIaxUF58UniNeEe30ec2pVBJi4IKX5silL1moCa0wkKhpjvzqAYcye5U81tR+/gcFL1ItZf7xIZLTlkVVlc9eMsTcs3UqvnbrKOWiKEyHrmEzXaqf/6CzoRwOWKy77lWJRAupHu+/CXkK6/R3+SvM8u0VXOoI1kjziqLupnW/3RaFAFvY/TIlBP6bUQM/Nb802BTr9FrrgcvaC7pUafsBg/J0xdJpRHlcrq3WkAKTqItbWCHfZUdYw4HRo9Mvpmj6HIYPApuIcem2F8SXV+l9LEsInyL2uNLWadN/yeDxXAWEGZ+52UBADJcoil0gPW7Qpfb8pD49I1hz4sz8U3RyJz5VY4iOHUB2o60ALrlNyfNnNoNXkLQXOdiMwYWTAa3xVyN+RhOUb5zdtxlOq0x6ERcHhYVcUmZ9N6fUg12eg9F5GSdV6TFEUefUsh2E1wyxlf0xY+kr3FK+jNIvtBtNO8kl2TKuMDXSnu4cbw2Db5jmVpACRYHcX/EaWa5Fwry4XDfSf4c7rA0d4SuMqhvrOCR63KMwUTrRAH0AnV76/LhUFLF44eDppxhDMSt7TnI7L0vhAgHmsH/9tp82DsaWpmKETyeTm/SRPK+e/gnarnZqEPW5ue5xwz7KhqoAIs3wmjZdKUDwSVqcKHpTSrGxU8d3Sh23TmkENOzZM07nRhgfbJVKRGzEHW3sIkWOezbqTChgRNCsoaDtvvJh2sn9MB2bFa9qUzgA4kx4RxdGxkHVY+4xB4ML+SbnObOupoxR9f/v4GYmjrtY1XH7eHiIVODhTVd X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0815; 6:IgDBi22NZeMIgXEbbXQjTOTnRUP/O/ePizVuY8JMUSYIjWkqeOF6TjkJ+8JrsUTfwe05jn+P/AakkEvj0QB0S7CHMoASykJRaOIcB80QsQNRouBmGXFCQrCfrc7gKAf6lk9oaPm3RNUVYhPtbduq5lBZouHRuMrwAdi4ZTuZ/Mh7WehFiAp1fqFX2+huOx9xvEmjjySCqlWLQVmNgBJcYByKr7JiHwCR8VbZ+chsI+crNHPJuaFv03rszIAmiNbY9UHmDZcI3om/vgh1olObjDiDbf0l2ztt31YyGMx1MT8WraMqsvRqDADeCtuJPEtIK+4/CAgM9asVAv8LUcxyUJTKnnqaeR2QJ11zeAiUPuJcgmZfCQLWfMJBgDC5HGq612mMTqBYACD6U8F1d4fBgyM6dRkHDw638gNFjlqhMwcIuTOXPTEr8ArRoUZyqKk/; 5:XKT+XoIUMSJalp3IeW+4/i3HBFirU5JbtZtOpWfHU0RwYvVlTfSck8FYu3KpkRj0BObPOlBcdhRvTDiqYOTus4yUM33YR9NsDnPqFq5aZHCN8SnluO6SseiAn0ceUEKGqwQ+rJAzkAMHYFKr5kW7LQ==; 24:yF5pYR8lBFTWifV5uDQFPAEM+SFeU6QI2dxSMNdrbkc7Yy6TPY0R/yIDuLq+GIrD1eFE9ChO3rKi6JmTkdZn5dkO9EMqYQwYAlXlnYXUrvM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB0815; 7:E49qkfdEKRUfAUz8wLuYuV0QKR0539IJmRh9lfKShf9rWOR7vO/w6pYgg60QmBGGdMATicz4yNiyzrhV5mw04AksOWZO7j851+bOi91hTe/E6YF2CTI9OP9hEY+e6oZVMKmxqyIBl95Zu3QwcyJz7OqIgGr6wFwCAcvgfsxxTX+OYCoC/0IZw6XnjZMdpzGqIi2Aj0siqekw6jbBWuFV7KBDcSJ0JZyTKS6/KN3i0VJK5GIte53NXm+EY19IAoCAAfGViCLV5vLcaScuCROAu+Y0mUZKfGUJbJkOlYGrvZ/qnC+KAFHWO5YFK4SE7QlTLqdFF23PiWBbESsLpqutorPYKUV4fvrRtND9a3DToRzsqMgiQXhTBI0d8LOWFXkA8szxXN/i/WiqhIgu/TP/ZmPTiH3AWZBQfFCauJl3+ZSq70tBDMB7sjfms1ZO91Uk4mPmPIOdsyBzEoiCn9nGPIpWYFq1DrwW0To1Bl0QtDLuqMqTKhlTOLieVjup2NnQhARjVqo9DY5umxg37dU/MDLC3FvkwQvA/ocJHs2oLY1FQrv7E3iPvLewaIDPpKqB X-OriginatorOrg: nokia.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2017 08:07:49.8154 (UTC) X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.35]; Helo=[hybrid2.ext.net.nokia.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB0815 Subject: [lng-odp] [PATCH v4 7/8] abi: queue: added initial definitions X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Initially, use the same default ABI file for all architectures. Default values match those defined in odp-linux implementation to minimize changes in this phase. Removed an unused type definition, documentation of that need to be still removed for API spec. Moved a TM specific define into TM source file. Signed-off-by: Petri Savolainen --- include/odp/arch/arm32-linux/odp/api/abi/queue.h | 7 +++++ include/odp/arch/arm64-linux/odp/api/abi/queue.h | 7 +++++ include/odp/arch/default/api/abi/queue.h | 35 ++++++++++++++++++++++ include/odp/arch/mips64-linux/odp/api/abi/queue.h | 7 +++++ include/odp/arch/power64-linux/odp/api/abi/queue.h | 7 +++++ include/odp/arch/x86_32-linux/odp/api/abi/queue.h | 7 +++++ include/odp/arch/x86_64-linux/odp/api/abi/queue.h | 7 +++++ platform/Makefile.inc | 6 ++-- .../include/odp/api/plat/queue_types.h | 25 +++++----------- platform/linux-generic/include/odp/api/queue.h | 4 +++ .../include/odp_classification_datamodel.h | 1 - platform/linux-generic/odp_queue.c | 5 ++++ platform/linux-generic/odp_traffic_mngr.c | 5 +++- 13 files changed, 102 insertions(+), 21 deletions(-) create mode 100644 include/odp/arch/arm32-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/arm64-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/default/api/abi/queue.h create mode 100644 include/odp/arch/mips64-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/power64-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/x86_32-linux/odp/api/abi/queue.h create mode 100644 include/odp/arch/x86_64-linux/odp/api/abi/queue.h -- 2.8.1 diff --git a/include/odp/arch/arm32-linux/odp/api/abi/queue.h b/include/odp/arch/arm32-linux/odp/api/abi/queue.h new file mode 100644 index 0000000..6027cee --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/arm64-linux/odp/api/abi/queue.h b/include/odp/arch/arm64-linux/odp/api/abi/queue.h new file mode 100644 index 0000000..6027cee --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/default/api/abi/queue.h b/include/odp/arch/default/api/abi/queue.h new file mode 100644 index 0000000..378b069 --- /dev/null +++ b/include/odp/arch/default/api/abi/queue.h @@ -0,0 +1,35 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_ABI_QUEUE_H_ +#define ODP_ABI_QUEUE_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** @internal Dummy type for strong typing */ +typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_queue_t; + +/** @ingroup odp_queue + * @{ + */ + +typedef _odp_abi_queue_t *odp_queue_t; + +#define ODP_QUEUE_INVALID ((odp_queue_t)0) + +#define ODP_QUEUE_NAME_LEN 32 + +/** + * @} + */ + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/mips64-linux/odp/api/abi/queue.h b/include/odp/arch/mips64-linux/odp/api/abi/queue.h new file mode 100644 index 0000000..6027cee --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/power64-linux/odp/api/abi/queue.h b/include/odp/arch/power64-linux/odp/api/abi/queue.h new file mode 100644 index 0000000..6027cee --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h new file mode 100644 index 0000000..6027cee --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h new file mode 100644 index 0000000..6027cee --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include diff --git a/platform/Makefile.inc b/platform/Makefile.inc index deeebff..3201d33 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -67,7 +67,8 @@ odpapiabidefaultinclude_HEADERS = \ $(top_srcdir)/include/odp/arch/default/api/abi/crypto.h \ $(top_srcdir)/include/odp/arch/default/api/abi/event.h \ $(top_srcdir)/include/odp/arch/default/api/abi/packet.h \ - $(top_srcdir)/include/odp/arch/default/api/abi/pool.h + $(top_srcdir)/include/odp/arch/default/api/abi/pool.h \ + $(top_srcdir)/include/odp/arch/default/api/abi/queue.h odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi odpapiabiarchinclude_HEADERS = \ @@ -76,7 +77,8 @@ odpapiabiarchinclude_HEADERS = \ $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/crypto.h \ $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/event.h \ $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/packet.h \ - $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/pool.h + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/pool.h \ + $(top_srcdir)/include/odp/arch/@ARCH_ABI@/odp/api/abi/queue.h EXTRA_DIST = \ arch/arm/odp/api/cpu_arch.h \ diff --git a/platform/linux-generic/include/odp/api/plat/queue_types.h b/platform/linux-generic/include/odp/api/plat/queue_types.h index 1569f5d..1561e22 100644 --- a/platform/linux-generic/include/odp/api/plat/queue_types.h +++ b/platform/linux-generic/include/odp/api/plat/queue_types.h @@ -17,39 +17,30 @@ extern "C" { #endif +#include +#if ODP_ABI_COMPAT == 1 +#include +#else + #include #include -/** @addtogroup odp_queue ODP QUEUE - * Macros and operation on a queue. +/** @ingroup odp_queue * @{ */ typedef ODP_HANDLE_T(odp_queue_t); -typedef ODP_HANDLE_T(odp_queue_group_t); - #define ODP_QUEUE_INVALID _odp_cast_scalar(odp_queue_t, 0) #define ODP_QUEUE_NAME_LEN 32 /** - * @def ODP_QUEUE_TYPE_TM - * Traffic manager queue - * @note Internal to the implementation -- not part of queue type API - */ -#define ODP_QUEUE_TYPE_TM 4 - -/** Get printable format of odp_queue_t */ -static inline uint64_t odp_queue_to_u64(odp_queue_t hdl) -{ - return _odp_pri(hdl); -} - -/** * @} */ +#endif + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/include/odp/api/queue.h b/platform/linux-generic/include/odp/api/queue.h index a5cf873..adceafb 100644 --- a/platform/linux-generic/include/odp/api/queue.h +++ b/platform/linux-generic/include/odp/api/queue.h @@ -27,6 +27,10 @@ extern "C" { * @{ */ +/* REMOVE FROM API SPEC. Typedef needed only for suppressing Doxygen + * warning. */ +typedef void odp_queue_group_t; + /** * @} */ diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h index d5382f3..37aff9f 100644 --- a/platform/linux-generic/include/odp_classification_datamodel.h +++ b/platform/linux-generic/include/odp_classification_datamodel.h @@ -82,7 +82,6 @@ struct cos_s { union cos_u *linked_cos[ODP_PMR_PER_COS_MAX]; /* Chained CoS with PMR*/ uint32_t valid; /* validity Flag */ odp_cls_drop_t drop_policy; /* Associated Drop Policy */ - odp_queue_group_t queue_group; /* Associated Queue Group */ size_t headroom; /* Headroom for this CoS */ odp_spinlock_t lock; /* cos lock */ odp_atomic_u32_t num_rule; /* num of PMRs attached with this CoS */ diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c index aafe567..3975405 100644 --- a/platform/linux-generic/odp_queue.c +++ b/platform/linux-generic/odp_queue.c @@ -756,3 +756,8 @@ int sched_cb_queue_empty(uint32_t queue_index) return ret; } + +uint64_t odp_queue_to_u64(odp_queue_t hdl) +{ + return _odp_pri(hdl); +} diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 9dc3a86..309f237 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -37,6 +37,9 @@ static const pkt_desc_t EMPTY_PKT_DESC = { .word = 0 }; #define MAX_PRIORITIES ODP_TM_MAX_PRIORITIES #define NUM_SHAPER_COLORS ODP_NUM_SHAPER_COLORS +/* Traffic manager queue */ +#define QUEUE_TYPE_TM 4 + static tm_prop_t basic_prop_tbl[MAX_PRIORITIES][NUM_SHAPER_COLORS] = { [0] = { [ODP_TM_SHAPER_GREEN] = { 0, DECR_BOTH }, @@ -3915,7 +3918,7 @@ odp_tm_queue_t odp_tm_queue_create(odp_tm_t odp_tm, tm_queue_obj->pkt = ODP_PACKET_INVALID; odp_ticketlock_init(&tm_wred_node->tm_wred_node_lock); - tm_queue_obj->tm_qentry.s.type = ODP_QUEUE_TYPE_TM; + tm_queue_obj->tm_qentry.s.type = QUEUE_TYPE_TM; tm_queue_obj->tm_qentry.s.enqueue = queue_tm_reenq; tm_queue_obj->tm_qentry.s.enqueue_multi = queue_tm_reenq_multi;