OMAP2+: UART: Enable tx wakeup + remove cpu checks

From: "Govindraj.R"<[email protected]>

Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself.

Cc Paul Walmsley<[email protected]>

Cc Kevin Hilman<[email protected]>

Signed-off-by Felipe Balbi<[email protected]>

Signed-off-by Govindraj.R<[email protected]>

---
  arch/arm/mach-omap2/serial.c                  |    8 ---
  arch/arm/plat-omap/include/plat/omap-serial.h |    1 -
  drivers/tty/serial/omap-serial.c              |   62 ++++++++++++++++++++++++-
  3 files changed, 61 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/serial.c +0 -8

index f590afc..330ee04 100644
@@ -357,14 +357,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
  	omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
  	omap_up.autosuspend_timeout = info->autosuspend_timeout;
 
-	/* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
-	if (!cpu_is_omap2420()&&  !cpu_is_ti816x())
-		omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
-
-	/* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
-	if (cpu_is_omap34xx() || cpu_is_omap3630())
-		omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
-
  	pdata =&omap_up;
  	pdata_size = sizeof(struct omap_uart_port_info);
 

arch/arm/plat-omap/include/plat/omap-serial.h +0 -1

index 9ff4444..1a52725 100644
@@ -65,7 +65,6 @@ struct omap_uart_port_info {
  	bool			dma_enabled;	/* To specify DMA Mode */
  	unsigned int		uartclk;	/* UART clock rate */
  	upf_t			flags;		/* UPF_* flags */
-	u32			errata;
  	unsigned int		dma_rx_buf_size;
  	unsigned int		dma_rx_timeout;
  	unsigned int		autosuspend_timeout;

drivers/tty/serial/omap-serial.c +7 -0

index f809041..c7666d6 100644
@@ -44,6 +44,13 @@
  #include<plat/dmtimer.h>
  #include<plat/omap-serial.h>
 
+#define UART_BUILD_REVISION(x, y)	(((x)<<  8) | (y))
+
+#define OMAP_UART_REV_42 0x0402
+#define OMAP_UART_REV_46 0x0406
+#define OMAP_UART_REV_52 0x0502
+#define OMAP_UART_REV_63 0x0603
+
  #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
 
  /* SCR register bitmasks */

@@ -1346,6 +1353,58 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
  	return;
  }
 

drivers/tty/serial/omap-serial.c +19 -0

+		minor = (mvr&  0x3f);
+		break;
+	default:
+		dev_warn(&up->pdev->dev,
+			"Unknown %s revision, defaulting to highest\n",
+			up->name);
+		/* highest possible revision */
+		major = 0xff;
+		minor = 0xff;
+	}
+
+	/* normalize revision for the driver */
+	revision = UART_BUILD_REVISION(major, minor);
+
+	switch (revision) {
+	case OMAP_UART_REV_46:
+		up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
+				UART_ERRATA_i291_DMA_FORCEIDLE);
+		break;

drivers/tty/serial/omap-serial.c +4 -1

+}
+
  static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)
  {
  	struct omap_uart_port_info *omap_up_info;

@@ -1443,7 +1502,6 @@ static int serial_omap_probe(struct platform_device *pdev)
  						"%d\n", DEFAULT_CLK_SPEED);
  	}
  	up->uart_dma.uart_base = mem->start;
-	up->errata = omap_up_info->errata;
 
  	if (omap_up_info->dma_enabled) {
  		up->uart_dma.uart_dma_tx = dma_tx->start;

@@ -1473,6 +1531,8 @@ static int serial_omap_probe(struct platform_device *pdev)
  	pm_runtime_enable(&pdev->dev);
  	pm_runtime_get_sync(&pdev->dev);
 
+	omap_serial_fill_features_erratas(up);
+
  	ui[up->port.line] = up;
  	serial_omap_add_console_port(up);
 

From: "Govindraj.R"<[email protected]>

Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself.

Cc Paul Walmsley<[email protected]>

Cc Kevin Hilman<[email protected]>

Signed-off-by Felipe Balbi<[email protected]>

Signed-off-by Govindraj.R<[email protected]>

---
  arch/arm/mach-omap2/serial.c                  |    8 ---
  arch/arm/plat-omap/include/plat/omap-serial.h |    1 -
  drivers/tty/serial/omap-serial.c              |   62 ++++++++++++++++++++++++-
  3 files changed, 61 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/serial.c +0 -8

index f590afc..330ee04 100644
@@ -357,14 +357,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
  	omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
  	omap_up.autosuspend_timeout = info->autosuspend_timeout;
 
-	/* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
-	if (!cpu_is_omap2420()&&  !cpu_is_ti816x())
-		omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
-
-	/* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
-	if (cpu_is_omap34xx() || cpu_is_omap3630())
-		omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
-
  	pdata =&omap_up;
  	pdata_size = sizeof(struct omap_uart_port_info);
 

arch/arm/plat-omap/include/plat/omap-serial.h +0 -1

index 9ff4444..1a52725 100644
@@ -65,7 +65,6 @@ struct omap_uart_port_info {
  	bool			dma_enabled;	/* To specify DMA Mode */
  	unsigned int		uartclk;	/* UART clock rate */
  	upf_t			flags;		/* UPF_* flags */
-	u32			errata;
  	unsigned int		dma_rx_buf_size;
  	unsigned int		dma_rx_timeout;
  	unsigned int		autosuspend_timeout;

drivers/tty/serial/omap-serial.c +7 -0

index f809041..c7666d6 100644
@@ -44,6 +44,13 @@
  #include<plat/dmtimer.h>
  #include<plat/omap-serial.h>
 
+#define UART_BUILD_REVISION(x, y)	(((x)<<  8) | (y))
+
+#define OMAP_UART_REV_42 0x0402
+#define OMAP_UART_REV_46 0x0406
+#define OMAP_UART_REV_52 0x0502
+#define OMAP_UART_REV_63 0x0603
+
  #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
 
  /* SCR register bitmasks */

@@ -1346,6 +1353,58 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
  	return;
  }
 

