From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 30 Dec 2013 04:19:31 +0000 (+1100)
Subject: Merge branch 'merge' into next
X-Git-Tag: Ubuntu-5.10.0-12.13~17571^2~26
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dece8ada993e1764a115bdff0f1effffaa5fc8dc;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'merge' into next

Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such
as Anton Little Endian fixes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

dece8ada993e1764a115bdff0f1effffaa5fc8dc
diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
index 614356cac466,2c6d173842b2..f0e68714696e
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@@ -720,9 -720,10 +720,10 @@@ static void pnv_pci_ioda2_setup_dma_pe(
  		tbl->it_type = TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE;
  	}
  	iommu_init_table(tbl, phb->hose->node);
+ 	iommu_register_group(tbl, pci_domain_nr(pe->pbus), pe->pe_number);
  
  	if (pe->pdev)
 -		set_iommu_table_base(&pe->pdev->dev, tbl);
 +		set_iommu_table_base_and_group(&pe->pdev->dev, tbl);
  	else
  		pnv_ioda_setup_bus_dma(pe, pe->pbus);
  
diff --cc arch/powerpc/platforms/powernv/pci.h
index 9a11ff0c5c0b,1ed8d5f40f5a..13f1942a9a5f
--- a/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@@ -176,8 -176,9 +176,10 @@@ struct pnv_phb 
  	union {
  		unsigned char			blob[PNV_PCI_DIAG_BUF_SIZE];
  		struct OpalIoP7IOCPhbErrorData	p7ioc;
 +		struct OpalIoPhb3ErrorData	phb3;
+ 		struct OpalIoP7IOCErrorData 	hub_diag;
  	} diag;
+ 
  };
  
  extern struct pci_ops pnv_pci_ops;