Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   meenakshi.aggarwal@nxp.com
To:     horia.geanta@nxp.com, V.sethi@nxp.com, pankaj.gupta@nxp.com,
        gaurav.jain@nxp.com, herbert@gondor.apana.org.au,
        davem@davemloft.net, linux-crypto@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Subject: [PATCH] crypto: caam/jr - fix shared IRQ line handling
Date:   Tue,  8 Aug 2023 12:55:27 +0200
Message-Id: <20230808105527.1707039-3-meenakshi.aggarwal@nxp.com>
In-Reply-To: <20230808105527.1707039-1-meenakshi.aggarwal@nxp.com>
References: <20230808105527.1707039-1-meenakshi.aggarwal@nxp.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WHpkdlk1cUFYUHJXdFFCNWEwVlNqd1dvOFEvQzN6M2NiaG9VZ0cvY3dJNVRv?=
 =?utf-8?B?ZjgzMEpNZXZJMmJNdjd6RTlsMDZaY2ptdFJ6RUozV3JxK0pEUXJIdldaRENE?=
 =?utf-8?B?blN6YXgrMEVzZU1CY25LRExVYmdpQ3ZQM1RueGNieU1Ydy96aDJMSDBFSmFB?=
 =?utf-8?B?Vko4MHRWRngrYTVydDVHbkYzaXo5UFRIZmJuU1QwcURjM2Mvbmt0S3lrVWJG?=
 =?utf-8?B?OURiVDM0NnMzZWo4dmYwbHNTMG02QkZpeEZzYzZTcWIydXFtelNuZ281YXhT?=
 =?utf-8?B?L0RrV0daQlNTMXgrM1ZRdCs2dVZKMStXRWxzLzJYYzZMQ2RSNFZETXM0bUhu?=
 =?utf-8?B?QkhHVkhjcUdIYWs5OTlxVzlGcnI2QjdtbWF3SnlVVW1iVkFCM1k3TisrTkY5?=
 =?utf-8?B?dGltck1aU0F6ZjdXQUpmWFM4aU1aVlBTWG4xd0lUNWd1OEpOeVNKNUhoRjhy?=
 =?utf-8?B?UUdXSlhCS21Ma0pHMkNXeXg4MHg2LzNRN3M4YzgxdFlVQnd0Q2FmTHFORU1U?=
 =?utf-8?B?bXYybnVEdlRBOGxwcERmeFBqUFBkejFvQXBwQ2VGbzVHQTI4SVNIY0RiYjh6?=
 =?utf-8?B?UjMrbVljdWUwUGczemtYblgySUtuRG15N2lCR2E2QVUxcUlsbVRyeUFudUpk?=
 =?utf-8?B?aHhqWEdCWGx0KzJxT01vSmhRZ0ZXMEFCcm9QWVZnYlBNTndMZWRUTmZ1L1JV?=
 =?utf-8?B?NHNacG9sdzlENDZTOFoyQXgyc0JkNVM1dGlIK1Y0dDU2VTBiRWppNDFOM0JU?=
 =?utf-8?B?MEFrR01KMUxQekxVQ0VCb01qTk5yd3kzbHBvdXlNWUpORUF2dGczWDM2blBu?=
 =?utf-8?B?NG1oWko3c2FFLzV5OXVYNWtjUDRPa2ZhVEczd2lNL2pIRnVJQWUrR0tabk5Z?=
 =?utf-8?B?MG01QmpleEs4c3JJWStvSUR2NEovTGN6TGQxZTdQQ0hFSDJRakZReDdWOVpr?=
 =?utf-8?B?NENLekU0elN1WUl3anZ4cG50Q3hsdzhhRm4vUlRhdlR0a1JRTWQwRDBxdXZO?=
 =?utf-8?B?YzVuQ3ZYZHNITTYyV2wyTUxiV0thWlpBSzFVdTNqNHRydmp6WFVyTU5HR3Fy?=
 =?utf-8?B?V2FYVENiYTVsVEFLNFlOOW91SlVadmREaDBIUlFYU0JJa0ErV2Z3RDJyWVRS?=
 =?utf-8?B?Q3BTeThhYm9wT29TbS9iUnFlUkhyN0lTb3JFc0hRS1BWMHB5ZmE2cFNLd20z?=
 =?utf-8?B?U3lvU3cxcm5RSEpldlpXMVJvelM0T0VtL01Xck1PaG5GMFdWcXlmSmNLUEJq?=
 =?utf-8?B?ZmZ1MUtVaFIxZXdndnk3TmlMcmRpQ3lTQXZQcHhTbEJ3ZTk4LzQxV2M2Qmsw?=
 =?utf-8?B?WCtrUGZqR28rZWl3ZEJndm9rbzlQbEdNZU9jS3VhY0xuaXhEWVdvemc5alZG?=
 =?utf-8?B?ei80RlBsbnZxdmpENTEvTEhqV2lYSnlybXREZjZwci9ueW54Z2lxZVl4Vkxq?=
 =?utf-8?B?aHdHMXN2Q3E0WUFXRVZTVnB0dGdlb2NwQTNudHhVVVhCSkljWG01RlNHSDVr?=
 =?utf-8?B?NVhCQyszdUVBdE0rNTYvc05QZVVCd05pQmZkM2dFenVvUDd4d3FyL3N0anZm?=
 =?utf-8?B?aHJNK2hZR3l2cCtMWWc5amViVXlVNWtDb1g4SzZhdDRjSkhWVndGbTluOXNN?=
 =?utf-8?B?RlBMNkxIWXJWN0RmazBjME5UdG10ZGh2VDFtN1JTZnRpODBMeEladEhtRGlT?=
 =?utf-8?B?NGl3M01jMHZvdDdkZnplMHhTeUdwTHZRTVN2ZEFsSHo3Y2N0ang1ZGtVZG13?=
 =?utf-8?B?ZGlzNmQ0MUJhSEM3clYzK3RsL3pELy9Lc2RIc0VFVlZNWmRndGFaNkNmNktT?=
 =?utf-8?B?YW5xZDUyZUFhckZ4RDVPLzVLTG95cm5uQm1UZ0NnTXNRVWdmZ2hoc1hISHJU?=
 =?utf-8?B?ZnBrT2hmSE5FMjNkZ0FMU2UydUhkZlB3ZXppdVAwWUM3TG5xcmNvSVNqUW9D?=
 =?utf-8?B?ckMvdDdBM2Q1cVNKbzQ2MlZ0dmpZYWxuaDFmSGorQ2tJZDlqYjFHcDQxK0xM?=
 =?utf-8?B?bWRFMU8wc3ZTaXpBZUJlVVlML1hPaTZqRVFDWm4xdWVsV1V5dHFiM3JKeStx?=
 =?utf-8?B?cU9zQmE4K3JXTmY4bXFVMklCYmh5VHFRalpEa28zdFYzVVoxOWgrbGZDNTNW?=
 =?utf-8?B?NWw2ZzBmeStuais2aUtNZUJic2lsWmcveHE0Y0JxTXZ2Qk93cE5NZHdZaDI1?=
 =?utf-8?B?WXc9PQ==?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fd287d85-d8fa-47d1-6173-08db97fe051f
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9563.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 10:55:46.8257
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YGyQ21yD4/br2/5RMNUHEF1gVhwz3mcybMsK9/h4mZ9soPZvhg1V0CRHavB5kk7fKaeDBMkx+P8mFxLC3S+CEEzFV8bvCNHvH3tVHX2p0w0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8101
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

