Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f6e1d8cc38b3776038fb15d3acc82ed8bb552f82

Authored by Bjorn Helgaas
Committed by Jesse Barnes
1 parent 8c57786ad3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

x86/PCI: MMCONFIG: add lookup function 

This patch factors out the search for an MMCONFIG region, which was
previously implemented in both mmconfig_32 and mmconfig_64.  No functional
change.

Reviewed-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Showing 4 changed files with 20 additions and 27 deletions Side-by-side Diff

arch/x86/include/asm/pci_x86.h
Diff comments   View file @ f6e1d8c
... ... @@ -134,6 +134,7 @@
134 134  
135 135 extern int __init pci_mmcfg_arch_init(void);
136 136 extern void __init pci_mmcfg_arch_free(void);
  137 +extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);
137 138  
138 139 extern struct list_head pci_mmcfg_list;
139 140  
arch/x86/pci/mmconfig-shared.c
Diff comments   View file @ f6e1d8c
... ... @@ -97,6 +97,18 @@
97 97 return new;
98 98 }
99 99  
  100 +struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus)
  101 +{
  102 + struct pci_mmcfg_region *cfg;
  103 +
  104 + list_for_each_entry(cfg, &pci_mmcfg_list, list)
  105 + if (cfg->segment == segment &&
  106 + cfg->start_bus <= bus && bus <= cfg->end_bus)
  107 + return cfg;
  108 +
  109 + return NULL;
  110 +}
  111 +
100 112 static const char __init *pci_mmcfg_e7520(void)
101 113 {
102 114 u32 win;
arch/x86/pci/mmconfig_32.c
Diff comments   View file @ f6e1d8c
... ... @@ -27,15 +27,10 @@
27 27 */
28 28 static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)
29 29 {
30   - struct pci_mmcfg_region *cfg;
  30 + struct pci_mmcfg_region *cfg = pci_mmconfig_lookup(seg, bus);
31 31  
32   - list_for_each_entry(cfg, &pci_mmcfg_list, list)
33   - if (cfg->segment == seg &&
34   - (cfg->start_bus <= bus) &&
35   - (cfg->end_bus >= bus))
36   - return cfg->address;
37   -
38   - /* Fall back to type 0 */
  32 + if (cfg)
  33 + return cfg->address;
39 34 return 0;
40 35 }
41 36  
arch/x86/pci/mmconfig_64.c
Diff comments   View file @ f6e1d8c
... ... @@ -14,28 +14,13 @@
14 14  
15 15 #define PREFIX "PCI: "
16 16  
17   -static char __iomem *get_virt(unsigned int seg, unsigned bus)
18   -{
19   - struct pci_mmcfg_region *cfg;
20   -
21   - list_for_each_entry(cfg, &pci_mmcfg_list, list)
22   - if (cfg->segment == seg &&
23   - (cfg->start_bus <= bus) &&
24   - (cfg->end_bus >= bus))
25   - return cfg->virt;
26   -
27   - /* Fall back to type 0 */
28   - return NULL;
29   -}
30   -
31 17 static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)
32 18 {
33   - char __iomem *addr;
  19 + struct pci_mmcfg_region *cfg = pci_mmconfig_lookup(seg, bus);
34 20  
35   - addr = get_virt(seg, bus);
36   - if (!addr)
37   - return NULL;
38   - return addr + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));
  21 + if (cfg && cfg->virt)
  22 + return cfg->virt + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));
  23 + return NULL;
39 24 }
40 25  
41 26 static int pci_mmcfg_read(unsigned int seg, unsigned int bus,