Re: [linux-yocto] [kernel-cache][PATCH] mti-malta32: enable CONFIG_HIGHMEM for qemumips to support up to 2GiB RAM
On 2017-12-05 9:37 PM, Hongxu Jia wrote: OE uses qemumips to simulate a Malta board by default. As upstream qemu introduced: https://git.qemu.org/?p=qemu.git;a=commit;h=94c2b6aff43cdfcfdfb552773a6b6b973a72ef0b The Malta board can support up to 2GiB of RAM which should be able to boot a Linux kernel built with CONFIG_HIGHMEM enabled. For mips, the `High Memory Support' only makes sense for the 32-bit kernel. I've merged this for the 4.12/4.9 kernel (and master, so newer kernels will get it as well). Bruce Signed-off-by: Hongxu Jia --- bsp/mti-malta32/mti-malta32-common.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp/mti-malta32/mti-malta32-common.cfg b/bsp/mti-malta32/mti-malta32-common.cfg index 104caf2..d30a38d 100644 --- a/bsp/mti-malta32/mti-malta32-common.cfg +++ b/bsp/mti-malta32/mti-malta32-common.cfg @@ -14,6 +14,7 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_MIPS32_R1=y +CONFIG_HIGHMEM=y CONFIG_MTD=y CONFIG_MTD_BLKDEVS=y -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [kernel-cache][PATCH] qemuppc: clean up obosolete patches
On 2017-12-05 9:37 PM, Hongxu Jia wrote:
Since the following commit remove remove old PREP platform,
and with a simple search, these patches were not used by
others, so clean up the obsolete code
I'm going to hold onto these a bit longer. I still sometimes
use the PReP platform to verify the mac99 behaviour.
Bruce
...
commit d341564a1ff749f87cfc9b2819b2759903c1efba
Author: Bruce Ashfield
Date: Thu Jul 16 15:08:13 2015 -0400
qemuppc: remove old PREP platform patches
...
Signed-off-by: Hongxu Jia
---
.../powerpc-special-load-offset-for-qemu.patch | 32 -
bsp/qemu-ppc32/qemu-platform-v2.patch | 1640
.../qemu-powerpc-Added-qemu_restart-function.patch | 55 -
...c-work-around-for-qemu-powerpc-32-interru.patch | 44 -
bsp/qemu-ppc32/qemu-ppc32.scc |8 -
bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch | 41 -
...pc32-support-multiple-ethernet-interfaces.patch | 34 -
bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch| 48 -
8 files changed, 1902 deletions(-)
delete mode 100644 bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch
delete mode 100644 bsp/qemu-ppc32/qemu-platform-v2.patch
delete mode 100644
bsp/qemu-ppc32/qemu-powerpc-Added-qemu_restart-function.patch
delete mode 100644
bsp/qemu-ppc32/qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch
delete mode 100644 bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch
delete mode 100644
bsp/qemu-ppc32/qemu_ppc32-support-multiple-ethernet-interfaces.patch
delete mode 100644 bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch
diff --git a/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch
b/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch
deleted file mode 100644
index ae9d48d..000
--- a/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9df586c4b4b112f55f1984697bfd6de663774118 Mon Sep 17 00:00:00 2001
-From: Jason Wessel
-Date: Wed, 3 Feb 2010 13:51:19 -0500
-Subject: [PATCH 2/3] powerpc: special load offset for qemu
-
-Patch the load offset to work correctly with qemu_boot_loader.
-
-Signed-off-by: Jason Wessel
-Signed-off-by: Bruce Ashfield
- arch/powerpc/kernel/vmlinux.lds.S |5 +
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/arch/powerpc/kernel/vmlinux.lds.S
b/arch/powerpc/kernel/vmlinux.lds.S
-index dcd01c8..4397f44 100644
a/arch/powerpc/kernel/vmlinux.lds.S
-+++ b/arch/powerpc/kernel/vmlinux.lds.S
-@@ -8,6 +8,11 @@
- #include
- #include
-
-+#ifdef CONFIG_PPC_QEMU
-+#undef LOAD_OFFSET
-+#define LOAD_OFFSET 0
-+#endif /* CONFIG_PPC_QEMU */
-+
- ENTRY(_stext)
-
- PHDRS {
---
-1.6.5.2
-
diff --git a/bsp/qemu-ppc32/qemu-platform-v2.patch
b/bsp/qemu-ppc32/qemu-platform-v2.patch
deleted file mode 100644
index 59b3fa3..000
--- a/bsp/qemu-ppc32/qemu-platform-v2.patch
+++ /dev/null
@@ -1,1640 +0,0 @@
-From ed6c530bc35a3366a04dcf77ec0fd456da5ce480 Mon Sep 17 00:00:00 2001
-From: Milton Miller
-Date: Sat, 22 Sep 2007 09:08:31 +1000
-Subject: [PATCH 1/3] qemu platform, v2
-
-Here is the second rev of patches to boot a arch powerpc kernel on
-qemu with the prep architecture.
-
-The goal is to provide an environment for use with the existing qemu
-hardware suppplied hardware, as oposed to changing the qemu
-machine description.
-
-This patch contains only the kernel portion. While the diff was
-generated against for-2.6.24, this first patch applies cleanly
-to 2.6.23-rc7. With the rom image created in the next patch,
-a kernel built by this patch should boot when using qemu -kernel.
-
-I debated putting this in the embedded6xx tree, especially when I
-discovered that the bridge is suposedly a '105, but saw no advantage
-in the end.
-
-pci config space is now working, however cirrusfb causes crashes
-and ohci times out, so at least pci memory is likely still broken.
-
-ide and serial work, floppy and parallel are untested.
-
-I added a defconfig based on chrp32; hardware options still need
-tweaking (eg isa ne2k).
-
-Signed-off-by: Jason Wessel
-Signed-off-by: Bruce Ashfield
-diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index c33e3ad..a0d28dc 100644
a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -636,7 +636,7 @@ menu "Bus options"
-
- config ISA
- bool "Support for ISA-bus hardware"
-- depends on PPC_CHRP
-+ depends on PPC_CHRP || PPC_QEMU
- select PPC_I8259
- help
- Find out whether you have ISA slots on your motherboard. ISA is the
-diff --git a/arch/powerpc/configs/qemu_defconfig
b/arch/powerpc/configs/qemu_defconfig
-new file mode 100644
-index 000..a6d6721
/dev/null
-+++ b/arch/powerpc/configs/qemu_defconfig
-@@ -0,0 +1,1217 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.23-rc6
-+# Tue Sep 18 15:18:32 2007
-+#
-+# CONFIG_PPC64 is not set
-+
-+#
-+# Processor support
-+#
-+CONFIG_6xx=y
-+# CONFIG_PPC_85xx is not
Re: [linux-yocto] [PATCH] kernel/softirq.c error in 4.9.65 tag
On 2017-12-08 1:05 PM, Daniel Dragomir wrote:
Hello Bruce!
Can you please review this patch and merge it in Axxia preempt-rt
branch from linux-yocto-4.9 if it's good:
standard/preempt-rt/axxia/base
After you have merged tag 4.9.65 tag from upstream in yocto branches
and also in Axxia ones, our preempt-rt build is failing with the
following error:
| kernel/softirq.c:615:28: error: macro "in_serving_softirq" passed
| 1 arguments, but takes just 0
| kernel/softirq.c:616:1: error: expected '=', ',', ';', 'asm' or
| '__attribute__' before '{' token
| scripts/Makefile.build:293: recipe for target 'kernel/softirq.o'
| failed
After searching the commits, I found that it's a duplication of
defining in_serving_softirq macro in include/linux/preempt.h.
I think it's merge issue. See details in commit log.
If you can confirm tis issue, maybe this should be fixed also in
other preempt-rt branches, including standard/preempt-rt/base.
Yep. It was your run of the mill merge issue.
I've merged this to all the preempt-rt branches and will send
SRCREV updates early next week.
Bruce
Best regards,
Daniel Dragomir (1):
softirq: Remove duplication of defining in_serving_softirq macro
include/linux/preempt.h | 1 -
1 file changed, 1 deletion(-)
--
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [kernel-cache][yocto-4.12][V2][PATCH 1/1] features/i915/i915.cfg: compile i915 as a module
On 2017-12-08 5:25 PM, Cal Sullivan wrote: Could this be merged into 4.9 as well? I had to do the minor fixup, but it is now in 4.9 as well. Bruce Thanks, Cal On 12/07/2017 02:36 AM, Bruce Ashfield wrote: On 12/06/2017 11:27 PM, Liwei Song wrote: Set i915 as a module to trigger the firmware load at the same time the module is loaded. This can avoid a timing problem between the driver starting and it triggering a firmware load, after compile it as module i915 driver will start after the rootfs is ready, then the firmware store in /lib/firmware/ can be load successful by i915 driver. merged. Bruce Signed-off-by: Liwei Song --- features/i915/i915.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/i915/i915.cfg b/features/i915/i915.cfg index 6dcc60f2dfc7..60cb963e014b 100644 --- a/features/i915/i915.cfg +++ b/features/i915/i915.cfg @@ -8,6 +8,6 @@ CONFIG_AGP=y CONFIG_AGP_INTEL=y CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_I915=y +CONFIG_DRM_I915=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_I915_ALPHA_SUPPORT=y -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] [kernel-cache][yocto-4.12][V2][PATCH 1/1] features/i915/i915.cfg: compile i915 as a module
Could this be merged into 4.9 as well? Thanks, Cal On 12/07/2017 02:36 AM, Bruce Ashfield wrote: On 12/06/2017 11:27 PM, Liwei Song wrote: Set i915 as a module to trigger the firmware load at the same time the module is loaded. This can avoid a timing problem between the driver starting and it triggering a firmware load, after compile it as module i915 driver will start after the rootfs is ready, then the firmware store in /lib/firmware/ can be load successful by i915 driver. merged. Bruce Signed-off-by: Liwei Song --- features/i915/i915.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/i915/i915.cfg b/features/i915/i915.cfg index 6dcc60f2dfc7..60cb963e014b 100644 --- a/features/i915/i915.cfg +++ b/features/i915/i915.cfg @@ -8,6 +8,6 @@ CONFIG_AGP=y CONFIG_AGP_INTEL=y CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_I915=y +CONFIG_DRM_I915=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_I915_ALPHA_SUPPORT=y -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH] softirq: Remove duplication of defining in_serving_softirq macro
After commit 7469ff09b8e2 ("softirq: Split softirq locks"), this
macro is defined only if CONFIG_PREEMPT_RT_FULL kernel option
is not set.
+#ifndef CONFIG_PREEMPT_RT_FULL
+# define softirq_count() (preempt_count() & SOFTIRQ_MASK)
+# define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
+#else
+# define softirq_count() (0UL)
+extern int in_serving_softirq(void);
+#endif
-#define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
But after commit 2715f6841a08 ("x86/uaccess, sched/preempt: Verify
access_ok() context"), this define line is present and it duplicates
the one from ifndef statement.
This will bring to the following error when compiling PREEMPT-RT
kernel:
| kernel/softirq.c:615:28: error: macro "in_serving_softirq" passed
| 1 arguments, but takes just 0
| kernel/softirq.c:616:1: error: expected '=', ',', ';', 'asm' or
| '__attribute__' before '{' token
| scripts/Makefile.build:293: recipe for target 'kernel/softirq.o'
| failed
Maybe it's a merge issue.
Signed-off-by: Daniel Dragomir
---
include/linux/preempt.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index ca0d03f..f97c542 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -89,7 +89,6 @@ extern int in_serving_softirq(void);
#define in_irq() (hardirq_count())
#define in_softirq() (softirq_count())
#define in_interrupt() (irq_count())
-#define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
#define in_nmi() (preempt_count() & NMI_MASK)
#define in_task() (!(preempt_count() & \
(NMI_MASK | HARDIRQ_MASK | SOFTIRQ_OFFSET)))
--
2.7.4
--
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] [PATCH] kernel/softirq.c error in 4.9.65 tag
Hello Bruce!
Can you please review this patch and merge it in Axxia preempt-rt
branch from linux-yocto-4.9 if it's good:
standard/preempt-rt/axxia/base
After you have merged tag 4.9.65 tag from upstream in yocto branches
and also in Axxia ones, our preempt-rt build is failing with the
following error:
| kernel/softirq.c:615:28: error: macro "in_serving_softirq" passed
| 1 arguments, but takes just 0
| kernel/softirq.c:616:1: error: expected '=', ',', ';', 'asm' or
| '__attribute__' before '{' token
| scripts/Makefile.build:293: recipe for target 'kernel/softirq.o'
| failed
After searching the commits, I found that it's a duplication of
defining in_serving_softirq macro in include/linux/preempt.h.
I think it's merge issue. See details in commit log.
If you can confirm tis issue, maybe this should be fixed also in
other preempt-rt branches, including standard/preempt-rt/base.
Best regards,
Daniel Dragomir (1):
softirq: Remove duplication of defining in_serving_softirq macro
include/linux/preempt.h | 1 -
1 file changed, 1 deletion(-)
--
2.7.4
--
___
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
