On Wed, Jun 12, 2019 at 08:19:40AM +1000, Benjamin Herrenschmidt wrote: > On Tue, 2019-06-11 at 15:58 +0100, Lorenzo Pieralisi wrote: > > > > > > if (obj && obj->type == ACPI_TYPE_INTEGER && obj->integer.value == 0) { > > /* preserve existing resource assignment */ > > pci_bus_claim_resources(bus); > > } > > > > pci_bus_size_bridges(bus); > > pci_bus_assign_resources(bus); > > So that makes me nervous... my understanding is that the pair > > pci_bus_size_bridges(bus); > pci_bus_assign_resources(bus); > > Is intended for full reassignment. Now they will try to skip resources > that already have a parent, but that's yet another code path. What's > wrong with pci_unassigned_* ? That's what it's meant for... Nothing wrong, we have not understood each others. What I am asking is to write it like this: if (obj && obj->type == ACPI_TYPE_INTEGER && obj->integer.value == 0) { /* preserve existing resource assignment */ pci_bus_claim_resources(bus); } /* this code path should be common, indipendent of _DSM #5 pci_assign_unassigned_root_bus_resources(bus); There is no reason to have two distinct code paths, current code can call: pci_assign_unassigned_root_bus_resources(bus); instead of pci_bus_size_bridges(bus); pci_bus_assign_resources(bus); Actually, current code is *questionable* given that AFAICS it does not account for hotplug bridges additional memory window size. > > That's how it should be I think: > > > > 1) we do not want pci_assign_unassigned_root_bus_resources(bus) to > > reallocate resources already claimed (see realloc parameter), do we ? > > Well, realloc is useful to handle SR_IOV when the BIOS doesn't do it > right (common case). That said, at this point, we should be able to > honor IORESOURCE_PCI_FIXED for things that have _DSM #5 since they have > been claimed. I don't see that realloc logic being a problem for us, > and I want to avoid gratuitous differences with x86, but maybe I'm > missing something here... See above. The conditions that make IORESOURCE_PCI_FIXED work are still unclear to me. > > 2) pci_bus_size_bridges(bus) and pci_bus_assign_resources(bus) should > > not interfere with resources already claimed so it *should* be safe > > to call them anyway > > Sure, *should* and here we introduce yet another way of doing things > though... Any reason we don't want to do what x86 does here ? No, see above, keeping in mind that what x86 does is still not very well defined AFAICS. > > Most importantly: I want everyone to agree that claiming is equivalent > > to making a resource immutable (except for realloc, see (1) above) > > because that's what we are doing by claiming on _DSM #5 == 0. > > I think the combination of claiming *and* IORESOURCE_PCI_FIXED is what > makes it *really* immutable. I'm a bit confused by the realloc logic > right now, I'll need more quality time looking at it after ingesting > more caffeing but I'm under the impression that it will honor the flag. Likewise, this requires some fuzzing because it is really hard to understand by perusing the code. > > There are too many ways to make a resource immutable in the kernel > > and this is confusing and prone to bugs. > > It is, but I don't want to create new ways of doing things, and what > you seem to propose is a new way imho :-) No, see above. What I am saying is that we have IORESOURCE_PCI_FIXED, res->parent != NULL and Enhanced allocation to make a BAR immutable and before going any further it would be great if we understand their interaction given that we are starting from a pseudo clean slate. If we fail to do that it is quirks later (and I would rather avoid seeing x86 command line parameters to work around them). Cheers, Lorenzo > Cheers, > Ben. > > > Thanks, > > Lorenzo > > > > > + ACPI_FREE(obj); > > > > > > list_for_each_entry(child, &bus->children, node) > > > pcie_bus_configure_settings(child); > > > diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h > > > index 8082b612f561..62b7fdcc661c 100644 > > > --- a/include/linux/pci-acpi.h > > > +++ b/include/linux/pci-acpi.h > > > @@ -107,9 +107,10 @@ static inline void acpiphp_check_host_bridge(struct acpi_device *adev) { } > > > #endif > > > > > > extern const guid_t pci_acpi_dsm_guid; > > > -#define DEVICE_LABEL_DSM 0x07 > > > -#define RESET_DELAY_DSM 0x08 > > > -#define FUNCTION_DELAY_DSM 0x09 > > > +#define IGNORE_PCI_BOOT_CONFIG_DSM 0x05 > > > +#define DEVICE_LABEL_DSM 0x07 > > > +#define RESET_DELAY_DSM 0x08 > > > +#define FUNCTION_DELAY_DSM 0x09 > > > > > > #else /* CONFIG_ACPI */ > > > static inline void acpi_pci_add_bus(struct pci_bus *bus) { } > > > > > > >