mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-29 17:30:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/radeon: Fix VFCT bus number matching with soft filter

Browse Source 
On systems where PCI bus renumbering occurs (e.g. pci=realloc,
resource conflicts), the runtime bus number may differ from the
BIOS POST bus number recorded in the VFCT table. This causes
radeon_acpi_vfct_bios() to fail finding the VBIOS even though
the correct device entry exists.

Introduce radeon_acpi_vfct_match() which treats the bus number
as a soft filter: vendor/device/function identity is the hard
requirement, while exact bus match is the preferred path. When
bus numbers disagree but device identity matches, accept the
VFCT entry and log a dev_notice for diagnostics. This mirrors the
equivalent amdgpu change.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260708193518.702584-5-mario.limonciello@amd.com
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Mario Limonciello
2026-07-08 14:35:17 -05:00
committed by Alex Deucher
parent 24071402a4
commit 4059e2f02c
1 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/gpu/drm/radeon/radeon_bios.c
View File

@@ -596,6 +596,45 @@ static bool radeon_read_disabled_bios(struct radeon_device *rdev)
return legacy_read_disabled_bios(rdev); return legacy_read_disabled_bios(rdev);
} }
/**
* radeon_acpi_vfct_match() - Check if a VFCT entry matches the device
* @rdev: Radeon device
* @vhdr: VFCT image header to check
*
* 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.
*
* Returns: 0 on match, -ENODEV on no match
*/
static int radeon_acpi_vfct_match(struct radeon_device *rdev,
VFCT_IMAGE_HEADER *vhdr)
{
/* Vendor and device IDs must always match */
if (vhdr->VendorID != rdev->pdev->vendor ||
vhdr->DeviceID != rdev->pdev->device)
return -ENODEV;
if (vhdr->PCIDevice != PCI_SLOT(rdev->pdev->devfn) ||
vhdr->PCIFunction != PCI_FUNC(rdev->pdev->devfn))
return -ENODEV;
/* Exact bus number match - preferred */
if (vhdr->PCIBus == rdev->pdev->bus->number)
return 0;
/* Bus mismatch but device identity matches (PCI renumbering case) */
dev_notice(&rdev->pdev->dev,
"VFCT bus number mismatch: table %u != runtime %u, matching by device identity (vendor 0x%04x device 0x%04x)\n",
vhdr->PCIBus, rdev->pdev->bus->number,
rdev->pdev->vendor, rdev->pdev->device);
return 0;
}
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
{ {
@@ -633,11 +672,7 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
} }
if (vhdr->ImageLength && if (vhdr->ImageLength &&
vhdr->PCIBus == rdev->pdev->bus->number && !radeon_acpi_vfct_match(rdev, vhdr)) {
vhdr->PCIDevice == PCI_SLOT(rdev->pdev->devfn) &&
vhdr->PCIFunction == PCI_FUNC(rdev->pdev->devfn) &&
vhdr->VendorID == rdev->pdev->vendor &&
vhdr->DeviceID == rdev->pdev->device) {
rdev->bios = kmemdup(&vbios->VbiosContent, rdev->bios = kmemdup(&vbios->VbiosContent,
vhdr->ImageLength, vhdr->ImageLength,
GFP_KERNEL); GFP_KERNEL);