From: Benjamin Herrenschmidt Date: Fri, 28 Feb 2014 05:20:29 +0000 (+1100) Subject: powerpc/powernv: Fix opal_xscom_{read,write} prototype X-Git-Tag: v3.13.6~71 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=9ccd6c7ee279b4b7dc092bb9a9eb2dff35c34e16;p=unionfs-2.6.39.y.git powerpc/powernv: Fix opal_xscom_{read,write} prototype commit 2f3f38e4d3d03dd4125cc9a1f49ab3cc91d8d670 upstream. The OPAL firmware functions opal_xscom_read and opal_xscom_write take a 64-bit argument for the XSCOM (PCB) address in order to support the indirect mode on P8. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index 7bdcf340016..0394e91557f 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -720,8 +720,8 @@ int64_t opal_pci_next_error(uint64_t phb_id, uint64_t *first_frozen_pe, int64_t opal_pci_poll(uint64_t phb_id); int64_t opal_return_cpu(void); -int64_t opal_xscom_read(uint32_t gcid, uint32_t pcb_addr, __be64 *val); -int64_t opal_xscom_write(uint32_t gcid, uint32_t pcb_addr, uint64_t val); +int64_t opal_xscom_read(uint32_t gcid, uint64_t pcb_addr, __be64 *val); +int64_t opal_xscom_write(uint32_t gcid, uint64_t pcb_addr, uint64_t val); int64_t opal_lpc_write(uint32_t chip_id, enum OpalLPCAddressType addr_type, uint32_t addr, uint32_t data, uint32_t sz);