From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (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 43CD72773D; Fri, 16 Oct 2026 10:30:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792146612; cv=none; b=mHyvf49nfYNjyh3O3GbchPQ/IfjHW1H1qR4bC1qZqtk0OyPa5sGpqnzsYFhKpI81dnhBmBP92SCqymWdp4Q02BKn2DIoMofCkVI6E8neVVN2XkPi38pVTErzOcMaV9HO0YwYUfQKwlC2sEelHeK1Im2s6e+BSk72SMUVtQiq7VI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792146612; c=relaxed/simple; bh=rXmKJeCC4PfXrDRmq3DKADrsdEBpG0Y5W6q1C6CHkK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XOt+0uoRr54td9laY0k0F/HtoxU9257yr7SOK28onNDTlO7svWxo6eIC0QFmloBgkTrucYTdco53mCReQxtLaeMDdJILPRmS20OibrTVzCgzosmqesdqcj3MSn3qL8KaSsMrDWyf2HQ74jB1OW3TVQ+ipwf12MRmVwrSOYQ2zks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=DkEGBeub; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="DkEGBeub" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 741EA1A1249; Fri, 16 Oct 2026 10:30:08 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 42C166075D; Fri, 16 Oct 2026 10:30:08 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id EC9AF103284D3; Fri, 16 Oct 2026 12:30:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1792146607; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=JsO2W6pthGVFI/KJVstZnxwlQ4x1nV0/99SHc4dysYg=; b=DkEGBeubhLdFNRl06Pcasy7K1nRnCANTcJoxpyjo19TN/gemzijMvc4CYxVhCSwkszGT+H i805zF7x0XDYCCMFtLpuq62ZYKM0V1zt65LaSTSfwlzbejwSjl9dspSkDl2vlxBG1xmEEd DH9/6gVY/d8KFyCpLptu6MAn2NFABaY6WROScnAC5J91vufw0sXLSfUQe/Kc6DsS9sDbGD ul8ZEDh1dka3G4piTFDW19XjrGtcIrymH3eHPUkR4g1xrtEvZbtWOII/6lHLsqVWCy4P4g wnt6lkceUOFOevsVCo/PkF+wl2MgZSwLqYJmt+iE/sA6qF3G65+Q6KMdtNPIuA== From: Paul Cercueil To: Pratyush Yadav , Michael Walle , Takahiro Kuwano , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Mark Brown Cc: Kees Cook , Tony Luck , "Guilherme G . Piccoli" , Thomas Petazzoni , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Bharat Bhushan , Sunil Kovvuri Goutham , Tanmay Jagdale , Paul Cercueil Subject: [PATCH v4 5/7] spi: cadence-xspi: Add irq-less support Date: Fri, 16 Oct 2026 12:29:15 +0200 Message-ID: <20261016102917.171095-6-paul.cercueil@bootlin.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261016102917.171095-1-paul.cercueil@bootlin.com> References: <20261016102917.171095-1-paul.cercueil@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 From: Tanmay Jagdale Make the interrupt line optional. If not provided, the driver will instead resort to polling registers. This can be useful in itself, but will be used later to support write on kernel panic. Note the cdns_xspi_is_{sdma,stig}_ready() seem to have moved for no reason; they were actually moved out of a conditional compilation block (#ifdef CONFIG_64BIT), as they are needed in conf-independent paths now. Signed-off-by: Tanmay Jagdale Co-developed-by: Paul Cercueil Signed-off-by: Paul Cercueil --- Notes: v2: Make sure we only enable interrupts if not using polling mode v3-v4: No change drivers/spi/spi-cadence-xspi.c | 104 ++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 46 deletions(-) diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c index 095bf640b379..2a2a40bf0a4c 100644 --- a/drivers/spi/spi-cadence-xspi.c +++ b/drivers/spi/spi-cadence-xspi.c @@ -365,6 +365,38 @@ static int cdns_xspi_wait_for_controller_idle(struct cdns_xspi_dev *cdns_xspi) 100, 1000); } +static bool cdns_xspi_is_stig_ready(struct cdns_xspi_dev *cdns_xspi, bool sleep) +{ + u32 ctrl_stat; + + return !readl_relaxed_poll_timeout + (cdns_xspi->iobase + CDNS_XSPI_CTRL_STATUS_REG, + ctrl_stat, + ((ctrl_stat & BIT(3)) == 0), + sleep ? MRVL_XSPI_POLL_DELAY_US : 0, + sleep ? MRVL_XSPI_POLL_TIMEOUT_US : 0); +} + +static bool cdns_xspi_is_sdma_ready(struct cdns_xspi_dev *cdns_xspi, bool sleep) +{ + u32 ctrl_stat; + + if (readl_relaxed_poll_timeout + (cdns_xspi->iobase + CDNS_XSPI_INTR_STATUS_REG, + ctrl_stat, + (ctrl_stat & CDNS_XSPI_SDMA_TRIGGER), + sleep ? MRVL_XSPI_POLL_DELAY_US : 0, + sleep ? MRVL_XSPI_POLL_TIMEOUT_US : 0)) { + return false; + } + + /* Clear the flag */ + writel(CDNS_XSPI_SDMA_TRIGGER, + cdns_xspi->iobase + CDNS_XSPI_INTR_STATUS_REG); + + return true; +} + static void cdns_xspi_trigger_command(struct cdns_xspi_dev *cdns_xspi, u32 cmd_regs[6]) { @@ -532,7 +564,8 @@ static int cdns_xspi_send_stig_command(struct cdns_xspi_dev *cdns_xspi, writel(FIELD_PREP(CDNS_XSPI_CTRL_WORK_MODE, CDNS_XSPI_WORK_MODE_STIG), cdns_xspi->iobase + CDNS_XSPI_CTRL_CONFIG_REG); - cdns_xspi->set_interrupts_handler(cdns_xspi, true); + if (cdns_xspi->irq >= 0) + cdns_xspi->set_interrupts_handler(cdns_xspi, true); cdns_xspi->sdma_error = false; memset(cmd_regs, 0, sizeof(cmd_regs)); @@ -562,16 +595,25 @@ static int cdns_xspi_send_stig_command(struct cdns_xspi_dev *cdns_xspi, cdns_xspi_trigger_command(cdns_xspi, cmd_regs); - wait_for_completion(&cdns_xspi->sdma_complete); - if (cdns_xspi->sdma_error) { - cdns_xspi->set_interrupts_handler(cdns_xspi, false); + if (cdns_xspi->irq >= 0) { + wait_for_completion(&cdns_xspi->sdma_complete); + if (cdns_xspi->sdma_error) { + cdns_xspi->set_interrupts_handler(cdns_xspi, false); + return -EIO; + } + } else if (!cdns_xspi_is_sdma_ready(cdns_xspi, true)) { return -EIO; } + cdns_xspi->sdma_handler(cdns_xspi); } - wait_for_completion(&cdns_xspi->cmd_complete); - cdns_xspi->set_interrupts_handler(cdns_xspi, false); + if (cdns_xspi->irq >= 0) { + wait_for_completion(&cdns_xspi->cmd_complete); + cdns_xspi->set_interrupts_handler(cdns_xspi, false); + } else if (!cdns_xspi_is_stig_ready(cdns_xspi, true)) { + return -EIO; + } cmd_status = cdns_xspi_check_command_status(cdns_xspi); if (cmd_status) @@ -1052,38 +1094,6 @@ static int cdns_xspi_prepare_transfer(int cs, int dir, int len, u32 *cmd_regs) return 0; } -static bool cdns_xspi_is_stig_ready(struct cdns_xspi_dev *cdns_xspi, bool sleep) -{ - u32 ctrl_stat; - - return !readl_relaxed_poll_timeout - (cdns_xspi->iobase + CDNS_XSPI_CTRL_STATUS_REG, - ctrl_stat, - ((ctrl_stat & BIT(3)) == 0), - sleep ? MRVL_XSPI_POLL_DELAY_US : 0, - sleep ? MRVL_XSPI_POLL_TIMEOUT_US : 0); -} - -static bool cdns_xspi_is_sdma_ready(struct cdns_xspi_dev *cdns_xspi, bool sleep) -{ - u32 ctrl_stat; - - if (readl_relaxed_poll_timeout - (cdns_xspi->iobase + CDNS_XSPI_INTR_STATUS_REG, - ctrl_stat, - (ctrl_stat & CDNS_XSPI_SDMA_TRIGGER), - sleep ? MRVL_XSPI_POLL_DELAY_US : 0, - sleep ? MRVL_XSPI_POLL_TIMEOUT_US : 0)) { - return false; - } - - /* Clear the flag */ - writel(CDNS_XSPI_SDMA_TRIGGER, - cdns_xspi->iobase + CDNS_XSPI_INTR_STATUS_REG); - - return true; -} - static int cdns_xspi_transfer_one_message_b0(struct spi_controller *controller, struct spi_message *m) { @@ -1276,15 +1286,17 @@ static int cdns_xspi_probe(struct platform_device *pdev) } #endif - cdns_xspi->irq = platform_get_irq(pdev, 0); - if (cdns_xspi->irq < 0) - return -ENXIO; + cdns_xspi->irq = platform_get_irq_optional(pdev, 0); + if (cdns_xspi->irq < 0 && cdns_xspi->irq != -ENXIO) + return cdns_xspi->irq; - ret = devm_request_irq(dev, cdns_xspi->irq, cdns_xspi_irq_handler, - IRQF_SHARED, pdev->name, cdns_xspi); - if (ret) { - dev_err(dev, "Failed to request IRQ: %d\n", cdns_xspi->irq); - return ret; + if (cdns_xspi->irq >= 0) { + ret = devm_request_irq(dev, cdns_xspi->irq, cdns_xspi_irq_handler, + IRQF_SHARED, pdev->name, cdns_xspi); + if (ret) { + dev_err(dev, "Failed to request IRQ: %d\n", cdns_xspi->irq); + return ret; + } } #ifdef CONFIG_64BIT -- 2.47.3