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 5F94DA0524; Thu, 6 May 2021 16:25:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE704410FA; Thu, 6 May 2021 16:25:45 +0200 (CEST) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by mails.dpdk.org (Postfix) with ESMTP id B2E8F410F3 for ; Thu, 6 May 2021 16:25:43 +0200 (CEST) Received: by mail-lf1-f48.google.com with SMTP id x19so8080210lfa.2 for ; Thu, 06 May 2021 07:25:43 -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=jNDDvAwDnzUfKct8+rsrTy2egXMKhm4ZUm2WPOwdatf97l5REdMMNUm/lEogcYQXRx G6sLaZ3ncpGJR6DAIbxOY64Hd5E/AP1UYsPweC8XTZvFPOI5CLZVkbvoZO76Flv24srI 5RFaDZHn+dYC4Ajc7HdoxHEhePeCTD1wv9xqVPGV8WHsLZnMVTxtWpeB0hLMYbKXCyhS AWWvlV9mQX8nAvIlHn20QwjmtYmygtEMLbyxhqJ0FlyawNXfYvKDzZMqMDzFw5QBM36I Y4AKge7/NCWT5moj6ZdbqVOsKQQx09myc12hGE6kYliSYOmg0G3KCYCkiU7cV9M/hvVS 8vHg== 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=LHxyGRrHTXUvwairPNJH7sRSpt6A/K1e2pn4NNYQLlb0Yv8VTG6dFzrPcXxBoimvhi BDrGGwstpshnOm+2sVWtPCMo3u2MMQGBC5qOP7rCIrkQLogvq5LOVTFNR2zidrYL6CCK CmIEATJrLwxOsPxngMGYuKvbtb1y0WaeAb2T/7AUwLauwwH5r5HrRFrqjG1+EDSMrYJD 43ll3G1nBzWVrdYnqJ12Xyh31RzeZ7xgc4goAS9wm6ukFoaSCdi+Ua/6gJ42cvTDX5n/ PzeZZf+EdXXN1sGIqZaInVfnl5XEVnoomhOkrx/y+GczLGjFeyIAMf7yT3KPdAZgRhpC hwXA== X-Gm-Message-State: AOAM5334WUgCLDsi8/qAplA3dmpYpjca5WMJdXNWdAGi67kCuMdg6vW2 6GsNyXxQ1JgZbi2bv/w0wVGLAvgSAMMMT8HC X-Google-Smtp-Source: ABdhPJwCgY3I+3hBfLhvyiKi5BMggoWcRglX6dlDCYk/YcateOGmcySrI80s1XTKS87Iubgx9na4Dw== X-Received: by 2002:a05:6512:10c9:: with SMTP id k9mr3028451lfg.273.1620311143005; Thu, 06 May 2021 07:25:43 -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 b40sm892908ljr.101.2021.05.06.07.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 07:25:42 -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: Thu, 6 May 2021 16:25:05 +0200 Message-Id: <20210506142526.28245-2-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210506142526.28245-1-mk@semihalf.com> References: <20210505073348.6394-1-mk@semihalf.com> <20210506142526.28245-1-mk@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 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