mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option
@ 2020-09-29 10:58 Ahmad Fatoum
  2020-09-29 10:58 ` [PATCH 2/5] lib: ratp: rename now undefined use of a Kconfig symbol Ahmad Fatoum
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2020-09-29 10:58 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

The code was copied from the kernel, but we don't support the imx6sl.
Drop the left-over.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/Kconfig b/common/Kconfig
index 9e6918189bdb..be03c0d5df2b 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1292,7 +1292,6 @@ config DEBUG_IMX_UART_PORT
 						DEBUG_IMX51_UART || \
 						DEBUG_IMX53_UART || \
 						DEBUG_IMX6Q_UART || \
-						DEBUG_IMX6SL_UART || \
 						DEBUG_IMX7D_UART || \
 						DEBUG_IMX8M_UART || \
 						DEBUG_VF610_UART
-- 
2.28.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/5] lib: ratp: rename now undefined use of a Kconfig symbol
  2020-09-29 10:58 [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Ahmad Fatoum
@ 2020-09-29 10:58 ` Ahmad Fatoum
  2020-09-29 10:58 ` [PATCH 3/5] at91: wdt: don't include <asm-generic/io.h> directly Ahmad Fatoum
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2020-09-29 10:58 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

The symbol used to exist, but was renamed in 6f37d9efd91 ("commands:
Move /dev/mem driver to drivers/misc") and then one instance without
definition was added back in cae5e14224f4 ("ratp: add more build
dependencies"). Fix it.

Fixes: cae5e14224f4 ("ratp: add more build dependencies")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 lib/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Kconfig b/lib/Kconfig
index 6d909c1ac8f0..8128e5108964 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -111,7 +111,7 @@ config LIBFDT
 
 config RATP
 	select CRC_ITU_T
-	select COMPILE_MEMORY
+	select DEV_MEM
 	select COMMAND_SUPPORT
 	select POLLER
 	depends on CONSOLE_FULL
-- 
2.28.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/5] at91: wdt: don't include <asm-generic/io.h> directly
  2020-09-29 10:58 [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Ahmad Fatoum
  2020-09-29 10:58 ` [PATCH 2/5] lib: ratp: rename now undefined use of a Kconfig symbol Ahmad Fatoum
@ 2020-09-29 10:58 ` Ahmad Fatoum
  2020-09-29 10:58 ` [PATCH 4/5] include: asm-generic: bitio.h " Ahmad Fatoum
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2020-09-29 10:58 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

<asm-generic/io.h> is not meant for direct inclusion. It provides
defaults for each arch's <asm/io.h> to fall back to.
Use <asm/io.h> instead.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/mach-at91/include/mach/at91_wdt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/include/mach/at91_wdt.h b/arch/arm/mach-at91/include/mach/at91_wdt.h
index d295d35d1b5c..04924742a533 100644
--- a/arch/arm/mach-at91/include/mach/at91_wdt.h
+++ b/arch/arm/mach-at91/include/mach/at91_wdt.h
@@ -41,7 +41,7 @@
  * Copyright (c) 2006, Atmel Corporation
  */
 
