Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp727066rwd; Thu, 15 Jun 2023 00:53:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ79394t8pklMy4ny+0MnfNxpz6CJpKc+aDyhcnvkAg2fMnJIwj/wCok49UNRnfjw0kNtjo8 X-Received: by 2002:a2e:b050:0:b0:2b1:a4c2:70b4 with SMTP id d16-20020a2eb050000000b002b1a4c270b4mr9189179ljl.30.1686815596452; Thu, 15 Jun 2023 00:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686815596; cv=none; d=google.com; s=arc-20160816; b=JcLYutIINH2C4SQPO7VTBUIm9rvwzBseAKB9a1T7pVH7Bll57KcEQjkhn67Ywk7YOD 0sxHuNT6ulNfJDv3Q9fF1fbJgTg6UjOb7xsQ/7jTXhN2fnGncx3Rk/yWspGXlrhvwZ0b EVx+9SE27FaqcnV6DRuRObJJiBM+zNsfBM9iV3Tcdf4fnALtSfy2u5n3W9a7zAVKLyXp +ClauQvIv0Bxe3sZNmiKpRhoN0uXI+QlsOXs3avqiLESI54EE2uJtfxwQIX3Wbh2DbhA 3r7cDiGCx2+3EXNjGFBjyZCpGQZ0zHEBp1tNFJcfhV/bHYjW/SwQ7CXISPhBPWWQg+T7 +BDw== 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=ic3w1UpqYpNpJ2vCRkBkIFvarcDVy7vffcczY7GxgEs=; b=yiMdDXB24+gazJg1zHIDRq/FObHiWciERybk4Z8cPFstqvh3TdSodDwC9UY+7Mu3tV OjDbb7zBvwpiLtgK17yPX3AKL1jRl2HIZ43GlM03/VvzGc7U7u+xbQamVcpvRcqxgHm1 +O92NFXLZbq4Fen6qiSoYs/JnFu2yr0dCJtcbKf0030JbjGgvL6UA2QjkxkxOPvLVjir qWnSApaTyEqcfR05tAcwMkCS5/gl3ooJg7FRfTV4bU/WB8A3IEmajtV55zWcZMEP0rnJ DknaulqBgD11jlE9HOhhypoZ/RX9YSoS+JPfqwGGPmhJBGL2pb4cuvQW668WMQ2JOCGO pl5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=Mzfmbh4C; 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 k9-20020aa7c049000000b00516485b6341si10069556edo.70.2023.06.15.00.52.52; Thu, 15 Jun 2023 00:53:16 -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=Mzfmbh4C; 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 S244716AbjFOHKt (ORCPT + 99 others); Thu, 15 Jun 2023 03:10:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244247AbjFOHJr (ORCPT ); Thu, 15 Jun 2023 03:09:47 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04AA22967; Thu, 15 Jun 2023 00:08:32 -0700 (PDT) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35F54l77030983; Thu, 15 Jun 2023 07:08:29 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=ic3w1UpqYpNpJ2vCRkBkIFvarcDVy7vffcczY7GxgEs=; b=Mzfmbh4CucLjYXQ98oRcMhqI67YmzUwFhM7mOrwnYg3lqyTgdwKzTcllD/KeaVtVWLyN 497C4pvlsEtk2kqD5keZT/aJu8bqJYZoBO6zBTvfWSQcnHkfK6lYGOVm6nYzi98VF6MH dH5y/mQDC5O1vnDDUXHOib0jSiyo0osFKkTBaumrokE4Kvn3HFcodj1jT/VOLjs9O20s t+8fJx5Aq7r/treXm8Ae3cGk2ocrsd0DZ9wihkbEjijrLMWmL5OpANGD0O1wPPFjf1FM vwKNwuC4oTaI8lvhyk2EXBw43yvIoiImMelFJDlQmBJXhFSLIca7nMY0z9dyeUeG/Tgx Mg== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3r7p4q8r95-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Jun 2023 07:08:29 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 35F78S8X027982 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Jun 2023 07:08:28 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.986.42; Thu, 15 Jun 2023 00:08:23 -0700 From: Praveen Talari To: , , , , , , , , , CC: , , , , Praveen Talari Subject: [PATCH v2 3/3] spi: spi-geni-qcom: Add SPI SLAVE mode support for GENI based QuPv3 Date: Thu, 15 Jun 2023 12:37:06 +0530 Message-ID: <20230615070706.18322-4-quic_ptalari@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230615070706.18322-1-quic_ptalari@quicinc.com> References: <20230615070706.18322-1-quic_ptalari@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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: LRyhNIzo0UIydeqIt4EfzVSJZ5LEuYhG X-Proofpoint-ORIG-GUID: LRyhNIzo0UIydeqIt4EfzVSJZ5LEuYhG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-15_04,2023-06-14_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 adultscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 phishscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306150058 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,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 slave mode support to GENI based QuPv3. Signed-off-by: Praveen Talari --- 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..2170bd6b7eef 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, "qcom,slv-ctrl")) + 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