[v2] sh-sci: Get register size from platform data

Commit Message

Yoshinori Sato May 16, 2015, 3:03 p.m. UTC

There is much implement of SCI,
So the register size should be acquired from platform data.

Signed-off-by: Yoshinori Sato <[e-mail]>
---
 drivers/tty/serial/sh-sci.c | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

Comments

Sergei Shtylyov May 16, 2015, 6:18 p.m. UTC | #1

Hello.

On 05/16/2015 06:03 PM, Yoshinori Sato wrote:

> There is much implement of SCI,

    Many implementations, you mean?

> So the register size should be acquired from platform data.

    You're not acquiring them from the platform data, you're using platform 
device resources for that.

> Signed-off-by: Yoshinori Sato <[e-mail]>

[...]
> @@ -2207,6 +2198,7 @@ static int sci_init_single(struct platform_device *dev,
>   		return -ENOMEM;
>
>   	port->mapbase = res->start;
> +	sci_port->reg_size = res->end - res->start + 1;

    Use resource_size(res) instead, please.

[...]

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Yoshinori Sato May 17, 2015, 4:23 p.m. UTC | #2

On Sun, 17 May 2015 03:18:30 +0900,
Sergei Shtylyov wrote:
> 
> Hello.
> 
> On 05/16/2015 06:03 PM, Yoshinori Sato wrote:
> 
> > There is much implement of SCI,
> 
>    Many implementations, you mean?

There is much SCI of SoC having within,
and the register size is also different in everyone.

> > So the register size should be acquired from platform data.
> 
>    You're not acquiring them from the platform data, you're using
> platform device resources for that.

Yes.
platform device is correct.

> > Signed-off-by: Yoshinori Sato <[e-mail]>
> 
> [...]
> > @@ -2207,6 +2198,7 @@ static int sci_init_single(struct platform_device *dev,
> >   		return -ENOMEM;
> > 
> >   	port->mapbase = res->start;
> > +	sci_port->reg_size = res->end - res->start + 1;
> 
>    Use resource_size(res) instead, please.

OK.
I'll update.

Thanks.

> [...]
> 
> WBR, Sergei
>

Patch

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 1468ec5..784650b 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -84,7 +84,7 @@  struct sci_port {
 	int			overrun_bit;
 	unsigned int		error_mask;
 	unsigned int		sampling_rate;
-
+	unsigned int		reg_size;
 
 	/* Break timer */
 	struct timer_list	break_timer;
@@ -2073,23 +2073,9 @@  static const char *sci_type(struct uart_port *port)
 	return NULL;
 }
 
-static inline unsigned long sci_port_size(struct uart_port *port)
-{
-	/*
-	 * Pick an arbitrary size that encapsulates all of the base
-	 * registers by default. This can be optimized later, or derived
-	 * from platform resource data at such a time that ports begin to
-	 * behave more erratically.
-	 */
-	if (port->type == PORT_HSCIF)
-		return 96;
-	else
-		return 64;
-}
-
 static int sci_remap_port(struct uart_port *port)
 {
-	unsigned long size = sci_port_size(port);
+	struct sci_port *sport = to_sci_port(port);
 
 	/*
 	 * Nothing to do if there's already an established membase.
@@ -2098,7 +2084,7 @@  static int sci_remap_port(struct uart_port *port)
 		return 0;
 
 	if (port->flags & UPF_IOREMAP) {
-		port->membase = ioremap_nocache(port->mapbase, size);
+		port->membase = ioremap_nocache(port->mapbase, sport->reg_size);
 		if (unlikely(!port->membase)) {
 			dev_err(port->dev, "can't remap port#%d\n", port->line);
 			return -ENXIO;
@@ -2117,23 +2103,28 @@  static int sci_remap_port(struct uart_port *port)
 
 static void sci_release_port(struct uart_port *port)
 {
+	struct sci_port *sport = to_sci_port(port);
+
 	if (port->flags & UPF_IOREMAP) {
 		iounmap(port->membase);
 		port->membase = NULL;
 	}
 
-	release_mem_region(port->mapbase, sci_port_size(port));
+	release_mem_region(port->mapbase, sport->reg_size);
 }
 
 static int sci_request_port(struct uart_port *port)
 {
-	unsigned long size = sci_port_size(port);
 	struct resource *res;
+	struct sci_port *sport = to_sci_port(port);
 	int ret;
 
-	res = request_mem_region(port->mapbase, size, dev_name(port->dev));
-	if (unlikely(res == NULL))
+	res = request_mem_region(port->mapbase, sport->reg_size,
+				 dev_name(port->dev));
+	if (unlikely(res == NULL)) {
+		dev_err(port->dev, "request_mem_region failed.");
 		return -EBUSY;
+	}
 
 	ret = sci_remap_port(port);
 	if (unlikely(ret != 0)) {
@@ -2207,6 +2198,7 @@  static int sci_init_single(struct platform_device *dev,
 		return -ENOMEM;
 
 	port->mapbase = res->start;
+	sci_port->reg_size = res->end - res->start + 1;
 
 	for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)
 		sci_port->irqs[i] = platform_get_irq(dev, i);