Hi Govindraj,

Quoted 78 lines · Govindraj.R

From: "Govindraj.R"<[email protected]>

Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself.

Cc Paul Walmsley<[email protected]>

Cc Kevin Hilman<[email protected]>

Signed-off-by Felipe Balbi<[email protected]>

Signed-off-by Govindraj.R<[email protected]>

---

?arch/arm/mach-omap2/serial.c ? ? ? ? ? ? ? ? ?| ? ?8 ---
?arch/arm/plat-omap/include/plat/omap-serial.h | ? ?1 -
?drivers/tty/serial/omap-serial.c ? ? ? ? ? ? ?| ? 62

++++++++++++++++++++++++-
?3 files changed, 61 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/serial.c +0 -8

index f590afc..330ee04 100644
@@ -357,14 +357,6 @@ void __init omap_serial_init_port(struct
 omap_board_data *bdata,
 ? ? ? ?omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
 ? ? ? ?omap_up.autosuspend_timeout = info->autosuspend_timeout;
 
- ? ? ? /* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
- ? ? ? if (!cpu_is_omap2420()&& ?!cpu_is_ti816x())
 
- ? ? ? ? ? ? ? omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
-
- ? ? ? /* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
- ? ? ? if (cpu_is_omap34xx() || cpu_is_omap3630())
- ? ? ? ? ? ? ? omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
-
 ? ? ? ?pdata =&omap_up;

? ? ? ?pdata_size = sizeof(struct omap_uart_port_info);

arch/arm/plat-omap/include/plat/omap-serial.h +0 -0

index 9ff4444..1a52725 100644
@@ -65,7 +65,6 @@ struct omap_uart_port_info {

? ? ? ?bool ? ? ? ? ? ? ? ? ? ?dma_enabled; ? ?/* To specify DMA Mode */ ? ? ? ?unsigned int ? ? ? ? ? ?uartclk; ? ? ? ?/* UART clock rate */ ? ? ? ?upf_t ? ? ? ? ? ? ? ? ? flags; ? ? ? ? ?/* UPF_* flags */
- ? ? ? u32 ? ? ? ? ? ? ? ? ? ? errata;
? ? ? ?unsigned int ? ? ? ? ? ?dma_rx_buf_size;
? ? ? ?unsigned int ? ? ? ? ? ?dma_rx_timeout;
? ? ? ?unsigned int ? ? ? ? ? ?autosuspend_timeout;

drivers/tty/serial/omap-serial.c +0 -0

index f809041..c7666d6 100644
@@ -44,6 +44,13 @@

?#include<plat/dmtimer.h>
?#include<plat/omap-serial.h>

drivers/tty/serial/omap-serial.c +7 -0

+#define UART_BUILD_REVISION(x, y) ? ? ?(((x)<< ?8) | (y))
+
+#define OMAP_UART_REV_42 0x0402
+#define OMAP_UART_REV_46 0x0406
+#define OMAP_UART_REV_52 0x0502
+#define OMAP_UART_REV_63 0x0603
+

?#define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/

?/* SCR register bitmasks */

drivers/tty/serial/omap-serial.c +0 -0

@@ -1346,6 +1353,58 @@ static void uart_tx_dma_callback(int lch, u16
 ch_status, void *data)
 ? ? ? ?return;
 ?}
 

