From patchwork Fri Jan 18 15:57:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1027522 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="Ih9UTR/c"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h5G00R4Wz9sBQ for ; Sat, 19 Jan 2019 02:58:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727786AbfARP6a (ORCPT ); Fri, 18 Jan 2019 10:58:30 -0500 Received: from mail-eopbgr140054.outbound.protection.outlook.com ([40.107.14.54]:20406 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727471AbfARP6a (ORCPT ); Fri, 18 Jan 2019 10:58:30 -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=wSuq2ZIOhXL4vgMVBeMrpYSUz/kNpksY0H+nsfGwxeU=; b=Ih9UTR/cd9bbqREVYB/0ItJ8S119A41z+gCfy2poAaUNJNhCgPdStUVWGcG81jYLp7g6BWcb14WJYc3KTUpZRxQlQFjnFi3lXXAAew2xDnykdJBrcYbLGtIr1tWiK8Yk1LxDpPzyVO/n1egDwYTK9c9OrcKCm7pJH8s0qF2raAU= Received: from AM6PR05MB6056.eurprd05.prod.outlook.com (20.179.2.148) by AM6PR05MB6424.eurprd05.prod.outlook.com (20.179.6.145) 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:57 +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:57 +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 2/8] mlxsw: pci: Increase PCI SW reset timeout Thread-Topic: [PATCH net 2/8] mlxsw: pci: Increase PCI SW reset timeout Thread-Index: AQHUr0aUB5YXJVYdZUW8PciRNwEJ+w== Date: Fri, 18 Jan 2019 15:57:56 +0000 Message-ID: <20190118155719.14827-3-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; AM6PR05MB6424; 6:dBKL+nJ/EnuqRJ48JynOBVGkoZJwuK24dtbKLS/6Rb1/y2JzsGgyi2JGGRIf8BR8kB6F6sft09WhHV1K55r2HR4ySbLA95ffHzACA3zrfaqZjf4ayJFZT2DCHS7P2nOnFlso/KeGdN2UXTdLJrgr+tvdD9rTtVq3YYqUOch1XphyFGMVIVO2NUFB3r5UXfA/H1+KWqNG2WyEyARZN1E6oZ/Vya+QHTnnHXc06SqMk+Fv18I77y2qw3HWCynLf9N4u3IIBa62atH6lSrBLMjZ7jfH8fdtsbvpFJQ5VsRWFSJcv4h6WuhuxCajYoX60cNcV/WtSCahcsNYcBD3zXxAJm85ntvQVDFd6OEuxN/gZ/3Ges1zzMZnK0Wt+iGNVuf/wE9fHPro4sP1cu4CpX6sFShbZToNqgV7mqGJAlKSmEwMGGtUxn3+8guIaCj2MvN8bJn4ax7ZZ5xIXuukFUFAeg==; 5:7p5MjBxzLrNM+i9B3Hj0KnJEH8xEESK9uvC2HkIHibNLvJF2gzRwFNYgMqaj7XG1Ho1jsA1KRssOwvZsVBCWF0N0qZxoZSqR2dZkC1kcL+6jKnWU4O2EL5DtO12dLAVKqJW6MhdTxaNt4DnUsLC2BjAU8eYSJWl+4Y/ZolDZycTcefIpFSVXG0ljENNev8fSWDgiDIJ5LrmY+CP1XJ1FXQ==; 7:CUUDIWmAmT//5N5sv4YcR0hqsHK7XZIhMg9h398xn3vb5Up2WOAd8GSIt/1aaHpgTkm+A/IVkfHC+O1cN9wwGs5k+8hscrj+49bSkCCfV6Bm1Kl2RZwBCkTfrMiapPL6gWT10ZY2NaYMM0GHwBNtrQ== x-ms-office365-filtering-correlation-id: 10b3a415-df1b-43e4-dc44-08d67d5db656 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:AM6PR05MB6424; x-ms-traffictypediagnostic: AM6PR05MB6424: x-microsoft-antispam-prvs: x-forefront-prvs: 0921D55E4F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(136003)(346002)(39860400002)(189003)(199004)(81166006)(11346002)(256004)(86362001)(54906003)(106356001)(316002)(2616005)(5640700003)(105586002)(71190400001)(476003)(14444005)(97736004)(71200400001)(486006)(99286004)(6436002)(446003)(2906002)(6486002)(14454004)(25786009)(2501003)(305945005)(7736002)(8936002)(26005)(5660300001)(1730700003)(81156014)(386003)(186003)(50226002)(102836004)(36756003)(8676002)(478600001)(4326008)(66066001)(6512007)(1076003)(53936002)(6506007)(2351001)(6916009)(6116002)(3846002)(76176011)(52116002)(68736007)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB6424; H:AM6PR05MB6056.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A: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: 7UUxYm8BictEEBI3mmCQcb2AqE3W3/cuzAoy24aeH4dizREVuQaxoN6+YJbkaputxVEULcJqbjZ5HKOKUHPkm6FgvX38cANSsxW+BDrmTOAq/QrdF1ck78g/N8NoDSmj+7L2QEeezWGOoBecEnz3k26TN7qh5OUhmgxhkfqQMIkJX2JmsUrGmeqmd23HZ/DTneOipwV0XnBzuRd5zYiDwQUjMOQ1KzRL9f2SwR/HgpdZ4LeClJ83HtrhCN1fYrI25EBf6+EKUMXhV7E9XOxuDQXf+C6JCS9TpVVjlRRJLSdrZCLowtFwYkQ83vqisXkWfYnf6DjrzTccUTTugTSsG7RPOqoCDbqAT93ZXT6pOlo+QC4ef0FUYksvxpIawIoRQ//q8luImBXpJ6bqcgCBdCFRg6vIIGpXhQqUypVfU48= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10b3a415-df1b-43e4-dc44-08d67d5db656 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2019 15:57:55.7465 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB6424 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nir Dotan Spectrum-2 PHY layer introduces a calibration period which is a part of the Spectrum-2 firmware boot process. Hence increase the SW timeout waiting for the firmware to come out of boot. This does not increase system boot time in cases where the firmware PHY calibration process is done quickly. Fixes: c3ab435466d5 ("mlxsw: spectrum: Extend to support Spectrum-2 ASIC") Signed-off-by: Nir Dotan Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h index 4265dd394f27..ffee38e36ce8 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h +++ b/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h @@ -27,7 +27,7 @@ #define MLXSW_PCI_SW_RESET 0xF0010 #define MLXSW_PCI_SW_RESET_RST_BIT BIT(0) -#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS 5000 +#define MLXSW_PCI_SW_RESET_TIMEOUT_MSECS 13000 #define MLXSW_PCI_SW_RESET_WAIT_MSECS 100 #define MLXSW_PCI_FW_READY 0xA1844 #define MLXSW_PCI_FW_READY_MASK 0xFFFF