* [PATCH] serial: 8250_of: Add IO space support
@ 2018-04-19 15:37 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2018-04-19 15:37 UTC (permalink / raw)
To: gregkh, jslaby, joel, p.zabel, arnd, fcooper, sergei.shtylyov,
yamada.masahiro, khoroshilov
Cc: linux-serial, linux-kernel, andriy.shevchenko, linuxarm, John Garry
Currently the 8250_of driver only supports MEM IO type
accesses.
Some development boards (Huawei D03, specifically) require
IO space access for 8250-compatible OF driver support, so
add it.
The modification is quite simple: just set the port iotype
and associated flags depending on the device address
resource type.
Signed-off-by: John Garry <john.garry@huawei.com>
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index 9835b1c..a7ffaf6 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -92,13 +92,43 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
goto err_unprepare;
}
+ port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_FIXED_PORT |
+ UPF_FIXED_TYPE;
spin_lock_init(&port->lock);
- port->mapbase = resource.start;
- port->mapsize = resource_size(&resource);
- /* Check for shifted address mapping */
- if (of_property_read_u32(np, "reg-offset", &prop) == 0)
- port->mapbase += prop;
+ if ((resource.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO) {
+ port->iotype = UPIO_PORT;
+ port->iobase = resource.start;
+ } else {
+ port->mapbase = resource.start;
+ port->mapsize = resource_size(&resource);
+
+ /* Check for shifted address mapping */
+ if (of_property_read_u32(np, "reg-offset", &prop) == 0)
+ port->mapbase += prop;
+
+ port->iotype = UPIO_MEM;
+ if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
+ switch (prop) {
+ case 1:
+ port->iotype = UPIO_MEM;
+ break;
+ case 2:
+ port->iotype = UPIO_MEM16;
+ break;
+ case 4:
+ port->iotype = of_device_is_big_endian(np) ?
+ UPIO_MEM32BE : UPIO_MEM32;
+ break;
+ default:
+ dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
+ prop);
+ ret = -EINVAL;
+ goto err_dispose;
+ }
+ }
+ port->flags |= UPF_IOREMAP;
+ }
/* Check for registers offset within the devices address range */
if (of_property_read_u32(np, "reg-shift", &prop) == 0)
@@ -114,26 +144,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
port->line = ret;
port->irq = irq_of_parse_and_map(np, 0);
- port->iotype = UPIO_MEM;
- if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
- switch (prop) {
- case 1:
- port->iotype = UPIO_MEM;
- break;
- case 2:
- port->iotype = UPIO_MEM16;
- break;
- case 4:
- port->iotype = of_device_is_big_endian(np) ?
- UPIO_MEM32BE : UPIO_MEM32;
- break;
- default:
- dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
- prop);
- ret = -EINVAL;
- goto err_dispose;
- }
- }
info->rst = devm_reset_control_get_optional_shared(&ofdev->dev, NULL);
if (IS_ERR(info->rst)) {
@@ -147,8 +157,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
port->type = type;
port->uartclk = clk;
- port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
- | UPF_FIXED_PORT | UPF_FIXED_TYPE;
if (of_property_read_bool(np, "no-loopback-test"))
port->flags |= UPF_SKIP_TEST;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] serial: 8250_of: Add IO space support
@ 2018-04-19 15:37 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2018-04-19 15:37 UTC (permalink / raw)
To: gregkh, jslaby, joel, p.zabel, arnd, fcooper, sergei.shtylyov,
yamada.masahiro, khoroshilov
Cc: linux-serial, linux-kernel, andriy.shevchenko, linuxarm, John Garry
Currently the 8250_of driver only supports MEM IO type
accesses.
Some development boards (Huawei D03, specifically) require
IO space access for 8250-compatible OF driver support, so
add it.
The modification is quite simple: just set the port iotype
and associated flags depending on the device address
resource type.
Signed-off-by: John Garry <john.garry@huawei.com>
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index 9835b1c..a7ffaf6 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -92,13 +92,43 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
goto err_unprepare;
}
+ port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_FIXED_PORT |
+ UPF_FIXED_TYPE;
spin_lock_init(&port->lock);
- port->mapbase = resource.start;
- port->mapsize = resource_size(&resource);
- /* Check for shifted address mapping */
- if (of_property_read_u32(np, "reg-offset", &prop) == 0)
- port->mapbase += prop;
+ if ((resource.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO) {
+ port->iotype = UPIO_PORT;
+ port->iobase = resource.start;
+ } else {
+ port->mapbase = resource.start;
+ port->mapsize = resource_size(&resource);
+
+ /* Check for shifted address mapping */
+ if (of_property_read_u32(np, "reg-offset", &prop) == 0)
+ port->mapbase += prop;
+
+ port->iotype = UPIO_MEM;
+ if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
+ switch (prop) {
+ case 1:
+ port->iotype = UPIO_MEM;
+ break;
+ case 2:
+ port->iotype = UPIO_MEM16;
+ break;
+ case 4:
+ port->iotype = of_device_is_big_endian(np) ?
+ UPIO_MEM32BE : UPIO_MEM32;
+ break;
+ default:
+ dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
+ prop);
+ ret = -EINVAL;
+ goto err_dispose;
+ }
+ }
+ port->flags |= UPF_IOREMAP;
+ }
/* Check for registers offset within the devices address range */
if (of_property_read_u32(np, "reg-shift", &prop) == 0)
@@ -114,26 +144,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
port->line = ret;
port->irq = irq_of_parse_and_map(np, 0);
- port->iotype = UPIO_MEM;
- if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
- switch (prop) {
- case 1:
- port->iotype = UPIO_MEM;
- break;
- case 2:
- port->iotype = UPIO_MEM16;
- break;
- case 4:
- port->iotype = of_device_is_big_endian(np) ?
- UPIO_MEM32BE : UPIO_MEM32;
- break;
- default:
- dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
- prop);
- ret = -EINVAL;
- goto err_dispose;
- }
- }
info->rst = devm_reset_control_get_optional_shared(&ofdev->dev, NULL);
if (IS_ERR(info->rst)) {
@@ -147,8 +157,6 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
port->type = type;
port->uartclk = clk;
- port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
- | UPF_FIXED_PORT | UPF_FIXED_TYPE;
if (of_property_read_bool(np, "no-loopback-test"))
port->flags |= UPF_SKIP_TEST;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] serial: 8250_of: Add IO space support
2018-04-19 15:37 ` John Garry
(?)
@ 2018-04-23 8:14 ` Greg KH
2018-04-23 9:22 ` John Garry
-1 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2018-04-23 8:14 UTC (permalink / raw)
To: John Garry
Cc: jslaby, joel, p.zabel, arnd, fcooper, sergei.shtylyov,
yamada.masahiro, khoroshilov, linux-serial, linux-kernel,
andriy.shevchenko, linuxarm
On Thu, Apr 19, 2018 at 11:37:48PM +0800, John Garry wrote:
> Currently the 8250_of driver only supports MEM IO type
> accesses.
>
> Some development boards (Huawei D03, specifically) require
> IO space access for 8250-compatible OF driver support, so
> add it.
>
> The modification is quite simple: just set the port iotype
> and associated flags depending on the device address
> resource type.
>
> Signed-off-by: John Garry <john.garry@huawei.com>
This no longer applies to my tree due to a patch that was sent before
yours that conflicts in the same area. Can you rebase it against my
tty-testing branch and resend?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] serial: 8250_of: Add IO space support
2018-04-23 8:14 ` Greg KH
@ 2018-04-23 9:22 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2018-04-23 9:22 UTC (permalink / raw)
To: Greg KH
Cc: jslaby, joel, p.zabel, arnd, fcooper, sergei.shtylyov,
yamada.masahiro, khoroshilov, linux-serial, linux-kernel,
andriy.shevchenko, linuxarm
On 23/04/2018 09:14, Greg KH wrote:
> On Thu, Apr 19, 2018 at 11:37:48PM +0800, John Garry wrote:
>> Currently the 8250_of driver only supports MEM IO type
>> accesses.
>>
>> Some development boards (Huawei D03, specifically) require
>> IO space access for 8250-compatible OF driver support, so
>> add it.
>>
>> The modification is quite simple: just set the port iotype
>> and associated flags depending on the device address
>> resource type.
>>
>> Signed-off-by: John Garry <john.garry@huawei.com>
>
> This no longer applies to my tree due to a patch that was sent before
> yours that conflicts in the same area. Can you rebase it against my
> tty-testing branch and resend?
>
Hi Greg,
OK, I'll do that. I will also make this small improvement to this patch:
+ if ((resource.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO) {
+ port->iotype = UPIO_PORT;
|
V
+ if (resource_type(&resource) == IORESOURCE_IO) {
+ port->iotype = UPIO_PORT;
All the best,
John
> thanks,
>
> greg k-h
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] serial: 8250_of: Add IO space support
@ 2018-04-23 9:22 ` John Garry
0 siblings, 0 replies; 5+ messages in thread
From: John Garry @ 2018-04-23 9:22 UTC (permalink / raw)
To: Greg KH
Cc: jslaby, joel, p.zabel, arnd, fcooper, sergei.shtylyov,
yamada.masahiro, khoroshilov, linux-serial, linux-kernel,
andriy.shevchenko, linuxarm
On 23/04/2018 09:14, Greg KH wrote:
> On Thu, Apr 19, 2018 at 11:37:48PM +0800, John Garry wrote:
>> Currently the 8250_of driver only supports MEM IO type
>> accesses.
>>
>> Some development boards (Huawei D03, specifically) require
>> IO space access for 8250-compatible OF driver support, so
>> add it.
>>
>> The modification is quite simple: just set the port iotype
>> and associated flags depending on the device address
>> resource type.
>>
>> Signed-off-by: John Garry <john.garry@huawei.com>
>
> This no longer applies to my tree due to a patch that was sent before
> yours that conflicts in the same area. Can you rebase it against my
> tty-testing branch and resend?
>
Hi Greg,
OK, I'll do that. I will also make this small improvement to this patch:
+ if ((resource.flags & IORESOURCE_TYPE_BITS) == IORESOURCE_IO) {
+ port->iotype = UPIO_PORT;
|
V
+ if (resource_type(&resource) == IORESOURCE_IO) {
+ port->iotype = UPIO_PORT;
All the best,
John
> thanks,
>
> greg k-h
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-23 9:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-19 15:37 [PATCH] serial: 8250_of: Add IO space support John Garry
2018-04-19 15:37 ` John Garry
2018-04-23 8:14 ` Greg KH
2018-04-23 9:22 ` John Garry
2018-04-23 9:22 ` John Garry
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.