drivers/tty/serial/omap-serial.c static void uart_tx_dma_callback(int lch, u16 · line 1366

Quoted 10 lines

drivers/tty/serial/omap-serial.c +10 -0

+static void omap_serial_fill_features_erratas(struct uart_omap_port *up)
+{
+ ? ? ? u32 mvr, scheme;
+ ? ? ? u16 revision, major, minor;
+
+ ? ? ? mvr = serial_in(up, UART_OMAP_MVER);
+
+ ? ? ? /* Check revision register scheme */
+ ? ? ? scheme = mvr& ?(0x03<< ?30);
+ ? ? ? scheme>>= 30;

Minor nit-pick, why not ...

? ? ? ?scheme = mvr >> 30;

drivers/tty/serial/omap-serial.c static void uart_tx_dma_callback(int lch, u16 · line 1369

Quoted 4 lines

drivers/tty/serial/omap-serial.c +3 -0

+ ? ? ? switch (scheme) {
+ ? ? ? case 0: /* Legacy Scheme: OMAP2/3 */
+ ? ? ? ? ? ? ? /* MINOR_REV[0:4], MAJOR_REV[4:7] */

This scheme is also true from OMAP1 devices. Maybe we could include in the comment.

drivers/tty/serial/omap-serial.c static void uart_tx_dma_callback(int lch, u16 · line 1377

Quoted 9 lines

drivers/tty/serial/omap-serial.c +7 -0

+ ? ? ? ? ? ? ? major = (mvr& ?0xf0)>> ?4;
+ ? ? ? ? ? ? ? minor = (mvr& ?0x0f);
 
+ ? ? ? ? ? ? ? break;
+ ? ? ? case 1:
+ ? ? ? ? ? ? ? /* New Scheme: OMAP4+ */
+ ? ? ? ? ? ? ? /* MINOR_REV[0:5], MAJOR_REV[8:10] */
+ ? ? ? ? ? ? ? major = (mvr& ?0x7<< ?8)>> ?8;

Nit-pick ...

? ? ? ?major = (mvr >> 8) & 0x7;

Quoted 96 lines · Jon Hunter

Hi Govindraj,

Quoted 78 lines · Govindraj.R

From: "Govindraj.R"<[email protected]>

Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself.

Cc Paul Walmsley<[email protected]>

Cc Kevin Hilman<[email protected]>

Signed-off-by Felipe Balbi<[email protected]>

Signed-off-by Govindraj.R<[email protected]>

---
  arch/arm/mach-omap2/serial.c                  |    8 ---
  arch/arm/plat-omap/include/plat/omap-serial.h |    1 -
  drivers/tty/serial/omap-serial.c              |   62
++++++++++++++++++++++++-
  3 files changed, 61 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/serial.c +0 -8

index f590afc..330ee04 100644
@@ -357,14 +357,6 @@ void __init omap_serial_init_port(struct
 omap_board_data *bdata,
        omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
        omap_up.autosuspend_timeout = info->autosuspend_timeout;
 
-       /* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
-       if (!cpu_is_omap2420()&&    !cpu_is_ti816x())
 
-               omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
-
-       /* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
-       if (cpu_is_omap34xx() || cpu_is_omap3630())
-               omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
-
        pdata =&omap_up;

        pdata_size = sizeof(struct omap_uart_port_info);

arch/arm/plat-omap/include/plat/omap-serial.h +0 -1

index 9ff4444..1a52725 100644
@@ -65,7 +65,6 @@ struct omap_uart_port_info {
        bool                    dma_enabled;    /* To specify DMA Mode */
        unsigned int            uartclk;        /* UART clock rate */
        upf_t                   flags;          /* UPF_* flags */
-       u32                     errata;
        unsigned int            dma_rx_buf_size;
        unsigned int            dma_rx_timeout;
        unsigned int            autosuspend_timeout;

drivers/tty/serial/omap-serial.c +7 -0

index f809041..c7666d6 100644
@@ -44,6 +44,13 @@
  #include<plat/dmtimer.h>
  #include<plat/omap-serial.h>
 
+#define UART_BUILD_REVISION(x, y)      (((x)<<    8) | (y))
+
+#define OMAP_UART_REV_42 0x0402
+#define OMAP_UART_REV_46 0x0406
+#define OMAP_UART_REV_52 0x0502
+#define OMAP_UART_REV_63 0x0603
+
  #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
 
  /* SCR register bitmasks */

@@ -1346,6 +1353,58 @@ static void uart_tx_dma_callback(int lch, u16
 ch_status, void *data)
        return;
  }
 

drivers/tty/serial/omap-serial.c static void uart_tx_dma_callback(int lch, u16 · line 1366

Quoted 10 lines

drivers/tty/serial/omap-serial.c +10 -0

+static void omap_serial_fill_features_erratas(struct uart_omap_port *up)
+{
+       u32 mvr, scheme;
+       u16 revision, major, minor;
+
+       mvr = serial_in(up, UART_OMAP_MVER);
+
+       /* Check revision register scheme */
+       scheme = mvr&    (0x03<<    30);
+       scheme>>= 30;

Minor nit-pick, why not ...

Quoted 2 lines

        scheme = mvr>>  30;

yes will correct it.

Quoted 6 lines

Quoted 4 lines

drivers/tty/serial/omap-serial.c +3 -0

+       switch (scheme) {
+       case 0: /* Legacy Scheme: OMAP2/3 */
+               /* MINOR_REV[0:4], MAJOR_REV[4:7] */

Quoted 2 lines

This scheme is also true from OMAP1 devices. Maybe we could include in the comment.

No omap1 from $SUBJECT also reason,

mach-omap1/serial.c => 8250.c
mach-omap2/serial.c => omap-serial.c

Quoted 10 lines

Quoted 8 lines

drivers/tty/serial/omap-serial.c +7 -0

+               major = (mvr&    0xf0)>>    4;
+               minor = (mvr&    0x0f);
 
+               break;
+       case 1:
+               /* New Scheme: OMAP4+ */
+               /* MINOR_REV[0:5], MAJOR_REV[8:10] */
+               major = (mvr&    0x7<<    8)>>    8;

Quoted 3 lines

Nit-pick ...

        major = (mvr>>  8)&  0x7;

yes fine will correct this.

Hi Govindraj,

Quoted 6 lines · Govindraj

Quoted 4 lines · On Wed, Mar 28, 2012 at 2:38 AM, Jon Hunter<[email protected]> ?wrote:

Hi Govindraj,

Quoted 13 lines

Quoted 13 lines

Review

Quoted 8 lines

+ ? ? ? u32 mvr, scheme;
+ ? ? ? u16 revision, major, minor;

(quoted diff) +6 -0

+
+ ? ? ? mvr = serial_in(up, UART_OMAP_MVER);
+
+ ? ? ? /* Check revision register scheme */
+ ? ? ? scheme = mvr& ? ?(0x03<< ? ?30);
+ ? ? ? scheme>>= 30;

Minor nit-pick, why not ...

Quoted 4 lines

Quoted 2 lines

? ? ? ?scheme = mvr>> ?30;

yes will correct it.

Thinking some more, could be better to add some #defines for OMAP_MVR_VERSION_MASK/SHIFT here.

Quoted 13 lines

Quoted 11 lines

Quoted 5 lines

+ ? ? ? switch (scheme) {
+ ? ? ? case 0: /* Legacy Scheme: OMAP2/3 */
+ ? ? ? ? ? ? ? /* MINOR_REV[0:4], MAJOR_REV[4:7] */

This scheme is also true from OMAP1 devices. Maybe we could include in the
comment.

Quoted 4 lines

No omap1 from $SUBJECT also reason,

mach-omap1/serial.c => ?8250.c
mach-omap2/serial.c => ?omap-serial.c

Got it! Thanks.

Quoted 16 lines

Quoted 14 lines

Quoted 8 lines

+ ? ? ? ? ? ? ? major = (mvr& ? ?0xf0)>> ? ?4;
+ ? ? ? ? ? ? ? minor = (mvr& ? ?0x0f);

+ ? ? ? ? ? ? ? break;
+ ? ? ? case 1:
+ ? ? ? ? ? ? ? /* New Scheme: OMAP4+ */
+ ? ? ? ? ? ? ? /* MINOR_REV[0:5], MAJOR_REV[8:10] */
+ ? ? ? ? ? ? ? major = (mvr& ? ?0x7<< ? ?8)>> ? ?8;

Nit-pick ...

? ? ? ?major = (mvr>> ?8)& ?0x7;

Quoted 1 line

yes fine will correct this.

May be we should add #defines here to for OMAP_UART_MVR1_MAJ_MASK/SHIFT, OMAP_UART_MVR1_MIN_MASK/SHIFT, OMAP_UART_MVR2_MAJ_MASK/SHIFT and OMAP_UART_MVR2_MIN_MASK/SHIFT.

From: "Govindraj.R" <[email protected]>

Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself.

Cc Paul Walmsley <[email protected]>

Cc Kevin Hilman <[email protected]>

Cc Jon Hunter <[email protected]>

Signed-off-by Felipe Balbi <[email protected]>

Signed-off-by Govindraj.R <[email protected]>

---
 arch/arm/mach-omap2/serial.c                  |    8 ---
 arch/arm/plat-omap/include/plat/omap-serial.h |    1 -
 drivers/tty/serial/omap-serial.c              |   75 ++++++++++++++++++++++++-
 3 files changed, 74 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/serial.c +0 -8

index 0cdd359..6affdd4 100644
@@ -355,14 +355,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
 	omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
 	omap_up.autosuspend_timeout = info->autosuspend_timeout;
 
-	/* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
-	if (!cpu_is_omap2420() && !cpu_is_ti816x())
-		omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
-
-	/* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
-	if (cpu_is_omap34xx() || cpu_is_omap3630())
-		omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
-
 	pdata = &omap_up;
 	pdata_size = sizeof(struct omap_uart_port_info);
 

arch/arm/plat-omap/include/plat/omap-serial.h +0 -1

index 9ff4444..1a52725 100644
@@ -65,7 +65,6 @@ struct omap_uart_port_info {
 	bool			dma_enabled;	/* To specify DMA Mode */
 	unsigned int		uartclk;	/* UART clock rate */
 	upf_t			flags;		/* UPF_* flags */
-	u32			errata;
 	unsigned int		dma_rx_buf_size;
 	unsigned int		dma_rx_timeout;
 	unsigned int		autosuspend_timeout;

drivers/tty/serial/omap-serial.c +7 -0

index 0121486..7d218c6 100644
@@ -44,6 +44,13 @@
 #include <plat/dmtimer.h>
 #include <plat/omap-serial.h>
 
+#define UART_BUILD_REVISION(x, y)	(((x) << 8) | (y))
+
+#define OMAP_UART_REV_42 0x0402
+#define OMAP_UART_REV_46 0x0406
+#define OMAP_UART_REV_52 0x0502
+#define OMAP_UART_REV_63 0x0603
+
 #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
 
 /* SCR register bitmasks */

@@ -53,6 +60,18 @@
 #define OMAP_UART_FCR_RX_FIFO_TRIG_SHIFT		6

drivers/tty/serial/omap-serial.c +12 -0

 static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
 
 /* Forward declaration of functions */

@@ -1346,6 +1365,59 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
 	return;
 }
 
+static void omap_serial_fill_features_erratas(struct uart_omap_port *up)
+{
+	u32 mvr, scheme;
+	u16 revision, major, minor;
+
+	mvr = serial_in(up, UART_OMAP_MVER);
+
+	/* Check revision register scheme */
+	scheme = mvr >> OMAP_UART_MVR_SCHEME_SHIFT;
+
+	switch (scheme) {
+	case 0: /* Legacy Scheme: OMAP2/3 */

From: "Govindraj.R"<[email protected]>

Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself.

Cc Jon Hunter<[email protected]>

Cc Paul Walmsley<[email protected]>

Cc Kevin Hilman<[email protected]>

Signed-off-by Felipe Balbi<[email protected]>

Signed-off-by Govindraj.R<[email protected]>

---
  arch/arm/mach-omap2/serial.c                  |    8 ---
  arch/arm/plat-omap/include/plat/omap-serial.h |    1 -
  drivers/tty/serial/omap-serial.c              |   74 ++++++++++++++++++++++++-
  3 files changed, 73 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/serial.c +0 -8

index 0cdd359..6affdd4 100644
@@ -355,14 +355,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
  	omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
  	omap_up.autosuspend_timeout = info->autosuspend_timeout;
 
-	/* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
-	if (!cpu_is_omap2420()&&  !cpu_is_ti816x())
-		omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
-
-	/* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
-	if (cpu_is_omap34xx() || cpu_is_omap3630())
-		omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
-
  	pdata =&omap_up;
  	pdata_size = sizeof(struct omap_uart_port_info);
 

arch/arm/plat-omap/include/plat/omap-serial.h +0 -1

index 9ff4444..1a52725 100644
@@ -65,7 +65,6 @@ struct omap_uart_port_info {
  	bool			dma_enabled;	/* To specify DMA Mode */
  	unsigned int		uartclk;	/* UART clock rate */
  	upf_t			flags;		/* UPF_* flags */
-	u32			errata;
  	unsigned int		dma_rx_buf_size;
  	unsigned int		dma_rx_timeout;
  	unsigned int		autosuspend_timeout;

drivers/tty/serial/omap-serial.c +71 -1

index 0121486..0555c96 100644
@@ -44,6 +44,13 @@
  #include<plat/dmtimer.h>
  #include<plat/omap-serial.h>
 
+#define UART_BUILD_REVISION(x, y)	(((x)<<  8) | (y))
+
+#define OMAP_UART_REV_42 0x0402
+#define OMAP_UART_REV_46 0x0406
+#define OMAP_UART_REV_52 0x0502
+#define OMAP_UART_REV_63 0x0603
+
  #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
 
  /* SCR register bitmasks */

@@ -53,6 +60,17 @@
  #define OMAP_UART_FCR_RX_FIFO_TRIG_SHIFT		6
  #define OMAP_UART_FCR_RX_FIFO_TRIG_MASK			(0x3<<  6)
 
+/* MVR register bitmasks */
+#define OMAP_UART_MVR_SCHEME_SHIFT	30
+
+#define OMAP_UART_LEGACY_MVR_MAJ_MASK	0xf0
+#define OMAP_UART_LEGACY_MVR_MAJ_SHIFT	4
+#define OMAP_UART_LEGACY_MVR_MIN_MASK	0x0f
+
+#define OMAP_UART_MVR_MAJ_MASK		0x700
+#define OMAP_UART_MVR_MAJ_SHIFT		8
+#define OMAP_UART_MVR_MIN_MASK		0x3f
+
  static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
 
  /* Forward declaration of functions */

@@ -1346,6 +1364,59 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
  	return;
  }
 
+static void omap_serial_fill_features_erratas(struct uart_omap_port *up)
+{
+	u32 mvr, scheme;
+	u16 revision, major, minor;
+
+	mvr = serial_in(up, UART_OMAP_MVER);
+
+	/* Check revision register scheme */
+	scheme = mvr>>  OMAP_UART_MVR_SCHEME_SHIFT;
+
+	switch (scheme) {
+	case 0: /* Legacy Scheme: OMAP2/3 */
+		/* MINOR_REV[0:4], MAJOR_REV[4:7] */
+		major = (mvr&  OMAP_UART_LEGACY_MVR_MAJ_MASK)>>
+					OMAP_UART_LEGACY_MVR_MAJ_SHIFT;
+		minor = (mvr&  OMAP_UART_LEGACY_MVR_MIN_MASK);
+		break;
+	case 1:
+		/* New Scheme: OMAP4+ */
+		/* MINOR_REV[0:5], MAJOR_REV[8:10] */
+		major = (mvr&  OMAP_UART_MVR_MAJ_MASK)>>
+					OMAP_UART_MVR_MAJ_SHIFT;
+		minor = (mvr&  OMAP_UART_MVR_MIN_MASK);
+		break;
+	default:
+		dev_warn(&up->pdev->dev,
+			"Unknown %s revision, defaulting to highest\n",
+			up->name);
+		/* highest possible revision */
+		major = 0xff;
+		minor = 0xff;
+	}
+
+	/* normalize revision for the driver */
+	revision = UART_BUILD_REVISION(major, minor);
+
+	switch (revision) {
+	case OMAP_UART_REV_46:
+		up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
+				UART_ERRATA_i291_DMA_FORCEIDLE);
+		break;
+	case OMAP_UART_REV_52:
+		up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
+				UART_ERRATA_i291_DMA_FORCEIDLE);
+		break;
+	case OMAP_UART_REV_63:
+		up->errata |= UART_ERRATA_i202_MDR1_ACCESS;
+		break;
+	default:
+		break;
+	}
+}
+
  static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)
  {
  	struct omap_uart_port_info *omap_up_info;

@@ -1443,7 +1514,6 @@ static int serial_omap_probe(struct platform_device *pdev)
  						"%d\n", DEFAULT_CLK_SPEED);
  	}
  	up->uart_dma.uart_base = mem->start;
-	up->errata = omap_up_info->errata;
 
  	if (omap_up_info->dma_enabled) {
  		up->uart_dma.uart_dma_tx = dma_tx->start;

From: "Govindraj.R" <[email protected]>

Currently the errata is populated based on cpu checks this can be removed and replaced with module version check of uart ip block. MVR reg is provided within the uart reg map use the same to populate the errata and thus now errata population and handling can be managed within the driver itself.

Cc Jon Hunter <[email protected]>

Cc Paul Walmsley <[email protected]>

Cc Kevin Hilman <[email protected]>

Signed-off-by Felipe Balbi <[email protected]>

Signed-off-by Govindraj.R <[email protected]>

---
 arch/arm/mach-omap2/serial.c                  |    8 ---
 arch/arm/plat-omap/include/plat/omap-serial.h |    1 -
 drivers/tty/serial/omap-serial.c              |   74 ++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 10 deletions(-)

arch/arm/mach-omap2/serial.c +0 -0

index 0cdd359..6affdd4 100644

arch/arm/mach-omap2/serial.c +0 -2

-		omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
-
 	pdata = &omap_up;
 	pdata_size = sizeof(struct omap_uart_port_info);
 

arch/arm/plat-omap/include/plat/omap-serial.h +0 -1

index 9ff4444..1a52725 100644
@@ -65,7 +65,6 @@ struct omap_uart_port_info {
 	bool			dma_enabled;	/* To specify DMA Mode */
 	unsigned int		uartclk;	/* UART clock rate */
 	upf_t			flags;		/* UPF_* flags */
-	u32			errata;
 	unsigned int		dma_rx_buf_size;
 	unsigned int		dma_rx_timeout;
 	unsigned int		autosuspend_timeout;

drivers/tty/serial/omap-serial.c +0 -0

index 0121486..0555c96 100644

drivers/tty/serial/omap-serial.c +65 -1

+
 #define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
 
 /* SCR register bitmasks */

@@ -53,6 +60,17 @@
 #define OMAP_UART_FCR_RX_FIFO_TRIG_SHIFT		6
 #define OMAP_UART_FCR_RX_FIFO_TRIG_MASK			(0x3 << 6)
 
+/* MVR register bitmasks */
+#define OMAP_UART_MVR_SCHEME_SHIFT	30
+
+#define OMAP_UART_LEGACY_MVR_MAJ_MASK	0xf0
+#define OMAP_UART_LEGACY_MVR_MAJ_SHIFT	4
+#define OMAP_UART_LEGACY_MVR_MIN_MASK	0x0f
+
+#define OMAP_UART_MVR_MAJ_MASK		0x700
+#define OMAP_UART_MVR_MAJ_SHIFT		8
+#define OMAP_UART_MVR_MIN_MASK		0x3f
+
 static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
 
 /* Forward declaration of functions */

@@ -1346,6 +1364,59 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
 	return;
 }
 
+static void omap_serial_fill_features_erratas(struct uart_omap_port *up)
+{
+	u32 mvr, scheme;
+	u16 revision, major, minor;
+
+	mvr = serial_in(up, UART_OMAP_MVER);
+
+	/* Check revision register scheme */
+	scheme = mvr >> OMAP_UART_MVR_SCHEME_SHIFT;
+
+	switch (scheme) {
+	case 0: /* Legacy Scheme: OMAP2/3 */
+		/* MINOR_REV[0:4], MAJOR_REV[4:7] */
+		major = (mvr & OMAP_UART_LEGACY_MVR_MAJ_MASK) >>
+					OMAP_UART_LEGACY_MVR_MAJ_SHIFT;
+		minor = (mvr & OMAP_UART_LEGACY_MVR_MIN_MASK);
+		break;
+	case 1:
+		/* New Scheme: OMAP4+ */
+		/* MINOR_REV[0:5], MAJOR_REV[8:10] */
+		major = (mvr & OMAP_UART_MVR_MAJ_MASK) >>
+					OMAP_UART_MVR_MAJ_SHIFT;
+		minor = (mvr & OMAP_UART_MVR_MIN_MASK);
+		break;
+	default:
+		dev_warn(&up->pdev->dev,
+			"Unknown %s revision, defaulting to highest\n",
+			up->name);
+		/* highest possible revision */
+		major = 0xff;
+		minor = 0xff;
+	}
+
+	/* normalize revision for the driver */
+	revision = UART_BUILD_REVISION(major, minor);
+
+	switch (revision) {
+	case OMAP_UART_REV_46:
+		up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
+				UART_ERRATA_i291_DMA_FORCEIDLE);
+		break;
+	case OMAP_UART_REV_52:
+		up->errata |= (UART_ERRATA_i202_MDR1_ACCESS |
+				UART_ERRATA_i291_DMA_FORCEIDLE);
+		break;
+	case OMAP_UART_REV_63:
+		up->errata |= UART_ERRATA_i202_MDR1_ACCESS;
+		break;
+	default:
+		break;
+	}
+}
+
 static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)
 {
 	struct omap_uart_port_info *omap_up_info;

@@ -1443,7 +1514,6 @@ static int serial_omap_probe(struct platform_device *pdev)
 						"%d\n", DEFAULT_CLK_SPEED);
 	}
 	up->uart_dma.uart_base = mem->start;
-	up->errata = omap_up_info->errata;
 
 	if (omap_up_info->dma_enabled) {
 		up->uart_dma.uart_dma_tx = dma_tx->start;

drivers/tty/serial/omap-serial.c +1 -0

+
 	ui[up->port.line] = up;
 	serial_omap_add_console_port(up);
 

From omap36xx onwards the module wakeup enable reg

From: "Govindraj.R" <[email protected]>

Based on Linux-OMAP tree uart branch.
(git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
remotes/origin/uart)

* Removes the cpu checks wherever possible and use version reg for populating features and errata's
* enable tx wakeup available in wer reg for applicable module revision's

Govindraj.R (3):
OMAP2+: UART: Remove cpu checks for populating errata flags OMAP2+: UART: enable tx wakeup bit for wer reg
OMAP2+: UART: replace omap34xx/omap4xx cpu checks with not omap24xx

 arch/arm/mach-omap2/serial.c                  |   13 +----
 arch/arm/plat-omap/include/plat/omap-serial.h |    8 +++-
 drivers/tty/serial/omap-serial.c              |   71 ++++++++++++++++++++++++-
 3 files changed, 78 insertions(+), 14 deletions(-)

Quoted 6 lines · Govindraj.R

From: "Govindraj.R" <[email protected]>

Based on Linux-OMAP tree uart branch.
(git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
remotes/origin/uart)

Quoted 4 lines

* Removes the cpu checks wherever possible and use version reg ? for populating features and errata's
* enable tx wakeup available in wer reg for applicable ? module revision's

As this affects multiple SoCs, please report what SoCs it was tested on as well.

Thanks,

Kevin

Quoted 9 lines

Govindraj.R (3):
? OMAP2+: UART: Remove cpu checks for populating errata flags ? OMAP2+: UART: enable tx wakeup bit for wer reg
? OMAP2+: UART: replace omap34xx/omap4xx cpu checks with not omap24xx

?arch/arm/mach-omap2/serial.c ? ? ? ? ? ? ? ? ?| ? 13 +----
?arch/arm/plat-omap/include/plat/omap-serial.h | ? ?8 +++-
?drivers/tty/serial/omap-serial.c ? ? ? ? ? ? ?| ? 71 ++++++++++++++++++++++++-

?3 files changed, 78 insertions(+), 14 deletions(-)

Sorry I for got to add that, here are details on what was tested.

1.) OMAP2430 SDP : Boot tested with uart1 as console.

2.) OMAP3430 SDP: Boot test, suspend/resume tests, retention off mode
(checking retention and off mode count
in cpu idle cases)

3.) OMAP3630 - Beagle XM: Boot test, suspend/resume tests, retention off mode
(checking retention and
off mode count in cpu idle cases)

4.) OMAP4430 - PANDA: Boot test, suspend/resume tests

