Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp30000044rwd; Wed, 5 Jul 2023 22:32:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlHIX62kojHeCwW5hSwWQlcFBWK0kBCmvfmm1LhJVR1utt4sNe63VPUSvJpwOYZrNHzqkeps X-Received: by 2002:a17:90b:4a12:b0:262:ece1:5fd9 with SMTP id kk18-20020a17090b4a1200b00262ece15fd9mr785936pjb.10.1688621545850; Wed, 05 Jul 2023 22:32:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688621545; cv=none; d=google.com; s=arc-20160816; b=K5vWi3vmcMGlWq6IEqHnGVGyekX2U8xZqkWY6yZuTxtDykPouXBEMjDOsnvzKOFqhm jutgVhautDQreRlWOkSnmuU7jKWKEc2l3GdWpDDAHt3MKA69/vaugTyAtGAGQBqk41fM hhwKxHuYJbZFe08bZv5lMSwYkL9wXWk1OHmGEYFGBZwi3IR2aLpFi8pD+keM/qAvbaZc /8pLnm/EbhGj5KMR3wJQjKP84otKmDc5s+wa9foCKizJyCrx+2huP/m7lwdbrc6sT+/l PtEpp/l4brRd33y8DjIA6OVsEWgkdRWo3yOz9M1U8LglTPMS4uR6U8d8atLWHo+8yLWJ 1LCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=lV1vCmbybECQxhVDClG6zNuGhoVFunFEgsOk7CrYVhw=; fh=FQHwAm4e+sv62d0A9W0r/7x/vfsGSTHXfhuG4YjaNeY=; b=dRRYP8ujWJESmwa69KFszOyeQslSzkrLfUMUxe0P0tzE+o4GjshRkGnrYHmjVWB3pG 86DIN06FZhIPNUOPM1xa+tKsqhMAv1My1h2WxYRFzasW4re56AF01AfmdcXPn+64jlXq Rht2uHgYViW/F7JCktlAb+9eWdsp6YnwRHLZ3Rm8aRZSHRriFfUah8vFTkrzz3I8+1pT ViVl45vfE4+l6f6Ltr/+hdoSW5tRDv3seDmiB1VjjaRwbUZCZLHs1izEshYjr7YChXLn rKMWMh8LJ9txyh/2ibaaWVIXKcaPZApIbnSgDuduERraV8OromY/WC2faFJnzl8K5Im3 6YhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=le7ZxhvM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 34-20020a630f62000000b0055bef96853bsi726802pgp.665.2023.07.05.22.32.10; Wed, 05 Jul 2023 22:32:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=le7ZxhvM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232963AbjGFFMF (ORCPT + 99 others); Thu, 6 Jul 2023 01:12:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229589AbjGFFMD (ORCPT ); Thu, 6 Jul 2023 01:12:03 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8340F1BF8; Wed, 5 Jul 2023 22:11:58 -0700 (PDT) Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3664xFWq030050; Thu, 6 Jul 2023 05:11:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=lV1vCmbybECQxhVDClG6zNuGhoVFunFEgsOk7CrYVhw=; b=le7ZxhvM9yqBQ6neu5vZUpv3U4t/aQhR9SUfj4APh23Kp86Gm/gD6xVrmgfGfgaWyk99 uSLqraOpIeHE+f+JqDgYFkEhVOJTM2TUEhmmG/OmFAFXQdtqR35HS93/WcXAD8YUPYaH G/MjMzg5qq91VZDCVqSN7+kq14ACV57IDPgRNSFPT01p8HZ/99tEcf7TL1JAoNt+6cbj 9BodXgOE9B/tgN7IS5PXKNEc4J9mL2a1qtWYau8pa0EfMIEvZjROLkychR6yfOMVZiBP nM/AGoCpVuVrpwtWc6vj5W1zL/RZDgwtH890+RRK6sKgrJCT1oAINQi4THhL/Cp5XWCP Iw== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3rn5mft8vd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Jul 2023 05:11:54 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3665BrF3002694 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 6 Jul 2023 05:11:53 GMT Received: from hu-ptalari-hyd.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 5 Jul 2023 22:11:49 -0700 From: Praveen Talari To: , , , , , , CC: , , , , Praveen Talari Subject: [PATCH v4 2/2] spi: spi-geni-qcom: Add SPI Device mode support for GENI based QuPv3 Date: Thu, 6 Jul 2023 10:40:24 +0530 Message-ID: <20230706051024.15422-3-quic_ptalari@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230706051024.15422-1-quic_ptalari@quicinc.com> References: <20230706051024.15422-1-quic_ptalari@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: M6XdTDBlIxWJrsGHewCB9sWtPXS5bzRM X-Proofpoint-ORIG-GUID: M6XdTDBlIxWJrsGHewCB9sWtPXS5bzRM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-06_02,2023-07-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 malwarescore=0 spamscore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 bulkscore=0 mlxlogscore=999 priorityscore=1501 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307060045 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently spi geni driver supports only master mode operation. Add spi device mode support to GENI based QuPv3. Signed-off-by: Praveen Talari --- v3 -> v4: - Used existing property spi-slave. v2 -> v3: - modified commit message to use device mode instead of slave mode v1 -> v2 - modified the commit message - added the code changes for code comments --- drivers/spi/spi-geni-qcom.c | 57 +++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index 206cc04bb1ed..4ec4fdee06b5 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +53,9 @@ #define SPI_CS_CLK_DELAY_MSK GENMASK(19, 10) #define SPI_CS_CLK_DELAY_SHFT 10 +#define SE_SPI_SLAVE_EN (0x2BC) +#define SPI_SLAVE_EN BIT(0) + /* M_CMD OP codes for SPI */ #define SPI_TX_ONLY 1 #define SPI_RX_ONLY 2 @@ -99,6 +103,24 @@ struct spi_geni_master { int cur_xfer_mode; }; +static struct spi_master *get_spi_master(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct spi_master *spi = platform_get_drvdata(pdev); + + return spi; +} + +static void spi_slv_setup(struct spi_geni_master *mas) +{ + struct geni_se *se = &mas->se; + + writel(SPI_SLAVE_EN, se->base + SE_SPI_SLAVE_EN); + writel(GENI_IO_MUX_0_EN, se->base + GENI_OUTPUT_CTRL); + writel(START_TRIGGER, se->base + SE_GENI_CFG_SEQ_START); + dev_dbg(mas->dev, "spi slave setup done\n"); +} + static int get_spi_clk_cfg(unsigned int speed_hz, struct spi_geni_master *mas, unsigned int *clk_idx, @@ -140,12 +162,18 @@ static void handle_se_timeout(struct spi_master *spi, const struct spi_transfer *xfer; spin_lock_irq(&mas->lock); - reinit_completion(&mas->cancel_done); if (mas->cur_xfer_mode == GENI_SE_FIFO) writel(0, se->base + SE_GENI_TX_WATERMARK_REG); xfer = mas->cur_xfer; mas->cur_xfer = NULL; + + if (spi->slave) { + spin_unlock_irq(&mas->lock); + goto unmap_if_dma; + } + + reinit_completion(&mas->cancel_done); geni_se_cancel_m_cmd(se); spin_unlock_irq(&mas->lock); @@ -542,6 +570,10 @@ static bool geni_can_dma(struct spi_controller *ctlr, if (mas->cur_xfer_mode == GENI_GPI_DMA) return true; + /* Set DMA mode for SPI slave. */ + if (ctlr->slave) + return true; + len = get_xfer_len_in_words(xfer, mas); fifo_size = mas->tx_fifo_depth * mas->fifo_width_bits / mas->cur_bits_per_word; @@ -619,6 +651,7 @@ static void spi_geni_release_dma_chan(struct spi_geni_master *mas) static int spi_geni_init(struct spi_geni_master *mas) { + struct spi_master *spi = get_spi_master(mas->dev); struct geni_se *se = &mas->se; unsigned int proto, major, minor, ver; u32 spi_tx_cfg, fifo_disable; @@ -627,7 +660,14 @@ static int spi_geni_init(struct spi_geni_master *mas) pm_runtime_get_sync(mas->dev); proto = geni_se_read_proto(se); - if (proto != GENI_SE_SPI) { + + if (spi->slave) { + if (proto != GENI_SE_SPI_SLAVE) { + dev_err(mas->dev, "Invalid proto %d\n", proto); + goto out_pm; + } + spi_slv_setup(mas); + } else if (proto != GENI_SE_SPI) { dev_err(mas->dev, "Invalid proto %d\n", proto); goto out_pm; } @@ -677,9 +717,11 @@ static int spi_geni_init(struct spi_geni_master *mas) } /* We always control CS manually */ - spi_tx_cfg = readl(se->base + SE_SPI_TRANS_CFG); - spi_tx_cfg &= ~CS_TOGGLE; - writel(spi_tx_cfg, se->base + SE_SPI_TRANS_CFG); + if (!spi->slave) { + spi_tx_cfg = readl(se->base + SE_SPI_TRANS_CFG); + spi_tx_cfg &= ~CS_TOGGLE; + writel(spi_tx_cfg, se->base + SE_SPI_TRANS_CFG); + } out_pm: pm_runtime_put(mas->dev); @@ -1072,6 +1114,9 @@ static int spi_geni_probe(struct platform_device *pdev) pm_runtime_set_autosuspend_delay(&pdev->dev, 250); pm_runtime_enable(dev); + if (device_property_read_bool(&pdev->dev, "spi-slave")) + spi->slave = true; + ret = geni_icc_get(&mas->se, NULL); if (ret) goto spi_geni_probe_runtime_disable; @@ -1092,7 +1137,7 @@ static int spi_geni_probe(struct platform_device *pdev) * for dma (gsi) mode, the gsi will set cs based on params passed in * TRE */ - if (mas->cur_xfer_mode == GENI_SE_FIFO) + if (!spi->slave && mas->cur_xfer_mode == GENI_SE_FIFO) spi->set_cs = spi_geni_set_cs; ret = request_irq(mas->irq, geni_spi_isr, 0, dev_name(dev), spi); -- 2.17.1