diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-11-13 19:34:13 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-11-24 18:29:17 -0500 |
commit | d215a9c8b46e55a1d3bc1cd907c943ef95938a0e (patch) | |
tree | e377a5f8995fdc83bf333d7f6cee69b59447d686 /arch/x86/pci/mmconfig_64.c | |
parent | df5eb1d67e8074dfbc23cf396c556116728187b3 (diff) |
x86/PCI: MMCONFIG: use a private structure rather than the ACPI MCFG one
This adds a struct pci_mmcfg_region with a little more information
than the struct acpi_mcfg_allocation used previously. The acpi_mcfg
structure is defined by the spec, so we can't change it.
To begin with, struct pci_mmcfg_region is basically the same as the
ACPI MCFG version, but future patches will add more information.
Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/mmconfig_64.c')
-rw-r--r-- | arch/x86/pci/mmconfig_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c index 8588711924cc..7a6231c3335e 100644 --- a/arch/x86/pci/mmconfig_64.c +++ b/arch/x86/pci/mmconfig_64.c | |||
@@ -14,14 +14,14 @@ | |||
14 | 14 | ||
15 | /* Static virtual mapping of the MMCONFIG aperture */ | 15 | /* Static virtual mapping of the MMCONFIG aperture */ |
16 | struct mmcfg_virt { | 16 | struct mmcfg_virt { |
17 | struct acpi_mcfg_allocation *cfg; | 17 | struct pci_mmcfg_region *cfg; |
18 | char __iomem *virt; | 18 | char __iomem *virt; |
19 | }; | 19 | }; |
20 | static struct mmcfg_virt *pci_mmcfg_virt; | 20 | static struct mmcfg_virt *pci_mmcfg_virt; |
21 | 21 | ||
22 | static char __iomem *get_virt(unsigned int seg, unsigned bus) | 22 | static char __iomem *get_virt(unsigned int seg, unsigned bus) |
23 | { | 23 | { |
24 | struct acpi_mcfg_allocation *cfg; | 24 | struct pci_mmcfg_region *cfg; |
25 | int cfg_num; | 25 | int cfg_num; |
26 | 26 | ||
27 | for (cfg_num = 0; cfg_num < pci_mmcfg_config_num; cfg_num++) { | 27 | for (cfg_num = 0; cfg_num < pci_mmcfg_config_num; cfg_num++) { |
@@ -109,7 +109,7 @@ static struct pci_raw_ops pci_mmcfg = { | |||
109 | .write = pci_mmcfg_write, | 109 | .write = pci_mmcfg_write, |
110 | }; | 110 | }; |
111 | 111 | ||
112 | static void __iomem * __init mcfg_ioremap(struct acpi_mcfg_allocation *cfg) | 112 | static void __iomem * __init mcfg_ioremap(struct pci_mmcfg_region *cfg) |
113 | { | 113 | { |
114 | void __iomem *addr; | 114 | void __iomem *addr; |
115 | u64 start, size; | 115 | u64 start, size; |