From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-eopbgr680064.outbound.protection.outlook.com [40.107.68.64]) by dpdk.org (Postfix) with ESMTP id 474141BACE for ; Fri, 11 Jan 2019 23:37:25 +0100 (CET) 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=1FHLTC+5lyrNN9t5wO6jSzjNh7NmkyDGVy69RQTP+iM=; b=bQDK0h75/uDqUvZn2auysjLZtnOHppF5LT3jxppvVKZJLUAddqk+u+rMa4uv1G7FBrJOPifTJOJEh6iCuIJdeCUIap+PTjuhUjuWs//HEyeNxBwssubzSRg5qdTWq3JtHhlR+vgLzo+8q0fPmCYWk1Y95gf/DKPqqqEUIjAeZgQ= Received: from SN6PR07MB5376.namprd07.prod.outlook.com (52.135.105.151) by SN6PR07MB4479.namprd07.prod.outlook.com (52.135.93.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.15; Fri, 11 Jan 2019 22:37:23 +0000 Received: from SN6PR07MB5376.namprd07.prod.outlook.com ([fe80::99d7:39b3:921a:7e45]) by SN6PR07MB5376.namprd07.prod.outlook.com ([fe80::99d7:39b3:921a:7e45%4]) with mapi id 15.20.1516.016; Fri, 11 Jan 2019 22:37:23 +0000 From: "Mody, Rasesh" To: "stable@dpdk.org" CC: "Mody, Rasesh" , "yskoh@mellanox.com" , Dept-Eng DPDK Dev Thread-Topic: [PATCH 17.11] net/qede: fix ethernet type in HW registers Thread-Index: AQHUqf44n6h4P4Gmh0GzKCxYWM9bnw== Date: Fri, 11 Jan 2019 22:37:23 +0000 Message-ID: <1547246170-12917-1-git-send-email-rasesh.mody@cavium.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR05CA0107.namprd05.prod.outlook.com (2603:10b6:a03:e0::48) To SN6PR07MB5376.namprd07.prod.outlook.com (2603:10b6:805:74::23) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Rasesh.Mody@cavium.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [198.186.1.5] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; SN6PR07MB4479; 6:7KGRYG/JbbPYOb9ZmZcM2Qpx18pR5VjvBkyLfKAtxF2WjdNi4Uel7hyyDxQTx1tdQ/xlxoP6eOQN7r8T3x5nZlXP3LCI+24rLUE+OQ9GIO7iI7hqoJFwfc+9Saa35Yaouh4AESY0sz5whagFnJW278CI8SI8BTAkHqbWJoGvcCr0qyFP65PFHZxywlczEpjt5gobZpxu/xDMdk8NMfbT4Y3RMOR7PAJsT9Ge2369hQ933iNiIvBkXANm732PBhCOXyEMxXrvdOiC+uIEDnYGK+IHwgwyWBTbArAsXvz8ba2A+pXw4TfE7HgPFgk7w5L1PPOy51Ygx4/00uP0Owk4p3YR1UzFzrgahcdNwoPXDuaB9K0t30vK8R91UcrVK8X+vGQ/baap74OOOiRY1gM5UcNsC0VIbekx6VlsqXVFE4Qlu6ixemPs2i3THhH4TCi1dcWTBfdeHMLQ0sL9dLHTjA==; 5:m2Q6R0XNf8N2vOk+bV5wbgNsTkWhUyq3yaKa3v6PvArhkAWsz6cbiJoqbaTpSxYRSYZsJ4OnWBd6RSM4br8C2SMoto7DIvpXTgL5ZrELVI2Ge/8wC+PLHumETdH4ddgyJ05W8Bhkz0H2ytSvUrUtcRNbp0jTusLQ0iL3y7ASjXgFGtEYiSWbaiijwOMLhTpYlF0NVedRXpAvF134xm/2BQ==; 7:sM6xZPhoPV112QfeYA2yBe+HP5/iLJbG/wzhPtCjOyuddTeaOp9XvBvkUkX8zU/ODmrYl2y9l8P/3NNc2V/xP4X3FX6w+RJuCcx6SsyWeR4OQP+SLFgLYFgTD0fHz4XCY/7//8dyeWbQPBLj+K0HAw== x-ms-office365-filtering-correlation-id: fd0d50ce-2827-46e2-9a8e-08d678155a66 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(2017052603328)(7153060)(7193020); SRVR:SN6PR07MB4479; x-ms-traffictypediagnostic: SN6PR07MB4479: x-microsoft-antispam-prvs: x-forefront-prvs: 09144DB0F7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(396003)(39860400002)(346002)(376002)(366004)(189003)(199004)(2906002)(99286004)(186003)(54906003)(5660300001)(25786009)(53936002)(3846002)(6116002)(97736004)(6512007)(66066001)(68736007)(52116002)(386003)(2501003)(105586002)(26005)(316002)(36756003)(102836004)(486006)(6506007)(8936002)(86362001)(106356001)(6916009)(8676002)(71200400001)(71190400001)(478600001)(5640700003)(1730700003)(81166006)(6436002)(81156014)(6486002)(476003)(2351001)(256004)(7736002)(305945005)(4326008)(14454004)(2616005)(107886003)(72206003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR07MB4479; H:SN6PR07MB5376.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: LcxVXET0LUypi7sq8iQFWMaIjvB2DUexMhIpuTWF/IBhzNVo41EiU2MakF9KkrmGNxmDKH8ZRrwD5rBdFaxK9rNPXmJPPtCkOy2SQSMoXtadJ1lXQOQh4g0bUV4G29PO9x6qTAwT0VOgwYxakZsfZsDPoZEfuhKwcrNhSoaiu3zNB5UTHwztaPcBaLFMrGGtGxquo1ocIYh+f4XZTedXSvzYQ2OgNyU8HhSUfsdUQnQHbII1DyPDrcfum7m/IkPlcXgP/KKSDZcmoPJrJnvwiId2anQLhBAQLPk/nqm0q16KTW3NFB7QOF/yoYqvG84lW9HBYU53hsIcCRgsfw84FX4yItlO6Pt1SNYuwQWTlHRaP7md3CH8oK3FteMPjsa4XxlgR6bbs/0oKeo9p2BwbkdMZ3eDeAyVOalrHTu6M/Y= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd0d50ce-2827-46e2-9a8e-08d678155a66 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2019 22:37:23.0687 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR07MB4479 Subject: [dpdk-stable] [PATCH 17.11] net/qede: fix ethernet type in HW registers 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: , X-List-Received-Date: Fri, 11 Jan 2019 22:37:25 -0000 [ upstream commit d5df6159dddadedc1bdc12ec5f1a92a813dc94d3 ] Fix to program the HW registers with proper ether type. Fixes: 36f45bce2537 ("net/qede/base: fix to support OVLAN mode") 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/ecor= e_dev.c index 6a3046d..ca3bb17 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -2334,6 +2334,7 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev *= p_dev, bool b_default_mtu =3D true; struct ecore_hwfn *p_hwfn; enum _ecore_status_t rc =3D ECORE_SUCCESS; + u16 ether_type; int i; =20 if ((p_params->int_mode =3D=3D ECORE_INT_MODE_MSI) && ECORE_IS_CMT(p_dev)= ) { @@ -2366,6 +2367,25 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev = *p_dev, if (rc !=3D ECORE_SUCCESS) return rc; =20 + 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 =3D ETHER_TYPE_VLAN; + else + ether_type =3D 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_fill_load_req_params(&load_req_params, p_params->p_drv_load_params); rc =3D ecore_mcp_load_req(p_hwfn, p_hwfn->p_main_ptt, --=20 1.7.10.3