From: Horia Geantă <horia.geanta@nxp.com>

There are cases when the interrupt status register (JRINTR) is non-zero,
even though:
1. An interrupt was generated, but it was masked OR
2. There was no interrupt generated at all
for the corresponding job ring.

1. The case when interrupt is masked (JRCFGR_LS[IMSK]=1b'1)
while other events have happened and are being accounted for, e.g.
-JRINTR[HALT]=2b'10 - input job ring underwent a flush of all on-going
jobs and processing of still-existing jobs (sitting in the ring) has been
halted
-JRINTR[HALT]=2b'01 - input job ring is currently undergoing a flush
-JRINTR[ENTER_FAIL]=1b'1 - SecMon / SNVS transitioned to FAIL MODE
It doesn't matter whether these events would assert the interrupt signal
or not, interrupt is anyhow masked.

2. The case when interrupt is not masked (JRCFGR_LS[IMSK]=1b'0), however
the events accounted for in JRINTR do not generate interrupts, e.g.:
-JRINTR[HALT]=2b'01
-JRINTR[ENTER_FAIL]=1b'1 and JRCFGR_MS[FAIL_MODE]=1b'0

Currently in these cases, when the JR interrupt handler is invoked (as a
consequence of JR sharing the interrupt line with other devices - e.g.
the two JRs on i.MX7ULP) it continues execution instead of returning
IRQ_NONE.
This could lead to situations like interrupt handler clearing JRINTR (and
thus also the JRINTR[HALT] field) while corresponding job ring is
suspended and then that job ring failing on resume path, due to expecting
JRINTR[HALT]=b'10 and reading instead JRINTR[HALT]=b'00.

Fix this by checking status of JRINTR[JRI] in the JR interrupt handler.
If JRINTR[JRI]=1b'0, there was no interrupt generated for this JR and
handler must return IRQ_NONE.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
---
 drivers/crypto/caam/jr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 5507d5d34a4c..07ec2f27cc68 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -232,7 +232,7 @@ static irqreturn_t caam_jr_interrupt(int irq, void *st_dev)
 	 * tasklet if jobs done.
 	 */
 	irqstate = rd_reg32(&jrp->rregs->jrintstatus);
-	if (!irqstate)
+	if (!(irqstate & JRINT_JR_INT))
 		return IRQ_NONE;
 
 	/*
-- 
2.25.1