Skip to content

L
linux
Switch branch/tag
  1. 24 Feb, 2012 23 commits
    • Bjorn Helgaas's avatar
      mips/PCI: get rid of device resource fixups · 96a6b9ad
      Bjorn Helgaas authored 
      Tell the PCI core about host bridge address translation so it can take
care of bus-to-resource conversion for us.

Here's the wrinkle on Cobalt: we can't generate normal I/O port addresses
on PCI because the GT-64111 doesn't do any address translation, so we have
this:

  CPU I/O port addresses		[io 0x0000-0xffffff]
  PCI bus I/O port addresses	[io 0x10000000-0x10ffffff]

Legacy-mode IDE controllers start out with the legacy bus addresses, e.g.,
0x1f0, assigned by pci_setup_device().  These are outside the range of
addresses GT-64111 can generate on PCI, but pcibios_fixup_device_resources()
converted them to CPU addresses anyway by adding io_offset.  Therefore, we
had to pre-adjust them in cobalt_legacy_ide_fixup().

With io_offset = 0xf0000000, we had this:

  res->start = 0x1f0	initialized in pci_setup_device()
  res->start = 0x100001f0	-= io_offset in cobalt_legacy_ide_fixup()
  res->start = 0x1f0	+= io_offset in pcibios_fixup_device_resources()

The difference after this patch is that the generic pci_bus_to_resource()
only adds the offset if the bus address is inside a host bridge window.
Since 0x1f0 is not a valid bus address and is not inside any windows, it is
unaffected, so we now have this:

  region->start = 0x1f0	initialized in pci_setup_device()
  res->start = 0x1f0	no offset by pci_bus_to_resource()

That means we can remove both pcibios_fixup_device_resources() and
cobalt_legacy_ide_fixup().

I would *rather* set the host bridge offset to zero (which corresponds
to what the GT-64111 actually does), and have both CPU and PCI addresses
of [io 0x10000000-0x10ffffff].  However, that would require changes to
generic code that assumes legacy I/O addresses, such as pic1_io_resource
([io 0x0020-0x00021]), and we'd have to keep a Cobalt IDE fixup.

Of course, none of this changes the fact that references to I/O port
0x1f0 actually go to port 0x100001f0, not 0x1f0, on the Cobalt PCI bus.
Fortunately the VT82C586 IDE controller only decodes the low 24 address
bits, so it does work.

CC: Ralf Baechle <ralf@linux-mips.org>
CC: Yoichi Yuasa <yuasa@linux-mips.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      96a6b9ad
    • Bjorn Helgaas's avatar
      microblaze/PCI: get rid of device resource fixups · aa23bdc0
      Bjorn Helgaas authored 
      Tell the PCI core about host bridge address translation so it can take
care of bus-to-resource conversion for us.

CC: Michal Simek <monstr@monstr.eu>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      aa23bdc0
    • Bjorn Helgaas's avatar
      ia64/PCI: get rid of device resource fixups · 10d1cd2b
      Bjorn Helgaas authored 
      Tell the PCI core about host bridge address translation so it can take
care of bus-to-resource conversion for us.

CC: Tony Luck <tony.luck@intel.com>
CC: Jack Steiner <steiner@sgi.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      10d1cd2b
    • Bjorn Helgaas's avatar
      ia64/PCI: SN: convert to pci_scan_root_bus() for correct root bus resources · f920b55d
      Bjorn Helgaas authored 
      Convert from pci_scan_bus() to pci_scan_root_bus().  Supply the root
bus resources from bussoft.  When we move the resource adjustment from
pcibios_fixup_resources() to the PCI core, it will be important to have
the root bus resources correct from the beginning.

CC: Tony Luck <tony.luck@intel.com>
CC: Jack Steiner <steiner@sgi.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      f920b55d
    • Bjorn Helgaas's avatar
      arm/PCI: get rid of device resource fixups · 9f786d03
      Bjorn Helgaas authored 
      Tell the PCI core about host bridge address translation so it can take
care of bus-to-resource conversion for us.

CC: Russell King <linux@arm.linux.org.uk>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      9f786d03
    • Bjorn Helgaas's avatar
      alpha/PCI: get rid of device resource fixups · c04d9e35
      Bjorn Helgaas authored 
      Tell the PCI core about host bridge address translation so it can take
