[v2,03/15] bus/pci: add fallback for out[lwb]_p for non GNU libc

Message ID 20190312101630.18250-1-ncopa@alpinelinux.org
State Superseded, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • Untitled series #3715
Related show

Checks

Context Check Description
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Natanael Copa March 12, 2019, 10:16 a.m.
Add a fallback for non-GNU libc systems like musl libc for the
non-standard functions  outl_p, outw_p and outb_p.

This ifixes the following buildtime errors when building with musl libc:
pci_uio.c:(.text+0xaa1): undefined reference to `outw_p'
pci_uio.c:(.text+0xac5): undefined reference to `outl_p'
pci_uio.c:(.text+0xadf): undefined reference to `outb_p'

fixes https://bugs.dpdk.org/show_bug.cgi?id=35

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---

v2 - fixed coding style issues reported by checkpatch

 drivers/bus/pci/linux/pci_uio.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

Comments

Ferruh Yigit March 13, 2019, 11:13 a.m. | #1
On 3/12/2019 10:16 AM, Natanael Copa wrote:
> Add a fallback for non-GNU libc systems like musl libc for the
> non-standard functions  outl_p, outw_p and outb_p.
> 
> This ifixes the following buildtime errors when building with musl libc:
> pci_uio.c:(.text+0xaa1): undefined reference to `outw_p'
> pci_uio.c:(.text+0xac5): undefined reference to `outl_p'
> pci_uio.c:(.text+0xadf): undefined reference to `outb_p'
> 
> fixes https://bugs.dpdk.org/show_bug.cgi?id=35
> 
> Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>

Hi Natanael,

Thank you for the patches.
I can see you have sent v2 for some of the individual patches in your set, it is
too hard to maintain individual patches in a set, also it breaks automated
checks and patchwork patchset logic.
Can you please send whole patchset when you need to update patches, starting
with a v3 of latest patchset?

Thanks,
ferruh
Natanael Copa March 13, 2019, 5:08 p.m. | #2
On Wed, 13 Mar 2019 11:13:40 +0000
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> On 3/12/2019 10:16 AM, Natanael Copa wrote:
> > Add a fallback for non-GNU libc systems like musl libc for the
> > non-standard functions  outl_p, outw_p and outb_p.
> > 
> > This ifixes the following buildtime errors when building with musl libc:
> > pci_uio.c:(.text+0xaa1): undefined reference to `outw_p'
> > pci_uio.c:(.text+0xac5): undefined reference to `outl_p'
> > pci_uio.c:(.text+0xadf): undefined reference to `outb_p'
> > 
> > fixes https://bugs.dpdk.org/show_bug.cgi?id=35
> > 
> > Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>  
> 
> Hi Natanael,
> 
> Thank you for the patches.
> I can see you have sent v2 for some of the individual patches in your set, it is
> too hard to maintain individual patches in a set, also it breaks automated
> checks and patchwork patchset logic.
> Can you please send whole patchset when you need to update patches, starting
> with a v3 of latest patchset?

I actually thought recent version of patchwork could handle that. Sorry.

A full patchset was resent.

Thanks!


-nc

Patch

diff --git a/drivers/bus/pci/linux/pci_uio.c b/drivers/bus/pci/linux/pci_uio.c
index 09ecbb7aa..e1dd8c875 100644
--- a/drivers/bus/pci/linux/pci_uio.c
+++ b/drivers/bus/pci/linux/pci_uio.c
@@ -14,6 +14,32 @@ 
 
 #if defined(RTE_ARCH_X86)
 #include <sys/io.h>
+#if defined(__GLIBC__)
+#define pci_uio_outl_p outl_p
+#define pci_uio_outw_p outw_p
+#define pci_uio_outb_p outb_p
+#else
+static inline void
+pci_uio_outl_p(unsigned int value, unsigned short int port)
+{
+	__asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80" : : "a" (value),
+			      "Nd" (port));
+}
+
+static inline void
+pci_uio_outw_p(unsigned short int value, unsigned short int port)
+{
+	__asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80" : : "a" (value),
+			      "Nd" (port));
+}
+
+static inline void
+pci_uio_outb_p(unsigned char value, unsigned short int port)
+{
+	__asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80" : : "a" (value),
+			      "Nd" (port));
+}
+#endif
 #endif
 
 #include <rte_log.h>
@@ -527,21 +553,21 @@  pci_uio_ioport_write(struct rte_pci_ioport *p,
 		if (len >= 4) {
 			size = 4;
 #if defined(RTE_ARCH_X86)
-			outl_p(*(const uint32_t *)s, reg);
+			pci_uio_outl_p(*(const uint32_t *)s, reg);
 #else
 			*(volatile uint32_t *)reg = *(const uint32_t *)s;
 #endif
 		} else if (len >= 2) {
 			size = 2;
 #if defined(RTE_ARCH_X86)
-			outw_p(*(const uint16_t *)s, reg);
+			pci_uio_outw_p(*(const uint16_t *)s, reg);
 #else
 			*(volatile uint16_t *)reg = *(const uint16_t *)s;
 #endif
 		} else {
 			size = 1;
 #if defined(RTE_ARCH_X86)
-			outb_p(*s, reg);
+			pci_uio_outb_p(*s, reg);
 #else
 			*(volatile uint8_t *)reg = *s;
 #endif