From patchwork Wed Jun 8 09:28:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 12873136 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DE63C433EF for ; Wed, 8 Jun 2022 09:57:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235652AbiFHJ5j (ORCPT ); Wed, 8 Jun 2022 05:57:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235657AbiFHJ5Y (ORCPT ); Wed, 8 Jun 2022 05:57:24 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2096.outbound.protection.outlook.com [40.107.223.96]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DDBE14AC81 for ; Wed, 8 Jun 2022 02:29:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UIrHDuzIw8fe8lNASZTBZymaehrdpi1A222mxdrm4tq7GlD3m0Q0LVYbHG9XUdRZTrstpzVx2bIGBM+be4BFZF9hJwzIZ+iOUm44OlHwW6x7mdYsLyZzOAlmlGFdSKxUPl68Cg0NPgYsKjtjiiIrr1EBEkdfeP1xYrCSkU0oZ+HbvljlYm3rakQSS2XESZdWR++v6W+DK/sWXMi5LPIl5mXtlXexbwiAdMKJqBhGqMcu+K75yYU9nFeqbZIvVv2VMfiEpBNh6votlOQHUszqMZx/erKglrBUi3XzYP1riP2Poc8yTSbp4xgO90cFfpy6lODST98UAnpu4wxywBQETQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=d4FeN4TnANnBKogKQFxjNNeSBMiiluax9+A/X8Pc418=; b=VT83fvP+/yY7DwNMa+7QsmMRFhw3iAenBZsrsUVZrD9J225AUSu9BZyf3BovxW+vUEk3t+hFXfeOYt5stcgT8rrEZUT28ZGx3Cczrt7mOnR+rBd+s1gEs+DBU5lXywdKibeQJ9rJe4ki9cq8amA6EN0cblGK7//aWmN61ByP8CPDyLXSpxKs+93SkQZJTddDIsENp0s5hHvKnp0WbpqavRYiGScOcFjmQrX+uKK2u/ITeiVH19hIqhWoDnWZ+bCSgcx1DOzKC7+dKDet2zxC5DLtbhAuLSmO1YLjU3Sf67+i+DmLsEkwvT2OZcXHS8Su4bjGjdlJPa5L6447FtF+9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d4FeN4TnANnBKogKQFxjNNeSBMiiluax9+A/X8Pc418=; b=jN5gvifIQkfsSaMXs26mCUE1PQAXwXoXJ2t6sn5rQ1uPEV1c/DHhbMizmMjxN+w86SYfhsXjig+bigA9G6UR54qJMB/IqK4Qo5N+ODEfiOslhsA9jXTaEJIKb60F4WYJWolI/NcOb2v+NR3THrIfo6as5FfNLMUl2CUagsjATO4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by PH7PR13MB5575.namprd13.prod.outlook.com (2603:10b6:510:139::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.4; Wed, 8 Jun 2022 09:29:52 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::b18b:5e90:6805:a8fa]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::b18b:5e90:6805:a8fa%8]) with mapi id 15.20.5332.011; Wed, 8 Jun 2022 09:29:52 +0000 From: Simon Horman To: David Miller , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, oss-drivers@corigine.com, Fei Qin , Etienne van der Linde Subject: [PATCH net 0/2] nfp: fixes for v5.19 Date: Wed, 8 Jun 2022 11:28:59 +0200 Message-Id: <20220608092901.124780-1-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AM3PR07CA0071.eurprd07.prod.outlook.com (2603:10a6:207:4::29) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b80bcf86-5956-41b7-56b6-08da493170d6 X-MS-TrafficTypeDiagnostic: PH7PR13MB5575:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oFYW6593Ag59vxJYtlKDzZLpuAmpHuVlwXR/kol+PtBVOwRBXoVOEkyElzMir5Y8BI+udFlhC71eAvoK50WcE4daqaDTqPwEP7D6DUL8iwwmnL36Gja8nMipxNgDs0xWJZuDJsskujzyq4YmyFk33i8bM2qVkYwT9hgavF8YvbbHuT0LA818yO8rqfuQwNVm/rPQd0x5Iz6lyUTK+KwBW4isCda+Osv6Ri1fabelBG0W8imc5FvzUZmRc/kxnnxhdsr/S3WQLb8fzoNh3iEpoE5fF8mk6Pb/e687U1kPbfPXqDDvbuiP4hlBXgGNFPVwhIfWZYt3zokZXe9MkjKl1lo8MPl6wBb5mHqGIjFIAqOfytJJkdZuFhoZy1yJL2Vcxug0SqTAyt8pgo8n16+MyA8sji7j5YvONUI5gcG6xI+PEsQ9R3hr4eX3MeJ7Z8j+YVwrUPUr4yM9QEMcnXOgRcpVsWVeZ4tY71F95akwPhVGip0zn8pKMD0HL5NbdyHOKaZQN9MicDBFVRWNT9l59pSV6EB5YoMz7yQFsxBsxPPunJBXTZtDt+Zf7q0zTZGFKfHZ4gOvZPvASIhVlNVQxXIn1IQsPMdBOfRt3E7d4aKacyoqAjz/++cZejPc1VABZ8c0HChskJaLZhct7DTLqpGt7rscMvdnE4XRVJ7rbrIxjFylJ1JNvX1Z7l3O0JQ6 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR13MB4842.namprd13.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(346002)(396003)(136003)(366004)(39840400004)(41300700001)(1076003)(186003)(508600001)(8936002)(2906002)(54906003)(83380400001)(4744005)(36756003)(6486002)(38100700002)(44832011)(86362001)(2616005)(316002)(110136005)(107886003)(5660300002)(6506007)(4326008)(52116002)(8676002)(66556008)(66476007)(66946007)(6512007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: SnvONDewsMKAvd2kp68JiVT0R43ZyywVNCx6CGk33BzNv1riHfP21jpGeh7+RC9GrHiEiiWEzqSXcS0aVy2YK3vtxiStQNKvuNbjTH1tEgOfEBVtPI27+Tz+MSMFbqypM5UxbmUjG1CbgMMGObRfJhYTwhReMlgMdfra/5sjAgHhdZLltf+v0uKGfFyO5X2yMNz7uOA4GfsX1g37wEoHA+F64nSkT5B8lnmi5M/obKlcyZ6cS57c4xQlcQzctLY7FfKozz2YNPTFR0jGzJQTIR9vb7N/WXGx9dOtethX9zUWfGzk6as5KmGpQYHKFS4ZB8eDhmNB7uaZ1XO0cAQ5mvFvyPSLYSSADppH9UbjV7obxzZy4kqmYk+HVs+yh3ordkIZETXErbk5UMbuJjzTm86kwfSG6R7B7fc82oWVFXDGpwug/4YgBtx1JKcn7/OEJDPiYsTsiD7M81GSsW/RZLHphasIm7YVn2R9Ovx1Z64NtdS0nJ0cj104D5aOJ9shyduL8f/pmOgZplwdMsCFCD6OUeIMpC7fFaZ4vLoM5pdqvGkIgfDOR0OBVReiFx3z+E4UbaJp8rfHQHr2nM0GPZYzWXeeAuY62tmynWWQpEpugN+YQ1zDF7TSFJ8XYikWVoTKiRHZin5spsfnZvTg3jzKk6YDaY6y2FJf1+x2UmYEIsn3zKaQa7wopvMi7m7S1sCgzo6SHgrKIy/nL8+ogciVYisFXrgRId+HFWbMWI76kvLMxlQc7MvqoKcWfClw2mkubaoRppdjwjqQNMsUEC884DObfO4ZFggGiQyVrQCGoesKqv9lrhvfwsRHx5SriGuVoNpS9aSzDzV7QPP9PuQMb8pakxxdZua8TTTeKz/NKUCSz590ECMG7k2TF2X2aCd5Qb3mSBPNZ4tUJuAbHvIFKyLRYa+dmQkqToArNLaFrgQprZO1Yy85ylGaX6SttMrqoA6dwBlx8z8wG+PuY76iNxosKBH2nFHXzzxaFEVN+0HafWq5gHRtC179eYBKfQ3F/Q4Ff0V9AcvI71KsLPCXqz/FP29oWF+G2De/2Vn0a+QOCTFOakC5c/xO/acyd1KRCMVPTfQvt29UvfC3WGQOsxB3mNqbQt7s2rQ4dGEv1pM+LTDDkdgnK61/yoHPUId6qJiykfxUlUISj+g479q9j7JM2ssktNy0OeRNrDyfA5T+XLjzqx3sdj+FdGO9Ji7xWPH79YalNCg7PPsyjj+QIdZjFB381uzBtEkKfKF4zRJN5n4N9oI1gGOMIMXArFOIA2pShhTRGmBUpPW9GXBsIowLKBTnff4Ee0EVKwGN6xtTihcpH2/C+t7SHYptwZt7bpc5IsNkR15QgiXoZy5CYe3aAluXoBvN65NYAPbZjSTAUFrH/r/IuIAL6/ak93UfyUwfrBKt0O7uzRDFTbxJOTwNt7ypVIbmrxTjsBQ+YfBtgS7KtMODC+yRYj8G5TmvC9aDZiazehrwWM+uMWvouVF/tbcoTPXuhBUuTfffm1NoQipQ/KHNHYXAzG62Jv5U2KMkTeJY5jKBtq+hSVxPq3MfYbB+0mq4WjgNkyejciVqN5ikjjPi+o1Gio52eRxUUAIGE9yN+ZdPcCT5GbTcQj+TlrOdJOzKI5w63Uo6SaPmdUsl6Z3kemJ/DelzfsiC4p9mLUSl7d3cefyMCD32fgF4uIE+PTOUEzuM0V6RzlVo2wbjDtN3tnfJEiMk/I/61735NLJ3InM2IJUcvxJzhHfBZR/oFc/evzklk+tm1s2a/+EoP39bI02aGwKqQqluiH4E X-MS-Exchange-AntiSpam-MessageData-1: nhO+vbTTGBAZNdgt89UBcfM+PQfmLrpcqn4= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b80bcf86-5956-41b7-56b6-08da493170d6 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2022 09:29:52.4322 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: e43JvwjT/ARcPs33yqY+nBlFq69VQ1Mycm42fCRNTSRZ6Ca6rC9qhKBHFDnoAXILNCEB+NhIdl5snUdgp5t6QNiV0M3+t1htxbgi1N/gTJ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5575 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Hi, this short series includes two fixes for the NFP driver. 1. Restructure GRE+VLAN flower offload to address a miss match between the NIC firmware and driver implementation which prevented these features from working in combination. 2. Prevent unnecessary warnings regarding rate limiting support.- It is expected that this feature to not _always_ be present but this was not taken into account when the code to check for this feature was added. Etienne van der Linde (1): nfp: flower: restructure flow-key for gre+vlan combination Fei Qin (1): nfp: avoid unnecessary check warnings in nfp_app_get_vf_config .../ethernet/netronome/nfp/flower/conntrack.c | 32 +++++++++---------- .../net/ethernet/netronome/nfp/flower/match.c | 16 +++++----- .../ethernet/netronome/nfp/nfp_net_sriov.c | 28 ++++++++-------- 3 files changed, 39 insertions(+), 37 deletions(-)