care of bus-to-resource conversion for us.

CC: linux-alpha@vger.kernel.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      c04d9e35
    • Bjorn Helgaas's avatar
      PCI: add generic pcibios_resource_to_bus() · 36a66cd6
      Bjorn Helgaas authored 
      This replaces the generic versions of pcibios_resource_to_bus() and
pcibios_bus_to_resource() in asm-generic/pci.h with versions that use
pci_resource_to_bus() and pci_bus_to_resource().

The replacements are equivalent except that they can apply host
bridge window offsets when the arch has supplied them by using
pci_add_resource_offset().

Each arch can convert to using pci_add_resource_offset() individually by
removing its device resource fixups from pcibios_fixup_bus() and supplying
ARCH_HAS_GENERIC_PCI_OFFSETS.  ARCH_HAS_GENERIC_PCI_OFFSETS can be removed
after all have converted.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      36a66cd6
    • Bjorn Helgaas's avatar
      PCI: convert bus addresses to resource when reading BARs · 5bfa14ed
      Bjorn Helgaas authored 
      Some PCI host bridges translate CPU addresses to PCI bus addresses.
Previously, we initialized pci_dev resources with PCI bus addresses,
then converted them to CPU addresses later in arch-specific code
(pcibios_fixup_resources()), which leaves a window of time where the
pci_dev resources are incorrect.

This patch adds support in the core for this address translation.
When the arch creates the root bus, it can supply the host bridge
address translation information, and the core can use it to set the
pci_dev resources correctly from the beginning.

This gives us a way to fix the problem that quirks that run between device
discovery and pcibios_fixup_resources() fail because they use pci_dev
resources that haven't been converted.  The reference below is to one
such problem that affected ARM and ia64.

Note that this patch has no effect until an arch starts using
pci_add_resource_offset() with a non-zero offset: before that, all
all host bridge windows have a zero offset and pci_bus_to_resource()
copies the pci_bus_region directly to the struct resource.

Reference: https://lkml.org/lkml/2009/10/12/405Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      5bfa14ed
    • Bjorn Helgaas's avatar
      PCI: add struct pci_host_bridge_window with CPU/bus address offset · 0efd5aab
      Bjorn Helgaas authored 
      Some PCI host bridges apply an address offset, so bus addresses on PCI are
different from CPU addresses.  This patch adds a way for architectures to
tell the PCI core about this offset.  For example:

    LIST_HEAD(resources);
    pci_add_resource_offset(&resources, host->io_space, host->io_offset);
    pci_add_resource_offset(&resources, host->mem_space, host->mem_offset);
    pci_scan_root_bus(parent, bus, ops, sysdata, &resources);
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      0efd5aab
    • Bjorn Helgaas's avatar
      PCI: add struct pci_host_bridge and a list of all bridges found · 5a21d70d
      Bjorn Helgaas authored 
      This adds a list of all PCI host bridges we find and a way to look up
the host bridge from a pci_dev.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      5a21d70d
    • Bjorn Helgaas's avatar
      PCI: don't publish new root bus until it's fully initialized · a5390aa6
      Bjorn Helgaas authored 
      When pci_create_root_bus() adds the new struct pci_bus to the global
pci_root_buses list, the bus becomes visible to other parts of the
kernel, so it should be fully initialized.

This patch delays adding the bus to the pci_root_buses list until after
all the struct pci_bus initialization is finished.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      a5390aa6
    • Bjorn Helgaas's avatar
      PCI: make pci_flags non-weak · 844393f4
      Bjorn Helgaas authored 
      No architecture defines its own pci_flags, so the core symbol does not
need to be weak.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      844393f4
    • Bjorn Helgaas's avatar
      unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag · b9c40b07
      Bjorn Helgaas authored 
      CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      b9c40b07
    • Bjorn Helgaas's avatar
      powerpc/PCI: replace pci_probe_only with pci_flags · 673c9756
      Bjorn Helgaas authored 
      We already use pci_flags, so this just sets pci_flags directly and removes
the intermediate step of figuring out pci_probe_only, then using it to set
pci_flags.

