From mboxrd@z Thu Jan 1 00:00:00 1970 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 114DFC282DE for ; Thu, 13 Mar 2025 09:46:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B326410E818; Thu, 13 Mar 2025 09:46:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DOZ7Cs0s"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B64110E818; Thu, 13 Mar 2025 09:46: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=1741859165; x=1773395165; h=from:date:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=KnDKEsArudUs0xPOlJ+UrPFKez4u7XPSRF38hrC27AY=; b=DOZ7Cs0sRaTKqYvXiRIye7u2Y0gOZ6eDl+Gb1gBrJ9JRYlJC9Mwbxn9J 1cC+VjcR9/zhs2C0jiQE4urJKhDMNfw7fWRgN/MjoQ6P6el+SPVLGJWZR XLxqUMpIRTdu0qOluD4iLc222mS4NG8H4G2vHGW3s1Ny1kht5qtJjCcUl saRLyAGPYl0M++zTapDSKz6ULxCPSMBcmYUihJYom6IVUdx1jgAJGAumT ClQUOL+Zq90+YpuESiJb8XLVBqv1GUSOqGIhN3VpWIQhTv9z4bgalOvjl 0FMApkSP7hZNdpj4KNiA+9fYxi+R7Ia+dIXzqmigLAQs1nx3gyz+IzMq3 w==; X-CSE-ConnectionGUID: zO8S+IegSK+EzwQvwPBsCw== X-CSE-MsgGUID: HkXGWol3R86hsA0BGdujgQ== X-IronPort-AV: E=McAfee;i="6700,10204,11371"; a="42218668" X-IronPort-AV: E=Sophos;i="6.14,244,1736841600"; d="scan'208";a="42218668" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2025 02:46:04 -0700 X-CSE-ConnectionGUID: OgZTVnicSw2ndjoz67HmGA== X-CSE-MsgGUID: h+IV8g1JRiycZ2xpDz+NkA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,244,1736841600"; d="scan'208";a="121400702" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.245.195]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2025 02:45:59 -0700 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Thu, 13 Mar 2025 11:45:45 +0200 (EET) To: =?ISO-8859-2?Q?Micha=B3_Winiarski?= cc: linux-pci@vger.kernel.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, LKML , Bjorn Helgaas , =?ISO-8859-15?Q?Christian_K=F6nig?= , =?ISO-8859-2?Q?Krzysztof_Wilczy=F1ski?= , Rodrigo Vivi , Michal Wajdeczko , Lucas De Marchi , =?ISO-8859-15?Q?Thomas_Hellstr=F6m?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matt Roper Subject: Re: [PATCH v5 1/6] PCI/IOV: Restore VF resizable BAR state after reset In-Reply-To: <20250312225949.969716-2-michal.winiarski@intel.com> Message-ID: References: <20250312225949.969716-1-michal.winiarski@intel.com> <20250312225949.969716-2-michal.winiarski@intel.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323328-1098235586-1741859145=:1742" X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-1098235586-1741859145=:1742 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE On Wed, 12 Mar 2025, Micha=C5=82 Winiarski wrote: > Similar to regular resizable BAR, VF BAR can also be resized, e.g. by > the system firmware or the PCI subsystem itself. >=20 > Add the capability ID and restore it as a part of IOV state. >=20 > See PCIe r4.0, sec 9.3.7.4. >=20 > Signed-off-by: Micha=C5=82 Winiarski > Reviewed-by: Ilpo J=C3=A4rvinen > Reviewed-by: Christian K=C3=B6nig > --- > drivers/pci/iov.c | 29 ++++++++++++++++++++++++++++- > include/uapi/linux/pci_regs.h | 1 + > 2 files changed, 29 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c > index 121540f57d4bf..eb4d33eacacb8 100644 > --- a/drivers/pci/iov.c > +++ b/drivers/pci/iov.c > @@ -7,6 +7,7 @@ > * Copyright (C) 2009 Intel Corporation, Yu Zhao > */ > =20 > +#include > #include > #include > #include > @@ -868,6 +869,30 @@ static void sriov_release(struct pci_dev *dev) > =09dev->sriov =3D NULL; > } > =20 > +static void sriov_restore_vf_rebar_state(struct pci_dev *dev) > +{ > +=09unsigned int pos, nbars, i; > +=09u32 ctrl; > + > +=09pos =3D pci_find_ext_capability(dev, PCI_EXT_CAP_ID_VF_REBAR); > +=09if (!pos) > +=09=09return; FYI, the commit f7c9bb759161 ("PCI: Cache offset of Resizable BAR=20 capability") which is currently in pci/enumeration makes this simpler. > +=09pci_read_config_dword(dev, pos + PCI_REBAR_CTRL, &ctrl); > +=09nbars =3D FIELD_GET(PCI_REBAR_CTRL_NBAR_MASK, ctrl); > + > +=09for (i =3D 0; i < nbars; i++, pos +=3D 8) { > +=09=09int bar_idx, size; > + > +=09=09pci_read_config_dword(dev, pos + PCI_REBAR_CTRL, &ctrl); > +=09=09bar_idx =3D FIELD_GET(PCI_REBAR_CTRL_BAR_IDX, ctrl); > +=09=09size =3D pci_rebar_bytes_to_size(dev->sriov->barsz[bar_idx]); > +=09=09ctrl &=3D ~PCI_REBAR_CTRL_BAR_SIZE; > +=09=09ctrl |=3D FIELD_PREP(PCI_REBAR_CTRL_BAR_SIZE, size); > +=09=09pci_write_config_dword(dev, pos + PCI_REBAR_CTRL, ctrl); > +=09} > +} > + > static void sriov_restore_state(struct pci_dev *dev) > { > =09int i; > @@ -1027,8 +1052,10 @@ resource_size_t pci_sriov_resource_alignment(struc= t pci_dev *dev, int resno) > */ > void pci_restore_iov_state(struct pci_dev *dev) > { > -=09if (dev->is_physfn) > +=09if (dev->is_physfn) { > +=09=09sriov_restore_vf_rebar_state(dev); > =09=09sriov_restore_state(dev); > +=09} > } > =20 > /** > diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.= h > index 3c2558b98d225..aadd483c47d6f 100644 > --- a/include/uapi/linux/pci_regs.h > +++ b/include/uapi/linux/pci_regs.h > @@ -744,6 +744,7 @@ > #define PCI_EXT_CAP_ID_L1SS=090x1E=09/* L1 PM Substates */ > #define PCI_EXT_CAP_ID_PTM=090x1F=09/* Precision Time Measurement */ > #define PCI_EXT_CAP_ID_DVSEC=090x23=09/* Designated Vendor-Specific */ > +#define PCI_EXT_CAP_ID_VF_REBAR 0x24=09/* VF Resizable BAR */ > #define PCI_EXT_CAP_ID_DLF=090x25=09/* Data Link Feature */ > #define PCI_EXT_CAP_ID_PL_16GT=090x26=09/* Physical Layer 16.0 GT/s */ > #define PCI_EXT_CAP_ID_NPEM=090x29=09/* Native PCIe Enclosure Management= */ >=20 --=20 i. --8323328-1098235586-1741859145=:1742--