5.) OMAP4460 - PANDA: Boot test.

Hi

Quoted 12 lines · Govindraj

Sorry I for got to add that, here are details on what was tested.

1.) OMAP2430 SDP : Boot tested with uart1 as console.

2.) OMAP3430 SDP: Boot test, suspend/resume tests, retention off mode ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?(checking retention and off mode count in cpu idle cases)

3.) OMAP3630 - Beagle XM: ?Boot test, suspend/resume tests, retention off mode ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (checking retention and off mode count in cpu idle cases)

Quoted 3 lines

4.) OMAP4430 - PANDA: Boot test, suspend/resume tests

5.) OMAP4460 - PANDA: Boot test.

What kernel .config was used for these tests?

From: "Govindraj.R" <[email protected]>

Based on Linux-OMAP tree uart branch.
(git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
remotes/origin/uart)

* Removes the cpu checks wherever possible and use version reg ?for populating features and errata's
* enable tx wakeup available in wer reg for applicable ?module revision's

Govindraj.R (3):
?OMAP2+: UART: Remove cpu checks for populating errata flags ?OMAP2+: UART: enable tx wakeup bit for wer reg
?OMAP2+: UART: replace omap34xx/omap4xx cpu checks with not omap24xx

?arch/arm/mach-omap2/serial.c ? ? ? ? ? ? ? ? ?| ? 13 +----
?arch/arm/plat-omap/include/plat/omap-serial.h | ? ?8 +++-
?drivers/tty/serial/omap-serial.c ? ? ? ? ? ? ?| ? 71 ++++++++++++++++++++++++-

