From patchwork Tue Feb 27 17:25:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129835 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp539566edc; Tue, 27 Feb 2018 09:27:43 -0800 (PST) X-Google-Smtp-Source: AG47ELsFgrPQbmfRQRWxt2hKhDFo95HrRF59307c48YoU6EZzmuWxbg72VvZxeFaHcv7AXI5Ydcz X-Received: by 10.28.13.138 with SMTP id 132mr11073684wmn.5.1519752463863; Tue, 27 Feb 2018 09:27:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519752463; cv=none; d=google.com; s=arc-20160816; b=EVUZeCNbPbDbECXC2Un+MGICfgOlLb67PKyVmDVy7wl8D1EVPW1qFt+rMbIBiaoTpa yOGrLLuBcdiNamdz6BLEJ5NE5M0Fn28WEIAS6UpPHZGOA5o6DHXpSb4txw1oeoEb05qQ fa6FaC/ujtDI50cXgwrlYbWNGd5zyrDkWIDzK84OhED/ZlnDwHzV1CHckx204dgxhObA rW8XY+oVovEWGWcp/5Vmgs2IlwaH8p2izYz22G4OAZT10j+DrmOsGcRfuisOLPpELxOu 3nQ00rUxLEDVtzErfX2MVvFJo8s75y3DTit3SaFSyT04UbTectYSnFkiF9hFEP0zQ1Sd 6Eig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=3xj0u3rvST7s4dAKqIyxYvEW4onZgtbg79jnTUJ37Qg=; b=jHWlGex4b6Qk5SW6U7alefWRbV2F38cHGC0jAJVD8cwnoxlTElZS7tqoO3YCBIFb8s /knEtccoFL/4fv1pdw2XgohX6DaJkDUMCTAqZiBsloMh2qd/ENdMMpOQXMjN7B5jzReO U8S1ILtG9FtCSBcsvuC5EXLhPjHuLprC3d7Zv1VI3y0RDaRRZcosQqUJM89gGtxKLNr7 Ztwg9xG50ka25v5/BnRNe0VsHksHtIXNXqEkZAN6zn25h1+6zduG4CUKzZTp1iMSxHOX yd65CdbD8CLMyzgFbbriiXQvcfzAZVnOSu3FO5HH+Vrz9E6fjzS/Wbn2h/x8ToeOdUWV MiGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=OyFRZK13; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id i5si4708237wre.541.2018.02.27.09.27.43; Tue, 27 Feb 2018 09:27:43 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=OyFRZK13; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 227CF4C7B; Tue, 27 Feb 2018 18:27:36 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0075.outbound.protection.outlook.com [104.47.0.75]) by dpdk.org (Postfix) with ESMTP id 4BD3719F5; Tue, 27 Feb 2018 18:27:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=3xj0u3rvST7s4dAKqIyxYvEW4onZgtbg79jnTUJ37Qg=; b=OyFRZK13HFUIfIWrN8V/VKCqUiALt4I9dy9P3TazYvuJAIpMH8feGRkBUwVCvm2wYvURTFG17zXtL8HqA6jOaUCc2C/RFQPB/9QBHyE1XAnZR+2OT+ImQJSyC57c1T0nx80ANWIqg+U95/5qrt6CYQGtpfEvgFDTJIBXUDXAwGU= Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 17:27:30 +0000 From: Hemant Agrawal To: dev@dpdk.org, bruce.richardson@intel.com Cc: thomas@monjalon.net, shreyansh.jain@nxp.com, stable@dpdk.org Date: Tue, 27 Feb 2018 22:55:46 +0530 Message-Id: <1519752352-15442-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> References: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::27) To DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 38c2b99f-5e9a-4a87-4904-08d57e0761cb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DB4PR04MB0768; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 3:zYAK2HfnpmswijZWrxYjznusV5xLhuqO9bohf3P8leUySNyVLv2DBIdkMY5qAMf/Gi9XPe9k0AZ6pyYIHIWDnuBI8x8zq1KCbnRlcN4mmqA6khqnkLntABXDyoRZWkT6dRB5V7+F+EuOfL00y6MXMDecKBmQ4dObIYQrdZ/w/M8CSJt7YVLtAi0/W4bot97jgdg0W3YpCUWm6/BVf9+BV8/l4t4mH85HM0gO9WKExmRvH6OZg07A28y4PLnkidEJ; 25:+XtZtEXu+ol/RYD4r2Aup9O5D6C3TLITiQAFxDGdQdu6jWLXyNiKW2v4j1E8zK0Zd48kZbeIFRBOSYVPpvgYDeZFLe0xW3Oh2qiSW12wlsK/nPKq2OEdfY7xxy4H8u5OGna2w73daChO6gTbwM3uZAd2o3Kjttjh9BKLm6BpgTAxhRAx9YsGhtLKKYMP3glNCT6rca35ntdYW8rph3ebTZwg9b+EWTs6/WFriV9j0WOCyHKE+n6lWL+F7UxwnuhGMWiHYmFhVn9mhcl2JZp4Sa3Xs+JOQ3V7vE5TnOSRwhhoPEuUSNjadX8/NNMZkjMdP0KYhqBmuFH3zTROHpIOHw==; 31:9XUEdjOICTZvRXIRfxwCmV2ZRnliihjispSR3kOQqo9lTxqtkNvjgAwZ0CKYks0RvezWJNa2nrbk+48vSy/kPnBJOP+/MHW/qDEwRDK20QxjVdYmya0MNzNLeraYGzHtSinWQpDhYhvOWoV9emRpH9CHhNq1C0AXAl6by3p8JWxIdmeatAVagKdIsNPHfS9HmR9/7/H672v8VTex/aj6+/8dBsDALjMedlqq3YCIT48= X-MS-TrafficTypeDiagnostic: DB4PR04MB0768: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 20:4hQ2+oT2ZNnEgpjqbCu50qYhBYdMSN+u5O1JacjtQ6ycnStb+S64CtMQf+ikqTuzVb6iwCRlD78aKoufz08MZrvK/++AqDpvneuQtZglfkJiSfNrptx5Ug/A4miHmSQwdMDZI/J6vg/26NmHiZzhDhkxseNMVGOiR1EMn1Npibk4JKv1QA10aXf5PbMLZQ8kJDnmWgvteinX2sw/hXhf9TmQihr4/GGGG9ZRKvkAmtegiMmw8cVn943MyQ65NdPCd88IcNAGsj35vU8etBaxA5OONg1hcDNW5ChWDmf5P/ivtnqaEb+gzM8ztxAiGWO9Kb0++RCiMVPAfK5iazO8qbDdB2/h9V0dNoYZtO0GnRgd6MPv3/yYb3YvMwlmO6/AWJNltwLlKgXhrASoUXv+JgWUoCnPIKhlNEk6Ok9MWh7jmynN/odCfkRS3BsS3sl1YlaKdaZNCiJZCkjLLjfE+jv/tWETQ2kr6XYoI03lFRgqc8bY0I0+PEeB1jliJy1Q; 4:3PFoTYhieByg1dv/4wffYbRHnLQweoAT7aTsen2azc7NRei7eYDumQOSBpFVtNtAEmim/OynOHqgeXv1Zv9KHSqS2CSnxnZDfKcC7ibRUK2N4Po/Yu2N2TLddgN7NQRFZEFOI9F2gso8rOlE1P2K8YnsXwz7tnp3B6WTQleJ1oEffWglGa5//QVIZ1l5eru6ElgK6PIWjDoLBnC+JiI4M6ClsuizGislodkdHnE90544ZYZt1Qv5uLhxzQGR34Trw65qGGUwlTa9yw/k8jC2HzxBM0xBtawSSbQdXgjxDJar9rm8TyFf1mpCLQyZ7EjH X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501198)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB0768; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0768; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(39380400002)(346002)(199004)(189003)(26005)(316002)(68736007)(105586002)(16586007)(6512007)(36756003)(66066001)(2906002)(47776003)(386003)(6346003)(4326008)(53936002)(6486002)(8676002)(55236004)(8936002)(97736004)(81156014)(76176011)(59450400001)(3846002)(5009440100003)(7736002)(5660300001)(6116002)(25786009)(50226002)(6506007)(305945005)(478600001)(81166006)(51416003)(52116002)(6666003)(106356001)(575784001)(86362001)(2950100002)(16526019)(48376002)(50466002)(186003)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0768; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0768; 23:BP3QzzmQNZvs5pSzVdLSc9NpsBpdAHt25MI/PD0xS?= LY2sBIpX6X8iPf7pb7Bp8cK0gjaMgDJsAuT61t0Th4Gf7QoVO8QDGjIsnNt/JYhCHJPfiN5x9roMXAmwpot1sGcHdmtcCpGIal39/iF7qXdfxL8PYC/yB8emoy6onuEfpuyDLyQnowjgWtM5tNtntbvegIk3m39QuRU661doJ0ItTpQI21+cfFsfnjTsnr4KOp97Bow+i8qwRNB6P1vnL1V9D0ThlpQ1ix+mpBzR5DiFblL4aCPi+cGqdgIJOnsV14Mo7AgaW0TIcNg5oEeK98q+bYxrePuZCYKQErtPMYFG3PiJy1mXRfYTUmeYI5r2+2lpptvRhFbboUfcWFt+DFckSrE1DHOUfavBqLwrEH3UgFwx4seJOvblFgHqHNvg7d4RqOSeWRun28XmKknPoQU+iDq6XsKwAHu8BHVXfOUTz7YxShMpUKa45f9NT9nokZlBeAD91unLbms+80dy1KsoAffQFR4dkGSOCIwF06O7OcGdnreFpwzr7OSGTk30qihGaGUvdXg8DkXjNS+c0lQNlbswnR+Qe2oCpp0p54t9qoweIedyE1s6TjARlGIKBFE1lTNy3UanXi0QIiDqswRLavQvRSUysoNOfyk+njZ9bOWF2EfmXD2rGX/2vdk5enGXwxf8FC7EGcad5fBOg+WCzWGe9VFvilnDoOfJ2hZhsag5hs4m5Bly+GBYcGcA52nch5RXI9bT7b3yVfg7V2n/9a9zMmE6f2TRNnzTXzSsha1OTyJEdW+sRE7ZfKnhovXlWJkc2QvmG4lXaqVXHREP2E34KbKgQfZqPzdqj+CYuN812oiFYoLer/yTIRxmkOo/g8UXWG7g+lbRLFKFKRqMoVUSi7C1lJ9yx4dyvYfqXf2Cd571DQVsnkkhgJGkqwDHoQcSCrfN7d7MmyqtalOhltfBLOF9gYWlWIPWP6sj5boEC1O49bP02pwRgS8MrUi43zcJFKzzmJ8unMy36+dKNgyRWlOQsC4Z434Zqd5ymSxdMm0QAqOW73EWH6jA/oejoosiL1wxsXhk2SJl2tpIdzusDiuYgJ8HadokwZj6hVOdKugEAUiFKABB1QY+F/HUDgw+z0PlS/QDDFxAxuYyQcNAhUalF8lNCFGxt9m7elCdNnLy9IZmL3VAz7Hr+sMoKCVKkXXz1UbSiAuAc1IQVNUmltXLVIAGvSWAtJsQg== X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 6:AcCIwbS9Ayfsa12xGQgNzniM+9bnZLPYAKbDSK2EQQpaT1x0/hP48CmJxU4K/ubIT54tgusEAEjLDFbiFfCbOjHf8jRW83/JxQ6vYmiRb+/o+xZTMsdU+VBBJYPof1UHYlXAMv9OB7G3DhZQGADOdUU2H9mRlyQ6j0MqJAkXdJolLKoiwANPOsu0pgORSpVP6enyBFHhgIt/b0AHQYeAIhcXoZodKg3Vk+WhHetRHjrwHHXj1tSjFfL1W+op/aCo/Nw91EQk9dO4oVYEcUA6mrVNf5+e+bcHpTRSiURjY+BimoaBXMX5B1KQQlps7cTNDELjZi1/RZxPrtIXyHVRtYAkGfmm/oRD89+OlZtRCqA=; 5:91Hm2mX61Xwavo9MZyQiAVfa1FLb12Vqg9dEmp2oiwVbqc6LJZZX8+DzOU7BUDQAZytdIzEB/kmkjSg1MnZ7HAxd7Tk67eyTcLyWaFNY9Xf1aJI1R+PLBAjvosSK7KnpedJMYbATluh6E3zOFIC1xooegzQ5ILc5K52JPryX0Bo=; 24:zDGuJR3WEiTZ45DJ+1rjxBLZBo/rTWkA0PGCfHAoosF0J2W9+iwOWCIiqfgHM4rFdworZ3TQBrA4eLCWz5siKBvyN0EQ9YJOPyLeMBkxEvw=; 7:EqkRJqO0g/tezsFUgAfuG+sAflL8NeOWjVyeYRnWnBJAAlT1TF7wRQhcQKB7+Fe4fMTpdh0ysef8b2NkymYh+Y0xQ2HF5Q0ZW5h8tVA8BWW2KHqJdRVh5cqIoWlgnn8Obxj4tyn0ffRpVzrsIgKbbttI2+9kAx8vN2JbREG3Xcuq0r4xZMz1+OPE+1hmRPWxpkcCI5YIwe37W5p3JQj8x3M6UTrTAuQFWFpWXj89XSLFmwZXyafzCAa34g8/v8TB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 17:27:30.3063 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 38c2b99f-5e9a-4a87-4904-08d57e0761cb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0768 Subject: [dpdk-dev] [PATCH 1/7] event/dpaa: fix include header X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" rte_cycles.h shall be included instead of rte_cycles_64.h dpaa_eventdev.c:32:27: fatal error: rte_cycles_64.h: No such file or directory Fixes: 9caac5dd1e7f ("event/dpaa: introduce PMD") Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal --- drivers/event/dpaa/dpaa_eventdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c index 0006801..cd13d0c 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include "dpaa_eventdev.h" From patchwork Tue Feb 27 17:25:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129836 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp539757edc; Tue, 27 Feb 2018 09:27:57 -0800 (PST) X-Google-Smtp-Source: AG47ELtLK2CeGeFAmPdRiKrECnqNp5JApoQONI5X3Adg8LFZcniF26jSyLxy7X9wpIByX9Tcqcqj X-Received: by 10.223.190.15 with SMTP id n15mr1579533wrh.82.1519752477503; Tue, 27 Feb 2018 09:27:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519752477; cv=none; d=google.com; s=arc-20160816; b=kToUZAbP0/cYEFIPSQizRX4XdPydI/9Y/sUd4WUt4PC5ttRaQ8hBcgTEgOXR+M00cP Bu7M0Om2evxJrG0DRRMj9RgZ9H7uJXtQdvkvFUEnaKZzVVPBV1qrm93iEXGEPgvI9xgr AefHN6P+FDFROZkZD2oRo2tpIj0Ck620Gp5mEuuHqmzTvcAzS9jVu59vZFZiVTW+H7NW VgZOhsg/IrZKhkZR2mA4pGvVMYdN5QkXoP/3v+5P4Bnc1ib/hlksjawUZWuJ/irCvANZ 1GofKe9Sv8P5V8vW2riLqxrjLrWOSYLnLGOQu2RT8BVirZS3FwoDaaY7wiyztRTi+XEI ZWxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=mCq0UQwpUUNv4jx8chxdsRTrPUl5UxsR8vpqI3tLcP4=; b=V7wEwRDwpwKdnqGUHoJk68MI41VKTa66cOBjOeO8tiHofkzn9mzS1DlDRenJuDu6Mw Zaio/6whlgiZDZQh+bl9ZYwCnqipXcIUTg7XbtiJlMt1i6r4WViE+BhGwsKxwzv73B4y LbZakJ6B4KaVpY68a8X++4Z3h116QXsENBDLLAt+2s76it5enSB83/32b4V3GEaEdv06 +Map1ZRXjB3hGAAUNKn4gofWgDgawvgGSFa8eJ4XfGFrr+AeP6dHMzQKwIgDye1ra7H6 sUoF1BVkBqcwT1mE/AUA96NZv4uEXiDmbDHtshKrkbJK8Suq1XXkl8R+D1RwtJjBxCVW lXTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=CyVokOKb; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id k51si9457150wrf.11.2018.02.27.09.27.57; Tue, 27 Feb 2018 09:27:57 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=CyVokOKb; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A5FC34CBB; Tue, 27 Feb 2018 18:27:37 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0079.outbound.protection.outlook.com [104.47.0.79]) by dpdk.org (Postfix) with ESMTP id 7BF2E101B for ; Tue, 27 Feb 2018 18:27:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mCq0UQwpUUNv4jx8chxdsRTrPUl5UxsR8vpqI3tLcP4=; b=CyVokOKbvvyIDOQj4nZn5s85fhKYNWMf3B7xqQxEZ8oF45UtRqtGEjQ50wtwS7jRV7C6OmYyDyT/9MUTMfk0kTNP0MpPKGxEgFnuoAX1+N/CSA3LB+QQpttee65PPrGndASUsVcEsvV4bnnfjd5oGbq0Ur/h3gAYiS7Uq1Bglkc= Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 17:27:31 +0000 From: Hemant Agrawal To: dev@dpdk.org, bruce.richardson@intel.com Cc: thomas@monjalon.net, shreyansh.jain@nxp.com Date: Tue, 27 Feb 2018 22:55:47 +0530 Message-Id: <1519752352-15442-3-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> References: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::27) To DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: ad88178a-c95c-4956-c8db-08d57e0762ad X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DB4PR04MB0768; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 3:PZuA/9j9yftF2jGz4hnr1MXRlrzFYmMUtWlp4a36SuoiX1GBoKoskm7ckKWxxlTnWtxA5ZCXLA8XVn72W2MaZRbwv3k1ouXukq5P4iXIHgFDwjgrVOeoBritcSHqdYUMQPEASZ35nbV4atdPZy1kzoGb6YysSdH5HoUErNA8aPrLN40Shm2rHs2T/iPYkuSNGrjv2Ke7Y5R5ZzIXDMmD39JXuhYLI9OufOExADDMFWThH/W0PXt6U03XXdfsAy+p; 25:PcjGpiEdQeFtFojnVZv8V6Bf22mw79MR4CDzk0N5mPOQUEEhUYYpG2+vF4Q2YrqR2B43x7Is1mNsn/KHFrHnu3R+aPIqBxxdiRS7NFMLWkYb/jnW4mEPYDKzFxNZZd28LdYmlFmfHf9KF7DfePJ6E882J0+pAiEr1rDrx1Vt9+xk3NaUAMFejxvAiH5EWGnamvJFrRQCZlqkb6pocIRaW+/tf+LWlMXmt1xLYUAXl2NaKcbbOmJa15jZ63WknMHlcMN6I12XZhfh8RtgmhDqkX0ofkGzxpFTK18jMZEzBKlkny3M5HgPdv6HQBCTsnqhTwDSwlnTylElGxTlaHvPLg==; 31:EcjFJQjm9wb5+jj2iRcdu+H1We/Q4GqFLt+HHsn3l+UzL5JW0YrH6hKv9MpG5cilusoWeuQSDul7aBW5nLu7hgnux+KA5IktaEbo28OaD5+8i7qlwlbqWWZ8PdSYSu7viDeWEFkWv12P/OgXk4UdXeXMRc+on9dxFtpAwtN+Rs40iPKzn62uDUGuEm3Byxirai606Vg1LXEbAU1vUKepSQyd7xnTR65DYBWcihQGtn4= X-MS-TrafficTypeDiagnostic: DB4PR04MB0768: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 20:S+RBpMcZchzXOJzOoapnVP3dYf2sUopOJmhg0gPwoRMS4Pb4IXM3f+gljMGnRXk4YM0Ss2jiTawXm9rH8HEXF5sgiq16nEuZRuvRk7cgpPbvHtMoIyYtJtQiC7aUybvn4wG0ahIPY5vClTtBBAhCfy4wnfaLhQJc8yZSdptLD7uJNftrHnfV1hn16rnPTxFo7oBghSAmtMwGM+uuNJjDOu0OBceDZL156Punkrc/H0ZoD9VKFqrezpJ+AbCm2bKeSRMAMBnjo42PJaNKbFvSA5Gf/ZY4X3Ojt58GFWjZ3tzv0cbmkKNWBnJ2zdGzPNgkcI9NYmuuJEWnoJE86qT9dmdKUHvw9dFmKnZ0F2AnrBH3O81RgUIDS+qyfAfmJx0RLbsS0MQZiFXYTUHwpwLQMTl24D7/4A3zUe6k6mFTwNDeIcdnAKsX4ZMpDWJD/o2j64cbd5qMfb3S1GiQEojyM8ltMTlemHvxm56GtK7bNZmh0jZR8JKk7kU9U1bmFgaw; 4:DPwLkjtqjLglOGt0p6N+5pgzzxMnL2odtcyGB6KwJ8pZhwdwVOdwFVp58GUcYRZVYBFvnKPjXnyDHM6Xkn2cRUL87bxqhq9ID0y5wJfPyjnJyqsQOEEruJaDSR3vAV1OAyCPrNKhvCwcdWhf4mWTQHiO22jeUESSMeDGDkFsaXc8DnwCxl5IUFAOpEVlrhgn101Olwc5ECQlp34yggUhBQvGMyJoGbVBFVrcsyU9S5m++6sRa0elNZJzgAJrf20mekw9P7HrQRA7I513nn4QvBvqGemuiPxelIgOPSiMHbpn07pkpu5u6odnpH+/SBfyFYHfSxTzeNUag6JA8LMHNuV9dWpZ9PwqIbq0vXCzFGE= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(131327999870524)(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501198)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB0768; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0768; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(39380400002)(346002)(199004)(189003)(26005)(316002)(68736007)(105586002)(16586007)(6512007)(36756003)(66066001)(2906002)(47776003)(386003)(6346003)(4326008)(53936002)(6486002)(8676002)(55236004)(8936002)(97736004)(81156014)(76176011)(59450400001)(3846002)(5009440100003)(7736002)(5660300001)(6116002)(25786009)(50226002)(6506007)(305945005)(478600001)(81166006)(51416003)(52116002)(6666003)(106356001)(86362001)(2950100002)(16526019)(48376002)(50466002)(186003)(110426004)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0768; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0768; 23:M9ZRRL4G9yfHE4GjQfQ/8zaSSl401vE9HK4o37IDK?= fe5VBSI6bfsZCgIM6HUk/wUUP47CqYkVtNCtE37BMs5PemZk7mamArL1hhYoLEkRIeLGzgZ3RMI7XqQs1/z71kFIwbbXgyu9/Kp9HonIMccmPW38vAqdKghFOyVD3lrVCMJ13WhnQMvWAqJ/nqfjTPggsz/JU4knxJxqfZtaVsvaSgM3PBph/HHBKt06GuL8rifzi7aIudZ8yzQZhIDQxNunTAF4QgHaorOWwqaD2RKOPP31ITjQ0s05C2WPuhzB7HL3AcxFt9vCXNYX8FSwj+ATeNm4rp+otvnGa0/DhV3u1u4WlTA3sfjeITLXlVq0ox70/FHDyRFc3Z/J98Pi8C3ShLH9a3Y/Q/S764UALJasdAN6vlc77Pbsn3RtEqPRsfyCGPQeu5gPZomTWrCA7Iczp1aldssxXQla9yszhy5YojhARdVMuvynoinRv5cRty4vKtmdrjh3MuOkJjOuOYRBgHjT3wpzjdGsWsyk12o6PQK0WClTxpSA2N+DkRPNuSlnJTaaXJOE7uTLBc3LRbD4kluewzjvsKRYS/JlZserRYhoq05vCn9u97DuloWmhDYAyy5hvcg2jmcy+WRIOtXnXRUkAhYjf62ict3Q/oVgptt1Z6WQreIgg8nwkC8SvodunlNQsOcXSK0Q9UzF9uCPDvBj7n98eqywiNduT9du/q8jhLBhvyjEaW5X49uPOKXq/mWgVs9TuDCTTqGsIJOWMOQHljjagOOuyXU+6HJjuExwHB5UCkYoq3OJl3McV5HX0zBu1I/COJO1JJGUiz+aZJhnVIrTQRZT3oE2a4B5enOmGlWbX7+WAkYJQoouorp2+gvNPyyUoOsNK4IjfM1iFbfzz7ZAFYquNi9dBWeJPRpts36oFzS0j9yPBaXAIw+GpbbV17kiZBSyJEXLnwHT0ItSMyVZkrD77dKq4FbaZWQLde7a2++iK0oOrOsVAyNao0XYn63uRiHelATQajYCQpqBMkOY88BVf2RiYw4B4h2fN3N1ACN4JBWhQEwcHSSryLlR0AzBTR4IAzUnq30jrIiY0weagJ7f4NsL35z1mQwLZT9rEF0pH6zw9hAF8hUt1UHNEgAF5Fktm/yPeY468NHk+oQNeGAdfhuC7QaJbP7sqrSQuAbv/SYARwYryTDSlfv7w/PAuxtXksXEh4gKeZRou88IiUGR0IJpvB11g== X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 6:h20W6MdUvAiIb9WT4nNXDrMsNY1iWT9Pv8MPO2PEkreS0L5jrWiT7qFlp0OAbMNQeNecIeTaB31OYtpuoHtMMD+Srw3sqzFEsLBSmx5PWFS2jQCJzOGE12xb+8LqFpeiKaqBlm5gbgES4u2ZXspWP4Zifx3zxDsk600yn4yFDv4Gbhl7aI9rKJwTavvREOaQwa1mFoF/s6BVDG8SBSt1l48ioKWHLmi8/uR+I2uZpk+Eq31JTBUQOht+Sje22c8odPD07Q++4yKorX/t8fs/K9Q4O5js/UNse8Kjb34HrlktPliraC3edYv8scJZ3/ScJp5/9ITCmpUR4UJ/CEzI3n4GoM+Hj9KOtE0a+jcjJyA=; 5:c5AVOLnR4XqUTGIMf/yeRorb1mBIMhdqXAmmiB+G/ScDetL0plzTZoCcfxsmqr4iRnQPdFF7cRUQh4z+4IzvBeNqVwQndADOySDtSbGrnAgq0i9d/cK3V6YiFbR8UmcAO9PMAVJkFLEAhJeovAdSwkuGQUVx6+6gySh+VzEIqU8=; 24:s/sQTi8NUuTobsimC1WfCOsc/g8kjEv/sYq/kQGdy2+fLl/kqL+/UgqGIzVqHuHH7Taa4wWSED92mHrKI7HSniVMJj5UuxuwIbdrXReEEfQ=; 7:LqD+dDTeFA49XK1I+jFzwsGdyL7dY9L27N+pDuXyuVvDimRH6hT+8NyhSWv4aK3peGi1HKfvPLTC5l20jPgO/8x5uUpW5+Nxey0BivQIGhbXFBxBiIX0DZTxuNS7bkvFfgyVXKlqzxs6c71QqrWHVkhlUUjYoBMGJlmNYeN63eA1YQ2nzpTuHUwPmLbQgEBF5QZ0Hgl9PKeoHahFvTjwwI7r9/wi8pjjjCoNZCMdREZNwuS8WZnk2yHs84nc6Ojj SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 17:27:31.9314 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad88178a-c95c-4956-c8db-08d57e0762ad X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0768 Subject: [dpdk-dev] [PATCH 2/7] dpaa: prepare for 32 bit compilation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch prepares the dpaa drivers for compilation on 32 bit machine. Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/fman/fman.c | 2 +- drivers/bus/dpaa/base/qbman/bman_driver.c | 2 +- drivers/bus/dpaa/base/qbman/qman.c | 5 +++-- drivers/bus/dpaa/base/qbman/qman_driver.c | 5 +---- drivers/bus/dpaa/dpaa_bus.c | 2 +- drivers/crypto/dpaa_sec/dpaa_sec.c | 30 +++++++++++++++--------------- drivers/mempool/dpaa/dpaa_mempool.c | 10 +++++----- drivers/mempool/dpaa/dpaa_mempool.h | 2 +- drivers/net/dpaa/dpaa_rxtx.c | 17 ++++++++--------- 9 files changed, 36 insertions(+), 39 deletions(-) -- 2.7.4 diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index bda62e0..e6fd5f3 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -300,7 +300,7 @@ fman_if_init(const struct device_node *dpa_node) _errno = fman_get_mac_index(regs_addr_host, &__if->__if.mac_idx); if (_errno) { - FMAN_ERR(-EINVAL, "Invalid register address: %lu", + FMAN_ERR(-EINVAL, "Invalid register address: %" PRIx64, regs_addr_host); goto err; } diff --git a/drivers/bus/dpaa/base/qbman/bman_driver.c b/drivers/bus/dpaa/base/qbman/bman_driver.c index a1ef392..1381da3 100644 --- a/drivers/bus/dpaa/base/qbman/bman_driver.c +++ b/drivers/bus/dpaa/base/qbman/bman_driver.c @@ -161,7 +161,7 @@ int bman_init_ccsr(const struct device_node *node) PROT_WRITE, MAP_SHARED, ccsr_map_fd, phys_addr); if (bman_ccsr_map == MAP_FAILED) { pr_err("Can not map BMan CCSR base Bman: " - "0x%x Phys: 0x%lx size 0x%lx", + "0x%x Phys: 0x%" PRIx64 " size 0x%" PRIu64, *bman_addr, phys_addr, regs_size); return -EINVAL; } diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 2b97671..2810fdd 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -1087,7 +1087,7 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, shadow[rx_number]->fd.opaque = be32_to_cpu(dq[rx_number]->fd.opaque); #else - shadow = dq; + shadow[rx_number] = dq[rx_number]; #endif /* SDQCR: context_b points to the FQ */ @@ -1095,7 +1095,8 @@ unsigned int qman_portal_poll_rx(unsigned int poll_limit, fq[rx_number] = qman_fq_lookup_table[be32_to_cpu( dq[rx_number]->contextB)]; #else - fq[rx_number] = (void *)(uintptr_t)be32_to_cpu(dq->contextB); + fq[rx_number] = (void *)be32_to_cpu( + dq[rx_number]->contextB); #endif fq[rx_number]->cb.dqrr_prepare(shadow[rx_number], &bufs[rx_number]); diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c index 7cfa8ee..66838d2 100644 --- a/drivers/bus/dpaa/base/qbman/qman_driver.c +++ b/drivers/bus/dpaa/base/qbman/qman_driver.c @@ -246,7 +246,6 @@ int fsl_qman_portal_destroy(struct qman_portal *qp) int qman_global_init(void) { const struct device_node *dt_node; - int ret = 0; size_t lenp; const u32 *chanid; static int ccsr_map_fd; @@ -352,9 +351,7 @@ int qman_global_init(void) qman_clk = be32_to_cpu(*clk); #ifdef CONFIG_FSL_QMAN_FQ_LOOKUP - ret = qman_setup_fq_lookup_table(CONFIG_FSL_QMAN_FQ_LOOKUP_MAX); - if (ret) - return ret; + return qman_setup_fq_lookup_table(CONFIG_FSL_QMAN_FQ_LOOKUP_MAX); #endif return 0; } diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index f2bb3b1..c643da5 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -235,7 +235,7 @@ int rte_dpaa_portal_init(void *arg) BUS_INIT_FUNC_TRACE(); - if ((uint64_t)arg == 1 || cpu == LCORE_ID_ANY) + if ((size_t)arg == 1 || cpu == LCORE_ID_ANY) cpu = rte_get_master_lcore(); /* if the core id is not supported */ else diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 18681cf..c5191ce 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -84,7 +84,7 @@ dpaa_sec_alloc_ctx(dpaa_sec_session *ses) dcbz_64(&ctx->job.sg[SG_CACHELINE_3]); ctx->ctx_pool = ses->ctx_pool; - ctx->vtop_offset = (uint64_t) ctx + ctx->vtop_offset = (size_t) ctx - rte_mempool_virt2iova(ctx); return ctx; @@ -97,7 +97,7 @@ dpaa_mem_vtop(void *vaddr) uint64_t vaddr_64, paddr; int i; - vaddr_64 = (uint64_t)vaddr; + vaddr_64 = (size_t)vaddr; for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { if (vaddr_64 >= memseg[i].addr_64 && vaddr_64 < memseg[i].addr_64 + memseg[i].len) { @@ -107,14 +107,14 @@ dpaa_mem_vtop(void *vaddr) return (rte_iova_t)paddr; } } - return (rte_iova_t)(NULL); + return (size_t)NULL; } /* virtual address conversin when mempool support is available for ctx */ static inline phys_addr_t dpaa_mem_vtop_ctx(struct dpaa_sec_op_ctx *ctx, void *vaddr) { - return (uint64_t)vaddr - ctx->vtop_offset; + return (size_t)vaddr - ctx->vtop_offset; } static inline void * @@ -125,8 +125,8 @@ dpaa_mem_ptov(rte_iova_t paddr) for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { if (paddr >= memseg[i].iova && - (char *)paddr < (char *)memseg[i].iova + memseg[i].len) - return (void *)(memseg[i].addr_64 + + paddr < memseg[i].iova + memseg[i].len) + return (void *)(size_t)(memseg[i].addr_64 + (paddr - memseg[i].iova)); } return NULL; @@ -406,7 +406,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) return -ENOTSUP; } - alginfo_c.key = (uint64_t)ses->cipher_key.data; + alginfo_c.key = (size_t)ses->cipher_key.data; alginfo_c.keylen = ses->cipher_key.length; alginfo_c.key_enc_flags = 0; alginfo_c.key_type = RTA_DATA_IMM; @@ -424,7 +424,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) return -ENOTSUP; } - alginfo_a.key = (uint64_t)ses->auth_key.data; + alginfo_a.key = (size_t)ses->auth_key.data; alginfo_a.keylen = ses->auth_key.length; alginfo_a.key_enc_flags = 0; alginfo_a.key_type = RTA_DATA_IMM; @@ -439,7 +439,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) PMD_TX_LOG(ERR, "not supported aead alg\n"); return -ENOTSUP; } - alginfo.key = (uint64_t)ses->aead_key.data; + alginfo.key = (size_t)ses->aead_key.data; alginfo.keylen = ses->aead_key.length; alginfo.key_enc_flags = 0; alginfo.key_type = RTA_DATA_IMM; @@ -463,7 +463,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) return -ENOTSUP; } - alginfo_c.key = (uint64_t)ses->cipher_key.data; + alginfo_c.key = (size_t)ses->cipher_key.data; alginfo_c.keylen = ses->cipher_key.length; alginfo_c.key_enc_flags = 0; alginfo_c.key_type = RTA_DATA_IMM; @@ -474,7 +474,7 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) return -ENOTSUP; } - alginfo_a.key = (uint64_t)ses->auth_key.data; + alginfo_a.key = (size_t)ses->auth_key.data; alginfo_a.keylen = ses->auth_key.length; alginfo_a.key_enc_flags = 0; alginfo_a.key_type = RTA_DATA_IMM; @@ -493,15 +493,15 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses) if (cdb->sh_desc[2] & 1) alginfo_c.key_type = RTA_DATA_IMM; else { - alginfo_c.key = (uint64_t)dpaa_mem_vtop( - (void *)alginfo_c.key); + alginfo_c.key = (size_t)dpaa_mem_vtop( + (void *)(size_t)alginfo_c.key); alginfo_c.key_type = RTA_DATA_PTR; } if (cdb->sh_desc[2] & (1<<1)) alginfo_a.key_type = RTA_DATA_IMM; else { - alginfo_a.key = (uint64_t)dpaa_mem_vtop( - (void *)alginfo_a.key); + alginfo_a.key = (size_t)dpaa_mem_vtop( + (void *)(size_t)alginfo_a.key); alginfo_a.key_type = RTA_DATA_PTR; } cdb->sh_desc[0] = 0; diff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c index fb3b6ba..7b82f4b 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.c +++ b/drivers/mempool/dpaa/dpaa_mempool.c @@ -115,7 +115,8 @@ dpaa_buf_free(struct dpaa_bp_info *bp_info, uint64_t addr) struct bm_buffer buf; int ret; - DPAA_MEMPOOL_DEBUG("Free 0x%lx to bpid: %d", addr, bp_info->bpid); + DPAA_MEMPOOL_DEBUG("Free 0x%" PRIx64 " to bpid: %d", + addr, bp_info->bpid); bm_buffer_set64(&buf, addr); retry: @@ -154,8 +155,7 @@ dpaa_mbuf_free_bulk(struct rte_mempool *pool, if (unlikely(!bp_info->ptov_off)) { /* buffers are from single mem segment */ if (bp_info->flags & DPAA_MPOOL_SINGLE_SEGMENT) { - bp_info->ptov_off - = (uint64_t)obj_table[i] - phy; + bp_info->ptov_off = (size_t)obj_table[i] - phy; rte_dpaa_bpid_info[bp_info->bpid].ptov_off = bp_info->ptov_off; } @@ -282,8 +282,8 @@ dpaa_register_memory_area(const struct rte_mempool *mp, bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp); total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size; - DPAA_MEMPOOL_DEBUG("Req size %lu vs Available %u\n", - len, total_elt_sz * mp->size); + DPAA_MEMPOOL_DEBUG("Req size %" PRIx64 " vs Available %u\n", + (uint64_t)len, total_elt_sz * mp->size); /* Detect pool area has sufficient space for elements in this memzone */ if (len >= total_elt_sz * mp->size) diff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h index 9435dd2..092f326 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.h +++ b/drivers/mempool/dpaa/dpaa_mempool.h @@ -46,7 +46,7 @@ static inline void * DPAA_MEMPOOL_PTOV(struct dpaa_bp_info *bp_info, uint64_t addr) { if (bp_info->ptov_off) - return ((void *)(addr + bp_info->ptov_off)); + return ((void *) (size_t)(addr + bp_info->ptov_off)); return rte_dpaa_mem_ptov(addr); } diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 0dea8e7..8d53137 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -90,11 +90,10 @@ static inline void dpaa_slow_parsing(struct rte_mbuf *m __rte_unused, /*TBD:XXX: to be implemented*/ } -static inline void dpaa_eth_packet_info(struct rte_mbuf *m, - uint64_t fd_virt_addr) +static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr) { struct annotations_t *annot = GET_ANNOTATIONS(fd_virt_addr); - uint64_t prs = *((uint64_t *)(&annot->parse)) & DPAA_PARSE_MASK; + uint64_t prs = *((uintptr_t *)(&annot->parse)) & DPAA_PARSE_MASK; DPAA_DP_LOG(DEBUG, " Parsing mbuf: %p with annotations: %p", m, annot); @@ -351,7 +350,7 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid) prev_seg = cur_seg; } - dpaa_eth_packet_info(first_seg, (uint64_t)vaddr); + dpaa_eth_packet_info(first_seg, vaddr); rte_pktmbuf_free_seg(temp); return first_seg; @@ -394,7 +393,7 @@ dpaa_eth_fd_to_mbuf(const struct qm_fd *fd, uint32_t ifid) mbuf->ol_flags = 0; mbuf->next = NULL; rte_mbuf_refcnt_set(mbuf, 1); - dpaa_eth_packet_info(mbuf, (uint64_t)mbuf->buf_addr); + dpaa_eth_packet_info(mbuf, mbuf->buf_addr); return mbuf; } @@ -455,7 +454,7 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, mbuf->ol_flags = 0; mbuf->next = NULL; rte_mbuf_refcnt_set(mbuf, 1); - dpaa_eth_packet_info(mbuf, (uint64_t)mbuf->buf_addr); + dpaa_eth_packet_info(mbuf, mbuf->buf_addr); } } @@ -593,7 +592,7 @@ uint16_t dpaa_eth_queue_rx(void *q, static void *dpaa_get_pktbuf(struct dpaa_bp_info *bp_info) { int ret; - uint64_t buf = 0; + size_t buf = 0; struct bm_buffer bufs; ret = bman_acquire(bp_info->bp, &bufs, 1, 0); @@ -602,10 +601,10 @@ static void *dpaa_get_pktbuf(struct dpaa_bp_info *bp_info) return (void *)buf; } - DPAA_DP_LOG(DEBUG, "got buffer 0x%lx from pool %d", + DPAA_DP_LOG(DEBUG, "got buffer 0x%" PRIx64 " from pool %d", (uint64_t)bufs.addr, bufs.bpid); - buf = (uint64_t)DPAA_MEMPOOL_PTOV(bp_info, bufs.addr) + buf = (size_t)DPAA_MEMPOOL_PTOV(bp_info, bufs.addr) - bp_info->meta_data_size; if (!buf) goto out; From patchwork Tue Feb 27 17:25:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129837 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp539926edc; Tue, 27 Feb 2018 09:28:09 -0800 (PST) X-Google-Smtp-Source: AH8x225btolyHdShJKfRupH+dAub1sCUlyqwMF30ZLYXtcCglP2X8wIgj4Mvw4z5YHfNbNEIbOE3 X-Received: by 10.223.166.171 with SMTP id t40mr14390364wrc.49.1519752489623; Tue, 27 Feb 2018 09:28:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519752489; cv=none; d=google.com; s=arc-20160816; b=Lh9X92QpmSfkLlOuaUBE9rKe8opme1+j+PrHBlMx5OWmf+ZKNbECY4gu0aXHMky9SN 6WPCK/NybUThD90AO5vQkxndGbSpkqcVq4pUhXBADTdGlXLdE5xpiwEZhblJCMv+Zp74 9jTIOOkD56aMNan5KxmI/BugyC2hK0Npmp07xxudvKs7avh/mqQknh44tPvzcsie1Dn7 yeuIfj0MfrW8vyIzmz7+0BuAs9No/OQZNfVKvh7fIHcgZ7esgQyeMBAEwL3kWYUWy0l0 tVsPp/08i63QfKywgOM2hnyy4KPnfPZ85Iut46CfSwxEonA/BmfvoRvzyEToyVTvbhdN h47w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=mYJSEZaLn1vRDSx3D2q/bVusplR22NwXzlCiRCKJI6k=; b=vR1qB/kpvlFXSkEj86qM8tGWEmIb4vsW3ziclDyq6yTQCQpYLrBILk/WlOCBi5djFR +218T/e9NfD8yQqybKPybZb2UTxowUD6m/Ykkn7PM4nsk5mupGzU/5RflUKtJtiW+7ha cM+C8v3TlriZ+JI02shnSrAAfZHchC/tFIjE8Y0E4bg6+DeMmLScKvAVe9YQUP1a0UAk yPdRr/N3XDEigtuIAosYQEYhsZJ32Tt2e4yVZwC4IgbjCihQTzBEZksBKqQkMR7cstaT xLykO/2u4cSmI37lekTVru3fceKbnHLdePDKjx83W8jOqN4Xlkuyi6nuig+b2pGZHYUD jHXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=TVK4iZaW; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id x10si3302821wmf.10.2018.02.27.09.28.09; Tue, 27 Feb 2018 09:28:09 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=TVK4iZaW; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A252E4CC9; Tue, 27 Feb 2018 18:27:38 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0057.outbound.protection.outlook.com [104.47.0.57]) by dpdk.org (Postfix) with ESMTP id 5EF024C9C for ; Tue, 27 Feb 2018 18:27:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=mYJSEZaLn1vRDSx3D2q/bVusplR22NwXzlCiRCKJI6k=; b=TVK4iZaWouPlTf5RkX1Uht+nM8Sr3VVyCidsm79rAHwSe7SVphPmHgQ9J9oP7NGAJYXiUbI/0l0Za/EnH4FuPMZrXYovw//K2G5feW5556grESObp8/tsFGDPbbUXHpL+JCmVo4wrWhrKxadcsZY3dHJG37GA7VolaxPI1lkpqs= Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 17:27:33 +0000 From: Hemant Agrawal To: dev@dpdk.org, bruce.richardson@intel.com Cc: thomas@monjalon.net, shreyansh.jain@nxp.com Date: Tue, 27 Feb 2018 22:55:48 +0530 Message-Id: <1519752352-15442-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> References: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::27) To DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 55e93a05-62b2-4511-8552-08d57e07636c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DB4PR04MB0768; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 3:rkGjwdu4rkVfe2nbcerDvy1pa8ZaoHNMm4bU9SWI2zg4Gv/g3U/MgmY/SW64W7qxMImwLvlY3oW/T4SRip0yrdTyQkGkWfJ4lPMHhvIIXXpCzUaxpczw8tXFTtmcKJMzXPgy63jVWhcEfNdO+DDv6QEs6ktTjGW1OqCNy6tQBc7Nas+2Wxbtc05fZY7/rTK5/2YuiWDBzbfnZe3P2CJjJJAKVKHIGLFoAhnJetpUegxLoawM2+ZmQzkU3OBb9nv2; 25:2sDYEcCl5yH9/TnQrQuKQOPRIspFiCCSzImhLIsB/U1VNAiZfF7+11IKEp6TG7WiLGE9X+mc+nVdDKkhaP90mhoZax90zuNZl4501yrBWbs/wE1RkGiQ35k3XWgjjF9iVZDZsyPhUQCdHrcG+bMZ7Q6Bg/dssmA+ou1rKpga0dGXA+JJZrCxGVSdote6OxPvKtBeYcWjyiUmsricHmLYwFlBd/w5P4FNv0pCZ2RCUYU1TlbrUGXAJ94d0dwR8646vCRUYTw8TrZJRUoXWBFzWWwiP/u4kj6ePNJbDOEvdTjzGgV4qIRVV0uw3/GD8l8+sMeapEqJ4nSZ78d2eUVpjQ==; 31:LzfIn05VglCNjPwJvnRAYiFbVY8V9NbF6EAcyqncymbv+ui/ZycZOuaAbmYIYBW1rcBZTU5kwrw5Ft2EMamN1NZHxX7Mjx1hdpQWcImsdUtdiB6A2cZ/I/noZUA9c6LG/Ew1MQQTC3puwHWDZJj8QmFhoNMsj2Vynk/BBAi+h4cr+z6pJ6NcCDlnoPl4EysNo5EoVW/uIsQn9XdbdpkqnYtaNo7Mb1hX74RbEy3MXsg= X-MS-TrafficTypeDiagnostic: DB4PR04MB0768: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 20:O31W60ECq3UXHjQUP8L9OfERn5tPMxQoNTQ8JhYYYaUtLbhY7cK1CK+B8aKvbDtPEC5TDG0Mg2G+B+3GBfTXBvo38Zj8CFvOuG6WxR8KEp4viV+PAFhlJ8L2QDmbeFjZ60vYL58aO5eKq/W5YUpz7JCxuvCOBImO4g95yC0W2MzU9Bz6ajy/uKQL4PKZSMXGxPFayMumU0mf2j8aFVkRL+pZo77FImRjYP3KxkyGbOVlkxABvmC8DRdwvCG9eUmC3M4PNAbCRRUN3PlDcsl6835Miebf/SDBUIHnQihfKnLOdAfUnbKo21s1t3Rr8qVcUMpP2PQ52uKaSsGwYH6mwfs9X8OG37h2xrSHXhCl6my/g3JMG8ntpjemy1keL83KcKRJhp0oVz/3+TYrnOcwVUcOXsYQH8lE49fGPVtsIWu4virtzOqdiEUUpgHese7MFj1L1Eiof1uS5/oixgeRdl13B2EMAKrReB0OKiNPG4INFdtj7SQ0P73yrfwwcavJ; 4:0+kQAhRWim3MEuulj1yzxXLjxFUhdOmi1BgGHmr6SiayEVksIIcKuOY82QgMFxmJozCvQW8c1Crw01bju8XDqDJSXyFpUSZ6cg/bb9sFcyoZAZrksLHwJtJvAbTtFR076dJSYPHq00pj/hG6yqY+3s5TKSpQEgqFbG655xESnevlCCM4oHXzCfxw/6Ksv8nIze0+MBqQtZ1IZ/JGxvyZqHTqBcfufhL1LEnI9hlWS78Hm9sJAuVpcr0Gg6KYp/Hap0QBvUs86SGyYAXEnUrW+pGtq1jUOplswKu7w+IdGXuwJ1nLg3qbs7ied2qfFTLWwKAoxGs8bgd2FKQ9+pBhZhqugQ3HxzoVXxzrZgfGP+w= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501198)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB0768; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0768; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(39380400002)(346002)(199004)(189003)(26005)(316002)(53946003)(68736007)(105586002)(16586007)(6512007)(36756003)(66066001)(2906002)(47776003)(386003)(6346003)(4326008)(53936002)(6486002)(8676002)(55236004)(8936002)(97736004)(81156014)(76176011)(59450400001)(3846002)(5009440100003)(7736002)(5660300001)(6116002)(25786009)(50226002)(6506007)(305945005)(478600001)(81166006)(5890100001)(51416003)(52116002)(6666003)(106356001)(575784001)(86362001)(2950100002)(16526019)(48376002)(50466002)(186003)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0768; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0768; 23:LSLbEtqVnPpzjO/HJbo5aF2v1jZ/3+mr+HPpj8pc3?= hsSS/6xBLQag/Csh/mctUVRIS0xD8Y+qfTnA0ubFkxqZWikgiVaoKjJcGXclV5W3Ll8DkthJNkgtFM9vPFB/edFP1kxQR4X+qZNRU5chig5n69WOfjD8/scZjNNjuO6rX4umDfRr8Qto6i+BoqYhkMVAaD8e+r9qpW2+X3foUnlcdk3m1zcseoaykZUVNAeq6+f9RRKR14BtU/35nH3JqDNKygfN1yb0avss8TilMO/gDkTd9EX/k/zRESZBQM0jUyqq/sOKRX9gUDVktMQPAHOAQD2h2wFfn1bWjnXkfGbIoQwDqZqMel6OvoSxu2XkrwfGRruR/gUlwABEceC4eNVg91RWTHGZdt63ZfLjaqUUbEq0bzH8vhcjAa0on3gw2XahlCqF4aXWqDnafWuAzME+Psq9MRR1JkeZonO2JCt0bMgNmO63aHSCDrmErcRXl2NBCTiVwXUJWRfJkRYqfusFjBOBJUgC0w9ldVvitbo0LLP6L2IAV/Ab4cC9FyMcC+JC5XrucnOEVyhw5yuoXFLoEv8mcx4JhcDElFHZl3m3sdx2lmK6iGScL7sYJGh8VSzsFOS4WWBuBR1CSDvQ/4+3oorwwI0bFiuNNKaaoyRchkQY/s5OsUcCuJ/FO9RS5djRC8y+a9+RuO4VmCDXE9+DhKM4mnW3VaA2rnC7mLIj9EPhr3IMNAJ8HpvGzAbPoQbVXNB8XljvsrvnUD0cUWgCvikufbeI0we0kHXoAWaMIVIzb4UrYVOD5LwrjX9KXU6Zmr7JCPQIdKSHo/4YqhcObY3hDOjomJpvZkZxC2SL3lxYAiHVLgjbKYHAcUcVqkKc1CXTlDkhHaBzHgAR3PKHHFsxqIMLDlA8tpo+zuCvNyyeaM8U09/nWNsKG7d/yVd+coxBGbkX3MzzH3+B9TqrKUVoD7F8zOry7knDRDMhbHA4pDMb9i532MTyET5J5znnoB56vK/JzsqsBgrkJIN6re+vVncER8uvyPwvteGjFyiMdWZociH0OJyhlNjkJAvQlgfA984dYZpawGQynqryiBxBpNkBio+iwj+i7iOFKBK7Sm6OuSdVlQ5Ptw9l5n7O0qC0+WmcdmNzVxuwywRS2jQsn9EkAxf6mtHSGyxKs7vUkftvrik7FBI7NB+d4Jz3tDHfhtxE5ZYYEyKJ1/uDbiViXtX2+bzBc3Dro6aBXkkX71hwEmxzmaQZ4dvDCuJSI4kve24R8TYFlob1DLQ X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 6:pFavrsXKkYM2gnj3LMGJ0jRCHLOD9NQYjk2CNdfSqsL/Jv3NoITfE3wjdg4DwZIcrXRcgZ3qXNk2Xl0nKzZhkup1dLRBj4cxr5KHvlumiDbrJow1RAI/ASmL5OBBsp3Wtpv615hQm2QGR29TrLcEPDYpUe5CxeMzr90iRgyZ1op9IAE3m1zTSoWCxaqme9VrK9jHNCj59zkvUcaaswLHB3RQlOjumg6jE8oSZmeVCbvMjNYq+51+KaWz9g19lvuHXNO3NABDyO30lyrPXc/mZg6J7fXK84VWQAiwe5sCW9SJC9sCI+wV/DFYCHC30cTpYwrU3xzMQlpnZYQhnEaXhvZi1lZ4loiuKGWu8urTki0=; 5:BhkD7sSuqlaej7e6CxbpUuMox1FASpB6TXyztsSwE/vsIhHb+XqKJMbXKL6Vom53VJbB9tFHtHL1oTWNgF7PDOppdOh9LFRaLQAK4CWBcmoj/YLgHPcmUBUAs9DJH9dnvqNNAaWbE6EMssIIeskFoh2aIwFJPoeko1GgHCW7zE8=; 24:H1EKjXI1VlPO7Iu1WOz6gXJG/BsKx2pFGmVtLglWykR/QhwS6/XvS9kPpt9QD5aE7bnVTQE4znytgrixAneTJZhlsIr4QJf11xKMDXIhvVQ=; 7:FVafZaPCptv4s1d2wAkvPUYLCCjB8Dbu6HuY6+Elf6tS4ZPnHHwyF4vy6VEEVvKNRHHD1nhFhaW+etwSpDvXvZm3weXNIinEfxtNG8yOQizvGnNArlk95AxXEjYusFY2a0dNQG7dIJ8FA5K6TJQ+Dx34o6xGZT/FpOTlsujRrkamSQaRTnuYA2TJSRsA+D30v59hE03ZPAunHyXaXfVvZDLxU8bJKcOss6LX3ivuuOww0DK9b6BOxhUTAphZenwm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 17:27:33.1970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55e93a05-62b2-4511-8552-08d57e07636c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0768 Subject: [dpdk-dev] [PATCH 3/7] dpaa2: prepare for 32 bit compilation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch prepare the dpaa2 drivers for compilation on 32 bit machine. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/fslmc_vfio.c | 10 ++--- drivers/bus/fslmc/mc/fsl_mc_cmd.h | 2 +- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 4 +- drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 37 +++++++++--------- drivers/bus/fslmc/qbman/qbman_portal.c | 14 +++---- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 60 ++++++++++++++--------------- drivers/event/dpaa2/dpaa2_eventdev.c | 6 +-- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 8 ++-- drivers/net/dpaa2/Makefile | 1 - drivers/net/dpaa2/base/dpaa2_hw_dpni.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.c | 6 +-- drivers/net/dpaa2/dpaa2_rxtx.c | 38 ++++++++---------- 12 files changed, 90 insertions(+), 98 deletions(-) -- 2.7.4 diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 1241295..e840ad6 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -76,7 +76,7 @@ fslmc_get_container_group(int *groupid) if (!g_container) { container = getenv("DPRC"); if (container == NULL) { - RTE_LOG(WARNING, EAL, "DPAA2: DPRC not available\n"); + RTE_LOG(DEBUG, EAL, "DPAA2: DPRC not available\n"); return -EINVAL; } @@ -270,7 +270,7 @@ int rte_fslmc_vfio_dmamap(void) static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj) { - int64_t v_addr = (int64_t)MAP_FAILED; + intptr_t v_addr = (intptr_t)MAP_FAILED; int32_t ret, mc_fd; struct vfio_device_info d_info = { .argsz = sizeof(d_info) }; @@ -301,7 +301,7 @@ static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj) FSLMC_VFIO_LOG(DEBUG, "region offset = %llx , region size = %llx", reg_info.offset, reg_info.size); - v_addr = (uint64_t)mmap(NULL, reg_info.size, + v_addr = (size_t)mmap(NULL, reg_info.size, PROT_WRITE | PROT_READ, MAP_SHARED, mc_fd, reg_info.offset); @@ -469,7 +469,7 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev) static int fslmc_process_mcp(struct rte_dpaa2_device *dev) { - int64_t v_addr; + intptr_t v_addr; char *dev_name; struct fsl_mc_io dpmng = {0}; struct mc_version mc_ver_info = {0}; @@ -489,7 +489,7 @@ fslmc_process_mcp(struct rte_dpaa2_device *dev) } v_addr = vfio_map_mcp_obj(&vfio_group, dev_name); - if (v_addr == (int64_t)MAP_FAILED) { + if (v_addr == (intptr_t)MAP_FAILED) { FSLMC_VFIO_LOG(ERR, "Error mapping region (errno = %d)", errno); free(rte_mcp_ptr_list); diff --git a/drivers/bus/fslmc/mc/fsl_mc_cmd.h b/drivers/bus/fslmc/mc/fsl_mc_cmd.h index a3c3e79..ac91961 100644 --- a/drivers/bus/fslmc/mc/fsl_mc_cmd.h +++ b/drivers/bus/fslmc/mc/fsl_mc_cmd.h @@ -27,7 +27,7 @@ #define le32_to_cpu rte_le_to_cpu_32 #define le16_to_cpu rte_le_to_cpu_16 -#define BITS_PER_LONG 64 +#define BITS_PER_LONG (__SIZEOF_LONG__ * 8) #define GENMASK(h, l) \ (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index eefde15..9bbc219 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -427,7 +427,7 @@ dpaa2_create_dpio_device(int vdev_fd, } dpio_dev->ce_size = reg_info.size; - dpio_dev->qbman_portal_ce_paddr = (uint64_t)mmap(NULL, reg_info.size, + dpio_dev->qbman_portal_ce_paddr = (size_t)mmap(NULL, reg_info.size, PROT_WRITE | PROT_READ, MAP_SHARED, vdev_fd, reg_info.offset); @@ -439,7 +439,7 @@ dpaa2_create_dpio_device(int vdev_fd, } dpio_dev->ci_size = reg_info.size; - dpio_dev->qbman_portal_ci_paddr = (uint64_t)mmap(NULL, reg_info.size, + dpio_dev->qbman_portal_ci_paddr = (size_t)mmap(NULL, reg_info.size, PROT_WRITE | PROT_READ, MAP_SHARED, vdev_fd, reg_info.offset); diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index d421dbf..3191ead 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -174,7 +174,7 @@ enum qbman_fd_format { }; /*Macros to define operations on FD*/ #define DPAA2_SET_FD_ADDR(fd, addr) do { \ - (fd)->simple.addr_lo = lower_32_bits((uint64_t)(addr)); \ + (fd)->simple.addr_lo = lower_32_bits((size_t)(addr)); \ (fd)->simple.addr_hi = upper_32_bits((uint64_t)(addr)); \ } while (0) #define DPAA2_SET_FD_LEN(fd, length) ((fd)->simple.len = length) @@ -193,33 +193,32 @@ enum qbman_fd_format { #define DPAA2_SET_FD_ASAL(fd, asal) ((fd)->simple.ctrl |= (asal << 16)) #define DPAA2_SET_FD_FLC(fd, addr) do { \ - (fd)->simple.flc_lo = lower_32_bits((uint64_t)(addr)); \ + (fd)->simple.flc_lo = lower_32_bits((size_t)(addr)); \ (fd)->simple.flc_hi = upper_32_bits((uint64_t)(addr)); \ } while (0) #define DPAA2_SET_FLE_INTERNAL_JD(fle, len) ((fle)->frc = (0x80000000 | (len))) #define DPAA2_GET_FLE_ADDR(fle) \ (uint64_t)((((uint64_t)((fle)->addr_hi)) << 32) + (fle)->addr_lo) #define DPAA2_SET_FLE_ADDR(fle, addr) do { \ - (fle)->addr_lo = lower_32_bits((uint64_t)addr); \ - (fle)->addr_hi = upper_32_bits((uint64_t)addr); \ + (fle)->addr_lo = lower_32_bits((size_t)addr); \ + (fle)->addr_hi = upper_32_bits((uint64_t)addr); \ } while (0) #define DPAA2_GET_FLE_CTXT(fle) \ - (uint64_t)((((uint64_t)((fle)->reserved[1])) << 32) + \ - (fle)->reserved[0]) + ((((uint64_t)((fle)->reserved[1])) << 32) + (fle)->reserved[0]) #define DPAA2_FLE_SAVE_CTXT(fle, addr) do { \ - (fle)->reserved[0] = lower_32_bits((uint64_t)addr); \ - (fle)->reserved[1] = upper_32_bits((uint64_t)addr); \ + (fle)->reserved[0] = lower_32_bits((size_t)addr); \ + (fle)->reserved[1] = upper_32_bits((uint64_t)addr); \ } while (0) #define DPAA2_SET_FLE_OFFSET(fle, offset) \ ((fle)->fin_bpid_offset |= (uint32_t)(offset) << 16) -#define DPAA2_SET_FLE_BPID(fle, bpid) ((fle)->fin_bpid_offset |= (uint64_t)bpid) +#define DPAA2_SET_FLE_BPID(fle, bpid) ((fle)->fin_bpid_offset |= (size_t)bpid) #define DPAA2_GET_FLE_BPID(fle) ((fle)->fin_bpid_offset & 0x000000ff) -#define DPAA2_SET_FLE_FIN(fle) ((fle)->fin_bpid_offset |= (uint64_t)1 << 31) +#define DPAA2_SET_FLE_FIN(fle) ((fle)->fin_bpid_offset |= 1 << 31) #define DPAA2_SET_FLE_IVP(fle) (((fle)->fin_bpid_offset |= 0x00004000)) #define DPAA2_SET_FD_COMPOUND_FMT(fd) \ ((fd)->simple.bpid_offset |= (uint32_t)1 << 28) #define DPAA2_GET_FD_ADDR(fd) \ -((uint64_t)((((uint64_t)((fd)->simple.addr_hi)) << 32) + (fd)->simple.addr_lo)) +((size_t)((((uint64_t)((fd)->simple.addr_hi)) << 32) + (fd)->simple.addr_lo)) #define DPAA2_GET_FD_LEN(fd) ((fd)->simple.len) #define DPAA2_GET_FD_BPID(fd) (((fd)->simple.bpid_offset & 0x00003FFF)) @@ -231,7 +230,7 @@ enum qbman_fd_format { (((fle)->fin_bpid_offset & ((uint64_t)1 << 29)) ? 1 : 0) #define DPAA2_INLINE_MBUF_FROM_BUF(buf, meta_data_size) \ - ((struct rte_mbuf *)((uint64_t)(buf) - (meta_data_size))) + ((struct rte_mbuf *)((size_t)(buf) - (meta_data_size))) #define DPAA2_ASAL_VAL (DPAA2_MBUF_HW_ANNOTATION / 64) @@ -265,14 +264,14 @@ static void *dpaa2_mem_ptov(phys_addr_t paddr) int i; if (dpaa2_virt_mode) - return (void *)paddr; + return (void *)(size_t)paddr; memseg = rte_eal_get_physmem_layout(); for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr_64 != 0; i++) { if (paddr >= memseg[i].iova && - (char *)paddr < (char *)memseg[i].iova + memseg[i].len) - return (void *)(memseg[i].addr_64 + paddr < memseg[i].iova + memseg[i].len) + return (void *)(size_t)(memseg[i].addr_64 + (paddr - memseg[i].iova)); } return NULL; @@ -295,7 +294,7 @@ static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr) return memseg[i].iova + (vaddr - memseg[i].addr_64); } - return (phys_addr_t)(NULL); + return (size_t)(NULL); } /** @@ -311,18 +310,18 @@ static phys_addr_t dpaa2_mem_vtop(uint64_t vaddr) /** * macro to convert Virtual address to IOVA */ -#define DPAA2_VADDR_TO_IOVA(_vaddr) dpaa2_mem_vtop((uint64_t)(_vaddr)) +#define DPAA2_VADDR_TO_IOVA(_vaddr) dpaa2_mem_vtop((size_t)(_vaddr)) /** * macro to convert IOVA to Virtual address */ -#define DPAA2_IOVA_TO_VADDR(_iova) dpaa2_mem_ptov((phys_addr_t)(_iova)) +#define DPAA2_IOVA_TO_VADDR(_iova) dpaa2_mem_ptov((size_t)(_iova)) /** * macro to convert modify the memory containing IOVA to Virtual address */ #define DPAA2_MODIFY_IOVA_TO_VADDR(_mem, _type) \ - {_mem = (_type)(dpaa2_mem_ptov((phys_addr_t)(_mem))); } + {_mem = (_type)(dpaa2_mem_ptov((size_t)(_mem))); } #else /* RTE_LIBRTE_DPAA2_USE_PHYS_IOVA */ diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbman/qbman_portal.c index e221733..713ec96 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -553,10 +553,9 @@ int qbman_swp_enqueue_multiple(struct qbman_swp *s, /* Flush all the cacheline without load/store in between */ eqcr_pi = s->eqcr.pi; - addr_cena = (uint64_t)s->sys.addr_cena; + addr_cena = (size_t)s->sys.addr_cena; for (i = 0; i < num_enqueued; i++) { - dcbf((uint64_t *)(addr_cena + - QBMAN_CENA_SWP_EQCR(eqcr_pi & 7))); + dcbf((addr_cena + QBMAN_CENA_SWP_EQCR(eqcr_pi & 7))); eqcr_pi++; eqcr_pi &= 0xF; } @@ -620,10 +619,9 @@ int qbman_swp_enqueue_multiple_desc(struct qbman_swp *s, /* Flush all the cacheline without load/store in between */ eqcr_pi = s->eqcr.pi; - addr_cena = (uint64_t)s->sys.addr_cena; + addr_cena = (size_t)s->sys.addr_cena; for (i = 0; i < num_enqueued; i++) { - dcbf((uint64_t *)(addr_cena + - QBMAN_CENA_SWP_EQCR(eqcr_pi & 7))); + dcbf((addr_cena + QBMAN_CENA_SWP_EQCR(eqcr_pi & 7))); eqcr_pi++; eqcr_pi &= 0xF; } @@ -690,7 +688,7 @@ void qbman_pull_desc_set_storage(struct qbman_pull_desc *d, dma_addr_t storage_phys, int stash) { - d->pull.rsp_addr_virt = (uint64_t)storage; + d->pull.rsp_addr_virt = (size_t)storage; if (!storage) { d->pull.verb &= ~(1 << QB_VDQCR_VERB_RLS_SHIFT); @@ -749,7 +747,7 @@ int qbman_swp_pull(struct qbman_swp *s, struct qbman_pull_desc *d) } d->pull.tok = s->sys.idx + 1; - s->vdq.storage = (void *)d->pull.rsp_addr_virt; + s->vdq.storage = (void *)(size_t)d->pull.rsp_addr_virt; p = qbman_cena_write_start_wo_shadow(&s->sys, QBMAN_CENA_SWP_VDQCR); memcpy(&p[1], &cl[1], 12); diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 9a790dd..a7f3b04 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -77,11 +77,11 @@ build_proto_fd(dpaa2_sec_session *sess, DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(sym_op->m_src)); DPAA2_SET_FD_OFFSET(fd, sym_op->m_src->data_off); DPAA2_SET_FD_LEN(fd, sym_op->m_src->pkt_len); - DPAA2_SET_FD_FLC(fd, ((uint64_t)flc)); + DPAA2_SET_FD_FLC(fd, (ptrdiff_t)flc); /* save physical address of mbuf */ op->sym->aead.digest.phys_addr = mbuf->buf_iova; - mbuf->buf_iova = (uint64_t)op; + mbuf->buf_iova = (size_t)op; return 0; } @@ -118,7 +118,7 @@ build_authenc_gcm_sg_fd(dpaa2_sec_session *sess, } memset(fle, 0, FLE_SG_MEM_SIZE); DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (size_t)priv); op_fle = fle + 1; ip_fle = fle + 2; @@ -269,7 +269,7 @@ build_authenc_gcm_fd(dpaa2_sec_session *sess, } memset(fle, 0, FLE_POOL_BUF_SIZE); DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); fle = fle + 1; sge = fle + 2; if (likely(bpid < MAX_BPID)) { @@ -414,7 +414,7 @@ build_authenc_sg_fd(dpaa2_sec_session *sess, } memset(fle, 0, FLE_SG_MEM_SIZE); DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); op_fle = fle + 1; ip_fle = fle + 2; @@ -563,7 +563,7 @@ build_authenc_fd(dpaa2_sec_session *sess, } memset(fle, 0, FLE_POOL_BUF_SIZE); DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); fle = fle + 1; sge = fle + 2; if (likely(bpid < MAX_BPID)) { @@ -692,7 +692,7 @@ static inline int build_auth_sg_fd( memset(fle, 0, FLE_SG_MEM_SIZE); /* first FLE entry used to store mbuf and session ctxt */ DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); op_fle = fle + 1; ip_fle = fle + 2; sge = fle + 3; @@ -773,7 +773,7 @@ build_auth_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op, * We can have a better approach to use the inline Mbuf */ DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); fle = fle + 1; if (likely(bpid < MAX_BPID)) { @@ -865,7 +865,7 @@ build_cipher_sg_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op, memset(fle, 0, FLE_SG_MEM_SIZE); /* first FLE entry used to store mbuf and session ctxt */ DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); op_fle = fle + 1; ip_fle = fle + 2; @@ -987,7 +987,7 @@ build_cipher_fd(dpaa2_sec_session *sess, struct rte_crypto_op *op, * We can have a better approach to use the inline Mbuf */ DPAA2_SET_FLE_ADDR(fle, DPAA2_OP_VADDR_TO_IOVA(op)); - DPAA2_FLE_SAVE_CTXT(fle, priv); + DPAA2_FLE_SAVE_CTXT(fle, (ptrdiff_t)priv); fle = fle + 1; sge = fle + 2; @@ -1206,7 +1206,7 @@ sec_simple_fd_to_mbuf(const struct qbman_fd *fd, __rte_unused uint8_t id) DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)), rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); - op = (struct rte_crypto_op *)mbuf->buf_iova; + op = (struct rte_crypto_op *)(size_t)mbuf->buf_iova; mbuf->buf_iova = op->sym->aead.digest.phys_addr; op->sym->aead.digest.phys_addr = 0L; @@ -1276,7 +1276,7 @@ sec_fd_to_mbuf(const struct qbman_fd *fd, uint8_t driver_id) /* free the fle memory */ if (likely(rte_pktmbuf_is_contiguous(src))) { - priv = (struct ctxt_priv *)DPAA2_GET_FLE_CTXT(fle - 1); + priv = (struct ctxt_priv *)(size_t)DPAA2_GET_FLE_CTXT(fle - 1); rte_mempool_put(priv->fle_pool, (void *)(fle-1)); } else rte_free((void *)(fle-1)); @@ -1455,7 +1455,7 @@ dpaa2_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, dev->data->queue_pairs[qp_id] = qp; cfg.options = cfg.options | DPSECI_QUEUE_OPT_USER_CTX; - cfg.user_ctx = (uint64_t)(&qp->rx_vq); + cfg.user_ctx = (size_t)(&qp->rx_vq); retcode = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); return retcode; @@ -1536,7 +1536,7 @@ dpaa2_sec_cipher_init(struct rte_cryptodev *dev, memcpy(session->cipher_key.data, xform->cipher.key.data, xform->cipher.key.length); - cipherdata.key = (uint64_t)session->cipher_key.data; + cipherdata.key = (size_t)session->cipher_key.data; cipherdata.keylen = session->cipher_key.length; cipherdata.key_enc_flags = 0; cipherdata.key_type = RTA_DATA_IMM; @@ -1595,10 +1595,10 @@ dpaa2_sec_cipher_init(struct rte_cryptodev *dev, flc->word1_sdl = (uint8_t)bufsize; flc->word2_rflc_31_0 = lower_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); flc->word3_rflc_63_32 = upper_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); session->ctxt = priv; @@ -1651,7 +1651,7 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev, memcpy(session->auth_key.data, xform->auth.key.data, xform->auth.key.length); - authdata.key = (uint64_t)session->auth_key.data; + authdata.key = (size_t)session->auth_key.data; authdata.keylen = session->auth_key.length; authdata.key_enc_flags = 0; authdata.key_type = RTA_DATA_IMM; @@ -1720,10 +1720,10 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev, flc->word1_sdl = (uint8_t)bufsize; flc->word2_rflc_31_0 = lower_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); flc->word3_rflc_63_32 = upper_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); session->ctxt = priv; for (i = 0; i < bufsize; i++) @@ -1786,7 +1786,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev, session->aead_key.length = aead_xform->key.length; ctxt->auth_only_len = aead_xform->aad_length; - aeaddata.key = (uint64_t)session->aead_key.data; + aeaddata.key = (size_t)session->aead_key.data; aeaddata.keylen = session->aead_key.length; aeaddata.key_enc_flags = 0; aeaddata.key_type = RTA_DATA_IMM; @@ -1840,10 +1840,10 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev, session->digest_length); flc->word1_sdl = (uint8_t)bufsize; flc->word2_rflc_31_0 = lower_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); flc->word3_rflc_63_32 = upper_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); session->ctxt = priv; for (i = 0; i < bufsize; i++) @@ -1928,7 +1928,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev, memcpy(session->auth_key.data, auth_xform->key.data, auth_xform->key.length); - authdata.key = (uint64_t)session->auth_key.data; + authdata.key = (size_t)session->auth_key.data; authdata.keylen = session->auth_key.length; authdata.key_enc_flags = 0; authdata.key_type = RTA_DATA_IMM; @@ -1988,7 +1988,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev, auth_xform->algo); goto error_out; } - cipherdata.key = (uint64_t)session->cipher_key.data; + cipherdata.key = (size_t)session->cipher_key.data; cipherdata.keylen = session->cipher_key.length; cipherdata.key_enc_flags = 0; cipherdata.key_type = RTA_DATA_IMM; @@ -2066,10 +2066,10 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev, flc->word1_sdl = (uint8_t)bufsize; flc->word2_rflc_31_0 = lower_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); flc->word3_rflc_63_32 = upper_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); session->ctxt = priv; for (i = 0; i < bufsize; i++) @@ -2202,7 +2202,7 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev, memcpy(session->auth_key.data, auth_xform->key.data, auth_xform->key.length); - authdata.key = (uint64_t)session->auth_key.data; + authdata.key = (size_t)session->auth_key.data; authdata.keylen = session->auth_key.length; authdata.key_enc_flags = 0; authdata.key_type = RTA_DATA_IMM; @@ -2261,7 +2261,7 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev, auth_xform->algo); goto out; } - cipherdata.key = (uint64_t)session->cipher_key.data; + cipherdata.key = (size_t)session->cipher_key.data; cipherdata.keylen = session->cipher_key.length; cipherdata.key_enc_flags = 0; cipherdata.key_type = RTA_DATA_IMM; @@ -2345,10 +2345,10 @@ dpaa2_sec_set_ipsec_session(struct rte_cryptodev *dev, /* Enable the stashing control bit */ DPAA2_SET_FLC_RSC(flc); flc->word2_rflc_31_0 = lower_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq) | 0x14); flc->word3_rflc_63_32 = upper_32_bits( - (uint64_t)&(((struct dpaa2_sec_qp *) + (size_t)&(((struct dpaa2_sec_qp *) dev->data->queue_pairs[0])->rx_vq)); /* Set EWS bit i.e. enable write-safe */ diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index c3e6fbf..9bdc014 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -126,7 +126,7 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], goto send_partial; } rte_memcpy(ev_temp, event, sizeof(struct rte_event)); - DPAA2_SET_FD_ADDR((&fd_arr[loop]), ev_temp); + DPAA2_SET_FD_ADDR((&fd_arr[loop]), (size_t)ev_temp); DPAA2_SET_FD_LEN((&fd_arr[loop]), sizeof(struct rte_event)); } @@ -258,7 +258,7 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[], qbman_swp_prefetch_dqrr_next(swp); fd = qbman_result_DQ_fd(dq); - rxq = (struct dpaa2_queue *)qbman_result_DQ_fqd_ctx(dq); + rxq = (struct dpaa2_queue *)(size_t)qbman_result_DQ_fqd_ctx(dq); if (rxq) { rxq->cb(swp, fd, dq, rxq, &ev[num_pkts]); } else { @@ -736,7 +736,7 @@ dpaa2_eventdev_setup_dpci(struct dpaa2_dpci_dev *dpci_dev, dpaa2_eventdev_process_atomic; for (i = 0 ; i < DPAA2_EVENT_DPCI_MAX_QUEUES; i++) { - rx_queue_cfg.user_ctx = (uint64_t)(&dpci_dev->queue[i]); + rx_queue_cfg.user_ctx = (size_t)(&dpci_dev->queue[i]); ret = dpci_set_rx_queue(&dpci_dev->dpci, CMD_PRI_LOW, dpci_dev->token, i, diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c index 2bd62e8..1a618ae 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -242,7 +242,7 @@ rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, #endif struct qbman_swp *swp; uint16_t bpid; - uint64_t bufs[DPAA2_MBUF_MAX_ACQ_REL]; + size_t bufs[DPAA2_MBUF_MAX_ACQ_REL]; int i, ret; unsigned int n = 0; struct dpaa2_bp_info *bp_info; @@ -270,10 +270,10 @@ rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, * then the remainder. */ if ((count - n) > DPAA2_MBUF_MAX_ACQ_REL) { - ret = qbman_swp_acquire(swp, bpid, bufs, + ret = qbman_swp_acquire(swp, bpid, (void *)bufs, DPAA2_MBUF_MAX_ACQ_REL); } else { - ret = qbman_swp_acquire(swp, bpid, bufs, + ret = qbman_swp_acquire(swp, bpid, (void *)bufs, count - n); } /* In case of less than requested number of buffers available @@ -290,7 +290,7 @@ rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, } /* assigning mbuf from the acquired objects */ for (i = 0; (i < ret) && bufs[i]; i++) { - DPAA2_MODIFY_IOVA_TO_VADDR(bufs[i], uint64_t); + DPAA2_MODIFY_IOVA_TO_VADDR(bufs[i], size_t); obj_table[n] = (struct rte_mbuf *) (bufs[i] - bp_info->meta_data_size); PMD_TX_LOG(DEBUG, "Acquired %p address %p from BMAN", diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile index 5a93a0b..068e9d3 100644 --- a/drivers/net/dpaa2/Makefile +++ b/drivers/net/dpaa2/Makefile @@ -25,7 +25,6 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 -CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2 CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal # versioning export map diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c index b93376d..4b60f56 100644 --- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c @@ -50,7 +50,7 @@ dpaa2_setup_flow_dist(struct rte_eth_dev *eth_dev, ret = dpaa2_distset_to_dpkg_profile_cfg(req_dist_set, &kg_cfg); if (ret) { - PMD_INIT_LOG(ERR, "given rss_hf (%lx) not supported", + PMD_INIT_LOG(ERR, "given rss_hf (%" PRIx64 ") not supported", req_dist_set); rte_free(p_params); return ret; diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 09a11d6..fd5897e 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -445,7 +445,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, memset(&cfg, 0, sizeof(struct dpni_queue)); options = options | DPNI_QUEUE_OPT_USER_CTX; - cfg.user_context = (uint64_t)(dpaa2_q); + cfg.user_context = (size_t)(dpaa2_q); /*if ls2088 or rev2 device, enable the stashing */ @@ -560,7 +560,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev, */ cong_notif_cfg.threshold_exit = CONG_EXIT_TX_THRESHOLD; cong_notif_cfg.message_ctx = 0; - cong_notif_cfg.message_iova = (uint64_t)dpaa2_q->cscn; + cong_notif_cfg.message_iova = (size_t)dpaa2_q->cscn; cong_notif_cfg.dest_cfg.dest_type = DPNI_DEST_NONE; cong_notif_cfg.notification_mode = DPNI_CONG_OPT_WRITE_MEM_ON_ENTER | @@ -1702,7 +1702,7 @@ int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev, } options |= DPNI_QUEUE_OPT_USER_CTX; - cfg.user_context = (uint64_t)(dpaa2_ethq); + cfg.user_context = (size_t)(dpaa2_ethq); ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX, dpaa2_ethq->tc_index, flow_id, options, &cfg); diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 183293c..f33b1fd 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -21,7 +21,6 @@ #include #include #include -#include #include "dpaa2_ethdev.h" #include "base/dpaa2_hw_dpni_annot.h" @@ -104,11 +103,9 @@ dpaa2_dev_rx_parse_frc(struct rte_mbuf *m, uint16_t frc) } static inline uint32_t __attribute__((hot)) -dpaa2_dev_rx_parse_slow(uint64_t hw_annot_addr) +dpaa2_dev_rx_parse_slow(struct dpaa2_annot_hdr *annotation) { uint32_t pkt_type = RTE_PTYPE_UNKNOWN; - struct dpaa2_annot_hdr *annotation = - (struct dpaa2_annot_hdr *)hw_annot_addr; PMD_RX_LOG(DEBUG, "annotation = 0x%lx ", annotation->word4); if (BIT_ISSET_AT_POS(annotation->word3, L2_ARP_PRESENT)) { @@ -167,7 +164,7 @@ dpaa2_dev_rx_parse_slow(uint64_t hw_annot_addr) } static inline uint32_t __attribute__((hot)) -dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, uint64_t hw_annot_addr) +dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr) { struct dpaa2_annot_hdr *annotation = (struct dpaa2_annot_hdr *)hw_annot_addr; @@ -207,25 +204,24 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, uint64_t hw_annot_addr) break; } - return dpaa2_dev_rx_parse_slow(hw_annot_addr); + return dpaa2_dev_rx_parse_slow(annotation); } static inline struct rte_mbuf *__attribute__((hot)) eth_sg_fd_to_mbuf(const struct qbman_fd *fd) { struct qbman_sge *sgt, *sge; - dma_addr_t sg_addr; + size_t sg_addr, fd_addr; int i = 0; - uint64_t fd_addr; struct rte_mbuf *first_seg, *next_seg, *cur_seg, *temp; - fd_addr = (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)); + fd_addr = (size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)); /* Get Scatter gather table address */ sgt = (struct qbman_sge *)(fd_addr + DPAA2_GET_FD_OFFSET(fd)); sge = &sgt[i++]; - sg_addr = (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FLE_ADDR(sge)); + sg_addr = (size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FLE_ADDR(sge)); /* First Scatter gather entry */ first_seg = DPAA2_INLINE_MBUF_FROM_BUF(sg_addr, @@ -243,14 +239,14 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd) DPAA2_GET_FD_FRC_PARSE_SUM(fd)); else first_seg->packet_type = dpaa2_dev_rx_parse(first_seg, - (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) - + DPAA2_FD_PTA_SIZE); + (void *)((size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + + DPAA2_FD_PTA_SIZE)); rte_mbuf_refcnt_set(first_seg, 1); cur_seg = first_seg; while (!DPAA2_SG_IS_FINAL(sge)) { sge = &sgt[i++]; - sg_addr = (uint64_t)DPAA2_IOVA_TO_VADDR( + sg_addr = (size_t)DPAA2_IOVA_TO_VADDR( DPAA2_GET_FLE_ADDR(sge)); next_seg = DPAA2_INLINE_MBUF_FROM_BUF(sg_addr, rte_dpaa2_bpid_info[DPAA2_GET_FLE_BPID(sge)].meta_data_size); @@ -299,8 +295,8 @@ eth_fd_to_mbuf(const struct qbman_fd *fd) dpaa2_dev_rx_parse_frc(mbuf, DPAA2_GET_FD_FRC_PARSE_SUM(fd)); else mbuf->packet_type = dpaa2_dev_rx_parse(mbuf, - (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) - + DPAA2_FD_PTA_SIZE); + (void *)((size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + + DPAA2_FD_PTA_SIZE)); PMD_RX_LOG(DEBUG, "to mbuf - mbuf =%p, mbuf->buf_addr =%p, off = %d," "fd_off=%d fd =%lx, meta = %d bpid =%d, len=%d\n", @@ -340,7 +336,7 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, DPAA2_FD_SET_FORMAT(fd, qbman_fd_sg); /*Set Scatter gather table and Scatter gather entries*/ sgt = (struct qbman_sge *)( - (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + (size_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + DPAA2_GET_FD_OFFSET(fd)); for (i = 0; i < mbuf->nb_segs; i++) { @@ -523,8 +519,8 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } dq_storage = q_storage->active_dqs; - rte_prefetch0((void *)((uint64_t)(dq_storage))); - rte_prefetch0((void *)((uint64_t)(dq_storage + 1))); + rte_prefetch0((void *)(size_t)(dq_storage)); + rte_prefetch0((void *)(size_t)(dq_storage + 1)); /* Prepare next pull descriptor. This will give space for the * prefething done on DQRR entries @@ -554,7 +550,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) */ while (!qbman_check_new_result(dq_storage)) ; - rte_prefetch0((void *)((uint64_t)(dq_storage + 2))); + rte_prefetch0((void *)((size_t)(dq_storage + 2))); /* Check whether Last Pull command is Expired and * setting Condition for Loop termination */ @@ -569,7 +565,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) next_fd = qbman_result_DQ_fd(dq_storage + 1); /* Prefetch Annotation address for the parse results */ - rte_prefetch0((void *)(DPAA2_GET_FD_ADDR(next_fd) + rte_prefetch0((void *)(size_t)(DPAA2_GET_FD_ADDR(next_fd) + DPAA2_FD_PTA_SIZE + 16)); if (unlikely(DPAA2_FD_GET_FORMAT(fd) == qbman_fd_sg)) @@ -726,7 +722,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) fd_arr[loop].simple.frc = 0; DPAA2_RESET_FD_CTRL((&fd_arr[loop])); - DPAA2_SET_FD_FLC((&fd_arr[loop]), NULL); + DPAA2_SET_FD_FLC((&fd_arr[loop]), (size_t)NULL); if (likely(RTE_MBUF_DIRECT(*bufs))) { mp = (*bufs)->pool; /* Check the basic scenario and set From patchwork Tue Feb 27 17:25:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129838 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp540124edc; Tue, 27 Feb 2018 09:28:21 -0800 (PST) X-Google-Smtp-Source: AH8x226fWHdgH2XS16gY7kTsig2fj8qz3mDitxsOs2HgLqxz1E6O1D4GEG2K1axjeDKhDqeOqLUc X-Received: by 10.223.189.8 with SMTP id j8mr14476706wrh.20.1519752501823; Tue, 27 Feb 2018 09:28:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519752501; cv=none; d=google.com; s=arc-20160816; b=b1CzZeDAaCZ1MLekw0q8XfQ+w06htNbqZ7FAB+VEENj5xooNpq/C5wnUixXG7ajFjA k/4rGLDx2wb/cQ49Bn1oL3AP13n5mtfo0usCwUb82prHRaDAlNsgI5SDp0BRIJwix7dT 3egB/weAqZpDfXJ6gxUUXLzu0EYsLTdDOabd1/FLeMisFNmK4NSdN+pAF/MYdIlhLmxB KGsXZh6y/Y7HJZduihYhGVoP033g3JhX5EtI4U0X2BLQBN4CXXF70EdPZXVtNi+KX1hA q5lxIOCR+XemzbzUJ0wV3FYO3WdM8BmhZu6TKZs90yb6/bzA+nrTPKM6cyKUCwkhMh0l ieYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=R3kl7+RrA6nHHRVWDDkrvpFcgPguwq4jMgmI6xgwWQo=; b=hvCb19rFk8nw7h+nIb9orY1PZtPkM5wc56S2cDTcz4Fc/BZw9K9jGzUrOJZ2dGRKZ4 1b2ohKerduksN1s7apSvWwZJj1DKbwmPiv/Zzpjo6saSFeQAIumD4wvBLH5tF3p3pqqz MEC1EYNUL36bnPvyQTGaqKSjZiWXn2a75fBLEuVHgtKYwEUwg2OsqfPr6X1dBq3JFq4F mMJALcya+eN/mnH0ip9EP90oJZ+v/IXODPanv+cPXH4EcXlgAHQraEBgdLbUnqxp6kFi u1JtMRvHPoDgTJkl2wGb+2DStEovWWgW160vRYrneKbH1HF008qf8zZztyLpSpW19hbc /KtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=ZcHn6t5V; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id h30si3152870wrh.247.2018.02.27.09.28.21; Tue, 27 Feb 2018 09:28:21 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=ZcHn6t5V; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 932864F91; Tue, 27 Feb 2018 18:27:39 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0057.outbound.protection.outlook.com [104.47.0.57]) by dpdk.org (Postfix) with ESMTP id C9C274C9F for ; Tue, 27 Feb 2018 18:27:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=R3kl7+RrA6nHHRVWDDkrvpFcgPguwq4jMgmI6xgwWQo=; b=ZcHn6t5Vibn+evLES4KQRFl0kVNjRJfB5Nud5NAhOHizm1fzJl4yhEaxkjjEI9U5oOFTpe16t5zUBTsp+P4l4MFs0Rjz8g9xvztOg6eRrJfgLU2nzVFPx4JJsPu4csnQd7zzZbQxnnBeyXaVp0Kw8yo/3xTsfLLH52TgXEwTBOw= Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 17:27:34 +0000 From: Hemant Agrawal To: dev@dpdk.org, bruce.richardson@intel.com Cc: thomas@monjalon.net, shreyansh.jain@nxp.com Date: Tue, 27 Feb 2018 22:55:49 +0530 Message-Id: <1519752352-15442-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> References: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::27) To DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0217bab5-0dd8-4f34-cb3b-08d57e076434 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DB4PR04MB0768; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 3:aHt8EbJPSx4AEoTYnXcD40biMaNSF4xAF1JnoLiI/yOkKjaLj4jvOBeUP1vG8aGsRZmSGAtZqCC/fKimRQUiYXiqLAftfEC3NjYYJ4DXiFCmegnQbFecCqt+tuk6ujkbht7qTBUb+QZZAvgCEasZOa1Yw5Bosm4Jfsq4M/Dd9pJcRqDGB4sqGe31fkoHJAJF5VfDv7z8f0aWLS9xxfwwqBSeddG3ruJcv32RfAOa1cdrYXIqAjpet9aef14nxtUX; 25:vX5Hf8axvXHFNhpFV3iH2xNcY1dNGOes+aRKcl8KA9vIq33NSrGSOGQIlDGHOUDJ0p53olIV4ix88N6Q/4Om6k/xKtBsjdkjPnNWzCYDaoqAxay/0XZm8rBe1iXSp2/eX1R6RY+StX361Arb+tM2J70Z2pNyF75/Wpe+hBa9YHS8Ff2xOjA9jABMUdXiG6P/IHk/oIu++JpQQwILdTEfdaVQ1loA2YYt+4YcXLneBeRPmenf7/CcYaJF4Ij733cuu57zeqA92PzN9vqKGj3AGXJdpPEI691DcWBZ0CZ7gX/JzSZa3fnjIk1efpTsillYief9WOPRpYHlBRz1xj2SyA==; 31:3tR/L7NJ650EqixxfxCpYmoxt1iQf9yuW/MMF8vrUDkeG1L9klvQ4wOiyShs/hOJ49elB2L+JtfKPivWRdwD92UeEQ2ANi80uR+Wj7MLYdMAH09gp30ql26Zzrcgi8JgCh7rRFfQcsdPVP+vzMVNGy4XIv8VJKDpmNItcIa/ciSSBDiOku6sx18rjM2aSClOmwt177esGvq408rICuzKLcWk3X5JT/xlMKsWqA0Kesk= X-MS-TrafficTypeDiagnostic: DB4PR04MB0768: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 20:5jjFVVK9a9HzlOGsbv7Tf5VF0DaJXSwz8v603IFSKRiWiSEVGrATxg1aT03c6mDwMFJWGo6Q38yvHrBhhjz3hiqyVdMhqaHQ6Tf31xMl22djlj9l+MdfFcT99uvGp+5iaDwfPFgBmAQNWJQF8qYp8yTgiVZLSNuVAA7e+ThqQTUg3kKBoSl5Dlv4wP1+k3NpuKHQ+NedpkEaedyc33HN2L27kvI6RCqzovK84FJ1SjYDgvUmUaS7dNPonHQCFslo5Cz83g1OTp8kg8F6Nn7a4rfW/7CLRvyz6rgb8IA/yBxulBBLAx2nIIR8asQV8dft6w/7am2R99HR6yDP45R8r9uBE3hNmhcNTqRODzUT4QJ4MFmj50VbnMowN34Q1jdyLuB/0fM7X0K467w7hWF3JXbFIZ5Ty+77NJK/T1BjO6HP5F3dWbzskXR6F4mPvj0EhLmXHXFhzNt/BYvU9HaGb5jO1+SVYeCCiEW07bwvpHB11zbzH1CZlFrA+zpfUPV8; 4:eHBM8+AMu/or4gP3LYlM1LNze8YEAha38wvDIDsb7Q7UCpJnutdupW3kR7U95u970+cjg+U/rf9yAPVirEMTVrZriy4yrDwNZuUvOnzPTIxEmoII9QzrJkfjafOJtR/wUJJD+CoxpCoYexARjXsWX0yDf2fb42JKFX/VbxTftyJ2E0PBCgh2AyuGhb2PUO1CkwfgS0bcYzE1YWFk5smQQKc2TUNpBxk22xrBEKGddCEltJxHOc7TNldgTUOyo14P1vqw5dxPqD7Fa4RuwjujVoRj2CyDNX1Z0VjUDQT5mYYlQzVStegDr+JXZ8X7Oqp1 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501198)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB0768; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0768; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(39380400002)(346002)(199004)(189003)(26005)(316002)(68736007)(105586002)(16586007)(6512007)(36756003)(66066001)(2906002)(47776003)(386003)(6346003)(4326008)(53936002)(6486002)(8676002)(55236004)(8936002)(97736004)(81156014)(76176011)(3846002)(5009440100003)(7736002)(5660300001)(6116002)(25786009)(50226002)(6506007)(305945005)(478600001)(81166006)(51416003)(52116002)(6666003)(106356001)(86362001)(2950100002)(16526019)(48376002)(50466002)(186003)(110426004)(473944003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0768; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0768; 23:6sIOvAgBVD8/ZtyCaNBzBzCxQ8bldNqssXJRDKh2F?= iukDlVWoWYyrV6CTNXr+Dag+AFBO/o+Pj8wpDUmEpxTJG/q3t44+qzRRY0awThV34nfemO4elR3r02UeztkQqh6AM04jyk9Q+1U8BRUMPrgCqwshFYi8X1Mb93yK7aBYA4lthJEv94UYR2asGWWoMW9lsi8cySpNlR6sI6Pn0mordUxH8HLjcogIxx7Jik5gyj13Gixr1fgDHjlxItIzXhTkhD2VuedAap3baiXnfzobFlAHCLGppoNgLpMD/CpnTy5AckAVwySSBY+YHvHq6c34O+sYWXgkcZRgmspb8V0HPErS5CuHeQmmRT++dAy/dsetyhSjbPxyFijnmKFbF4dOdAqewbgsPwfeHsPm7PhLJ6YcvIid2EfKYOp28nQVKurOF7SLibAvKvsGWMYss0OZomiCJkKH0AinAxr5x1hsVBKZ1Xz3YjO+RSfRzOmuDEeZKjO8wAb5VZPBEZ6XgOYdUxWplXQ4529OLiHRxiqKCLmxQXaNfaQ3C8PttPd1z7MnOsElfReAS6hWEkTaxWUr1YiIW2mZbFFLHGjrjd+P20Y/X4CfpgVx7RyfauWj+LlXl9NksMZknuDc4Ge7rRReDFXyzDPdxH6jvvCERkr3sNGi1KjRuKImwzTnI1+aob7SPVIroQrCFWzvM3R8pDBTrnbSRJPf/hQGr0U61SVxixC49mxtu62FHUYT4Qqjjh1fy9WbK2H1N4JIP1X+hNbMhubAUxl1geiHaoKFuFLiC9e+WlNkOnN71vP7s/Ohy1cz4VBSHI8xGpl1sO5W8vHjTmOIpP1b6g1G8T0J9LA9gnGDfw2XTY+lBT0ok6ymdus9CypKgEg50G2GxmLdU9WQg2BdwFA5NiHSKm+TiiW1kMnJfFFyYpOJYuQT1dxnzk62HVr9NfoifywsxyRPLTfRkO+qPQqRXyGPcUAZm3r5QuO2c7G6aFBfW2wdxRmdcm74RKXvgxKSsFneC387GGQ5pJOQcZ5EUK6hN9nsOfF0KerXyBpfgoYTUzyLeQaRPp17S7B+odO+h74ElY7lutOrUAaV8Oy0cT2iarDISIlDVDqsNVwChPxE3dFqIEmWqVP9hcOFfwfdjwbXlzSD0e1UsGay4iD7q0QqIRTzfeNvU6t5fBRpD0tL8i4yvqcaCno0tTBA41GqRXYKbhEnbUA X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 6:0LF4K9oBBFvV/mJey9i4bvhTNzKKvHD2nj3ojBG3x2gYJms1JvXJrvbuaakqxM4OyqcK22z1XaYzy3q/tQbnuVtORDUjT1EOrkw1Lr21K/NOQGG4yIOe2qj3sOY/XdGCx1pc4Jk1IUWfpiw5OhKvprdTR3F2/b5BPfUxPVtt6OM/IVsR8HGMfLMlY51gg/J5e5l0ijqYyQkpJMhlbLNvFfeAmWkqb8bIqq3RjVhbH0F795pZWuJcfOVWx7JRNYZxHJ3Rm8sUnrTa9ArAkV4RvErAHpN/0MLfjqP9Sys+63FKsYT/kKfL78qK9qkeMMwkQ4uLVJbRLd+TDnK6wfHOXv8VLSn9AQEK2LXHaj97zco=; 5:2ZLfqotmX/nfOqHhVmsLecjYL7LupNjFHgGspW/0VGA4QUlN7MoabUaoHWqyYIyaKBB7638+hv7KY/+H/Y/HAEXQRQu8z7Z1kWH3nn1Vgd8iWUEjxD1lvLxG3svu2MZntLYTY3iHZQmO5THl5TgGYz+T2vNJFHiAN18S2xdMAjA=; 24:UACUZO4xhpE7YUlpfHomtlOhWyYVuyBHr9S0jaJqE1utiOUgH2SAo7IPAl951iX5l5iHX3YPkTHxSXRSFUhz5DHLQCLJFCpyCswFdR5Yg5E=; 7:0/khj4gV6d0VZS+BfF0/O/+RGezwj8LU1OZvAbFtEDGdYn46lFQPnvPUA1zUFwtrRUCKnz/4kx4X3V9lXuWwuHdSxkzyLip4TLKVcG/1908YQ03X/F5Nfw4Ogp3k9AzS6VDWomcQOLXf64upkthbl93KZw4yYfbIgoYEhC+n8faIXWGE2vhLoWoq+xIcmK761LUdcr2ROL8nb7Giw0I/wxv8hWJokLFJojVevFhxI0SsscPdpExvZ6sQL3x5QNPm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 17:27:34.5095 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0217bab5-0dd8-4f34-cb3b-08d57e076434 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0768 Subject: [dpdk-dev] [PATCH 4/7] bus/fslmc: add 32 bit functional support for ARM X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch adds the functional logic to make the dpaa2 drivers work on 32bit machine. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/qbman_sys.h | 30 ++++++++++++++++++++++++++++-- drivers/bus/fslmc/qbman/qbman_sys_decl.h | 9 +++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/bus/fslmc/qbman/qbman_sys.h b/drivers/bus/fslmc/qbman/qbman_sys.h index 846788e..0b460c4 100644 --- a/drivers/bus/fslmc/qbman/qbman_sys.h +++ b/drivers/bus/fslmc/qbman/qbman_sys.h @@ -20,6 +20,9 @@ #include "qbman_sys_decl.h" +#define CENA_WRITE_ENABLE 0 +#define CINH_WRITE_ENABLE 1 + /* Debugging assists */ static inline void __hexdump(unsigned long start, unsigned long end, unsigned long p, size_t sz, const unsigned char *c) @@ -178,7 +181,11 @@ static inline void *qbman_cena_write_start_wo_shadow(struct qbman_swp_sys *s, s->addr_cena, s->idx, offset); #endif QBMAN_BUG_ON(offset & 63); +#ifdef RTE_ARCH_64 return (s->addr_cena + offset); +#else + return (s->addr_cinh + offset); +#endif } static inline void qbman_cena_write_complete(struct qbman_swp_sys *s, @@ -191,11 +198,19 @@ static inline void qbman_cena_write_complete(struct qbman_swp_sys *s, s->addr_cena, s->idx, offset, shadow); hexdump(cmd, 64); #endif +#ifdef RTE_ARCH_64 for (loop = 15; loop >= 1; loop--) __raw_writel(shadow[loop], s->addr_cena + offset + loop * 4); lwsync(); __raw_writel(shadow[0], s->addr_cena + offset); +#else + for (loop = 15; loop >= 1; loop--) + __raw_writel(shadow[loop], s->addr_cinh + + offset + loop * 4); + lwsync(); + __raw_writel(shadow[0], s->addr_cinh + offset); +#endif dcbf(s->addr_cena + offset); } @@ -224,9 +239,15 @@ static inline void *qbman_cena_read(struct qbman_swp_sys *s, uint32_t offset) s->addr_cena, s->idx, offset, shadow); #endif +#ifdef RTE_ARCH_64 for (loop = 0; loop < 16; loop++) shadow[loop] = __raw_readl(s->addr_cena + offset + loop * 4); +#else + for (loop = 0; loop < 16; loop++) + shadow[loop] = __raw_readl(s->addr_cinh + offset + + loop * 4); +#endif #ifdef QBMAN_CENA_TRACE hexdump(shadow, 64); #endif @@ -313,6 +334,11 @@ static inline int qbman_swp_sys_init(struct qbman_swp_sys *s, uint8_t dqrr_size) { uint32_t reg; +#ifndef RTE_ARCH_64 + uint8_t wn = CENA_WRITE_ENABLE; +#else + uint8_t wn = CINH_WRITE_ENABLE; +#endif s->addr_cena = d->cena_bar; s->addr_cinh = d->cinh_bar; @@ -333,10 +359,10 @@ static inline int qbman_swp_sys_init(struct qbman_swp_sys *s, QBMAN_BUG_ON(reg); #endif if (s->eqcr_mode == qman_eqcr_vb_array) - reg = qbman_set_swp_cfg(dqrr_size, 0, 0, 3, 2, 3, 1, 1, 1, 1, + reg = qbman_set_swp_cfg(dqrr_size, wn, 0, 3, 2, 3, 1, 1, 1, 1, 1, 1); else - reg = qbman_set_swp_cfg(dqrr_size, 0, 1, 3, 2, 2, 1, 1, 1, 1, + reg = qbman_set_swp_cfg(dqrr_size, wn, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1); qbman_cinh_write(s, QBMAN_CINH_SWP_CFG, reg); reg = qbman_cinh_read(s, QBMAN_CINH_SWP_CFG); diff --git a/drivers/bus/fslmc/qbman/qbman_sys_decl.h b/drivers/bus/fslmc/qbman/qbman_sys_decl.h index f82bb18..5640b04 100644 --- a/drivers/bus/fslmc/qbman/qbman_sys_decl.h +++ b/drivers/bus/fslmc/qbman/qbman_sys_decl.h @@ -15,6 +15,7 @@ /****************/ /* arch assists */ /****************/ +#if defined(RTE_ARCH_ARM64) #define dcbz(p) { asm volatile("dc zva, %0" : : "r" (p) : "memory"); } #define lwsync() { asm volatile("dmb st" : : : "memory"); } #define dcbf(p) { asm volatile("dc cvac, %0" : : "r"(p) : "memory"); } @@ -28,3 +29,11 @@ static inline void prefetch_for_store(void *p) { asm volatile("prfm pstl1keep, [%0, #0]" : : "r" (p)); } +#elif defined(RTE_ARCH_ARM) +#define dcbz(p) memset(p, 0, 64) +#define lwsync() { asm volatile("dmb st" : : : "memory"); } +#define dcbf(p) RTE_SET_USED(p) +#define dccivac(p) RTE_SET_USED(p) +#define prefetch_for_load(p) { asm volatile ("pld [%0]" : : "r" (p)); } +#define prefetch_for_store(p) { asm volatile ("pld [%0]" : : "r" (p)); } +#endif From patchwork Tue Feb 27 17:25:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129839 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp540372edc; Tue, 27 Feb 2018 09:28:35 -0800 (PST) X-Google-Smtp-Source: AH8x22557szN7FxWjr6mIK6562u01rzrU4ElPqMxqrzgYaGd5Smj+TSRPb30ZMiVT71KL2WmuRTS X-Received: by 10.223.172.168 with SMTP id o37mr12724070wrc.268.1519752515475; Tue, 27 Feb 2018 09:28:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519752515; cv=none; d=google.com; s=arc-20160816; b=P2IH60FYIJeadxbRPblzBSlFetbFdO4Lq2hVgjl7jKIXrc+2Ytt0CGhsEAhMUEgOWq DQYhvqt1vXQ4+wZXtEypHaCzYhZMTu9IdcxpRnczZiQyw4/kiOs/8IeO7j32iZ9/44MU XtH0GJxmyloQjCXeK3tUfYBBvj9X/NntjM1EqdE3k9tDScjXbPd+92jHFd8TSiwBDdqB hU0vJcWcQ1mEeq7eBu2/jPmNCg5Q6Gxb/a48XTzP3zx2usT9K4P4fqrrjvzqx5ws2JbA Lj/vBA+974OeSb16IfVkLxfrRWffnoZYcWP2YK95HbLW+pmNjUN4gOtG2hyWS1F/2ffo KSRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=D5ZayIA0Luz9imyBsjRBDBVd6ar0B8p+oHMOVrgQX24=; b=hp1tyidJ8hh27GWYHHTJcUwbOJdognw91M+75VmftCOEVCFirLYmgm2/fpiK9SsIqd ZssMUvm3RTRH7j6bsuQHyVda/sB1Hw/i+Tc5dPZlx+iWxVPflRVCbWv9vePwCTJ04irB RdGFgsWXjg/5EMv4NOCVvs7DqQ6rYB04R8IMUULLghwWlqEbmgQXanSrroFusdgW4ssl SMr8BQKrhYtCZ0EFzzFUv5AELETxm0UxXUbMkCHGmyHRCeWmtWPyDdox0rx3KCvMf2jT wna3rGwuHYElZP5nZGOXQQ5owR3sswfUPJF7koGvBgLgUKejAZC2qvaHAyRZhP9G4Rfo BVyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=tTllBsFt; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id n55si1534481wrf.550.2018.02.27.09.28.35; Tue, 27 Feb 2018 09:28:35 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=tTllBsFt; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B2B464CAB; Tue, 27 Feb 2018 18:27:43 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0079.outbound.protection.outlook.com [104.47.0.79]) by dpdk.org (Postfix) with ESMTP id 8FC024CAF for ; Tue, 27 Feb 2018 18:27:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=D5ZayIA0Luz9imyBsjRBDBVd6ar0B8p+oHMOVrgQX24=; b=tTllBsFtgrIgCtNYDiu8xTfmdAt8nGjRT+SXdvF2lSgNuKitN8WE5bkMs//oUZKwQ3BsqszIE3TPV+VdtSjlzEoDSTRKUpmGxfhqofLaaRAt13K9hho5RjnCNiKJl7EdxKQsqA741FMY5wtJkKepXapKgPlPrhbIe6smUIcOYVM= Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 17:27:35 +0000 From: Hemant Agrawal To: dev@dpdk.org, bruce.richardson@intel.com Cc: thomas@monjalon.net, shreyansh.jain@nxp.com Date: Tue, 27 Feb 2018 22:55:50 +0530 Message-Id: <1519752352-15442-6-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> References: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::27) To DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6c256aa3-a306-4277-87b8-08d57e0764f3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DB4PR04MB0768; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 3:Doh7UfvBkjU68l3xNtMJbRi3R9Ii8ct+PWlknO7A5qo2IFcp+6fNszgbb4FygZGSmv0VVUTZEPXRE3plVvdboWFI5bscaJ3QmycZFN84Ml7ATaMpOenGWKVNf8lFLLOwHw/QltV43l/JRbmH+bUgp6eyR5AKRC0B5ydapq9Ct+LMmnYOfsrXPaBS5rMOaCnWrByh61ySgf5eHbWqcPiTTe6mrZ9CUa//avFDsEHTp38AiTOvC3DQdHpY7Ywr7AS8; 25:cZvPA+DylNzG2EwC54xUUvQzpUq/UlsA6ncbd4WKMe8PgiM5alccOjjGc0HkF6tUoCaHZu7ChNY33MVhpYezcZ8v7ggP3GDdkH7SNQRSbrUzF643SQ8ei+gyhnUPvCfeAx+Tz4iZ2zTUrotrQIJjdhR39k8e2PVVr5+hNPvcrp0D/iXdBKYm/Lrwa5VT8XBlXnTtCL1eJcQE2FWqJR4dD0/G2dr+CJA09odpO35mjNPZOzGtvMOvdgKdhegc9ygs0oOkYvaOnhy+BX2fTtHAIH+VT/zk1rrF28b44LAz2F2FCO/4KO3rLI0srzQ94crYA/3Ecu7gmwDaIrNIdtNSQw==; 31:pHjITRpC+IWVhfNN41DgqUsKHRPj8O/SCGe6FSN7BjPZzrOrTqu6s3dTBgb595Pe9mSToTF/g1SRyevxocQE53U0nu/XzInOwl/JpwHvsr15z1X6D01uqCMLfKT6fw3wcJjpYtC+h0D3ZTK/0BrH3ple9eVvJS+oVi45LwSYNkZPvvvlIrsloBkvJINlXidMMl9kffTov71VLUVMb25Y0pxivc1QmSKg/5gRn++Avr0= X-MS-TrafficTypeDiagnostic: DB4PR04MB0768: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 20:Ms+qIiKCbccqzu03Oki2IZAXXbtbBWkjf08qIgM3h8VAkSrTBWz4PyhPo3cgK0ghI3v0pcUfBJUmeLh/WnmbpLrE1ByQhw8eQhE7bsIi/wJhSj9HaSZ466rGfDcQPPVEVLMZEhFZAsvZLw6ZFvmzLjrMWLFWEISLaf/3JCllcnvGrvOgAU89wYRd0dwx0pzPj2QR6K+pZmI4dw03vQlWFNLRzbP2tdhLBfMp8xY2NrQ1waNWIFtJGtxgmeJ2OrsJDnXhy1a2TmuTK/rb/3sCtprsncMKdgSXDZFvhAJ3EGe6SOF6ZxXD7nmL89rF3KW/CaKDlfBKUsLUOyv9wpcSFB4lDr+SAODUgKQ3dOZ69u95yFtn59somrSvPfvRAu1JDszrGABjsbP1W5/IevdnfpHEABs1m5fpDq/C/5M1QBXHp9My+iMUijJ5pzBquJmcpkZ7MEkA0raNYy3OkVBYlyJjT+IHumNtB6Ym1EpkZLJmaHj+qaif5+1eA4JfARZH; 4:9OlyzEHAa0fodvA+KsvPis6HeCOtyjt8TAdODMdy480UNmU/2Xe2hzRrmFRaqU1QrxFC/rC0MliXXGqUHbR0Qc4+Dua+m+k6afoaZH/AsLtphF7/CY23WYTd/4juRO1BQBjtZG9FgriklhukA3UL+p9k38ZC2F8h0VTGxF+u/oVkNHq9JsD6ZzvHuVlU5kt2Wa2lAke2ZLl2AVpkiQJQiDMjQxaGKXsZ9hM4kF78nJL7AB0V2xVkWLGvp0vr/fqo3qkepsAyenaRsy5jBLg9r2c7WKTjq9mGr78X5VIVrAC8VqqMelmtP46qGIUTrq5O X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501198)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB0768; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0768; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(39380400002)(346002)(199004)(189003)(26005)(316002)(68736007)(105586002)(16586007)(6512007)(36756003)(66066001)(2906002)(47776003)(386003)(6346003)(4326008)(53936002)(6486002)(8676002)(55236004)(8936002)(97736004)(81156014)(76176011)(3846002)(5009440100003)(7736002)(5660300001)(6116002)(25786009)(50226002)(6506007)(305945005)(478600001)(81166006)(51416003)(52116002)(6666003)(106356001)(86362001)(2950100002)(16526019)(48376002)(50466002)(186003)(110426004)(473944003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0768; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0768; 23:xQLPI/4Ri0Quuhk1HHfjVZyyGt7OvF43F3jBProw0?= OXs6HY+hdSBpxoj/D/7dY+PMtDbnz6a3Mgqs/QmpATWuMEZEQwE+DzzHOfbEsOgGrsddu+NLje1ocgFKV0Na2fjbCdrKcNV4AUzI/veQZitusXrObRDGdURQo8RI9af6yJEvELs1c23H2hCP7XPjJbZCdT67lbv6Pjpaav3phC/fj1rDgWzjm0WDDaiT/Ov2ppXZtzsO/luliIXk3JmNHkbCNhlz2isEpWBsEvXK+3U1X7BNKT5XOorZeXpPcG+pTB1Rf0l0KUJDgfIX6onmZO2yCVTtaCnZMAcgjc0U+5B+EDdWxriKc5sDqhc3NIlMBRFtscJHGuke66WKDSZPY+HW95VhoIX/u3oBJcTacc3hedY7K7IuwSzN0bXFzACytMg4bEf72LIqkS1w66E1sK6aa+Aluto5EokznPesJCy/yPyN9tNfskMQZPVLkXM7fafKgB31X62d3AVQPP4cYD4DOfjCCp4D2zoUuaJLg2IImMCyKkCqBRL2JcF+/NdZbJpmknQJ4R7PMmQ+X+KU/t6jH8LVSeesBEJTGEpfU1nb7pvbWUeQuJnH3R96YNR8FZT4ybS9v49A/nXgCdmWANswRaWhMrzuni4jXB0W/ih/yt3EpiqhyhDBRXZ/tKT/uEEVTsoMD6imx3UZopn45HaSoFqgicYrU52AEnww8jMce0RouoqIOIehfGC5Ov6VG3ywI7DY69SGNb9xkgXz5vCrnS9E5R3/4NxkQ3kqQJPopjdShAZDHzHAWODj5ptKtrpfywJf8peVOGqLBgRFl7RLZsX1Er1MZiqyydBT0cE2VyNTHVF9z5+Rb0K4BqMd3C45yxTAdUrCoZ0ZPZATB3qYGdcpTCbEJGgPjXsWDiYaxn88GeJSOWUMs3cdon/5aNT13x5rT1hgnW0bd/YBc4YVm9RQfZVF3i3J4EsnB1JO2sHQBdE1KEXCJdAuUmdNC1/IyxlUgRUgF+kTua84PCJarHejZxmJWHLCpEGgq765KJ44n1K9q/41bdd+zhsLAxQWTaGXn8yk3Ma2IaJtrh4dmuRuX5jlievEw64kGEDXDzdoE/WIkLgH9wycRO8VMZKZ/Mi+VXdIh2X3RZ2p5Psvd//UD9VdIXzsugJckSw2RYGPD6sivscboMlIUgVpED2quLs7Ku6IHhe/B3EXX03 X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 6:tHjBGw64HqDNvT2h6kgp5c3EXZBX3svDeSNr2/4WbKyOu3SXkiTkiyXZasQmhndhNfRoPpLxHtzQpTv0lp4Yp/9AHQoaXMAz2ym0OkB7MVp29Kayk3YlvAYSwDUPM36hKLZagfJG/bdt8FTN4JfycKYBlCBdk5IiVHk+wfv7FFowR7TzP3VMJ4fxB/8FUzV7qsnVNzO2+9Lf2K9Qu9MPw+vLBfYRJb7m0tDH8+nYvveXrGekOoshRQIe7D3XzPp7gP90KRrJE4a2UdX34bGecVKQXStYTcb3N1GVn1gU6Ej3Nkrz4aYsXa4R6i4LKKyutiqpAzmqCPW0S1lIV5NwcEWod15QCOjiKOP45Y2maCg=; 5:Opzb4J8WRYvqyWqtKp/VtgilZ+wRU0KR7vdr89mq9pXEEWqum19HAPFpKUX7dULG4P6OjYQgfgk1xLztlZCcZsiToCC1pI4MinsjvXu8vZhXSfzphCkS7Mjz1xUMs44tZ2wlQX9qxz1jE5mavX54YOctuOEmnUyNaolDuSwFKbo=; 24:JOVIKjMgsbW+axvyOmltY9DJ79Z0eC91n3GiBaMOnxRFE9h1gcPZq4oMldSiP58R6xyEFST8w9tiTH8eYXq8Y17JJqrXFhFJ+aGTCbkvjS8=; 7:g53kRdckDctCv8t5IsURPojFYHGIs22HZOdJD5Y99Z3+mu+TzjYjOTMNJ29WMpkIBpDlIE+NQWWxLbCIciMZHzodLK+pednlmWRxDC1JdRp8zUS98TsujjT3ZY4ubu+r8CF2RgVAsBrT55e42eayVM2XVDumaIycIGIVy1IMZKvBuMjutVRP378HXnW0dyyFx/mE0yl2BwAewsq2kZSpLTTPl9igEh4nFNu7+MtZxJOE8vkgAEthW0opBM1HQqQw SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 17:27:35.7595 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c256aa3-a306-4277-87b8-08d57e0764f3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0768 Subject: [dpdk-dev] [PATCH 5/7] bus/dpaa: enabling dpaa compilation for other platforms X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/include/compat.h | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/bus/dpaa/include/compat.h b/drivers/bus/dpaa/include/compat.h index 53707bb..e4b5702 100644 --- a/drivers/bus/dpaa/include/compat.h +++ b/drivers/bus/dpaa/include/compat.h @@ -39,6 +39,7 @@ #include #include #include +#include /* The following definitions are primarily to allow the single-source driver * interfaces to be included by arbitrary program code. Ie. for interfaces that @@ -127,13 +128,15 @@ static inline void out_be32(volatile void *__p, u32 val) *p = rte_cpu_to_be_32(val); } +#define hwsync() rte_rmb() +#define lwsync() rte_wmb() + #define dcbt_ro(p) __builtin_prefetch(p, 0) #define dcbt_rw(p) __builtin_prefetch(p, 1) +#if defined(RTE_ARCH_ARM64) #define dcbz(p) { asm volatile("dc zva, %0" : : "r" (p) : "memory"); } #define dcbz_64(p) dcbz(p) -#define hwsync() rte_rmb() -#define lwsync() rte_wmb() #define dcbf(p) { asm volatile("dc cvac, %0" : : "r"(p) : "memory"); } #define dcbf_64(p) dcbf(p) #define dccivac(p) { asm volatile("dc civac, %0" : : "r"(p) : "memory"); } @@ -144,9 +147,27 @@ static inline void out_be32(volatile void *__p, u32 val) asm volatile("prfm pldl1keep, [%0, #64]" : : "r" (p)); \ } while (0) +#elif defined(RTE_ARCH_ARM) +#define dcbz(p) memset((p), 0, 32) +#define dcbz_64(p) memset((p), 0, 64) +#define dcbf(p) RTE_SET_USED(p) +#define dcbf_64(p) dcbf(p) +#define dccivac(p) RTE_SET_USED(p) +#define dcbit_ro(p) RTE_SET_USED(p) + +#else +#define dcbz(p) RTE_SET_USED(p) +#define dcbz_64(p) dcbz(p) +#define dcbf(p) RTE_SET_USED(p) +#define dcbf_64(p) dcbf(p) +#define dccivac(p) RTE_SET_USED(p) +#define dcbit_ro(p) RTE_SET_USED(p) +#endif + #define barrier() { asm volatile ("" : : : "memory"); } #define cpu_relax barrier +#if defined(RTE_ARCH_ARM64) static inline uint64_t mfatb(void) { uint64_t ret, ret_new, timeout = 200; @@ -160,6 +181,11 @@ static inline uint64_t mfatb(void) DPAA_BUG_ON(!timeout && (ret != ret_new)); return ret * 64; } +#else + +#define mfatb rte_rdtsc + +#endif /* Spin for a few cycles without bothering the bus */ static inline void cpu_spin(int cycles) From patchwork Tue Feb 27 17:25:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129840 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp540537edc; Tue, 27 Feb 2018 09:28:45 -0800 (PST) X-Google-Smtp-Source: AG47ELuME6Pp+VjC2OO9DDKNQdaI2xuKUMbHkGRhahVyksdyHe0TNua0d2A5A5izoBq8TmyC15hW X-Received: by 10.28.177.215 with SMTP id a206mr6775256wmf.142.1519752525769; Tue, 27 Feb 2018 09:28:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519752525; cv=none; d=google.com; s=arc-20160816; b=A7N6cAZVavySF4fdx+8706nQHTg3g76ImXEk2xnvyKUUrKB6V6FPSTfpBku4gvWl56 UrtX44NhPWgUUJRyIUjc1tMv6J+6yZQRXVriIAvl+K2RUMsHOprZo7n3nFYxF9tpozpf zBFZv8e+AOcMB1QENhCfcCh88CtR8OUM9pUAoXyzcARI1QNE+IAe13YeqPL7iVQQR9ux u/D+S3bXlz4iKEYiP+y1fDuWAkk5sc1dFr0t8e5qhCyMTvnazjwTS8KV31C0BXstVvfS rITbMZ1Kx4G+wpX5KOsQtO5LP0DTN3v1wdsEGI83ogLlTywHUqJyx8jY8YsfSvk9uRrM Q0Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=MjmjqcIGob+uoQE6xVPSpAX0+Fx7g6gjkoE6LLToVQI=; b=z/vFLEMVpjGrVl4djMMNf/wt5Bz+5wgN/V2FGcTZrRocSBEF4xDlbGCqDRdvlHDG0k /z/dujXuTuWbuzNEraYKu4i7Qrsc3hQNlCl4nsZ28A+y1VYMKxkfyjRdsP4y1waB+n2t ybsJOWMvm2rbIgozXfNwMzla/1/wK/JBlE6TWqJC3jN/11EJYRHwF/s0rfiP7mUeMRSX BmJvu1oE28RlencckXmAVOaTlV5Iqqyyd+zZrM1q/ncpXPaLbz3ZXBjH4b3Qiz2wsMxv Q4mgJA1EUbrqG3U7Ux8SAjwXCQNU18tGJ3o1iuyi+sUoNoobOac/cd2nZyy5JXFkSv6X P7Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=AtQZF5TI; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id x3si9350977wre.44.2018.02.27.09.28.45; Tue, 27 Feb 2018 09:28:45 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=AtQZF5TI; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 704955B18; Tue, 27 Feb 2018 18:27:44 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0042.outbound.protection.outlook.com [104.47.0.42]) by dpdk.org (Postfix) with ESMTP id EA39F4F91 for ; Tue, 27 Feb 2018 18:27:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=MjmjqcIGob+uoQE6xVPSpAX0+Fx7g6gjkoE6LLToVQI=; b=AtQZF5TI7xjRI2AXaKR3mk0ih3kaBlY8PbaUyjU0kkjdaAOjWPIBvZMRomo5zty3UXcq/IZsXUjnH7nw7AtiB/beWPIIni61YvsSx38AY+BudTOMJSY6hxdIJiEpBj0TnlOEEzTDY57GhivM0OC9Vy4bSMFKfIHbYN7MVEWg8w0= Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 17:27:37 +0000 From: Hemant Agrawal To: dev@dpdk.org, bruce.richardson@intel.com Cc: thomas@monjalon.net, shreyansh.jain@nxp.com Date: Tue, 27 Feb 2018 22:55:51 +0530 Message-Id: <1519752352-15442-7-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> References: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::27) To DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 02456b55-0191-4b06-6b43-08d57e0765b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DB4PR04MB0768; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 3:n14Int2ull9YcPct8NY0DZw6B2C471X5Eu/Tag+n5D6X77+liME++fsOl2/uq4JiezhEs9loRHvBjuP2cDnRiVcHC69E9p7RMWfcdJMyKPgTwUtwkJxc420KF/MyWwAEe4XDfu85vlZuzdXbT07tTEakclAXVo/b7DLEZqT9sTVpZnggimve3woB3rc29qSzHvcq/BD0Bvn67hUG5uvao7i9a4nRG2kVtHUvD3E1I/+ByTiVOB1f46Zn2nbGA+w2; 25:HdAin5Ru+m9422kdr8egDWyu4UWaIyJ8QZhoncDzfP+6AGAoa536M4pUQRscvXJfYDnj79gBM6C9ePFCUGGWcjcspngvveu17vmzADgIVly1Mtm5rYe2c0GD0KqFEONQFekuKx4kM2jsjau1GSe01E65WXNUx4NYFPd2cfn3DeI+TSIoJ7o83pRfjMjaow/jEHC27ugFCAOjsSKDDFXMPZCOs8ukELs4RgrNagJjFRymbkD0PmABqZs/qG4GayGcF9mNG00yVHRf5kbJrugfEo2oQTYsA9bGSH52EYLLagQbeLv+Fo/M6ly6ldw6eAr3kQCpviVBb+Y8YkJTSh+jeQ==; 31:BH8CQ01QQ4n7YRtLzHgRDoYUM+hGG09hHD9+vIRb+ixfbP/PM7BFHcAdEBPmvusSPPJq9B28ZRis4d8NFM5Fr+JovXJ18MR2yyCaV3HyRVrIPVYoHEtEAK0ZiAkmRwPDAHlvkKY7mlAfFB7TcKpuG0ncnBbUQ5RfSsIbwhMFh/P2yBWV+NwE/FO0/s88NA/9pNe2IjeMoe229AT0tk0JsXaBfVdEtXB7JYfG/UViW6Q= X-MS-TrafficTypeDiagnostic: DB4PR04MB0768: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 20:/Ds6c+AJicdZneMcgGS70qr+JrxWeZDdMnIR7FG6vI5b/0SKLOXKBbfnFW9aUuWgvuH3MvkBoVuRihZvRZUGjNX2/qdOMlREDPt7CIVWbc0vZsG9ohr/Z+Z/ty845+uRraq6HK7fwGMGR2FqCuIdJAj98eVc7bP2jBGOr7g44SF/mgEIz3K7+XsKKBCRxy3Wx4v+MpJWCa+wxal+bbgq/6+/eB9PxT32OBC4dwYYt2MFROq82bqV1+DGa6mCoEqw2H6YTQrFl+zL87svJu38l+bMF1s+BOuLo0bEpFCpeLyWNAdMGqsYRZLRFJ2YeAgn3uPdtJQ8EirX3ZiZEcy/WI9Im8NcMcuSbOOkb3bEVIBcs4bvBOihhH+Y+uVyZ3naW8978cY/tYOj5BEUhaXNo9PR/GhiCAbBn1q+OcsIOODZSXzYYkt+ZPOjTtuXN5swGq8BS0784mCS8z+s6imY18E14MaOP8YX0pmhOamd8zEPdVgWfDiRzjPIi08rh+rl; 4:gRefr6QZ9yJaBDi2kOIY1qXrvUQDUpYmOIghPcKZxQyFWE9Ahm7ApvQ8mNAJ97YpPyE/iImTvSRCf6E7gi/5No8vLLW9Jg6rgncWel2dvYcBI1CobJbwTFATA9QjBM2U1sdhVq1ODjb0QW2uFDD72IqYI+JzQSnENFDIwmZ2OfzFfiWp5brb30HeI6jhHBFbGk7CBEgFNZ5gjExDu1FOrqSQX7dij6Z36oVd7ltGc4qBmd23et9lce6cl/y/fOfaKMpqOT91SoIYZrGJK7GCwxMcePXLsNXzogp635kJbNkGie+4FqL4jrONHsKfCx3Y X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501198)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB0768; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0768; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(39380400002)(346002)(199004)(189003)(26005)(316002)(68736007)(105586002)(16586007)(6512007)(36756003)(66066001)(2906002)(47776003)(386003)(6346003)(4326008)(53936002)(6486002)(8676002)(55236004)(8936002)(97736004)(81156014)(76176011)(3846002)(5009440100003)(7736002)(5660300001)(6116002)(25786009)(50226002)(6506007)(305945005)(478600001)(81166006)(51416003)(52116002)(6666003)(106356001)(86362001)(2950100002)(16526019)(48376002)(50466002)(186003)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0768; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0768; 23:tGYaqqPI1vZuOSDTBAW8sxcY1t1ywTRbkVDrHvtp0?= 1UkaYoDcyL8hYSwoLrAjZOOO7ZTetfl3Z4gFv51JPbs6zs1mVdGUr+CBVfM4FsxR9iY3NBrpieUjxaj6OIneBo25TpbqJZwlKa2meuubaC+1xrvoXxNfS10d89NoP/8cTnq+qaNhEQpCPqzcOG/9ylj63mI2I/yoGYYNz8jAdWrtNBXe4rUBLVgcHuiCjVc5c0woQ42K3B2FZWlkVNuOnq4faSaBVAm14C4fsBRHIejuxNZDmMbZb3lgrVJuAqZn2yjheJ9swReHK6J0dZTfdgPqIIpSQDaIg+IpxYleCEeUfAIoNkYFYCjEJ3Ni+XC1K+4V/HMzkSvgFv7HovTni0YgM0gkY9jyDPYb6Pyzuf2RwdWdK5zG78TeUdHAj39yIJPPEJNLjMV5s9muDd5LFLBl3Re+KuVpBp/c2McvreObho+91/R4AE9bLRKvuhQTNXNtnptVx3wiTiR6meNDxgq+1N06ZrXZAfRaI2jzQ+JRrk5T50H/e99vW1MFfO5YxsocSu93V+zPhAL5w/9o0nXKe4IQbAWcB14+kEZuXZrvZB91jkrPHJscQ4aYCsH1naP5hkacvPd8iVK10no5fxnQCT/eiVKp08w54rb2zfNunMFIJaHgx0Exmka7VnoeK1E+SGujFrc3e4DIM3JSRLPeLtc82xyUqvQymD/5TiS4TBILSFmE7WV89rAXfwzpNHXfJ2zKOHH5vIrUkylbDwX/p+GFx81QfAywjXkETgu4/2DQQzPMbrpv6JHi59ZtHJcwY9pbZ2uzWLf85fudkH2qJRcyE5T7RFjdx/EmEJJuZ0RsKLmK2MTCCUZb0rGu9oSLFLDDssJSgneIt6fUFe3HijMHrIujVjTx97fjJjiJP3rXT61z9jrful3I4dp1W+akj4MYpxjgkpA8HatSZCkcFjeD7d24oEMA3KNqCby65HFHdzlmRqJWdZBjB68dpHbwgZRHsVCtkoDRUHUmtj4aw7sXnqNwMgnKrKmhTxUTR3xT0+18S9ISunB093ilM4y3p+VF/lk/1SaeC9V93TPMScosHJ2bchJhHouQHTktygAiUkgHg+Zt5sBxLsUxlnR5idsTVO/KNffYodUf1u0C1oWgkRiwlsYLfiTaW8a9EGbIBzOdtZgX15ljcjtjgU= X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 6:26zSHRQttyKZTJix0c9QjZ4NuMEZSxnr+6Jq3m5jXiWCkp3Ow1ceYvRdkQNQ88zTp46SvU233qvOxtgHG+gnHZEy92G93cFSniGU8pJRwfo2bklP20zPgxzZUVwfqWkcndkHqAElxOpkX+A/EFv7O3a/rV8kPrFNglZVhRihIqiDJX+e4SVbNxRikdi1Mw7pL8UqXYkhQIo4PZ1fEN6m07rkCSpcYpJJe08N1XB5ZImSab+lvF7u60J2fhGsZ/MobMZX9LlfUHwmsSIK5LBbVZ25b9azKwfzOwsa3CDMdMn5E5ueM7D7qO3v3ivPmm8vL0dYvKWLfEHx58RlEWuLPSaVI23cBT1wv6Bsfm/KiWc=; 5:tzshLrbM57EZ+ifazXv6uOZ1G1eznIAUVHz7M0wEo/wL1IPeEHXz6caPPdxqWu7OtZZZ/C6ZouRSIm1NV1Nis918kOm8CDdYuXK7iRBOk71qB4fVwTYLn5jRuRvl6ss9Q2xrBNGSLRI8Qcu6KzlaKbcBQaZDhiyZ+982X1nGARE=; 24:KCO3NQcoZ+9tKZLo7h9+G2KCclqiDBR+ZPxFi4QbDiSwq+pKFqGL2rdXnSvfTE8iX6ZcmvWIJSZ0c7tXnwGQ9bpB4Pq8WNfg9cLclA0P0xM=; 7:GLFk59lFTkRXTJ9PYQknRo/JD9F8SiAQeQsFRt/pKJdG27JEgNqpukKTdoHb7wDy3hqK0eCfNPQ0C9fgCU1tprHfxTUQI+eApX+3hgsJW0puJgqz50ZMrWnHYIaBFnLdmchBlJYz5jJtwUfU9HMu9lLUVY8mAP4Qpy5V63p8l7ycbK7Bced2cEbP65VtqmKM2JVVaRzGJMy2iDB4TQHh3i2q1jkwY1BtlG6LAmsPAb8CQwgH7a46PetHOKkXF7rq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 17:27:37.0564 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02456b55-0191-4b06-6b43-08d57e0765b9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0768 Subject: [dpdk-dev] [PATCH 6/7] bus/fslmc: enabling dpaa2 compilation for other platforms X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/qbman_sys_decl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.7.4 diff --git a/drivers/bus/fslmc/qbman/qbman_sys_decl.h b/drivers/bus/fslmc/qbman/qbman_sys_decl.h index 5640b04..fa6977f 100644 --- a/drivers/bus/fslmc/qbman/qbman_sys_decl.h +++ b/drivers/bus/fslmc/qbman/qbman_sys_decl.h @@ -36,4 +36,18 @@ static inline void prefetch_for_store(void *p) #define dccivac(p) RTE_SET_USED(p) #define prefetch_for_load(p) { asm volatile ("pld [%0]" : : "r" (p)); } #define prefetch_for_store(p) { asm volatile ("pld [%0]" : : "r" (p)); } + +#else +#define dcbz(p) RTE_SET_USED(p) +#define lwsync() +#define dcbf(p) RTE_SET_USED(p) +#define dccivac(p) RTE_SET_USED(p) +static inline void prefetch_for_load(void *p) +{ + RTE_SET_USED(p); +} +static inline void prefetch_for_store(void *p) +{ + RTE_SET_USED(p); +} #endif From patchwork Tue Feb 27 17:25:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 129841 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp540694edc; Tue, 27 Feb 2018 09:28:57 -0800 (PST) X-Google-Smtp-Source: AH8x224YJm+sPAIzzCnU3L5fD/d61qLpFQoMx7J6ZVfsVrhNkGss3N6v49ObIBDuck2JnqG2VMHj X-Received: by 10.28.39.67 with SMTP id n64mr13119187wmn.0.1519752537713; Tue, 27 Feb 2018 09:28:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519752537; cv=none; d=google.com; s=arc-20160816; b=d6NsYcYrGLLCNxDywH8e+Heh9xm+q7c98RrqDqTmkzB8hvN1U8kk6zPAVO3vfldpTM glxGeTrb5ZM8aZfsxCsbjve9JCvv1AMDvf95gMcWNmc66dQar9AuxWAKdw8kyYWj9UDN +mINE736iYxucQB7eLkKddRDfab3JZvX1a+erQm17gT3BuvrJDwLKqQyWKt1QvLy70yR rC2VLNsTOHYwuUYJh0EqGhiU9HAcvqqNscf1DUCbSPDxiESiSN0CEEiQphrSVfXBargr yQ1FxBOZLTlwjuNNmR+YkxR1DJQFUV22IOXTqBrDVqrXPgulsT334z7sUK9DoNJv49V2 +r9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:dkim-signature:arc-authentication-results; bh=5qhiEGKJfwYBvtfECkEuVUlu9KSTBgzr4wWVjSRVPIE=; b=A1ask2dnx1Igy3YvzvQ4OW1kX3tH2HyvOGzMrgeFfh9LNJhcHFtdoDoHpgpct81gAY r5CTF6KV5IbCwUQ5iXInkWEqO6Q+kWXpghE63TLYDjGtY1Beq0N1h8MOt0H+J3/IkVfl 57w59OWJI/fhRZmrmLCCMX2yDFdccYw9wwdZeukKMXc0L6DzBya0JLEpefwWUSQBwZ8m +ahCRhOvFMJr86CBpfTXNQ+f3YlLLetGZZsyXU8NcC9ntV/hvqmyCj6NBN3r4H8c4uTn 1K77o3vHH1rJYZjQUWmrGO/QDLEOuV6zDSrkzkys/sr8I9LSBZk6xqoqjnhaOMX2yI3Z Nelg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=LTuHzKd2; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id f189si1472366wme.207.2018.02.27.09.28.57; Tue, 27 Feb 2018 09:28:57 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; dkim=fail header.i=@nxp.com header.s=selector1 header.b=LTuHzKd2; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4B44B5B28; Tue, 27 Feb 2018 18:27:45 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0083.outbound.protection.outlook.com [104.47.0.83]) by dpdk.org (Postfix) with ESMTP id D017A4C97 for ; Tue, 27 Feb 2018 18:27:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5qhiEGKJfwYBvtfECkEuVUlu9KSTBgzr4wWVjSRVPIE=; b=LTuHzKd2AK/04MEwuivFSPeO+czNx6mKcLzNXtI7eGqo3b7ihq/9eKZjBYXh0b2uPp/KZzYhn7znHJj8kKD2beBdNXjzonU4h0El5X/56rqG/0fjo7TMZq55Ob5FkBBjgVYE4ojN+b1MpmmRCGJR4ci81k+3RjcaxqNtbU5bTmM= Received: from bf-netperf1.ap.freescale.net (14.142.187.166) by DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 17:27:38 +0000 From: Hemant Agrawal To: dev@dpdk.org, bruce.richardson@intel.com Cc: thomas@monjalon.net, shreyansh.jain@nxp.com, Akhil Goyal Date: Tue, 27 Feb 2018 22:55:52 +0530 Message-Id: <1519752352-15442-8-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> References: <1519752352-15442-1-git-send-email-hemant.agrawal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [14.142.187.166] X-ClientProxiedBy: BM1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:18::27) To DB4PR04MB0768.eurprd04.prod.outlook.com (2a01:111:e400:984d::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 50445549-ed79-4d81-eb1a-08d57e07669b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:DB4PR04MB0768; X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 3:1LTCOoVnX5dSOYocPwGygD8oAEhMu7wMQ1p9i/60XJD/UDzuSQAWtstNBsvD5hUcuaaujeiC0i0xHCb3ZgLJZtRV+t1k8DEfFmDcYQkTz5TL9aTtGqBMvAEMtajfJPABZp8nqol8lL+eOHlMwWKdkcDVWd3W9BqwoQK1ZrvQPJdL7Y7F217dqKJUEnQW2gsJeVKqrJVU7Qxu01ok6FRKbSGUCKSndT99UROyrdOK1uQtR+ifGbcxn5j7962hcQCI; 25:D1mhJCciTTIUzq16BBmtF0uCh+CXXnozQ9IwYygi9naSTLzEjy+gzLGiXowsceEdXSXnUiQrQem1jZBnx73Jx+Qqs/kA/DlIO7Kj5TnRW9bSjNV9mhHH7LHYowvNw88zuEZ/wFa4yrLuiLyKbe0jgqTcBHYCSkmFAvASqwdPRjYTGv48LwcLIL9a5naHRIBMf7lX5pC3oEw2XSF2cr9xWkw5Y+U2LIAenjK0m6b0PclPuSBTVyywc+M0L3SXR7/mBoKs04W5HAcaKMa+7etDg7xLmJymj43yyzPsDUxWnL4vTJYW2wp/p1mPgvOuTxFLSX0Xvh7oNICYGu1RE6jrsA==; 31:GSp8GVMqwptS7sohdVq9jqSw/gSakcXFSIQXctUpGdZhguOybczLb0uCN1kqDqYLvB6m95LwK5K2ObfajX88EU6ecLhDIoNbh1agFcV/ZQTJR9a9FxLyov3YGriL7EkwgXRwtn7sXRNxFmzdwlCOYaAImTYwQWGg4UXvzksUXgxA6R/Cr28HE5saWEp98wj9t4I/G/IpTyaR+yxF6pVd02LcHTwLex+4OCqUVt6f7d4= X-MS-TrafficTypeDiagnostic: DB4PR04MB0768: X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 20:F6Walwf99bifaZbnZJwsJ1eLeFf5AA906UaHw8+Y/KWaRf1/ylNuUvhs97E8TtyU0/v0DwzviZsm1w6kHFDuy2SbwXOmSiKXwBr6PS2dMhPAadNA6/AXkVNPbPxUZg7SOcmyN5eVNWR0g1WGlcPpeF248Tr2VSPHJgP5Y1IChB84K6K66xLGRrjbWzrSTxLacqU1nQYhrBgQFoCI7rNIXmAUkvzVWdT06ORoFwdyqaK0s25U/mc/G7un8P0INfse8Yp1Bmm9Obi9Xgr83XH5n9c6VQktlOHiv1N+H2FK/vGEooc30vnT8E1SCdevJknJPJSTunT0nSGd43FGXUg4exwgnO5hVThbdwbpaiBy+rr9Hd5ob/SgOrZivFzCJvND3JgmD9QeE0jbcJOsrOGjHSEpNSCThT2X18LGixuLAmQWo5mruUGgzTaUeO2wf+BJWfkLpMpuaCPwN+w6G+ti+nG+zBVcpAole9PC2zXCk+xa4cVQ60TSV5T7NsxBm1+2; 4:lInCyu4PY7U6UzbDY5pmGv8R2ONokFdQw6WZy4pMM88WLR4Atg2GnavpZ69ip9ScHgflakWhd06B4pMeAg4HNFdzKT/fd3RIGU5tvbLt9SFvmJgtUvGqresEtRsDhxnHXtGgyKG3fOSeak2MUqqMjXyDxNeUBw8U9zzEv19rtqn9AYSXYZXq1AeRT3tBDNLClJqEcBRI/AFNZITE8iXhzM750ZBvicLEGEppC0dxkWt7I8AGGFZH1V7bujq1s2XWoL0To5miZ28b0m5lKRJQPCjcjOngZevAgqeot4n1Z5W6aoeX3YRzdoNGl/SXK2ojmAM8nVqfZksQGwt+t6lVXl5WfF8E61WPLgBQ7ue00yvOYpF2OdKWGh3ggz3sd0lE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705)(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(8121501046)(5005006)(3002001)(3231220)(944501198)(52105095)(93006095)(93001095)(10201501046)(6055026)(6041288)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DB4PR04MB0768; BCL:0; PCL:0; RULEID:; SRVR:DB4PR04MB0768; X-Forefront-PRVS: 05961EBAFC X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(39860400002)(39380400002)(346002)(199004)(189003)(26005)(316002)(68736007)(105586002)(16586007)(6512007)(36756003)(66066001)(2906002)(47776003)(386003)(6346003)(4326008)(53936002)(6486002)(8676002)(55236004)(8936002)(97736004)(81156014)(76176011)(59450400001)(3846002)(5009440100003)(7736002)(5660300001)(6116002)(25786009)(50226002)(6506007)(305945005)(478600001)(81166006)(51416003)(52116002)(6666003)(106356001)(86362001)(2950100002)(16526019)(48376002)(50466002)(186003)(110426004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB4PR04MB0768; H:bf-netperf1.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=hemant.agrawal@nxp.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB4PR04MB0768; 23:gHeZOhCiQ/wh+M2xraJe9uPJMMUBvFCaTNEHpknBE?= UBUWhZp7vcxeKrT3G+kCunEgMCPV7YMy34+oa8ewVBDAMgbeDdDutYrcXnYuZ9krw9TPTgd+H5nFWdI98ISzGqO0Y9A4xM08AOaNXVUfXJ+wKEUTPOcxNHl3B8Ap0pUqexRR+1jFY62cY9PhRLDHF4VcQ8Qq3lbWTIT+EJ8tzeSpEzR6Feqr2YIamzJFjfO6p8ZreoOEYRrc3R4IogQ42jXbTQxsgJepPw4dw7idu/jqZ991s5vieK/+ySLenXn2GGSQ/C/28pr/2xnlAze2l+T5gg6S06ErNhBTz7MeEpcy6x6n7mmli9PLhJqdQ5ptS2YOJNvUmCE9fb2LOAZGYKggSxF3j08hvh15XUmeHa76OQoOFYfBE8zttiVpvHH7LQXNysZcWt/hRv+wd2z38vM9KJI48Dz6OWmpRkrTYc7m7JDUA/XmGv3tEPsj1zckCAqEYfXyTgfm2dFzrvn9fTzkKqS+gDhz9L9V5Z6vxyKDqZGbHifbSUJUG2ovWDaLjNb+VobObcQS8uizSc5TOCePuTTUJ9Kk44SVMviTNbTndv9gmKJcIwEulRPwUdqhJX3IrI+q1VH6A6v0nHBXXwJ+kvMvAmUESJMi5cPgas1PmgnlpXcyRMwq5tSfr/W1sTehHhJKC6R3AC430GW/6c/RwITspMcOUMBm5wf31mDS7uMjEeeydwjuYc+p/LE68gV94xCVd9m1tOCF+ZEXiHmZvKd00Zs3n8RmJ7jTclEYbtk141yEjwQlwFoas14dMGSgdSdcZMR+2/itD4abb10B1X4GcdSEREWcUOmFXnUyIeEHJuV0qj2nS+bVXn+TNl3DH62mtjGKSkSIodwoQq/+zyXvjeswoGj5uASftEzgIDMopnvcAAaXTGDTJEF/cG9aFks8Bsr/D1fsLnoPfB3I6vO8EtfwuuriI/hR/SZojyrdzchFceKtcZ4enskzIeaGmKxGaskGvKttWTRBwmGnR/DM90YoE7MDQZLM/MesSvJ15lJIjQDM9zCeODqJoubVk+h1oYN6hUYyvH6L8nb4W7nH3JadWBG3xzrBaArI854I+iDkFzN42mhvUdto8gT0jA4mPq1juWl/+MC3ZoSB5oKvQW7aU4TgXn8lniWTM2KPjUYLFTAYpm9f7OVgRArIsQg4r2e8uepJao2qu6q X-Microsoft-Exchange-Diagnostics: 1; DB4PR04MB0768; 6:AJHJPERwiZieDscJyT/inpD0ZXEf/sJTU7AeSRnXdE2uZTp5aFTjnB0T50FE0g4kfSDIUxJk6756hkcrBd9z7qwOzdXJPaLzuGajYLnFMsTccLNdjisTeyeT6K7U9oJ3oDtQatSbjitk7ja6DAl8kVcPr6KLepAbmf+TIGXMZo0+1nmMvTDNLeOYexQX4x+LfJDDsS+90lCQbQhNXXrWXl3p8KqatIE+Kodl3CkVy+eMUZfx5EfxOx857Fxc+e1Tp09TZoJMkgYcIYT21Z4Syt+Ss9p0HyPocPUfCQvrfr5l8/jJMEOGndDwMjK/pDmazg6L8D2+XUStAHK82WQI5AFLnlj9autEghd65xsZMlk=; 5:dd45tfiEOrq73ac2kPcFI+PLkra2WE+DmKnm9K3T47I3DntlSSpKGaNZ73CVyKZZ3qKd6rqtCQlMqu8F+bktBMVeXLYhMci/Aen53jLl5IzNJaf1FVc9aAv1t3ERcrb6YCNnNec81NI4ixYBNoolD9zSbyf/lLU+VrjEIv6L9x4=; 24:K6zT/LsdPfCLOQYhG0lfmZRE4LeQ5v4JmWv6a99zdSwp6Pj5KVgPBOZqGmWOh6gtfz3pQ1kyfLOD07qps+phHphGW0fBC1K5EhTN1ZGezm4=; 7:/f/B+xKPxVoG4W5RRLBs7L5uWhK3PrV42oXEdIx7eO4WyY58D49J/rZtGzuD0YbtSl+Bvbeolnv8JxuFlOh3zC7Xhu6/DVTWvCbzEwcj4Hgb3xk3puHcWOHHaJp8y66hGvi7f2ZhUGW/kPP9MZKTZzniCpOnWWw3biRzd83Ko+DhR6hPgszNGfaaHnRkD3mbdHBQqUpp4mbBELo4+q5RuBYbsICRMKmIOxPLiHmpwLL7nUHx8P0/5ZsJd+t1jSAc SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2018 17:27:38.3845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50445549-ed79-4d81-eb1a-08d57e07669b X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR04MB0768 Subject: [dpdk-dev] [PATCH 7/7] build: add meson support for dpaaX platforms X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Akhil Goyal Signed-off-by: Hemant Agrawal --- app/test-pmd/meson.build | 3 +++ config/arm/arm64_dpaa2_linuxapp_gcc | 13 +++++++++++++ config/arm/arm64_dpaa_linuxapp_gcc | 14 ++++++++++++++ config/arm/meson.build | 13 +++++++++++++ drivers/bus/dpaa/meson.build | 29 +++++++++++++++++++++++++++++ drivers/bus/fslmc/meson.build | 28 ++++++++++++++++++++++++++++ drivers/bus/meson.build | 4 ++-- drivers/crypto/dpaa2_sec/meson.build | 16 ++++++++++++++++ drivers/crypto/dpaa_sec/meson.build | 16 ++++++++++++++++ drivers/crypto/meson.build | 3 +++ drivers/event/dpaa/meson.build | 11 +++++++++++ drivers/event/dpaa2/meson.build | 12 ++++++++++++ drivers/event/meson.build | 2 +- drivers/mempool/dpaa/meson.build | 9 +++++++++ drivers/mempool/dpaa2/meson.build | 9 +++++++++ drivers/mempool/meson.build | 2 +- drivers/net/dpaa/meson.build | 15 +++++++++++++++ drivers/net/dpaa2/meson.build | 16 ++++++++++++++++ drivers/net/meson.build | 2 +- 19 files changed, 212 insertions(+), 5 deletions(-) create mode 100644 config/arm/arm64_dpaa2_linuxapp_gcc create mode 100644 config/arm/arm64_dpaa_linuxapp_gcc create mode 100644 drivers/bus/dpaa/meson.build create mode 100644 drivers/bus/fslmc/meson.build create mode 100644 drivers/crypto/dpaa2_sec/meson.build create mode 100644 drivers/crypto/dpaa_sec/meson.build create mode 100644 drivers/event/dpaa/meson.build create mode 100644 drivers/event/dpaa2/meson.build create mode 100644 drivers/mempool/dpaa/meson.build create mode 100644 drivers/mempool/dpaa2/meson.build create mode 100644 drivers/net/dpaa/meson.build create mode 100644 drivers/net/dpaa2/meson.build -- 2.7.4 diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 7ed74db..83f8bb1 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -32,6 +32,9 @@ if dpdk_conf.has('RTE_LIBRTE_SOFTNIC_PMD') sources += files('tm.c') deps += 'pmd_softnic' endif +if dpdk_conf.has('RTE_LIBRTE_DPAA_PMD') + deps += ['bus_dpaa', 'mempool_dpaa', 'pmd_dpaa'] +endif dep_objs = [] foreach d:deps diff --git a/config/arm/arm64_dpaa2_linuxapp_gcc b/config/arm/arm64_dpaa2_linuxapp_gcc new file mode 100644 index 0000000..87337fb --- /dev/null +++ b/config/arm/arm64_dpaa2_linuxapp_gcc @@ -0,0 +1,13 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-gcc-ar' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = 'dpaa2' diff --git a/config/arm/arm64_dpaa_linuxapp_gcc b/config/arm/arm64_dpaa_linuxapp_gcc new file mode 100644 index 0000000..f769435 --- /dev/null +++ b/config/arm/arm64_dpaa_linuxapp_gcc @@ -0,0 +1,14 @@ +[binaries] +c = 'aarch64-linux-gnu-gcc' +cpp = 'aarch64-linux-gnu-cpp' +ar = 'aarch64-linux-gnu-gcc-ar' +strip = 'aarch64-linux-gnu-strip' + +[host_machine] +system = 'linux' +cpu_family = 'aarch64' +cpu = 'armv8-a' +endian = 'little' + +[properties] +implementor_id = 'dpaa' diff --git a/config/arm/meson.build b/config/arm/meson.build index 4e788a4..c1ab6ed 100644 --- a/config/arm/meson.build +++ b/config/arm/meson.build @@ -54,6 +54,17 @@ flags_cavium = [ ['RTE_MAX_LCORE', 96], ['RTE_MAX_VFIO_GROUPS', 128], ['RTE_RING_USE_C11_MEM_MODEL', false]] +flags_dpaa = [ + ['RTE_MACHINE', '"dpaa"'], + ['RTE_CACHE_LINE_SIZE', 64], + ['RTE_MAX_NUMA_NODES', 1], + ['RTE_MAX_LCORE', 16]] +flags_dpaa2 = [ + ['RTE_MACHINE', '"dpaa2"'], + ['RTE_CACHE_LINE_SIZE', 64], + ['RTE_MAX_NUMA_NODES', 1], + ['RTE_MAX_LCORE', 16], + ['RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', 'n']] ## Arm implementer ID (ARM DDI 0487C.a, Section G7.2.106, Page G7-5321) impl_generic = ['Generic armv8', flags_generic, machine_args_generic] @@ -69,6 +80,8 @@ impl_0x51 = ['Qualcomm', flags_generic, machine_args_generic] impl_0x53 = ['Samsung', flags_generic, machine_args_generic] impl_0x56 = ['Marvell', flags_generic, machine_args_generic] impl_0x69 = ['Intel', flags_generic, machine_args_generic] +impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic] +impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic] if cc.get_define('__clang__') != '' diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build new file mode 100644 index 0000000..c4257a5 --- /dev/null +++ b/drivers/bus/dpaa/meson.build @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +deps += ['pci', 'ethdev', 'eventdev'] +sources = files('dpaa_bus.c', + 'base/fman/fman.c', + 'base/fman/fman_hw.c', + 'base/fman/of.c', + 'base/fman/netcfg_layer.c', + 'base/qbman/process.c', + 'base/qbman/bman.c', + 'base/qbman/bman_driver.c', + 'base/qbman/qman.c', + 'base/qbman/qman_driver.c', + 'base/qbman/dpaa_alloc.c', + 'base/qbman/dpaa_sys.c') + +allow_experimental_apis = true + +if cc.has_argument('-Wno-cast-qual') + cflags += '-Wno-cast-qual' +endif + +includes += include_directories('include', 'base/qbman') +cflags += ['-D_GNU_SOURCE'] diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build new file mode 100644 index 0000000..87475ee --- /dev/null +++ b/drivers/bus/fslmc/meson.build @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +deps += ['eal', 'ethdev', 'eventdev'] +sources = files('qbman/qbman_portal.c', + 'qbman/qbman_debug.c', + 'mc/dpmng.c', + 'mc/dpbp.c', + 'mc/dpio.c', + 'mc/mc_sys.c', + 'mc/dpcon.c', + 'mc/dpci.c', + 'portal/dpaa2_hw_dpio.c', + 'portal/dpaa2_hw_dpbp.c', + 'portal/dpaa2_hw_dpci.c', + 'fslmc_vfio.c', + 'fslmc_bus.c') + +allow_experimental_apis = true + +includes += include_directories('../../../lib/librte_eal/linuxapp/eal') +includes += include_directories('mc', 'qbman/include', 'portal') +dpdk_conf.set('CONFIG_RTE_ARCH_ARM_TUNE', 'cortex-a72') +cflags += ['-D_GNU_SOURCE'] diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build index c6af500..2187f6b 100644 --- a/drivers/bus/meson.build +++ b/drivers/bus/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['pci', 'vdev'] -std_deps = ['eal'] +drivers = ['pci', 'vdev', 'fslmc', 'dpaa'] +std_deps = ['eal', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_BUS' driver_name_fmt = 'rte_bus_@0@' diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build new file mode 100644 index 0000000..e80f15d --- /dev/null +++ b/drivers/crypto/dpaa2_sec/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +deps += ['bus_fslmc', 'security', 'mempool_dpaa2'] +sources = files('dpaa2_sec_dpseci.c', + 'mc/dpseci.c') + +allow_experimental_apis = true + +includes += include_directories('mc', 'hw') +dpdk_conf.set('RTE_DPAA2_SEC_PMD_MAX_NB_SESSIONS', 2048) +ext_deps += dep diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build new file mode 100644 index 0000000..10a7dd3 --- /dev/null +++ b/drivers/crypto/dpaa_sec/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +deps += ['bus_dpaa', 'security'] +sources = files('dpaa_sec.c') + +allow_experimental_apis = true + +includes += include_directories('../dpaa2_sec/') +dpdk_conf.set('RTE_LIBRTE_DPAA_MAX_CRYPTODEV', 4) +dpdk_conf.set('RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS', 2048) +ext_deps += dep diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index 17041ad..a08bce5 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -2,6 +2,9 @@ # Copyright(c) 2017 Intel Corporation drivers = ['qat', 'null', 'openssl'] + + drivers += ['dpaa_sec', 'dpaa2_sec'] + std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps config_flag_fmt = 'RTE_LIBRTE_@0@_PMD' driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build new file mode 100644 index 0000000..0a26d5d --- /dev/null +++ b/drivers/event/dpaa/meson.build @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif +deps += ['mempool_dpaa', 'bus_dpaa', 'pmd_dpaa'] +sources = files('dpaa_eventdev.c', +) + +allow_experimental_apis = true diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build new file mode 100644 index 0000000..686b622 --- /dev/null +++ b/drivers/event/dpaa2/meson.build @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif +deps += ['mempool_dpaa2', 'bus_fslmc', 'bus_vdev', 'pmd_dpaa2'] +sources = files('dpaa2_hw_dpcon.c', + 'dpaa2_eventdev.c' +) + +allow_experimental_apis = true diff --git a/drivers/event/meson.build b/drivers/event/meson.build index d7bc485..f1c3678 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['skeleton', 'sw', 'octeontx'] +drivers = ['skeleton', 'sw', 'octeontx', 'dpaa', 'dpaa2'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' driver_name_fmt = 'rte_pmd_@0@_event' diff --git a/drivers/mempool/dpaa/meson.build b/drivers/mempool/dpaa/meson.build new file mode 100644 index 0000000..08423c2 --- /dev/null +++ b/drivers/mempool/dpaa/meson.build @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +deps += ['bus_dpaa'] +sources = files('dpaa_mempool.c') diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build new file mode 100644 index 0000000..402d087 --- /dev/null +++ b/drivers/mempool/dpaa2/meson.build @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +deps += ['mbuf', 'ethdev', 'kvargs', 'bus_fslmc'] +sources = files('dpaa2_hw_mempool.c') diff --git a/drivers/mempool/meson.build b/drivers/mempool/meson.build index 5991856..47431cd 100644 --- a/drivers/mempool/meson.build +++ b/drivers/mempool/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['ring', 'stack', 'octeontx'] +drivers = ['ring', 'stack', 'octeontx', 'dpaa', 'dpaa2'] std_deps = ['mempool'] config_flag_fmt = 'RTE_LIBRTE_@0@_MEMPOOL' driver_name_fmt = 'rte_mempool_@0@' diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build new file mode 100644 index 0000000..e5a2d17 --- /dev/null +++ b/drivers/net/dpaa/meson.build @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif +deps += ['bus_dpaa'] +deps += ['mempool_dpaa'] + +sources = files('dpaa_ethdev.c', + 'dpaa_rxtx.c') + +allow_experimental_apis = true + +install_headers('rte_pmd_dpaa.h') diff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build new file mode 100644 index 0000000..025c587 --- /dev/null +++ b/drivers/net/dpaa2/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2018 NXP + +if host_machine.system() != 'linux' + build = false +endif + +deps += ['bus_fslmc'] # same with vdev bus +deps += ['mempool_dpaa2'] # same with vdev bus +sources = files('dpaa2_ethdev.c', + 'dpaa2_rxtx.c', + 'base/dpaa2_hw_dpni.c', + 'mc/dpni.c', + 'mc/dpkg.c') + +includes += include_directories('base', 'mc') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index 704cbe3..6d7a772 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -4,7 +4,7 @@ drivers = ['af_packet', 'bonding', 'e1000', 'fm10k', 'i40e', 'ixgbe', 'null', 'octeontx', 'pcap', 'ring', - 'sfc', 'thunderx'] + 'sfc', 'thunderx', 'dpaa', 'dpaa2'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus