linux-kernel - [PATCH 7/8] Spi: sprd-adi: Waiting write

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230815023426.15076-7-jiansheng.wu@unisoc.com>
Date:   Tue, 15 Aug 2023 10:34:25 +0800
From:   Jiansheng Wu <jiansheng.wu@...soc.com>
To:     Mark Brown <broonie@...nel.org>, Orson Zhai <orsonzhai@...il.com>,
        Baolin Wang <baolin.wang@...ux.alibaba.com>,
        Chunyan Zhang <zhang.lyra@...il.com>
CC:     <linux-spi@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <yongzhi.chen@...soc.com>, <xiaoqing.wu@...soc.com>,
        <jianshengwu16@...il.com>
Subject: [PATCH 7/8] Spi: sprd-adi: Waiting write_cmd is finished

Checeking state on write_cmd, and return flag of result. It is a new
function on UMS9620 to verify that the data transfer is complete.

Signed-off-by: XiaoQing Wu <xiaoqing.wu@...soc.com>
Signed-off-by: Jiansheng Wu <jiansheng.wu@...soc.com>
---
 drivers/spi/spi-sprd-adi.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c
index 0b20c228e119..8c518c227549 100644
--- a/drivers/spi/spi-sprd-adi.c
+++ b/drivers/spi/spi-sprd-adi.c
@@ -48,6 +48,7 @@
 #define RD_ADDR_MASK			GENMASK(30, 16)
 
 /* Bits definitions for register REG_ADI_ARM_FIFO_STS */
+#define BIT_ARM_WR_FREQ			BIT(31)
 #define BIT_FIFO_FULL			BIT(11)
 #define BIT_FIFO_EMPTY			BIT(10)
 
@@ -78,6 +79,7 @@
 
 #define ADI_FIFO_DRAIN_TIMEOUT		1000
 #define ADI_READ_TIMEOUT		2000
+#define ADI_WRITE_TIMEOUT		2000
 
 /*
  * Read back address from REG_ADI_RD_DATA bit[30:16] which maps to:
@@ -150,6 +152,7 @@
 struct sprd_adi_data {
 	u32 slave_offset;
 	u32 slave_addr_size;
+	int (*write_wait)(void __iomem *adi_base);
 	int (*read_check)(u32 val, u32 reg);
 	u32 rst_sts;
 	u32 swrst_base;
@@ -247,6 +250,22 @@ static int sprd_adi_read_check(u32 val, u32 addr)
 	return 0;
 }
 
+static int sprd_adi_write_wait(void __iomem *adi_base)
+{
+	unsigned int write_timeout = ADI_WRITE_TIMEOUT;
+	u32 val;
+
+	do {
+		val = readl_relaxed(adi_base + REG_ADI_ARM_FIFO_STS);
+		if (!(val & BIT_ARM_WR_FREQ))
+			return 0;
+		cpu_relax();
+	} while (--write_timeout);
+
+	pr_err("ADI write fail, sts = 0x%02x\n", val);
+	return -EBUSY;
+}
+
 static int sprd_adi_read_check_r2(u32 val, u32 reg)
 {
 	return sprd_adi_read_check(val, reg & RDBACK_ADDR_MASK_R2);
@@ -365,8 +384,12 @@ static int sprd_adi_write(struct sprd_adi *sadi, u32 reg, u32 val)
 	if (timeout == 0) {
 		dev_err(sadi->dev, "write fifo is full\n");
 		ret = -EBUSY;
+		goto out;
 	}
 
+	if (sadi->data->write_wait)
+		ret = sadi->data->write_wait(sadi->base);
+
 out:
 	if (sadi->hwlock)
 		hwspin_unlock_irqrestore(sadi->hwlock, &flags);
@@ -691,6 +714,7 @@ static struct sprd_adi_data ums512_data = {
 };
 
 static struct sprd_adi_data ums9620_data = {
+	.write_wait = sprd_adi_write_wait,
 	.slave_offset = ADI_15BIT_SLAVE_OFFSET,
 	.slave_addr_size = ADI_15BIT_SLAVE_ADDR_SIZE,
 	.rst_sts = UMP9620_RST_STATUS,
-- 
2.17.1