* [PATCH 1/3] import linux __iowrite32/64_copy support
@ 2017-03-09 10:31 Jean-Christophe PLAGNIOL-VILLARD
2017-03-09 10:31 ` [PATCH 2/3] x86: add __raw_read{b,w,l,q} and __raw_write{b,w,l,q} Jean-Christophe PLAGNIOL-VILLARD
2017-03-09 10:31 ` [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 2 replies; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2017-03-09 10:31 UTC (permalink / raw)
To: barebox
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
include/linux/io.h | 27 +++++++++++++++++++++
lib/Makefile | 1 +
lib/iomap_copy.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 98 insertions(+)
create mode 100644 include/linux/io.h
create mode 100644 lib/iomap_copy.c
diff --git a/include/linux/io.h b/include/linux/io.h
new file mode 100644
index 000000000..a87501c6c
--- /dev/null
+++ b/include/linux/io.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2006 PathScale, Inc. All Rights Reserved.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _LINUX_IO_H
+#define _LINUX_IO_H
+
+#include <linux/types.h>
+#include <asm/io.h>
+
+void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
+void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
+
+#endif /* _LINUX_IO_H */
diff --git a/lib/Makefile b/lib/Makefile
index 1be174249..052fe10f2 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,7 @@
obj-y += bcd.o
obj-$(CONFIG_BOOTSTRAP) += bootstrap/
obj-y += ctype.o
+obj-y += iomap_copy.o
obj-y += rbtree.o
obj-y += display_options.o
obj-y += string.o
diff --git a/lib/iomap_copy.c b/lib/iomap_copy.c
new file mode 100644
index 000000000..8732ae0e1
--- /dev/null
+++ b/lib/iomap_copy.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2006 PathScale, Inc. All Rights Reserved.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <module.h>
+#include <linux/io.h>
+
+/**
+ * __iowrite32_copy - copy data to MMIO space, in 32-bit units
+ * @to: destination, in MMIO space (must be 32-bit aligned)
+ * @from: source (must be 32-bit aligned)
+ * @count: number of 32-bit quantities to copy
+ *
+ * Copy data from kernel space to MMIO space, in units of 32 bits at a
+ * time. Order of access is not guaranteed, nor is a memory barrier
+ * performed afterwards.
+ */
+void __attribute__((weak)) __iowrite32_copy(void __iomem *to,
+ const void *from,
+ size_t count)
+{
+ u32 __iomem *dst = to;
+ const u32 *src = from;
+ const u32 *end = src + count;
+
+ while (src < end)
+ __raw_writel(*src++, dst++);
+}
+EXPORT_SYMBOL_GPL(__iowrite32_copy);
+
+/**
+ * __iowrite64_copy - copy data to MMIO space, in 64-bit or 32-bit units
+ * @to: destination, in MMIO space (must be 64-bit aligned)
+ * @from: source (must be 64-bit aligned)
+ * @count: number of 64-bit quantities to copy
+ *
+ * Copy data from kernel space to MMIO space, in units of 32 or 64 bits at a
+ * time. Order of access is not guaranteed, nor is a memory barrier
+ * performed afterwards.
+ */
+void __attribute__((weak)) __iowrite64_copy(void __iomem *to,
+ const void *from,
+ size_t count)
+{
+#ifdef CONFIG_64BIT
+ u64 __iomem *dst = to;
+ const u64 *src = from;
+ const u64 *end = src + count;
+
+ while (src < end)
+ __raw_writeq(*src++, dst++);
+#else
+ __iowrite32_copy(to, from, count * 2);
+#endif
+}
+
+EXPORT_SYMBOL_GPL(__iowrite64_copy);
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] x86: add __raw_read{b,w,l,q} and __raw_write{b,w,l,q}
2017-03-09 10:31 [PATCH 1/3] import linux __iowrite32/64_copy support Jean-Christophe PLAGNIOL-VILLARD
@ 2017-03-09 10:31 ` Jean-Christophe PLAGNIOL-VILLARD
2017-03-09 10:31 ` [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 0 replies; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2017-03-09 10:31 UTC (permalink / raw)
To: barebox
so we can use __iowrite{32/64} to speedup the framebuffer console scrolling
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/x86/include/asm/io.h | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index df4bc99ec..189eb9aae 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -21,6 +21,10 @@ build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
+build_mmio_read(__readb, "b", unsigned char, "=q", )
+build_mmio_read(__readw, "w", unsigned short, "=r", )
+build_mmio_read(__readl, "l", unsigned int, "=r", )
+
#define build_mmio_write(name, size, type, reg, barrier) \
static inline void name(type val, volatile void *addr) \
{ asm volatile("mov" size " %0,%1": :reg (val), \
@@ -30,6 +34,10 @@ build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
build_mmio_write(writew, "w", unsigned short, "r", :"memory")
build_mmio_write(writel, "l", unsigned int, "r", :"memory")
+build_mmio_write(__writeb, "b", unsigned char, "q", )
+build_mmio_write(__writew, "w", unsigned short, "r", )
+build_mmio_write(__writel, "l", unsigned int, "r", )
+
#define BUILDIO(bwl, bw, type) \
static inline void out##bwl(unsigned type value, int port) \
{ \
@@ -61,6 +69,31 @@ BUILDIO(b, b, char)
BUILDIO(w, w, short)
BUILDIO(l, , int)
+#define __raw_readb __readb
+#define __raw_readw __readw
+#define __raw_readl __readl
+
+#define __raw_writeb __writeb
+#define __raw_writew __writew
+#define __raw_writel __writel
+
+#ifdef CONFIG_X86_64
+
+build_mmio_read(readq, "q", unsigned long, "=r", :"memory")
+build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
+
+#define readq_relaxed(a) readq(a)
+#define writeq_relaxed(v, a) writeq(v, a)
+
+#define __raw_readq(a) readq(a)
+#define __raw_writeq(val, addr) writeq(val, addr)
+
+/* Let people know that we have them */
+#define readq readq
+#define writeq writeq
+
+#endif
+
#define IO_SPACE_LIMIT 0xffff
/* do a tiny io delay */
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling
2017-03-09 10:31 [PATCH 1/3] import linux __iowrite32/64_copy support Jean-Christophe PLAGNIOL-VILLARD
2017-03-09 10:31 ` [PATCH 2/3] x86: add __raw_read{b,w,l,q} and __raw_write{b,w,l,q} Jean-Christophe PLAGNIOL-VILLARD
@ 2017-03-09 10:31 ` Jean-Christophe PLAGNIOL-VILLARD
2017-03-10 7:00 ` Sascha Hauer
1 sibling, 1 reply; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2017-03-09 10:31 UTC (permalink / raw)
To: barebox
this devide the time by 4 on x86
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
drivers/video/fbconsole.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c
index b261f1704..b5e951e23 100644
--- a/drivers/video/fbconsole.c
+++ b/drivers/video/fbconsole.c
@@ -6,6 +6,7 @@
#include <gui/image_renderer.h>
#include <gui/graphic_utils.h>
#include <linux/font.h>
+#include <linux/io.h>
enum state_t {
LIT, /* Literal input */
@@ -202,7 +203,7 @@ static void printchar(struct fbc_priv *priv, int c)
buf = gui_screen_render_buffer(priv->sc);
- memcpy(buf, buf + line_height, line_height * priv->rows);
+ __iowrite64_copy(buf, buf + line_height, (line_height * priv->rows) >> 2);
memset(buf + line_height * priv->rows, 0, line_height);
gu_screen_blit(priv->sc);
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling
2017-03-09 10:31 ` [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling Jean-Christophe PLAGNIOL-VILLARD
@ 2017-03-10 7:00 ` Sascha Hauer
2017-03-10 13:58 ` Jean-Christophe PLAGNIOL-VILLARD
2017-03-10 14:30 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 2 replies; 6+ messages in thread
From: Sascha Hauer @ 2017-03-10 7:00 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Thu, Mar 09, 2017 at 11:31:11AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> this devide the time by 4 on x86
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> drivers/video/fbconsole.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c
> index b261f1704..b5e951e23 100644
> --- a/drivers/video/fbconsole.c
> +++ b/drivers/video/fbconsole.c
> @@ -6,6 +6,7 @@
> #include <gui/image_renderer.h>
> #include <gui/graphic_utils.h>
> #include <linux/font.h>
> +#include <linux/io.h>
>
> enum state_t {
> LIT, /* Literal input */
> @@ -202,7 +203,7 @@ static void printchar(struct fbc_priv *priv, int c)
>
> buf = gui_screen_render_buffer(priv->sc);
>
> - memcpy(buf, buf + line_height, line_height * priv->rows);
> + __iowrite64_copy(buf, buf + line_height, (line_height * priv->rows) >> 2);
Shouldn't this be >> 3?
Besides, I'm not sure using __iowrite64_copy is the right weapon here.
Maybe better port arch/x86/lib/memcpy_64.S to get an optimized memcpy?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling
2017-03-10 7:00 ` Sascha Hauer
@ 2017-03-10 13:58 ` Jean-Christophe PLAGNIOL-VILLARD
2017-03-10 14:30 ` Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 0 replies; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2017-03-10 13:58 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 08:00 Fri 10 Mar , Sascha Hauer wrote:
> On Thu, Mar 09, 2017 at 11:31:11AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > this devide the time by 4 on x86
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> > drivers/video/fbconsole.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c
> > index b261f1704..b5e951e23 100644
> > --- a/drivers/video/fbconsole.c
> > +++ b/drivers/video/fbconsole.c
> > @@ -6,6 +6,7 @@
> > #include <gui/image_renderer.h>
> > #include <gui/graphic_utils.h>
> > #include <linux/font.h>
> > +#include <linux/io.h>
> >
> > enum state_t {
> > LIT, /* Literal input */
> > @@ -202,7 +203,7 @@ static void printchar(struct fbc_priv *priv, int c)
> >
> > buf = gui_screen_render_buffer(priv->sc);
> >
> > - memcpy(buf, buf + line_height, line_height * priv->rows);
> > + __iowrite64_copy(buf, buf + line_height, (line_height * priv->rows) >> 2);
>
> Shouldn't this be >> 3?
yeah should be 3
>
> Besides, I'm not sure using __iowrite64_copy is the right weapon here.
> Maybe better port arch/x86/lib/memcpy_64.S to get an optimized memcpy?
we need to test the performance
but as far as I remember __iowrite was kicker on ARM at least
Best Regards,
J.
>
> Sascha
>
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling
2017-03-10 7:00 ` Sascha Hauer
2017-03-10 13:58 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2017-03-10 14:30 ` Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 0 replies; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2017-03-10 14:30 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 08:00 Fri 10 Mar , Sascha Hauer wrote:
> On Thu, Mar 09, 2017 at 11:31:11AM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > this devide the time by 4 on x86
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> > drivers/video/fbconsole.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c
> > index b261f1704..b5e951e23 100644
> > --- a/drivers/video/fbconsole.c
> > +++ b/drivers/video/fbconsole.c
> > @@ -6,6 +6,7 @@
> > #include <gui/image_renderer.h>
> > #include <gui/graphic_utils.h>
> > #include <linux/font.h>
> > +#include <linux/io.h>
> >
> > enum state_t {
> > LIT, /* Literal input */
> > @@ -202,7 +203,7 @@ static void printchar(struct fbc_priv *priv, int c)
> >
> > buf = gui_screen_render_buffer(priv->sc);
> >
> > - memcpy(buf, buf + line_height, line_height * priv->rows);
> > + __iowrite64_copy(buf, buf + line_height, (line_height * priv->rows) >> 2);
>
> Shouldn't this be >> 3?
>
> Besides, I'm not sure using __iowrite64_copy is the right weapon here.
> Maybe better port arch/x86/lib/memcpy_64.S to get an optimized memcpy?
My other issue to the current driver is so so slow
Normaly we need to have a shadow buffer with twice the size of the real buffer
And we should use a timer when we have to blit too much and add scroll support
I've those feature on an other barebox fbcon implementation
Best Regards,
J.
>
> Sascha
>
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-10 14:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-09 10:31 [PATCH 1/3] import linux __iowrite32/64_copy support Jean-Christophe PLAGNIOL-VILLARD
2017-03-09 10:31 ` [PATCH 2/3] x86: add __raw_read{b,w,l,q} and __raw_write{b,w,l,q} Jean-Christophe PLAGNIOL-VILLARD
2017-03-09 10:31 ` [PATCH 3/3] fbcon: use __iowrite{32/64} to speedup the framebuffer console scrolling Jean-Christophe PLAGNIOL-VILLARD
2017-03-10 7:00 ` Sascha Hauer
2017-03-10 13:58 ` Jean-Christophe PLAGNIOL-VILLARD
2017-03-10 14:30 ` Jean-Christophe PLAGNIOL-VILLARD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox