diff options
author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-10-18 11:16:47 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-20 10:10:25 +0100 |
commit | 0fe5286e49d4e1fe7eba347302b3d3dee217eade (patch) | |
tree | 637f7e83dc6035e306d04fd57af7e7bf6a1b97ef | |
parent | 2637cb1e3d8086cd31a96e60c3e7e0aa74c043f4 (diff) | |
download | linux-stable-0fe5286e49d4e1fe7eba347302b3d3dee217eade.tar.gz linux-stable-0fe5286e49d4e1fe7eba347302b3d3dee217eade.tar.bz2 linux-stable-0fe5286e49d4e1fe7eba347302b3d3dee217eade.zip |
powerpc/ipic: Fix status get and status clear
[ Upstream commit 6b148a7ce72a7f87c81cbcde48af014abc0516a9 ]
IPIC Status is provided by register IPIC_SERSR and not by IPIC_SERMR
which is the mask register.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/powerpc/sysdev/ipic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index 16f1edd78c40..535cf1f6941c 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c @@ -846,12 +846,12 @@ void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq) u32 ipic_get_mcp_status(void) { - return ipic_read(primary_ipic->regs, IPIC_SERMR); + return ipic_read(primary_ipic->regs, IPIC_SERSR); } void ipic_clear_mcp_status(u32 mask) { - ipic_write(primary_ipic->regs, IPIC_SERMR, mask); + ipic_write(primary_ipic->regs, IPIC_SERSR, mask); } /* Return an interrupt vector or 0 if no interrupt is pending. */ |