Commit 96b0df24 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Return true/false (not 1/0) from bool functions (Yang Li)

- Add Joyce Ooi as Altera PCIe maintainer (Joyce Ooi)

* pci/misc:
  MAINTAINERS: Add Joyce Ooi as Altera PCIe maintainer
  x86/pci: Return true/false (not 1/0) from bool functions
parents 56d2731c 4db221f6

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -13942,8 +13942,7 @@ F: Documentation/devicetree/bindings/pci/aardvark-pci.txt 
F:	drivers/pci/controller/pci-aardvark.c









PCI DRIVER FOR ALTERA PCIE IP









M:	Ley Foon Tan <ley.foon.tan@intel.com>









L:	rfi@lists.rocketboards.org (moderated for non-subscribers)









M:	Joyce Ooi <joyce.ooi@intel.com>









L:	linux-pci@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/pci/altera-pcie.txt








@@ -14140,8 +14139,7 @@ S:	Supported







F:	Documentation/PCI/pci-error-recovery.rst

















PCI MSI DRIVER FOR ALTERA MSI IP









M:	Ley Foon Tan <ley.foon.tan@intel.com>









L:	rfi@lists.rocketboards.org (moderated for non-subscribers)









M:	Joyce Ooi <joyce.ooi@intel.com>









L:	linux-pci@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
































arch/x86/pci/mmconfig-shared.c



+5
−5






























Original line number
Diff line number
Diff line







@@ -461,7 +461,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,







	}



















	if (size < (16UL<<20) && size != old_size)









		return 0;









		return false;



















	if (dev)









		dev_info(dev, "MMCONFIG at %pR reserved in %s\n",








@@ -493,7 +493,7 @@ static bool __ref is_mmconf_reserved(check_reserved_t is_reserved,







				&cfg->res, (unsigned long) cfg->address);









	}



















	return 1;









	return true;









}



















static bool __ref








@@ -501,7 +501,7 @@ pci_mmcfg_check_reserved(struct device *dev, struct pci_mmcfg_region *cfg, int e







{









	if (!early && !acpi_disabled) {









		if (is_mmconf_reserved(is_acpi_reserved, cfg, dev, 0))









			return 1;









			return true;



















		if (dev)









			dev_info(dev, FW_INFO








@@ -522,14 +522,14 @@ pci_mmcfg_check_reserved(struct device *dev, struct pci_mmcfg_region *cfg, int e







	 * _CBA method, just assume it's reserved.









	 */









	if (pci_mmcfg_running_state)









		return 1;









		return true;



















	/* Don't try to do this check unless configuration









	   type 1 is available. how about type 2 ?*/









	if (raw_pci_ops)









		return is_mmconf_reserved(e820__mapped_all, cfg, dev, 1);



















	return 0;









	return false;









}



















static void __init pci_mmcfg_reject_broken(int early)