From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0049.outbound.protection.outlook.com [104.47.2.49]) by dpdk.org (Postfix) with ESMTP id E4D662A62 for ; Fri, 1 Dec 2017 04:30:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9btlRmzw2HIq4H7Boh64DgR98BGhnj7IsT6V9h8/MHE=; b=dM5121XCeURhsurSALfFUaHUYWSZzDMnlMun71ZnpIpWowMXumwoDgGFuOPKAQYOCwEPwZL4xTuD9E2IKOepjNna/x2gApVd9XEzbwJVAjromSB9l/4FtvurjfqUEUaw1nDk/QIjIKDnUDkITbAGSrlxkp634lQf24UYFXGSkMw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Jianbo.Liu@arm.com; Received: from arm.com (113.29.88.7) by VI1PR0801MB1358.eurprd08.prod.outlook.com (2603:10a6:800:3b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Fri, 1 Dec 2017 03:30:20 +0000 Date: Fri, 1 Dec 2017 11:29:07 +0800 From: Jianbo Liu To: Tomasz Duszynski Cc: dev@dpdk.org, mw@semihalf.com, jck@semihalf.com, dima@marvell.com, nsamsono@marvell.com Message-ID: <20171201032905.GA21389@arm.com> References: <1512048743-23749-1-git-send-email-tdu@semihalf.com> <1512048743-23749-2-git-send-email-tdu@semihalf.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1512048743-23749-2-git-send-email-tdu@semihalf.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [113.29.88.7] X-ClientProxiedBy: SG2PR06CA0090.apcprd06.prod.outlook.com (2603:1096:3:14::16) To VI1PR0801MB1358.eurprd08.prod.outlook.com (2603:10a6:800:3b::10) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86087c4c-3587-4b2d-7f1e-08d5386bdaeb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(48565401081)(2017052603286); SRVR:VI1PR0801MB1358; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1358; 3:0EVjVEr/VKdQSXTMhKPkQxK04uU88Jv5x2trL7wNBdzH+dVfFH8PuYzN3fc42qUVkOS/dk5y9Jh2vEQEth8egUuk2qSRxZqXXZcOX71DPuqaVSkKh7heipYS80XLhlTPPJD7EJyDyM3jlZ3qRYkQs5JNbsA8DVpLYE8qHIu3EEnbs2RI5CRk9qdcsjP2KUcFBVyf3LxYKXIfUXlyzZS6cr6dl0bDP9h1NsZZYOurFxUqOO+SzK9wh3ajpJ90Co3a; 25:3X23aPCUz7xqSzHTyJNhW/ePhEVNc3s0QUmiRG7EHk6wW+yAx/6pz2hGsmgu/FDN9dhWLmkAvTzK7ano6+hTiVrHjKMWebrShwYZDA0BOzRUr2hhd2mTwUQQGGK05njXwDw1q+4vBE2crr7XWSMaqlmOp4jwfDnIip2Ozjxc9R45V4IALhBSWJP7glTWQmm0frQZ4mU8DFV+oqFdWuzIJCxi4n2iSwLApuzyqmnmS33ttzVy8vneWFt0jE/HxhjuFVw9NzlQcsvoM4VvKkYpDoeCGcThpw9nfsGLSa5s2OHrQywogpKuWg5s3hGsz/+IXzl3SRLsFKhijK4auI5ohQ==; 31:Z+7TFagA1sTp2bLE8h9IeWKi2Vre2SFpjpEcVBlsUh7A1NYI4gbK73GHFmVN+/8OqEszp6PITjwMHnV1aSqCpl9ZTkZCKefNPU3N072Km2YRz2zc+P9KYBVOmm6QdYkv1zZnFCSYPymiUfcZyBRT4kfRRoDl1WEag37DBpPK7v/hMMLpFCcf8z7fbviPpIHzflXYs3vriUbHG21R194BrE07wcEA/XNJ7UUo7kLtPLQ= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1358: Content-Transfer-Encoding: quoted-printable X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1358; 20:L6rXkEUE0sjzdSIWbRHUPFYT8DQQy+I/2rFwVUSXngvO8DLXusVg23u+C4//fwEM1JzBy4qyYBRv7qeWkddJ1TyDglnJhCX1NpLq4NYevR1bxcZEVjmEEwTItvx7Bp0hkoCa1I9HryYFy9wVzLevXLPmEcmekmtpIyERkvWQglGnX3ql7qEwHzFzKAtYNZqGQVs5+Wh6fdLvum/7fzN5m3BXIg4YYZrEYH5976b0uyONIBtLI+cWgPwIrFWMB1Ejk3B3Gq1liqUsf4+QPniDj7PlqKJUFU64Kct/c1GYWNLVtaRpa+L7Cd3eqbIj6Km8oZiKmxKBGM60PP0M2PQ0bi3FOWe0b8mNkHxvY/ImiFwFD/sLuvOdiusbezXHZ6k5VRFX65ZQm3BFgdWW3heHfvP8fzHxwl9MfQ3/P6n2HYp/K3c9FlS8xoAe5fwMsQZ2Owc6XOQsDMj4lFzSC+KOL+WZrlep+wfryK9JV3zGabftlccx991TrZwIaGstvwEE; 4:0Bl0Eki6uVzy7+lC2rhnbfTNBVij7eYd36G6anLgK5XEmMUW8UcYiO7CP1Na6JoJOKVY6FbAk4+NsgQbKsS4PALiNfApsFEKkyq4vO5T6CjIcfeccbCYTVgdqQnBrjdrGYMRsYD2SiX3aXj58cu7xTQ2CavCEjW+20btKF0UH6g590h5h6H3TyW0xRvuPkIznJU+KZr3phygG2DqnE1YZaGqSkRDZZsxbxNY/qNVYUxF0m64purIQIVuDBsOUoiqFUik4vzxy5NMPcPS1C346g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(10201501046)(3231022)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123555025)(6072148)(201708071742011); SRVR:VI1PR0801MB1358; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1358; X-Forefront-PRVS: 05087F0C24 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(366004)(346002)(376002)(40434004)(199003)(24454002)(189002)(2486003)(54356011)(52116002)(23676004)(5660300001)(7696005)(52146003)(8676002)(81156014)(81166006)(8746002)(76176011)(50466002)(5890100001)(25786009)(36756003)(97736004)(305945005)(7736002)(229853002)(86362001)(16526018)(105586002)(33656002)(53936002)(6246003)(478600001)(101416001)(55016002)(2950100002)(21086003)(6916009)(2906002)(106356001)(6666003)(58126008)(6116002)(3846002)(47776003)(1076002)(83506002)(8936002)(66066001)(316002)(55236003)(189998001)(4326008)(68736007)(72206003)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0801MB1358; H:arm.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtWSTFQUjA4MDFNQjEzNTg7MjM6NXF3azJpQ3VIZGQ5WDA0WCsvYURUbllQ?= =?utf-8?B?c2RMS0hSZkNScWg4RmJqeExiVVZFNEVXMWdxd0d6emllWk1hbElDWHgvRS9l?= =?utf-8?B?NkNvWjZMd3pQZlpJbXpTWERFVEFDcTdMUmpJQjFIellKRDBBWGVqdUFXZU9V?= =?utf-8?B?amUwalI5aDdKTVA0ZzM0eXMzYlY0NTNQMjZTbEN3SEJLMkFxMllDcHZwaE5m?= =?utf-8?B?ajhrbTM4OUZBcUFVbWxCT1NMMTA5ak9CamVpMVJyWUV1V2JOdFRUam56MHBS?= =?utf-8?B?eVp0ZkVBS3hOcjlIRWM2YWdVYkZMWE1UMVRLRStaVzZnKzArYXMzU3d2NThp?= =?utf-8?B?OWQ1LzF0SUR1NDluVVI1MWlTWVJNU1NJZ2IyUWNRZ3pLb25yZkFrWkEvMDEv?= =?utf-8?B?WDQ3OUZSb2lxb2l6WHFyWVpwSlRUNmJMV0FLRHdMMmRtdVBOdjRLRXBkN2cr?= =?utf-8?B?WVNLbmtVRTZ6bVZJbHVmdXFCOHVZaVZPalRrNWxla0NTQ2M5YmkxVURJekZ1?= =?utf-8?B?aXNUVlk4UlZ0a1hqdUo0Y1VZblZQZ3M3SzBxRE9ZOHAwL3BxT09RTTBNMjNP?= =?utf-8?B?Q1lHM3l5SVRlTm1UNXhPNnlYMDBSU3FwVENxZWdLbUtWZ0diSERkTnZnbjdS?= =?utf-8?B?TGF2cGs2aFJCSzhJYzE5QTBrY3FyQTg4TzVnSHkreUx4dE5jZjU3dEJ3YjY2?= =?utf-8?B?VGhnUjhoOXlMQzVGMFRUL01GbEd0cDU5ajJ0WnNZQ2duMGs5KytTek5Wdk44?= =?utf-8?B?UXluTGE2UXorRjZXZWJGQmNheFFkbkRpeHJ3c0Q4SFB3NmdDK3lzRTZDZW9o?= =?utf-8?B?RENrWjBCaGR6MnB5RHlFMjdBTjk4S2hSbVkxblJmNktjRTU0U0MrQUdUREx2?= =?utf-8?B?amJPRmFrekhpVCtueTFjSEdHODA0cGZ5cU1QZ3hOQUsva1VCU1ljQkhPU3lY?= =?utf-8?B?MTFGZ2lud29Nb1ZnM0FjU2FwSEJvcFRpcmp3U2htTGpyRk5wb1hGZnZpdk1F?= =?utf-8?B?bG9zT2VjV015cFhrRUNNU3VveVNRekpzL25QOE5uVnNVNEJoVVdENGlWRjR6?= =?utf-8?B?cFBXV0FiTzVKS096QVFpYTFvQ1NhUktxcitaUkhsMzNlUEc3ckZ0L3RmTGhv?= =?utf-8?B?SUg5VGlvUVVUenFCT0VEdXovelI5VnQxbFJaOG1EVU5oREVKU2pqWUdXKzJX?= =?utf-8?B?THBXWlpPVm0wQkRrSkFDeDRDZE5EWTUrWVR3TExTZWVBd1Y4VlpRUGJYSWtu?= =?utf-8?B?OGNPZjJxcUVENEtDNnNlK3NzTTJPaFluT1ZINnMzcFBZQ1FWWVJFd1U3ZDBT?= =?utf-8?B?b0NNR1ExMElVSkRreThwbDBadkNxem9qc0hMQmtzN2pNMGRZWWFkYWNOMHZa?= =?utf-8?B?Q1BKbzVrbXJKbDJseXZZVlI2QjFEMC9KRThKcUZtTUQrQXNLdUlqSVcvVmlL?= =?utf-8?B?Wmo4MXZzRDltbTY0RUFVQkpsRXJYWUV2cGd1M3MxcDcweDhscUVjMTlpUHRH?= =?utf-8?B?Vnk2dTIvQ2F2bUpNRWYvNmVjRTBvWVgzT1pNS0p0cW0xZGxQMnM3MVdnRmVX?= =?utf-8?B?K3RMTDBqdVdaaHRyN3hpdFJ0NisvMzRUdVlEZkphQU9zVW8xQU4vY3JIRTRm?= =?utf-8?B?dWg0WEt2OEloWkJQM3R6eFJPZnV1ZStPa2puOHVGWUZlTGRxUlR2TGRWdHRE?= =?utf-8?B?aXhiTnZHY285Tm9Za2EzZXA4aVd5azlUQktLc3NldEw5dy9aallsbW9vRVJN?= =?utf-8?B?SXdFTFNLdFlEL1hCcW9aYkNmMTVmOGliUTlySFlpNmRUbmJwRTlTQXl4WTBv?= =?utf-8?Q?vD1sHGVx4OBX6h/?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1358; 6:kzXsy8mCbavMJaKw6DKfLcm+cGmg8SfZw+kR/C0FVh6ir7aFpW+k5ouq7RiKwxITBmiH29Ng1UcTDyPsxzj45ms1OSDpyfOneKNq/rXx3+XWtQuCzrrhLXCMrBS7B+bBBHSIAl4nXeKTqKFAfZOi/9NsKq3M6P54DzUm+I0B9d4DnZYKTPXeTIosJgu3be8OnFsmFT75nG6GJmH9mXQUouDJf39BZcXsS9t4zlDJinp1R1fspwPWLAt5v/Yg5Hf61YtgUGuKdh8CQFCwKT3mJd0IIx4iDwP4I3e92ZK1JMm+iPfasfhLhYPvMxSWDO19PaGf88BX/1Fa2cawWF5nVJEeDYKX4UO1EqKrnN4nRhc=; 5:p5sxZTrnVVCMrvX19gAKvp+42dN5Ncga86AcMZ1QPN4Hcfy4ze9gTYTcBTF4htuZa4wrFK3EzDn7PF2z5Y6LGVCkDN8P8gQz9kQpWRimZiV1rkCDaya580t7DTdLP7edXLPV9/GZA0AEfvUbdFUJuJj6oimCwTeIOMyM3FN6rwA=; 24:DgSHzXO8K1WE+h6p9FcLJYDxh5WCdKawqVpqEC5jCi7U5eQdrs1vlHaJMzyY6F5+tYH8vUSgV2KAZizR6UM7Y7ngmubRuU/Eq0nElh76vVA=; 7:UpUBbKqleCodely1IBW6hQitWQSQQDkfDFE6TA/eUrvebN8xv+t7DcdGp232nd5td93BMBpp0fiex/gf9LnihQ3KY1jwamEc+A3wzHDf13WwHrS77q3X1sez4f7+q4JHQB/gHf3iI4SWbyaw/fvrA0+3kGWmhDm5BK/inlY65R6uI0E33Pk5upqnFvHrdKxce/Zk8VMUvdn6FXPMD3B9pc5FULXqEi+0/EITa+6QIOjYjFZlBeqaUjPYfAoXnOZp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2017 03:30:20.7221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86087c4c-3587-4b2d-7f1e-08d5386bdaeb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1358 Subject: Re: [dpdk-dev] [PATCH 1/7] net/mrvl: sync compilation with musdk-17.10 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2017 03:30:25 -0000 The 11/30/2017 14:32, Tomasz Duszynski wrote: > Followig changes are needed to switch to musdk-17.10: > > - With a new version of the musdk library it's no longer necessary to > explicitly define MVCONF_ARCH_DMA_ADDR_T_64BIT and > CONF_PP2_BPOOL_COOKIE_SIZE. > > Proper defines are autogenerated by ./configure script based on > passed options and available after mv_autogen_comp_flags.h inclusion. > > - API used to set promiscuous mode was renamed. Thus in order to > compile against the latest library new API must be used. > > Signed-off-by: Tomasz Duszynski > --- > drivers/net/mrvl/Makefile | 4 ++-- > drivers/net/mrvl/mrvl_ethdev.c | 5 +++-- > drivers/net/mrvl/mrvl_ethdev.h | 1 + > 3 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/mrvl/Makefile b/drivers/net/mrvl/Makefile > index 815c3ba..f75e53c 100644 > --- a/drivers/net/mrvl/Makefile > +++ b/drivers/net/mrvl/Makefile > @@ -51,8 +51,8 @@ EXPORT_MAP :=3D rte_pmd_mrvl_version.map > > # external library dependencies > CFLAGS +=3D -I$(LIBMUSDK_PATH)/include > -CFLAGS +=3D -DMVCONF_ARCH_DMA_ADDR_T_64BIT > -CFLAGS +=3D -DCONF_PP2_BPOOL_COOKIE_SIZE=3D32 > +CFLAGS +=3D -DMVCONF_TYPES_PUBLIC > +CFLAGS +=3D -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC > CFLAGS +=3D $(WERROR_FLAGS) > CFLAGS +=3D -O3 > LDLIBS +=3D -L$(LIBMUSDK_PATH)/lib > diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_ethde= v.c > index 2936165..4fac797 100644 > --- a/drivers/net/mrvl/mrvl_ethdev.c > +++ b/drivers/net/mrvl/mrvl_ethdev.c > @@ -47,6 +47,7 @@ > #undef container_of > #endif > > +#include Is it needed as you also included this file in mrvl_ethdev.h? I think you can move all the MUSDK headers to mrvl_ethdev.h to avoid the duplication. > #include > #include > #include > @@ -690,7 +691,7 @@ mrvl_promiscuous_enable(struct rte_eth_dev *dev) > struct mrvl_priv *priv =3D dev->data->dev_private; > int ret; > > - ret =3D pp2_ppio_set_uc_promisc(priv->ppio, 1); > + ret =3D pp2_ppio_set_promisc(priv->ppio, 1); > if (ret) > RTE_LOG(ERR, PMD, "Failed to enable promiscuous mode\n"); > } > @@ -724,7 +725,7 @@ mrvl_promiscuous_disable(struct rte_eth_dev *dev) > struct mrvl_priv *priv =3D dev->data->dev_private; > int ret; > > - ret =3D pp2_ppio_set_uc_promisc(priv->ppio, 0); > + ret =3D pp2_ppio_set_promisc(priv->ppio, 0); > if (ret) > RTE_LOG(ERR, PMD, "Failed to disable promiscuous mode\n"); > } > diff --git a/drivers/net/mrvl/mrvl_ethdev.h b/drivers/net/mrvl/mrvl_ethde= v.h > index 2a4ab5a..252e7a3 100644 > --- a/drivers/net/mrvl/mrvl_ethdev.h > +++ b/drivers/net/mrvl/mrvl_ethdev.h > @@ -36,6 +36,7 @@ > #define _MRVL_ETHDEV_H_ > > #include > +#include > #include > #include > > -- > 2.7.4 > -- IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease notify the sender immediately and do not disclose the contents to any= other person, use it for any purpose, or store or copy the information in = any medium. Thank you.