Skip to contentSkip to conversation

package/sunxi-tools: Fix build meminfo with musl

PATCH New Vadim Kochan 3 participants 4 messages Mar 3, 2019 – Mar 25, 2019 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/sunxi-tools: Fix build meminfo with musl

musl does not provide inx/outx API for ARM arch, so use io memory access via pointers which is actually done this way in glibc/ulibc.

Fixes:

    http://autobuild.buildroot.net/results/bf10cbe40c0f672c34db72e4eea4c168d5932bd4/

---

PATCH v1:
1) Tested on board with A13 SoC

RFT v2:
1) Fixed mistaken copy-paste-n-replace of outl by sunxi_io_write in sunxi_io_mask(...)

 ...-meminfo-Access-to-io-memory-via-pointers.patch | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch
package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch new file +59 -0
new file mode 100644
index 0000000000..997c413f23
@@ -0,0 +1,59 @@
+From 5c0a443ba336f10a8db6a99c769aa84ad37ed4d2 Mon Sep 17 00:00:00 2001
+From: Vadim Kochan <[email protected]>
+Date: Wed, 20 Feb 2019 02:48:43 +0200
+Subject: [PATCH] meminfo: Access to io memory via pointers
+
+The main reason for this is to be able compile with musl library,
+because there is no support of inx/outx functions for ARM platform.
+
+Signed-off-by: Vadim Kochan <[email protected]>
+---
+ meminfo.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/meminfo.c b/meminfo.c
+index 0b0ff23..7d9f10f 100644
+--- a/meminfo.c
++++ b/meminfo.c
+@@ -22,7 +22,6 @@
+ #include <sys/mman.h>
+ #include <stdint.h>
+ #include <errno.h>
+-#include <sys/io.h>
+ #include <stdbool.h>
+ 
+ #include "common.h"
+@@ -74,24 +73,26 @@ static enum sunxi_soc_version soc_version;
+ unsigned int
+ sunxi_io_read(void *base, int offset)
+ {
+-	return inl((unsigned long) (base + offset));
++	unsigned long port = (unsigned long) (base + offset);
++	return *((volatile unsigned long *) port);
+ }
+ 
+ void
+ sunxi_io_write(void *base, int offset, unsigned int value)
+ {
+-	outl(value, (unsigned long) (base + offset));
++	unsigned long port = (unsigned long) (base + offset);
++	*((volatile unsigned long *) port) = value;
+ }
+ 
+ void
+ sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask)
+ {
+-	unsigned int tmp = inl((unsigned long) (base + offset));
++	unsigned int tmp = sunxi_io_read(base, offset);
+ 
+ 	tmp &= ~mask;
+ 	tmp |= value & mask;
+ 
+-	outl(tmp, (unsigned long) (base + offset));
++	sunxi_io_write(base, offset, tmp);
+ }
+ 
+ 
+-- 
+2.14.1
+
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 package/sunxi-tools: Fix build meminfo with musl

Quoted 9 lines · On Mon, 4 Mar 2019 01:23:40 +0200 Vadim Kochan <[email protected]> wrote:

musl does not provide inx/outx API for ARM arch, so use io memory access via pointers which is actually done this way in glibc/ulibc.

Fixes:

    http://autobuild.buildroot.net/results/bf10cbe40c0f672c34db72e4eea4c168d5932bd4/

---

Applied to master, thanks. Could you please submit this patch upstream ? The project is on Github, so submitting a pull request is fairly trivial.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/sunxi-tools: Fix build meminfo with musl

Hi Thomas,

Quoted 10 lines · Thomas Petazzoni
Quoted 7 lines · On Mon, 4 Mar 2019 01:23:40 +0200 Vadim Kochan <[email protected]> wrote:

musl does not provide inx/outx API for ARM arch, so use io memory access via pointers which is actually done this way in glibc/ulibc.

Fixes:

    http://autobuild.buildroot.net/results/bf10cbe40c0f672c34db72e4eea4c168d5932bd4/
Quoted 8 lines
Quoted 2 lines

---

Applied to master, thanks. Could you please submit this patch upstream ? The project is on Github, so submitting a pull request is fairly trivial.

Thanks!

Already there:

    https://github.com/linux-sunxi/sunxi-tools/pull/122

Regards,
Vadim Kochan

#3 lore raw

PATCH 1/1 package/sunxi-tools: Fix build meminfo with musl

In reply to Vadim Kochan
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vadim" == Vadim Kochan <[email protected]> writes:

musl does not provide inx/outx API for ARM arch, so use io memory access via pointers which is actually done this way in glibc/ulibc.

Fixes:

    http://autobuild.buildroot.net/results/bf10cbe40c0f672c34db72e4eea4c168d5932bd4/
Quoted 8 lines

---

PATCH v1:
1) Tested on board with A13 SoC

RFT v2:
1) Fixed mistaken copy-paste-n-replace of outl by sunxi_io_write in sunxi_io_mask(...)

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard