diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2013-06-06 15:34:48 +0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2013-06-18 09:44:10 -0700 |
| commit | 5cd7595dea8d54d93124cfc4faec103ce56ab03d (patch) | |
| tree | 2c0fb4985707e51283f4fac48c7079dbed0be6df /arch/ia64/include | |
| parent | 2ead66b5472542d82f31c3b6418b23ace3dac87d (diff) | |
| download | blackbird-op-linux-5cd7595dea8d54d93124cfc4faec103ce56ab03d.tar.gz blackbird-op-linux-5cd7595dea8d54d93124cfc4faec103ce56ab03d.zip | |
PCI/IA64: embed pci hostbridge resources into pci_root_info
Currently, pcibios_resource_to_bus() and pcibios_bus_to_resource()
functions use pci_host_bridge to translate bus side address from/to
cpu side address. The pci_window in pci_controller never be used again.
So we remove pci_window in pci_controller and embed hostbridge resource
into pci_root_info. Bjorn suggested to implement hostbridge resources
release in IA64 like in X86, this patch is to prepare for that.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include')
| -rw-r--r-- | arch/ia64/include/asm/pci.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 5e04b591e423..a7ebe5f97e63 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h @@ -89,23 +89,16 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, #define pci_legacy_read platform_pci_legacy_read #define pci_legacy_write platform_pci_legacy_write -struct pci_window { - struct resource resource; - u64 offset; -}; - struct pci_controller { void *acpi_handle; void *iommu; int segment; int node; /* nearest node with memory or -1 for global allocation */ - unsigned int windows; - struct pci_window *window; - void *platform_data; }; + #define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata) #define pci_domain_nr(busdev) (PCI_CONTROLLER(busdev)->segment) |
