d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the fixed memory type to the pci ecam driver

Browse Source 
Add ACPI_RESOURCE_TYPE_FIXED_MEMORY32 to the PCI ECAM driver. This is
used on the Microsoft Dev Kit 2023 and reportedly the Lenovo x13s.

Reviewed by:	Robert Clausecker <fuz@fuz.su> (Earlier version)
Tested by:	Robert Clausecker <fuz@fuz.su> (Earlier version)
Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D38031
This commit is contained in:
Andrew Turner 2023-01-18 09:30:46 +00:00
parent a85cf421d1
commit 896f556205
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/pci/pci_host_generic_acpi.c
View File

@ -142,25 +142,42 @@ pci_host_generic_acpi_parse_resource(ACPI_RESOURCE *res, void *arg)
device_t dev = (device_t)arg;
struct generic_pcie_acpi_softc *sc;
rman_res_t min, max, off;
int r;
int r, restype;
sc = device_get_softc(dev);
r = sc->base.nranges;
switch (res->Type) {
case ACPI_RESOURCE_TYPE_ADDRESS16:
restype = res->Data.Address16.ResourceType;
min = res->Data.Address16.Address.Minimum;
max = res->Data.Address16.Address.Maximum;
break;
case ACPI_RESOURCE_TYPE_ADDRESS32:
restype = res->Data.Address32.ResourceType;
min = res->Data.Address32.Address.Minimum;
max = res->Data.Address32.Address.Maximum;
off = res->Data.Address32.Address.TranslationOffset;
break;
case ACPI_RESOURCE_TYPE_ADDRESS64:
restype = res->Data.Address64.ResourceType;
min = res->Data.Address64.Address.Minimum;
max = res->Data.Address64.Address.Maximum;
off = res->Data.Address64.Address.TranslationOffset;
break;
case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
/*
* The Microsoft Dev Kit 2023 uses a fixed memory region
* for some PCI controllers. For this memory the
* ResourceType is ACPI_IO_RANGE meaning we create an IO
* resource. As drivers expect it to be a memory resource
* force the type here.
*/
restype = ACPI_MEMORY_RANGE;
min = res->Data.FixedMemory32.Address;
max = res->Data.FixedMemory32.Address +
res->Data.FixedMemory32.AddressLength - 1;
off = 0;
break;
default:
return (AE_OK);
}
@ -171,9 +188,9 @@ pci_host_generic_acpi_parse_resource(ACPI_RESOURCE *res, void *arg)
sc->base.ranges[r].pci_base = min;
sc->base.ranges[r].phys_base = min + off;
sc->base.ranges[r].size = max - min + 1;
if (res->Data.Address.ResourceType == ACPI_MEMORY_RANGE)
if (restype == ACPI_MEMORY_RANGE)
sc->base.ranges[r].flags |= FLAG_TYPE_MEM;
else if (res->Data.Address.ResourceType == ACPI_IO_RANGE)
else if (restype == ACPI_IO_RANGE)
sc->base.ranges[r].flags |= FLAG_TYPE_IO;
sc->base.nranges++;
} else if (res->Data.Address.ResourceType == ACPI_BUS_NUMBER_RANGE) {