From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-eopbgr780072.outbound.protection.outlook.com [40.107.78.72]) by dpdk.org (Postfix) with ESMTP id 95F561B61F for ; Wed, 19 Dec 2018 01:43:50 +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=LENuVc0oYtrqb+Dv5A5Gr04lI9+jc1xUKiXPazDtqt8=; b=CrJO+j5S9gUKyqh+x3CHvL+/pp5/CK2t59Ca/OnvHYzi+iT4zlF7cGVgLeoKKZY6oYVYGYiyQ8k2BdufX6merdv0x9YVWBkHEKZXhDtPokcD1Oaf/IZCD0Ja/xnJdIbuN8CUroEJhYbahN6tfMZFT/1z1NRvb77ihApT7GplxN8= Received: from BYAPR07MB5365.namprd07.prod.outlook.com (20.177.125.18) by BYAPR07MB4792.namprd07.prod.outlook.com (52.135.205.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.18; Wed, 19 Dec 2018 00:43:49 +0000 Received: from BYAPR07MB5365.namprd07.prod.outlook.com ([fe80::514:ce1d:4236:9b9]) by BYAPR07MB5365.namprd07.prod.outlook.com ([fe80::514:ce1d:4236:9b9%3]) with mapi id 15.20.1425.021; Wed, 19 Dec 2018 00:43:49 +0000 From: "Mody, Rasesh" To: "stable@dpdk.org" CC: "Mody, Rasesh" , "yskoh@mellanox.com" , Dept-Eng DPDK Dev Thread-Topic: [PATCH 17.11 3/3] net/bnx2x: fix VF link state update Thread-Index: AQHUlzPo9ThuQTXc2EOh23BWw8N1Mg== Date: Wed, 19 Dec 2018 00:43:49 +0000 Message-ID: <1545180208-3622-3-git-send-email-rasesh.mody@cavium.com> References: <1545180208-3622-1-git-send-email-rasesh.mody@cavium.com> In-Reply-To: <1545180208-3622-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: BYAPR01CA0017.prod.exchangelabs.com (2603:10b6:a02:80::30) To BYAPR07MB5365.namprd07.prod.outlook.com (2603:10b6:a03:64::18) 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; BYAPR07MB4792; 6:7CDWKA6OqEgpmQk3SoMrESlE8pPsd22VTXcRaEhnRnrL5iIupqtEiQFV3b4Jrb7O0Uixj/NGX79rinY1ePmySPS9QW1cGnZ05wzE5bOzCq1uZO82i92uSQ9Ur/s06l4nrN/F9KlB+WcsopwBaq8RRsyi1NVl15+hyZsXvmwPim/cZIrkXdKcHoCRN5GFL6WlA7iB95K3FByKzWSoo70AhzQ6K97gc28U9uftROMeOaWYiXcDDrBcvEVp9pw25ciJWy1jg76RAdE17tvIUZxBSsJHaNbaDmRRqomCx0M3arr3sIF/8ZyC+p7dV8luIgvCkPo4MRhOEmCvNszGbY3lrffVQjHFze9pEBQCrbhCuEidqJffPhRsJp9bbitizKxwJE4IZLoBccFrI/SJb83wzrV0mXenTTmk3cv1iCfRvlHFm7Ar/j88lDljyIBQ7xrvK3hL5ny99gxopQs5P07cSQ==; 5:oLrXfmVk1O7MpSuJsMbGD9A+Xt8YqKsGxPvPjexmbhprK8fkiX3I5PkY7oQeB3EPxAIMQAK+KSwjtSCgqz9pKdL1kLCLsEt/RfEmFkxJR6ftye3O4hjbhJ3PnVTyhdW5wv7uQ0YIdzfwWdRkaBqSKia6gaWAmkp7ZHTve7pxwKo=; 7:Nd2rrvxXLRORB9sRd/y+m9QRupEaTbDQ48TNKLI6arnc7QZftCzkxXD8vCw+c3k27kDKByaa1s8jZnzTrCiHziPc3iH05pMcEcjqoKcsxyVUeDcEFkX0/IiEojhnfC7Yw4liwxp7vorRq5AqRXvkew== x-ms-office365-filtering-correlation-id: 05b0d36d-e061-4b7c-ebcc-08d6654b0a64 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4792; x-ms-traffictypediagnostic: BYAPR07MB4792: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(6040522)(2401047)(8121501046)(5005006)(823302103)(93006095)(93001095)(3231475)(944501520)(52105112)(10201501046)(3002001)(148016)(149066)(150057)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(201708071742011)(7699051)(76991095); SRVR:BYAPR07MB4792; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4792; x-forefront-prvs: 0891BC3F3D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(1496009)(396003)(366004)(346002)(376002)(39860400002)(136003)(199004)(189003)(99286004)(54906003)(72206003)(2616005)(81156014)(316002)(575784001)(86362001)(386003)(2351001)(102836004)(76176011)(6116002)(6916009)(8936002)(6506007)(3846002)(305945005)(7736002)(2906002)(81166006)(1730700003)(8676002)(26005)(52116002)(105586002)(106356001)(71190400001)(186003)(71200400001)(486006)(11346002)(446003)(6486002)(6512007)(6436002)(15650500001)(14444005)(5660300001)(5024004)(53936002)(256004)(551934003)(4326008)(68736007)(66066001)(107886003)(5640700003)(2501003)(36756003)(478600001)(25786009)(476003)(14454004)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4792; H:BYAPR07MB5365.namprd07.prod.outlook.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-antispam-message-info: 5wpK3BljFpOrSpfCR/WIBpFhUcVM1gcGmRExFjG1nj9jpLLd/3iSHAAQNjar/j6D7K2FcDaxNBnGBDu08qcZwPq7VLc+XueVjTH/Oaeo1hCtSMzYLg2/9FOlbvMEI800pwFhtJk32CpDh6/g3P0pHML94jxiX7c1AYAi/BIVoB5vzfwryqLF9cMdoB+FJM2+FZjq7FuGmDQq6hRy1jPuvtywHRv4P0+oTY7rxH2XzMPJbQn7jh1f9hZmBBqSvQ79bfRNHOa9Kuno3iDx8g94Wc+8lhCKWGMk8zBaYKOPIWrAuBtl5QgFLX7hJnb66qlA 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: 05b0d36d-e061-4b7c-ebcc-08d6654b0a64 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2018 00:43:49.4436 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4792 Subject: [dpdk-stable] [PATCH 17.11 3/3] net/bnx2x: fix VF link state update 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: Wed, 19 Dec 2018 00:43:51 -0000 [ upstream commit 39ae74caa0d1158df15ea1e2f8e893eee1a2189d ] In general the VF driver should not access the chip. For VF link status update, VF driver should not use HW lock, use bnx2x_link_report_locked() instead. Add few prints for releasing previously held HW locks. Fixes: a9b58b15ed51 ("net/bnx2x: fix to add PHY lock") Signed-off-by: Rasesh Mody --- drivers/net/bnx2x/bnx2x.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index fb748a1..42fa510 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -203,8 +203,12 @@ static int bnx2x_acquire_hw_lock(struct bnx2x_softc *s= c, uint32_t resource) uint32_t hw_lock_control_reg; int cnt; =20 +#ifndef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC if (resource) PMD_INIT_FUNC_TRACE(sc); +#else + PMD_INIT_FUNC_TRACE(sc); +#endif =20 /* validate the resource is within range */ if (resource > HW_LOCK_MAX_RESOURCE_VALUE) { @@ -252,8 +256,12 @@ static int bnx2x_release_hw_lock(struct bnx2x_softc *s= c, uint32_t resource) int func =3D SC_FUNC(sc); uint32_t hw_lock_control_reg; =20 +#ifndef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC if (resource) PMD_INIT_FUNC_TRACE(sc); +#else + PMD_INIT_FUNC_TRACE(sc); +#endif =20 /* validate the resource is within range */ if (resource > HW_LOCK_MAX_RESOURCE_VALUE) { @@ -7047,7 +7055,7 @@ void bnx2x_link_status_update(struct bnx2x_softc *sc) } bnx2x_link_report(sc); } else { - bnx2x_link_report(sc); + bnx2x_link_report_locked(sc); bnx2x_stats_handle(sc, STATS_EVENT_LINK_UP); } } @@ -9396,6 +9404,8 @@ static int bnx2x_prev_unload(struct bnx2x_softc *sc) uint32_t fw, hw_lock_reg, hw_lock_val; uint32_t rc =3D 0; =20 + PMD_INIT_FUNC_TRACE(sc); + /* * Clear HW from errors which may have resulted from an interrupted * DMAE transaction. @@ -9403,22 +9413,23 @@ static int bnx2x_prev_unload(struct bnx2x_softc *sc= ) bnx2x_prev_interrupted_dmae(sc); =20 /* Release previously held locks */ - if (SC_FUNC(sc) <=3D 5) - hw_lock_reg =3D (MISC_REG_DRIVER_CONTROL_1 + SC_FUNC(sc) * 8); - else - hw_lock_reg =3D - (MISC_REG_DRIVER_CONTROL_7 + (SC_FUNC(sc) - 6) * 8); + hw_lock_reg =3D (SC_FUNC(sc) <=3D 5) ? + (MISC_REG_DRIVER_CONTROL_1 + SC_FUNC(sc) * 8) : + (MISC_REG_DRIVER_CONTROL_7 + (SC_FUNC(sc) - 6) * 8); =20 hw_lock_val =3D (REG_RD(sc, hw_lock_reg)); if (hw_lock_val) { if (hw_lock_val & HW_LOCK_RESOURCE_NVRAM) { + PMD_DRV_LOG(DEBUG, sc, "Releasing previously held NVRAM lock\n"); REG_WR(sc, MCP_REG_MCPR_NVM_SW_ARB, (MCPR_NVM_SW_ARB_ARB_REQ_CLR1 << SC_PORT(sc))); } + PMD_DRV_LOG(DEBUG, sc, "Releasing previously held HW lock\n"); REG_WR(sc, hw_lock_reg, 0xffffffff); } =20 if (MCPR_ACCESS_LOCK_LOCK & REG_RD(sc, MCP_REG_MCPR_ACCESS_LOCK)) { + PMD_DRV_LOG(DEBUG, sc, "Releasing previously held ALR\n"); REG_WR(sc, MCP_REG_MCPR_ACCESS_LOCK, 0); } =20 @@ -9748,6 +9759,8 @@ int bnx2x_attach(struct bnx2x_softc *sc) sc->fw_seq =3D (SHMEM_RD(sc, func_mb[SC_FW_MB_IDX(sc)].drv_mb_header) & DRV_MSG_SEQ_NUMBER_MASK); + PMD_DRV_LOG(DEBUG, sc, "prev unload fw_seq 0x%04x", + sc->fw_seq); bnx2x_prev_unload(sc); } =20 --=20 1.7.10.3