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 7BCDAA0093 for ; Tue, 19 May 2020 15:13:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 70A861D68B; Tue, 19 May 2020 15:13:28 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by dpdk.org (Postfix) with ESMTP id 6E4561D8ED for ; Tue, 19 May 2020 15:13:26 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id w64so3495784wmg.4 for ; Tue, 19 May 2020 06:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dpWk1tZ1xGusYOFrDMkD+hpjZ0V3+pseotr4E25Lb+k=; b=TPLUFSREWHdsaRhLcXcNFcMKXTPA4pddyu1eGXYsQ2QReKyuvulPm0sdP0oF6Lebmi ZNlBFkDydo9SJmfyDnO0qdWVtur8lUj1bMB0uZc7xxYvtkH8CQxwxp17VIZoqilWGg9E e1su4yxji+wW1JbLMxQlZOZptGA7/Qa+6ZU2FtdpHaneN+FEQJ2EE730a+RvONT2/Ze0 P03YjcbpaO+b4uaLLAUeEvhw1+DxD0IAi8C2e8v4gQpnVLUKT6T8J8rZv1jmRgcsvoja 0Yb+0jE4DutimYK9GUy0UyUvBWOlwB5K9xltoclJAGTc0wcZw96cADNtmo3r/TxOsQEm oSDw== 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=dpWk1tZ1xGusYOFrDMkD+hpjZ0V3+pseotr4E25Lb+k=; b=MRQudE08hG80OeSlGDL+fkimI/yK9SCClzH0ykck1lsdy2cTw9k96QRQYSUo/3/JH1 P7wYthfnRJUR2zyb4/CnlFLizz8nNRAWkipuMqgpEsYLHqhQTjxXoGc3/y2zE6kdXD3f WeLfwnRX+A4G3KB1BRc2bjsrnnv/ymd+3SfJ4WkdCn2vVQYLp2Hw9/zGACoxbTtE8oNx X7BRBaUdG+O+XcXr+/2+clK/JdjZi7CQ7dUufb+UZk0Lm3ZkZAN9k1J/F0PvI8psTEsE bZ/yZbVsYWzGJTDaU/ehb7xbvWmjRggq3JJkJXYVmWKC+S3ayQXQdCENDyk0RYK91bey MCjA== X-Gm-Message-State: AOAM530meGBmb/pQapAsv6+o+f+yHHg+yDv2kPeyHN1xd3fHEP2ixBkE JRGz9oGTS2/4NVtxAi7pTzk= X-Google-Smtp-Source: ABdhPJy4kpyuU5BKkMa2xGGSD8zJhMQdT8S3iYRM3ZKqlNtcPkohIEiR/iqm0q4oB7qvPwwbJAGYmQ== X-Received: by 2002:a05:600c:d6:: with SMTP id u22mr5139021wmm.45.1589894006195; Tue, 19 May 2020 06:13:26 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u7sm3855877wmm.8.2020.05.19.06.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Rybchenko Cc: dpdk stable Date: Tue, 19 May 2020 14:04:40 +0100 Message-Id: <20200519130549.112823-145-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc/base: use simpler EF10 family conditional check' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 68409f9a6cb68aa0157b828c971a251a2738112c Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 28 Apr 2020 14:37:24 +0100 Subject: [PATCH] net/sfc/base: use simpler EF10 family conditional check [ upstream commit f201b886b74f60886477188a9b7510102a712780 ] Fixes: 4f12e20c85dc ("net/sfc/base: introduce EVB module for SR-IOV") Fixes: 18c8e84d7726 ("net/sfc/base: support proxy auth operations for SR-IOV") Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/ef10_evb.c | 4 ++-- drivers/net/sfc/base/efx_evb.c | 4 ++-- drivers/net/sfc/base/efx_proxy.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c index 1788a2c96a..cde2196f18 100644 --- a/drivers/net/sfc/base/ef10_evb.c +++ b/drivers/net/sfc/base/ef10_evb.c @@ -9,7 +9,7 @@ #if EFSYS_OPT_EVB -#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 +#if EFX_OPTS_EF10() __checkReturn efx_rc_t ef10_evb_init( @@ -549,5 +549,5 @@ ef10_evb_vport_stats( EFX_STATS_UPLOAD, 0)); } -#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */ +#endif /* EFX_OPTS_EF10() */ #endif /* EFSYS_OPT_EVB */ diff --git a/drivers/net/sfc/base/efx_evb.c b/drivers/net/sfc/base/efx_evb.c index dd64bc7854..5fa0d99809 100644 --- a/drivers/net/sfc/base/efx_evb.c +++ b/drivers/net/sfc/base/efx_evb.c @@ -28,7 +28,7 @@ static const efx_evb_ops_t __efx_evb_dummy_ops = { }; #endif /* EFSYS_OPT_SIENA */ -#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 +#if EFX_OPTS_EF10() static const efx_evb_ops_t __efx_evb_ef10_ops = { ef10_evb_init, /* eeo_init */ ef10_evb_fini, /* eeo_fini */ @@ -44,7 +44,7 @@ static const efx_evb_ops_t __efx_evb_ef10_ops = { ef10_evb_vport_reconfigure, /* eeo_vport_reconfigure */ ef10_evb_vport_stats, /* eeo_vport_stats */ }; -#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */ +#endif /* EFX_OPTS_EF10() */ __checkReturn efx_rc_t efx_evb_init( diff --git a/drivers/net/sfc/base/efx_proxy.c b/drivers/net/sfc/base/efx_proxy.c index 791105a5a0..ecf703b03d 100644 --- a/drivers/net/sfc/base/efx_proxy.c +++ b/drivers/net/sfc/base/efx_proxy.c @@ -23,7 +23,7 @@ static const efx_proxy_ops_t __efx_proxy_dummy_ops = { }; #endif /* EFSYS_OPT_SIENA */ -#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 +#if EFX_OPTS_EF10() static const efx_proxy_ops_t __efx_proxy_ef10_ops = { ef10_proxy_auth_init, /* epo_init */ ef10_proxy_auth_fini, /* epo_fini */ @@ -35,7 +35,7 @@ static const efx_proxy_ops_t __efx_proxy_ef10_ops = { ef10_proxy_auth_exec_cmd, /* epo_exec_cmd */ ef10_proxy_auth_get_privilege_mask, /* epo_get_privilege_mask */ }; -#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */ +#endif /* EFX_OPTS_EF10() */ __checkReturn efx_rc_t efx_proxy_auth_init( -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.355580804 +0100 +++ 0145-net-sfc-base-use-simpler-EF10-family-conditional-che.patch 2020-05-19 14:04:44.468652941 +0100 @@ -1,11 +1,12 @@ -From f201b886b74f60886477188a9b7510102a712780 Mon Sep 17 00:00:00 2001 +From 68409f9a6cb68aa0157b828c971a251a2738112c Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 28 Apr 2020 14:37:24 +0100 Subject: [PATCH] net/sfc/base: use simpler EF10 family conditional check +[ upstream commit f201b886b74f60886477188a9b7510102a712780 ] + Fixes: 4f12e20c85dc ("net/sfc/base: introduce EVB module for SR-IOV") Fixes: 18c8e84d7726 ("net/sfc/base: support proxy auth operations for SR-IOV") -Cc: stable@dpdk.org Signed-off-by: Andrew Rybchenko --- @@ -15,7 +16,7 @@ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c -index a1528508ea..f290339f2f 100644 +index 1788a2c96a..cde2196f18 100644 --- a/drivers/net/sfc/base/ef10_evb.c +++ b/drivers/net/sfc/base/ef10_evb.c @@ -9,7 +9,7 @@ @@ -35,7 +36,7 @@ +#endif /* EFX_OPTS_EF10() */ #endif /* EFSYS_OPT_EVB */ diff --git a/drivers/net/sfc/base/efx_evb.c b/drivers/net/sfc/base/efx_evb.c -index 9725ba1f45..17318b7e11 100644 +index dd64bc7854..5fa0d99809 100644 --- a/drivers/net/sfc/base/efx_evb.c +++ b/drivers/net/sfc/base/efx_evb.c @@ -28,7 +28,7 @@ static const efx_evb_ops_t __efx_evb_dummy_ops = { @@ -57,7 +58,7 @@ __checkReturn efx_rc_t efx_evb_init( diff --git a/drivers/net/sfc/base/efx_proxy.c b/drivers/net/sfc/base/efx_proxy.c -index 5b4e98c381..24baa5a3a4 100644 +index 791105a5a0..ecf703b03d 100644 --- a/drivers/net/sfc/base/efx_proxy.c +++ b/drivers/net/sfc/base/efx_proxy.c @@ -23,7 +23,7 @@ static const efx_proxy_ops_t __efx_proxy_dummy_ops = {