From patchwork Sat Sep 8 20:30:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mody, Rasesh" X-Patchwork-Id: 44447 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 777AB4F93; Sat, 8 Sep 2018 22:31:54 +0200 (CEST) Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680088.outbound.protection.outlook.com [40.107.68.88]) by dpdk.org (Postfix) with ESMTP id 7DDC14C8D; Sat, 8 Sep 2018 22:31:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BprqUx+Gr+AWp9dewVBV5+qcRwK3c7GCqMqAhJK6AFE=; b=TXp4zmeW5bCbIxkAhHKzMTwXfb5Syp1ZivJRyLJtpbD+i1CyWXlAOBs3VhkjkMW3VqkTqC83ZO6zk+Ykjxoozadcr/YkNZLNb7ddXrzJENyCtWcHyxIH4r07fb0v3VzhVXT042hxO8pO0tAy5J986h1Vwuja2feqEYhZLJ66tJ8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; Received: from cavium.com (198.186.1.5) by DM6PR07MB5372.namprd07.prod.outlook.com (2603:10b6:5:44::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.18; Sat, 8 Sep 2018 20:31:48 +0000 From: Rasesh Mody To: dev@dpdk.org Cc: Rasesh Mody , ferruh.yigit@intel.com, Dept-EngDPDKDev@cavium.com, stable@dpdk.org Date: Sat, 8 Sep 2018 13:30:53 -0700 Message-Id: <1536438666-22184-5-git-send-email-rasesh.mody@cavium.com> X-Mailer: git-send-email 1.7.10.3 In-Reply-To: <1536438666-22184-1-git-send-email-rasesh.mody@cavium.com> References: <1536438666-22184-1-git-send-email-rasesh.mody@cavium.com> MIME-Version: 1.0 X-Originating-IP: [198.186.1.5] X-ClientProxiedBy: BYAPR02CA0031.namprd02.prod.outlook.com (2603:10b6:a02:ee::44) To DM6PR07MB5372.namprd07.prod.outlook.com (2603:10b6:5:44::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca9beade-274c-4758-0702-08d615ca1a16 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:DM6PR07MB5372; X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB5372; 3:qu2kbLvEZERj9coNRvu7B9p9kUf/Y0HNzrjW7UM+YbYggU/yvgOPUjMTgHPAbTzMhNlWyogc+egRWF5ONlAPvBf2ESW04C0dAqUU7NpaD1xCsapXn1EfYmjWHG5VUHi/7mBndDwykB3CPiJoAzaRJthcRVZ3jzvvYDJj4dRCE2B++WZUhXEzGVgfDxG7ScX6PaCeKReeaujLeHnP+We9yKOU9TUgtwOlgtoyBUPBMKwlgYFxuss8QIyJ7hc63Q9V; 25:FtadumHvVYnWEbTjF8EBewRL30uuRumZdKaHH2W2vzjrm8Va9JUinZPTBIUfDBvJSp/dX3q74mN+rC24zH7BDc1hlNkDFoj2BebfFoOS+VLpBDiZaepF3M86UsVASSUByM0wuDw0va4sQa54xo/1r4iGQNSdkVgz1T2JqqC8dPuLk7wS7BrA3lYQH1NtBv1+TViRe54T1dwoV6om2RGkXWiuKohBmwSPMweaI+obciLkRG4LCUo9CPqGWsznvgwyQusxOe4Tf38XJEvLMHY6rvpDi8Hcb7D8FcPKk0TZ0dVm71MEjBCFRtQhFbLxeTbLwRslqiATTsUM2PKzpp5ncg==; 31:40VMKjKejtQCm28AXLH8yY4xk+Gs0mpV/4XegGaLj79nl43HblhQkNsiIR2RY6KEpD/pllyI0KJV36rroH/GyP8VtjXn6mGrIgu9RZc4jX+fOEBZqwBZGnQE/GyPY376zwnIF/P6kMBtFpN1t6GrMBRzjDnI80G67kU67+CZ/Q2myAdM4qxkKYz3VUNdGtQwR1MBu67wqEihp1+54SrLpfFdTpkRPQYAgTpK49saTKA= X-MS-TrafficTypeDiagnostic: DM6PR07MB5372: X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB5372; 20:IXGx5OCKXGnic+tHqRS15zqqgKO29D54lRR2FJfAOBUxmoJXg5eAbTFrODHT9S3fve0So5+zSS2U9TMwHLw5PiHneKbubszc3rAA9uAyFyFXDBuntbQsMjAtTZw/Y9cMxT9TsV/+lX3wOzA+2bucNIY1couABVkuskWhKI2ZaxrS5w83oY0/Io6W9vP1gUTw8X8iexjdbl2fNlKX/wP4IqMfxralnnLdAqlslptCioUAPn+cBNAoul5oXqZ7A1j8AGlYDarglxtQxLr/azNmxtPOEqekn/tGiBAh7+uQYnlbpIeJJhYStAyh/1Hglxli/LKD7Emzx0DGpwaeNHUqpQFMDmsKC0uw2M209SIFDTRQWJ0nIJYdY8UbDxysiVfbZGdsGBIt+IrYZgFg3CrcAgS3/QsjXoywGN42dTcUwUUPI4cgCUmWaInE982f976U/huNKFYiCVyVEoDhazgctx4ZerQHn/GF7+6CYOne7LVejewiV4XrKRI/F5rKs9TX; 4:TBFQRKx5lW71QEpHbMbzXtTiYdUdNujUH5Ujsg8r4i92la5q2rWhq2iZfz78qCBddmtGbkuhhKZur7ry/YQ/J02cPRnAtsbpepA91Ir1rsMIaHMeZsCnQqCzHOY9kBjFKmDXDNwcP5O0oJhRrSFJJE8jvtjxlkui9p0DW28JiMWmzJJkYA7ORNRYGNJwua5JApMVaVGOCUpFjoduIDHh+UJSHPUYatwkVBg77XsxuSdhbyj6v+enb1evHGfeVue1F2TXIYSf+fjmxt7Yvet1UQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699050); SRVR:DM6PR07MB5372; BCL:0; PCL:0; RULEID:; SRVR:DM6PR07MB5372; X-Forefront-PRVS: 07891BF289 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(136003)(346002)(376002)(39860400002)(199004)(189003)(4720700003)(97736004)(2351001)(106356001)(105586002)(72206003)(66066001)(47776003)(4326008)(50466002)(48376002)(25786009)(305945005)(7736002)(2361001)(8676002)(478600001)(316002)(52116002)(69596002)(186003)(50226002)(44832011)(16526019)(486006)(21086003)(2906002)(55016002)(26005)(8936002)(476003)(956004)(81156014)(81166006)(86362001)(5660300001)(6666003)(36756003)(16586007)(11346002)(446003)(2616005)(76176011)(3846002)(6116002)(6916009)(68736007)(386003)(51416003)(53936002)(7696005); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR07MB5372; H:cavium.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM6PR07MB5372; 23:eZW8pndZRZ52+MPeTsqwEffrAeF960FlQI0nO18Ea?= EbBjC83c1Kci3cEmRJSlklCIcuV9d8V7DYUM9/lbXPu0I5iH65ZmO12HQgSbCtw7+76xWU2QC2RdjuossJkAH/y/ZvbUzapvyKjMy6VjFia1Daukkn7B0dLXAcoPbcGlfXmUGXIt7GvUY05B0ILs+zohfq8Uo1Jy0TrPgKTXMURdgRkdljlBbIMwCQgfQ/QBHlPSzRmhGHoX5Pp04THvg9tr0ZPD/9o63IxkNGJyWmKhMSajUztykzznGgF40jVkpGlWy3T9zIxVWuJJOim6tRmQq+LXc8uHCC+AKnXWUCgTKX6y9GZvhqnXMRSTRXgZAdL+myA5pi7xLdfqmg4vrn7HXeZsA1sa582T4xM6S1YbeGG5dB8JQogHBrRt8woFxoKDxgUT63MLsRga6KeR0ueKecs6lVKG93mRQswui/9poALFSl3qn7IBsaez5TRq+XOppDZ5ejclg+OvJCKF3pIn1PUE9PijAKBzzEIwCIjD1V5J3gyJyPHWPD6URCYcdXRNFMpudYXY1gDqBI54zJyMk5LmyhEVfpzYYcvSXU/Kjts2O6j5pzT1borhSbM8crstOPs0JVxYmQnjSAMVpZhE+qCxAeqzsncN1QBYGmdytPblLi5hHb1lFCf1MfCJGfhqKx4Mc8/0i6WBq84YH56JW5j5SxFup2qG4mP+7EmOn6lRuv54Yxz45Ytgw6sROvKWZTH0nVPZtsw4h0NZkpACXTRX/SkWxEddum+M/KLGaW4bum9fldlRPbiiLRUmLwAL6IA4RRDBkvqGj2WC/HCIuGPpsagIDUpUPKzRVAiZIJn3I2VrY8XugVRLSfO0DceU9FF6gRAWyBvHGb6SOy2BNW+HknqsHyv6Wg9ai4wnc9GnB5nvUgMI+VZTZAy6hSmnztlC2zx+HTuzs+Ky2AzZN+Gf/dM7puP0AdBaYYMYmwHxe7AJmSNOs0LCGU5h9Ir9iS9McE1D3qnY9fNkm6aJiXuGCUQ74ee6gDoDlTrXkOPH3l2X5iHZvxXf3iW2pbVDuX4d9JG4Y8xahzuhrZ5Kr4/uoMlb5+Q07IbLNbHu/dKzjMYsdKlEbQLrWk7N0k3qhbcaZtsL50dKIHhZEQ103RxBts+5/fixR0+GLWx7mygVVFgPQxXEfYo3mxj5KwcPrEOnXh2ao2ne3Vq6pT5b9Y36Q0xCLsEMk+KkvJROXx446CF6xjWIqHnDQalCnMN1/xXCUIs7+MQHQnbfLpJBLtfLZJwP0ct6ZlxXy6u7g== X-Microsoft-Antispam-Message-Info: mPDS6yyzs53AvF6xIwKvuHdjeE7viWp8iiGFabJZcmIJA/5Z2dZZcAIcsuUsUqR2V3M33Zn6D+cmO6hZBDGWE+GCuul/zRTdCfwp/tPsbafqCwLK/PDoALOLlqF/w/Kxhp5xm6aEPemOjP7KknIh70iZRF9hRvGCSASP5pMml8uPRm16YZIg+oEo1OHukj4v8yxLqIE3mRg0kjGNzR2MZSrv8QMR49o/MFo3BNCrYLPvXboNj+n6vTM0Un02RPqYvwyLA22VhFxU5KjDjMfvfFTWdpni6ftW6Zb3jhTCnqriAi5uOsltmrqe8CXnaQQjLrFZEJtwKCI606TkRtTs7E3oJRnQei3xsCZLj81df50= X-Microsoft-Exchange-Diagnostics: 1; DM6PR07MB5372; 6:jGtBxKTxbNSVNvZQQXeJ0TJyqk2ibmZLuH7d7x2x68RIUdksKj0cS2yiIx44NHowWwuABFY9NqzQWuuYuAO/ygc+qPbfHi5LLw+zkBe7/lqenj+471HOjOn5Cm17uCr0RO4JTVFGsW+RsggltGLM/Kye9DQCCLFoGN46VHrzE9kK0pkBGIIx633HYV6plwGZzd0NitkCU4p6cOpPYWge+n/jIoeGt6FHdlVfd/muG6FsLrxLa1nr1mVhiOXa3RBdCakxcKWC08sD83c7xKVYU+BL7ltynG3/L9Uu0jMl18XM66XORJJ5sXzpKRuVcnskhIRWVgUxSH6y3RAabkWiVsja3v+CQcazA+FnpO6UEmD9UE803BgF0ClfOuYsNz6R2up5d6P7mrSkORl6EEOmqh5ewTJcvarom1HqHgaM6sBrlAj2+CHmQh4pxwktxPB6MUvQHgdvcPNWOauqPMedrA==; 5:rNjn+pgfH6xOBKvZOVkWLb8ek8DGcI/2zJQREK4Jr1RKI8hvEJj1QItnJhGxhukw+lZrdijlwjV0ovMO/bARRgBBvtd0Q5SUY75vdg5pJKc1unMwYeiZRATxZseF6e4df3MuAzyykVs/b9u6CO3hDORbJRrYRdn1nvc01l07IeU=; 7:KVp9h8ryzcZr82WW1AYGx9lKt7y2isiCtczgXKWTtw1NvOI0DmlB+N4lU8Y/sAip95prJsZQxjXKa0VscDt0J77va297pnHIgJvfgv87yF6tVRv7NLnd3W4ubkalACMfDhZnTtRPUKTNca99eNTLzz8SXJDFDhTtk90LcNvJ6KEJJTWWhuEGKPxupZlaV3v18D7OMFCr346+aNeMv4E1Oxp7PY5VgNXx5xFl7GwpAyjQHuk+FPsc4O2UvGrqVDMZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2018 20:31:48.0669 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca9beade-274c-4758-0702-08d615ca1a16 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR07MB5372 Subject: [dpdk-dev] [PATCH 04/17] net/qede: fix to program HW regs with ether type 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" Fix to program the HW registers with proper ether type. Fixes: 36f45bce2537 ("net/qede/base: fix to support OVLAN mode") Cc: stable@dpdk.org Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore_dev.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c index 958d7a0..6302abc 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -2410,6 +2410,7 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev *p_dev, bool b_default_mtu = true; struct ecore_hwfn *p_hwfn; enum _ecore_status_t rc = ECORE_SUCCESS; + u16 ether_type; int i; if ((p_params->int_mode == ECORE_INT_MODE_MSI) && ECORE_IS_CMT(p_dev)) { @@ -2442,6 +2443,25 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev *p_dev, if (rc != ECORE_SUCCESS) return rc; + if (IS_PF(p_dev) && (OSAL_TEST_BIT(ECORE_MF_8021Q_TAGGING, + &p_dev->mf_bits) || + OSAL_TEST_BIT(ECORE_MF_8021AD_TAGGING, + &p_dev->mf_bits))) { + if (OSAL_TEST_BIT(ECORE_MF_8021Q_TAGGING, + &p_dev->mf_bits)) + ether_type = ETHER_TYPE_VLAN; + else + ether_type = ETHER_TYPE_QINQ; + STORE_RT_REG(p_hwfn, PRS_REG_TAG_ETHERTYPE_0_RT_OFFSET, + ether_type); + STORE_RT_REG(p_hwfn, NIG_REG_TAG_ETHERTYPE_0_RT_OFFSET, + ether_type); + STORE_RT_REG(p_hwfn, PBF_REG_TAG_ETHERTYPE_0_RT_OFFSET, + ether_type); + STORE_RT_REG(p_hwfn, DORQ_REG_TAG1_ETHERTYPE_RT_OFFSET, + ether_type); + } + ecore_set_spq_block_timeout(p_hwfn, p_params->spq_timeout_ms); rc = ecore_fill_load_req_params(p_hwfn, &load_req_params,