From: Bjorn Helgaas <helgaas@kernel.org>
To: Mario Limonciello <mario.limonciello@amd.com>
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Oz Tiram" <oz@shift-computing.de>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
"Lijo Lazar" <lijo.lazar@amd.com>,
"Reza Nikzad Chaleshori" <rezanikzadch@gmail.com>
Subject: Re: [PATCH v7 2/3] drm/amdgpu: Match VFCT using initial PCI bus number
Date: Thu, 19 Nov 2026 10:53:48 -0600 [thread overview]
Message-ID: <20261119165348.GA811401@bhelgaas> (raw)
In-Reply-To: <20261112-vfct-regression-v7-2-69b1e0cf45c2@amd.com>
[+cc Lijo]
On Thu, Nov 12, 2026 at 03:54:54PM -0600, Mario Limonciello wrote:
> VFCT records the PCI bus number from BIOS POST. The current bus number
> can change after PCI core renumbers the bus, while accepting a mismatch
> based only on device identity can select the wrong VFCT image when
> matching devices are present. Compare against the bus number captured
> from the firmware bus assignment before bridge renumbering.
>
> Reported-by: Reza Nikzad Chaleshori <rezanikzadch@gmail.com>
> Closes: https://lore.kernel.org/amd-gfx/20261014080523.186533-1-rezanikzadch@gmail.com/
> Fixes: 11c141672045f ("drm/amdgpu: Fix VFCT bus number matching with soft filter")
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 23 ++++++++++-------------
> 1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> index 08ed1eb695586..0ee4c6462c4d0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
> @@ -386,16 +386,17 @@ static bool amdgpu_read_disabled_bios(struct amdgpu_device *adev)
> * VFCT entries contain the PCI bus number as recorded during BIOS POST.
> * On systems where the kernel renumbers PCI buses (e.g. pci=realloc or
> * resource conflicts), the runtime bus number may differ from the POST
> - * value. Match by device identity (vendor + device + function) and use
> - * the bus number as a preference: exact bus match is preferred, but when
> - * the bus numbers disagree we accept the entry if the device identity
> - * matches.
> + * value. Match using the bus number captured when the device was
> + * discovered, before any bus renumbering.
> *
> * Returns: 0 on match, -ENODEV on no match
> */
> static int amdgpu_acpi_vfct_match(struct amdgpu_device *adev,
> VFCT_IMAGE_HEADER *vhdr)
> {
> + struct pci_dev *bridge = adev->pdev->bus->self;
pci_upstream_bridge() does this and handles the case where pdev is an
SR-IOV VF (that case probably never applies here, but we can still
avoid that assumption).
> + unsigned char initial_bus;
> +
> /* Vendor and device IDs must always match */
> if (vhdr->VendorID != adev->pdev->vendor ||
> vhdr->DeviceID != adev->pdev->device)
> @@ -405,16 +406,12 @@ static int amdgpu_acpi_vfct_match(struct amdgpu_device *adev,
> vhdr->PCIFunction != PCI_FUNC(adev->pdev->devfn))
> return -ENODEV;
>
> - /* Exact bus number match - preferred */
> - if (vhdr->PCIBus == adev->pdev->bus->number)
> - return 0;
> + if (bridge && bridge->fw_sec_bus_valid)
> + initial_bus = bridge->fw_sec_busnr;
> + else
> + initial_bus = adev->pdev->bus->number;
Why can't we use bridge->fw_sec_busnr unconditionally? The bus number
at FW/OS handoff is the only bus number firmware could possibly know
about.
It seems like this should just be:
if (vhdr->PCIBus == bridge->fw_sec_busnr &&
vhdr->PCIDevice == PCI_SLOT(adev->pdev->devfn) &&
vhdr->PCIFunction == PCI_FUNC(adev->pdev->devfn))
return 0; /* match */
return -ENODEV; /* no match */
It seems like the bus/device/function match should be solid by itself,
so I don't know why you need to check Vendor/Device IDs (but I don't
object if you do).
Maybe this boolean style is typical in DRM, and it does match the
strcmp() style, but it seems weird to me to write
if (!amdgpu_acpi_vfct_match(...))
/* do the matching case */
> - /* Bus mismatch but device identity matches (PCI renumbering case) */
> - dev_notice(adev->dev,
> - "VFCT bus number mismatch: table %u != runtime %u, matching by device identity (vendor 0x%04x device 0x%04x)\n",
> - vhdr->PCIBus, adev->pdev->bus->number,
> - adev->pdev->vendor, adev->pdev->device);
> - return 0;
> + return vhdr->PCIBus == initial_bus ? 0 : -ENODEV;
> }
>
> static bool amdgpu_acpi_vfct_bios(struct amdgpu_device *adev)
>
> --
> 2.43.0
>
next prev parent reply other threads:[~2026-11-19 16:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-12 21:54 [PATCH v7 0/3] Fix VFCT matching after PCI bus renumbering Mario Limonciello
2026-11-12 21:54 ` [PATCH v7 1/3] PCI: Cache bridge firmware secondary bus number Mario Limonciello
2026-11-13 1:05 ` sashiko-bot
2026-11-13 15:00 ` Lazar, Lijo
2026-11-19 16:53 ` Bjorn Helgaas
2026-11-12 21:54 ` [PATCH v7 2/3] drm/amdgpu: Match VFCT using initial PCI " Mario Limonciello
2026-11-13 0:59 ` sashiko-bot
2026-11-19 16:53 ` Bjorn Helgaas [this message]
2026-11-12 21:54 ` [PATCH v7 3/3] drm/radeon: " Mario Limonciello
2026-11-13 0:58 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119165348.GA811401@bhelgaas \
--to=helgaas@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=lijo.lazar@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=oz@shift-computing.de \
--cc=rezanikzadch@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.