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 8CE79A0093 for ; Tue, 19 May 2020 15:13:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 847F61D702; Tue, 19 May 2020 15:13:39 +0200 (CEST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by dpdk.org (Postfix) with ESMTP id 616961D702 for ; Tue, 19 May 2020 15:13:37 +0200 (CEST) Received: by mail-wm1-f49.google.com with SMTP id u1so2233666wmn.3 for ; Tue, 19 May 2020 06:13:37 -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=1vQJTtmz2N+tihE6G2IRQR8JKFfXVrJfajoscLZ+Rfg=; b=tOeH9Gds6/KNs0GerLWcLEcImdPfhEYAFVB3XPhcV/f0HKfkSJZaBt045dFoDMm3UC umr4Pi+vXztXLp6Aoh2k946WPQ9g3S0lqstWjWjk780awUsbp65GkHi1YuxGC/VcemBg Mxmxgx+T4Pf+zkWZqWvojPf0lmE9LtDFJeotgcEQX736GcdRZsLzrO6w966A+/CNb9t5 mNfA9wZQ7BZbgA1u12PkxlHtjNOK+GdEhcDa4svhZsJ2raOs32xAxDKbYFjVNc2o4mx8 vS/LRVWemWKclHzR5CKzZAgds5uiqvB3j18dAVnwBtHWIim8Wc9EHjUWJLRW09u6/cWT TQEA== 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=1vQJTtmz2N+tihE6G2IRQR8JKFfXVrJfajoscLZ+Rfg=; b=BTiaCHu/2sFNnOGfPs069Wca9ou8P0k7KpVH4Is/Ysfb2BZxuQRBUfqKzFEPOurEUu /iCamc1C2nZJnToZmVYvngHj7ad640TNa40SpWM8wCDVT+nhD/fxRKFEB3gwp2Fam5kw h9E53X2IP7/8Rk8Nv48tnURvIv/Y0dQRAmJO0ldoMq4HqP8spa1oQtas+G5TYAQrOV2/ ELaLkbqFgT2IssZBsnbKrbnq7RaVMyO1tYtQzYOM/NL3rAF+lw4TUClNMVQVVR4n+p1O FTzx/Tk+ure47jpF8OSDziYFpvlZfsUye7tC8NaOwSnOjXGHV+aKsf3U5cZajXlfQPZD vlDg== X-Gm-Message-State: AOAM530ka+lKU4fNwy8AMPc3x0SkVpspuqviZRFfyCJjd5cVK9B8PCDa ri50H22eeqEnXb9j4hnJiXU= X-Google-Smtp-Source: ABdhPJxbdomB4tLvM/CJKXyGoSW81czuJB5LFJ9+LbzVnxHegdBgaFXQACsYVZWk5pf1oq3JW60B7g== X-Received: by 2002:a05:600c:29a:: with SMTP id 26mr5795867wmk.151.1589894017132; Tue, 19 May 2020 06:13:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u74sm4010151wmu.13.2020.05.19.06.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:13:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Andrew Rybchenko Cc: dpdk stable Date: Tue, 19 May 2020 14:04:41 +0100 Message-Id: <20200519130549.112823-146-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 run-time checks' 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 5862e3fe624e0ca0e30bcc07492a94e511558e1e Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 28 Apr 2020 14:37:25 +0100 Subject: [PATCH] net/sfc/base: use simpler EF10 family run-time checks [ upstream commit dd3d209cb12090b7cda31323fec61951087febac ] Fixes: 4625c4f5277d ("net/sfc/base: factor out upstream port vAdaptor allocation") 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 | 8 ++------ drivers/net/sfc/base/ef10_nic.c | 4 +--- drivers/net/sfc/base/ef10_proxy.c | 8 ++------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c index cde2196f18..c26cada5da 100644 --- a/drivers/net/sfc/base/ef10_evb.c +++ b/drivers/net/sfc/base/ef10_evb.c @@ -15,9 +15,7 @@ ef10_evb_init( __in efx_nic_t *enp) { - EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON || - enp->en_family == EFX_FAMILY_MEDFORD || - enp->en_family == EFX_FAMILY_MEDFORD2); + EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp)); return (0); } @@ -26,9 +24,7 @@ ef10_evb_init( ef10_evb_fini( __in efx_nic_t *enp) { - EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON || - enp->en_family == EFX_FAMILY_MEDFORD || - enp->en_family == EFX_FAMILY_MEDFORD2); + EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp)); } __checkReturn efx_rc_t diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c index b25ce1908e..3eb4674c5e 100644 --- a/drivers/net/sfc/base/ef10_nic.c +++ b/drivers/net/sfc/base/ef10_nic.c @@ -2288,9 +2288,7 @@ ef10_nic_init( efx_rc_t rc; boolean_t alloc_vadaptor = B_TRUE; - EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON || - enp->en_family == EFX_FAMILY_MEDFORD || - enp->en_family == EFX_FAMILY_MEDFORD2); + EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp)); /* Enable reporting of some events (e.g. link change) */ if ((rc = efx_mcdi_log_ctrl(enp)) != 0) diff --git a/drivers/net/sfc/base/ef10_proxy.c b/drivers/net/sfc/base/ef10_proxy.c index 059b2f5f4d..619d98e472 100644 --- a/drivers/net/sfc/base/ef10_proxy.c +++ b/drivers/net/sfc/base/ef10_proxy.c @@ -13,9 +13,7 @@ ef10_proxy_auth_init( __in efx_nic_t *enp) { - EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON || - enp->en_family == EFX_FAMILY_MEDFORD || - enp->en_family == EFX_FAMILY_MEDFORD2); + EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp)); return (0); } @@ -24,9 +22,7 @@ ef10_proxy_auth_init( ef10_proxy_auth_fini( __in efx_nic_t *enp) { - EFSYS_ASSERT(enp->en_family == EFX_FAMILY_HUNTINGTON || - enp->en_family == EFX_FAMILY_MEDFORD || - enp->en_family == EFX_FAMILY_MEDFORD2); + EFSYS_ASSERT(EFX_FAMILY_IS_EF10(enp)); } static __checkReturn efx_rc_t -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:50.398791647 +0100 +++ 0146-net-sfc-base-use-simpler-EF10-family-run-time-checks.patch 2020-05-19 14:04:44.468652941 +0100 @@ -1,12 +1,13 @@ -From dd3d209cb12090b7cda31323fec61951087febac Mon Sep 17 00:00:00 2001 +From 5862e3fe624e0ca0e30bcc07492a94e511558e1e Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 28 Apr 2020 14:37:25 +0100 Subject: [PATCH] net/sfc/base: use simpler EF10 family run-time checks +[ upstream commit dd3d209cb12090b7cda31323fec61951087febac ] + Fixes: 4625c4f5277d ("net/sfc/base: factor out upstream port vAdaptor allocation") 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 --- @@ -16,7 +17,7 @@ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c -index f290339f2f..d541db4980 100644 +index cde2196f18..c26cada5da 100644 --- a/drivers/net/sfc/base/ef10_evb.c +++ b/drivers/net/sfc/base/ef10_evb.c @@ -15,9 +15,7 @@ @@ -42,7 +43,7 @@ __checkReturn efx_rc_t diff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c -index d1802da0bd..34fa45e8c1 100644 +index b25ce1908e..3eb4674c5e 100644 --- a/drivers/net/sfc/base/ef10_nic.c +++ b/drivers/net/sfc/base/ef10_nic.c @@ -2288,9 +2288,7 @@ ef10_nic_init( @@ -57,7 +58,7 @@ /* Enable reporting of some events (e.g. link change) */ if ((rc = efx_mcdi_log_ctrl(enp)) != 0) diff --git a/drivers/net/sfc/base/ef10_proxy.c b/drivers/net/sfc/base/ef10_proxy.c -index 9be9e221d5..19c11c6ebc 100644 +index 059b2f5f4d..619d98e472 100644 --- a/drivers/net/sfc/base/ef10_proxy.c +++ b/drivers/net/sfc/base/ef10_proxy.c @@ -13,9 +13,7 @@