| Message ID | 20150521183629.GT10274@atomide.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thursday 21 May 2015 11:36:30 Tony Lindgren wrote: > > > > OK got it triggered here too with randconfig builds now. > > This seems to be related to not selecting some omap1 SoCs or > > boards. I'll try to do a minimal fix for it today. > > > > It seems the include changes you posted would be better done > > by replacing the the dependencies to mach/irqs.h where possible > > rather than adding more includes? Yes, I guess we can do that too. FWIW, almost all the problems were uses of cpu_is_omap*(), omap_read*() and omap_write*(). There are quite a lot of them overall, but at least they are easy to grep for, and there should be an obvious fix for each of them, following what you did on OMAP2 a couple of years ago. > OK figured it out. We now rely on an indirect include selected > with ARCH_OMAP15XX. Here's what I suggest as a fix for this > issue, obviously the real fix is to fix the legacy drivers to not > #include <mach/*.h>. Ok, I've put this patch in my randconfig build setup to replace my older patch, let's see if there are still some corner cases left. So far, everything looks good (50 random mach-omap1 builds done). Can you send an updated pull request with the fix folded in? Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Arnd Bergmann <arnd@arndb.de> [150521 14:35]: > On Thursday 21 May 2015 11:36:30 Tony Lindgren wrote: > > > > > > OK got it triggered here too with randconfig builds now. > > > This seems to be related to not selecting some omap1 SoCs or > > > boards. I'll try to do a minimal fix for it today. > > > > > > It seems the include changes you posted would be better done > > > by replacing the the dependencies to mach/irqs.h where possible > > > rather than adding more includes? > > Yes, I guess we can do that too. FWIW, almost all the problems > were uses of cpu_is_omap*(), omap_read*() and omap_write*(). > > There are quite a lot of them overall, but at least they are > easy to grep for, and there should be an obvious fix for each > of them, following what you did on OMAP2 a couple of years ago. Yeah then that can be done one driver at a time. > > OK figured it out. We now rely on an indirect include selected > > with ARCH_OMAP15XX. Here's what I suggest as a fix for this > > issue, obviously the real fix is to fix the legacy drivers to not > > #include <mach/*.h>. > > Ok, I've put this patch in my randconfig build setup to replace > my older patch, let's see if there are still some corner cases > left. So far, everything looks good (50 random mach-omap1 builds > done). Can you send an updated pull request with the fix folded in? OK will do. I'll also include the secion warning I posted earlier today as that seems to get triggered with some randconfigs because of the __init_or_module. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/arch/arm/mach-omap1/board-h3-mmc.c +++ b/arch/arm/mach-omap1/board-h3-mmc.c @@ -16,6 +16,7 @@ #include <linux/i2c/tps65010.h> +#include "common.h" #include "board-h3.h" #include "mmc.h" --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -36,6 +36,8 @@ #include <mach/irqs.h> +#include "soc.h" + #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) void omap7xx_map_io(void); #else --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c @@ -21,6 +21,8 @@ #include <mach/irqs.h> +#include "soc.h" + #define OMAP1610_GPIO1_BASE 0xfffbe400 #define OMAP1610_GPIO2_BASE 0xfffbec00 #define OMAP1610_GPIO3_BASE 0xfffbb400 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c @@ -21,6 +21,8 @@ #include <mach/irqs.h> +#include "soc.h" + #define OMAP7XX_GPIO1_BASE 0xfffbc000 #define OMAP7XX_GPIO2_BASE 0xfffbc800 #define OMAP7XX_GPIO3_BASE 0xfffbd000 --- a/arch/arm/mach-omap1/include/mach/memory.h +++ b/arch/arm/mach-omap1/include/mach/memory.h @@ -5,6 +5,9 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H +/* REVISIT: omap1 legacy drivers still rely on this */ +#include <mach/soc.h> + /* * Bus address is physical address, except for OMAP-1510 Local Bus. * OMAP-1510 bus address is translated into a Local Bus address if the @@ -14,7 +17,6 @@ * because of the strncmp(). */ #if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__) -#include <mach/soc.h> /* * OMAP-1510 Local Bus address offset --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -62,6 +62,7 @@ #include "iomap.h" #include "clock.h" #include "pm.h" +#include "soc.h" #include "sram.h" static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -25,6 +25,7 @@ #include <mach/mux.h> #include "pm.h" +#include "soc.h" static struct clk * uart1_ck; static struct clk * uart2_ck;