| From foo@baz Mon Dec 18 15:03:25 CET 2017 |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| Date: Wed, 18 Oct 2017 11:16:47 +0200 |
| Subject: powerpc/ipic: Fix status get and status clear |
| |
| From: Christophe Leroy <christophe.leroy@c-s.fr> |
| |
| |
| [ 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> |
| --- |
| arch/powerpc/sysdev/ipic.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/powerpc/sysdev/ipic.c |
| +++ b/arch/powerpc/sysdev/ipic.c |
| @@ -844,12 +844,12 @@ void ipic_disable_mcp(enum ipic_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 NO_IRQ if no interrupt is pending. */ |