The PCI core provides a pci_flags definition (currently __weak), so drop
the powerpc definitions in favor of that.

CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: linuxppc-dev@lists.ozlabs.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      673c9756
    • Bjorn Helgaas's avatar
      powerpc/PCI: make pci_probe_only default to 0 · 3c13be01
      Bjorn Helgaas authored 
      pci_probe_only is set on ppc64 to prevent resource re-allocation
by the core. It's meant to be used in very specific circumstances
such as when operating under a hypervisor that may prevent such
re-allocation.

Instead of default to 1, we make it default to 0 and explicitly
set it in the few cases where we need it.

This fixes FSL PCI which wants it clear among others.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      3c13be01
    • Bjorn Helgaas's avatar
      mips/PCI: removed unused pci_probe configurability · 14be538c
      Bjorn Helgaas authored 
      We never assign anything other than PCI_ASSIGN_ALL_BUSSES to pci_probe,
so just remove the indirection.  If configurability is required in the
future, please use the pci_flags/PCI_REASSIGN_ALL_BUS functionality
as is done for powerpc.

CC: Ralf Baechle <ralf@linux-mips.org>
CC: linux-mips@linux-mips.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      14be538c
    • Bjorn Helgaas's avatar
      mips/PCI: replace pci_probe_only with pci_flags · 29090606
      Bjorn Helgaas authored 
      Some architectures (alpha, mips, powerpc) have an arch-specific
"pci_probe_only" flag.  Others use PCI_PROBE_ONLY in pci_flags for
the same purpose.  This moves mips to the pci_flags approach so
generic code can use the same test across all architectures.

CC: Ralf Baechle <ralf@linux-mips.org>
CC: linux-mips@linux-mips.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      29090606
    • Bjorn Helgaas's avatar
      microblaze/PCI: remove unused pci_flags · e5b36841
      Bjorn Helgaas authored 
      pci_flags is initialized to zero and never modified (I think this was just
copied from powerpc).  Therefore, "(pci_flags & XX)" is always false and
"!(pci_flags & XX)" is always true, and we can remove all references
to pci_flags.

CC: Michal Simek <monstr@monstr.eu>
CC: microblaze-uclinux@itee.uq.edu.au
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      e5b36841
    • Bjorn Helgaas's avatar
      arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag · a4fab044
      Bjorn Helgaas authored 
      CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      a4fab044
    • Bjorn Helgaas's avatar
      arm/PCI: remove arch pci_flags definition · 6696cbc3
      Bjorn Helgaas authored 
      The PCI core provides a pci_flags definition (currently __weak), so drop
the arm definition in favor of that.

We EXPORT_SYMBOL(pci_flags) as arm did previously.  I'm dubious about
this: no other architecture exports it, and I didn't see any modules in
the tree that reference it.

CC: Rob Herring <rob.herring@calxeda.com>
CC: Russell King <linux@arm.linux.org.uk>
CC: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      6696cbc3
    • Bjorn Helgaas's avatar
      alpha/PCI: replace pci_probe_only with pci_flags · 151d16d5
      Bjorn Helgaas authored 
      Some architectures (alpha, mips, powerpc) have an arch-specific
"pci_probe_only" flag.  Others use PCI_PROBE_ONLY in pci_flags for
the same purpose.  This moves alpha to the pci_flags approach so
generic code can use the same test across all architectures.

CC: linux-alpha@vger.kernel.org
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      151d16d5
    • Bjorn Helgaas's avatar
      PCI: add pci_clear_flags() · dcce6dc4
      Bjorn Helgaas authored 
      Add a pci_clear_flags() for cases when we statically initialize
pci_flags, then decide to clear things out later.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      dcce6dc4
    • Bjorn Helgaas's avatar
      PCI: make pci_flags always available · 47087700
      Bjorn Helgaas authored 
      If we move resource assignment functions into the core, we'll still
need a way for architectures to prevent reassignment, e.g., the
"pci_probe_only" functionality, and we'll need a generic, always
available way the core can test for that.  The "pci_flags"
arrangement used by several architectures seems like a convenient
way to do this.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      47087700
  3. 23 Feb, 2012 11 commits
  5. 17 Feb, 2012 3 commits
  7. 14 Feb, 2012 3 commits
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7