From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 052A2A0524; Wed, 5 May 2021 09:34:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B888410F5; Wed, 5 May 2021 09:34:02 +0200 (CEST) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 5802440040 for ; Wed, 5 May 2021 09:34:00 +0200 (CEST) Received: by mail-wr1-f53.google.com with SMTP id a4so675423wrr.2 for ; Wed, 05 May 2021 00:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2XqtNgVNFW+3cuq3W34xXDy9JZdCaLxVkH9dYbjPK7Y=; b=0TSaxLI7tSd84LwQuYh38qmarRtew/mAEal/7yEqCQY1OdKf6VXPi7CDmIICEBCBVe XAWY+Jn9klW3YMEZ2Jvf5bHPbhzj3V3Fd063XfOCEUeprryLsXnixU0UqT2z+WFF/KWC ZoJx9Lb1nlyCymH0XDdi1aWG9Dx//T3RK39a5Ia2DKMYoE10S+6BG6al5RaVK09bx8e2 yN/+A0LBwFgmBVdJeeVzy0+7E4Kxgir4Ytg8sq4RPPw1HS1inHFZiLO44LHgLLdOQby3 QaZ8k+Lwy1t1XK602SlFdhzv4vlMVqmDsFSv8FHwAbCXtWZkRxM6GnlIVIlu3pFFY2kA G5cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2XqtNgVNFW+3cuq3W34xXDy9JZdCaLxVkH9dYbjPK7Y=; b=MTHFL7ef15mj9+MmSscILiJZ1dq8EqIee1L6FNw/xLhN39bxjy8e5Ovi1+JLOnvvc3 ZPaCEdE44pQpoolpJpa4WnQ8toyBAwteL6n01dp78AGUbJEuZoYB7LBRDZ9JeCUsw9EX gR3rJvQhKJ8vm5YYJ0TTyHTb6D2TMVGUNfQKxUN6ZznPox8mEtyHnl0GjrZZK+kyiGDS hD90w17SiG1u6wTtCgXRY87oG/puw83Wjay4icbkyMgugpqCvuIQfePfauvuV/vHC5mF roqMYzLqAwo0TU3oSyOt85fJ2Qb/GxKzK0I9S/46lAJaS6AV98pcEXO9f+DRe35lDXEM AFYg== X-Gm-Message-State: AOAM5331RLVDsTANula8KXAM0c4etmgpU3Ykv1trh1xPEA1lUy+VYK2x JnptfBN2qG6SBnHyZmMI2r4TinVGPurpF04W X-Google-Smtp-Source: ABdhPJwx0e1vMk2xqCJgfMUSBp7oNkj9aImOEbSJJCN6sMCdJUqLHhLjpDWWrHezYap8T5YTgNaIug== X-Received: by 2002:a05:6000:1ac7:: with SMTP id i7mr23715204wry.380.1620200039822; Wed, 05 May 2021 00:33:59 -0700 (PDT) Received: from DESKTOP-U5LNN3J.localdomain (89-79-189-199.dynamic.chello.pl. [89.79.189.199]) by smtp.gmail.com with ESMTPSA id t17sm4679856wmq.12.2021.05.05.00.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 00:33:59 -0700 (PDT) From: Michal Krawczyk To: dev@dpdk.org Cc: ndagan@amazon.com, gtzalik@amazon.com, igorch@amazon.com, upstream@semihalf.com, stable@dpdk.org, Michal Krawczyk , Artur Rojek Date: Wed, 5 May 2021 09:33:27 +0200 Message-Id: <20210505073348.6394-2-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505073348.6394-1-mk@semihalf.com> References: <20210430125725.28796-1-mk@semihalf.com> <20210505073348.6394-1-mk@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 01/22] net/ena: switch memcpy to dpdk-optimized version X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" From: Igor Chauskin memcpy is now mapped to rte_memcpy macro on x86 architectures. Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK") Cc: stable@dpdk.org Signed-off-by: Igor Chauskin Reviewed-by: Michal Krawczyk Reviewed-by: Artur Rojek --- v2: * Fix nested declaration of the rte_memcpy on arm64 architecture. drivers/net/ena/base/ena_plat_dpdk.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index a1d749f83f..ae68f860a5 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -25,6 +25,7 @@ #include #include +#include typedef uint64_t u64; typedef uint32_t u32; @@ -62,7 +63,11 @@ typedef uint64_t dma_addr_t; #define ENA_UDELAY(x) rte_delay_us_block(x) #define ENA_TOUCH(x) ((void)(x)) -#define memcpy_toio memcpy +/* Avoid nested declaration on arm64, as it may define rte_memcpy as memcpy. */ +#if defined(RTE_ARCH_X86) +#undef memcpy +#define memcpy rte_memcpy +#endif #define wmb rte_wmb #define rmb rte_rmb #define mb rte_mb -- 2.25.1