On Tue, Mar 08, 2016 at 11:33:32PM -0600, Bjorn Helgaas wrote:
> On Tue, Mar 08, 2016 at 11:27:01PM +0100, Rafael J. Wysocki wrote:
> > On Tue, Mar 8, 2016 at 11:21 PM, Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
> > > On Thu, Feb 11, 2016 at 05:47:07PM +0000, Lorenzo Pieralisi wrote:
> > >> The [0 - 64k] ACPI PCI IO port resource boundary check in:
> > >>
> > >> acpi_dev_ioresource_flags()
> > >>
> > >> is currently applied blindly in the ACPI resource parsing to all
> > >> architectures, but only x86 suffers from that IO space limitation.
> > >>
> > >> On arches (ie IA64 and ARM64) where IO space is memory mapped,
> > >> the PCI root bridges IO resource windows are firstly initialized from
> > >> the _CRS (in acpi_decode_space()) and contain the CPU physical address
> > >> at which a root bridge decodes IO space in the CPU physical address
> > >> space with the offset value representing the offset required to translate
> > >> the PCI bus address into the CPU physical address.
> > >>
> > >> The IO resource windows are then parsed and updated in arch code
> > >> before creating and enumerating PCI buses (eg IA64 add_io_space())
> > >> to map in an arch specific way the obtained CPU physical address range
> > >> to a slice of virtual address space reserved to map PCI IO space,
> > >> ending up with PCI bridges resource windows containing IO
> > >> resources like the following on a working IA64 configuration:
> > >>
> > >> PCI host bridge to bus 0000:00
> > >> pci_bus 0000:00: root bus resource [io 0x1000000-0x100ffff window] (bus
> > >> address [0x0000-0xffff])
> > >> pci_bus 0000:00: root bus resource [mem 0x000a0000-0x000fffff window]
> > >> pci_bus 0000:00: root bus resource [mem 0x80000000-0x8fffffff window]
> > >> pci_bus 0000:00: root bus resource [mem 0x80004000000-0x800ffffffff window]
> > >> pci_bus 0000:00: root bus resource [bus 00]
> > >>
> > >> This implies that the [0 - 64K] check in acpi_dev_ioresource_flags()
> > >> leaves platforms with memory mapped IO space (ie IA64) broken (ie kernel
> > >> can't claim IO resources since the host bridge IO resource is disabled
> > >> and discarded by ACPI core code, see log on IA64 with missing root bridge
> > >> IO resource, silently filtered by current [0 - 64k] check in
> > >> acpi_dev_ioresource_flags()):
> > >>
> > >> PCI host bridge to bus 0000:00
> > >> pci_bus 0000:00: root bus resource [mem 0x000a0000-0x000fffff window]
> > >> pci_bus 0000:00: root bus resource [mem 0x80000000-0x8fffffff window]
> > >> pci_bus 0000:00: root bus resource [mem 0x80004000000-0x800ffffffff window]
> > >> pci_bus 0000:00: root bus resource [bus 00]
> > >>
> > >> [...]
> > >>
> > >> pci 0000:00:03.0: [1002:515e] type 00 class 0x030000
> > >> pci 0000:00:03.0: reg 0x10: [mem 0x80000000-0x87ffffff pref]
> > >> pci 0000:00:03.0: reg 0x14: [io 0x1000-0x10ff]
> > >> pci 0000:00:03.0: reg 0x18: [mem 0x88020000-0x8802ffff]
> > >> pci 0000:00:03.0: reg 0x30: [mem 0x88000000-0x8801ffff pref]
> > >> pci 0000:00:03.0: supports D1 D2
> > >> pci 0000:00:03.0: can't claim BAR 1 [io 0x1000-0x10ff]: no compatible
> > >> bridge window
> > >>
> > >> For this reason, the IO port resources boundaries check in generic ACPI
> > >> parsing code should be moved to x86 arch code so that more arches (ie
> > >> ARM64) can benefit from the generic ACPI resources parsing interface
> > >> without incurring in unexpected resource filtering, fixing at the same
> > >> time current breakage on IA64.
> > >>
> > >> This patch moves the IO ports boundary [0 - 64k] check to x86 arch code
> > >> code that validates the PCI host bridge resources.
> > >
> > > I definitely agree with moving this check out of the generic ACPI
> > > code, so while I have a minor question below,
> > >
> > > Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> > >
> > >> Fixes: 3772aea7d6f3 ("ia64/PCI/ACPI: Use common ACPI resource parsing
> > >> interface for host bridge")
> > >
> > > 3772aea7d6f3 was merged via the ACPI tree. Does it make sense to
> > > have this fix for it merged the same way? I'll assume so unless
> > > Rafael thinks otherwise.
> >
> > I'll apply it, thanks!
> >
> > >> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> > >> Tested-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
> > >> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> > >> Cc: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
> > >> Cc: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx>
> > >> Cc: Tony Luck <tony.luck@xxxxxxxxx>
> > >> Cc: Tomasz Nowicki <tn@xxxxxxxxxxxx>
> > >> Cc: Mark Salter <msalter@xxxxxxxxxx>
> > >> Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
> > >> ---
> > >> v1 -> v2
> > >>
> > >> - Updated commit log to report missing IO resources
> > >> - Fixed function ioport_valid() comment 16k/64k typo
> > >>
> > >> v1: https://lkml.org/lkml/2016/2/1/157
> > >>
> > >> arch/x86/pci/acpi.c | 18 +++++++++++++-----
> > >> drivers/acpi/resource.c | 3 ---
> > >> 2 files changed, 13 insertions(+), 8 deletions(-)
> > >>
> > >> diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
> > >> index 3cd6983..cec68e7 100644
> > >> --- a/arch/x86/pci/acpi.c
> > >> +++ b/arch/x86/pci/acpi.c
> > >> @@ -275,11 +275,14 @@ static void pci_acpi_root_release_info(struct acpi_pci_root_info *ci)
> > >> * to access PCI configuration space.
> > >> *
> > >> * So explicitly filter out PCI CFG IO ports[0xCF8-0xCFF].
> > >> + *
> > >> + * Furthermore, IO ports address space is limited to 64k on x86,
> > >> + * any IO resource exceeding the boundary must therefore be discarded.
> > >> */
> > >> -static bool resource_is_pcicfg_ioport(struct resource *res)
> > >> +static bool ioport_valid(struct resource *res)
> > >> {
> > >> - return (res->flags & IORESOURCE_IO) &&
> > >> - res->start == 0xCF8 && res->end == 0xCFF;
> > >> + return !(res->start == 0xCF8 && res->end == 0xCFF) &&
> > >> + !(res->end >= 0x10003);
> > >
> > > Is the "res->end >= 0x10003" test actually fixing a problem?
> > >
> > > I think 4d6b4e69a245 ("x86/PCI/ACPI: Use common interface to support
> > > PCI host bridge") is the x86 change corresponding to 3772aea7d6f3. I
> > > took a quick look through it, and I didn't see a res->end test before
> > > 4d6b4e69a245, but maybe I missed it.
> > >
> > > The reason I'm asking is because there's no reason in principle that
> > > x86 couldn't support multiple host bridges, one with a 0-64K I/O space
> > > accessible via the x86 inb/outb instructions, and others with more I/O
> > > space accessible only via the in-kernel inb()/outb() functions, which
> > > would use an MMIO region that the host bridge converts to I/O accesses
> > > on the PCI side. This is what ia64 does, and x86 could do something
> > > similar. If it did, it would be fine for res->end to be above
> > > 0x10003 for those memory-mapped I/O spaces.
> >
> > Interesting, but I guess quite theoretical. :-)
> >
> > In any case I think that may be fixed up on top of the $subject patch.
>
> Wait a minute, this doesn't seem right to me.
>
> The problem we're trying to fix is that on ia64, we incorrectly
> discard the PCI host bridge window [io 0x1000000-0x100ffff window].
>
> That window is currently discarded by the generic
> acpi_dev_ioresource_flags() function, where we're removing this code:
>
> - if (res->end >= 0x10003)
> - res->flags |= IORESOURCE_DISABLED | IORESOURCE_UNSET;
>
> and we're adding the "res->end >= 0x10003" check to
> arch/x86/pci/acpi.c.
>
> But the removal also affects other users of acpi_dev_ioresource_flags(),
> and that's broader than the scope of this patch. We might want to
> remove the check, but if we do, it should be in a separate patch by
> itself so it isn't a hidden side-effect of fixing this ia64 problem.
>
> The other users of acpi_dev_ioresource_flags() include:
>
> {acpi_lpss_create_device,acpi_create_platform_device,acpi_pci_probe_root_resources,acpi_default_enumeration,bcm_acpi_probe,tpm_tis_acpi_init,acpi_dma_parse_resource_group,acpi_dma_request_slave_chan_by_index,acpi_gpio_resource_lookup,acpi_gpio_count,acpi_i2c_add_device,inv_mpu_process_acpi_config,acpi_spi_add_device}
> acpi_dev_get_resources
> acpi_dev_process_resource
> acpi_dev_resource_io
> acpi_dev_get_ioresource
> acpi_dev_ioresource_flags
>
> {pnpacpi_add_device,resources_store}
> pnpacpi_parse_allocated_resource
> pnpacpi_allocated_resource
> acpi_dev_resource_io
> acpi_dev_get_ioresource
> acpi_dev_ioresource_flags
>
> I think the original test in acpi_dev_ioresource_flags() isn't quite
> correct because it's generic code, but it enforces an arch-specific
> 64K limit.
Yes, I was about to write to you I noticed the same issue.
That (>=0x10003) check in generic code is an x86ism, it is wrong but
it is there and given that there are other potential
users of acpi_dev_ioresource_flags() this patch should
be dropped I do not want to trigger x86 regressions because
some IO resources are not filtered.
I am travelling, so can't have a proper look till next week,
Rafael, please drop this patch.
> Maybe acpi_dev_ioresource_flags() should instead check res->end
> against ioport_resource.end, as we already do in
> acpi_pci_root_validate_resources()? Each arch already sets its own
> ioport_resource.end using IO_SPACE_LIMIT:
>
> arch/x86/include/asm/io.h #define IO_SPACE_LIMIT 0xffff
> arch/ia64/include/asm/io.h #define IO_SPACE_LIMIT 0xffffffffffffffffUL
We can't do that, it may work on IA64 but the ioport_resource is a
chunk of address space on IA64/ARM64 that has nothing to do with
the physical address at which the root bridges decode IO space (which
is what's contained in the resource).
I will have a look next week, please drop this patch.
Thanks,
Lorenzo
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
