From patchwork Sat Aug 19 01:21:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manlunas, Felix" X-Patchwork-Id: 803480 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (1024-bit key; unprotected) header.d=CAVIUMNETWORKS.onmicrosoft.com header.i=@CAVIUMNETWORKS.onmicrosoft.com header.b="Z8/id1wD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xZ2Gt1nL3z9t2V for ; Sat, 19 Aug 2017 11:21:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751537AbdHSBVk (ORCPT ); Fri, 18 Aug 2017 21:21:40 -0400 Received: from mail-sn1nam01on0086.outbound.protection.outlook.com ([104.47.32.86]:38918 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751054AbdHSBVi (ORCPT ); Fri, 18 Aug 2017 21:21:38 -0400 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; bh=O77IFoiUfqzVXQc0j1UMiwZMed5nrJxXE6IHnAz0cpU=; b=Z8/id1wDN4DMYhrA8OW/lfPrsH2MLBDTQ4IyodXrOIotRvkBKdmPUclj8TkUh0LGqCT/RFaHHTr/YluJbLoGlhnUq3SUblNPk1Cwjt1vDMSgucZsy8ALTNtDOETXoYQeCeZT5DGPuCEjzeKGTNKm1aWScsSlmhWYjuH1Yi2e2D0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Felix.Manlunas@cavium.com; Received: from localhost (50.233.148.156) by MWHPR07MB3181.namprd07.prod.outlook.com (10.172.96.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21; Sat, 19 Aug 2017 01:21:36 +0000 Date: Fri, 18 Aug 2017 18:21:49 -0700 From: Felix Manlunas To: davem@davemloft.net Cc: netdev@vger.kernel.org, raghu.vatsavayi@cavium.com, derek.chickles@cavium.com, satananda.burla@cavium.com, ricardo.farrington@cavium.com Subject: [PATCH net-next] liquidio: fix use of pf in pass-through mode in a virtual machine Message-ID: <20170819012149.GA4838@felix-thinkpad.cavium.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: MWHPR01CA0028.prod.exchangelabs.com (10.172.172.142) To MWHPR07MB3181.namprd07.prod.outlook.com (10.172.96.139) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7ae716f-512b-4ce2-a2de-08d4e6a0a29d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR07MB3181; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3181; 3:M2ifODHBog59jTiRY2a8KV1qizQbSNLMdD6EGIJWvNNc8IV7yJxGmTY6fyX+8HqmiBuiDPeTWpL8rWPni9OMo1AtmVLko/hJ1g+IQXL0kUOik+dk6iEUos/ARV+rMb7Epd671o36/j+xEDPaD4XhPMRTcVQEiDV+tdeFOpXsyeEE0cZnXAOnzJfJhIt2j+vxpC9LFvo1pQnLFiaLv5JaLxBjirdc+NnZzMOi3BUjj13xGQirtIaFLWwADCUbOXdf; 25:OAkzv1gV14w/Tx0emivRqugV4PzTqkk34LCpsSiLb2IwENqfa/2L4oGWkc73D2TYIWIo6LNfAhK0LIp55tLWz5SGgLwuMAx083jT0ba1Xj+TMBY6RUGgHPinmzDhvIXSzsZf3ohkWD9Fl18BIBZb0l6RN9F2BvSV06lE4peQ5HQ39/MmX4m1LY24VXwDQpUk7Ax4LXdE2wYABr8nFvQy/3J3q+CMpS39LdDLRSYtDwLSyU/mBq4xsQimXNbrKsb21pvKX/rtE6pvyYVyE+TVx3UD6kEbc4NSHHqoXVAI34XX4GybNOP707LlkY0TwaJOy0ye/bS/ANOybOSo3hHXDg==; 31:hHv273xoZ0lu30FYdzNpJVBcWn+/5IjEMPhU1St1BCCMLxVRYhdCELm4MGlyNKLVDyrSboWMij2jgWHq+ZbM7wunAJmeR6Pt7ErB8L8VrJmwUYSUc2xuIo92jwYEX+APqUjGNf3I1KyeIote34VdlTBrkVe9mEInX7wWxhKuskmBwNJVOKaz+DAtyaJkZ1H0KlqxJxVxBDYzEM72nRlAAB1OiX+2s8jsXnG7ZvqWSMg= X-MS-TrafficTypeDiagnostic: MWHPR07MB3181: X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3181; 20:SEmaSewjs7RtRrQ8Dwgfe4BqL6/NNqCZNtQf6qTO/CqGEtIEpC4WbOTd0UJIikQVFrPNXBsFIqCFW6WtzNOVTuXRdIPHoPkaOk4bZbqM0Nit9Aav/pkFayKBSMVfNDgt3/ib4r8uCv0eHBPbJTIbyKnZ9suTwAdNtLfFBB5f8wl1ghLoWinMW2YP64EDnWEmue1fmufGTDwDiA/pehk4bUGYJx/yhOuwgKlZ+SZBpj9Q/1PS8MpXonZdDvM/DWotGbblYmuLo1kwDZPhzZLzA5xM9ZSenZ3B5IKzNrsw5evvAKaU4feQ4BgrTpK4ke8nBeLHJ8QpPXL6Tk7qqmwZ1C2bMz+lcxoguyW9F2551YljQR+f2JlV9HjiBc/JB1ZyyJ3rQl7VJ9EIlJg7ZkrEHmxzs5yNWgToWG2UyAlFMLCHu3UOQFMZzmt3t/a/qSm2SpJ4xg1k0JSEnwBWhlRMdIf/q6xDB1ugi4AQcc9hSMy0dmrk2F4qpGcDNjPM5xw2; 4:VsVuCFm4AfhCjQxNcsrOEDx5poR/3m6q9lwrxnMnsUZ0eE4BfxpAiDqoDfyyoOWW1wWjdRsZVj3Y2mjhRQUC7wjpCC8HInBZNuCrWTO1QmQnn0hGBheSrX/FW5tbCXb52h1ljGc6sVmLe/8BN63ha2qOMLmW0Dua6RtaT/vOf3YYF3gDipI/EUwIQ5oaOb1CUF9+wwPObsmBUvyrt1FpUbBxp1yHbPi9ISqtkj4wdr0bOUeIuhXlH2IkzWhiT9nY X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123562025)(20161123560025)(20161123558100)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR07MB3181; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR07MB3181; X-Forefront-PRVS: 04041A2886 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(7370300001)(6009001)(6069001)(199003)(189002)(4326008)(3846002)(72206003)(23726003)(50466002)(6116002)(2906002)(4001350100001)(33656002)(81166006)(53936002)(5660300001)(97736004)(86362001)(305945005)(575784001)(25786009)(1076002)(81156014)(7736002)(110136004)(76506005)(6666003)(101416001)(6496005)(478600001)(8676002)(107886003)(7350300001)(66066001)(2361001)(105586002)(106356001)(50986999)(68736007)(54356999)(83506001)(189998001)(47776003)(6486002)(6916009)(2351001)(42186005)(18370500001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR07MB3181; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR07MB3181; 23:+s54/O2pEXKmfAuotE6QDwtz1Q/Wt9quX437rvcPN?= =?us-ascii?Q?sbAqEBMiXPi5N/QLjMbSCM89uOZosgSuTVFIH6jqM0cZW4waZEhunwiOTHms?= =?us-ascii?Q?8eDipbANwQmcHAwcjdx/XDmdHKn92vyY1l2L1h7Y0xBZVvU240TDLHIUOxkM?= =?us-ascii?Q?p4COn2VrUCm1LjhN/vY1lpa79mJueybin4c0gPyyoGDlkwnC2nJr/uK9J47O?= =?us-ascii?Q?6xiTerSLP+ZKxJAt6yEx1TjOYkwk544k3/UOS4oq5j9iU8H4e+WkNxe9wDq7?= =?us-ascii?Q?388ONYrtfzAy/xAKEuegt5gGQCkFF30f/zxyRpDrxNbHDV9wMVyf4isKBU9M?= =?us-ascii?Q?z0fV/NC3FYBwQeUFPtmgGtYoflJHrsY387aHK29oR3oxzLZuMqerCLi54uEI?= =?us-ascii?Q?/TmXI96xdk1xCM0sFSLBGGqEqitrOpQzzYNPSSgO3BmwD2cOT7W2LKOVGTc3?= =?us-ascii?Q?KDfqAK7PRwt8MwZFXUizuw1tqzgXl1ajPYoXAGrrNorSwz1SuejyFmAskxPH?= =?us-ascii?Q?W5Ncn82ni2NaR7VNrXOxNWeEQd5F7BmQqLOPPoiPg7jG3Gs+N3XefzCL5rQR?= =?us-ascii?Q?76ZskAwdpVam24dAhgLjUJjhBB1Lp5fV3GbrvM72D567mwV4minRL9HuLE5Q?= =?us-ascii?Q?pnEOii5wbawxoPMLZ+JQOw0E4fd229I03teXDYX/KbciEBB/gAccg+QutAE2?= =?us-ascii?Q?f4mBHdFRWRY2/TY5twJExbH6sYRVQVdgM0vrfFWKz4UWk4auiBwhDsUz5IM4?= =?us-ascii?Q?sTDmSXEb/UJ69XWNoelJfyK/lCvDFej6zvTQii4acOyDG4PnBH3Qn6YpuYQU?= =?us-ascii?Q?NtIaV6xl/PPn3ZS9frayvKlNTm6cpR36OcMA9P13dQGrcRdGh7rxGL6rfvoh?= =?us-ascii?Q?OwHNtaXu/hOyxRT3kwKSEJto+MGXbRe5iJv3j/qBTSi0yrsBX2nhsfbHZRAk?= =?us-ascii?Q?wdfjjaRBwSX3CJ9PTq3qYI9Llv+pKh1ZbX9xWu4liU7sDWXg0NVDfpTydn7r?= =?us-ascii?Q?avKOCZiuKp4eofZ+fvxbzjgBOeYOcdR0B46kpQIlMtj2Jo9Zek663itM+9MW?= =?us-ascii?Q?bOHucEAaMomaGtp6XxvbJOQdbi4rNQe8+b7pq81tmkISydBeZXCDTPfLUKQq?= =?us-ascii?Q?udnUkXVUEoGLi+dZ1/B2bBFjkDfhJ5iSmr9IPaWddMxMszhP3iCtRBJB42fO?= =?us-ascii?Q?YjyO7feGxwG8m7UoDQWFaoySANOFxL428gB?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3181; 6:baISGBy3Q8KgIC/ueFMUlhtFSmBfNMEU/qgNRUNhuUS4a0QtxJn9yaw4BCa4xIolD/mLJB5HJMBpEhh2H74JJfkNUBr7oz0pLppWauupWLKC8sz+y4ofXQrswDyMeKLxvHA7OUTnKyZtxxcR3R/7+fvyePCcntE8LR1BDmws0MZVQaUVjNqlh3mHHJ/dDTBlkb95caYxyCsvxYeT2Csqu0nciiDISQjjIAkRtJWb0KObVQ5vwIr07k8mAqD5wbRJWLhNGoMJNNm0bhifZmJ6kNJGYS08EpbrhdTUYHSEXlrg1xu+HIBRzPHwkfSo2GaD/Y2wmb0zfpoE73ttf0TlLQ==; 5:4aN/zqHMsWrpF1JPa74xw3zjEJkEzwwQtw/6tFlFjOIp010VkhYFAY6fYmmcfg+dNmF55gdsvAgDGg8ZsyTbyl8ylDR46mR4JhgZilH6nKZD37wJTuebQ+bK0y5Kh7P2xnvo8Jg8tnBmjDbFNyI/zg==; 24:3CKDxpsR+3dyoxpDXAqLX/W6flkHg77FhPbxdRby3x7ejyfzLe8VAAe9KDg8UEqppxaMuEVfYVEj70JdAFGjNZbU/vCCeFL2vWi867qf28E=; 7:nnZa/r9hCw8dVbrIBda1YZahOw/8Pqws6QSSrV8b+ob3rYy7K0Es/OdftlIbl1kq1cfevkb+BxEt+UgqLDpnfz6j4tzm9w32awchGMkggYuLpp1PUEj9a/KJkxf35A8ljkOdAFMiuIvm5CqwfbxJqBtfIdRqt9L6pJzbG6Fy5VcflMrxJFIzU+sgYY41DnmmYMaDTJAm89rtI96OHRPanHANuPbRJ5+/Y+YHIjEyvMM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2017 01:21:36.2228 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3181 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rick Farrington Fix problem when PF is used in pass-through mode in a VM (w/embedded f/w). If host error reading PF num from CN23XX_PCIE_SRIOV_FDL reg, try to retrieve PF num from SLI_PKT(0)_INPUT_CONTROL (initialized by f/w). Signed-off-by: Rick Farrington Signed-off-by: Felix Manlunas --- .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 47 +++++++++++++++++++--- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 + 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c index 4b0ca9f..fbc0d4e 100644 --- a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c +++ b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c @@ -1150,14 +1150,50 @@ static void cn23xx_get_pcie_qlmport(struct octeon_device *oct) oct->pcie_port); } -static void cn23xx_get_pf_num(struct octeon_device *oct) +static int cn23xx_get_pf_num(struct octeon_device *oct) { u32 fdl_bit = 0; + u64 pkt0_in_ctl, d64; + int pfnum, mac, trs, ret; + + ret = 0; /** Read Function Dependency Link reg to get the function number */ - pci_read_config_dword(oct->pci_dev, CN23XX_PCIE_SRIOV_FDL, &fdl_bit); - oct->pf_num = ((fdl_bit >> CN23XX_PCIE_SRIOV_FDL_BIT_POS) & - CN23XX_PCIE_SRIOV_FDL_MASK); + if (pci_read_config_dword(oct->pci_dev, CN23XX_PCIE_SRIOV_FDL, + &fdl_bit) == 0) { + oct->pf_num = ((fdl_bit >> CN23XX_PCIE_SRIOV_FDL_BIT_POS) & + CN23XX_PCIE_SRIOV_FDL_MASK); + } else { + ret = EINVAL; + + /* Under some virtual environments, extended PCI regs are + * inaccessible, in which case the above read will have failed. + * In this case, read the PF number from the + * SLI_PKT0_INPUT_CONTROL reg (written by f/w) + */ + pkt0_in_ctl = octeon_read_csr64(oct, + CN23XX_SLI_IQ_PKT_CONTROL64(0)); + pfnum = (pkt0_in_ctl >> CN23XX_PKT_INPUT_CTL_PF_NUM_POS) & + CN23XX_PKT_INPUT_CTL_PF_NUM_MASK; + mac = (octeon_read_csr(oct, CN23XX_SLI_MAC_NUMBER)) & 0xff; + + /* validate PF num by reading RINFO; f/w writes RINFO.trs == 1*/ + d64 = octeon_read_csr64(oct, + CN23XX_SLI_PKT_MAC_RINFO64(mac, pfnum)); + trs = (int)(d64 >> CN23XX_PKT_MAC_CTL_RINFO_TRS_BIT_POS) & 0xff; + if (trs == 1) { + dev_err(&oct->pci_dev->dev, + "OCTEON: error reading PCI cfg space pfnum, re-read %u\n", + pfnum); + oct->pf_num = pfnum; + ret = 0; + } else { + dev_err(&oct->pci_dev->dev, + "OCTEON: error reading PCI cfg space pfnum; could not ascertain PF number\n"); + } + } + + return ret; } static void cn23xx_setup_reg_address(struct octeon_device *oct) @@ -1279,7 +1315,8 @@ int setup_cn23xx_octeon_pf_device(struct octeon_device *oct) return 1; } - cn23xx_get_pf_num(oct); + if (cn23xx_get_pf_num(oct) != 0) + return 1; if (cn23xx_sriov_config(oct)) { octeon_unmap_pci_barx(oct, 0); diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index cbd6287..1a4fc17 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c @@ -1848,6 +1848,8 @@ static int octeon_chip_specific_setup(struct octeon_device *oct) case OCTEON_CN23XX_PCIID_PF: oct->chip_id = OCTEON_CN23XX_PF_VID; ret = setup_cn23xx_octeon_pf_device(oct); + if (ret) + break; #ifdef CONFIG_PCI_IOV if (!ret) pci_sriov_set_totalvfs(oct->pci_dev,