From nobody Wed Oct 8 14:54:00 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.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 5847E298CA6 for ; Fri, 27 Jun 2025 10:22:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751019735; cv=none; b=lfehVE6JFe1z3r7iD7PBnG1mYV/RCyd7NuKlaXJlvTQyjl882tg2VY48fKYrqqZls4wtSHn1GOn7h7KPpb4pj6aKya4HlH3ZN99Q1hFqk1LMYwsUoArfarWKnmp89BOAO+llABfKjco4pg7EPtKUso5sngNpoNSD0lSTewXlYuc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751019735; c=relaxed/simple; bh=A0AE7vMjvLEfs1Y6oPJLVtlkIxVVKUGc/kFuse+plRg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ke/fDQ/aahT8/CmwDysFtdYl4cAJf/7JvpktM8WF0hXEASp+4Ql69stGUpWFXfdhzP/e9a92iVXik9zIpnnx1K7ah1N8y5ub+2NqSztB6Px8MpCxm2p/T0Peaf4oaifOyBHgiOa1U8C7xPDQT9DGqeSg2AMgSkRmBAGxA/Nehzk= 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=phiUVO/m; arc=none smtp.client-ip=209.85.128.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="phiUVO/m" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-453749aef9eso7288065e9.3 for ; Fri, 27 Jun 2025 03:22:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1751019732; x=1751624532; 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=KzTUwfC3xNjPw5feWhh4vjqhcP0iCwezFStPDEpH0fM=; b=phiUVO/mfjvLngwXHEQjbNPPbLaqLHwNoPocjA8cXkv8p29xGStvvwfp3jroMiwcCP tiNiPw8JXaCppJQgT6KwW3cVJ2aYlOE058HwYDiw4ykp/61JuorScgbUh9k6w3E6ua33 teJW7gk2+2212L3ekH8QyaeWMdhzGyv7nu8lgnMIQnFJS8J5PkCt9Ln/XtY9fzi1paez GC7pPlSyA4nlR69vSaBeM0r7Zr/qpzft5NCQNKZ4kQCE9K+IAxwq0a9hG7fuyTJvNXAb d1/euX8nWNNDThMaX68Y71++qSv+INZpxx8CXAD7GC6UlNYaWjtMEjS/JpE6gEEBjHSE gMyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751019732; x=1751624532; 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=KzTUwfC3xNjPw5feWhh4vjqhcP0iCwezFStPDEpH0fM=; b=C4dpylsWN/6WRwO9ozGs47pVHWzD585BD1eusIUyZvU3tU7G1WQfJyXPUJUt6F0bJY jGG4Lc8x0R6UiArbwaTgw8AUC9OSrfyDHiC5qdHGip6PX8bK+DcP2K1wp8XFxlJ9+Ocd nKcqhNUJw0CSRWI+6tG56BUgOyOJ6AybQO/3Djdmq3GASq99o2OuxacbjqGVyRNAZsRl ZI7PY5DOfO9YndAOKK11LviG+LJifoFwvuzw+WaPzKN1fcs8FR6Y0mI9mg8oUft4DHUt tDT44gmJZeIzJsZbzxK9nbJy0wMHdFn0UReKfOy1eALcAPUgjB2E+eYlX4rCQhDbrl+w pgRQ== X-Forwarded-Encrypted: i=1; AJvYcCUl6qZxSAQNC1XC7+TgmQ9TIjjykJtA65eI35HBa5U7RlDdUefOlqk6CzGLpk0d11bh4/zFkKEIS0aZZXk=@vger.kernel.org X-Gm-Message-State: AOJu0YxR8g1yThxHib95thYSfxpDk4/PG5J9vYZU6fQC0JvhzoChA2VS 403mNnpcMamwJJwJi7BsgyKdcwT4q/c4iMCgUlyaJMW13WI6IcZimgjb8tiPPx59wKw= X-Gm-Gg: ASbGncujYbYS+HgzkokWuhCr1fHuRHgu7mRbsQpl4cIzUAG3rfzLjfzBnVOh8pFUFQr UlCH8JyUGMtW9GuT1ZUAg5lEvhpkLg+4j3enI+grNkXI/M6MP4XM37VVZ1C9MdT4tVAU3Qk4w4g OcXBvzclid/p4lBsI9CmhjaBIziDijMMSMX28JjqrIBmDdwQMQVdSUeoetCWzQwWvyQTbNC7J8J 0SgyPnLmj2dELN3Tr6yAuFkAfxql+jIr78l/tsFLBAJ+bMClUlkAOm6MzFVx275QgKf1p1DI2rP VUg55q3Vwuq983ernGlsHcEBOGWgLOk8akNMb0soBkL5kJsSmyPivFBaPMbLHGlugl6YOzc= X-Google-Smtp-Source: AGHT+IFUDK62yhJ0rt2DuWwPnjIXpTSxvzqvb1fP76J3ZPniobq8nM9uTfBlDj2J/p+KBtN2CEHUkw== X-Received: by 2002:a05:600c:458b:b0:450:b9c0:c7d2 with SMTP id 5b1f17b1804b1-45391b6b96dmr12054215e9.11.1751019731517; Fri, 27 Jun 2025 03:22:11 -0700 (PDT) Received: from ho-tower-lan.lan ([37.18.136.128]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a3a5599sm47250955e9.13.2025.06.27.03.22.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jun 2025 03:22:11 -0700 (PDT) From: James Clark Date: Fri, 27 Jun 2025 11:21:38 +0100 Subject: [PATCH v4 2/6] spi: spi-fsl-dspi: Store status directly in cur_msg->status 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: quoted-printable Message-Id: <20250627-james-nxp-spi-dma-v4-2-178dba20c120@linaro.org> References: <20250627-james-nxp-spi-dma-v4-0-178dba20c120@linaro.org> In-Reply-To: <20250627-james-nxp-spi-dma-v4-0-178dba20c120@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 This will allow us to return a status from the interrupt handler in a later commit and avoids copying it at the end of dspi_transfer_one_message(). For consistency make polling and DMA modes use the same mechanism. Refactor dspi_rxtx() and dspi_poll() to not return -EINPROGRESS because this isn't actually a status that was ever returned to the core layer but some internal state. Wherever that was used we can look at dspi->len instead. No functional changes intended. Signed-off-by: James Clark --- drivers/spi/spi-fsl-dspi.c | 70 ++++++++++++++++++++++++------------------= ---- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 4bd4377551b5..65567745fe9a 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -591,11 +591,10 @@ static int dspi_next_xfer_dma_submit(struct fsl_dspi = *dspi) =20 static void dspi_setup_accel(struct fsl_dspi *dspi); =20 -static int dspi_dma_xfer(struct fsl_dspi *dspi) +static void dspi_dma_xfer(struct fsl_dspi *dspi) { struct spi_message *message =3D dspi->cur_msg; struct device *dev =3D &dspi->pdev->dev; - int ret =3D 0; =20 /* * dspi->len gets decremented by dspi_pop_tx_pushr in @@ -612,14 +611,12 @@ static int dspi_dma_xfer(struct fsl_dspi *dspi) message->actual_length +=3D dspi->words_in_flight * dspi->oper_word_size; =20 - ret =3D dspi_next_xfer_dma_submit(dspi); - if (ret) { + message->status =3D dspi_next_xfer_dma_submit(dspi); + if (message->status) { dev_err(dev, "DMA transfer failed\n"); break; } } - - return ret; } =20 static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) @@ -986,36 +983,40 @@ static void dspi_fifo_write(struct fsl_dspi *dspi) dspi->progress, !dspi->irq); } =20 -static int dspi_rxtx(struct fsl_dspi *dspi) +static void dspi_rxtx(struct fsl_dspi *dspi) { dspi_fifo_read(dspi); =20 if (!dspi->len) /* Success! */ - return 0; + return; =20 dspi_fifo_write(dspi); - - return -EINPROGRESS; } =20 -static int dspi_poll(struct fsl_dspi *dspi) +static void dspi_poll(struct fsl_dspi *dspi) { - int tries =3D 1000; + int tries; u32 spi_sr; =20 - do { - regmap_read(dspi->regmap, SPI_SR, &spi_sr); - regmap_write(dspi->regmap, SPI_SR, spi_sr); + while (dspi->len) { + for (tries =3D 1000; tries > 0; --tries) { + regmap_read(dspi->regmap, SPI_SR, &spi_sr); + regmap_write(dspi->regmap, SPI_SR, spi_sr); =20 - if (spi_sr & SPI_SR_CMDTCF) - break; - } while (--tries); + if (spi_sr & SPI_SR_CMDTCF) + break; + } =20 - if (!tries) - return -ETIMEDOUT; + if (!tries) { + dspi->cur_msg->status =3D -ETIMEDOUT; + return; + } =20 - return dspi_rxtx(dspi); + dspi_rxtx(dspi); + } + + dspi->cur_msg->status =3D 0; } =20 static irqreturn_t dspi_interrupt(int irq, void *dev_id) @@ -1029,8 +1030,13 @@ static irqreturn_t dspi_interrupt(int irq, void *dev= _id) if (!(spi_sr & SPI_SR_CMDTCF)) return IRQ_NONE; =20 - if (dspi_rxtx(dspi) =3D=3D 0) + dspi_rxtx(dspi); + + if (!dspi->len) { + if (dspi->cur_msg) + WRITE_ONCE(dspi->cur_msg->status, 0); complete(&dspi->xfer_done); + } =20 return IRQ_HANDLED; } @@ -1060,7 +1066,6 @@ static int dspi_transfer_one_message(struct spi_contr= oller *ctlr, struct spi_device *spi =3D message->spi; struct spi_transfer *transfer; bool cs =3D false; - int status =3D 0; u32 val =3D 0; bool cs_change =3D false; =20 @@ -1120,7 +1125,7 @@ static int dspi_transfer_one_message(struct spi_contr= oller *ctlr, dspi->progress, !dspi->irq); =20 if (dspi->devtype_data->trans_mode =3D=3D DSPI_DMA_MODE) { - status =3D dspi_dma_xfer(dspi); + dspi_dma_xfer(dspi); } else { /* * Reinitialize the completion before transferring data @@ -1134,15 +1139,12 @@ static int dspi_transfer_one_message(struct spi_con= troller *ctlr, =20 dspi_fifo_write(dspi); =20 - if (dspi->irq) { + if (dspi->irq) wait_for_completion(&dspi->xfer_done); - } else { - do { - status =3D dspi_poll(dspi); - } while (status =3D=3D -EINPROGRESS); - } + else + dspi_poll(dspi); } - if (status) + if (READ_ONCE(message->status)) break; =20 spi_transfer_delay_exec(transfer); @@ -1151,7 +1153,8 @@ static int dspi_transfer_one_message(struct spi_contr= oller *ctlr, dspi_deassert_cs(spi, &cs); } =20 - if (status || !cs_change) { + dspi->cur_msg =3D NULL; + if (message->status || !cs_change) { /* Put DSPI in stop mode */ regmap_update_bits(dspi->regmap, SPI_MCR, SPI_MCR_HALT, SPI_MCR_HALT); @@ -1160,10 +1163,9 @@ static int dspi_transfer_one_message(struct spi_cont= roller *ctlr, ; } =20 - message->status =3D status; spi_finalize_current_message(ctlr); =20 - return status; + return message->status; } =20 static int dspi_set_mtf(struct fsl_dspi *dspi) --=20 2.34.1