Skip to contentSkip to conversation

serial: a3720: Implement pending method for output direction

PATCH New Pali Rohár 2 participants 3 messages Jan 14, 2021 – Jan 15, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 serial: a3720: Implement pending method for output direction

To check if some output characters are waiting either in Transmitter Holding Register or Transmitter Shift Register we need to look at TX_EMPTY bit of UART Status Register.

---
 drivers/serial/serial_mvebu_a3700.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/serial/serial_mvebu_a3700.c +8 -2
index fb43f88eaf..909901c9f0 100644
@@ -23,6 +23,7 @@ struct mvebu_platdata {
 #define UART_POSSR_REG		0x14
 
 #define UART_STATUS_RX_RDY	0x10
+#define UART_STATUS_TX_EMPTY	0x40
 #define UART_STATUS_TXFIFO_FULL	0x800
 
 #define UART_CTRL_RXFIFO_RESET	0x4000
@@ -59,8 +60,13 @@ static int mvebu_serial_pending(struct udevice *dev, bool input)
 	struct mvebu_platdata *plat = dev_get_platdata(dev);
 	void __iomem *base = plat->base;
 
-	if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)
-		return 1;
+	if (input) {
+		if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)
+			return 1;
+	} else {
+		if (!(readl(base + UART_STATUS_REG) & UART_STATUS_TX_EMPTY))
+			return 1;
+	}
 
 	return 0;
 }
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 serial: a3720: Implement pending method for output direction

Quoted 5 lines · Pali Roh?r

To check if some output characters are waiting either in Transmitter Holding Register or Transmitter Shift Register we need to look at TX_EMPTY bit of UART Status Register.

BTW: How did you detect this issue?

Thanks,
Stefan

Quoted 23 lines
---
  drivers/serial/serial_mvebu_a3700.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
drivers/serial/serial_mvebu_a3700.c +1 -2
index fb43f88eaf..909901c9f0 100644
@@ -23,6 +23,7 @@ struct mvebu_platdata {
  #define UART_POSSR_REG		0x14
 
  #define UART_STATUS_RX_RDY	0x10
+#define UART_STATUS_TX_EMPTY	0x40
  #define UART_STATUS_TXFIFO_FULL	0x800
 
  #define UART_CTRL_RXFIFO_RESET	0x4000
@@ -59,8 +60,13 @@ static int mvebu_serial_pending(struct udevice *dev, bool input)
  	struct mvebu_platdata *plat = dev_get_platdata(dev);
  	void __iomem *base = plat->base;
 
-	if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)
-		return 1;

drivers/serial/serial_mvebu_a3700.c static int mvebu_serial_pending(struct udevice *dev, bool input) · line 72

Quoted 10 lines
drivers/serial/serial_mvebu_a3700.c +7 -0
+	if (input) {
+		if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)
+			return 1;
+	} else {
+		if (!(readl(base + UART_STATUS_REG) & UART_STATUS_TX_EMPTY))
+			return 1;
+	}
 
  	return 0;
  }

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
#2 lore raw

PATCH 1/1 serial: a3720: Implement pending method for output direction

Quoted 10 lines · On Friday 15 January 2021 15:50:46 Stefan Roese wrote:
Quoted 5 lines · Pali Roh?r

To check if some output characters are waiting either in Transmitter Holding Register or Transmitter Shift Register we need to look at TX_EMPTY bit of UART Status Register.

BTW: How did you detect this issue?

During debugging both TF-A and linux kernel as they were eating characters sent via A3720 UART. Details are in kernel and TF-A patches:

https://lore.kernel.org/linux-serial/20201223191931.18343-1-pali at kernel.org/
https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7734

I have not spotted this issue in U-Boot (only in TF-A and kernel), but I decided to look also at the U-Boot A3720 UART implementation... And find out that it is incomplete too, ignoring 'bool input' function argument.

Quoted 41 lines

Thanks,
Stefan

Quoted 19 lines
---
  drivers/serial/serial_mvebu_a3700.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)
drivers/serial/serial_mvebu_a3700.c +1 -2
index fb43f88eaf..909901c9f0 100644
@@ -23,6 +23,7 @@ struct mvebu_platdata {
  #define UART_POSSR_REG		0x14
  #define UART_STATUS_RX_RDY	0x10
+#define UART_STATUS_TX_EMPTY	0x40
  #define UART_STATUS_TXFIFO_FULL	0x800
  #define UART_CTRL_RXFIFO_RESET	0x4000
@@ -59,8 +60,13 @@ static int mvebu_serial_pending(struct udevice *dev, bool input)
  	struct mvebu_platdata *plat = dev_get_platdata(dev);
  	void __iomem *base = plat->base;
-	if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)
-		return 1;

drivers/serial/serial_mvebu_a3700.c static int mvebu_serial_pending(struct udevice *dev, bool input) · line 71

Quoted 10 lines
drivers/serial/serial_mvebu_a3700.c +7 -0
+	if (input) {
+		if (readl(base + UART_STATUS_REG) & UART_STATUS_RX_RDY)
+			return 1;
+	} else {
+		if (!(readl(base + UART_STATUS_REG) & UART_STATUS_TX_EMPTY))
+			return 1;
+	}
  	return 0;
  }
 

Viele Gr??e,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de