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

Commit 56829d19 authored by OGAWA Hirofumi's avatar OGAWA Hirofumi Committed by Andi Kleen
Browse files

[PATCH] mmconfig: fix unreachable_devices() 



Currently, unreachable_devices() compares value of mmconfig and value
of conf1. But it doesn't check the device is reachable or not.

Signed-off-by: default avatarOGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 429d512e

arch/i386/pci/mmconfig-shared.c

+7 −5
Original line number Diff line number Diff line
@@ -43,12 +43,14 @@ static void __init unreachable_devices(void) 
			if (val1 == 0xffffffff)

				continue;



			if (pci_mmcfg_arch_reachable(0, bus, devfn)) {

				raw_pci_ops->read(0, bus, devfn, 0, 4, &val2);

			if (val1 != val2) {

				set_bit(i + 32 * bus, pci_mmcfg_fallback_slots);

				printk(KERN_NOTICE "PCI: No mmconfig possible"

				       " on device %02x:%02x\n", bus, i);

				if (val1 == val2)

					continue;

			}

			set_bit(i + 32 * bus, pci_mmcfg_fallback_slots);

			printk(KERN_NOTICE "PCI: No mmconfig possible on device"

			       " %02x:%02x\n", bus, i);

		}

	}

}

arch/i386/pci/mmconfig.c

+6 −0
Original line number Diff line number Diff line
@@ -136,6 +136,12 @@ static struct pci_raw_ops pci_mmcfg = { 
	.write =	pci_mmcfg_write,

};



int __init pci_mmcfg_arch_reachable(unsigned int seg, unsigned int bus,

				    unsigned int devfn)

{

	return get_base_addr(seg, bus, devfn) != 0;

}



int __init pci_mmcfg_arch_init(void)

{

	printk(KERN_INFO "PCI: Using MMCONFIG\n");

arch/i386/pci/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -101,4 +101,6 @@ extern void pcibios_sort(void); 
#define PCI_MMCFG_MAX_CHECK_BUS 16

extern DECLARE_BITMAP(pci_mmcfg_fallback_slots, 32*PCI_MMCFG_MAX_CHECK_BUS);



extern int __init pci_mmcfg_arch_reachable(unsigned int seg, unsigned int bus,

					   unsigned int devfn);

extern int __init pci_mmcfg_arch_init(void);

arch/x86_64/pci/mmconfig.c

+6 −0
Original line number Diff line number Diff line
@@ -126,6 +126,12 @@ static void __iomem * __init mcfg_ioremap(struct acpi_mcfg_allocation *cfg) 
	return addr;

}



int __init pci_mmcfg_arch_reachable(unsigned int seg, unsigned int bus,

				    unsigned int devfn)

{

	return pci_dev_base(seg, bus, devfn) != NULL;

}



int __init pci_mmcfg_arch_init(void)

{

	int i;