crypto: ccp - Disable interrupts early on unload

Orabug: 26644685

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>
(cherry picked from commit 116591fe3eef11c6f06b662c9176385f13891183)
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

diff --git a/drivers/crypto/ccp/ccp-dev-v5.c b/drivers/crypto/ccp/ccp-dev-v5.c
index c7972e733e43e551ce38f30d1641692164c8a4fd..13b81a1c11849a8d9c4a4bd21fc754d0bd01ad1f 100644 (file)
--- 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);
        }