Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6e1d8cc authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

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: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 8c57786a

arch/x86/include/asm/pci_x86.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct pci_mmcfg_region { 


extern int __init pci_mmcfg_arch_init(void);

extern void __init pci_mmcfg_arch_free(void);

extern struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus);



extern struct list_head pci_mmcfg_list;

arch/x86/pci/mmconfig-shared.c

+12 −0
Original line number Diff line number Diff line
@@ -97,6 +97,18 @@ static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start, 
	return new;

}



struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus)

{

	struct pci_mmcfg_region *cfg;



	list_for_each_entry(cfg, &pci_mmcfg_list, list)

		if (cfg->segment == segment &&

		    cfg->start_bus <= bus && bus <= cfg->end_bus)

			return cfg;



	return NULL;

}



static const char __init *pci_mmcfg_e7520(void)

{

	u32 win;

arch/x86/pci/mmconfig_32.c

+3 −8
Original line number Diff line number Diff line
@@ -27,15 +27,10 @@ static int mmcfg_last_accessed_cpu; 
 */

static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn)

{

	struct pci_mmcfg_region *cfg;

	struct pci_mmcfg_region *cfg = pci_mmconfig_lookup(seg, bus);



	list_for_each_entry(cfg, &pci_mmcfg_list, list)

		if (cfg->segment == seg &&

		    (cfg->start_bus <= bus) &&

		    (cfg->end_bus >= bus))

	if (cfg)

		return cfg->address;



	/* Fall back to type 0 */

	return 0;

}

arch/x86/pci/mmconfig_64.c

+4 −19
Original line number Diff line number Diff line
@@ -14,28 +14,13 @@ 


#define PREFIX "PCI: "



static char __iomem *get_virt(unsigned int seg, unsigned bus)

{

	struct pci_mmcfg_region *cfg;



	list_for_each_entry(cfg, &pci_mmcfg_list, list)

		if (cfg->segment == seg &&

		    (cfg->start_bus <= bus) &&

		    (cfg->end_bus >= bus))

			return cfg->virt;



	/* Fall back to type 0 */

	return NULL;

}



static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)

{

	char __iomem *addr;

	struct pci_mmcfg_region *cfg = pci_mmconfig_lookup(seg, bus);



	addr = get_virt(seg, bus);

	if (!addr)

	if (cfg && cfg->virt)

		return cfg->virt + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));

	return NULL;

	return addr + (PCI_MMCFG_BUS_OFFSET(bus) | (devfn << 12));

}



static int pci_mmcfg_read(unsigned int seg, unsigned int bus,