mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux
@ 2017-07-27  5:00 Oleksij Rempel
  2017-07-27  5:00 ` [PATCH v1 2/2] serial: ns16550: provide big-endian support Oleksij Rempel
  2017-07-31 10:02 ` [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux Lucas Stach
  0 siblings, 2 replies; 5+ messages in thread
From: Oleksij Rempel @ 2017-07-27  5:00 UTC (permalink / raw)
  To: l.stach; +Cc: Oleksij Rempel, barebox

|commit 37786c7fee40771d13901de129af7e084ed48b55
|Author: Kevin Cernekee <cernekee@gmail.com>
|Date:   Thu Apr 9 13:05:14 2015 -0700
|
|    of: Add helper function to check MMIO register endianness
|
|    SoC peripherals can come in several different flavors:
|
|     - little-endian: registers always need to be accessed in LE mode (so the
|       kernel should perform a swap if the CPU is running BE)
|
|     - big-endian: registers always need to be accessed in BE mode (so the
|       kernel should perform a swap if the CPU is running LE)
|
|     - native-endian: the bus will automatically swap accesses, so the kernel
|       should never swap
|
|    Introduce a function that checks an OF device node to see whether it
|    contains a "big-endian" or "native-endian" property.  For the former case,
|    always return true.  For the latter case, return true iff the kernel was
|    built for BE (implying that the BE MMIO accessors do not perform a swap).
|    Otherwise return false, assuming LE registers.
|
|    LE registers are assumed by default because most existing drivers (libahci,
|    serial8250, usb) always use readl/writel in the absence of instructions
|    to the contrary, so that will be our fallback.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 drivers/of/base.c | 23 +++++++++++++++++++++++
 include/of.h      |  1 +
 2 files changed, 24 insertions(+)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index ea330d1310..95bea4ee83 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1622,6 +1622,29 @@ int of_device_is_available(const struct device_node *device)
 EXPORT_SYMBOL(of_device_is_available);
 
 /**
+ *  of_device_is_big_endian - check if a device has BE registers
+ *
+ *  @device: Node to check for endianness
+ *
+ *  Returns true if the device has a "big-endian" property, or if the kernel
+ *  was compiled for BE *and* the device has a "native-endian" property.
+ *  Returns false otherwise.
+ *
+ *  Callers would nominally use ioread32be/iowrite32be if
+ *  of_device_is_big_endian() == true, or readl/writel otherwise.
+ */
+bool of_device_is_big_endian(const struct device_node *device)
+{
+	if (of_property_read_bool(device, "big-endian"))
+		return true;
+	if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN) &&
+	    of_property_read_bool(device, "native-endian"))
+		return true;
+	return false;
+}
+EXPORT_SYMBOL(of_device_is_big_endian);
+
+/**
  *	of_get_parent - Get a node's parent if any
  *	@node:	Node to get parent
  *
diff --git a/include/of.h b/include/of.h
index 0ba73f197f..4563cbeddd 100644
--- a/include/of.h
+++ b/include/of.h
@@ -150,6 +150,7 @@ extern int of_machine_is_compatible(const char *compat);
 extern int of_device_is_compatible(const struct device_node *device,
 		const char *compat);
 extern int of_device_is_available(const struct device_node *device);
+extern bool of_device_is_big_endian(const struct device_node *device);
 
 extern struct device_node *of_get_parent(const struct device_node *node);
 extern struct device_node *of_get_next_available_child(
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v1 2/2] serial: ns16550: provide big-endian support
  2017-07-27  5:00 [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux Oleksij Rempel
@ 2017-07-27  5:00 ` Oleksij Rempel
  2017-07-31 10:03   ` Lucas Stach
  2017-07-31 10:02 ` [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux Lucas Stach
  1 sibling, 1 reply; 5+ messages in thread
From: Oleksij Rempel @ 2017-07-27  5:00 UTC (permalink / raw)
  To: l.stach; +Cc: Oleksij Rempel, barebox

we need it at least for QCA AR9344

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 drivers/serial/serial_ns16550.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index a8953cd99d..4d73ea8b87 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -94,6 +94,16 @@ static void ns16550_write_reg_mmio_32(struct ns16550_priv *priv, uint8_t val, un
 	writel(val, priv->mmiobase + offset);
 }
 
+static uint8_t ns16550_read_reg_mmio_32be(struct ns16550_priv *priv, unsigned offset)
+{
+	return ioread32be(priv->mmiobase + offset);
+}
+
+static void ns16550_write_reg_mmio_32be(struct ns16550_priv *priv, uint8_t val, unsigned offset)
+{
+	iowrite32be(val, priv->mmiobase + offset);
+}
+
 static uint8_t ns16550_read_reg_ioport_8(struct ns16550_priv *priv, unsigned offset)
 {
 	return inb(priv->iobase + offset);
@@ -305,8 +315,13 @@ static void ns16550_probe_dt(struct device_d *dev, struct ns16550_priv *priv)
 			priv->write_reg = ns16550_write_reg_mmio_16;
 			break;
 		case 4:
-			priv->read_reg = ns16550_read_reg_mmio_32;
-			priv->write_reg = ns16550_write_reg_mmio_32;
+			if (of_device_is_big_endian(np)) {
+				priv->read_reg = ns16550_read_reg_mmio_32be;
+				priv->write_reg = ns16550_write_reg_mmio_32be;
+			} else {
+				priv->read_reg = ns16550_read_reg_mmio_32;
+				priv->write_reg = ns16550_write_reg_mmio_32;
+			}
 			break;
 		default:
 			dev_err(dev, "unsupported reg-io-width (%d)\n",
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux
  2017-07-27  5:00 [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux Oleksij Rempel
  2017-07-27  5:00 ` [PATCH v1 2/2] serial: ns16550: provide big-endian support Oleksij Rempel
@ 2017-07-31 10:02 ` Lucas Stach
  1 sibling, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2017-07-31 10:02 UTC (permalink / raw)
  To: Oleksij Rempel; +Cc: barebox

Am Donnerstag, den 27.07.2017, 07:00 +0200 schrieb Oleksij Rempel:
> > commit 37786c7fee40771d13901de129af7e084ed48b55
> > Author: Kevin Cernekee <cernekee@gmail.com>
> > Date:   Thu Apr 9 13:05:14 2015 -0700
> > 
> >    of: Add helper function to check MMIO register endianness
> > 
> >    SoC peripherals can come in several different flavors:
> > 
> >     - little-endian: registers always need to be accessed in LE
> > mode (so the
> >       kernel should perform a swap if the CPU is running BE)
> > 
> >     - big-endian: registers always need to be accessed in BE mode
> > (so the
> >       kernel should perform a swap if the CPU is running LE)
> > 
> >     - native-endian: the bus will automatically swap accesses, so
> > the kernel
> >       should never swap
> > 
> >    Introduce a function that checks an OF device node to see
> > whether it
> >    contains a "big-endian" or "native-endian" property.  For the
> > former case,
> >    always return true.  For the latter case, return true iff the
> > kernel was
> >    built for BE (implying that the BE MMIO accessors do not perform
> > a swap).
> >    Otherwise return false, assuming LE registers.
> > 
> >    LE registers are assumed by default because most existing
> > drivers (libahci,
> >    serial8250, usb) always use readl/writel in the absence of
> > instructions
> >    to the contrary, so that will be our fallback.
> 
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>

I guess this should be your private mail address?

> ---
>  drivers/of/base.c | 23 +++++++++++++++++++++++
>  include/of.h      |  1 +
>  2 files changed, 24 insertions(+)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index ea330d1310..95bea4ee83 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -1622,6 +1622,29 @@ int of_device_is_available(const struct
> device_node *device)
>  EXPORT_SYMBOL(of_device_is_available);
>  
>  /**
> + *  of_device_is_big_endian - check if a device has BE registers
> + *
> + *  @device: Node to check for endianness
> + *
> + *  Returns true if the device has a "big-endian" property, or if
> the kernel
> + *  was compiled for BE *and* the device has a "native-endian"
> property.
> + *  Returns false otherwise.
> + *
> + *  Callers would nominally use ioread32be/iowrite32be if
> + *  of_device_is_big_endian() == true, or readl/writel otherwise.
> + */
> +bool of_device_is_big_endian(const struct device_node *device)
> +{
> +	if (of_property_read_bool(device, "big-endian"))
> +		return true;
> +	if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN) &&
> +	    of_property_read_bool(device, "native-endian"))
> +		return true;
> +	return false;
> +}
> +EXPORT_SYMBOL(of_device_is_big_endian);
> +
> +/**
>   *	of_get_parent - Get a node's parent if any
>   *	@node:	Node to get parent
>   *
> diff --git a/include/of.h b/include/of.h
> index 0ba73f197f..4563cbeddd 100644
> --- a/include/of.h
> +++ b/include/of.h
> @@ -150,6 +150,7 @@ extern int of_machine_is_compatible(const char
> *compat);
>  extern int of_device_is_compatible(const struct device_node *device,
>  		const char *compat);
>  extern int of_device_is_available(const struct device_node *device);
> +extern bool of_device_is_big_endian(const struct device_node
> *device);

This misses a stub implementation for !CONFIG_OFTREE

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 2/2] serial: ns16550: provide big-endian support
  2017-07-27  5:00 ` [PATCH v1 2/2] serial: ns16550: provide big-endian support Oleksij Rempel
@ 2017-07-31 10:03   ` Lucas Stach
  2017-08-01 10:55     ` Oleksij Rempel
  0 siblings, 1 reply; 5+ messages in thread
From: Lucas Stach @ 2017-07-31 10:03 UTC (permalink / raw)
  To: Oleksij Rempel; +Cc: barebox

Am Donnerstag, den 27.07.2017, 07:00 +0200 schrieb Oleksij Rempel:
> we need it at least for QCA AR9344
> 
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  drivers/serial/serial_ns16550.c | 19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
> index a8953cd99d..4d73ea8b87 100644
> --- a/drivers/serial/serial_ns16550.c
> +++ b/drivers/serial/serial_ns16550.c
> @@ -94,6 +94,16 @@ static void ns16550_write_reg_mmio_32(struct ns16550_priv *priv, uint8_t val, un
>  	writel(val, priv->mmiobase + offset);
>  }
>  
> +static uint8_t ns16550_read_reg_mmio_32be(struct ns16550_priv *priv, unsigned offset)
> +{
> +	return ioread32be(priv->mmiobase + offset);
> +}
> +
> +static void ns16550_write_reg_mmio_32be(struct ns16550_priv *priv, uint8_t val, unsigned offset)
> +{
> +	iowrite32be(val, priv->mmiobase + offset);
> +}

This doesn't work on PPC and x86, as those 2 architectures are missing
the "be" variants of the iowrite/ioread functions.

> +
>  static uint8_t ns16550_read_reg_ioport_8(struct ns16550_priv *priv, unsigned offset)
>  {
>  	return inb(priv->iobase + offset);
> @@ -305,8 +315,13 @@ static void ns16550_probe_dt(struct device_d *dev, struct ns16550_priv *priv)
>  			priv->write_reg = ns16550_write_reg_mmio_16;
>  			break;
>  		case 4:
> -			priv->read_reg = ns16550_read_reg_mmio_32;
> -			priv->write_reg = ns16550_write_reg_mmio_32;
> +			if (of_device_is_big_endian(np)) {
> +				priv->read_reg = ns16550_read_reg_mmio_32be;
> +				priv->write_reg = ns16550_write_reg_mmio_32be;
> +			} else {
> +				priv->read_reg = ns16550_read_reg_mmio_32;
> +				priv->write_reg = ns16550_write_reg_mmio_32;
> +			}
>  			break;
>  		default:
>  			dev_err(dev, "unsupported reg-io-width (%d)\n",

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 2/2] serial: ns16550: provide big-endian support
  2017-07-31 10:03   ` Lucas Stach
@ 2017-08-01 10:55     ` Oleksij Rempel
  0 siblings, 0 replies; 5+ messages in thread
From: Oleksij Rempel @ 2017-08-01 10:55 UTC (permalink / raw)
  To: Lucas Stach, Oleksij Rempel; +Cc: barebox


[-- Attachment #1.1.1: Type: text/plain, Size: 1574 bytes --]

Am 31.07.2017 um 12:03 schrieb Lucas Stach:
> Am Donnerstag, den 27.07.2017, 07:00 +0200 schrieb Oleksij Rempel:
>> we need it at least for QCA AR9344
>>
>> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
>> ---
>>  drivers/serial/serial_ns16550.c | 19 +++++++++++++++++--
>>  1 file changed, 17 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
>> index a8953cd99d..4d73ea8b87 100644
>> --- a/drivers/serial/serial_ns16550.c
>> +++ b/drivers/serial/serial_ns16550.c
>> @@ -94,6 +94,16 @@ static void ns16550_write_reg_mmio_32(struct ns16550_priv *priv, uint8_t val, un
>>  	writel(val, priv->mmiobase + offset);
>>  }
>>  
>> +static uint8_t ns16550_read_reg_mmio_32be(struct ns16550_priv *priv, unsigned offset)
>> +{
>> +	return ioread32be(priv->mmiobase + offset);
>> +}
>> +
>> +static void ns16550_write_reg_mmio_32be(struct ns16550_priv *priv, uint8_t val, unsigned offset)
>> +{
>> +	iowrite32be(val, priv->mmiobase + offset);
>> +}
> 
> This doesn't work on PPC and x86, as those 2 architectures are missing
> the "be" variants of the iowrite/ioread functions.

hmm....

include/asm-generic/io.h:#define ioread32be(addr)
__be32_to_cpu(__raw_readl(addr))

include/linux/byteorder/little_endian.h:#define __be32_to_cpu(x)
__swab32((__force __u32)(__be32)(x))
include/linux/byteorder/big_endian.h:#define __be32_to_cpu(x) ((__force
__u32)(__be32)(x))

i assume it should be available on all platforms. Or do i miss something?

-- 
Regards,
Oleksij


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-08-01 10:56 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-27  5:00 [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux Oleksij Rempel
2017-07-27  5:00 ` [PATCH v1 2/2] serial: ns16550: provide big-endian support Oleksij Rempel
2017-07-31 10:03   ` Lucas Stach
2017-08-01 10:55     ` Oleksij Rempel
2017-07-31 10:02 ` [PATCH v1 1/2] of: base: port of_device_is_big_endian from linux Lucas Stach

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox