| From 116591fe3eef11c6f06b662c9176385f13891183 Mon Sep 17 00:00:00 2001 |
| From: Gary R Hook <ghook@amd.com> |
| Date: Thu, 20 Apr 2017 15:24:22 -0500 |
| Subject: [PATCH] crypto: ccp - Disable interrupts early on unload |
| |
| commit 116591fe3eef11c6f06b662c9176385f13891183 upstream. |
| |
| Ensure that we disable interrupts first when shutting down |
| the driver. |
| |
| Cc: <stable@vger.kernel.org> # 4.9.x+ |
| |
| Signed-off-by: Gary R Hook <ghook@amd.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| |
| diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c |
| index c7972e733e43..13b81a1c1184 100644 |
| --- a/drivers/crypto/ccp/ccp-dev-v5.c |
| +++ b/drivers/crypto/ccp/ccp-dev-v5.c |
| @@ -942,10 +942,10 @@ static void ccp5_destroy(struct ccp_device *ccp) |
| iowrite32(cmd_q->qcontrol & ~CMD5_Q_RUN, cmd_q->reg_control); |
| |
| /* Disable the interrupts */ |
| - iowrite32(SUPPORTED_INTERRUPTS, cmd_q->reg_interrupt_status); |
| + iowrite32(0x00, cmd_q->reg_int_enable); |
| |
| /* Clear the interrupt status */ |
| - iowrite32(0x00, cmd_q->reg_int_enable); |
| + iowrite32(SUPPORTED_INTERRUPTS, cmd_q->reg_interrupt_status); |
| ioread32(cmd_q->reg_int_status); |
| ioread32(cmd_q->reg_status); |
| } |
| -- |
| 2.12.0 |
| |
