From patchwork Thu Mar 20 11:08:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 14023713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CEA29C36002 for ; Thu, 20 Mar 2025 11:09:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4231B10E5E6; Thu, 20 Mar 2025 11:09:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="iR2nrKnm"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id DDD9210E5E5; Thu, 20 Mar 2025 11:09:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742468982; x=1774004982; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=ekCQgO9lCFpsXza+3seCULH6HQkdNXXsZrNKbO3l4Ig=; b=iR2nrKnmtbVJLXws5JSe4O6lYvN+g+Y7Z8M2XQSLGRBm7CgBhaOIH2tv LnufSsOhK6dAwghII92xln+xKlR8ZqfzeyyYb7NbyTvbJKZ0beb0DQeBJ 2lsADZSpfhZOckaX+EsVjzi/5cxVb6NYscd8LOpBLPqbx2wTFpEcEexnB EikXOsMRfjPJhNNbISU68bm67Bb9VLfJb+oLv0gHOGQs7bW78HJIGzHYQ smMobeP9Nn51hr2+miURF6Uo63xmIyzkg+0dl01H9iLQEm3tvlpzQqMQ/ dIe+2k9wQvi9FCshByg077px8r9ku8uLKJf+z8qX/FD5mqRc9Dx7PGl8G w==; X-CSE-ConnectionGUID: 39n/TN8qTu2cKNYGd8cSAw== X-CSE-MsgGUID: i940n9TXSqeeBsVFuIcMwg== X-IronPort-AV: E=McAfee;i="6700,10204,11378"; a="55070822" X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="55070822" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:09:41 -0700 X-CSE-ConnectionGUID: mw3l8HyIQ1Oj8CGVyJqRcA== X-CSE-MsgGUID: B4iyALuNTZunFHaR4XRPOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="122785029" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa009.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 20 Mar 2025 04:09:41 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 20 Mar 2025 04:09:40 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Thu, 20 Mar 2025 04:09:40 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.43) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 20 Mar 2025 04:09:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EwbYRSmwmP3zSBDUrzhZB7KIqq6heZCjGt0urS2nDqR27dM9tu87zhSuvxDFmHb9HyBJes/gC8aanGoUhL0Qd4Cha50ajI56dhXE4GdHpKYpKTaVOlTY1X4Csarfz1Yrt1pbiTVMK8yeU+r/yaI/vcK1H9rBmUEiT3PIKcTJzTRlbYtirPvmtB/kmKcp6vHF2CvCxcV8/E2/HVy41iaySaV8E76y/z54miFyasPjuZb6DOiJiicu9SUPmW4cKLiXXjYhZb/YxelRerH/1SjomhPg0N7MDPpipgXB0p+P3NHO7kP51V09I78CnD2J6QHcn71xdJVvW7VDfH9IChoqYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vhqoj3NyjngsQs5wE5hzQZVK+3P++t745Q3Nd/M8vWo=; b=YlMxTUxwe3kfM206lC22N8LQTXZE6RW6E76Q6OIGqPiBgmcXHMC5Ofl1+5fNBBQhTGNNRaEIAXaS5QKai2NmATtmQJ6f9D7Ap4iV04U/w+ATEPB888BoCsFVxmk0ZP2Ka24IsLs/41vfLJ1LgDqXBbdykEdIg2KnyBZpJz/rGOSzyT5iEMP+oWFpXYEWS1Wsxk8sc0qlyANWwY3manPJMdg1fa/KOp7k/m4UysAylh+Nf+FwjAvutMLYF1gpZHC/Btc3eTf5klRT81g3/c+MLox3ZhBt2zDFBi2m9lAyc96QgtjEv7sQ6JvMd9+BlJHd/tRfMBwF8bZ98iZ+E4QarA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by SN7PR11MB6875.namprd11.prod.outlook.com (2603:10b6:806:2a6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 11:09:38 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%7]) with mapi id 15.20.8534.036; Thu, 20 Mar 2025 11:09:38 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , , , "Bjorn Helgaas" , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= CC: Rodrigo Vivi , Michal Wajdeczko , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matt Roper , =?utf-8?q?Micha=C5=82_Winiarski?= Subject: [PATCH v6 1/6] PCI/IOV: Restore VF resizable BAR state after reset Date: Thu, 20 Mar 2025 12:08:49 +0100 Message-ID: <20250320110854.3866284-2-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250320110854.3866284-1-michal.winiarski@intel.com> References: <20250320110854.3866284-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR0102CA0089.eurprd01.prod.exchangelabs.com (2603:10a6:803:15::30) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SN7PR11MB6875:EE_ X-MS-Office365-Filtering-Correlation-Id: 35c8272c-cc60-47b4-a478-08dd679fb4a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?nQTN4FW6VEWIJeiEalwUn+k4XkcUlgl?= =?utf-8?q?53GBEO9bGIDpkl288jDu1C1+lkgxncAFIEy4Mrmz1tuHvB4i4GgpC9WShaLTWp+Xx?= =?utf-8?q?e/ztEAR5KH2oBBB4ZzJK2Yt/Lz84zeLfxFq0PiQXBs19SC2HwOP4prcKWP9j7ws35?= =?utf-8?q?iHnVcQaS8OEL5vaAO8o4sBrc3/zVT8eA/9lSEOB3/+rrtdpcMTFwo/Gw2JhzOaykK?= =?utf-8?q?HKRt2Y4s6EsP+yGYIprRM0f1Zi1NNbphxYOn+kUKkkFhPyreGmuWeKWhnNKh71PtP?= =?utf-8?q?+XwEXen42iAFG9Qj90LlbO9rsvd+mYwY088ZTbv8xCKtTOV6zT66jEG/LrrRov5Vf?= =?utf-8?q?iAqGPPGW35DllV1PwrvIgsENT1yS9OpMIYHX83phJR0zk77AjFO33GvpLyotep+Eb?= =?utf-8?q?AHPb5w6LWBCHxcJdkhSm33AEkwPowQ4x/wDDWA91RHhiUQk2C/A63EY8uVfOn4YyP?= =?utf-8?q?POGsszMdUpvlmnJyedW0X17pYNOXVplEo5fA1TgHi3fP2+IEYPZ3tvBDpcADbA9Fh?= =?utf-8?q?CQbNDYDls5s8XlbAK51iLaI1qlfeWCjaAvvmNEfvQJ8iGSrhcA3D9pwSi8nvIHPn7?= =?utf-8?q?qDYIMql9TDaQwE1kLbgCmZkHWDvkJQ1hJyR7R1Rv0+RrFd+DJPGBiiLD6atbraOAn?= =?utf-8?q?8bDsTyL2+aBVeI/8qlz3O6rTfXIg4Bez7Esh2B2NcX+w2xjR0YAbD17rrlyVo+0t/?= =?utf-8?q?UIHBZ5M9z0EREBT27GlhISux5uXJxp/ebgl/bbIoTA55GvGUO3EFMvUGgSN94gGam?= =?utf-8?q?NDg31yQLOJRJyX3pFZFrFw5/YFWsX9BcMnfELE7/dpxvgoNtXI1UUiyzoXqmrWVNU?= =?utf-8?q?t+M2lcuMz+wXYtlPLaZqDttuLAzmG2hcajS3w+Hqfo1aB7LjlRom6uA3NtWHuQx61?= =?utf-8?q?0uZJhQgsdoPjFnsj0u75agoHJm7MuSFRRYknHvFa7jfYuOJxvoVgrPd4czkgET2bG?= =?utf-8?q?YB12sktkI9le0WJ2qpu/sodtZyt/Q6FfSTijQg+W/JRTjqgR7oOzWurK2DLTQRQAO?= =?utf-8?q?i2obUgCYD4GFhpynOV1Nx09BJi3K7NtByj7TZnGomaEdmNK4gnaWYhTx5HzRnqw48?= =?utf-8?q?aAlq2W85LjCDojIAfWu/J3Xfk/czM3AB7FrIyM+DauhfNV6y+oXh8dwWb/UnwnOcy?= =?utf-8?q?YMOqyrWlbFgjirHi/VmmUot2z2SAolgcufS06tFwXxlUPhGZeRLFPeo4XLLg7Xgu1?= =?utf-8?q?u5o6zLhG8Sgix4jlVhpaI8QEXhN8aTy9pZ5MPgjystkMYbCJRk6FzzXZF9XxoabW0?= =?utf-8?q?w+2KJOiMGdAdUO9tKDeRQmRVfEfidRPfn+VetWJNfa3YxYJv2Nu0xJ4M+H4CsNBkk?= =?utf-8?q?ii/QgRfcqPlb?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(1800799024)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Z38cwb+CXopYvprt4AStTxomdEkG?= =?utf-8?q?yLLF/01/K+YfuJgFy3FKDxR4Jtn2cthSQ+oE/U0/FWdQAkLbWZ/UKrGErcgErpQBS?= =?utf-8?q?sPYe8nl40drju7PEdawM0i18m9Wan8zeaoF42xAH4lMZojJOLbhaSsKgxSzcSykjZ?= =?utf-8?q?Q6VrSZ28bDEEXgEZd1px9J5EiFXtaBaxqG0cQ00YU5lAkcNG0IotB38Eo1LqDXc+q?= =?utf-8?q?zBgbcvogCLhaczDQ6aTNA+34gHfyrCp8WsAeSaLA6AHb4ARe7oX2s9/+nV+HqLMQf?= =?utf-8?q?ocakjOpCMCdv/ef/AqwYUiyRCZ8nz+LUivyjRRh9p6top7/ghX3qlFraL0JKe1rGS?= =?utf-8?q?rZ8P2GzagdZq1gdxsak3ivwpk+Z4SOQbdx8XDazMKwwlxBbLx3xZh7YQ8yAEJG6xv?= =?utf-8?q?/trzQpHfOYhW972mtvVesC4p8lwK3EI7YI4sXyHdJInXlIAFiPLyeOI/Y2Tmmc85R?= =?utf-8?q?uCpKqBW3RS1ZG2PtaLo1k8tGqH/hnKzkkxzrxbO0KErLiCANFoCKxWtJ08HXMGa4v?= =?utf-8?q?qN8lmNCN4bkRKcxBhNjXSXwOazT6LtDoAFpLgGyk2E8yAZT5Y5ribM0VpOENTzD0C?= =?utf-8?q?12NAikUPjXsWv6giXeLsRAg/LYl6P6QVCq30AB0Ms3nRfXJgKIdwoT8DokP4ei+e2?= =?utf-8?q?eHOGHDEO9w4wPJi4s3V0fTJy0fKQ7xgHDuHOAeyZ6jDKpmz5Dxt7JxW+QkyewSJhV?= =?utf-8?q?dMuxnLi2P19bZBcPoerHMvB6n41EwVvMBPC5h9drtVKHWGMs0cZVqHPVFjdFiSyJC?= =?utf-8?q?pf2FNo//kNHlglucXxwSlgskwH8bUx1CdWVtbkYT89kR4wNn8h4NYkWeFFRZrvS76?= =?utf-8?q?xlfKBnXsS1JSd+wdo2jtYVd8CiJlu/pdPsAQ/nfCHfL23Du1uYhMxGLy1xEQux7XF?= =?utf-8?q?Vi1772Uz5OVxcItjSwRZd+sPTOAut5nt6uI3WyBTs+Dh8QDTNtcgnznpaChEFXX1O?= =?utf-8?q?rlbQjLNmn/9RUTPKrRIWwbLUeezfgIWFbBZiQlip8IkkEdAMEsKs8d6USQyVuUrr4?= =?utf-8?q?ECXClaMk1JbYn8eOOQRIkMDnbZPPiLSKI8uXCZ8bfcRhrlnm4Um9ZPqSFnkB+vc80?= =?utf-8?q?WT/1qZjPfGU2WL7t9qMfBvJIbf+res07i9PovanW5V9zC2dcSIbgfI+cg8zW311c2?= =?utf-8?q?GYa/VBLP6qyguLoAf9cUw5lAS7C/XggTKbjPVs+SERRJEHdbqzVnLjQl2pPC+g1wO?= =?utf-8?q?IgeDFIxvXzUMzqdnOac+HfdKkb/XDQEfvVWW6+7byC4ox5HCGYZ1Kg7Ha5ZkOwKba?= =?utf-8?q?64SBV2EPwvgeXUQAM2C3W53g5AsUXX0KqchV5K+APTcUNNzq2JQUFot/1QGxr9Ksb?= =?utf-8?q?NXD6nRE0d5eRNicbLhIW3Tn2Uxi2L5s5Y7146znCFGy8BmSwNeellqAEzNBlXDSmL?= =?utf-8?q?8dtSWvaMgqE6Ij56sHPOlubuRDaBO9cARo6CrqtbvomOAykE/0Q8FiSTp4qyUVJq0?= =?utf-8?q?C+AlBzIqxvyLuOFKm6GBX/1UYW1act5NgaHt3EnLYeOCJ8wZ5r1omJAG4EeV6zYhk?= =?utf-8?q?/QaDGnhHY67RUdR4iepiuy0hVrpCyjL2ug=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 35c8272c-cc60-47b4-a478-08dd679fb4a8 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 11:09:38.5892 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Yeru6Y/TihAFiVy+ZiRoXSoLswXw5ZmywiEUV6EoXIjDdKGPicw2ROcwifQCC7ks8cV5npN1oiZo53gl4ROTWJdSTFPQ1LRN9itJioplLqw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6875 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Similar to regular resizable BAR, VF BAR can also be resized, e.g. by the system firmware or the PCI subsystem itself. Add the capability ID and restore it as a part of IOV state. See PCIe r4.0, sec 9.3.7.4. Signed-off-by: Michał Winiarski Reviewed-by: Ilpo Järvinen Reviewed-by: Christian König Reviewed-by: Ilpo Järvinen --- drivers/pci/iov.c | 30 +++++++++++++++++++++++++++++- drivers/pci/pci.h | 1 + include/uapi/linux/pci_regs.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 121540f57d4bf..bf95387993cd5 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -7,6 +7,7 @@ * Copyright (C) 2009 Intel Corporation, Yu Zhao */ +#include #include #include #include @@ -830,6 +831,7 @@ static int sriov_init(struct pci_dev *dev, int pos) pci_read_config_byte(dev, pos + PCI_SRIOV_FUNC_LINK, &iov->link); if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) iov->link = PCI_DEVFN(PCI_SLOT(dev->devfn), iov->link); + iov->vf_rebar_cap = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_VF_REBAR); if (pdev) iov->dev = pci_dev_get(pdev); @@ -868,6 +870,30 @@ static void sriov_release(struct pci_dev *dev) dev->sriov = NULL; } +static void sriov_restore_vf_rebar_state(struct pci_dev *dev) +{ + unsigned int pos, nbars, i; + u32 ctrl; + + pos = dev->sriov->vf_rebar_cap; + if (!pos) + return; + + pci_read_config_dword(dev, pos + PCI_REBAR_CTRL, &ctrl); + nbars = FIELD_GET(PCI_REBAR_CTRL_NBAR_MASK, ctrl); + + for (i = 0; i < nbars; i++, pos += 8) { + int bar_idx, size; + + pci_read_config_dword(dev, pos + PCI_REBAR_CTRL, &ctrl); + bar_idx = FIELD_GET(PCI_REBAR_CTRL_BAR_IDX, ctrl); + size = pci_rebar_bytes_to_size(dev->sriov->barsz[bar_idx]); + ctrl &= ~PCI_REBAR_CTRL_BAR_SIZE; + ctrl |= FIELD_PREP(PCI_REBAR_CTRL_BAR_SIZE, size); + pci_write_config_dword(dev, pos + PCI_REBAR_CTRL, ctrl); + } +} + static void sriov_restore_state(struct pci_dev *dev) { int i; @@ -1027,8 +1053,10 @@ resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno) */ void pci_restore_iov_state(struct pci_dev *dev) { - if (dev->is_physfn) + if (dev->is_physfn) { + sriov_restore_vf_rebar_state(dev); sriov_restore_state(dev); + } } /** diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index b81e99cd4b62a..adc54bb2c8b34 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -482,6 +482,7 @@ struct pci_sriov { u16 subsystem_vendor; /* VF subsystem vendor */ u16 subsystem_device; /* VF subsystem device */ resource_size_t barsz[PCI_SRIOV_NUM_BARS]; /* VF BAR size */ + u16 vf_rebar_cap; /* VF Resizable BAR capability offset */ bool drivers_autoprobe; /* Auto probing of VFs by driver */ }; diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index ba326710f9c8b..bb2a334e50386 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -745,6 +745,7 @@ #define PCI_EXT_CAP_ID_L1SS 0x1E /* L1 PM Substates */ #define PCI_EXT_CAP_ID_PTM 0x1F /* Precision Time Measurement */ #define PCI_EXT_CAP_ID_DVSEC 0x23 /* Designated Vendor-Specific */ +#define PCI_EXT_CAP_ID_VF_REBAR 0x24 /* VF Resizable BAR */ #define PCI_EXT_CAP_ID_DLF 0x25 /* Data Link Feature */ #define PCI_EXT_CAP_ID_PL_16GT 0x26 /* Physical Layer 16.0 GT/s */ #define PCI_EXT_CAP_ID_NPEM 0x29 /* Native PCIe Enclosure Management */ From patchwork Thu Mar 20 11:08:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 14023714 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 44595C36000 for ; Thu, 20 Mar 2025 11:09:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B17C310E5E8; Thu, 20 Mar 2025 11:09:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="lyCL7tFO"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id E08A610E5E8; Thu, 20 Mar 2025 11:09:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742468987; x=1774004987; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=5xPmGW6vZT3dvZqGhB4QHYZw15uhwdothZz9LmvDgeA=; b=lyCL7tFOI64JISMpvsk4y+uuqHVHr8sNx9koQro1SH65zWKCyEMPXbz7 GALPlFYS+8OCqwvgiQvsUcDuVJ20vbK+3lRnArawYSiHv9uekJ/oirOmA oEEA99v8KVlkDSfD0yxyHYE+ENOvJGCXuqz7w3JhNc5KLoZ6S2sX4eZcu I+PhmLsGVx3vyQVfd2MGS1W0PItmfDIye1sc6c4ucfuoovzC/GTBi5ofb I2XaTtEPGBoHJMhCXdtJShrrlXmfo9B4tSrNv9vnnAsWRcw61woW6w0aH PI0RuSNAgm2AJNIdgIkjpZLW6hBp0MkEZrWQny5GJFz7YJK0XeOQun41L g==; X-CSE-ConnectionGUID: ZNfSBra1RLuaJXcxZUuvug== X-CSE-MsgGUID: mmAmqQp+TSyhgH60Zb0u6g== X-IronPort-AV: E=McAfee;i="6700,10204,11378"; a="55070839" X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="55070839" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:09:47 -0700 X-CSE-ConnectionGUID: LATMQMPDRiKWI3GDu6FoEA== X-CSE-MsgGUID: wmx/RYbiS6mi76Zaj8/zqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="146265532" Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by fmviesa002.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:09:46 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 20 Mar 2025 04:09:46 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Thu, 20 Mar 2025 04:09:45 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.42) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 20 Mar 2025 04:09:45 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MkHkgYmeslg6462C3D8Gp600CIai9BRbATA4LlCqhjP4+r+Zpur7JImkD7cvfLwe+Vx6ncxgQExGo3pGUrpsPYabJpbtV3u89CpM4bQ8Hkmw4LOJeF96Ws3ZtWnpIE2me+uyuDV357dZrwonXVbtit/heuPWXGO7Q+wVa3ANBnveQLGYwxkTtnpPN5e1kv44RpopV0hEOqNXdQL0PI2cKBE6D6/BtjVpAEqN14xosAwnO8alAsmQHDT5UKqVhRoE0P1obnSGmA85dG6t3kH0oZbF2t/s+C7y7GjzgJmPyNtZzvrdjGa1Us24cyYJSYzVV7igc75vHspP9TCy0a98Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aUPMBI+d4z8hOisADQ3OBoMr7nDKCGRSxyWJUhw22eQ=; b=S8pK0TRg718xIrZZ1/hCDabSRBRzSr03VrhcTmN/SVjTp1jB99rB7ERX5PfQVYQSSn/lzRfANIaaVuQo2qWJ/iO+0Aj2Opt/31ZAqZztFvzPHnfcdpFpQPzcghISwE/HGopAIsCv7dEb8ScKTX8nNvGW2gltFMjl2oWB3arsvMozuSftz7r4XMXBqOB0wLyw4KQe4/5W6NifDbLdIFsKC49mTWWx5CpRiWs/RRsBj6UckDX9mr/b/hHFYzU+viPb5zMalxuRKU3xbHF38S0bpa4Mj37CjlwuNuSnxeKdoWX0b+gv2T8kJuswbcVYup/RUURs0sR/Rt/jCDUIek94YQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by SN7PR11MB6875.namprd11.prod.outlook.com (2603:10b6:806:2a6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 11:09:43 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%7]) with mapi id 15.20.8534.036; Thu, 20 Mar 2025 11:09:43 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , , , "Bjorn Helgaas" , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= CC: Rodrigo Vivi , Michal Wajdeczko , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matt Roper , =?utf-8?q?Micha=C5=82_Winiarski?= Subject: [PATCH v6 2/6] PCI: Add a helper to convert between VF BAR number and IOV resource Date: Thu, 20 Mar 2025 12:08:50 +0100 Message-ID: <20250320110854.3866284-3-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250320110854.3866284-1-michal.winiarski@intel.com> References: <20250320110854.3866284-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR09CA0096.eurprd09.prod.outlook.com (2603:10a6:803:78::19) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SN7PR11MB6875:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d72259e-9b5f-4ad8-110c-08dd679fb79c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?W5Iwf8EvLFsm3MqC4Udi9rH4tdpFPal?= =?utf-8?q?uW1x/1s7Zb2wFGRb2EU9e+AXiTltKVZMe9oSV8XMvbEjgVbfdpeawM5ldjrlXqlg3?= =?utf-8?q?3cXo52ZoO92DvSvINdO7CXy6Fz4ids4f+XnDnskCfz8oTcNSlUaK3HGF0BEVFtPpT?= =?utf-8?q?9ZIvLaLjga7t2atB3QM72JPiL6kGq5RoJRANOLTASVIfgjI1tTFs7kwAqERFy5lz2?= =?utf-8?q?AepKhcAbYk5iUOMLjwR7rSQiO0IoJVnkFF4RnTQ/shRjdgNfanrrItlxbXU/MfNR/?= =?utf-8?q?P8viGvPHLWpemsFlxrKOCphFvkKoWdhIoRpcut7yJBbzlOyZiQOsYuX7jKeBca7Z0?= =?utf-8?q?SNBP9ibUTyqurQs6UA7IF8bV05/bo6LFISuXFoXy8J55REleZrIdQ2fc7y01kCrYp?= =?utf-8?q?fPPLQ8vRVpAEI6y9BFXVRcivQRGE3PZNEzdSqA+VfD5bUBDQUMKDs8ws0C5vD/DZi?= =?utf-8?q?jy8ht6TvG8YSfKnav1o/4IlHMedCKT7y/Jal0AGacF/bqcl/s/YnA8SPYWl6qESuf?= =?utf-8?q?pENZ7i2hkWFYNE/R9KTtKEHkkSMfJaL3US3mN0AFDDTj8yz6TE0ladtg2wO6vrjDx?= =?utf-8?q?7/rETGSgSX/Nbu+sFBSpMZKMRme3HNfNrRMhdbv1oRs1FFASGDZ3qXmiJi5EHN9S2?= =?utf-8?q?hCv6hLcXZ8SNzSNKSiGJk2/aNYyDZ7t5GHqy7Jk3iA+mCQP8DOPfAti0FRkdShvfX?= =?utf-8?q?U5vB0s4VO9SrW38oQ+zGc4rF3b6NFu5788OeBfdX0u+fiEZooXpnxQoEsJoQYguh7?= =?utf-8?q?hQcs/J/uMlaQ42DzaPqc+ew5Fi+sTChU9hBSTKt+knqQ1+zdRDo6MHiFdhVYWuPK7?= =?utf-8?q?zU9YUBArltoVu61CoB8zAuwoccKLO8ht9uCs4lQBw9TlWHXc20TYtsqrbzpV6cG1a?= =?utf-8?q?NWKI3VGFuzff3N2RBFy/lXiioN+0uIBvoTWE7L0SzhlKWmdTOT/6MezQhDifCyufa?= =?utf-8?q?rIS77EeeN9MLw58xuoBwTP5Fb6hE0xC3cU06JsaMt96LJoVZUCXDVn+gJ0VOuFTTn?= =?utf-8?q?AoNuF92lbfL6VHhgOX82IHPJlJC96Fyobr24rj5iZaJ89AfpCsxHEqBmfnuY6u2ug?= =?utf-8?q?M9DiAsmpOQBssITH2PG0VtJsnxrHe19OS5zNopP3MVkuPILjxk5GKjAx606Nvxccm?= =?utf-8?q?BWATTETHvhHhZI3S/8PJFaV8ki26W19S1suiT83As/BseaEeySoekv5NXHZNxYnad?= =?utf-8?q?qLz7j/T/0+m7cHQUEYF6jvaQAiPEK3fy/IdwWsRl67DOBjct1chZdMyNwLdArwzyV?= =?utf-8?q?JnSNZAE9EUvxrZlRRiqIGjdjg2IWmgDbtIMU5eNIxOdfDQo6gQ3NhEEmftVwDxgbY?= =?utf-8?q?Ch/iIa9fKtmQ?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(1800799024)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?nGHX+wPJZVIGlVanAej3YG6Gaoa/?= =?utf-8?q?/sFYLd1mrqSW8QFJiZXhpJrp8sCoYdOgcPbU3eiOz783/Ske2+V/q4ZoJjHjDXHJ2?= =?utf-8?q?Dho1NAurn/FGTR3dKwlZeijJ/1XCF8Y6sUAKwRYe8SuD6W/hZ9LbwtvVVhsko8/d6?= =?utf-8?q?ziHGsEhoxLOSFKcNtHqCh2pukowC4Zv60BJ37qS1YMClPfR84lpdSQ+bYjmpx2XEE?= =?utf-8?q?cDbyfsSSmF89+P+pURgZz0rJ51Q5dNc8FO7j1tMZbH3PytKeIHTvByp83BfijHqgy?= =?utf-8?q?6+gCW6RKUvUyJtd+6yhbtyCYspqR2pCX9KTHKIatXpP3riDC0BCkRd9mZz3GOcz7G?= =?utf-8?q?FEboO+Rb5L4kxYyPsmjqrLeaI2Z9AvjZJJwSq1cKuM6wk2hxVBHKmR9t2Tf+9594H?= =?utf-8?q?UhIccmyIuX9S+bL+vtBhU1k939olwJ1SDvRYSJIPg6TSMPOXnUDGQ7zZVoYoYo7Wz?= =?utf-8?q?FVuMWPC2aXQVsdlG57QMhr6k9+9d1dsjNqSJI6BdK2/+87amkxq0bXJqMhzua47NK?= =?utf-8?q?MOLdNn+QrS5yvQPObCARWqwTDlPyYtTpPCi0UpFXMbETrXcF2LqlmU2FVcNkWlePt?= =?utf-8?q?paXkaD6pA7t8mAU9UXxvWyJVe6IynkNn/uqekLo+uxXMbji5RsIX+WfGAnjD9znD0?= =?utf-8?q?/NeIvpgKBWUpDKjBF08Js1b9ZcaUu5zvSWC+OlrJuyPtJr+BxoV/51L4w5/V4Ofxb?= =?utf-8?q?8QqPcdFvmRPHGUzd0S6c6kbRywIAN8e5BZO07xaJmXhSC4tXozEyejRK/C8O3yayk?= =?utf-8?q?iifSX9ZS2B9Q3nv3IU8oNzkC6ORYc/n67MGK2tM88zl5vMCXWTdqXcfLPKDMIpwtD?= =?utf-8?q?KyuVRwh8YDD0lv53Bdw8YFK3R2eeQg1j+enUmUWtGirZSrXrZk/7/oFLyILl96wAy?= =?utf-8?q?xch4SzmxAIHydqEuqkHhfLJcefxMxQrwC+G1Dfa1L9SS9vnJHnfDDM1h+G6/gc90G?= =?utf-8?q?J1EpyYcKWr05FsnMI0IPGrqObhyQTrTvb0/a69k91/vNFQAP1tQ794l5WUDOB6efr?= =?utf-8?q?RIynEGh/6rcB6S7UdN9tWX9l2eiFNLEmDZfbcl9xOetQBXygVsyRwUFGfU7KAHiXy?= =?utf-8?q?pFcTTFNM6Oy98XaRp/NJlXxlRqhHPV2pZ6EmyvhlBlhmwXBH0yAFRKqQO7rfCcas7?= =?utf-8?q?+ra14SyBkOFyUQtVfyn1zcrk4b1YOEyAgyHXS1zg3C8Fm8YzpHRebEqN3RSbjP5dv?= =?utf-8?q?3ZgIdssNFCelDnp5ibw0U9BDkz6HUN865kpcw/ttp2RymujG0YE++Bnf5jzlfCLKl?= =?utf-8?q?SFcHYWEHhh07g488eBFhpwSku7QRB50fstXrZUBqni/My5IjxOcHlUKMPjakuH+8m?= =?utf-8?q?nIZLZwOkvbWkXUHiwq9gjD3yoEYk59aO6RFiMCLh2irjQRXDFxyTfR3GU6OYc9U9J?= =?utf-8?q?z8uYL3djqoeK/zo0XIGUk8Hj69pwi5a4eOFB2lKlQinUWaZ/tUB0VrMEbkv8ZjOIs?= =?utf-8?q?vD4Hm0ZecSYTTy/2r73lPQ6/t0PwjWVxAnF2YPvEwatCE6+sJ+O0hzl34nHtg/P+2?= =?utf-8?q?7HigA7T0UPvCbK0Y8Mg5JWOpER3vLTJJeg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 1d72259e-9b5f-4ad8-110c-08dd679fb79c X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 11:09:43.6413 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tkzYlhnoTKA9FZBcMw62mxG/zvmol5efqhAXPUpFC5CnhEC3RumxR8imdUb3WesVmvmouCjlrxtvVFAeWcYeGB8zZam8I167lJZEGrFZQZE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6875 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" There are multiple places where conversions between IOV resources and corresponding VF BAR numbers are done. Extract the logic to pci_resource_num_from_vf_bar() and pci_resource_num_to_vf_bar() helpers. Suggested-by: Ilpo Järvinen Signed-off-by: Michał Winiarski Acked-by: Christian König --- drivers/pci/iov.c | 22 ++++++++++++---------- drivers/pci/pci.h | 19 +++++++++++++++++++ drivers/pci/setup-bus.c | 3 ++- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index bf95387993cd5..985ea11339c45 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -151,7 +151,7 @@ resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) if (!dev->is_physfn) return 0; - return dev->sriov->barsz[resno - PCI_IOV_RESOURCES]; + return dev->sriov->barsz[pci_resource_num_to_vf_bar(resno)]; } static void pci_read_vf_config_common(struct pci_dev *virtfn) @@ -322,12 +322,13 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) virtfn->multifunction = 0; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { - res = &dev->resource[i + PCI_IOV_RESOURCES]; + res = &dev->resource[pci_resource_num_from_vf_bar(i)]; if (!res->parent) continue; virtfn->resource[i].name = pci_name(virtfn); virtfn->resource[i].flags = res->flags; - size = pci_iov_resource_size(dev, i + PCI_IOV_RESOURCES); + size = pci_iov_resource_size(dev, + pci_resource_num_from_vf_bar(i)); resource_set_range(&virtfn->resource[i], res->start + size * id, size); rc = request_resource(res, &virtfn->resource[i]); @@ -624,8 +625,8 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) nres = 0; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { - bars |= (1 << (i + PCI_IOV_RESOURCES)); - res = &dev->resource[i + PCI_IOV_RESOURCES]; + bars |= (1 << pci_resource_num_from_vf_bar(i)); + res = &dev->resource[pci_resource_num_from_vf_bar(i)]; if (res->parent) nres++; } @@ -791,8 +792,9 @@ static int sriov_init(struct pci_dev *dev, int pos) nres = 0; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { - res = &dev->resource[i + PCI_IOV_RESOURCES]; - res_name = pci_resource_name(dev, i + PCI_IOV_RESOURCES); + res = &dev->resource[pci_resource_num_from_vf_bar(i)]; + res_name = pci_resource_name(dev, + pci_resource_num_from_vf_bar(i)); /* * If it is already FIXED, don't change it, something @@ -851,7 +853,7 @@ static int sriov_init(struct pci_dev *dev, int pos) dev->is_physfn = 0; failed: for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { - res = &dev->resource[i + PCI_IOV_RESOURCES]; + res = &dev->resource[pci_resource_num_from_vf_bar(i)]; res->flags = 0; } @@ -913,7 +915,7 @@ static void sriov_restore_state(struct pci_dev *dev) pci_write_config_word(dev, iov->pos + PCI_SRIOV_CTRL, ctrl); for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) - pci_update_resource(dev, i + PCI_IOV_RESOURCES); + pci_update_resource(dev, pci_resource_num_from_vf_bar(i)); pci_write_config_dword(dev, iov->pos + PCI_SRIOV_SYS_PGSIZE, iov->pgsz); pci_iov_set_numvfs(dev, iov->num_VFs); @@ -979,7 +981,7 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno) { struct pci_sriov *iov = dev->is_physfn ? dev->sriov : NULL; struct resource *res = pci_resource_n(dev, resno); - int vf_bar = resno - PCI_IOV_RESOURCES; + int vf_bar = pci_resource_num_to_vf_bar(resno); struct pci_bus_region region; u16 cmd; u32 new; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index adc54bb2c8b34..f44840ee3c327 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -693,6 +693,15 @@ static inline bool pci_resource_is_iov(int resno) { return resno >= PCI_IOV_RESOURCES && resno <= PCI_IOV_RESOURCE_END; } +static inline int pci_resource_num_from_vf_bar(int resno) +{ + return resno + PCI_IOV_RESOURCES; +} + +static inline int pci_resource_num_to_vf_bar(int resno) +{ + return resno - PCI_IOV_RESOURCES; +} extern const struct attribute_group sriov_pf_dev_attr_group; extern const struct attribute_group sriov_vf_dev_attr_group; #else @@ -717,6 +726,16 @@ static inline bool pci_resource_is_iov(int resno) { return false; } +static inline int pci_resource_num_from_vf_bar(int resno) +{ + WARN_ON_ONCE(1); + return -ENODEV; +} +static inline int pci_resource_num_to_vf_bar(int resno) +{ + WARN_ON_ONCE(1); + return -ENODEV; +} #endif /* CONFIG_PCI_IOV */ #ifdef CONFIG_PCIE_TPH diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 54d6f4fa3ce16..55e91ba1e74a2 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1885,7 +1885,8 @@ static int iov_resources_unassigned(struct pci_dev *dev, void *data) bool *unassigned = data; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { - struct resource *r = &dev->resource[i + PCI_IOV_RESOURCES]; + struct resource *r = + &dev->resource[pci_resource_num_from_vf_bar(i)]; struct pci_bus_region region; /* Not assigned or rejected by kernel? */ From patchwork Thu Mar 20 11:08:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 14023715 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8EEFDC36000 for ; Thu, 20 Mar 2025 11:09:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0564610E5EB; Thu, 20 Mar 2025 11:09:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="k6bRoHi2"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9BB9A10E5EB; Thu, 20 Mar 2025 11:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742468993; x=1774004993; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=Py+C7U8AL8Mhwsx5wsAyiuW0d5Lr/DX4NyaGNQSGdRM=; b=k6bRoHi2zEqBaQRaa7bzTlg1e0PYbsvC/D/L+kM29h+JSUqqcQSD/WUe 2Zqei3SmR9OWhoUVzXfBqon/JaIDpz8D1iln3OTzqyAwRlLaGeJ3Wxptj tnQ5Z6ghKrrhL196qhDv5dyTOc8bKptfYFO9qSUp8kWNCt86CXmOVZKr6 M+kIenbHtCmunvlP3SXte8Jue1PWuuJEnfyZTv4f98EcOgjsjKaZ2obT7 SQ6cjsojEhSTDNb7kn/GaphbW2stQxZ1D9uE6Ce/pde622Pm9fhNYLidV XMT7fampqFG06Ho1+RljsVk7g/jQ9NwWFAdzr1T1Gf4sIsxD5X68qcXx5 A==; X-CSE-ConnectionGUID: QamcSOXNTp2nvrLg6e0/tA== X-CSE-MsgGUID: E3RXFx8wSTa98XSmJMZmXA== X-IronPort-AV: E=McAfee;i="6700,10204,11378"; a="55070853" X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="55070853" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:09:52 -0700 X-CSE-ConnectionGUID: YcWybnwVRu+Ex7/RF8AW8w== X-CSE-MsgGUID: ALZLpGlWR5yCb0ohY5LgxA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="146265551" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmviesa002.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 20 Mar 2025 04:09:51 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 20 Mar 2025 04:09:51 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44 via Frontend Transport; Thu, 20 Mar 2025 04:09:51 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.46) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 20 Mar 2025 04:09:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZMyaebHywiYTGFmRz2DccbT0sMxS94jWeLfhtwhAxeb62xaoWtFZWYgFYtYoNtCcU8ZOcHQBGrwSdIxrrKZ7Tpx/uIAZ+TMmDxekqIDZda6zS3dCA+2rjTQc1IJMwvvpRgmzztf7OaeL73l3BEAaAwUFORVnlwMVMzQMN5ZTs4cnPYfAHBCLy9BP58hL+3wQvZH+YYSvufbg08Hv8+EaaHv1vwvCRImr0yjLWHCGsHBBgjU2qmFGxRcs4If2XYs8GBH9ShqlqNrq8tq1Tjvq862qXpN3ct44OA9kp7Q42w1Nr79QvG40lBK44gTfyuOUzwSy5YLAexeWvZCKZb7q1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LT2QoIDWpaGCsL+nS7tfdyFCxwyvZgbx2hTsMTk0fcM=; b=QXiAA8zsuG8XfR37V5xtedkHvKMz8fDGydU9PWz2tsWxnllT72RaX6Lhn+WiRz8iPa8YsUjFjVfaUAG4TH+1WuKqMIpqDfde+oPB+NcUfDE8btB3AMTqerHJaD/5q7dlrPVODL4pFytvsWPfQxrIC9vyHpetSw7no6D/69K1BDiBSx+Ra6JLjErfpBYFVKLnamOa56cK4ozQ6vSFQqWXnRz1Y5vAIOas8gayCF6afgwFy58DkhWf+x/Sg1O+EGS6+XMShIwGPXfktFEyTFZN3lXXzkEdvPQVm7XOPrGs41hwVHPgxqpTxzmLKghdxqjFAnzy5oNbsTXpUUx0sWCaGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by SN7PR11MB6875.namprd11.prod.outlook.com (2603:10b6:806:2a6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 11:09:48 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%7]) with mapi id 15.20.8534.036; Thu, 20 Mar 2025 11:09:48 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , , , "Bjorn Helgaas" , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= CC: Rodrigo Vivi , Michal Wajdeczko , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matt Roper , =?utf-8?q?Micha=C5=82_Winiarski?= Subject: [PATCH v6 3/6] PCI: Allow IOV resources to be resized in pci_resize_resource() Date: Thu, 20 Mar 2025 12:08:51 +0100 Message-ID: <20250320110854.3866284-4-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250320110854.3866284-1-michal.winiarski@intel.com> References: <20250320110854.3866284-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR09CA0134.eurprd09.prod.outlook.com (2603:10a6:803:12c::18) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SN7PR11MB6875:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ee32af5-afa2-403d-471f-08dd679fba81 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?9BsUJuZ+kcwcR1PYjJDsFNfnpTEXVvS?= =?utf-8?q?nE22kmhRAm2zD2mHczugEBw+UBnYEimEqvAB/RpQ4bbeZ8qxVsl1KcgObtKORRqR0?= =?utf-8?q?LRnFB0jmcnJlXdcf+qFrs8iWAkHqXteDuThjPKkQMYa7fn9RTqAUJRRYuT8PdjLJr?= =?utf-8?q?dNe979thy/uo9kAOv5byhvgwh3iy0DTRpkccDJbDJ5YCeegm8ZW+l+ycJhFtEEJCq?= =?utf-8?q?dp22YTrDDqgWbgCtCzDUQBbiWaJRxXdjDC1z139Jvj6zHJ+7kpoZgnNbpwLWoLeG8?= =?utf-8?q?J0h41OGlxMIS28BJly+NhcJFiR7Vi2S/rabl/tAiaUAi8F0bFy4SE1iB5wJ3DsbwU?= =?utf-8?q?NwmyWzLLQKCp58xydSkRKPkd52e6XtTyhLUQpvJ9ovw4B6E28Qs+PpXPVP6Rc39zi?= =?utf-8?q?Eh9/5pT7/cTLn04bLvv4utA1n4wOB5bISWqddFQ1H98yl2c4n1NtCzPH3ldZSUoeS?= =?utf-8?q?0G8pS0ApJ5q3/qqpayxW8YGxzck1hSJb7ErB0qemU8nQSIfRYqQ3rLvmz11sElEu4?= =?utf-8?q?NYP7NP/OwE8kU9YEcgsU1kSM6oN7vDJ1wMvRC41tulJcUh3WBSXSO2cPJQZom7DmT?= =?utf-8?q?ILYYGweJQgWEEoSzofyM+4AxqxJ4ME4I7dUQ9NeZJPSG79GQl1hXw5OASqCR58ZPz?= =?utf-8?q?vRH3WlF1gNmJ1shGNrYT4py5XPh7NutLw987Hnr0R30cppHLOr7GlGIarmgd0MN59?= =?utf-8?q?i6nAYMwhkS0Gxct202JHGm+u4ZHADCs6w1rck88dIqE6MLHpMAYXlGs6oudxGnnMZ?= =?utf-8?q?S04yn/5K6m/84YDjvGd+2aFHxGK8Aiu4Z1fG88yA21+qU00MzsQ5eamcraYkPWc0y?= =?utf-8?q?6w0STFR9hJvp3R5++7GZvm2YMHnjE9YaPCbwgMCY+CmxKg1nyM3BLL20cVCHTfl+x?= =?utf-8?q?ZLMdAC5bjvkZoafT1zn7JuNRhPlzZ4je5Icjet4x4JaKjIcr+CKrkI0Qyt5+IeUBo?= =?utf-8?q?xHMV5cGjXbdR3HsCGTwS6HLGflygsOdVjd/AumioyDJbBKoGKJsTh0wmTdwF97QAU?= =?utf-8?q?fWU3YKRznp+DcGwvJOkh1mDNxqssKSyxZn7PuWs94CchzbwlSALVKtKgD2Kdmdp2z?= =?utf-8?q?aEyLSOs9hgorVLbIA8Gp/AN0L5/IKlkqu9YrDhrpj5nl0vWtQe8PGQdHFTiMy6+lJ?= =?utf-8?q?cbrYoh583YepeHy9c1PG7hlErgZ7BUOVgl0rQN0mdekwTbZRlxMftQqzhRyombyXi?= =?utf-8?q?54oNNXXBN8t/ThAqggXXiQNWG43L5mM4Gw8ikLuGLkocQ0Zo4KcoEUooFYBs4mEzQ?= =?utf-8?q?VJq1b6moqBjqv4oaX8RpL5o5JQVok0R2gIrDCEzNYXY9Hjouvst7N0Hq1ThTyXHOQ?= =?utf-8?q?AWb1Y6wUkSCO?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(1800799024)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?NxbzbFOqTx8LCMF4+b8XiRePCWPt?= =?utf-8?q?frWRavc17kBq9wM7S3I/q9wKrPFIm4lm71xjOrTY/T+PhXkntne9tVrcHwJyGrmR5?= =?utf-8?q?X2Mo8LREUaE88dLsStU/6xvLMfg9pn1DBSW1PFpdD3I0SEz2LeygMOwSJvkaP6u9b?= =?utf-8?q?rSGk1vJe6YBmeOrKP39c2SN8URKr61wOQL+PffGw/AvvKWC+FZw6kc4++1DOTqUyA?= =?utf-8?q?ekekIvaIOA+kodrIADBuHnlCiMJibO9GKMtji8cxeOE+bfinf/ItCH2r/kZ3iUpbu?= =?utf-8?q?n4TSr57/FBE0QdRsjM97CJaZ1MfwS+5DGeIPzSK2drfxhlS36SFO7ZmszgFBlNHmO?= =?utf-8?q?3g1iz6sNCvdeqO7n86rnNgZueLPwqOWPJjfIMazRMHK0/9SR9OHPJdVBJcJI5tLnh?= =?utf-8?q?JXJEhgXWyc4A6sSn0hU4MlY2GD3MCQU/RaS/oe/J5Kgk5Mr7SI53x1KxtrCFMQzOI?= =?utf-8?q?2N60JuYFr7RbxaZKQEXb+QG/LrRJ7bANY37vK+x0UbODaap1wQagkAY6BpWPtneIw?= =?utf-8?q?xeBrKzWpMb+16uaRH+TDGeU/McLtiqJMtHcjpo0blgA/wYtAtOK8i1yHx8S0ypZRZ?= =?utf-8?q?S4wSCpcxd4ZxIhfR1EA9rBJmVTwI/FG8J7Oj2oBcxqbBinV5g2p4Ole5NJ49I6VDq?= =?utf-8?q?F/X4Og3Kd7oC25SsKrRdjL2Cv0/vMaHGx8qiLqhrdnlAjvwhVpEnlSqJB6/6fihnR?= =?utf-8?q?mc7yH4hiWwWljyDwr04adfIWPpLyW89KFl/R5Auw//Df3N0zWJYKLbuMVYSXGLiid?= =?utf-8?q?L1Qe/8SN4crZNBDe8uHD8Y050nF/RGygCVm90eqmjbAtr/LvWrG6iQ4M5lCJFTyWb?= =?utf-8?q?vQ2hT35v0Hz1xmjbB22F42WoOhgpEgXzc24I2R17IE3HpOaMYcyizE6P4Pu3DxSvC?= =?utf-8?q?AyTzj/zoZLa9tBAkQNLN2zOV56J3IbpqqVTtKY4hGfEj5SMjUe66SoPKDqq3mpd2d?= =?utf-8?q?+Sfyrt2GRt3CQ+6K/vvKl24QLc4ow3KSPanNz2fK8LTWJ7p3TJpClKjOiQ9YwtW64?= =?utf-8?q?3WX1D4LzZ7RLM6yYaPVc4BsSGPzfXduLe5PqqdhKnnIdM+9jGN2fwM53d4bjoFaXU?= =?utf-8?q?uY+Rwo2ZSpy72B5Nk7H7IlgkfHf/Zw3YOpu6zrEjnluk42JmFiM8W2BBNvP3XhoSr?= =?utf-8?q?7mG0eud3L5VnXhd9KEHk6sihQWJ9c4wUWPutfW8srE2Awhc3hhzfoG5xHyGihWcIq?= =?utf-8?q?ftk4Pcg85grmmExmAxxmGO3s7srw6QY8qkdGUoEA/KinBSlUB4gRU8CKlTGq50BkA?= =?utf-8?q?L6V7LOpsS59e1PWr9Y08/sUUtUb06IFTudDPwFnpVnjBXY8hhoRfapVhdHBr7u2iT?= =?utf-8?q?f2v2dSKI5/76G/LCq9OXUm4gUYFfpyH48M9oPMjLI+Bg22HIDs9sUVHVyofg91i51?= =?utf-8?q?0WDt2eje/6dFBH+28tsUY+EQgdI9+EzsfQnqyLdSeryvuVFUMNPXee+rFpMkPPCfc?= =?utf-8?q?Px3QyBbNagpezU7GCNUnY9lBUfvirh9kAByeu2SaRpBtxr0Ys0Sg206Q6wn3XZErv?= =?utf-8?q?dJ/gT+bkpMStc3ehHih7ZQO8EcvXi9yBYQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 1ee32af5-afa2-403d-471f-08dd679fba81 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 11:09:48.4729 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Lm/qHd8jokjvsV7yYKr2XnMRBRoj+LG4ikxdZk7POSc2wJ8wzdfsHRoSwvQsztnVQe+ARbz1HqFEx0T8n5dbzBysd3ccLNjOowgfDuLn1iY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6875 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Similar to regular resizable BAR, VF BAR can also be resized. The structures are very similar, which means we can reuse most of the implementation. Extend the pci_resize_resource() function to accept IOV resources. See PCIe r4.0, sec 9.3.7.4. Signed-off-by: Michał Winiarski --- drivers/pci/iov.c | 21 +++++++++++++++++++++ drivers/pci/pci.c | 8 +++++++- drivers/pci/pci.h | 9 +++++++++ drivers/pci/setup-res.c | 35 ++++++++++++++++++++++++++++++----- 4 files changed, 67 insertions(+), 6 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 985ea11339c45..cbf335725d4fb 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -154,6 +154,27 @@ resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) return dev->sriov->barsz[pci_resource_num_to_vf_bar(resno)]; } +void pci_iov_resource_set_size(struct pci_dev *dev, int resno, + resource_size_t size) +{ + if (!pci_resource_is_iov(resno)) { + pci_warn(dev, "%s is not an IOV resource\n", + pci_resource_name(dev, resno)); + return; + } + + dev->sriov->barsz[pci_resource_num_to_vf_bar(resno)] = size; +} + +bool pci_iov_is_memory_decoding_enabled(struct pci_dev *dev) +{ + u16 cmd; + + pci_read_config_word(dev, dev->sriov->pos + PCI_SRIOV_CTRL, &cmd); + + return cmd & PCI_SRIOV_CTRL_MSE; +} + static void pci_read_vf_config_common(struct pci_dev *virtfn) { struct pci_dev *physfn = virtfn->physfn; diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index ff69f3d653ced..1fad9f4c54977 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3745,7 +3745,13 @@ static int pci_rebar_find_pos(struct pci_dev *pdev, int bar) unsigned int pos, nbars, i; u32 ctrl; - pos = pdev->rebar_cap; + if (pci_resource_is_iov(bar)) { + pos = pdev->physfn ? pdev->sriov->vf_rebar_cap : 0; + bar = pci_resource_num_to_vf_bar(bar); + } else { + pos = pdev->rebar_cap; + } + if (!pos) return -ENOTSUPP; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index f44840ee3c327..643cd8c737f66 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -689,6 +689,9 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno); resource_size_t pci_sriov_resource_alignment(struct pci_dev *dev, int resno); void pci_restore_iov_state(struct pci_dev *dev); int pci_iov_bus_range(struct pci_bus *bus); +void pci_iov_resource_set_size(struct pci_dev *dev, int resno, + resource_size_t size); +bool pci_iov_is_memory_decoding_enabled(struct pci_dev *dev); static inline bool pci_resource_is_iov(int resno) { return resno >= PCI_IOV_RESOURCES && resno <= PCI_IOV_RESOURCE_END; @@ -722,6 +725,12 @@ static inline int pci_iov_bus_range(struct pci_bus *bus) { return 0; } +static inline void pci_iov_resource_set_size(struct pci_dev *dev, int resno, + resource_size_t size) { } +static inline bool pci_iov_is_memory_decoding_enabled(struct pci_dev *dev) +{ + return false; +} static inline bool pci_resource_is_iov(int resno) { return false; diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index c6657cdd06f67..d2b3ed51e8804 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -423,13 +423,39 @@ void pci_release_resource(struct pci_dev *dev, int resno) } EXPORT_SYMBOL(pci_release_resource); +static bool pci_resize_is_memory_decoding_enabled(struct pci_dev *dev, + int resno) +{ + u16 cmd; + + if (pci_resource_is_iov(resno)) + return pci_iov_is_memory_decoding_enabled(dev); + + pci_read_config_word(dev, PCI_COMMAND, &cmd); + + return cmd & PCI_COMMAND_MEMORY; +} + +static void pci_resize_resource_set_size(struct pci_dev *dev, int resno, + int size) +{ + resource_size_t res_size = pci_rebar_size_to_bytes(size); + struct resource *res = pci_resource_n(dev, resno); + + if (!pci_resource_is_iov(resno)) { + resource_set_size(res, res_size); + } else { + resource_set_size(res, res_size * pci_sriov_get_totalvfs(dev)); + pci_iov_resource_set_size(dev, resno, res_size); + } +} + int pci_resize_resource(struct pci_dev *dev, int resno, int size) { struct resource *res = pci_resource_n(dev, resno); struct pci_host_bridge *host; int old, ret; u32 sizes; - u16 cmd; /* Check if we must preserve the firmware's resource assignment */ host = pci_find_host_bridge(dev->bus); @@ -440,8 +466,7 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size) if (!(res->flags & IORESOURCE_UNSET)) return -EBUSY; - pci_read_config_word(dev, PCI_COMMAND, &cmd); - if (cmd & PCI_COMMAND_MEMORY) + if (pci_resize_is_memory_decoding_enabled(dev, resno)) return -EBUSY; sizes = pci_rebar_get_possible_sizes(dev, resno); @@ -459,7 +484,7 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size) if (ret) return ret; - resource_set_size(res, pci_rebar_size_to_bytes(size)); + pci_resize_resource_set_size(dev, resno, size); /* Check if the new config works by trying to assign everything. */ if (dev->bus->self) { @@ -471,7 +496,7 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size) error_resize: pci_rebar_set_size(dev, resno, old); - resource_set_size(res, pci_rebar_size_to_bytes(old)); + pci_resize_resource_set_size(dev, resno, old); return ret; } EXPORT_SYMBOL(pci_resize_resource); From patchwork Thu Mar 20 11:08:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 14023716 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 762CDC36002 for ; Thu, 20 Mar 2025 11:09:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF64910E5EC; Thu, 20 Mar 2025 11:09:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="be00nlNl"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3898C10E5EC; Thu, 20 Mar 2025 11:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742468996; x=1774004996; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=L0gnhAy12+pBA8N7aVrR1ppPMpMddCZ1SRv+i8EY6PE=; b=be00nlNlpCasOl4ujq21+XDtIUzITljfMRQDiBcnuo4fM/GJZaryDggy RaH072z8byVPkAqkOmg2oigghNlH2vlzx6NbIMuPs5evcT19M/IDnJBCC J4/aohRFdfbrcROLRfz8U40oU8QSQUE0Q8vouxEze1iWw8lQ8sfe11Yki p3W4iazxef+WLEn4DxJeBkzESHSeNeboazUnTrlGx/WKZPNS+YjRDyfxn hHODY/J68QP02cJhgUvJ6iE35ffI7ISJFbw5M6YDq+Kk0on17q65pDlM/ nn5pJBb8WtEdYOXxnAdgUA4JNmKNxNKUgxVpKU106muV4jRruHeAdLcYp w==; X-CSE-ConnectionGUID: 9U2HgIE8Tda1x7Vq5h9c6w== X-CSE-MsgGUID: NbwZcxfES1GkoeKUfEBEpw== X-IronPort-AV: E=McAfee;i="6700,10204,11378"; a="55070867" X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="55070867" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:09:56 -0700 X-CSE-ConnectionGUID: VGLe8Q3NTYuf6JlmfIiCLA== X-CSE-MsgGUID: kwZv40D5RVOWPAgtjfBM2A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="146265569" Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by fmviesa002.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:09:55 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 20 Mar 2025 04:09:55 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Thu, 20 Mar 2025 04:09:55 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.49) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 20 Mar 2025 04:09:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d5M5o3qP/1eJsiM54j8efN2kLOncb1WQMJD/7Pdo+kouEHPDvL3yT2RNdpMsuRLQO9vjqf0YyWV56mWYpa7d7s67OQNoDy+GXBnXedG+5XttkHxnkyajTNQWC/Ho9ENpfZb7F+HL9dM7rl//ySIQxYB7R1KZ8vAsbLaTmnrShsg0OF4aojRLs8O0h3LGiAUzAR/m3QmgHgbRuhL/yHp4boNYNftLJFjlMHMEBI0E0yY3uKU8R9WhC5mPunV0uU0AEdbfLCzWgjdktMuDbJ02HN3yWIW/PEUdyLjsQnxxubYSybkZ9ZW1nZL0jC8YHTYE40nw3/PzNGVFlIKgmVfF8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fkh+RjKXYZuPmliaIxzvKlbcAJ3OTsmXJEDPgMuDqNI=; b=iwclHgYoXSPXjgTr6WzQFKewMhFelKJtyyU9i2/gqyACCkeMK+5BkTQm/fQfKbfCQ2aCuzf1N67ZmVBIxIkmAIrTvUta9E8UZhpHai7Bb5aSQiEPDQ/WEYJWKp1w+qqcqCRmiEgHp0kXRjTt9+wxVTa+LiBCNp51tEkTptVaKBbxxEj/3uWfBTqh9ZnI/sbMfrAaDfI8H4rDMMkwmReQvIUUzAGN4toSaF0s6buRsXprxHB4sWLuiKpF1hz+QLlaE0kaYpVRHFdVwjfztH/b2hXZ4sZdtS03ps/Vo3DH4tN4ykjAgfdzdHnA+X3uPEPltBqa8Rr/YEAgCz5sE9uVcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by SN7PR11MB6875.namprd11.prod.outlook.com (2603:10b6:806:2a6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 11:09:53 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%7]) with mapi id 15.20.8534.036; Thu, 20 Mar 2025 11:09:53 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , , , "Bjorn Helgaas" , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= CC: Rodrigo Vivi , Michal Wajdeczko , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matt Roper , =?utf-8?q?Micha=C5=82_Winiarski?= Subject: [PATCH v6 4/6] PCI/IOV: Check that VF BAR fits within the reservation Date: Thu, 20 Mar 2025 12:08:52 +0100 Message-ID: <20250320110854.3866284-5-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250320110854.3866284-1-michal.winiarski@intel.com> References: <20250320110854.3866284-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR06CA0178.eurprd06.prod.outlook.com (2603:10a6:803:c8::35) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SN7PR11MB6875:EE_ X-MS-Office365-Filtering-Correlation-Id: 00f7e26c-30fb-4e4f-23b9-08dd679fbd3d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?hymEBP/qR/zH4iCA3AcYZVyc/hGFkvu?= =?utf-8?q?KodE2fYTBMIyeJRuq8nW+QhiSSwdFI3hLveIvaoLlLDU2oTbQLtWTYyf+i8K8Nv28?= =?utf-8?q?6P2ruI/s/tu1Vd71VlJtb//Zu0pMOaCIlViktoUcQUw7uLdykJ5kUN6cbx1w6pwNm?= =?utf-8?q?NKDyWC87LrJDFBMyqxOBKARxmU97FJjia3OaTcgr8Q5fYXOquB+RVWzXKSkgXpF7x?= =?utf-8?q?ejy70VP/Zsk+q+nxo2TTX05lpmrUDarSTGC46w6qWAEtfybWxCSwezKF4oTz2xFZC?= =?utf-8?q?U9282WZ7SQbBpXhePkLaOaNqf0kgbD5eoI9sPyn/SBEx1dt/U0lJJVzCQIAKUcEo0?= =?utf-8?q?HQqdkS8ZVLQIZrS59Y6+R6A3ohCTMruZ58nZCX2OPdWMy9n5f+Qy+PK13xeQkW9V2?= =?utf-8?q?saHTXtp4HoCvb8PQL65j0+/wU1LtKCMWDrKDAv1zQqlpvCY9Rk5slXgaj+ObfABr1?= =?utf-8?q?MbfXpWxplQvOahxGEHhTdtssoOUcls7SXWZHfMPniwr0evn8eUFjpYBM35g724MWm?= =?utf-8?q?28j1ruc/maOEZaTKGI/gRqxFPgPQNTHHEO4uxUZTV2aaLv+u2Tse05bjV6SyRpLNH?= =?utf-8?q?6NbA+SgMYUjBg0Ib00cOB5faQcbAvd492mHBSKZ1cfxDZiWLYA94WPpERKs/rPWXD?= =?utf-8?q?uhqhakU3umePEK/nN9/tgP0SNLiasFzSoJ9EtDGfw5cVtIDigjGHfYswgPrI36Y/g?= =?utf-8?q?eLu/fYPEsndj7yR2hqd+kZVFMR8gYoJ2ByE30pDNuHl5v5jFMwyrcjCvxbCJ6WtOn?= =?utf-8?q?EookPGLoEXY+LtdwHIz0NQ6GeNqWvuirQYrwrA6Il4MusLa3i3Z5E4Exa5Y8ykcaK?= =?utf-8?q?2i75QHnD4Ow6mRAwgysBjTAKFwO3oZnLBTSsThWqqNF4N2kDFN89jYgovq9uwJ1Xl?= =?utf-8?q?lkiVgbV/mQcefv6UnoSbYpcRTJ9/sJJTK/NtEyeVXlBW21ZOjGpwsvKNzV/mz4vNi?= =?utf-8?q?uLlDFqmRAYJh6r8EYx0wk/LH948rEFnU30IBrgjuMHWFwjBZO/w/SR1SSlt89hKX4?= =?utf-8?q?im/ygLGI6qE6/GzlYGrzqfTQ1QKyq0RCYOA5o6CtHjU6MmewrwcFl3J6htuAwXZsT?= =?utf-8?q?0wdhzhlTPyJbyQnAOYFK7k2gX7EUo6ncIQWN9UI/tyqiEUHEzgIWAIC5/I588vU2T?= =?utf-8?q?AraBMixofjkl9r0h+huWLGea0s5NFIk2lIOxmry9suaqMkRQFuGME6b/T/LBQh7ij?= =?utf-8?q?+clgBGVrBJv+zgaqlS99QgP9jO9N+e4W1QRfWhiR1no8syOU/wr2j+ZnC5Of4Vend?= =?utf-8?q?NV7CtDSVcDaiPIzN9iaqq0DfrKP+bChR9P1dC6nQYDb7JHPaxIyW4GUl99PiAIjz8?= =?utf-8?q?h89TmnRzXMN2?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(1800799024)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?zQ/2cRiWx/g7f3owia6ovvMxqIJp?= =?utf-8?q?UL4A5ilTRpFLNFT+BXZh1Bqt4MDpld+nf5yxujYR80gArtekpLg1nHrNv6tTjFx3f?= =?utf-8?q?EcdcP1UCv/5Le203hogdaDi2eEafy7uhx+D0Qz4s7/wEkNWqQziBMZVMoCV/xVCaa?= =?utf-8?q?ruLj3z+56ZSsr5VKVXqSjZHwwvBe5a84U6RgqDrhFBcGbG+lv02PJDB9lxrtlTmk+?= =?utf-8?q?Ta3/cJ1mxdgF0zI6JgrQv7b22TlnVuxSBErXod7DYrNcSWdFAI8fAGUy0GfANcV3q?= =?utf-8?q?rgwao/ROxLdVTJjxqDgEEm16swzEHLOCR9Q3kSjXS+UDQIGPdDfZTyzgOD+SH/msn?= =?utf-8?q?fq2hzm1yE1Z+4KDb/+DCerhHgMw5cuAPSpSweoFX111Huiahj/RsMJ7LTd6i2LGha?= =?utf-8?q?whGsOdrqaioVSXW8nqERC7PvMVGrcJHSE6X1q3pZTu/jiQdtAyPNDmExo1yKURd6I?= =?utf-8?q?PnBfiEe3a2RufAcbWOtH6PEdPiAc4GdlT8T5otXjrycKtCS1QiT4+k4f+9pJBZMEq?= =?utf-8?q?nNAjXXkpRTw44uVzhFSnRRxseUr203nZtLfnyRf206fApe8ozYbsUO01jb8ULcbkc?= =?utf-8?q?zaFn/pBTW4wpEVkWdQiNuszMJbZnGnELdunqaLZ4nRnH3k7cTHdpIjmIIirjYtGTW?= =?utf-8?q?JvwfYnnIHT73rJM2uMDQqKcFPNDCH69teDzppIlCVRP3leeNmflCNXsRFoWEni31m?= =?utf-8?q?dzfIzyF52zORNReoG7KSLdCXzzzdYmiAdJsxcA4k+4p5+c5E71SAMWvQGcRzXIa25?= =?utf-8?q?BrlZRekRqjAOegYXTHeUX+15gXsTKwCe0KIfL5ekS2MGv2wDR28bJndh+thYeFIFE?= =?utf-8?q?L2Yp7a8Qr4KItKuOCNThM/JCU2TaZc+E0S3Y3QSi0txmn/By3cpFBMmm9swCoYR2S?= =?utf-8?q?AJixb3HXo5+GM9nOiO0fFLUWyDjxskTMxXX9LZiQvjrkAeRvsQySXFfKxRGCoyAK8?= =?utf-8?q?RxSsOFAt9ndA8Zgoy255s6mqnfVanSFhMNyesPMO5tWWvUJxwrDSg2WmBDW0tU/NK?= =?utf-8?q?UijA/YJHWHyzAEOGwOfejPiay7lLp7KJBwhSmU6VtzUV3z8+LHQYm9OGId7GbJh+d?= =?utf-8?q?/FMociiPHo9VshnTjAeyHNYOcq5j/275OZGRiIENRWicGSVWDAsI83YIfRNrbTdKm?= =?utf-8?q?futPq4IrUr1GHNACYAdl+03a3U/ggc2kVK1KKVjeNEWJTaMnO+6+ydPVFUtmXM7Ov?= =?utf-8?q?nJM8ep//UhRPA5uc/ocN8vLyRCcNZQLkVPuoCx7F9JooKFITm490Z/Mj30ifixPZM?= =?utf-8?q?MyFxPvqIfd048k5IKS4BIrD5q2n50xdE1sCjdkZDtf5R6tNahlCUgH7KP+w/QR1H4?= =?utf-8?q?ftyolEVEudwcI1MXmYbKvqKo/aOD/C7yIXV/+lnar1+/zKPTPKz8DfiS1c/1mDQd8?= =?utf-8?q?LOyMmgLIzzWeMD7LR0wHph0y+xsdb3N4GRfa/JJjKtgAwbetLBwut4ogw+3ClLHo5?= =?utf-8?q?oPh9qDNHiP+huWmrRQ0rHgQcnOjUp5rDiqG8+5FEF2Utn9DDLUh1irDMYmtWxZRAi?= =?utf-8?q?iaediNyKzyvWQS+72fTMbARWe5fswD2YNQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 00f7e26c-30fb-4e4f-23b9-08dd679fbd3d X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 11:09:52.9937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OXiyvWT3hufNEGwzikadGM+8V2nDqa6pf3AbN1ef7fouTkKDyeO4I3RTpjNqniGsIkE2uTj8RjiGuaNu4d4gAGEYfo4kBXMUvGunt0UVJIQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6875 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When the resource representing VF MMIO BAR reservation is created, its size is always large enough to accommodate the BAR of all SR-IOV Virtual Functions that can potentially be created (total VFs). If for whatever reason it's not possible to accommodate all VFs - the resource is not assigned and no VFs can be created. The following patch will allow VF BAR size to be modified by drivers at a later point in time, which means that the check for resource assignment is no longer sufficient. Add an additional check that verifies that VF BAR for all enabled VFs fits within the underlying reservation resource. Signed-off-by: Michał Winiarski --- drivers/pci/iov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index cbf335725d4fb..861273ad9a580 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -646,8 +646,13 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) nres = 0; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { + resource_size_t vf_bar_sz = + pci_iov_resource_size(dev, + pci_resource_num_from_vf_bar(i)); bars |= (1 << pci_resource_num_from_vf_bar(i)); res = &dev->resource[pci_resource_num_from_vf_bar(i)]; + if (vf_bar_sz * nr_virtfn > resource_size(res)) + continue; if (res->parent) nres++; } From patchwork Thu Mar 20 11:08:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 14023718 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CAA14C28B30 for ; Thu, 20 Mar 2025 11:10:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B94910E5E7; Thu, 20 Mar 2025 11:10:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="aibBaItI"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE4E510E5E3; Thu, 20 Mar 2025 11:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742469042; x=1774005042; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=PMC3cb65PZY1zqKMUSX6Vo+OoWOPI+6VYGRdcem/nWY=; b=aibBaItI+Hwne4VNgh+AGSDY88bOxPCbxJHHZrbeNiK8qF93/tmb9yAA Wd2bLnvcSTdq9SWgn/FuaprEZ8KByc3LHO9ADUle/T2OlBWHtcuAj9PJM jaZfMCrF7jAajRNHEqnB4u1Ri4a/9wSMBbg50LWuPZyJohJRAT7Tldf2T AzB5gZheN1PKEXtJEGJ5R1GF0YdtI/8supuVImiXqO7EFkzWoyUAYsbA7 TJ/LdSv/NHlF/FVNYOuJdgQjjcir+lJwwCF0rw8rLJNbxPduwaj0ct9oP 5aIT1g9ECj/wLEBtejLAStWzjwPFj4rb+Byw+nq+5g49KikZNfLcTvLj/ A==; X-CSE-ConnectionGUID: WWAiF3NhQhCZJAeENdMPPA== X-CSE-MsgGUID: XQYS8kxtQx+rVntKJFJMdQ== X-IronPort-AV: E=McAfee;i="6700,10204,11378"; a="47573402" X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="47573402" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:10:41 -0700 X-CSE-ConnectionGUID: ldis87nrROmS5BN3tncMuQ== X-CSE-MsgGUID: kawBaNZ1RwOUW/4jtumzYA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="124003654" Received: from orsmsx902.amr.corp.intel.com ([10.22.229.24]) by orviesa008.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:10:41 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX902.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 20 Mar 2025 04:10:41 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Thu, 20 Mar 2025 04:10:41 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.45) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 20 Mar 2025 04:10:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aSFzbMq9MhepbooQ9ZhWJdi9fLBtyNFrl9/bDhNUktetoIaJy6/deaaMttS72+juMx8pXMA2tfTRNQLtusOU7qukPFtjurRhxnYYe/fIUQKerjScrgR30bSWXVZtKgwzN2qSbGo8bSn5i0pnEeJLe59r0V/Zwt9jiegZhx5oXREjZgWFqmndGuVZL2gQkF78BsVEcGB5h1rHQ4G8S7pD9yYk6PLc/CFZpJOG5CTgNehRIyfjoXZV6l/Ynhrjy7D/AdZIHMG2SLre5xfeU6d909GMrZWWxbL5o1661o3Te2v+AnnNBM2NpmcMiM8YvGl2yaQtPX+3+a2dZzxu0Fo/hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7QYYi3unbwGCGFBCBZxeTyRJU6W7G0PfBVOw0RNUKjo=; b=lXzG2RBcvrmB/++ghDKiHXC/MtGf4D3r4lv6oucBFQwAT9i2evgKd7rvn3j93GliHwtsfyzpkbbMKt1wbkR6m68Yd1kZFV2bE9zt0rN9TeiOV9CsKKYqUbflx4Wa0GAPSNMvlqbLKiwiegwxgnd4cRBtkwDv8fVsGlv6m74Ir9xJer41vsgz50lPKi5q8sngDPoerwvEjHBPZxUKEpuqKZvyCoDU7XmJojO38MP2ctrUS58LPGaoMXPxaOqZFOsFdq0EcTjHu7owCzSRlOqj52VYjm+bKGLGUOGEPKRXdsdMiZxExsXQjWWXEc7UtPIprLIo4CTqe+MltehSiZEBuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by SN7PR11MB6875.namprd11.prod.outlook.com (2603:10b6:806:2a6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 11:09:57 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%7]) with mapi id 15.20.8534.036; Thu, 20 Mar 2025 11:09:57 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , , , "Bjorn Helgaas" , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= CC: Rodrigo Vivi , Michal Wajdeczko , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matt Roper , =?utf-8?q?Micha=C5=82_Winiarski?= Subject: [PATCH v6 5/6] PCI: Allow drivers to control VF BAR size Date: Thu, 20 Mar 2025 12:08:53 +0100 Message-ID: <20250320110854.3866284-6-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250320110854.3866284-1-michal.winiarski@intel.com> References: <20250320110854.3866284-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR04CA0136.eurprd04.prod.outlook.com (2603:10a6:803:f0::34) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SN7PR11MB6875:EE_ X-MS-Office365-Filtering-Correlation-Id: 0442f441-0f0d-4032-b53b-08dd679fbfb4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?bnf2jPZZ4D6i38cCKymap2VEjr8LYCC?= =?utf-8?q?VZTR+CJswfsvy1TfIGfQqSkk7EFAabPAe8wS7N/4pd686K8h7VusUgYBY9ypTGxp+?= =?utf-8?q?1p3r9Y+4oB5Ks6THSJc6+jKE3mogaOYCRGvBNSAuchGkUZelYRedBGkwETgJSJ7Bt?= =?utf-8?q?ipEnIBXsUGcDhEWy3qiZn1S41XuJG+6b0SCmND+wqLkUOq3DYYhHOdvN0V4tSYUoW?= =?utf-8?q?YYG56DP8NDtYJ/YXDqMRYLJi6qsmJV0vDC3tOvnEOUrsPdKnrXS9HiPHGI2LeXLdz?= =?utf-8?q?6IgNOYG4iiTl/jy5KBjSt2CjnTE4wCn7+bYt9xvnJCmYJEovERXSm443g8Hy22knr?= =?utf-8?q?SC4Ro/bCJMIUOZjHIj8YvnAKjWgdEX1zq3Cb9MXTYgu0lUcWIr/SEL3pB4bx79Wa6?= =?utf-8?q?01tWSXdH8p/lnNXPr6GEe3d2FWPSs7NASj6HFk8ffefbbFf1DhpCz8Rr+DUQK+dFf?= =?utf-8?q?nAUsJ+CaklQ9tlq8x/SG7lZHAzmIB1F2qBEPC0x20dgSE0gsmAvSV8Aq3/ATDlfIR?= =?utf-8?q?RkfFbzy88sUUMrjclqP6SqW+F+nlAjJ3G81pIOK3EWEscLWVacsgkXzTkq7NE4iKX?= =?utf-8?q?6WZ7SdCqXEWrcwpxyiOX/wh7QliAz3PnGakAGNWlmmDX0XuXdVhpGxuhbW6MS10PU?= =?utf-8?q?urnnuHAJoGTd2ty5dO0aaDm9RMHNt/CLuzRzcE8zHZQP2TuaVUgvrmkRpBG4Su0hv?= =?utf-8?q?4B+Wo6aVHKdQFA3nmvrh/DfP64H4GEF6uYFC/LmAxfo+DUpzPO4K1Rkvx7olCaemM?= =?utf-8?q?5s7VSuA+iYa5+1wzpgIWdro1ccoe6CL2V1WqJce6vEdK2IFC8KOGAakOm1HFLlcAF?= =?utf-8?q?DftkIlMvFEBxdNpRzPtq/eZwPNTM2uZ29e/aaxQDdml/0h/EwBrpz7MivXSDjHobW?= =?utf-8?q?fM0/qhN2J7aBeVT1/Rawg6KXiTkQV28EeSA65pW+BD7moKUuyuCd/cDcN7DY1Y2hg?= =?utf-8?q?lcO26i7ZelRFiHSCNPBadoT8npwPJdpL3/68pLzpzJ6ywGMy0bi4g9JWedSOXqZbQ?= =?utf-8?q?wNlWbitv4Mh/oA/XAAid08UolVhAHkQupNkGKsXZM0lm0xERuTXoxYzcN48bJj8QV?= =?utf-8?q?vQG0CvIz7C2sA4mrdihGtcIVnADy4QdAovtppZDAc5YsN3FE4WjTfQVCtSKoo3N/L?= =?utf-8?q?VLXUeImiMyPDyZ6Jd4wZG7RDrFCHKk7KgHPD3Ns7WPY8oSvyMdCerUEZzcPAzIg2b?= =?utf-8?q?DH01oRkBmxw9Yn/7M32a78RKS/qXmXN1KIX9h1Xpz359umy1Y5z+5rAoo9DBDYEaZ?= =?utf-8?q?HUHLfsqs1ti9pj8KXE5f/FVXDYs1FtRRRdCXQWCTG6KMPFQTdQNacJJHUVqbbgu0g?= =?utf-8?q?48LigRz1ZWZ8?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(1800799024)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?GtBmQs5Xcjogtb7uzIawnlbbdg/m?= =?utf-8?q?Q5Xlp902+qve6r+Y/LhAFWzSK3rNHHzuGghiQIIEm9/Iue0igFxwJOu3AhRyqtCFU?= =?utf-8?q?SnvTiZOTv7gukE5KBRtzL/PpKgwZC7olhUVtqbnCAVJCHqCCWVZNIWqkNunwHk3Gg?= =?utf-8?q?keH99hXRYIIMzI0MbcUaqva8DaY7doo5UgklzqIPs7l/VerV14wpf1V4kHyoa26Ar?= =?utf-8?q?xZTYHdx4YjuicFgD6QdHoVvO1q/Dqb91Nat6ILUScgfMagVw6uziyhtHErEqZko15?= =?utf-8?q?v9yOE1BjO+ZeFkbolpdpw57BQ1tres3F0+bilqMug1mkrEodiUVKcJj9tyIq33uVA?= =?utf-8?q?jtnS2Eacsy8rm0gXj71rGdo2+HG6VzB/cRsuw4rpJt60Z7YLI6qq6v6NYZ0XY6ILm?= =?utf-8?q?UC0r+a6I1VY5Xoy+9VYFwcD8UVncYtmCaXDmSGW0jONid0SFHOvzrDFROEWJJWzbX?= =?utf-8?q?j8BbPqddTKpgl7M6+rcoGODEEdiFmb2mmVJ8I0rSFgmLpW1f3CB3TfQExQVEMXKw3?= =?utf-8?q?XSWH8VbjSthxi36k1msuKs8SAj216cV/GKnkI1IedthX8gWr6138j8Up6IBxRPvWo?= =?utf-8?q?naliVcwjizWor3BGZQeRHQe31cH75hjM3D+flrUvYS2U/xHacxOkvKUr3vaold7Oj?= =?utf-8?q?5yXghVZdxPhK/B0mlDIUN437E+AcROTCCrcNB+2JOEWVi31taEbU05rP3/YVBdRZx?= =?utf-8?q?1PNvLWvK5m90ycOTfS9v/tyVrbjroMiH3ezA1B2LL8fJaaLrSkcyN37CgT6+ai0mH?= =?utf-8?q?Txxb1PRz4RKrq3X9lgjJ4fLDbc6Ghm1/lTNzJVagE0MYdteRx7Jig/nPp/N1VgJBr?= =?utf-8?q?5liLLmXPHF6K33l3pqSSu9Au85mTJRB/YnVyg2Z1p/Fb9mt92HOHcafaRPkGyMf75?= =?utf-8?q?wpxaQNQjlnemtRKg1GdmKO/1loxJCirFgV2J02N+fLjVyrhdvy82RZBKvKnMg95VN?= =?utf-8?q?ZL/+32Rri0cYYGSma+/e7D+oLjH01OR8//x/gLc/Zi2By8dC/DN6POj8O3bXUp8TW?= =?utf-8?q?/8d6zea6mIEnnisG/LWPUoNArwYzCv3wOZO9VxJ0+vN7JDRAvfJzJhArCY7dRc1Vy?= =?utf-8?q?LArCP1u2/xRU+8Rbt5dpNAnkQRq6G3xHBWr6xLtJMJ6FFkpv6hUPCTG3o/vxXGnyK?= =?utf-8?q?m8pRsllgDfxmFGLTVpPBnp043SjBI+PKmIuKZL5dMaD8RxceT864Rg1x/gYpmpx/X?= =?utf-8?q?oIXBF/XxB2+CDvb92zT02lAoOTS8191pvjoX6gaS6hW2G8hG7zjE3nN2FLUa4Pl+f?= =?utf-8?q?Q1BuyA1i+b5RsO487+k3ce69yvyOUwrQdOxxYVq0km+iNtyZlwUy4wmn/ZeTVg++p?= =?utf-8?q?0glY8yPsD0SaMcCTfT5fs7gPIctHb63BB7E+4LXSuxhJKbREepwrQD37M7jrHUBfM?= =?utf-8?q?tDvi0KMDGLsg8ycySqtnpJkK4lWWJd5T+DY3nIDqvm7TPMT47lORNgWuATSPvilup?= =?utf-8?q?KL5qQi0LK1PY3z030XbGztt8pq0hmkZdk5qvYupaX7sIG1/K15GvbQjYJzobvrQ2k?= =?utf-8?q?v2X5bfLD8kKsHtswrxLQbQ1nHSajEFYDGA=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 0442f441-0f0d-4032-b53b-08dd679fbfb4 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 11:09:57.1564 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: brNGFrEAAg8N4Oi7BF7hSYzwsI/uIL0ze2K0bh/G10tBV+82YMxdepfWF0VUbEVEKVHmInt49SCbTza4bI2V9WFBz6pMhm0A9e+Ff5tjFSU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6875 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Drivers could leverage the fact that the VF BAR MMIO reservation is created for total number of VFs supported by the device by resizing the BAR to larger size when smaller number of VFs is enabled. Add a pci_iov_vf_bar_set_size() function to control the size and a pci_iov_vf_bar_get_sizes() helper to get the VF BAR sizes that will allow up to num_vfs to be successfully enabled with the current underlying reservation size. Signed-off-by: Michał Winiarski --- drivers/pci/iov.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/pci.h | 6 ++++ 2 files changed, 84 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 861273ad9a580..751eef232685c 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -1291,3 +1291,81 @@ int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn) return nr_virtfn; } EXPORT_SYMBOL_GPL(pci_sriov_configure_simple); + +/** + * pci_iov_vf_bar_set_size - set a new size for a VF BAR + * @dev: the PCI device + * @resno: the resource number + * @size: new size as defined in the spec (0=1MB, 31=128TB) + * + * Set the new size of a VF BAR that supports VF resizable BAR capability. + * Unlike pci_resize_resource(), this does not cause the resource that + * reserves the MMIO space (originally up to total_VFs) to be resized, which + * means that following calls to pci_enable_sriov() can fail if the resources + * no longer fit. + * + * Returns 0 on success, or negative on failure. + */ +int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size) +{ + int ret; + u32 sizes; + + if (!pci_resource_is_iov(resno)) + return -EINVAL; + + if (pci_iov_is_memory_decoding_enabled(dev)) + return -EBUSY; + + sizes = pci_rebar_get_possible_sizes(dev, resno); + if (!sizes) + return -ENOTSUPP; + + if (!(sizes & BIT(size))) + return -EINVAL; + + ret = pci_rebar_set_size(dev, resno, size); + if (ret) + return ret; + + pci_iov_resource_set_size(dev, resno, pci_rebar_size_to_bytes(size)); + + return 0; +} +EXPORT_SYMBOL_GPL(pci_iov_vf_bar_set_size); + +/** + * pci_iov_vf_bar_get_sizes - get VF BAR sizes allowing to create up to num_vfs + * @dev: the PCI device + * @resno: the resource number + * @num_vfs: number of VFs + * + * Get the sizes of a VF resizable BAR that can be accommodated within the + * resource that reserves the MMIO space if num_vfs are enabled. + * + * Returns 0 if BAR isn't resizable, otherwise returns a bitmask in format + * defined in the spec (bit 0=1MB, bit 31=128TB). + */ +u32 pci_iov_vf_bar_get_sizes(struct pci_dev *dev, int resno, int num_vfs) +{ + resource_size_t size; + u32 sizes; + int i; + + sizes = pci_rebar_get_possible_sizes(dev, resno); + if (!sizes) + return 0; + + while (sizes > 0) { + i = __fls(sizes); + size = pci_rebar_size_to_bytes(i); + + if (size * num_vfs <= pci_resource_len(dev, resno)) + break; + + sizes &= ~BIT(i); + } + + return sizes; +} +EXPORT_SYMBOL_GPL(pci_iov_vf_bar_get_sizes); diff --git a/include/linux/pci.h b/include/linux/pci.h index 0e8e3fd77e967..c8708f3749757 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2389,6 +2389,8 @@ int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs); int pci_sriov_get_totalvfs(struct pci_dev *dev); int pci_sriov_configure_simple(struct pci_dev *dev, int nr_virtfn); resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno); +int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size); +u32 pci_iov_vf_bar_get_sizes(struct pci_dev *dev, int resno, int num_vfs); void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe); /* Arch may override these (weak) */ @@ -2441,6 +2443,10 @@ static inline int pci_sriov_get_totalvfs(struct pci_dev *dev) #define pci_sriov_configure_simple NULL static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno) { return 0; } +static inline int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size) +{ return -ENODEV; } +static inline u32 pci_iov_vf_bar_get_sizes(struct pci_dev *dev, int resno, int num_vfs) +{ return 0; } static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { } #endif From patchwork Thu Mar 20 11:08:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Micha=C5=82_Winiarski?= X-Patchwork-Id: 14023717 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73A6EC36002 for ; Thu, 20 Mar 2025 11:10:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E092F10E5E9; Thu, 20 Mar 2025 11:10:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="kqmKKOaK"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9526710E5F4; Thu, 20 Mar 2025 11:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742469038; x=1774005038; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=bvVvwt0y5ZU+ZkeloQRdenfa1tfIFKVtQjEFgD/wv3Y=; b=kqmKKOaKxItrjYzoxGAme76p6uCzAt+aAL7Jp33YwcoGXe/SLNthq88D ps0LP/BNqX08/LLsfhhkbtjFZrHBAhUZXlLDhCJhfSUQEWBK4fLAwHmsC 21O49i4oyq3FgUErpYaxYuJeYgdXAcUYxbXPHGvjt4HgL2eLNUiah0xf4 6EiF4Cv5vdW3No8ACMknnWZXLmGq6ECnEcv8Ggy9pbaRbfD58mP4hs00+ QqCt8kVAUX+9imrBvuBC1pE1SBzJjZCSesM9lKZnipymY1VXz5lq/KfBN /f4fdpXliNV5L8BthT4JDcO8sSeAcrzLMuDncsl97VP7UwO0+EI0514+Q g==; X-CSE-ConnectionGUID: XCWRq3e2R22hE2u0ddu51w== X-CSE-MsgGUID: QCIbLBU6RLK+fWCs5VwpAw== X-IronPort-AV: E=McAfee;i="6700,10204,11378"; a="55070954" X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="55070954" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:10:37 -0700 X-CSE-ConnectionGUID: j9q8d2P+SHy6FvZwy4SfvA== X-CSE-MsgGUID: sZuMH+97TYynQecJtD7/Qg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,261,1736841600"; d="scan'208";a="146265891" Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by fmviesa002.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2025 04:10:35 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Thu, 20 Mar 2025 04:10:35 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Thu, 20 Mar 2025 04:10:35 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.43) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Thu, 20 Mar 2025 04:10:34 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oZH3VMsxtz8q54vpOF/Wn43AgX1wju5RRGwDoyaqmt4sEWwjTnb4jDYMThqkiM0+Ov3G08oeAliLlalcks3jRexdaCK6Aj49moMQhiRBlxBZXRlQ+b5tIhUIpNtyHothImD2G9xT5AcbGimKSc7hOp8lukosg56qIqoz7EnKAwl5l5NvYT0Yd6/W+I0jl3KoLt7WAoXnnHl/TjAQTrfb9+A0kjlOYVgi/+o6u5Kb37sjdihv5ANEbSLR7X9bTMzNaelcx/WW0fYNaVz4IIO+jalUHRV0IpjefQSOB6kYrl04SDPNRCmXrrFKhy/qbfXz145MaH3A4WQuFVN/xKiJvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rZAkXwf8MLaO3y2+dBIyKmc26XFB+GjoTCgYEzxxgVE=; b=fSgDcmBHQXxHpsEpedZZiOAJgeXQKdMrCtw8WuH+h2+1U2pKP9eRzV9qYqzvRQD1z8seZT4qFSMzlzjEWZ5wYqnM+BpRnmmXhxjZbr/Z+7/77EGEBs9W40yI9sKnbtsAZwh2EKbkBQZVNdp2EvhJat589d4/9KFBp6TWXoiP8MWVdqrW0dof19ilxhqCSmlxg1FpCw/xCcNhLXqwTvUUurGvdSNCSrA4h/tdypcgPyZPvSaAoIyvIIbOmmVi4ZvSzegaPMxwK0fCJN/GimEATUgeqlt/zl7ism/QNFrGI5l7ttEtOh9gyVcbCRdSokUfvkIpxC2BlxfEuy8UWQOKHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) by SN7PR11MB6875.namprd11.prod.outlook.com (2603:10b6:806:2a6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Thu, 20 Mar 2025 11:10:01 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%7]) with mapi id 15.20.8534.036; Thu, 20 Mar 2025 11:10:01 +0000 From: =?utf-8?q?Micha=C5=82_Winiarski?= To: , , , , "Bjorn Helgaas" , =?utf-8?q?Christian_K=C3=B6nig?= , =?utf-8?q?Krzy?= =?utf-8?q?sztof_Wilczy=C5=84ski?= , =?utf-8?q?Ilpo_J=C3=A4rvi?= =?utf-8?q?nen?= CC: Rodrigo Vivi , Michal Wajdeczko , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matt Roper , =?utf-8?q?Micha=C5=82_Winiarski?= Subject: [PATCH v6 6/6] drm/xe/pf: Set VF LMEM BAR size Date: Thu, 20 Mar 2025 12:08:54 +0100 Message-ID: <20250320110854.3866284-7-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250320110854.3866284-1-michal.winiarski@intel.com> References: <20250320110854.3866284-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR06CA0169.eurprd06.prod.outlook.com (2603:10a6:803:c8::26) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SN7PR11MB6875:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b020934-2e31-4b3a-cf7c-08dd679fc270 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?utf-8?q?VxuU3fCZ/SQi48yOiovlcX+5X1AJJcE?= =?utf-8?q?aDs+i5UzfWh8JOdEfCcySQy4BjrYArzL+yn/grxXORek5eHvyv8+9XihW597HP2sK?= =?utf-8?q?5PTiIIEKRhEq/68OdWXNgsrBXEc8jMC8DYBqBZ5O1DJjC1sYpA1wLYtCjbdSnQoex?= =?utf-8?q?sB01xUGq840CzWBn000SSO1tka/KymiHr7Cyt4VVSME/9/BknM6zDVuYtfBuhlvWi?= =?utf-8?q?i/s0pgxp93MCe7YVtEnymEQgqNUeEZwxu7A8NF8lSurx2ZBPvUHPgCvia7z5BQjw3?= =?utf-8?q?Ls+fZRFm4nzM+NdjjkTJZ4T1ju7OA4lcUcTKDbkGOrVNYv34h7MJbysESRColRDkh?= =?utf-8?q?S08VVPTKm7KeLkNVgfaKuIjOKsAgXG51A9bhaRkf7TciliA1liWiw/RdpK9ed+4dE?= =?utf-8?q?GAXUPxegWJKFSeggkP/2o6EN2gSxztJeaf2IVqPvrBm7Zgvs/Uisg5BZMXSMebZMb?= =?utf-8?q?yv3MZm2tLTcU87Au2RCBb7kKYW6aLqgfdCpWImnnQz+cLxgAQ4/FV3B87AGBhJd3u?= =?utf-8?q?LoFIRP2uZHDkOpp+0gkl9RJTHMUH24yzP39NnTDdHUn8bBc3NdX7UYT4mCElq2U4/?= =?utf-8?q?WFecl3RHvP1N8bxxWJXph87QLDQWIWl1p1U+Ffu9oNldXXnNuzR+gXhFNHH66mKTo?= =?utf-8?q?h+CiZ8LfKHZDiFWTp6aiZepZk9EwKCFo0E1J+m0cfOFgZ55+WHf1beNHSqV0/gx1M?= =?utf-8?q?Mi/kHJlh/07IPXsLoctp2KGf5bmjbiDSc8bLuVhu3k6FKv2xAY2ZAzn2YVwflk6IP?= =?utf-8?q?rmkFSCx/I8LKw/qtE2RGh7AYUrPMpPykk5oY0LkgQ1DvOtp39YZuYyODhh2tgLBeA?= =?utf-8?q?bPBYeAAo7aPw3RLe/3I0eH0RUdrQ0yfAOmv0KZZquW9s1HZLebF5MX9/N654TT59m?= =?utf-8?q?ZHsLkOAx0hdIZaTj8a2ZFys6VwVK0txmC+MnhqEwRizt0Hu8AvKcdWgzfv0M6s8k0?= =?utf-8?q?+dYXV70Kz5ciYzbaX2NTkaoelh+r339pqsEJLOgCvML5xUKLLnaAXx3CkZVIbUmlx?= =?utf-8?q?wqFNYX46/y9l4SI+Sro35si4W5l06CVSXx0/8lXrUB+6HP6RI4mQa2xMT1J0NWQlR?= =?utf-8?q?oZJhCqZail0roLvWlokvbdReW1OZwPHa/V/eXM+6CTXnJ/mYKWGfPIr9UaXk9ZrVi?= =?utf-8?q?Ec3NG9H6HWAhrwdNgoMu3bIpnbkmp3ygHd9gqgYxLMtvBmkT3JnBUxfq+iGB6AoY2?= =?utf-8?q?LcVWqjOapIi9fz1j2q5iVNpO35Yg+gTAx7dUxI8aEuvaO4aCEv+ZWv6Pc+kvlno83?= =?utf-8?q?QeXIk6Ace9aYIQLBNgMovRT4MENguVmeXdca6korVqfBCfF12Xyi3q3LCF6HTVZ+W?= =?utf-8?q?9zpUdSnMoQx8?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5373.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(1800799024)(366016); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?T7V7nTw9xa9WpYY6f28AqkYRx+nE?= =?utf-8?q?gucPFluwxKIlET8ep931cLpsQqjXdRuMsRWUTMbN77GbTvN4ZFrQON9gq0b1UgPMZ?= =?utf-8?q?1qeoCrDe3esO8bgcye7zgaHCuT1AZDQlYLdmJMbvruJxP8XHS/Skz0LwleaY0FLfj?= =?utf-8?q?GF2HiI2CDHexFQYfgAnVSC6u9J7ZAC8QkptqpLro7KMO87c2m2mnklNmkJ6kpCICi?= =?utf-8?q?prkC8FkGpA3NJf7D4Tqsycg/LfYEI6H/S37juNSp42tsWQLWSta1AHooM4SRGWjWN?= =?utf-8?q?VR+lUUBEKP4tDergp6ZdQCJuaLR9n7WsdqmoXVbHWmOreOEIKGbe3VH2hXyAb2S+z?= =?utf-8?q?PlC8faxe+NtiWFUu1xqxpi0lVxZpvK9b6wj2pRdSeT5afE0+DzGDNAJgDD5qk6GA/?= =?utf-8?q?8n5o4OG0szzHHEEAzYcHxMUDiHa7K9imjxHhWtKI4PQFVuOuFRAe0ifAI+9rUFBVB?= =?utf-8?q?oAoj0viK9mfLKldpWFLRaK+UH6ZB1M+B2euXufmSKBMOgchPwdSp9nS8u0IkDS5MY?= =?utf-8?q?7WvBLIQo+UfrlDDN63LJgaEF+sKvFy+oyQIwA339tjQm2MHt69xVE45LoIGeNRp4U?= =?utf-8?q?O1biZPY1bkenbWKx63/8yksnw9hrZnZRKzRg34HPMooFbvSVGkPREh7apsGUZ7WFg?= =?utf-8?q?Atz8zGaD9VsOFBVqTTAt+J5+b/mMdpS7ouOxhHtNaQ8Vet4h+DoaGcLDrxtXnfGis?= =?utf-8?q?gglcwCPxuruNPfg4TYPWZxPegpO2WX7fjzoKb7W3WQY1w/+zi8oUchl+7gZenUB5E?= =?utf-8?q?7IArzZB7HN8CeV31Bbh9fOrJVAQUATezLq/uKcw45a1RXFzw775fGVtpyxOsAUN8K?= =?utf-8?q?i5RMJQ8XPbH6iNZOcyqYeloSFiVLOLhQGCQDh+9zjqlEbpWvxiRvGtx4tKAn1VcEA?= =?utf-8?q?hu9xdEl46Ryj/UXEkd/DqE9v0Hzekq2kjfbbHg+0EojWarKdTllfrx3o15rz0SG2v?= =?utf-8?q?kc5D1RbBLAB4edDHerREySiVaDc3hO34YKNtC3G4lfrcHc1WdSW0iR8LnIajIQhtK?= =?utf-8?q?1P7Us9a6KIWqX0jrwLZO4lvIHc0sI1JHR0ozFbVLlCHlqhGxhMaB+N5eMiOcNkner?= =?utf-8?q?UGMXxjcOfxb2v7LP/ZboKCEBaaiJlMiou8tPcVclwMFTI7LMNRIWUNgeRYtrcNUS6?= =?utf-8?q?e30yiaGmynZb6ha9xJg/6pPjK6VNsu8tyDrZdoXMTcnbKqgW/1AZezv7GtlwhYeVR?= =?utf-8?q?2dX3GQfTvOqzxVsi3WlIbSGRqyAeZnXiJRbc7jRApA/EoU6bJ8Aas9JJkksR5NBXQ?= =?utf-8?q?rlbKz8HluMvr0NcJZr7l7009E8qy5RD8fDpoLGJJmB7XDPJkznUquBakMz9Ef1B+M?= =?utf-8?q?0eCgy1Y7O4sArO1kIm0L/sXymPnvpX+48sk8X4N/k/ofbDWk4UWKawGIpURAAuxyi?= =?utf-8?q?tNh8Z/2s2TKavOWF6XjgW93Op+AhfvFZnkJ9F+gBxvL/9QzgSxMPgsOX4E6lTBTZT?= =?utf-8?q?2hcCcW+KMbE70j1BRlCl97X2eZX8TtEobhPrZLw38j5sPFJUIA2TSbxcCPnTuM9FI?= =?utf-8?q?fIWSwrSxJn3afMJTSYIwo8Dt2vc0lTwziw=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 1b020934-2e31-4b3a-cf7c-08dd679fc270 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2025 11:10:01.7382 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: o3b0HK9H7r9wff6fPo4bXVREXcCB53gVFDRkm3lZ+mWWm4eojndsxzcwjdqMJgmbq2ptMPL4MzZMpt1Evh5sNWwI8ykU4M3gdz+bJadHZ4k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB6875 X-OriginatorOrg: intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" LMEM is partitioned between multiple VFs and we expect that the more VFs we have, the less LMEM is assigned to each VF. This means that we can achieve full LMEM BAR access without the need to attempt full VF LMEM BAR resize via pci_resize_resource(). Always set the largest possible BAR size that allows to fit the number of enabled VFs. Signed-off-by: Michał Winiarski Reviewed-by: Ilpo Järvinen --- drivers/gpu/drm/xe/regs/xe_bars.h | 1 + drivers/gpu/drm/xe/xe_pci_sriov.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/drivers/gpu/drm/xe/regs/xe_bars.h b/drivers/gpu/drm/xe/regs/xe_bars.h index ce05b6ae832f1..880140d6ccdca 100644 --- a/drivers/gpu/drm/xe/regs/xe_bars.h +++ b/drivers/gpu/drm/xe/regs/xe_bars.h @@ -7,5 +7,6 @@ #define GTTMMADR_BAR 0 /* MMIO + GTT */ #define LMEM_BAR 2 /* VRAM */ +#define VF_LMEM_BAR 9 /* VF VRAM */ #endif diff --git a/drivers/gpu/drm/xe/xe_pci_sriov.c b/drivers/gpu/drm/xe/xe_pci_sriov.c index aaceee748287e..57cdeb41ef1d9 100644 --- a/drivers/gpu/drm/xe/xe_pci_sriov.c +++ b/drivers/gpu/drm/xe/xe_pci_sriov.c @@ -3,6 +3,10 @@ * Copyright © 2023-2024 Intel Corporation */ +#include +#include + +#include "regs/xe_bars.h" #include "xe_assert.h" #include "xe_device.h" #include "xe_gt_sriov_pf_config.h" @@ -62,6 +66,18 @@ static void pf_reset_vfs(struct xe_device *xe, unsigned int num_vfs) xe_gt_sriov_pf_control_trigger_flr(gt, n); } +static int resize_vf_vram_bar(struct xe_device *xe, int num_vfs) +{ + struct pci_dev *pdev = to_pci_dev(xe->drm.dev); + u32 sizes; + + sizes = pci_iov_vf_bar_get_sizes(pdev, VF_LMEM_BAR, num_vfs); + if (!sizes) + return 0; + + return pci_iov_vf_bar_set_size(pdev, VF_LMEM_BAR, __fls(sizes)); +} + static int pf_enable_vfs(struct xe_device *xe, int num_vfs) { struct pci_dev *pdev = to_pci_dev(xe->drm.dev); @@ -88,6 +104,12 @@ static int pf_enable_vfs(struct xe_device *xe, int num_vfs) if (err < 0) goto failed; + if (IS_DGFX(xe)) { + err = resize_vf_vram_bar(xe, num_vfs); + if (err) + xe_sriov_info(xe, "Failed to set VF LMEM BAR size: %d\n", err); + } + err = pci_enable_sriov(pdev, num_vfs); if (err < 0) goto failed;