From patchwork Wed Apr 2 14:11:17 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: 14036094 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 7DA9AC28B20 for ; Wed, 2 Apr 2025 14:12:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3B36710E7DF; Wed, 2 Apr 2025 14:12:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="oDl5BP41"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1255F10E7D5; Wed, 2 Apr 2025 14:12:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743603125; x=1775139125; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=uaLN4nN20No4hlqhR8aptXwXK/u+iL2XHrALmgQZwS0=; b=oDl5BP41gbseldogLl/T2h8Mj28RsuORY0cuSSyRKbLMDe3D66JCsQrE ERPg6d5TynWc7cDhM/aJLjP2j/pEEBxjEgAuvG6LaqMQYA/z6ayIJLlP3 V9P/811NRQhrLwbKIBglpBb3JuxuaOD+6WR0QHQxdD4HD8RnI01aCqHZv lH10F/XTNDOQXYtfUuaQE7fA8uvHyfWf10y08c3+22qmMAXogbTqElOoo 5dglSH4uaw5v9tEEZSVxg/DUnS5m3op1repjG/hURdgKps323LdpuqCBT 1UfAGPg5oihERi+lrwcGxrnehO8dxBp1e71hRtjB1LEF/YRoz7hUChy4/ Q==; X-CSE-ConnectionGUID: wR9gkG20Tf+BqyEEO9O15A== X-CSE-MsgGUID: iUEbcnvpQDuzJddPX+ZZ4g== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="44677119" X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="44677119" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:04 -0700 X-CSE-ConnectionGUID: K65Rh4/nTGykMFe544unRg== X-CSE-MsgGUID: EQYVioqSQNGWD7KUbDm9lg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="127620412" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa008.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 02 Apr 2025 07:12:03 -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; Wed, 2 Apr 2025 07:12:02 -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; Wed, 2 Apr 2025 07:12:02 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) 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; Wed, 2 Apr 2025 07:12:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tXepFsafiueFt7PGwcuGDFmYoLjQux3ufss4IhlDP4yyRNHfjJAK4dzgFvwg1MnoCk5KUZEXk1xF0oIwXxccvaPIsesGYKPfjrbji3t/Eoxo9jwBaGf0dVf2DIIrknSuG3Q1DXuxe+XtTICnvicWyB3fMcLNC22c+8Kmtd4XGfNHp//osrJsPiqkQoemSfW7hlmHxf6ZBg4LcWD0f38mH77hPyYcUKpbrCL9SkwwAGubNv4aKC22n2brPGiTtVf+HH0DHpqedmVMLEyC2C+SsAGzrIFB5LyQMU8VAdd108UFgtgpWqUVQMsdTgk1kbmjRaR9eDvR5/n37+QgLOG7+w== 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=fsKKFgSfS7ckipDxTfJ2D+IUjygo2mbu6zEOktC19AI=; b=ZewczICKeERUubQFqRyyCpssyW1Q+77Dq5HjdiPqxtWApmMleIHQrLllGBs/pUO7ANEw8n2TLnJZRI9nJv7CX8AzWfRjK3ddrCxzMaAwDYR1ixF4sLGTbmTprpoGbf3BWuRJwwreB6ufmxPZFNhWruSwX78QErAeMT/eJyqMYoq8dgq8gTrZUUxBoY7H9VUJfDnNXPP4O++UXl1+Tp1dpFr2yaII7SsoR781mJ1XJmx4gKFrguMO4e+Tngk1e4XbflRqp0UtZCvyOCQ2tes3OWU9YpjPNkBncSaomdgfthPzMtv4lw9+XmuLyHQRDEY20jBEI8ZS0KnDv8VVIXMZqQ== 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 SJ0PR11MB5213.namprd11.prod.outlook.com (2603:10b6:a03:2da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.48; Wed, 2 Apr 2025 14:11:37 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%4]) with mapi id 15.20.8583.041; Wed, 2 Apr 2025 14:11:37 +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 v7 1/6] PCI/IOV: Restore VF resizable BAR state after reset Date: Wed, 2 Apr 2025 16:11:17 +0200 Message-ID: <20250402141122.2818478-2-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402141122.2818478-1-michal.winiarski@intel.com> References: <20250402141122.2818478-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR09CA0154.eurprd09.prod.outlook.com (2603:10a6:803:12c::38) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SJ0PR11MB5213:EE_ X-MS-Office365-Filtering-Correlation-Id: 99cab7dc-89ae-4bbe-84ff-08dd71f047e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?NqdBdttoY+qwbOR7seyJruKmnGGYnSX?= =?utf-8?q?xA9ZVtqRWW6a4wf/oWp6SQwkOI5hf4vy04Axr8L6Hce05w2mAdn/7dHoP7t5kIu3Z?= =?utf-8?q?aYXec99PEYEFpBgDklssW7Ktg2uO/s5MVCXDWgOJdRNo53KeUY3o3Kad/DvFccE8j?= =?utf-8?q?YRU3BxCQeD6WZhQYEALxm1mMH2Tgy8ZS5Dox5doGd2uOanWLF8V3m3SxmMdmtjiqd?= =?utf-8?q?rgSOmd5nNmfZoh2XtWA05EvuONdqSdtcdl+egXyaWKsWdyseP1I/SFVy5sfPAEKpn?= =?utf-8?q?zNUROli++QJmKOEDx+WE/rzvOzDKWHTW1lqCbMQeW+fbD/XNeKyC6wM3EmyUfRWIt?= =?utf-8?q?XGL4m6ARL3QBjQtryV4YaexcbDECydwYjeXqnSy04YWFqhSxadrZGqXmHvy0OepCX?= =?utf-8?q?X5KCCC6kiCgp/KpEjeSbfyfDR/pD6TU6aH/l0w3caFmnfsh6qiylpfcKqelogh5CW?= =?utf-8?q?Nmz1pdj2O7JldTYOIqeh2g8rGVRHwme8l9QPIZNR9BlrAS1TqX4Wb3UE1P5GRQJph?= =?utf-8?q?hvAtvQddoYv4+ZD/9B5RPNhZ/MvIgBg0LFImwX86Lfr/Hpom8Ec609Vo7dqRppNQf?= =?utf-8?q?ily+qQl/SwKQset5rU11GZ2ip4fM3qQkAjBK9QQQ59zKDr3CaGaBVw/tTDccJbncv?= =?utf-8?q?35mjwyO2X50mKnrV8wWtqk9bsaZccJ3lM709vzBZWgBRYq+ngSnntP73lU333n0BZ?= =?utf-8?q?CO04a3aFBi2tRELnUZyQHjvS9c+D1hR1bTkCCm2tDSTKUMlzhFHlAkWtxrX9Z49b2?= =?utf-8?q?kz36sE+COnP6F0jYcvKw0mkzXO5sl/VWPSFexPnMPsuVAyJHCk640ipMlZcuRp5bv?= =?utf-8?q?FNxRzCeECFfYNtwXWIiRsTsbwmzNBGUFyY/QDiBjnNH2jQ5ykbL2QvxqDRuCvmtx+?= =?utf-8?q?XQ9splBcl/eZFwYsVp3nBZH4qaU4pNx3OcXOh+SZJ+aIfMagfhmUboz/uITUk99Rg?= =?utf-8?q?vo2Jcq6nHez2HxtPT9N7MiiD5CaUiNxuipUjM17Ttnnp7EdDFDPaDH8sWkCqGwsKQ?= =?utf-8?q?mjEhfp2MsLp16VlYNtU1dTwYhz4e6wDI78QvRrycCKlPJEkn/BUOnBiwrDPZqu/QM?= =?utf-8?q?soZHd8fksN6SskdgIiDQ35ipb82negiXvwaHYUQbbNC9vSl6GnXnfX2AejQavSeRi?= =?utf-8?q?1n1r51TngPJS906Ss2WbgeO+5Jtbh5wXBzJRPedOPxIMOVYxu4uCsR7M4stOGygrn?= =?utf-8?q?1PHToRVCXmSPRw9YfFN3vRrl7TJAIG6sUiIn8kIvwfwmiXKgBQ7jrmKdXif8icJB6?= =?utf-8?q?lBQh/BBwbbWgwck+ViHUgmpE0XI3Gm1IiN/JX8H1lhD+scRwdEobr1nKTyPw5+lX8?= =?utf-8?q?zdO79m5JKFAP?= 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)(7416014)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jKf2NnewTfCttqREyhKuywRY0Y95?= =?utf-8?q?piNrhrbPAj23nnyh4wf3XxroLw+kE/RgtismnWEEN6bFeWIprZtvdT+FHSbRVS2yI?= =?utf-8?q?3R1RBfZdexIGRav6bHpwlMXRsNPhimtqkKa9wgW4Da1BGTAEPUFJYwbl5nh7e5Haw?= =?utf-8?q?0cphMnNux+RWphr+pfrxM+zNrhTB6LcciWXxJwyxoTCq2YafyrsnSHme0g5IRFJ3x?= =?utf-8?q?MUGjRr05hjrW8BoWsLkh6xjtL1mLVOSV6ANkRVEmP54oTthWwxi0MoDJRZ3TOKl7O?= =?utf-8?q?ryN6wOJsf15EBPIKvEJTsknjD2HNaAmzvNxQy27LiOXoqNd/o7U8kJJBYcAtnceP1?= =?utf-8?q?InbkUiTu6nwVicK2rucDTEgFelbNY2gkO/KoKXTMh2scrUxUzf/mOvLx6AcJ8spUh?= =?utf-8?q?pXn3zH6WYxZcoXRmwUaEADIvCs1/VD0NwQFggKWzdbuozoItbpzDyvs2UvoGq+7c2?= =?utf-8?q?fuQJCuaYsLCC2HJKdvuY+JOXfzhfpNQ/38WcRDd38/4+8tJK0FiQ3aimXyyytDkpu?= =?utf-8?q?YCfFw2KafCjz/pc6V5IdiUAmrVq/UAOoF/ebc0Se/Jd+fRblApfUiMWsgykppHyV9?= =?utf-8?q?27qjErD2U5mmFtpaURffZ2iYGeEI49n/ZoviRcopZIpYIevdFjG8gl9PvdtU8aowS?= =?utf-8?q?7vrBkxQ5++EG0oFDg/Sau1UKRGLZ87MDwlmYovou5ZnFQjCj8PGR8XKFFatAVFVEF?= =?utf-8?q?dV3EX+9LxBDLDtQZcs4Yi6K/EI+JniirU6OFmsaGvZICUJZPHL0xKAhiIw/echh3c?= =?utf-8?q?0kBm2bfbuAHPG2/Z9Yr2rbAq4ZKAHoKW0o2BUu6411iVnnIJNcctj3Cr7QzQ/6Amj?= =?utf-8?q?U+oWvj5zZVcAmdSmBLcvOXz3fZcvj6JrUieUAkuEf9KBMkF9qiV+dWFnCJvmS1w+2?= =?utf-8?q?hDL+/Jdr9Re8CWnj+w/Y3wjLC8RZ474och1R7qvuJYTDy8U77aFOQpiNAvKM9Sa00?= =?utf-8?q?G1SHFOzFFvcvEd4y5N9IZcqinncfvit9TSfNCnJDL4u30sZ7lBvGFe2B3LYL1Dlgk?= =?utf-8?q?OanJsoHQeVovbqT7aTIm78eDMVf80whPo191zOdLRdoQw3Wp7M08r48aJo0AeR3pW?= =?utf-8?q?TtFkFS5TlkY3F5ZnduIBdCxelvUp8chioIUyxEhjjO51lEdGkURL0mo8PlhrgH9RC?= =?utf-8?q?iGnt+AkrFEVMEWLIPsWRzFM7yP52dOZMWgq+79rHfUgohL2nt2YA3GXeBXMNu7EEP?= =?utf-8?q?CGzeY5iy5PbFHBfklGfSGFgApi2+QKQgWkpS38wMA/dim/eC9Ojn4ffavvg0BE1lV?= =?utf-8?q?Hu6NizYvAAeSDqLl0dAYqt7aj0EL7WMEdMZeK9haD+UqjjkN/048CpFzYDU3/LWet?= =?utf-8?q?jKhm7SC12NDghngaGsxwPz/lB1NJ3KjkV4X3evtkKYauwbriBvDv5IEe3ue20cEah?= =?utf-8?q?GNFe9B1WrylVuN695oE5FJ9j7wrk0cZcnFTJy9XGMn+7Lg4RLiWbX67MkO4Yf4HHh?= =?utf-8?q?9WjKP4rD+W1eYZ1poAU2pLfc1mcDTtqGKK+qpFi1C5ykkWg9cMjaUSF3efJFpvB5Y?= =?utf-8?q?EzuEBxhzNDl4U4BxK+LO32drHc1NMqx2Ig=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 99cab7dc-89ae-4bbe-84ff-08dd71f047e6 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2025 14:11:37.1364 (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: BcSmQ8YV3/6TVd6dcMzqkD4luMXq7PoGpEbhdfbzGkzSwHpwapIlNHt+esER5drVwGeJ7QaioNpZaStjEbhaN3SbOnUzFAcZcw8sfAdntOU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5213 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. The capability layout is the same as PCI_EXT_CAP_ID_REBAR. Add the capability ID and restore it as a part of IOV state. See PCIe r6.2, sec 7.8.7. Signed-off-by: Michał Winiarski Reviewed-by: Ilpo Järvinen Reviewed-by: Christian König --- drivers/pci/iov.c | 30 +++++++++++++++++++++++++++++- drivers/pci/pci.h | 1 + include/uapi/linux/pci_regs.h | 9 +++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 10693b5d7eb66..8bdc0829f847b 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 @@ -850,6 +851,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); @@ -888,6 +890,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_VF_REBAR_CTRL, &ctrl); + nbars = FIELD_GET(PCI_VF_REBAR_CTRL_NBAR_MASK, ctrl); + + for (i = 0; i < nbars; i++, pos += 8) { + int bar_idx, size; + + pci_read_config_dword(dev, pos + PCI_VF_REBAR_CTRL, &ctrl); + bar_idx = FIELD_GET(PCI_VF_REBAR_CTRL_BAR_IDX, ctrl); + size = pci_rebar_bytes_to_size(dev->sriov->barsz[bar_idx]); + ctrl &= ~PCI_VF_REBAR_CTRL_BAR_SIZE; + ctrl |= FIELD_PREP(PCI_VF_REBAR_CTRL_BAR_SIZE, size); + pci_write_config_dword(dev, pos + PCI_VF_REBAR_CTRL, ctrl); + } +} + static void sriov_restore_state(struct pci_dev *dev) { int i; @@ -1047,8 +1073,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..b2d5f3ac79ae9 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 */ @@ -1140,6 +1141,14 @@ #define PCI_DVSEC_HEADER2 0x8 /* Designated Vendor-Specific Header2 */ #define PCI_DVSEC_HEADER2_ID(x) ((x) & 0xffff) +/* VF Resizable BARs, same layout as PCI_REBAR */ +#define PCI_VF_REBAR_CAP PCI_REBAR_CAP +#define PCI_VF_REBAR_CAP_SIZES PCI_REBAR_CAP_SIZES +#define PCI_VF_REBAR_CTRL PCI_REBAR_CTRL +#define PCI_VF_REBAR_CTRL_BAR_IDX PCI_REBAR_CTRL_BAR_IDX +#define PCI_VF_REBAR_CTRL_NBAR_MASK PCI_REBAR_CTRL_NBAR_MASK +#define PCI_VF_REBAR_CTRL_BAR_SIZE PCI_REBAR_CTRL_BAR_SIZE + /* Data Link Feature */ #define PCI_DLF_CAP 0x04 /* Capabilities Register */ #define PCI_DLF_EXCHANGE_ENABLE 0x80000000 /* Data Link Feature Exchange Enable */ From patchwork Wed Apr 2 14:11:18 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: 14036095 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 6D56AC3601A for ; Wed, 2 Apr 2025 14:12:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F23910E7E1; Wed, 2 Apr 2025 14:12:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="fwV5zfUI"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1980610E7DA; Wed, 2 Apr 2025 14:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743603126; x=1775139126; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=Nv+UfiYi334Vj2bEklwc7omGZtO8waKDPtZmnD/hEhw=; b=fwV5zfUIoEd+CanWiz+AUu5/kQVbYWn9qK2SAVKA4w2cvD48h/ytO7Ha yNLYOLZqSVtElRpAbwaQIwXs9ar/jflykL9pTLUUbCiLuCnMFklAm2MCO mjuF+PBHWOy2Ls5HYDp2waNI3gdgoBuHKMUMvxUKBMgGQddSCiozVse8y 2qzoIEwcvODvhqNoWkw/vTSoj5Qf3zgSPXeLrgw4iisS0U9bPYA6Lurt9 UMXft2FFuNzvee7KeFKv+sF0X/3YEgJG/bwvp3TgyQXVaMe1j6Xg8E1mj aeXPa85202aa5AXt0BwMgQWTJ4aCV6wE8toauDmTEtMIc/u1zhMUiO2ZH w==; X-CSE-ConnectionGUID: T4ci6P9pRBeCfQK9XUxUpA== X-CSE-MsgGUID: v67HtnL7Q2urE2fIvl/jmw== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="44677139" X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="44677139" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:04 -0700 X-CSE-ConnectionGUID: O86ujsA0SFiARd9S4Ltt1g== X-CSE-MsgGUID: dzmy1acqSq2IXw8IUVwb8w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="127620415" Received: from orsmsx903.amr.corp.intel.com ([10.22.229.25]) by orviesa008.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:04 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 2 Apr 2025 07:12:03 -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; Wed, 2 Apr 2025 07:12:03 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) 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; Wed, 2 Apr 2025 07:12:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HMZMj2zneIZoT+t4ZDXQj7HXhkgCG/dTWl1e1O6ZEKDXI5H3HqeHmzc6tb0sqrOL4UAlHBbq+G+XKAIHaPMCD7SMD8IhmitfgbDQe96KJGyIpJvs6NUy2Atzuc9/1kVwDR5yts7i82VCUhe5HhiqraqriXC2XOoXu0ipqjQZ7FTvninzf5jRrgZMjI5VfXm1ZY0DVyNp9FA1MLrjx4YzIFV23bKdAFnPhdaNOxwhElrao7SkJy8uxQvWj35138A6B5ZTSE2X3BZx4slbQWErpD+ITqfSUEof3zitJYgqnSkfM2B0JGwJ3TXqQ6WzruK3sijO9T7YDcGG+D7/HqRjjQ== 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=dfGxvsJ/e+JrR6SZ0zItm7bxN5WZZg32/gGWH4KsMAQ=; b=B1WM+pQglIB+jmE1VrACL7tW2i+fwcL+P8xElwUUejLz67xP7cfQKZDu2DpWXO6mzdxlB5T/Ms656BKzlc778U1au30gVf5qICsX2Stu5QaFXgk8YS+5gAZGfOob5NpORlA1fHg0JfdF/43PYZsSPtstTMt6jPECy17Ys6HaAzwklfXuxLwQYtKJ9/lzc8S6KxEI8PQz+w4DVxF1g1vs6MPslAvnOC5nE3/IEiVLe4YXs/eYruzYJCevM1nff+Lcm/wlOAEVHkEQwkNZ0uJ3PcLnD8RPj8G1vIvoxn9xqmOTjIViNqd+EqX5r2/YbfogoGhV1W4PkVxdYW3w1vV/3A== 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 SJ0PR11MB5213.namprd11.prod.outlook.com (2603:10b6:a03:2da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.48; Wed, 2 Apr 2025 14:11: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%4]) with mapi id 15.20.8583.041; Wed, 2 Apr 2025 14:11: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 v7 2/6] PCI: Add a helper to convert between VF BAR number and IOV resource Date: Wed, 2 Apr 2025 16:11:18 +0200 Message-ID: <20250402141122.2818478-3-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402141122.2818478-1-michal.winiarski@intel.com> References: <20250402141122.2818478-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR09CA0135.eurprd09.prod.outlook.com (2603:10a6:803:12c::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_|SJ0PR11MB5213:EE_ X-MS-Office365-Filtering-Correlation-Id: 53c8a69d-f97d-4f38-820e-08dd71f04bac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?UqrUtlcWbU7HppZZOOLmp1DyYD4fa35?= =?utf-8?q?d6PI+dkSc60SYv+C7Pa5xfa95iIAlCcXUGFZDvID2pZcys6Ovo6gjEXlajDUFPQ7H?= =?utf-8?q?9l5FwQbXEiSyapnYcptaiBqpzoXAT7A/leMP39rsPukX8IDfdPh76UNb+Luk7Ygn+?= =?utf-8?q?LHCK/DxnjIRttARmQQRD2f3ZE+9+S10rZuO3hhAAL+WZ+GfFsVTFRwT5Xxpt5E5s0?= =?utf-8?q?Hp4cBKVR7N7lOaaP7fftc3HQK8NvxhYGmeB8RqoDWEaC4GcTSnFmCJz2MgXyOGO+p?= =?utf-8?q?RlUm7AtN9EhWGkD8xOBZDymPTCYON73UiLqpURp2tIdqpPfNiv5XVTu+9Iutt0MvT?= =?utf-8?q?ellMkZI5FWJ2j6ET+C8lVDoFHjflpeVKWBXZi5NFMXxe5EcooTnmygxv2OZHhFYEY?= =?utf-8?q?Qj4homhqKyK+W+1k2KOMnotQRXbjTvi9qopf49lFFwb9G6qpwEP24NCH/bel0ab84?= =?utf-8?q?fPH1JGLF/aoyy+1C8s5tDvj40GwDd/595vrQkhzmoU7L8kjGEIFvQnLVFQat1OMJ7?= =?utf-8?q?tNi7Rm5PHo6TjOBvZirEvuxIz2KNM9/46EkFOypNc7y7UQDekLSAEw0Z2TrQ26NaP?= =?utf-8?q?q0C6Nfl35AsaQNT6k6D20dsHSjHGMMoOfOH8Um6cC+o70DCOMjR3j64qqm1Z91r5l?= =?utf-8?q?4xPxe4FjeAGGi1aY4SJcHawBd8g4u/jIsqFQFhqBBikc415ASRDgaTcfc/hGb0nRA?= =?utf-8?q?HxgUU6FTSV9iD7e1o884Oeulo/SqiIijYEVZrXdl8LjtG0GSrvtvdvj+7HEWx+ueV?= =?utf-8?q?i6s7e8ZPcV1EfihYrw4j3vtFtrn49sDDZInGXzHdb0ApI0Xiw4sbJ+Inl/us21iyJ?= =?utf-8?q?+ogYfsza+VRHTKZAXlMyrxnt0NeDu2vNfCExAHIKndGX7CghVBjJ49b1gS1OUZQzd?= =?utf-8?q?WfYZuCAL0AL1Li+o1CJv9v9WGKzIKW3s+ShSwMGZhfm2eBZiiB7bxALGNd8yyKRNj?= =?utf-8?q?wTwLG9qRn+0S5EbXJFCo/gcyL1KhJEIWUK5Y+x99mawuH4kqh7qKUM1BLXzkHV3uv?= =?utf-8?q?PjrG3VSJJrM/T+7BbqALpWzpgGLDoJo5XrdYgf6ZQcxhE8OrxQwvs/hGaR5mlk3U/?= =?utf-8?q?WpjLlvoXReQ3tspGFGCWZ/SxkYxWn8B/yTMDrP4ai/C7EbPIM9ceVoX6DZ88goQYz?= =?utf-8?q?QApr0BmaaBD4m09bHF/PLIikkSKjaokbn206WvIIYxtIkPPqv8iLs/OGT0Y8wX18L?= =?utf-8?q?FzaSm7sZkH4zpOY9SULiwl/yxP0IvRgMkecS7H6gwoGSLPO9v8U23Q2AHRC6MLJZp?= =?utf-8?q?T3e5UpbXNOEhGAtQ2es8dyssF/RKO23w1IHGghBMoO9zQsusc7lVtX29jcyooxs7t?= =?utf-8?q?L49RiGcOI6lY?= 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)(7416014)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ElzcDt2ryLc2xPkCvrwGFKQDInkV?= =?utf-8?q?7DKd/fGLTDWsLRCHOZJaRtgObAbWQUVyloOhqpNPINdh+TSa6mJ3DpU3nbvljVoKf?= =?utf-8?q?H0uVL+wDfsFexObjErKCl9JTpeKySHMgAToLkgAaLwxqIr/HKa8x6XW6/PjHQ9eW5?= =?utf-8?q?Fn9vCFVXoR6NEqTZV+BM+w9L8nZ8lZfAVjNM28xUINvadNZIfxDYj/fNpdYFtWR2O?= =?utf-8?q?igPrTEYI63c0rRmOuFNH+d66PBI/fA2pYegqnQLtUPL+S4VQS0sIyjsq4JuiqMTpn?= =?utf-8?q?GCxs+8kcdBP5+sOrgjsbyeF12B4w9Rn7v59w092xgYVhl1NaRSdirL3elZPpIeyH8?= =?utf-8?q?Hz+STEUZSWhG7ynzebYTYXs6/iPh/iR8hLlPLMu/iKN3SJtamtFAUDpbT+DY5jmuu?= =?utf-8?q?sTmA9LzReJYHVe5koLCCukgWdAqzLt6MN6XS7u6ynaBo00YIuR3VRSCG3m1JXBmx8?= =?utf-8?q?4WVzuS5cPCkcfUqbvz8ktkAr8xT3d5Xth5G2TxsSTg0oOlr6SbbpwKUAkAHa+cU/z?= =?utf-8?q?AUuKFxi0bE+tgQ2N9sCE8Q/jQvUau1Qsjnd8PwTSOGkA0VIX5rs1WOItG2qtmGAlA?= =?utf-8?q?u6HnRapSfxreSHDITBgwRMJgCgpHJklMaygO4kir8k7YyWj8s+nEfYy8hLmcPKFOB?= =?utf-8?q?/NNzXpKWOLPB6AKUbNW9qNsEcXp33VG56wR5dbtDdbhrDO24Ntj1YLRq3rbukoG6I?= =?utf-8?q?DRdyiVJRxRnihThUwnRHX+sAlzJWIVethRFnxhDQ4xqnxXDVAmKCota821ikgLpXa?= =?utf-8?q?MvYZkOsyV1f5ln8gZw9hewD/dlCZT+KMEv9SBXiETItO18FOA3tbIs7B5VkfNXI6G?= =?utf-8?q?Hms9vk55UOmTPr1aKUb95VRpfvKDBpKv0LIpaVj8ThPIUVVtRGhSdcrP0tqn2KU6H?= =?utf-8?q?bvHjG58Od4Q1PKxxHWo/QtJ3H1Nz1B78pJh3lRPNczeLG5LosIa7BonD3h+vySUoU?= =?utf-8?q?HD68Inq6PNAG4LjHcDnuXbergWRr4Jw3dBYAqOcjef9v/hoSEO4vPPDnQOMIB4bzT?= =?utf-8?q?dqtKOgZaJTHzRV3tvipMGt67KyQl8F4IRgEC5tkdDiLgWBulwnBNLGFcgJj1PkaNT?= =?utf-8?q?pc8BUwoG5G447Zd01fne2od9G6kkE8CnqiJygMM+Mom38b07Y+6MDVC9Zy9720UFU?= =?utf-8?q?EkZwkPIyFVV955PL7fKZ8OKEqBqTYe2g+v9eKFsnmzY3NN+TjPRANjMslfx0eTMdu?= =?utf-8?q?RiKcgAOCef12bZUx2VtDquRvHNIbpc0qpS3fTPl25ajbMIQzoHXXcUS7M2wXDCYHH?= =?utf-8?q?RX9iJBvCvmbzIQcyGqq2ZtWT0pSIYhqmnKepHHycl5ah99sS44o+dUYHYvEjv2eNG?= =?utf-8?q?o3nMV973YR/SxamUgZ9v82Nj4YpYoigY0aCRj+co9brNbV09x1uuq55x8xlA0k+O4?= =?utf-8?q?PQm5IUsfwpTPc5dq8Og52iaygwE+mbs/JT3uQE7C7fKaYgXhi2x8czzqgJSuWfWyc?= =?utf-8?q?L2484pLzutlybnSpSNh65x5BpJRGKuUBPChTJiuvkr63v4cT5/B2K56kJnFXFgnfL?= =?utf-8?q?AFmgKuygwksnd/5mT7B2n7UFsq5PAwD5UA=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 53c8a69d-f97d-4f38-820e-08dd71f04bac X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2025 14:11:43.4179 (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: lS6gXxDbDo3onBE/Pbb/HeFbJUjgcyrRI8D4sO8rtNJEaEiXQqmHPyL+yWvLaILiLQ3YCh7jOqTpjoDi0v5iaYMsg3NSvRoCPy2rmoK7JFI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5213 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 Reviewed-by: Ilpo Järvinen --- drivers/pci/iov.c | 26 ++++++++++++++++---------- drivers/pci/pci.h | 19 +++++++++++++++++++ drivers/pci/setup-bus.c | 3 ++- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 8bdc0829f847b..3d5da055c3dc1 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) @@ -342,12 +342,14 @@ 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]; + int idx = pci_resource_num_from_vf_bar(i); + + res = &dev->resource[idx]; 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, idx); resource_set_range(&virtfn->resource[i], res->start + size * id, size); rc = request_resource(res, &virtfn->resource[i]); @@ -644,8 +646,10 @@ 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]; + int idx = pci_resource_num_from_vf_bar(i); + + bars |= (1 << idx); + res = &dev->resource[idx]; if (res->parent) nres++; } @@ -811,8 +815,10 @@ 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); + int idx = pci_resource_num_from_vf_bar(i); + + res = &dev->resource[idx]; + res_name = pci_resource_name(dev, idx); /* * If it is already FIXED, don't change it, something @@ -871,7 +877,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; } @@ -933,7 +939,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); @@ -999,7 +1005,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..281121449fc0b 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]; + int idx = pci_resource_num_from_vf_bar(i); + struct resource *r = &dev->resource[idx]; struct pci_bus_region region; /* Not assigned or rejected by kernel? */ From patchwork Wed Apr 2 14:11:19 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: 14036096 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 0397CC28B20 for ; Wed, 2 Apr 2025 14:12:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EE3310E7E6; Wed, 2 Apr 2025 14:12:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YIcH1sqa"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id E0A0110E7D8; Wed, 2 Apr 2025 14:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743603130; x=1775139130; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=S1jC0Lmjg22Iq2xHGaQKQ4cSnZc+qzdwjPAR/8Q3DCI=; b=YIcH1sqaaeR7GtHvbu/8bIJtCIpfz1pxe/beKq0PjNdb1Gy+wzwoLweL JnyQ2hdlvop6uquvksgQG74fWYeUZxwNU5hw28KAqzEcGSr2NL87Cjuu/ ooJ7IW+c0EWvLqFsxR923gXLR15XpYIaPpTouHC5eUVG/sv2F+IOhmj2n 2kqHnmgIWR/53oh8pgtzSYNBOfVYuPy7XRvf0fV1Ms8CSV+YUdsWRt3gy CCv9S75d0VkYzryJ/tF7UUPGe/fZsYunJYduGToXFBiMb/d6bRIj+GGZJ zBu4PahSoCDeUwKmu7lC+eupH5//mw4u7DDPe+BljA0Purd9jTvPE9R1v g==; X-CSE-ConnectionGUID: 3CC7MXNrTr6skrm+7c/WgQ== X-CSE-MsgGUID: tKUMx5JNQtKJIq9v1A7Buw== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="44677154" X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="44677154" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:05 -0700 X-CSE-ConnectionGUID: zzfVS+2TQtyBUfGYpDrAOA== X-CSE-MsgGUID: P54R2dcwQDOWJqrTeTylJg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="127620420" Received: from orsmsx902.amr.corp.intel.com ([10.22.229.24]) by orviesa008.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:05 -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; Wed, 2 Apr 2025 07:12:04 -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; Wed, 2 Apr 2025 07:12:04 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) 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; Wed, 2 Apr 2025 07:12:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TWVLmBO7Zxc3537vFpbGF6abXutVoev5o6+8SuyANV3dt1mQlnp4Rxucz+XqwX4kV9kEHccTTEYgc7zcKUXgbuDbCACJmCC11RJ+XAwcicV9g9G0nzYvvNLGp8F/sjIgZUBKD6dflexMQgrKuoZusparE1cojG3G6PrGphuyXUFUDGWY2SASd2T2YJRqE45glMc8M7ySVxJpCFm8W3/HhUbwrz1fvcaXvwrKIHYBf6t9dbo9BIawE/KpCA4jVQJjWahwtKOY4zRmMud+ny8Lr6bF5WOPN9o2h76T5s6VxC+551cHvzO9ZcStODAz/BbMSny1wChctd+JVkf5FkInFw== 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=1+WX4f30IsXc1peH/jKONYDsfguRJ8HmiN0jcQiIz+s=; b=LemrCJWmKKatigUFTseV4XU7jwgxu9gPfPJlAaNge6lI11Rxjh8Vd8fkMKS+L68KTLq5BcisRXuJjjqh5fsqRYx+7mjW4YoRhhoXa7rC5pSrnuY/6eJzfTCQ+g03ASnRs+u9mZqabmPeGPkwEX3kdKY2Xt3rkcU9/cmVgWgClTPqGxwNKNhNT/6Qhldj8/bygPeysyuqqZ5Sb4/gldULpLpWElJAUDa1ADn8CwDpmOHyPDPeyz+6f3CdcYNg700R4FFOdojMBvSZuU+fFIKeogciBJlxmKYAUHrEOIjDWwHJdrOxkYWESEIVDx6GpLyhS7SRjnWtTT6AMqVsDE3aiQ== 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 SJ0PR11MB5213.namprd11.prod.outlook.com (2603:10b6:a03:2da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.48; Wed, 2 Apr 2025 14:11:50 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%4]) with mapi id 15.20.8583.041; Wed, 2 Apr 2025 14:11:50 +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 v7 3/6] PCI: Allow IOV resources to be resized in pci_resize_resource() Date: Wed, 2 Apr 2025 16:11:19 +0200 Message-ID: <20250402141122.2818478-4-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402141122.2818478-1-michal.winiarski@intel.com> References: <20250402141122.2818478-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR0102CA0021.eurprd01.prod.exchangelabs.com (2603:10a6:802::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_|SJ0PR11MB5213:EE_ X-MS-Office365-Filtering-Correlation-Id: f9c2cc56-f4d2-45f7-6978-08dd71f04e5f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?WXGLrP1Y88YNhIw0uXBNxm6jDG/0Jns?= =?utf-8?q?1ENEcoMBFyeiNA/tndj4h31SMal4Y0Pkq0DoRJ3devQrsGUGJYuTPsBX3cET61f+J?= =?utf-8?q?/q0KZTdE5bNFGr/k67NGyxjq7jTMJkQB7fVGH5g+BvM6noNfofBf7mtfFFNsdlzJi?= =?utf-8?q?bBAFMw4XyEsE+OxjY/dfV4jmA3g0c72P7D6/Cm+UQKItLPI5O4NdEKEXzIez3H/KN?= =?utf-8?q?vxZybZmpyrZ7W3zG/7E1D5K3SMdA0skX425QsRqcOYlHeLZWrTbCw6WHUyAPGmSYw?= =?utf-8?q?/vd1MSRqQ0I+Tz1Oxj+LS4Bf/++eGzEPOXEkrRefVtTcZEG+/v/TpRSsqsVwQJVz0?= =?utf-8?q?Vv3Pu860lglwE3NP2ESRHqgcAvVZHKDw99Kolc4pts7Bn+2AsAUud2aFl2z4rLFA/?= =?utf-8?q?22ATlDUB1ChYdcQtJjcAZqDmmq1z70vrM/qIe8CjiL0d8k9yLV+kIVTYrl/qjVgsN?= =?utf-8?q?yUX7L5AwhwqFkMq4G3GDQtk117p4ZL1wCqeQVxTxfThoB4KVrNKNxSffLM5+yvsym?= =?utf-8?q?+jKiH0bixEwu1bjKusZcSbZslHbSpLHxl/JsibunhmVQZg0E8SEMNN2qvkKIzfAu0?= =?utf-8?q?tLqWEXdlELEPm8kcRhxpcrVJjAS5m4w4afpdtmCesmCqgZz/t0/j86/ZkrPop0fAf?= =?utf-8?q?tCR4WQj5viDYp01JVwDld+3AI76vpaGbHJ6DthnwYAACudMgjOjsYTnlt3LYOL+jt?= =?utf-8?q?ySAD0waDWrXKM7pCVf91mGIkroJeklDpl2wf7r8nD+UXbGD7Pbo8J7Rh/oVJOX5lD?= =?utf-8?q?r10qjCL8TtL7Qdt5009snVEiFZcpi2H8Mo1LQ4aGHLFv0T7MoFxQ1Z539jXk4iHDr?= =?utf-8?q?L7xP+Dv6HMp2g7Rj6HKIKyP2yz94SqMSHBUGErBgPtlwJtj3Csq+Fp68IPRR8VCK1?= =?utf-8?q?Z8E2qmApmWaAoOthdmnFDkILBlsXG5E/G1P/AHZDZAfMuxjzgZTmau0zFfT0EgR9q?= =?utf-8?q?uhCjXV6YIgcADOt2E22jVwQpWoq13cNoR9n/qReW3bibbcVia4MTUuMf40sXc5pZs?= =?utf-8?q?LYHcT4Aj61C3thJXlGcP0/bxon7eMl9JCo6LfCJEDZxv4lqc/Tkdo0Dx2zJ52jJ+T?= =?utf-8?q?taF82i3yQIsWOIvtrUj63JtefAuFHtYpEU0nc9ZcCccUrtHuw/zkAEG+bOE7fadWO?= =?utf-8?q?O1vesyZ3azXQsPUwPp64VOvMm0UrkumOPHJYUi+ona/idiV0+/ogRZc0+okNpbs9C?= =?utf-8?q?rxukpfiDeQ8NgG4tiWd1GT17nqh3HPUiIavun7B/9ttyWhRi2PCrMhC8Wh/4MVh1W?= =?utf-8?q?rQb4KDcFtWJFpqBgyPV+TkY3EJ8EzEYCnSPZ/Y4q03ManlRZGYoGQwLFHcTBtEkYX?= =?utf-8?q?llnRNPinNsCa?= 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)(7416014)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ue6q6n1PnTJdI0PG0wPwXIQ4QzV7?= =?utf-8?q?HmhkONTVdb58DyFufNz86TGSxrSV4q0IQ+JXVP5W8plsrWI7L8d08tIV01Iyczd68?= =?utf-8?q?86onDygRPqoxN/bda2UyvZFtKwL/ldWqpHJINmLLYMgFHuC25gcZs7BKH066zrkbQ?= =?utf-8?q?O9IP1lCfiQ0hlYNxw/TGq4tp5heGrQkcSEAKY6nRC6mqeyj1NKam4MGD3Z+qQJoXZ?= =?utf-8?q?YhWpx5iO5KSjPaW34oSAEYSCvSBllVEVRFqUSXWRQuw6HNxnTA5T0+b5pqwSemODQ?= =?utf-8?q?KhetAaleRXpXr+BBLr6QlCwDpdHkuzLf/gSy2oKP193srE3eiRM/iZNyhIbARD+JP?= =?utf-8?q?UCn/WdatPSZcTORamTpQjxjgKzn3g6ptPs7TDruT1czBv1Mf0O1bpUqednpuAbhkO?= =?utf-8?q?FRUuy+TkcvTD9LQlQ5lNk9dtD0vCtRqgCb3NFAgZANRmEUkOyaBZhR6vxKtiwiGiq?= =?utf-8?q?LvArWTDhbHvXxee11kkgQk4jFbf6OHTvCjmi0SXDZXShxhd5IP1CrSuBVXl4UGMud?= =?utf-8?q?8yc3HJkR0fTxX1vc0e9aFgOYHFUNw3WUOx18zaUDQLbehOp5MbhDzXH+CCBpYVSCj?= =?utf-8?q?c9u335o97VkXb03dp/pTxQ1SHrIgoUNR2Yv0iWMGgrZdAYBNp/4lqUGUvO3KYzEoL?= =?utf-8?q?lITriFKPJFDB1W2qrxAwpEHl0lfR3YWuRiO4OByUDBeyHUipeyCvrF+frbZMOJVdj?= =?utf-8?q?0RdJbHGlydUPNyV2lq9RZ0a7cSEA6bkLjweStPieRWUnA/VlYZ/tjp3oHakAVNguU?= =?utf-8?q?lAUlCIO6NpWx/i71/Q6p+q2hUmHq1CtU9WtQw0RNHe0Xd6Fpg4BZBM8j9acdAe7AW?= =?utf-8?q?t8E4pRYq8Ig9ANkhxMjdgCAtdcAD/ULStTPYPV0DFfk5HpXJyEtxcdifYCzWMGEIR?= =?utf-8?q?XP90BHEJG8JyhwMBKXFvDybABKZhfzB/kpx07nGQxbGSk/vbNf4rXpqPQUaSbLWsz?= =?utf-8?q?O5DoPsbveBYBlVy0rWUA9RbDO/8zhRPyC6L79HMjGWnhvAth9ePulaR3KGIm/ArNW?= =?utf-8?q?C3fkLHsE+8aq3Pl8fUFV+wdZeGivGS7EarEE29Gma+Ss6T0zLbn+lZIn5x+Sn/cN+?= =?utf-8?q?70zn3KqDL43TAGQ98viCSFB+v7jOYYhTWH5mH3tkh0di1pknPfDPB4tBDGkmhqHNb?= =?utf-8?q?wW0JnyQR7z1sASZ1Ek62UQNqKP6AvWd4pJ6/oGz0AvHpdmd4JeoN1Hp0V4I8zxLx2?= =?utf-8?q?bJU4kxy4C9lIaG/Gc3bYVBAZoKuUQOdNzi0yvwgOZs3TQ1w57Q0G02ZflUBc13nYz?= =?utf-8?q?lGn4FI0d0ktyl7zgFeL6+NUPApQ/2i2yZSJoXjC4FB5oNFc+5GOZ2Hd6ovzGQ5mXJ?= =?utf-8?q?FuvtOV15rdHdEuqChar4YfQHZW4y6jAQcTinBqunylVueaUe3XctOScXLF3a0GNwV?= =?utf-8?q?Ncj3jkRZ0slp/Xwfb1GcXmO/OSxZWSJxqFYRhP2WXYUWctnhjSi56vZzzfY4FHvfh?= =?utf-8?q?cQ2avf2pdTUUgijcHjOkM1rwmCNn+1Vi4msAIDc0ybZgOAiAvpaPOr6/mNIs9RCKP?= =?utf-8?q?fo1Us3hOc/luESIrgu/WnjLEKzoy7r4Tjw=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: f9c2cc56-f4d2-45f7-6978-08dd71f04e5f X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2025 14:11:50.5394 (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: D4oprYbjuKh1g4ocI4O7Qm1Jn0sbYmCAdOPQ/rrpVA+jmLz/KiACx1ndeikADeP0kH+eaitKpAew4PpQsK0CvZT5knH6KsWDG0RdqCJuzDA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5213 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 capability layout is the same as PCI_EXT_CAP_ID_REBAR, which means we can reuse most of the implementation, the only difference being resource size calculation (which is multiplied by total VFs) and memory decoding (which is controlled by a separate VF MSE field in SR-IOV cap). Extend the pci_resize_resource() function to accept IOV resources. See PCIe r6.2, sec 7.8.7. Signed-off-by: Michał Winiarski Reviewed-by: Ilpo Järvinen --- drivers/pci/iov.c | 21 +++++++++++++++++++++ drivers/pci/pci.c | 10 +++++++++- drivers/pci/pci.h | 9 +++++++++ drivers/pci/setup-res.c | 35 ++++++++++++++++++++++++++++++----- 4 files changed, 69 insertions(+), 6 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 3d5da055c3dc1..fee99e15a943f 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 4d7c9f64ea24e..6878e3b1e3fcf 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3745,7 +3745,15 @@ 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)) { + if (!pdev->physfn) + return -ENOTSUPP; + pos = pdev->sriov->vf_rebar_cap; + 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 Wed Apr 2 14:11:20 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: 14036097 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 4E84CC3601C for ; Wed, 2 Apr 2025 14:12:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1EFFC10E7E3; Wed, 2 Apr 2025 14:12:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ie7wCuHq"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7869C10E7D8; Wed, 2 Apr 2025 14:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743603131; x=1775139131; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=luDF2Sdx2KVSQ5m4lKqpObI9udJNMyroUb4ugSNNWFg=; b=Ie7wCuHqkmL7vcWXf9bGwZC0oKjo5kzpnXKdPOjbLLmulvSNLChrX1NH W1rCR30ZzTkcTA/9seiI5KsXTpTCuAVqif/6sVwNnLIiPQkF1+NOZJinI HQ463CvP6v9EwlrhUtuo6ODoBCQ24xTLyFzoMZGSONCZgiOy5zEYvJyDH tD346lvEhlFH6H4oDtQEauX/+vcf7BpKI8tpWVlZzYNFzu1xI06rJXMTE /+r8jnrVGFyxyQNvRTVlVJPeDezqLqyammsMOMGhqV2rGmDoDXMjUjIfJ npGph3iSxyr/u5wr0QYk2OYn4JrHDiK6YfbbkFcgqTD19u4cr7nbNjkSB A==; X-CSE-ConnectionGUID: p29IMcclQYWjQo9Z+tZDMQ== X-CSE-MsgGUID: W9BSvO+ZQHO19tGQ1CPmMA== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="44677170" X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="44677170" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:06 -0700 X-CSE-ConnectionGUID: /6ispDT8SpOk7w4yB2GJ6A== X-CSE-MsgGUID: lAG+bcylS1i0085DR92eIg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="127620423" Received: from orsmsx903.amr.corp.intel.com ([10.22.229.25]) by orviesa008.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:06 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 2 Apr 2025 07:12:05 -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; Wed, 2 Apr 2025 07:12:05 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) 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; Wed, 2 Apr 2025 07:12:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kIwx723fmq7F+fbrMo2EBOnoEuBR9o2GSev/KMXEM0fvcinci0hOl90iCoJ68UqllK1TdTnlsUpOITgMRAh+X6rpBY6rhOnTKzqQMBrJKlttSsT3ldEdbKmN3Quhxa/m21zveWxl1BUytXo4+GhFx+9NG/KcJ/OZBJeE9NpvVGY92c0AuVtVXwC9erue2m50U8Fta351VTA1Gqp8m362VAe/qT8wFzxAj0QbmsEHC3eXEhXxnJghQ8Eb4nzO3NuYmV+tXik5F0yT5jF0SZsdwgehxEDTDlQ5dvoZXMLqmx2ZiaEHlNTWF2Wnd/qJpXg78ol/ZhSAD5pITCHOgb9MpQ== 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=4ueZT6TffxGJQiUqEov+JWnO8IZEZetcax/CaDTXGnk=; b=PPVAacLHfX+xITP1iSFRWm2ojeX5AY7sGKOqEYJvR8k1WX3Tr7vByIEDJOOuzXhwbx/ML3Pb8Pxh3bZ2Ap1XjHz57+r+x1dWegQvqp32l/GWSZLqPyEV6T7nuMuDZY9k5PoYCRZzinA2GpiO8DI3XSDaf5XQo/KFeMM68TXzDEHt9EYaTeeXA1UnUDyFoW2u+f02aGJusAYzQuTXtz9rvN6u3AFO0qmeal+375ul440dunTB/k0AYmPuHRMH2UZt1/lIHZZMZP+xX6pjECZTK3x38F7dHtQPwxOaaah8BMdqGjVZP9gN5s+CxVTi5Cod7V7I563sH3HfATm5Z/iX9g== 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 SJ0PR11MB5213.namprd11.prod.outlook.com (2603:10b6:a03:2da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.48; Wed, 2 Apr 2025 14:11:55 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%4]) with mapi id 15.20.8583.041; Wed, 2 Apr 2025 14:11:55 +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 v7 4/6] PCI/IOV: Check that VF BAR fits within the reservation Date: Wed, 2 Apr 2025 16:11:20 +0200 Message-ID: <20250402141122.2818478-5-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402141122.2818478-1-michal.winiarski@intel.com> References: <20250402141122.2818478-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR09CA0127.eurprd09.prod.outlook.com (2603:10a6:803:12c::11) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SJ0PR11MB5213:EE_ X-MS-Office365-Filtering-Correlation-Id: 61fcf376-a4f5-41e2-7227-08dd71f052cf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?ufhGVpa7mHYRNz81qaf3tKUzjE2xGST?= =?utf-8?q?fWTyURAntC8anJ4jWfJDqS37ne7Vt9pSD1AJFR4KD00euG0LON3/O76PR0yiJhGYE?= =?utf-8?q?u2XLPrqIKMboZUvlvj25QWvt0hV48ZXYjMboTSbzV3SiZw/AE1eJQKi7DUkLVr0CI?= =?utf-8?q?1NKUzbDyI3IOzAYocShW+82/tl2bDPQzgPBHbPy8EweIBTNiB39E9TAH+J1PJKlnr?= =?utf-8?q?6LucAr3KNQpJIEkSPjgyM+jqELT+JBzvHsqLL6+qaJ6dWiLrVxggOD3DkQrQz98ir?= =?utf-8?q?jY/2Ck8UrZD9kIrynNp5lTOSdYusg7JdvLlwdRkX27EPyasmOjysqXy7HJ+i/im3O?= =?utf-8?q?x9hJUMAZFkNrpOpaMqWyMyAS1ZEKzE6h8mFwhEyeVnJwcSznc/KJTRcT63Wk16DTo?= =?utf-8?q?Cja3QREjkguir8tK+OnZvFAhnzK7pEKGssCFYwSuX/MFm8T+2M3N1LF+aDUPbCNIg?= =?utf-8?q?B5EF1KpICjWaa3w6x65tNgX90n3uZtzQVP/p/Wxb2iLwmhYhQWdoebYnnctroRBTo?= =?utf-8?q?nCFkUul48pSK25v3w6FR5GuVmaKSerGyOcbnyq1DCC7XMY06FB0l6lX6wCjnqBz7R?= =?utf-8?q?deZjmiXYPJ5LSs4tbd4eTNo5k8o3RzrVfzCx7UlXIpscO0Z027JMZc4OtSsQwV+Q4?= =?utf-8?q?MxLjldyh0BZij1b5NqADV16qWWpNX9JG3Sd0U23dBIjfM7NU/X8W/sgc6hb7d+LDM?= =?utf-8?q?NM25s1LS03xysCAmfYyvtglK9pev4o3rCzmRVd3EBlL7dSgCXsRP6m7b0bSROhkLx?= =?utf-8?q?lZdqewfHa4sRJOqutnW6i9UHHqQs40EglcNT+bi8xuav2A4Ja/9TEZAyf5IRfvpH1?= =?utf-8?q?BWiR7A1iX1jJqwK/dj+ddUvdSvzm2PCOHAM/qYKRZXW5HBbH7d7xo8IRdc9rCZzGr?= =?utf-8?q?BAYn54IE1DAn9PUQ4SfNART3sCgTRy/a0CcuazUaS+mt/GsDBtqI//BTKxP+hBPFv?= =?utf-8?q?/PsJxjsnTCwEUP8N0nD21d3Q+E8xphmgVpj2qNAY2r9H/fGGQCn+g1IEzaGVJSaKE?= =?utf-8?q?6p+KMvU6NaAV2P7NK5N+raAGsk6Nw1vBcgctYx8wQDI13cRUnR873ZugMrFPdd0Lz?= =?utf-8?q?8QZLJ9eE95w7BsHqs1/mW8iK94By46mEf9bVnsDWLtHf9SQQyXa/JhsJVlj52rLG6?= =?utf-8?q?RFc9uXIlwavBVAzm66WYQrhaHkhxR1qlGsscAIhQjpwLBVBhXt44MoulVxPwpSxCP?= =?utf-8?q?7M/lnXl9aOwHDRyUdZzeVClOIrsdrRkD0U05z219LmHuXjj6WIa8YxQfj57/tQo3e?= =?utf-8?q?yEwMiRUhQNkmas5Gy4cBdKexa2q9dZ1PTxXnUD28WJwdzKaVSfObzKkYmYJyNT0oN?= =?utf-8?q?FnB8Qu68ttr/?= 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)(7416014)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JGnWCPhlMNsXlnrCs7xByGu4qeeH?= =?utf-8?q?3/KIJLboyXhkFHqQhiwqnPwzZqhebIdOtCbiUu/OC4HsbUH+jHaQ5Q8RS29oQItkA?= =?utf-8?q?CUsao9WvN1i+GXAAohfRtU7Ul9c5VgdEhTQ0jisAKO72eg7cpI0Se0QbcD1zANr2H?= =?utf-8?q?+uKeqR73pOJ7vnyDYcY5c9WWHbH+PH4V8+qjcQyjhb5zqltQgQlKHKA9wj5fzkUGq?= =?utf-8?q?w5V3KHURR7BS474oDU3FFwOBp6ArSD1viPUN1SfFPE/1dElACSTeuskt1YsiydzjO?= =?utf-8?q?HBrs4+47rhsPJ1ehlje44F60dm3ZMH9E1gt4lWyA8BN+HuJKPQ3cLlICjby7GstmW?= =?utf-8?q?Fg2lx7wueo72e+i97YOMXiFrhEyYEwE8Xq/oZGjdKLMPtDx2ekBAFlWJtxJesnBld?= =?utf-8?q?FJZfZzxYwwsxP/JTxYb2RVi2CdfvO/cvaP55RR4pbS+kd6quHfpHsaDsBsqhN3NHY?= =?utf-8?q?ZCePx1c2xjTd95EW/iqt3Y8Vo9gGKecDUu11zljPJF+9RME4vfh2aNIat1kVWv1qQ?= =?utf-8?q?7QJUC7t5ddFY/ypIV4IYBHg9hnafoVERUYDoM/XJCwsHrG+hdkAjNIx1vVTDq/cEG?= =?utf-8?q?HfdJF298eUd+rpU/fF2OC4uIXM8mv6Obivc+hltdOHzRxXGBp3qeOLk4MZ0swXgI1?= =?utf-8?q?OKcoAqFKHPTY5yVfuTDihauVYbbOm85SGW4f12t6oh94cGq7IaZsWjfEo6XTGXrDs?= =?utf-8?q?C+EPWeEEviAtvawiJig8HjOKxSJEzp6Wka6nR1EBVi/s46r7PfD1Xn9UJwmrrkuxV?= =?utf-8?q?QS/rA/fydiuwQbM5nvIrHGg7tEZkoqaw4bpQd6a/Q53wybLz1wnKNO4as5RPsHGlG?= =?utf-8?q?FFbhBq0c+PL8otCNcn4XU3rtXT6SjqG/CIcXtyv1EbBr+X5zreibxFL1Zp7Ng70m7?= =?utf-8?q?/Wbs5VtxkLmnsdSqnaW1HBXSp9PhJSNMmjCytGf7cUjSCWQILBk/VL5I0TGyARwAU?= =?utf-8?q?oe+H5ggXwH60fmSIJ/0Qxz8Rrv2CzRWy5kyGF5ijmzO+5jdcfmnO8KpaBdgpaG5eG?= =?utf-8?q?aNzXoxpEXvnNw26GrJnQTfZ5qz+pTP2u7CMs8JEa/bzOZ8KvijMAG1y9O79VtytAu?= =?utf-8?q?d84QTgpTvTJv7rz7rKSFek0vObBzw6qI/lGDl/Qmc5LkhkfvkNHx226opLHmTutLy?= =?utf-8?q?a1kGA7Z+VYQvQhBlMqGCXWcj/p6uGhv0EIYcPpk6JmgoCZ7rwa7fHlhNBKi3TzI4T?= =?utf-8?q?MHUUvBdup6is5ptqjEEZXT9kS+YQLq0/F1L+PByj1XuIRkOhTYf7LBPP53xezYwu+?= =?utf-8?q?fzMfmCvZuVvLTg255yBL99kiXrrxoQzV32L5D1FzsEdNfER0lvgRLzUPRb8QhIX8C?= =?utf-8?q?aUe1s0fIW3Xjshu1pzC2mka//TXdK9Ps3ak1I6vbdYJp/8EqWepmqZ2aDsdxjWnGc?= =?utf-8?q?REoP4bB47lqa9xIUI1k8FXy4uAm++NCnGLTXFENLtDxoJbLl+vy8fucwTxEdosXpe?= =?utf-8?q?5Mt4lnebv68xkOiD8wai33zLFpJkLgdU/QXBK7DybrUSJCvJZsuiBoKiZR8dY2W46?= =?utf-8?q?fagAitkrnIph9Gu68Pt1/WuVhGlhfSUWjw=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 61fcf376-a4f5-41e2-7227-08dd71f052cf X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2025 14:11:55.5364 (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: C29O/bJfiTtbiR9YDfFR238o1GbVCTKtNnVY0J2VEc46MzeMTkt1kbu0XSDcKoQ+Ls78joeval7edU80QffA/VI2Jr6z0kREHX+28JzHV9k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5213 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. An upcoming change 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 Reviewed-by: Ilpo Järvinen --- drivers/pci/iov.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index fee99e15a943f..2fafbd6a998f0 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -668,9 +668,12 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) nres = 0; for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) { int idx = pci_resource_num_from_vf_bar(i); + resource_size_t vf_bar_sz = pci_iov_resource_size(dev, idx); bars |= (1 << idx); res = &dev->resource[idx]; + if (vf_bar_sz * nr_virtfn > resource_size(res)) + continue; if (res->parent) nres++; } From patchwork Wed Apr 2 14:11:21 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: 14036098 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 52E49C369A0 for ; Wed, 2 Apr 2025 14:12:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B83A510E7EE; Wed, 2 Apr 2025 14:12:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="du2G0CZp"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C17D810E7E3; Wed, 2 Apr 2025 14:12:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743603132; x=1775139132; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=siRTl6GX8QnDF0Mdme3stuVND2y9WogQTrZmNu+39U0=; b=du2G0CZpHyQVunlMKJZ+chZZn1rLH1vhOPrnSzU5Vyvkega96+F3jrHf 3cy+LdzzECMSfSImyIkGGRtn+pNhI1oqdPaAyb4MRSoC7w7Wjo5E8C8Yk rAye8su7VIn1Y/KTi81fOGegpeiSl3/Pgxn7sAkfaOyI0Xt6UZhs4Gptm CD2C9HHFgX2p6Ui8h9LlBWXro0YIztpArhZbAd8wXiMx+Alq3vQLrcoVX kE7bZG5QxTZo3DSxkTI5gOi5R1kxpjSbIJLXZI+iQiseklEeaBNm3jlUa DJYFUAuqSAvuYSxqByfjkCJLCXU3fIdO/sONelTdAXv2h4hHdeACOdAzp w==; X-CSE-ConnectionGUID: F7hTuJnjTr+BstUwZ0CDuQ== X-CSE-MsgGUID: hnky8aBlT56g6YiwLB+F6w== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="44677191" X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="44677191" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:08 -0700 X-CSE-ConnectionGUID: koFjoONqQHqeMkEMr+HnvQ== X-CSE-MsgGUID: yhvcPjnGSf+pAPZTtGfoXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="127620432" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa008.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 02 Apr 2025 07:12:08 -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; Wed, 2 Apr 2025 07:12:06 -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; Wed, 2 Apr 2025 07:12:06 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) 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; Wed, 2 Apr 2025 07:12:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pKl7gb1JBBSSXTa5L0XQzbQZtslVF16iPL+70ms8a2t/pj910xWYlqVmJggSPSFdDjDWQ8y8NLeF5pSGhBUYtII4YId7hwyXf0CpDxQEwMbCoLNoyZgr+XEElL2LLp0SAI2Z4u0pJQORxhA+LV5jSVf8pg3R2n3li+daUZZsqAk7oG7hDBf0nkwma63w8LC8zgn7u/46AnadDJcTADGuiPxIhz0NgOZasxiZpntwVFHLzulV2uPcyWqsuUyPZxpMFPih7QIDMygcPUSeSZekXDI5f6nj546hD5jbnH4LigSfbOfP3Mmn+v7bbVej3iY6YQAuArsAssJy0s5FZyRfrg== 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=wTYB5JU+JVxoGhTV0ErzA5+Ib3Ar06g1IPVIx4B+wks=; b=GO33Y6CJWO/Ui/nIoaU6ekFC8Y++Jgsi3GP1MhdzItZtg/pCZSx4vd9WOM18lXfyEQciTQQaabWnC49qmf6kg/n3xWcd6pNHJ4+PjIB+Yp3G2FOonvd8DAQpG7Kckaby0Wogbh/OtZhaEDOxO5DRT/u5RtAPgJWrCgSY9nTZSlRP/s9/6o4FgPZW4NKmTJoZQ5tWYv40CrilDf1THi2YHMOQPld7rAE1f5ofGBtNVwuH3mDaKrsyJ5D4QbYi3pt+oX+CsGpmTl6e1a5cDVzdtqwFV33pF/AL0B2u/DdwhU+6D7mt4rvd4BCAvGk/Kptcl4vxzqqaxlrgQww7RTws1Q== 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 SJ0PR11MB5213.namprd11.prod.outlook.com (2603:10b6:a03:2da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.48; Wed, 2 Apr 2025 14:12:00 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%4]) with mapi id 15.20.8583.041; Wed, 2 Apr 2025 14:12:00 +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 v7 5/6] PCI: Allow drivers to control VF BAR size Date: Wed, 2 Apr 2025 16:11:21 +0200 Message-ID: <20250402141122.2818478-6-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402141122.2818478-1-michal.winiarski@intel.com> References: <20250402141122.2818478-1-michal.winiarski@intel.com> X-ClientProxiedBy: VE1PR03CA0037.eurprd03.prod.outlook.com (2603:10a6:803:118::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_|SJ0PR11MB5213:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f8268e3-4db7-4b21-7bb2-08dd71f055e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?FMUCf4OzAPOkT+yZU4tK6hF7zZhi3C3?= =?utf-8?q?vJtQdFQ3ABWqxE6uaPTtB0PWTl4GuRVRHy6Vs6cmXgIrwUldlDeT3dlKdCjVLk1A4?= =?utf-8?q?4C3U/TCdNQ5g3R007AUfjmNEr+/1f5Tf7mie2zvihkVBBM6l5YBuUc5GliT6Cu+Lm?= =?utf-8?q?E0miar0KBBIDZRLccgogr8eYekQi7X7xbDRev4Zvb/m+whIIFvD2ELset8so3jOGS?= =?utf-8?q?GGqrDGsRGkTgSkx2WsNB7jDJb5A2qkUmDQMk/DkqA5CxpL+gmBh3l3aHVJCYn7HgL?= =?utf-8?q?guGDHkUaJkgp0EuwJGEUxZYQaD1V12M/B/jEHWUgbLbBEN/y8k17YxPISVs50eSq6?= =?utf-8?q?cAoCfxZDPBqgWupg7xZiQEV7uh/jGRPuRjOJLVKPwyBkYo6D+GWlCuc+RdA4yF+7q?= =?utf-8?q?p9SX3LsIV0KDRC5TmNNBXyJukpInNbGsOczFy7/CWiQFhpr3o4nQorGTv7mJDGFbA?= =?utf-8?q?zXyG88n+Hiyk5KPSEN0WVSGEp0sfRowMCmjGI8Z9mc0ZVB2q+5QLiC4lcOOonLqCz?= =?utf-8?q?Ebtn9Jx+ZqeHVWZpJbZo0uC7NqlNReCITq4r/0fw6MOr+je92mF7rINFJMF8wfWOO?= =?utf-8?q?EtoZrgClcu7BDIf8iT62B5wtC4YB4B895QkYuaeX+/Bdp5JjMFLqIypD27TsEXiHK?= =?utf-8?q?Igqz8LIii2bIn3hT3oP/zavK9DTHkX+3NTDCbu7H50EB/E+oBzxYaeAVbKCXT0Jmt?= =?utf-8?q?JFw8ch42M2QFFS9tz8pkINvRiRhxLqIsU3x4Svb3nA2D4m8tK780KnYPOpZA9xtYb?= =?utf-8?q?Jm2ye5IkpiW9rMQH9EPjWDvYw6O5jEmYcEhSlOolelHADYoIDRmt1zyxMsJGtH0Qt?= =?utf-8?q?NNR8mMQdAOnQTx0wQDutZl4O+G8RDwkLHyL1QeTg0OE5hilh+af1LiXOfShLUc1Wd?= =?utf-8?q?pKGQwYLb3jBh6pyU0EwIRI3lhD1/nZRx6o7ab7/VpiGEKCAYpJlTktvSfrsqP2LW/?= =?utf-8?q?qaXf23BA2xEm5Lm/DfdXXPS/YF08eTa1HCuG1oNBVKMwbwrE5p1EsigyI78jzTf7V?= =?utf-8?q?KcYvZRhsgvO1vznn0tWWuhczc3orYslm6TyGy95fSLX/g7nQrOfH89qGtscrmdruE?= =?utf-8?q?SerWbrPagTXCaSBFjBvuPiovNzsDJTEq7v4F50BmHl8MUM+mLCsGWfBRauyNp2sAE?= =?utf-8?q?SK5MNkUx4EyGV3bgraukm5uiYTwsR97+9f0nEG9ktNmVTpAJJJvcGaaBs2zzpLHXJ?= =?utf-8?q?NXrcBNYF/iQuuAUR7axO/sSpjNnkVJgQUvSDu8E21KXUEa59h5T+i0i57YZp0hM7p?= =?utf-8?q?lD0/UT1fEcyExjt3A80MtmZj9qGxYUJ5ax+wJwTA2fATXUr9UJ9jRz94YziJRCmDE?= =?utf-8?q?HL7iK/siCR8C?= 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)(7416014)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?WafIuOFdKx6Lb0cxL9RWbmUzkWJp?= =?utf-8?q?BaJAZ5IKpJwSKX5yXsxSLT55bM5awPgiLI6r1IPHaJkyuW2UOIE7shyrLIb2uhY0R?= =?utf-8?q?6avAYANMReq5R9Xcor16HKqmQqPhFpCeOLc2nRQD+UJNnqcv7q9v/8dmk9bawF0sl?= =?utf-8?q?nOWPRb8HUmtBwhLLPKi90noN4XVYlsWpt6v7iHYmZFh3rL+9TmhqlwDTPafwsRjpB?= =?utf-8?q?oq+XARx0WmNhWy6svsFoTgZ2dSAByKYQgvRSifp5DW+aj+n3lECw71qih6WpFqcb9?= =?utf-8?q?hJSArUzQ4BSBZch4jvEnbEIIJDvsce542khoVYKtOBJ6G0BNWQJaoV6SzEtx8g/Fc?= =?utf-8?q?HxEqICgoV8KjgXa7s9f6DGcSPTGo+uUlc1NH9Qe+WNDbJVtfxe5S1XatfW6karEyP?= =?utf-8?q?cyUmRPCKPxyImPNezSDcIj+DF0VYi8ovqs0m1IhDeerv9Vwk+o6v0Slc3viUCQCBD?= =?utf-8?q?Xmx6/4rAAWSfxyg9ldH1wcZxXpFUqNaV3cwsChJOLkrt87ZPr9zWiLEto3ZhIKIri?= =?utf-8?q?RohGz54073pJfHmgQIeLw9qWoxABufA260E3v5ERDP8EU4nGGoaSPEwQD7d+6OPH1?= =?utf-8?q?oIF2YPVU/6TgEO279ZUVin8yhRKEaSZZmVRxy8Txnr9TZg7OOJGH9JblQa+aYait2?= =?utf-8?q?tG0iq1xX9ljElWLwhulhbP3dn4fSVuI0hRb2FWC07hE6WEwX2RyaxuEbDoi/t0Cwk?= =?utf-8?q?+edpO1652Uh8hdwwk24D0HP75QFrX5PnRpUGjR6SvULM7nWEgiPZnaNrfX2SfytYY?= =?utf-8?q?gEnN9Fq/t8okgfVtco5PsPeYHwNz6xAXVrbmRiS9jHjelN32gGJBJV1a7P0QDJg96?= =?utf-8?q?XcpgQVsLprj1mgQQ75EOLrn1Rf/ZhH5bsSBGtz2iz2nEHApURrNp4K+zPMHzuJyEZ?= =?utf-8?q?n7GnSbrltIxcWETYRfCXJ9MtSF1Bmz3PDi60MwT2MzF6jSy3zOxNzS7JvaHrRJVyX?= =?utf-8?q?DlppWYvx1PZVJrC9Qrp3TOcBzAa+v7hBHs9o4auCE7Rjrfm5nmRCAX0tx657OB+jw?= =?utf-8?q?7n3zgMrVh48lUOcpMjfo+ZbgtNuVxKABR9Lr5W9QLHN4nf3urfMzr6r7n21kZ6hQy?= =?utf-8?q?9QTWWOGp6/zxCenzsYTZSartmTE8G8vpD3APpRppvJpALnSJbGNNH3CoWQIaosK1A?= =?utf-8?q?jRuO4aoNa1A9kqiaCGWDbenbuazmSpu/vnnT1PuzMmCnNIFDNiszdt88F4Z0ADOKX?= =?utf-8?q?gzQc9Fb7LpmJ/VFEaimxyo4VeBm59cap+Dpq19WJ21C8veKvq/6HXta2Q0nU3dnyV?= =?utf-8?q?K3f5vcX7xWH8Wk8UYK2UJa0zZvD+OghLUAEBCOd4nzoidmWX+iXK5TOuQ+XzOdnom?= =?utf-8?q?KwArF5ciWeJGIivpuiEwWZQqcgIbQekr0LszTIrlp1R2V7GuYybpxDPtD/qIfOlXr?= =?utf-8?q?lfn6tz20FV0Y2AetpfzwrWAmsnqwxgo0y1895zW+9xNAU6NQolE4jnSsFSWB1mC5N?= =?utf-8?q?7WSIYf4kTsOjigilLuGC6GFk44ci1Zn2lbnmIuihHW/KGJTSeWHZ20E+bdieieRIq?= =?utf-8?q?Js/oT3R4LVakPkpYtjQ/gCob0zAQ56ZUCQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 7f8268e3-4db7-4b21-7bb2-08dd71f055e3 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2025 14:12:00.5265 (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: f9fo8/jBpcUhcVs+mxdYoELDOZ2mXkCRBWtCCTzRsCeLNKNx7geWzKY4evcxjOgqOA5TAdcRjdRbqpXdM2UaR0BP2u6uODgWf99pLWbAhWU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5213 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 | 69 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/pci.h | 6 ++++ 2 files changed, 75 insertions(+) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 2fafbd6a998f0..8a62049b56b41 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -1313,3 +1313,72 @@ 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. + * + * Return: 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 accommodate @num_vfs within + * the currently assigned size of the resource @resno. + * + * Return: A bitmask of sizes 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 vf_len = pci_resource_len(dev, resno); + u32 sizes; + + if (!num_vfs) + return 0; + + do_div(vf_len, num_vfs); + sizes = (roundup_pow_of_two(vf_len + 1) - 1) >> ilog2(SZ_1M); + + return sizes & pci_rebar_get_possible_sizes(dev, resno); +} +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 Wed Apr 2 14:11:22 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: 14036099 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 2248AC28B20 for ; Wed, 2 Apr 2025 14:12:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E7D9210E7E7; Wed, 2 Apr 2025 14:12:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="U5AQtR1g"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8D8E10E7E3; Wed, 2 Apr 2025 14:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743603133; x=1775139133; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=yQvZm0Ga/hRwG31Kw3v5uaPPK1j+cEzIWVk6JP2lqn0=; b=U5AQtR1ghAHY2uRvHPGQX790CIJIRzSXy+fb34BBhPUndaDUTKqMLK9t 1yr2IG3h9uWBoOvG6zpzUk40LuLmD/ih5bpolUlLjJ+xCXQGfaE7n+WHU rrEXSWeKhvjwW4K3cXyBRoGmyyaXkp5fYNwsLmca6ZizCVwDEFXjdK/fS 7S/O/fscwbgVCYg3B4kDi/tv4Qz9dxDtbVyVxvdltW7/f6RH+YBFyQoKS 8Tn64vvf7y+1WpYLPz1G92MisKsidkAg9i3u4KxIcHi1ncEG2jCgnLUSm GOqcyHK/z1PD5GxlXO/zdlnuQm1sgojv5GOwELX385k28Eu2IQ1LqNpFu w==; X-CSE-ConnectionGUID: AwaYZeHnRQmwJUaSvW2irQ== X-CSE-MsgGUID: esIO4XelRgiTWF73hUfZDg== X-IronPort-AV: E=McAfee;i="6700,10204,11392"; a="44677213" X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="44677213" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2025 07:12:11 -0700 X-CSE-ConnectionGUID: RzTMhvfxTI2VTbHOwgS1lQ== X-CSE-MsgGUID: KgabNgITTXqDLSFgD8V2sA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,182,1739865600"; d="scan'208";a="127620443" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa008.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 02 Apr 2025 07:12:11 -0700 Received: from ORSMSX903.amr.corp.intel.com (10.22.229.25) 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; Wed, 2 Apr 2025 07:12:10 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX903.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Wed, 2 Apr 2025 07:12:10 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) 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; Wed, 2 Apr 2025 07:12:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h1AqI5xuwYj8OR6A7SuhYFwdIe1ILFDdGaf9Gl7M/DEgD3vZZ7de5EBcIVU7l7zIglrJjQ5leYwdVzoc9sEdfFi1pNM3cTttwgl9tl46Z0qX4nEHgfUrWBQsWHxHj4lIl0ozz3n376G9zd8JPsgZlTImhBcd/aGTKg7B7Q/rEkl6apU0T5qKyYoZtZbFaVJVKoT0lTcS1/znH8b9K+0QXUtVwbN7vzzyTOuLdqH08/pOCZix7Wyc4izAU1cZDDqJ5S8FIiESuaAFnXsEnMFrwJoMYGousX4I4HsX9ri+bQG0piQ+//r7JsAlwbRzJ9y1B1jtGPvMLMqM6l52hKAB5w== 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=1plmEqMqpV8IgipC6AnDhVqIl4Yt7pMfRz3yMnlU1nM=; b=EUVtEhmg/crKukPo9pcxAaCoHs9rBpXPoNEDfWNk77ekSpRORJy4n/SXCfRBSDO2e6ukqATYRgOOpFPIBjSkTNWixuQYGJJPQYsATyRQpd8F6YrzzWJr2MJbT9TfQRm/UxrIS0OAsIyZoD8fQh1Ha+LFM9qQ5gSVH1ynp90OwG+67M55TPjQstI2i5eN504c65PwDMyi11xffhsmhy9w46xFGlboFrhyk3ldqJxgF8JjuUVwqud8vLBlBIAkPeakH1iu7hJFfYe/S3/iRb4qzIQYgUEAWXxnN02q0ikmYvII4pdUr9T9VQfBFSIQEa3oUuhqIkhtoSJNVsDRsMQ8mw== 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 SJ0PR11MB5213.namprd11.prod.outlook.com (2603:10b6:a03:2da::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.48; Wed, 2 Apr 2025 14:12:05 +0000 Received: from DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39]) by DM4PR11MB5373.namprd11.prod.outlook.com ([fe80::927a:9c08:26f7:5b39%4]) with mapi id 15.20.8583.041; Wed, 2 Apr 2025 14:12:05 +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 v7 6/6] drm/xe/pf: Set VF LMEM BAR size Date: Wed, 2 Apr 2025 16:11:22 +0200 Message-ID: <20250402141122.2818478-7-michal.winiarski@intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402141122.2818478-1-michal.winiarski@intel.com> References: <20250402141122.2818478-1-michal.winiarski@intel.com> X-ClientProxiedBy: VI1PR06CA0129.eurprd06.prod.outlook.com (2603:10a6:803:a0::22) To DM4PR11MB5373.namprd11.prod.outlook.com (2603:10b6:5:394::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5373:EE_|SJ0PR11MB5213:EE_ X-MS-Office365-Filtering-Correlation-Id: 4771b498-e83a-4e15-1dd2-08dd71f058a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?lXLfdG6w8Za+i9NmxJwkHyiDXYk38Uq?= =?utf-8?q?kSZ5kUtGcRM6QYVg8+DNraXVqVrPFzmsHouqAvZwhEOtqNdnJSeAGybdF+Pn/osJG?= =?utf-8?q?/akNiDAvIimoLDfgbrgihZl8L9AHQ0gYn34AokQEcsuG5E1nI49EThq6f1PVNXNxM?= =?utf-8?q?4urzKx5EAFaNhE7fnpjYuGC2KPdNX3DUfgK6GE1jb2KFksfGGOW0GAEjDeXL6W9PD?= =?utf-8?q?2A2YYA2aRZxN8iYpO6oZOewPfgN2NVlLjZTB8Nk4u1c2qugvh0xbnf/MHd292koN2?= =?utf-8?q?Ay6JY3uZpAcPWtcCSRKh6oNlGDcjJCMRwaryYI/L1f8VFA6gH3IX+3exuAV0abJ+f?= =?utf-8?q?4fOcVKmVD9Fv3Mj29VDYG3rke2e2yfxfg8wHphUHN9gpQ50L4xSjBz+lG9M0ValE0?= =?utf-8?q?Zmt7/DfYC/HNrSxLaN/wKdUvTbxcyJew0d8uDm06n1UlLMuPvMVCMC9jVctsDUkHV?= =?utf-8?q?wQepuKSncUhQuMYzzpvG3SMhtBtvYN6VhcBHpthAOd2vdOakScHCGtVT0tdnF/fWt?= =?utf-8?q?73CDUBlyIlIFIklfqnVKLIo04944jdhZRuxUtoF1LWXOg5Hys5eji+AerPVXBGYob?= =?utf-8?q?iio2mKP3z6K7Zmu1FtTXAtspVluzUCJGsC/pjFUkG/mtdEKOEyREiRRZTN7G8vrdu?= =?utf-8?q?cif124nNKQyKEM7hgOslou02OIeSjcL4s59NUk1wRaZwgRYMGIOt7N6owXojWCQsC?= =?utf-8?q?rEy2cxhBh2Tjex3wUfpbn78+TQZWw5EYkHBMzahHCZFI2V14mqAteFWoJPzcFkkxc?= =?utf-8?q?HSMDcJka1MWawXsjD+Xt5f6IYIeFwOflhpESOYKteGojcinagSWkEZe77Mt3iu7pu?= =?utf-8?q?JGBOksVWAgfJOGnCv0IUI8xm74bYa/H6CP7AMxnOUefIMu+UlO3vFB/Jz8qWry2By?= =?utf-8?q?4mc1NCc+UaQ+NTCmSzdIPD51N2KWoBp8fnUKjX8eA8t+UqSBsyG3QpdteDNtKl5oj?= =?utf-8?q?zfj2XSOfwhyWW7l7jn2QObzHCdWfKt4FQpSZfKdOipe6aDqCgRxLeUckfOVyBouZI?= =?utf-8?q?dHPqnDsBu69aU5y6JhGeiZfZwdXtOElEZMBnyasPcNzuMRoFXgK/PycOV6617RO42?= =?utf-8?q?nXB7JEfSFoYMG4psPOjdJavEm5doCpvCE1U5nWeFfSeAcA7FIAFhaD55HGceLnh7E?= =?utf-8?q?HgCPJwMdXqjBgYE53OKOKBBtdE9jgtVOI3zRiuhnQFdwvsVjPaAeVuS2+bnRJpzXx?= =?utf-8?q?OjvS5WT+rrIL6w2RH0r6bZq1uuftxxym5gnMjLTLbfggdX5p1NXzX+VKwwoOyTbsY?= =?utf-8?q?YWWIieEk1D8knsYq8p1aERYS7+t8YyHYOcBbWdXVAxo1Frx5igwSRA4nLXzwIaGbF?= =?utf-8?q?lKJ9GFA/DCRk?= 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)(7416014)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?S5VZ7a/E1jQwp+NwG9Eu3hf0Fx1i?= =?utf-8?q?t431I8AT42nBRNwkIGHuW+U2EB8pYtOyR786+5qBucppJg2fdUJzHFIjHfWa1A9qx?= =?utf-8?q?xxSxpRizyy0ea6iLwNWcvHDHw0q5CkLYmOmvto4p9JRU1PT99Sqr3+hVJ3/3ZUZ1X?= =?utf-8?q?rANGJ5dHtVf86w+MdTcd8mF2DoMImgtEOVJowb26YUvINrByJOoucOOaLQ267pw+P?= =?utf-8?q?u3x1jwuRMs4Ejwz16VoLlvnydr0IUUZ8vUpYlmImUjyoYksXtIOvvL9rdj5XZx46g?= =?utf-8?q?vcSgCoR2MXEafvgNRor3qhPSoRYH46NFAscXvZ0WkYQdycJ9xD6tkTgm4fgPZamgX?= =?utf-8?q?WZFFAUrSHKUDFUM3IDXRTUPX9ue5P8qGSwOcjMHJ5ClNRoWcmxjmwxJofDgmgPIJy?= =?utf-8?q?FR4MBIqAzpfsReiFv2it9yfqcZtFeHSvM/PR7/PScyanLqved3W/2dUX64oowFOVO?= =?utf-8?q?wXIyTc/DEk49amBeH2IgWGTaKblK0NaWPDKmTYWjJf3WDbESWxDH2TpyBmASwng6c?= =?utf-8?q?+DS/wfOsx1Bf6d833iQgie75opW++LVsA7cQ+Kyph1dOaXGSIoQ0SIqFJgJ3jD9Px?= =?utf-8?q?XpPiiEAOL/D/OHMSwFkoqgKVDs3PvrAM1xpPWIFSubVQvuohYOW+S/yZFhkbB0qnf?= =?utf-8?q?YgjAEO3Mme5aAegIGSNc8N4e45jlribAsonwwwjKxFDHJmwbZ7qmSFTtcx91pIvFG?= =?utf-8?q?zr6sPGMv4YsXByM/CEFECNW2PfH4HHbcOITR+CKuj5RiWu598MQj37bkvDy+Yk+7y?= =?utf-8?q?bh7YrRrkXlpz00D0Fnp2ODt4Dwvw/19OaRA7wSNaWvrB4EMRR/Y9sXzoXz6f8qUhr?= =?utf-8?q?LhhJKtxVDPoz+aguUzw13TdJp74F+FAAv1L522X9EE2L9CBcwi5307tFzAriCTCCo?= =?utf-8?q?WCE7UF+M4H4ovcnsNzZbKmqoXk5CBTWPn4y8fxnvc6Wh2+fyvYQIg1/5wIVRxfDZP?= =?utf-8?q?tTP1GcVlYo/ErBNPGZZ6Y99tXn7JD/4GH+/2zm0ro/Az6S/HkAN4fnGzOkCqkyWrC?= =?utf-8?q?85eVKd0pWTDt78SaqqbjEQ4c0OgudOCfEoitOZKNfW8saU966aOvHDkQE97moJ+K8?= =?utf-8?q?Eq6nH/+cacba+RgC+trvmTQIoOy9ewBAu9+K/fO+Xi97i2B9g2BhZfH/zhAlYsdsK?= =?utf-8?q?kXSkttv4OKJTBNz9+3gAowQKTBIZ3t/pSxYgCpQrnk5ejTSNESs9XjIE09c1TX1Ve?= =?utf-8?q?gbgqwHCmxt92yHuu4MEeP1ox29PfLInmWjmPejXm+0X+HQz/VCEdC7+poKKJdzbpe?= =?utf-8?q?o3zwIY7aZCscLTtqa3pIc1XgqSan9Dc3MjZ6c/JfJhCPp+TnGJ6R+oz4xXm/oSgvh?= =?utf-8?q?Lt//3ZGUyzfufnF4fakhRBV85/TqBNSHNYEFJidFMQCJRgV6WL44dvp5YOZfpldAq?= =?utf-8?q?FCkQbrqO0IprYHWPlvvOFBgjBmSPjmZscm1MAZi2dk1ITrCRU4csa5cXF3SQtZbwU?= =?utf-8?q?Dy24KFiCCk/RGxS2WkAhzt45woUKx4ik8Wz2Kjncoqsrr7glcF2eXcfUUewXssfjy?= =?utf-8?q?pIGzlOLGoCO+3FKrpli5n8lqqEVn16eDAA=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 4771b498-e83a-4e15-1dd2-08dd71f058a1 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2025 14:12:05.1116 (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: 3EYOWMy3j+Q72q0BS9Y65m9F8EAgyzpGWvxiTm8GpINO/UfVhcvTCuTKn46lmpWissTHMeHyO5Cx0fyEIlzH39ydWKBXFE9HY2wA1MVqwAc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5213 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 try to set the largest possible BAR size that allows to fit the number of enabled VFs and inform the user in case the resize attempt is not successful. 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 09ee8a06fe2ed..4be566331ee15 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" @@ -111,6 +115,18 @@ static void pf_link_vfs(struct xe_device *xe, int num_vfs) } } +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); @@ -137,6 +153,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;