From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DF893A04E1; Tue, 22 Sep 2020 10:50:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EEC8A1D6D4; Tue, 22 Sep 2020 10:50:16 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 7F2DF1C222 for ; Tue, 22 Sep 2020 10:50:13 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.150]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 267F42006B for ; Tue, 22 Sep 2020 08:50:13 +0000 (UTC) Received: from us4-mdac16-59.at1.mdlocal (unknown [10.110.50.152]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 25D24800A3 for ; Tue, 22 Sep 2020 08:50:13 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.8]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id B7D14100061 for ; Tue, 22 Sep 2020 08:50:12 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 7F1E14C005A for ; Tue, 22 Sep 2020 08:50:12 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 22 Sep 2020 09:50:09 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 22 Sep 2020 09:50:09 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 08M8o9He004583 for ; Tue, 22 Sep 2020 09:50:09 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 1D3731613AB for ; Tue, 22 Sep 2020 09:50:09 +0100 (BST) From: Andrew Rybchenko To: Date: Tue, 22 Sep 2020 09:48:58 +0100 Message-ID: <1600764594-14752-5-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600764594-14752-1-git-send-email-arybchenko@solarflare.com> References: <1600764594-14752-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25674.003 X-TM-AS-Result: No-4.144600-8.000000-10 X-TMASE-MatchedRID: B6OF5MsVQnvabBVcqlDcF2wTEruL9ObTBGvINcfHqhcGmHr1eMxt2UAc 6DyoS2rIqQ4DH3i/D94595trGMYhhrlcL8GzHfqtB8Lglj0iCADESSxPxTa9g0krZ4mFjTbD1mI qSQOMZGzVPGtJpQStsFtRr92EMHJLFUPnz5fE4uPjsEyk2Mc+L0ewdu9S21aiGy2EO7JCB/FLIA jDsEYHR4TcmhipZoOaGx4QOjd5HXXBQaAoBFeC8gKDWtq/hHcNfS0Ip2eEHnz3IzXlXlpamPoLR 4+zsDTtwwUcWQpWasFx2W5Aq4G8V5+P9ta3Q4mDOkFMwHFWNmTHjKN5yOwgpxtoD4jTgeV5UH5w ntxidcnuq9pVZlPsArz0+RNybP9kxdfpLuQmFPsAA9BapWXaJtG+KyfdrZrRf3e2vVbH8zBmH8z Zfront1XK9tOD+u6c X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10-4.144600-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25674.003 X-MDID: 1600764613-56zDT3ehVDMg Subject: [dpdk-dev] [PATCH 04/60] common/sfc_efx/base: add efsys option for Riverhead 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: Andrew Rybchenko Reviewed-by: Andy Moreton Reviewed-by: Vijay Kumar Srivastava --- drivers/common/sfc_efx/base/efx_check.h | 44 ++++++++++++------------- drivers/common/sfc_efx/efsys.h | 3 ++ 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx_check.h b/drivers/common/sfc_efx/base/efx_check.h index 5a04a69e5f..978321cf67 100644 --- a/drivers/common/sfc_efx/base/efx_check.h +++ b/drivers/common/sfc_efx/base/efx_check.h @@ -47,8 +47,8 @@ #if EFSYS_OPT_CHECK_REG /* Verify chip implements accessed registers */ -# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA) -# error "CHECK_REG requires EF10 arch or SIENA" +# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +# error "CHECK_REG requires RIVERHEAD or EF10 arch or SIENA" # endif #endif /* EFSYS_OPT_CHECK_REG */ @@ -79,21 +79,21 @@ #if EFSYS_OPT_FILTER /* Support hardware packet filters */ -# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA) -# error "FILTER requires EF10 arch or SIENA" +# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +# error "FILTER requires RIVERHEAD or EF10 arch or SIENA" # endif #endif /* EFSYS_OPT_FILTER */ -#if EFX_OPTS_EF10() +#if EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() # if !EFSYS_OPT_FILTER -# error "EF10 arch requires FILTER" +# error "RIVERHEAD or EF10 arch requires FILTER" # endif #endif /* EFX_OPTS_EF10() */ #if EFSYS_OPT_LOOPBACK /* Support hardware loopback modes */ -# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA) -# error "LOOPBACK requires EF10 arch or SIENA" +# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +# error "LOOPBACK requires RIVERHEAD or EF10 arch or SIENA" # endif #endif /* EFSYS_OPT_LOOPBACK */ @@ -107,21 +107,21 @@ #if EFSYS_OPT_MAC_STATS /* Support MAC statistics */ -# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA) -# error "MAC_STATS requires EF10 arch or SIENA" +# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +# error "MAC_STATS requires RIVERHEAD or EF10 arch or SIENA" # endif #endif /* EFSYS_OPT_MAC_STATS */ #if EFSYS_OPT_MCDI /* Support management controller messages */ -# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA) -# error "MCDI requires EF10 arch or SIENA" +# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +# error "MCDI requires RIVERHEAD or EF10 arch or SIENA" # endif #endif /* EFSYS_OPT_MCDI */ -#if (EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +#if (EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) # if !EFSYS_OPT_MCDI -# error "EF10 arch or SIENA requires MCDI" +# error "RIVERHEAD or EF10 arch or SIENA requires MCDI" # endif #endif @@ -288,15 +288,15 @@ #if EFSYS_OPT_RX_SCALE /* Support receive scaling (RSS) */ -# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA) -# error "RX_SCALE requires EF10 arch or SIENA" +# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +# error "RX_SCALE requires RIVERHEAD or EF10 arch or SIENA" # endif #endif /* EFSYS_OPT_RX_SCALE */ #if EFSYS_OPT_RX_SCATTER /* Support receive scatter DMA */ -# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA) -# error "RX_SCATTER requires EF10 arch or SIENA" +# if !(EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() || EFSYS_OPT_SIENA) +# error "RX_SCATTER requires RIVERHEAD or EF10 arch or SIENA" # endif #endif /* EFSYS_OPT_RX_SCATTER */ @@ -338,8 +338,8 @@ #if EFSYS_OPT_ALLOW_UNCONFIGURED_NIC /* Support adapters with missing static config (for factory use only) */ -# if !(EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2) -# error "ALLOW_UNCONFIGURED_NIC requires MEDFORD or MEDFORD2" +# if !(EFSYS_OPT_RIVERHEAD || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2) +# error "ALLOW_UNCONFIGURED_NIC requires RIVERHEAD or MEDFORD or MEDFORD2" # endif #endif /* EFSYS_OPT_ALLOW_UNCONFIGURED_NIC */ @@ -359,8 +359,8 @@ /* Support hardware assistance for tunnels */ #if EFSYS_OPT_TUNNEL -# if !(EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2) -# error "TUNNEL requires MEDFORD or MEDFORD2" +# if !(EFSYS_OPT_RIVERHEAD || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2) +# error "TUNNEL requires RIVERHEAD or MEDFORD or MEDFORD2" # endif #endif /* EFSYS_OPT_TUNNEL */ diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h index 46b08f9789..1567d91588 100644 --- a/drivers/common/sfc_efx/efsys.h +++ b/drivers/common/sfc_efx/efsys.h @@ -105,6 +105,9 @@ prefetch_read_once(const volatile void *addr) #define EFSYS_OPT_MEDFORD 1 /* Enable SFN2xxx support */ #define EFSYS_OPT_MEDFORD2 1 +/* Disable Riverhead support */ +#define EFSYS_OPT_RIVERHEAD 0 + #ifdef RTE_LIBRTE_SFC_EFX_DEBUG #define EFSYS_OPT_CHECK_REG 1 #else -- 2.17.1