From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D6742DAFDE for ; Tue, 2 Sep 2025 12:46:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756817178; cv=none; b=Tjms6m9vMubwb1a6VEadNqm6et412f2FMIDO2HtaY7bRNv6IUuZZf7PrKAgtbFlvBPYSARHVxerzEGHgonRvtiUBxnMC21mxX3+MskBY2dOSJ4W5+ZxuKiQ9OX8c1Xd86+Wk5IOTSpnRrGoRGLjRze/CCjXfrZVztA5h6EIwoEo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756817178; c=relaxed/simple; bh=fDy13d0jadoNgDpWip0eDAJ9ZTQEC7MeqwnmLrMOq3g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GK3gxXgv5vdVT7NYUGRrxRVJxJea+B1ApbCn4rsa1ejAYm+uP9N4wBCAg4vEFUv0ZGD6e8aunqp8ja+4s6YTeqGGtNdaDVRdqYBsNaY8EUOw0nF06De20SuaEmhwcPYJ1hqqkbol1WOyNN1hzY5POEtOBaT1oKbNjUk6IpuiiHQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=orTCVXt/; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="orTCVXt/" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3da9ad0c1f4so439393f8f.3 for ; Tue, 02 Sep 2025 05:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756817173; x=1757421973; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=t/upoONcJkK6CJjYHWkLIMw2CILsxwp/wVjDokkLyWs=; b=orTCVXt/bLmQ7sXY0Sj2MNp4u05xO8G1i1fmSxX/nrFZuCcI4eEjzu+RMDpyrK8dyi Sf0wLuaFSkbJOSUV83XCdvhRhOxS0HLspUF/rV8UZEWjbFSh620lSQdnqaiTwpRGXTNC zYwp667oEcsH4D3lly/alGcPCPayxUCd7gJW3EfvUYi3r0F8hdhT8NvVwDbs+7/HHVK3 NaWFUuhvhf4lV6AtQVYVOk2Cpk+m/wK3atEzUlMTgqPM+y4OjxBe57Ldz+hW7OmXJkly fUR4K75lBbKT/WbgiIz7HB16CjJisO2GZvVfDpc/Sr20j7S2MUYO5HicGtc50g3rwqHY VbDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756817173; x=1757421973; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t/upoONcJkK6CJjYHWkLIMw2CILsxwp/wVjDokkLyWs=; b=AlZjV476h+s3k0Yla6jnL6NkK8gpGR9lIS75cHMj3zRyHOLiFMEZENKktN7nsc7LH7 3y5ElYmqCF/bJ+ct3s83O9zXUuMqCsOuIZh4jFSU0zdgZk+CnjPvEmX6naNpQ8aVTe+u FJiuC1Yaz8GF5+pUxn6nAA4JMEo98rhvRIvnCmgMdbrSdzymEOtjLfV/XvEMj6odW14k CAVW6q8ELbzwWAR3N3uu0plv5UvEowqNypMU2EqzErbcc+hqAx9owy/5qRcI9oC9KC17 B/zjUL4aGBB0UQQv5rP8epwfbccHu4xyIZhl3i2ka7uon5R3LShQbJdPri9bEAXfpRJX bPFA== X-Forwarded-Encrypted: i=1; AJvYcCWZGNFJ1pUQXthSTXhzgGyZAYyoAFfWCOfgSr9xj8u33ZYja3AaUvm7xCDHa8y1wWuuEy3449PSBxpHNuY=@vger.kernel.org X-Gm-Message-State: AOJu0YyICHPjLWhi/UfPZuXPrFDplgYmWgRUm5gD4a2oyw/5qGd98DYj OO/4WdxZJwgQtzsXlS7XMvCDcefw/+qfgHPWECTzKO/nke6maIasiQkY5Q7DlnTDgFoczDOAweS Vjw+v1II= X-Gm-Gg: ASbGncsFOuVJnUdF93SzGAmYVYPWyv2/pW+tiPgmh1k9H9LiwV8rEY+gnJ4n0Mkmyjr HMJIwnZQKCyKxJuqfkXHiHPYSCW160IoolDOorbwQBnd/ljFu0RUc6SgrknmLA1s+YD+ZYLFinc I+P88BuhXa2Y846axhLojHOuMzh5/nUf7l9QNHFdvdjd7S0WQi0ytaICH16aW3JixqnZrD400nL zXu5qoniV+Qg9UMW5R60cJ8PAOnOmTeGibOme1DXOxaf9EB8Ytbjn8VgFE0Xtjyd27GXBFBH/fY 2fFcAHXzTmxiUjZC+rT2PhUCtiyZY6zYgQ9SSBbVpik/GV8+70TciNx68SN+Lo3nlUFBLVeJQM4 DFR6w6EE249MUNRg4MV7Qr1ixNTCcMjyr0+x/4YUwvg== X-Google-Smtp-Source: AGHT+IG6jUoitTgiFTXdSrwMTL/OoQio/BlhVxzRStwKd/kUGsgb2XZinkbeZSLm7z/B6IiziT0tBQ== X-Received: by 2002:a05:6000:1883:b0:3c0:7e30:a95f with SMTP id ffacd0b85a97d-3d1e0a94fbfmr9044471f8f.60.1756817173362; Tue, 02 Sep 2025 05:46:13 -0700 (PDT) Received: from ho-tower-lan.lan ([185.48.76.109]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3cf275d2717sm19589896f8f.15.2025.09.02.05.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Sep 2025 05:46:12 -0700 (PDT) From: James Clark Date: Tue, 02 Sep 2025 13:44:59 +0100 Subject: [PATCH v6 7/7] spi: spi-fsl-dspi: Report FIFO overflows as errors Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250902-james-nxp-spi-dma-v6-7-f7aa2c5e56e2@linaro.org> References: <20250902-james-nxp-spi-dma-v6-0-f7aa2c5e56e2@linaro.org> In-Reply-To: <20250902-james-nxp-spi-dma-v6-0-f7aa2c5e56e2@linaro.org> To: Vladimir Oltean , Mark Brown , Vladimir Oltean , Arnd Bergmann , Larisa Grigore , Frank Li , Christoph Hellwig Cc: linux-spi@vger.kernel.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org, James Clark X-Mailer: b4 0.14.0 In target mode, the host sending more data than can be consumed would be a common problem for any message exceeding the FIFO or DMA buffer size. Cancel the whole message as soon as this condition is hit as the message will be corrupted. Only do this for target mode in a DMA transfer, it's not likely these flags will be set in host mode so it's not worth adding extra checks. In IRQ and polling modes we use the same transfer functions for hosts and targets so the error flags always get checked. This is slightly inconsistent but it's not worth doing the check conditionally because it may catch some host programming errors in the future. Signed-off-by: James Clark --- drivers/spi/spi-fsl-dspi.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 3d29285c772c..83ea296597e9 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -480,6 +480,17 @@ static void dspi_push_rx(struct fsl_dspi *dspi, u32 rxdata) dspi->dev_to_host(dspi, rxdata); } +static int dspi_fifo_error(struct fsl_dspi *dspi, u32 spi_sr) +{ + if (spi_sr & (SPI_SR_TFUF | SPI_SR_RFOF)) { + dev_err_ratelimited(&dspi->pdev->dev, "FIFO errors:%s%s\n", + spi_sr & SPI_SR_TFUF ? " TX underflow," : "", + spi_sr & SPI_SR_RFOF ? " RX overflow," : ""); + return -EIO; + } + return 0; +} + #if IS_ENABLED(CONFIG_DMA_ENGINE) /* Prepare one TX FIFO entry (txdata plus cmd) */ @@ -553,6 +564,7 @@ static int dspi_next_xfer_dma_submit(struct fsl_dspi *dspi) struct device *dev = &dspi->pdev->dev; struct fsl_dspi_dma *dma = dspi->dma; int time_left; + u32 spi_sr; int i; for (i = 0; i < dspi->words_in_flight; i++) @@ -603,7 +615,8 @@ static int dspi_next_xfer_dma_submit(struct fsl_dspi *dspi) if (spi_controller_is_target(dspi->ctlr)) { wait_for_completion_interruptible(&dspi->dma->cmd_rx_complete); - return 0; + regmap_read(dspi->regmap, SPI_SR, &spi_sr); + return dspi_fifo_error(dspi, spi_sr); } time_left = wait_for_completion_timeout(&dspi->dma->cmd_tx_complete, @@ -1073,6 +1086,10 @@ static void dspi_poll(struct fsl_dspi *dspi) for (tries = 1000; tries > 0; --tries) { regmap_read(dspi->regmap, SPI_SR, &spi_sr); regmap_write(dspi->regmap, SPI_SR, spi_sr); + + dspi->cur_msg->status = dspi_fifo_error(dspi, spi_sr); + if (dspi->cur_msg->status) + return; if (spi_sr & SPI_SR_CMDTCF) break; } @@ -1088,6 +1105,7 @@ static void dspi_poll(struct fsl_dspi *dspi) static irqreturn_t dspi_interrupt(int irq, void *dev_id) { struct fsl_dspi *dspi = (struct fsl_dspi *)dev_id; + int status; u32 spi_sr; regmap_read(dspi->regmap, SPI_SR, &spi_sr); @@ -1096,6 +1114,14 @@ static irqreturn_t dspi_interrupt(int irq, void *dev_id) if (!(spi_sr & SPI_SR_CMDTCF)) return IRQ_NONE; + status = dspi_fifo_error(dspi, spi_sr); + if (status) { + if (dspi->cur_msg) + WRITE_ONCE(dspi->cur_msg->status, status); + complete(&dspi->xfer_done); + return IRQ_HANDLED; + } + if (dspi_rxtx(dspi) == false) { if (dspi->cur_msg) WRITE_ONCE(dspi->cur_msg->status, 0); -- 2.34.1