Merge branch 'next-eeh' into next-sriov (d4ed11aa) · Commits · e / devices / android_kernel_samsung_universal8895

arch/powerpc/kernel/eeh_pe.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -328,6 +328,13 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)
		{
		struct eeh_pe pe, parent;

		/* Check if the PE number is valid */
		if (!eeh_has_flag(EEH_VALID_PE_ZERO) && !edev->pe_config_addr) {
		pr_err("%s: Invalid PE#0 for edev 0x%x on PHB#%d\n",
		__func__, edev->config_addr, edev->phb->global_number);
		return -EINVAL;
		}

		/*
		* Search the PE has been existing or not according
		* to the PE address. If that has been existing, the
		@@ -336,12 +343,6 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev)
		*/
		pe = eeh_pe_get(edev);
		if (pe && !(pe->type & EEH_PE_INVALID)) {
		if (!edev->pe_config_addr) {
		pr_err("%s: PE with addr 0x%x already exists\n",
		__func__, edev->config_addr);
		return -EEXIST;
		}

		/* Mark the PE as type of PCI bus */
		pe->type = EEH_PE_BUS;
		edev->pe = pe;

+2 −1

Original line number	Diff line number	Diff line
		@@ -2462,7 +2462,8 @@ static void pnv_ioda_setup_pe_seg(struct pci_controller *hose,
		region.start += phb->ioda.io_segsize;
		index++;
		}
		} else if (res->flags & IORESOURCE_MEM) {
		} else if ((res->flags & IORESOURCE_MEM) &&
		!pnv_pci_is_mem_pref_64(res->flags)) {
		region.start = res->start -
		hose->mem_offset[0] -
		phb->ioda.m32_pci_base;