From patchwork Fri Jan 18 15:57:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027517 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="USS2/szI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5FR1th3z9sBQ for ; Sat, 19 Jan 2019 02:58:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727942AbfARP6C (ORCPT ); Fri, 18 Jan 2019 10:58:02 -0500 Received: from mail-eopbgr150073.outbound.protection.outlook.com ([40.107.15.73]:21666 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727491AbfARP6B (ORCPT ); Fri, 18 Jan 2019 10:58:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9wBeUs/G22yZP4PiDhP+m5kFKRCETSE+lTxXRRm/oFw=; b=USS2/szI/mgAs6cQR6GApvdWEx7lGiOIjYQ1mXVKMByMcFLIs8Gc5LPOSJqX0b67dUaeEMzjbODQGnp9eqYECJvhQI1jom1tMbVy2XgpI9+82mfYfARST2C2pdzIc8YenEoUl6sh3rV8aIctYoGYAHuUlXeyygURk8tlYahc5vU= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB5702.eurprd05.prod.outlook.com (20.178.86.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Fri, 18 Jan 2019 15:57:58 +0000 Received: from AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f]) by AM6PR05MB6056.eurprd05.prod.outlook.com ([fe80::5490:e4ea:7798:e65f%3]) with mapi id 15.20.1516.019; Fri, 18 Jan 2019 15:57:58 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Alexander Petrovskiy , Nir Dotan , Ido Schimmel Subject: [PATCH net 3/8] mlxsw: pci: Return error on PCI reset timeout Thread-Topic: [PATCH net 3/8] mlxsw: pci: Return error on PCI reset timeout Thread-Index: AQHUr0aUWfl/sCgHiUWDMrXWL3AhEQ== Date: Fri, 18 Jan 2019 15:57:57 +0000 Message-ID: <20190118155719.14827-4-idosch@mellanox.com> References: <20190118155719.14827-1-idosch@mellanox.com> In-Reply-To: <20190118155719.14827-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0032.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::45) To AM6PR05MB6056.eurprd05.prod.outlook.com (2603:10a6:20b:ab::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [79.183.38.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM6PR05MB5702; 6:YLtuG70WMBGMjS6o5Jl72ZBUs1ln+fGDlThDEKrRNTz3GVV7JFTv8/pQOzvKF6bK6V3MmmsSSvBg0+d4G/KYhGIqSf1mdUD0kEiE9rXK8jjecqXFqS2nbD9Es0IcsxSxbLlUdOdESjwzahfuHYhUzTyljmlwfmZAK/VCJFfsVV0+v9yufZ9TCCMTYirD1IPyMmgYBlFXazDSKP7k5XQ2FcYuW5BUDP4TXyzI5l+2/kmEMN9afpzNk0InpTA3iQt2IKZ/pSn4QP9HURW4wQ0B0i898ZUOJjY9xKnzSYxclOfq4J9I/DlIfNBJUDNlQPa/eSPcWhIuwz7hAdYFZPCBVXDXNPURBL0V4lD+bHjCoq7QDHU6dH/nD8OxsVZ0w10lTkqbm94V334LFFwaQjdgS/IFXkl1ntyGsOSv1hwBUfMaMEiOQskGkv4Jwn9jG2e0dtyVVuNGanACwVDHimtsQg==; 5:JFuWT5djyOdo156c54C3tgzqRdK1Ptyshu0pWn2RaUQS12rABslDnm/t+auMkRIpefHMOPd1F22eX5Ju2wyjxhoaxPNPXHepjUdroCVacnW+5751s3LL9g+vZonog8AL3nk2evrBZAV24wh3/nN2ZP6wBV+OaMYnBLdzs3HF6eYwg/j/yhalJSw2CBNj1wfO0DG7aMI6adW+tYetbyYIqg==; 7:wAwA2EZDUCpZrr8pELVkeREoG+Q+hAAyMmW7fsHMAlQhC45rQvjTXR+I+JBXPTu+OD3ey79eCDe+RdApE3ms0NCg3EDUUD6rCdJ4DOWEPxpPgHZl7D0U9+Z7rtVQKUMNzQh2cY+FI7bU9F79C3ybyA== x-ms-office365-filtering-correlation-id: 11559779-4a21-4389-8df0-08d67d5db70e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB5702; x-ms-traffictypediagnostic: AM6PR05MB5702: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(366004)(39860400002)(376002)(346002)(396003)(199004)(189003)(5640700003)(86362001)(6116002)(99286004)(316002)(2351001)(1076003)(2501003)(71200400001)(54906003)(52116002)(256004)(71190400001)(3846002)(6436002)(6486002)(26005)(102836004)(36756003)(186003)(6916009)(5660300001)(14454004)(2906002)(106356001)(107886003)(7736002)(8936002)(486006)(478600001)(6506007)(2616005)(1730700003)(105586002)(476003)(305945005)(76176011)(8676002)(53936002)(446003)(11346002)(6512007)(50226002)(25786009)(97736004)(81156014)(68736007)(81166006)(4326008)(386003)(66066001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB5702; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: uuS1rD3eEX1x9ey6+HXOFcPrZ9IgCQ7fSM1bF8MkxQPWHqbe0LyoXIxskIIe7j4Z9Sn+6D6s//0/xGliwhjlNyU4I45wWP9rlld3fp3HcMlNWcIJnv10CueN1c5pBcv1P07nIBteKBqRZX9thQPALFy4c3wqpjLU2EVG1aoKP4/vao0r2OAIwzs7WvJlTaZ8+zNQ/2GfQ4jB2PYbyIo62EVwx+E5svSaaaQ0/jt3dDM7Z3RCNBf4EY9cTgoel7uivzoaFkaI/OaqLRczZguCgk828bp1q2plA/YnSFt6fv9S35Q12rNg9I6UloUIK6bPB91X5kwV7iH05QH2xbAbuYljlAJR5FT+ad5YNjLLR6mWYUvkW+FyDlrS7TJuKuKznegmLOBZ68y5DeOXbgOu4512wMIfQQYgKoQoelTVwJo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11559779-4a21-4389-8df0-08d67d5db70e X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:57:56.9614 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5702 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nir Dotan Return an appropriate error in the case when the driver timeouts on waiting for firmware to go out of PCI reset. Fixes: 233fa44bd67a ("mlxsw: pci: Implement reset done check") Signed-off-by: Nir Dotan Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 91bf294f7677..a2321fe8d6a0 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -1367,10 +1367,10 @@ static int mlxsw_pci_sw_reset(struct mlxsw_pci *mlxsw_pci, u32 val = mlxsw_pci_read32(mlxsw_pci, FW_READY); if ((val & MLXSW_PCI_FW_READY_MASK) == MLXSW_PCI_FW_READY_MAGIC) - break; + return 0; cond_resched(); } while (time_before(jiffies, end)); - return 0; + return -EBUSY; } static int mlxsw_pci_alloc_irq_vectors(struct mlxsw_pci *mlxsw_pci)