From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63C5823E6C7; Thu, 12 Dec 2024 16:36:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021415; cv=none; b=Ns+m0j6XosI0NPifOVcRH5oEnAAP/67ppS2WbRimQfjG5AUnWxMRundnFqRc5P3xybV1nL/gM8PH7Chop3Cf2qwAQZ4BMzpLxzf7/0fz02IgB0F3ljhJaNYPoH3ubGnT7pYSvwWh/+lF2Y5OY9gpCkANST3CDxx+HTiNMQSUwyo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734021415; c=relaxed/simple; bh=JB0pkUradMt5JgZdiFAYApojxl7eQD/E3F8XQRm+Sac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ikZxhcXhgT0kajwyyzqKC73iAw5OKwhRbm/9Am23FU4ZTc6M3d9TKcHg5Sla4plGMsCHqWxhXA1xswLjEPprQEsQgezUBIr4BDY4S7CEIMwyKv0ExhbuBWymKf/6pL4cTkIpO2Uh6RD01R6kUT9q9XlCjz9Ik4/iuGi/c5lI2z4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IRYPavuj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="IRYPavuj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7389C4CECE; Thu, 12 Dec 2024 16:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734021415; bh=JB0pkUradMt5JgZdiFAYApojxl7eQD/E3F8XQRm+Sac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IRYPavuj/aFXE23NpbNjnV5T7JvfiBLvhUY9ZOrOYNLLfGtRbgyEDnweGjPLhRYmM oMzpGpqZVJTJYKCpBuGLJ6To+nxFyfX4qgnPe/vwilRyotbO2m9MtMLttPxl2ABmo2 JIDGmmfvRDkLbkdDI3wMl2/uai9SrA9bcwUgIiLk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jarkko Nikula , Alexandre Belloni , Sasha Levin Subject: [PATCH 6.1 714/772] i3c: mipi-i3c-hci: Mask ring interrupts before ring stop request Date: Thu, 12 Dec 2024 16:00:59 +0100 Message-ID: <20241212144419.393766109@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jarkko Nikula [ Upstream commit 6ca2738174e4ee44edb2ab2d86ce74f015a0cc32 ] Bus cleanup path in DMA mode may trigger a RING_OP_STAT interrupt when the ring is being stopped. Depending on timing between ring stop request completion, interrupt handler removal and code execution this may lead to a NULL pointer dereference in hci_dma_irq_handler() if it gets to run after the io_data pointer is set to NULL in hci_dma_cleanup(). Prevent this my masking the ring interrupts before ring stop request. Signed-off-by: Jarkko Nikula Link: https://lore.kernel.org/r/20240920144432.62370-2-jarkko.nikula@linux.intel.com Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/i3c/master/mipi-i3c-hci/dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i3c/master/mipi-i3c-hci/dma.c b/drivers/i3c/master/mipi-i3c-hci/dma.c index edc3a69bfe31f..bcc0c7d4131f2 100644 --- a/drivers/i3c/master/mipi-i3c-hci/dma.c +++ b/drivers/i3c/master/mipi-i3c-hci/dma.c @@ -174,10 +174,10 @@ static void hci_dma_cleanup(struct i3c_hci *hci) for (i = 0; i < rings->total; i++) { rh = &rings->headers[i]; + rh_reg_write(INTR_SIGNAL_ENABLE, 0); rh_reg_write(RING_CONTROL, 0); rh_reg_write(CR_SETUP, 0); rh_reg_write(IBI_SETUP, 0); - rh_reg_write(INTR_SIGNAL_ENABLE, 0); if (rh->xfer) dma_free_coherent(&hci->master.dev, -- 2.43.0