-#include <asm-generic/io.h>
+#include <asm/io.h>
 
 static inline void at91_wdt_disable(void __iomem *wdt_base)
 {
-- 
2.28.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 4/5] include: asm-generic: bitio.h don't include <asm-generic/io.h> directly
  2020-09-29 10:58 [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Ahmad Fatoum
  2020-09-29 10:58 ` [PATCH 2/5] lib: ratp: rename now undefined use of a Kconfig symbol Ahmad Fatoum
  2020-09-29 10:58 ` [PATCH 3/5] at91: wdt: don't include <asm-generic/io.h> directly Ahmad Fatoum
@ 2020-09-29 10:58 ` Ahmad Fatoum
  2020-09-29 10:58 ` [PATCH 5/5] sandbox: add dummy memory-mapped I/O port region Ahmad Fatoum
  2020-10-01  6:12 ` [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2020-09-29 10:58 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

<asm-generic/io.h> is not meant for direct inclusion. It provides
defaults for each arch's <asm/io.h> to fall back to.
Use <asm/io.h> instead.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/asm-generic/bitio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/asm-generic/bitio.h b/include/asm-generic/bitio.h
index e88dbd7b8527..99b85da59c6d 100644
--- a/include/asm-generic/bitio.h
+++ b/include/asm-generic/bitio.h
@@ -3,7 +3,7 @@
 #ifndef __ASM_GENERIC_BITIO_H
 #define __ASM_GENERIC_BITIO_H
 
-#include <asm-generic/io.h>
+#include <asm/io.h>
 
 /*
  * Clear and set bits in one shot. These macros can be used to clear and
-- 
2.28.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 5/5] sandbox: add dummy memory-mapped I/O port region
  2020-09-29 10:58 [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Ahmad Fatoum
                   ` (2 preceding siblings ...)
  2020-09-29 10:58 ` [PATCH 4/5] include: asm-generic: bitio.h " Ahmad Fatoum
@ 2020-09-29 10:58 ` Ahmad Fatoum
  2020-10-01  6:12 ` [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Ahmad Fatoum @ 2020-09-29 10:58 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

Super I/O devices on x86 have their base usually located at one of two
I/O ports. They are probed by writing a "passcode" to the I/O port
and then a value is read back.

When COMPILE_TESTing these drivers and running them on sandbox,
this fails with a segfault because all I/O port access lead to
zero page dereference on that architecture. Even without running
barebox, static analyzers correctly flag these accesses as invoking
undefined behavior. Adding a dummy I/O region solves both issues.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/sandbox/board/devices.c  | 3 +++
 arch/sandbox/include/asm/io.h | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/sandbox/board/devices.c b/arch/sandbox/board/devices.c
index 72e62552a3b8..1fd1913ae60f 100644
--- a/arch/sandbox/board/devices.c
+++ b/arch/sandbox/board/devices.c
@@ -9,6 +9,9 @@
 #include <mach/linux.h>
 #include <init.h>
 #include <mach/linux.h>
+#include <asm/io.h>
+
+unsigned char __pci_iobase[IO_SPACE_LIMIT];
 
 static LIST_HEAD(sandbox_device_list);
 
diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h
index 6a0e77aead42..9f9cd3a42ab1 100644
--- a/arch/sandbox/include/asm/io.h
+++ b/arch/sandbox/include/asm/io.h
@@ -1,7 +1,11 @@
 #ifndef __ASM_SANDBOX_IO_H
 #define __ASM_SANDBOX_IO_H
 
-#define	IO_SPACE_LIMIT 0
+#define	IO_SPACE_LIMIT 0xffff
+/* pacify static analyzers */
+#define PCI_IOBASE     ((void __iomem *)__pci_iobase)
+
+extern unsigned char __pci_iobase[IO_SPACE_LIMIT];
 
 #include <asm-generic/io.h>
 #include <asm-generic/bitio.h>
-- 
2.28.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 1/5] common: debug_ll: remove reference to undefined Kconfig option
  2020-09-29 10:58 [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Ahmad Fatoum
                   ` (3 preceding siblings ...)
  2020-09-29 10:58 ` [PATCH 5/5] sandbox: add dummy memory-mapped I/O port region Ahmad Fatoum
@ 2020-10-01  6:12 ` Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2020-10-01  6:12 UTC (permalink / raw)
  To: Ahmad Fatoum; +Cc: barebox

On Tue, Sep 29, 2020 at 12:58:19PM +0200, Ahmad Fatoum wrote:
> The code was copied from the kernel, but we don't support the imx6sl.
> Drop the left-over.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  common/Kconfig | 1 -
>  1 file changed, 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 9e6918189bdb..be03c0d5df2b 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -1292,7 +1292,6 @@ config DEBUG_IMX_UART_PORT
>  						DEBUG_IMX51_UART || \
>  						DEBUG_IMX53_UART || \
>  						DEBUG_IMX6Q_UART || \
> -						DEBUG_IMX6SL_UART || \
>  						DEBUG_IMX7D_UART || \
>  						DEBUG_IMX8M_UART || \
>  						DEBUG_VF610_UART
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
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:[~2020-10-01  6:13 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-29 10:58 [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Ahmad Fatoum
2020-09-29 10:58 ` [PATCH 2/5] lib: ratp: rename now undefined use of a Kconfig symbol Ahmad Fatoum
2020-09-29 10:58 ` [PATCH 3/5] at91: wdt: don't include <asm-generic/io.h> directly Ahmad Fatoum
2020-09-29 10:58 ` [PATCH 4/5] include: asm-generic: bitio.h " Ahmad Fatoum
2020-09-29 10:58 ` [PATCH 5/5] sandbox: add dummy memory-mapped I/O port region Ahmad Fatoum
2020-10-01  6:12 ` [PATCH 1/5] common: debug_ll: remove reference to undefined Kconfig option Sascha Hauer

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