| From 2f3f38e4d3d03dd4125cc9a1f49ab3cc91d8d670 Mon Sep 17 00:00:00 2001 |
| From: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Date: Fri, 28 Feb 2014 16:20:29 +1100 |
| Subject: powerpc/powernv: Fix opal_xscom_{read,write} prototype |
| |
| From: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| |
| 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 <benh@kernel.crashing.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/powerpc/include/asm/opal.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 |
| 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); |
