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 A079D33D7FD; Mon, 5 May 2025 22:37:37 +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=1746484657; cv=none; b=bt/d64WvSJAa43MHAZC9MoerFoq5hiuxZrpr0OYHgEUR+2HvN8kbNc6L3aYijQFQwY600w3cdWPruAfdOelxCjQAP59VBuI3uzVY5fqzHwf7F6+biL5sFwjPfWDbLNwB/8RvGAfDNx5TSazgs3j3KV3PehvsL/aiV8/nrZexNdw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484657; c=relaxed/simple; bh=S0OHo+7ZN6MypwGjs4k4gQOJtY2Jmv9eZceTL8tUSxk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tan+Ox37bcP/pXbPLtGEQ366fzYbecoHS/id5qDdfzNdwBFsJSbBb4p2F99v7WmUlFjnJfu8/hm8bYA3242bS5JIAsqXqVKvJ8hcT4OV/NsLxMU7cR3KyBXe38W2O9qb6osGSZw2XH/DaWnikxZmdygy//tQdMFsCOJd1GSxYWk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jcVk+8qZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jcVk+8qZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EED9C4CEEF; Mon, 5 May 2025 22:37:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484657; bh=S0OHo+7ZN6MypwGjs4k4gQOJtY2Jmv9eZceTL8tUSxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jcVk+8qZ5Da4bUFYKXP3Amq33vOGbnoU5Z4ElQeIuOwRWtXVOCp9DLSjYY3zQtIe7 ZYeP26JTctNB/k+l1+TDLW1grHCugUB6XxGyIDY/dbjPNuaaSU6aYqBaTEp0los6KA DnGEMj7utzG4VEx95Zzy6TSKk4AlSRd1rRaJtYzEztovMBJji2FXfTEiajYWVp22lU vuI/JOGaceG89vLOSZtALoKdWZUNHKuxAj5O44n6fBN0ivIjpambzxn23qU455uz+/ 79PO+C/1ykNSxH/4mhZZwT939YyI2fWk2q03r/GASzLQrDWSgjwvDEWnVDorpL3SNg t9x7cLA6FntjQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sean Anderson , Mark Brown , Sasha Levin , michal.simek@amd.com, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.14 589/642] spi: zynqmp-gqspi: Always acknowledge interrupts Date: Mon, 5 May 2025 18:13:25 -0400 Message-Id: <20250505221419.2672473-589-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Sean Anderson [ Upstream commit 89785306453ce6d949e783f6936821a0b7649ee2 ] RXEMPTY can cause an IRQ, even though we may not do anything about it (such as if we are waiting for more received data). We must still handle these IRQs because we can tell they were caused by the device. Signed-off-by: Sean Anderson Link: https://patch.msgid.link/20250116224130.2684544-6-sean.anderson@linux.dev Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-zynqmp-gqspi.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index d800d79f62a70..12ab13edab543 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -799,7 +799,6 @@ static void zynqmp_process_dma_irq(struct zynqmp_qspi *xqspi) static irqreturn_t zynqmp_qspi_irq(int irq, void *dev_id) { struct zynqmp_qspi *xqspi = (struct zynqmp_qspi *)dev_id; - irqreturn_t ret = IRQ_NONE; u32 status, mask, dma_status = 0; status = zynqmp_gqspi_read(xqspi, GQSPI_ISR_OFST); @@ -814,27 +813,24 @@ static irqreturn_t zynqmp_qspi_irq(int irq, void *dev_id) dma_status); } - if (mask & GQSPI_ISR_TXNOT_FULL_MASK) { + if (!mask && !dma_status) + return IRQ_NONE; + + if (mask & GQSPI_ISR_TXNOT_FULL_MASK) zynqmp_qspi_filltxfifo(xqspi, GQSPI_TX_FIFO_FILL); - ret = IRQ_HANDLED; - } - if (dma_status & GQSPI_QSPIDMA_DST_I_STS_DONE_MASK) { + if (dma_status & GQSPI_QSPIDMA_DST_I_STS_DONE_MASK) zynqmp_process_dma_irq(xqspi); - ret = IRQ_HANDLED; - } else if (!(mask & GQSPI_IER_RXEMPTY_MASK) && - (mask & GQSPI_IER_GENFIFOEMPTY_MASK)) { + else if (!(mask & GQSPI_IER_RXEMPTY_MASK) && + (mask & GQSPI_IER_GENFIFOEMPTY_MASK)) zynqmp_qspi_readrxfifo(xqspi, GQSPI_RX_FIFO_FILL); - ret = IRQ_HANDLED; - } if (xqspi->bytes_to_receive == 0 && xqspi->bytes_to_transfer == 0 && ((status & GQSPI_IRQ_MASK) == GQSPI_IRQ_MASK)) { zynqmp_gqspi_write(xqspi, GQSPI_IDR_OFST, GQSPI_ISR_IDR_MASK); complete(&xqspi->data_completion); - ret = IRQ_HANDLED; } - return ret; + return IRQ_HANDLED; } /** -- 2.39.5