?3 files changed, 78 insertions(+), 14 deletions(-)

Quoted 16 lines · Govindraj.R

From: "Govindraj.R" <[email protected]>

Based on Linux-OMAP tree uart branch.
(git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
remotes/origin/uart)

* Removes the cpu checks wherever possible and use version reg for populating features and errata's
* enable tx wakeup available in wer reg for applicable module revision's

Govindraj.R (3):
 OMAP2+: UART: Remove cpu checks for populating errata flags OMAP2+: UART: enable tx wakeup bit for wer reg
 OMAP2+: UART: replace omap34xx/omap4xx cpu checks with not omap24xx

Quoted 5 lines

 arch/arm/mach-omap2/serial.c                  |   13 +---- arch/arm/plat-omap/include/plat/omap-serial.h |    8 +++- drivers/tty/serial/omap-serial.c              |   71 ++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 14 deletions(-)

Alan / Greg,

With you ack on tty parts can this series be upstreamed from omap tree ?

Quoted 24 lines · Govindraj

Quoted 21 lines · Govindraj.R

From: "Govindraj.R" <[email protected]>

Based on Linux-OMAP tree uart branch.
(git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
remotes/origin/uart)

* Removes the cpu checks wherever possible and use version reg ?for populating features and errata's
* enable tx wakeup available in wer reg for applicable ?module revision's

Govindraj.R (3):
?OMAP2+: UART: Remove cpu checks for populating errata flags ?OMAP2+: UART: enable tx wakeup bit for wer reg
?OMAP2+: UART: replace omap34xx/omap4xx cpu checks with not omap24xx

?arch/arm/mach-omap2/serial.c ? ? ? ? ? ? ? ? ?| ? 13 +----
?arch/arm/plat-omap/include/plat/omap-serial.h | ? ?8 +++-
?drivers/tty/serial/omap-serial.c ? ? ? ? ? ? ?| ? 71

++++++++++++++++++++++++- 3 files changed, 78 insertions(+), 14 deletions(-)

Quoted 4 lines

Alan / Greg,

With you ack on tty parts can this series be upstreamed from omap tree ?

Fine by me - this seems primarily to be architectural details.