[linux-yocto] [linux-yocto v6.5 1/1] neighbour: Fix __randomize_layout crash in struct neighbour
From: "Gustavo A. R. Silva"
Previously, one-element and zero-length arrays were treated as true
flexible arrays, even though they are actually "fake" flex arrays.
The __randomize_layout would leave them untouched at the end of the
struct, similarly to proper C99 flex-array members.
However, this approach changed with commit 1ee60356c2dc ("gcc-plugins:
randstruct: Only warn about true flexible arrays"). Now, only C99
flexible-array members will remain untouched at the end of the struct,
while one-element and zero-length arrays will be subject to randomization.
Fix a `__randomize_layout` crash in `struct neighbour` by transforming
zero-length array `primary_key` into a proper C99 flexible-array member.
Fixes: 1ee60356c2dc ("gcc-plugins: randstruct: Only warn about true flexible
arrays")
Closes:
https://lore.kernel.org/linux-hardening/20231124102458.gb1503...@e124191.cambridge.arm.com/
Signed-off-by: Gustavo A. R. Silva
Reviewed-by: Kees Cook
Tested-by: Joey Gouly
Link: https://lore.kernel.org/r/ZWJoRsJGnCPdJ3+2@work
Signed-off-by: Paolo Abeni
---
include/net/neighbour.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 07022bb0d44d..0d28172193fa 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -162,7 +162,7 @@ struct neighbour {
struct rcu_head rcu;
struct net_device *dev;
netdevice_tracker dev_tracker;
- u8 primary_key[0];
+ u8 primary_key[];
} __randomize_layout;
struct neigh_ops {
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13672):
https://lists.yoctoproject.org/g/linux-yocto/message/13672
Mute This Topic: https://lists.yoctoproject.org/mt/104893318/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v6.5 0/1] backport Fix __randomize_layout crash in struct neighbour
Linux kernel commit 9aea191c29e18f7c044a2f95a2da7f7b7fdd0449, “gcc-plugins: randstruct: Only warn about true flexible arrays” (backported to 6.5.13 as part of the stable process) introduces a bug, which is preventing networking from functioning (and logging lots of errors in dmesg). Linux kernel commit 45b3fae4675dc1d4ee2d7aefa19d85ee4f891377 resolves the issue. The fix was originally added to the v6.7 kernel and has been back ported to the v6.6 kernel, but not the v6.5 kernel (yet). A quick search shows the initial (buggy) patch only brought back to v6.5. So, this is only being seen on nanbield. The errors being seen are networking related. For example, on the fvp-base machine in meta-arm, I see the following: … Configuring network interfaces... [ cut here ] refcount_t: underflow; use-after-free. WARNING: CPU: 7 PID: 0 at /lib/refcount.c:28 refcount_warn_saturate+0xf4/0x148 Modules linked in: CPU: 7 PID: 0 Comm: swapper/7 Tainted: GT 6.5.13-yocto-standard #1 Hardware name: Unknown Unknown Product/Unknown Product, BIOS 2023.10 10/01/2023 pstate: 6149 (nZCv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=--) pc : refcount_warn_saturate+0xf4/0x148 lr : refcount_warn_saturate+0xf4/0x148 sp : ffc081703e10 x29: ffc081703e10 x28: ff88ff5d2b38 x27: 000a x26: x25: ffc0810d0008 x24: ffc0815d1518 x23: 0009 x22: ffc0814b8ac0 x21: ff88803e x20: x19: ff8882d44f00 x18: ffc082ddbc28 x17: ffc87e4f x16: ffc08170 x15: 0720072007200720 x14: 0720072007200720 x13: 0720072007200720 x12: 0720072007200720 x11: 0720072007200720 x10: ffc08149d368 x9 : ffc0800ae968 x8 : ffc081445368 x7 : efff x6 : 8000f000 x5 : x4 : x3 : x2 : x1 : x0 : ff88803e Call trace: refcount_warn_saturate+0xf4/0x148 ip6_dst_destroy+0x1c4/0x1e8 dst_destroy+0x48/0x1b8 dst_destroy_rcu+0x1c/0x30 rcu_core+0x2e8/0xa50 rcu_core_si+0x18/0x30 __do_softirq+0x118/0x394 do_softirq+0x18/0x30 call_on_irq_stack+0x24/0x58 do_softirq_own_stack+0x24/0x38 irq_exit_rcu+0x98/0xd8 el1_interrupt+0x38/0x68 el1h_64_irq_handler+0x18/0x28 el1h_64_irq+0x64/0x68 default_idle_call+0x74/0x140 do_idle+0x218/0x278 cpu_startup_entry+0x40/0x50 secondary_start_kernel+0x128/0x158 __secondary_switched+0xb8/0xc0 ---[ end trace ]--- done. Starting system message bus: dbus. Starting Connection Manager Starting Xserver Starting Dropbear SSH server: dropbear. Starting rpcbind daemon... X.Org X Server 1.21.1.11 X Protocol Version 11, Revision 0 Current Operating System: Linux fvp-base 6.5.13-yocto-standard #1 SMP PREEMPT Thu Dec 14 16:41:11 UTC 2023 aarch64 Kernel command line: BOOT_IMAGE=/Image root=PARTUUID=0fb89d8b-b627-4ac1-9e0d-474bb65140d2 rootwait rootwait rootfstype=ext4 Current version of pixman: 0.42.2 Before reporting problems, check http://wiki.x.org to make sure that you have the latest version. Markers: (--) probed, (**) from config file, (==) default setting, (++) from command line, (!!) notice, (II) informational, (WW) warning, (EE) error, (NI) not implemented, (??) unknown. (==) Log file: "/var/log/Xorg.0.log", Time: Tue Mar 12 19:41:29 2024 (==) Using system config directory "/usr/share/X11/xorg.conf.d" (EE) Fatal server error: (EE) no screens found(EE) (EE) Please consult the The X.Org Foundation support at http://wiki.x.org for help. (EE) Please also check the log file at "/var/log/Xorg.0.log" for additional information. (EE) (EE) Server terminated with error (1). Closing log file. done. [ cut here ] WARNING: CPU: 5 PID: 467 at /include/net/neighbour.h:522 ip6_finish_output2+0x5e4/0x768 Modules linked in: CPU: 5 PID: 467 Comm: xinit Tainted: GW T 6.5.13-yocto-standard #1 Hardware name: Unknown Unknown Product/Unknown Product, BIOS 2023.10 10/01/2023 pstate: a149 (NzCv daif +PAN -UAO -TCO +DIT -SSBS BTYPE=--) pc : ip6_finish_output2+0x5e4/0x768 lr : ip6_finish_output2+0x490/0x768 sp : ffc082e236f0 x29: ffc082e23730 x28: 2800 x27: ffc082e239b0 x26: ff8883f98000 x25: ff8880d745f0 x24: ff8880d74608 x23: ff8882de80e0 x22: dfdfdfd0 x21: dfdfdfcf x20: x19: ff88809f62a0 x18: 0014 x17: ca50a0b9 x16: 4f93a896 x15: 043a3fc2 x14: 966530e2 x13: 0100 x12: x11: a4790321 x10: 0003 x9 : ffc080c92fa0 x8 : x7 : f18eea13 x6 : de53d701 x5 : a4790321 x4 : 63ba84c0 x3 : ffc0815ab640 x2 : ff8882ff6740 x1 : 00f0 x0 : ff8880d745f0 Call trace: ip6_finish_output2+0x5e4/0x768 ip6_finish_output+0x1d8/0x388 ip6_output+0x80/0x1d0 ip6_xmit+0x47c/0x6e8
[linux-yocto] [linux-yocto v6.4+][PATCH] drm/fb-helper: move zeroing code to drm_fb_helper_fill_var
From: Jon Mason
__fill_var is used by both drm_fb_helper_check_var and
drm_fb_helper_fill_var. In drm_fb_helper_check_var, it is possible that
some of the variables in fb_info-> var which are currently being zero'ed
have pre-existing values. Zeroing these causes some fb tests to fail
with (from the Xorg.log):
[ 9.897] (II) Module fbdevhw: vendor="X.Org Foundation"
[ 9.897]compiled for 1.21.1.8, module version = 0.0.2
[ 9.897]ABI class: X.Org Video Driver, version 25.2
[ 9.898] (II) FBDEV(0): using default device
[ 9.901] (==) FBDEV(0): Depth 24, (==) framebuffer bpp 32
[ 9.902] (==) FBDEV(0): RGB weight 888
[ 9.902] (==) FBDEV(0): Default visual is TrueColor
[ 9.902] (==) FBDEV(0): Using gamma correction (1.0, 1.0, 1.0)
[ 9.902] (II) FBDEV(0): hardware: virtio_gpudrmfb (video memory:
4000kB)
[ 9.902] (DB) xf86MergeOutputClassOptions unsupported bus type 0
[ 9.903] (II) FBDEV(0): checking modes against framebuffer device...
[ 9.904] (II) FBDEV(0): mode "640x480" test failed
[ 9.904] (II) FBDEV(0): mode "640x480" test failed
[ 9.904] (II) FBDEV(0): mode "640x480" test failed
[ 9.904] (II) FBDEV(0): mode "640x480" test failed
[ 9.904] (II) FBDEV(0): mode "640x480" not found
[ 9.904] (II) FBDEV(0): checking modes against monitor...
[ 9.905] (II) FBDEV(0): Virtual size is 1280x800 (pitch 1280)
[ 9.905] (**) FBDEV(0): Built-in mode "current"
[ 9.905] (==) FBDEV(0): DPI set to (96, 96)
Previously, these values were not modified. Moving the zero'ing of the
variables to drm_fb_helper_fill_var resolves the issue.
Fixes: ee4cce0a8f03 ("drm/fb-helper: fix input validation gaps in check_var")
Signed-off-by: Jon Mason
---
drivers/gpu/drm/drm_fb_helper.c | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index fd27f1978635..ddc12c080dcc 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1548,8 +1548,6 @@ static void drm_fb_helper_fill_pixel_fmt(struct
fb_var_screeninfo *var,
static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info,
struct drm_framebuffer *fb)
{
- int i;
-
var->xres_virtual = fb->width;
var->yres_virtual = fb->height;
var->accel_flags = 0;
@@ -1557,15 +1555,6 @@ static void __fill_var(struct fb_var_screeninfo *var,
struct fb_info *info,
var->height = info->var.height;
var->width = info->var.width;
-
- var->left_margin = var->right_margin = 0;
- var->upper_margin = var->lower_margin = 0;
- var->hsync_len = var->vsync_len = 0;
- var->sync = var->vmode = 0;
- var->rotate = 0;
- var->colorspace = 0;
- for (i = 0; i < 4; i++)
- var->reserved[i] = 0;
}
/**
@@ -2059,6 +2048,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info,
{
struct drm_framebuffer *fb = fb_helper->fb;
const struct drm_format_info *format = fb->format;
+ int i;
switch (format->format) {
case DRM_FORMAT_C1:
@@ -2076,6 +2066,14 @@ static void drm_fb_helper_fill_var(struct fb_info *info,
info->pseudo_palette = fb_helper->pseudo_palette;
info->var.xoffset = 0;
info->var.yoffset = 0;
+ info->var.left_margin = info->var.right_margin = 0;
+ info->var.upper_margin = info->var.lower_margin = 0;
+ info->var.hsync_len = info->var.vsync_len = 0;
+ info->var.sync = info->var.vmode = 0;
+ info->var.rotate = 0;
+ info->var.colorspace = 0;
+ for (i = 0; i < 4; i++)
+ info->var.reserved[i] = 0;
__fill_var(>var, info, fb);
info->var.activate = FB_ACTIVATE_NOW;
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12944):
https://lists.yoctoproject.org/g/linux-yocto/message/12944
Mute This Topic: https://lists.yoctoproject.org/mt/100630659/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [yocto-kernel-cache][master/yocto-6.1 PATCH 2/2] efi: add ACPI enablement
/ATA On Wed, Mar 1, 2023 at 10:38 AM Bruce Ashfield wrote: > > Patch 1/2 looks fine, but 2/2 reverts the following commit: > > == > commit 41751659d0650c4effdd598f26febba39aeaf082 > Author: Andrei Gherzan > Date: Mon Aug 22 19:55:10 2022 +0200 > > efi.cfg: Drop ACPI dependency > > On X86 this will have no impact as CONFIG_ACPI is enabled by default. On > the other hand, ARM64 would be affected as they don't have the same > default. The defconfig for arm64 recommends CONFIG_ACPI and this patch > follows this recommendation in the qemuarm64 bsp configuration to fix > ACPI-only EFI boots on this arch. > > arm (32bit) would also be unaffected as there is no ACPI support there > at all. And this unconditional drop (CONFIG_ACPI) will actually fix a > configuration warning when enabling EFI on a arm (32bit) machine: > > [INFO]: config 'CONFIG_ACPI' was set, but it wasn't assignable, check > (parent) dependencies What's weird is that I'm not seeing this issue at all, and I'm compiling with and without efi enabled. See https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-kernel/linux/linux-yocto_%25.bbappend https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-kernel/linux/files/efi.cfg with edk2 (uefi) https://gitlab.com/jonmason00/meta-arm/-/jobs/3868649253 without edk2 (using u-boot) https://gitlab.com/jonmason00/meta-arm/-/jobs/3868649241 For giggles, I added the same efi.cfg to qemuarmv5 to see if it would cause an issue (as maybe the sstate is hiding the warnings), and I don't see it there either. Is there a better way than this to replicate it? Also, if this one is holding the other back, feel free to drop and I'll mess with it again later. Thanks, Jon > > Signed-off-by: Andrei Gherzan > Signed-off-by: Bruce Ashfield > > diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg > index ef8d3ed023d..03fdc58cccf 100644 > --- a/bsp/qemuarm64/qemuarm64.cfg > +++ b/bsp/qemuarm64/qemuarm64.cfg > @@ -32,3 +32,10 @@ CONFIG_RTC_DRV_PL031=y > # PCI configs, needed for virtio-rng (and others) > CONFIG_PCI=y >CONFIG_PCI_HOST_GENERIC=y >+ >+# arm64 defconfig suggests CONFIG_ACPI as default because it won't be > enabled >+# with CONFIG_EFI - even though ACPI-only ARM64 EFI boots would break >+# otherwise. We also do the same here as a sane default. >+CONFIG_ARCH_SUPPORTS_ACPI=y >+CONFIG_ACPI=y >+ >diff --git a/cfg/efi.cfg b/cfg/efi.cfg >index d3dfd603dc5..d729cbe9fc7 100644 >--- a/cfg/efi.cfg >+++ b/cfg/efi.cfg >@@ -3,7 +3,6 @@ > > # Dependencies > CONFIG_PCI=y > -CONFIG_ACPI=y > > # Enable basic EFI support > CONFIG_EFI=y > > === > > So what's the right path ? We could potentially declare the option > non-hardware so the warning doesn't come back. More BSPs may need > to have the option added to them, if we are seeing boot issues. But > constantly adding an option to many BSPs does indicate that it could > be enabled in a more generic place. > > We could also create an edk2 fragment, and just have it include > efi and add this option ? And then BSPs we want to support edk2 > could include that ? That at least gets us some abstraction and > assigns a meaningful name to the feature we are trying to enable. > > Bruce > > > In message: [yocto-kernel-cache][master/yocto-6.1 PATCH 2/2] efi: add ACPI > enablement > on 28/02/2023 Jon Mason wrote: > > > CONFIG_ACPI is needed for qemuarm and qemuarm64 kernels to boot edk2. > > Since this is only needed for edk2, add this to the efi config fragment. > > > > Signed-off-by: Jon Mason > > --- > > cfg/efi.cfg | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/cfg/efi.cfg b/cfg/efi.cfg > > index d729cbe9fc78..482e622bce97 100644 > > --- a/cfg/efi.cfg > > +++ b/cfg/efi.cfg > > @@ -8,3 +8,6 @@ CONFIG_PCI=y > > CONFIG_EFI=y > > CONFIG_EFI_STUB=y > > CONFIG_EFIVAR_FS=y > > + > > +# While you can do EFI with device tree, the vast majority do ACPI > > +CONFIG_ACPI=y > > -- > > 2.30.2 > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12210): https://lists.yoctoproject.org/g/linux-yocto/message/12210 Mute This Topic: https://lists.yoctoproject.org/mt/97296889/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [yocto-kernel-cache][master/yocto-6.1 PATCH 1/2] qemuarma15: add ARM_PATCH_PHYS_VIRT
As of the v6.1 kernel, ARM_PATCH_PHYS_VIRT is no longer being enabled by default. This is causing poky-tiny to not boot (as it automatically disables all features not explicitly enabled). Signed-off-by: Jon Mason --- bsp/qemuarma15/qemuarma15.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp/qemuarma15/qemuarma15.cfg b/bsp/qemuarma15/qemuarma15.cfg index 890ae9093962..3c40bd0a3409 100644 --- a/bsp/qemuarma15/qemuarma15.cfg +++ b/bsp/qemuarma15/qemuarma15.cfg @@ -7,6 +7,7 @@ CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12184): https://lists.yoctoproject.org/g/linux-yocto/message/12184 Mute This Topic: https://lists.yoctoproject.org/mt/97296888/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [yocto-kernel-cache][master/yocto-6.1 PATCH 2/2] efi: add ACPI enablement
CONFIG_ACPI is needed for qemuarm and qemuarm64 kernels to boot edk2. Since this is only needed for edk2, add this to the efi config fragment. Signed-off-by: Jon Mason --- cfg/efi.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cfg/efi.cfg b/cfg/efi.cfg index d729cbe9fc78..482e622bce97 100644 --- a/cfg/efi.cfg +++ b/cfg/efi.cfg @@ -8,3 +8,6 @@ CONFIG_PCI=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFIVAR_FS=y + +# While you can do EFI with device tree, the vast majority do ACPI +CONFIG_ACPI=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12185): https://lists.yoctoproject.org/g/linux-yocto/message/12185 Mute This Topic: https://lists.yoctoproject.org/mt/97296889/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [kernel-cache][PATCH v2 7/8] arm-versatile-926ejs: reorg for tiny and preempt-rt
On Wed, Apr 6, 2022 at 11:21 PM Bruce Ashfield wrote: > > > > On Thu, Mar 31, 2022 at 2:24 PM Jon Mason wrote: >> >> Make the necessary changes to get tiny and preempt-rt working again, as >> well as a general reorg to make things simpler. >> >> Signed-off-by: Jon Mason >> --- >> .../arm-versatile-926ejs-gfx.cfg | 16 ++- >> .../arm-versatile-926ejs-preempt-rt.cfg | 3 + >> .../arm-versatile-926ejs-preempt-rt.scc | 6 +- >> .../arm-versatile-926ejs-standard.scc | 1 - >> .../arm-versatile-926ejs-tiny.scc | 1 - >> .../arm-versatile-926ejs.cfg | 105 +- >> .../arm-versatile-926ejs.scc | 9 +- >> 7 files changed, 75 insertions(+), 66 deletions(-) >> create mode 100644 >> bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg >> >> diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg >> b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg >> index 5e7519e0dfe2..83c71ae6b03e 100644 >> --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg >> +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg >> @@ -1,8 +1,16 @@ >> # SPDX-License-Identifier: MIT >> +CONFIG_INPUT=y >> +CONFIG_USB_HID=y >> + >> +CONFIG_INPUT_MISC=y >> +CONFIG_INPUT_UINPUT=y >> + >> +CONFIG_DRM_PANEL=y >> +CONFIG_DRM_PANEL_ARM_VERSATILE=y >> +CONFIG_DRM_PL111=y >> + >> CONFIG_FB=y >> CONFIG_FB_ARMCLCD=y >> -CONFIG_FRAMEBUFFER_CONSOLE=y >> >> -CONFIG_INPUT_TABLET=y >> -CONFIG_HID_WACOM=y >> -CONFIG_INPUT_MISC=y >> +CONFIG_AUXDISPLAY=y >> +CONFIG_ARM_CHARLCD=y >> diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg >> b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg >> new file mode 100644 >> index ..8d4d4e2fc53b >> --- /dev/null >> +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg >> @@ -0,0 +1,3 @@ >> +# SPDX-License-Identifier: MIT >> +# CONFIG_LEDS_TRIGGER_CPU is not set >> +# CONFIG_FUNCTION_GRAPH_TRACER is not set >> diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc >> b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc >> index 8dbe0e8601f5..c1a9d34e4058 100644 >> --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc >> +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc >> @@ -1,10 +1,14 @@ >> # SPDX-License-Identifier: MIT >> define KMACHINE arm-versatile-926ejs >> define KMACHINE qemuarmv5 >> -define KMACHINE qemuarm >> define KTYPE preempt-rt >> define KARCH arm >> >> # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch >> include ktypes/preempt-rt/preempt-rt.scc >> +branch arm-versatile-926ejs >> + >> include arm-versatile-926ejs.scc >> +kconf hardware arm-versatile-926ejs-preempt-rt.cfg >> + >> +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch >> diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc >> b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc >> index 6edfe67bbd57..a88f385d2236 100644 >> --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc >> +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc >> @@ -1,7 +1,6 @@ >> # SPDX-License-Identifier: MIT >> define KMACHINE arm-versatile-926ejs >> define KMACHINE qemuarmv5 >> -define KMACHINE qemuarm >> define KTYPE standard >> define KARCH arm >> >> diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc >> b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc >> index d22969f0de5e..0fa5dae7ec99 100644 >> --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc >> +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc >> @@ -1,7 +1,6 @@ >> # SPDX-License-Identifier: MIT >> define KMACHINE arm-versatile-926ejs >> define KMACHINE qemuarmv5 >> -define KMACHINE qemuarm >> define KTYPE tiny >> define KARCH arm >> >> diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg >> b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg >> index 1f41220f9449..7cec7f886b9c 100644 >> --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg >> +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg >> @@ -1,78 +1,77 @@ >> # SPDX-License-Identifier: MIT >> -#..
Re: [linux-yocto] [kernel-cache][PATCH v2 0/8] poky-tiny fixes and cleanups
On Wed, Apr 6, 2022 at 11:06 PM Bruce Ashfield wrote: > > In message: [linux-yocto] [kernel-cache][PATCH v2 0/8] poky-tiny fixes and > cleanups > on 31/03/2022 Jon Mason wrote: > > > Changes in v2 > > * Removal of preempt-rt.scc and move of that change into the general > > qemuarma15.cfg file > > * Addition of SPDX headers where necessary > > * Clean-ups and minor changes requested by Bruce > > > > I believe I covered all of the comments, but please double check me. > > I did a rough test (with the other changes) in gitlab, and the results > > can be seen at https://gitlab.com/jonmason00/poky/-/pipelines/506117127 > > I did a scan, and everything does look to be addressed. > > I've queued this locally for a bit of extra testing, but otherwise, > it looks good to go. > > I'm assuming you are targetting the active kernel versions in master, > which means 5.10+ Yes, I'm not worried about legacy stuff. Thanks and sorry about taking so long for a v2. Thanks, Jon > > Bruce > > > > > --- > > > > This series is to get poky-tiny working for qemuarmv5, qemuarm, and > > qemuarm64 (which was added in parallel while I was developing this > > series), as well as the resulting fallout from building and testing > > qemux86 and qemux86-64. There will be additional patches needed in > > oe-core, etc to use these. With these patches and the patches to > > oe-core/poky, I am able to run a limited testimage on all of the arm > > and x86 qemu machines for poky-tiny, rt, and regular kernel. > > > > Thanks, > > Jon > > > > > > Jon Mason (7): > > x2apic: enable iommu for tiny > > common-pc: add CONFIG_ISA_DMA_API for tiny > > virtio: Add prereqs for tiny > > pci: remove CONFIG_PCI_MMCONFIG > > qemuarma15: fix tiny and preempt-rt > > arm-versatile-926ejs: reorg for tiny and preempt-rt > > qemuarm64: cleanup for tiny enablement > > > > Jon Mason via lists.yoctoproject.org (1): > > tiny: make more generic > > > > .../arm-versatile-926ejs-gfx.cfg | 16 ++- > > .../arm-versatile-926ejs-preempt-rt.cfg | 3 + > > .../arm-versatile-926ejs-preempt-rt.scc | 6 +- > > .../arm-versatile-926ejs-standard.scc | 1 - > > .../arm-versatile-926ejs-tiny.scc | 1 - > > .../arm-versatile-926ejs.cfg | 105 +- > > .../arm-versatile-926ejs.scc | 9 +- > > bsp/common-pc/common-pc-drivers.cfg | 1 + > > bsp/qemuarm64/qemuarm64-gfx.cfg | 9 +- > > bsp/qemuarm64/qemuarm64-preempt-rt.scc| 1 - > > bsp/qemuarm64/qemuarm64-standard.scc | 2 - > > bsp/qemuarm64/qemuarm64-tiny.scc | 5 +- > > bsp/qemuarm64/qemuarm64.cfg | 1 + > > bsp/qemuarm64/qemuarm64.scc | 5 + > > bsp/qemuarma15/qemuarma15-gfx.cfg | 7 +- > > bsp/qemuarma15/qemuarma15-preempt-rt.scc | 5 +- > > bsp/qemuarma15/qemuarma15-standard.scc| 7 +- > > bsp/qemuarma15/qemuarma15-tiny.cfg| 20 > > bsp/qemuarma15/qemuarma15-tiny.scc| 9 -- > > bsp/qemuarma15/qemuarma15.cfg | 10 +- > > bsp/qemuarma15/qemuarma15.scc | 7 ++ > > cfg/virtio.cfg| 7 ++ > > features/debug/printk.cfg | 3 - > > features/pci/pci.cfg | 4 - > > features/x2apic/x2apic.cfg| 2 + > > ktypes/tiny/tiny.cfg | 6 +- > > ktypes/tiny/yocto.cfg | 1 - > > 27 files changed, 114 insertions(+), 139 deletions(-) > > create mode 100644 > > bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > delete mode 100644 bsp/qemuarma15/qemuarma15-tiny.cfg > > > > -- > > 2.30.2 > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11136): https://lists.yoctoproject.org/g/linux-yocto/message/11136 Mute This Topic: https://lists.yoctoproject.org/mt/90161227/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH v2 8/8] qemuarm64: cleanup for tiny enablement
Move the USB and VIRTIO GPU stuff out of gfx, as those should be handled in the usb and virtio scc files. Add the PCI scc for virtio (which thinks it's PCI on this QEMU setup), and add a tiny.scc/cfg to get tiny working. Also, EARLY_PRINTK does not exist for arm64. So remove those from the common configs. Signed-off-by: Jon Mason --- bsp/qemuarm64/qemuarm64-gfx.cfg| 9 + bsp/qemuarm64/qemuarm64-preempt-rt.scc | 1 - bsp/qemuarm64/qemuarm64-standard.scc | 2 -- bsp/qemuarm64/qemuarm64-tiny.scc | 5 + bsp/qemuarm64/qemuarm64.cfg| 1 + bsp/qemuarm64/qemuarm64.scc| 5 + features/debug/printk.cfg | 3 --- ktypes/tiny/yocto.cfg | 1 - 8 files changed, 8 insertions(+), 19 deletions(-) diff --git a/bsp/qemuarm64/qemuarm64-gfx.cfg b/bsp/qemuarm64/qemuarm64-gfx.cfg index 193ff9850d22..ceae36c5831f 100644 --- a/bsp/qemuarm64/qemuarm64-gfx.cfg +++ b/bsp/qemuarm64/qemuarm64-gfx.cfg @@ -1,11 +1,4 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y -CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y - -CONFIG_DRM=y -CONFIG_DRM_VIRTIO_GPU=y - +CONFIG_INPUT=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarm64/qemuarm64-preempt-rt.scc b/bsp/qemuarm64/qemuarm64-preempt-rt.scc index f2004be0e44a..8705450152f7 100644 --- a/bsp/qemuarm64/qemuarm64-preempt-rt.scc +++ b/bsp/qemuarm64/qemuarm64-preempt-rt.scc @@ -6,7 +6,6 @@ define KARCH arm64 # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-standard.scc b/bsp/qemuarm64/qemuarm64-standard.scc index 361f4a20639f..17bc7bb60fa6 100644 --- a/bsp/qemuarm64/qemuarm64-standard.scc +++ b/bsp/qemuarm64/qemuarm64-standard.scc @@ -4,9 +4,7 @@ define KTYPE standard define KARCH arm64 include ktypes/standard/standard.scc -branch qemuarm64 -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-tiny.scc b/bsp/qemuarm64/qemuarm64-tiny.scc index 0ec933dc5d05..e4928b43416e 100644 --- a/bsp/qemuarm64/qemuarm64-tiny.scc +++ b/bsp/qemuarm64/qemuarm64-tiny.scc @@ -4,11 +4,8 @@ define KTYPE tiny define KARCH arm64 include ktypes/tiny/tiny.scc -branch qemuarm64 -include cfg/virtio.scc -include cfg/fs/ext4.scc include qemuarm64.scc # enable the ability to run 32 bit apps -include arch/arm/32bit-compat.scc \ No newline at end of file +include arch/arm/32bit-compat.scc diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg index ef8d3ed023de..2412d24e6258 100644 --- a/bsp/qemuarm64/qemuarm64.cfg +++ b/bsp/qemuarm64/qemuarm64.cfg @@ -14,6 +14,7 @@ CONFIG_ARM_AMBA=y # # Non-8250 serial port support # +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/bsp/qemuarm64/qemuarm64.scc b/bsp/qemuarm64/qemuarm64.scc index dee5741eb2a1..f6c5d07318c9 100644 --- a/bsp/qemuarm64/qemuarm64.scc +++ b/bsp/qemuarm64/qemuarm64.scc @@ -1,3 +1,8 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarm64.cfg kconf hardware qemuarm64-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/virtio.scc diff --git a/features/debug/printk.cfg b/features/debug/printk.cfg index 0df20f914836..5beb425f73ae 100644 --- a/features/debug/printk.cfg +++ b/features/debug/printk.cfg @@ -5,8 +5,5 @@ CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=y - -CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EFI_EARLYCON=y CONFIG_TTY_PRINTK=y diff --git a/ktypes/tiny/yocto.cfg b/ktypes/tiny/yocto.cfg index 2e51a7d73c6e..e891070b83c4 100644 --- a/ktypes/tiny/yocto.cfg +++ b/ktypes/tiny/yocto.cfg @@ -20,7 +20,6 @@ CONFIG_RT_MUTEXES=y # Basic logging facilities CONFIG_PRINTK=y -CONFIG_EARLY_PRINTK=y CONFIG_PRINTK_TIME=y # Provide a minimal dynamic device fs -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6): https://lists.yoctoproject.org/g/linux-yocto/message/6 Mute This Topic: https://lists.yoctoproject.org/mt/90161236/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH v2 7/8] arm-versatile-926ejs: reorg for tiny and preempt-rt
Make the necessary changes to get tiny and preempt-rt working again, as well as a general reorg to make things simpler. Signed-off-by: Jon Mason --- .../arm-versatile-926ejs-gfx.cfg | 16 ++- .../arm-versatile-926ejs-preempt-rt.cfg | 3 + .../arm-versatile-926ejs-preempt-rt.scc | 6 +- .../arm-versatile-926ejs-standard.scc | 1 - .../arm-versatile-926ejs-tiny.scc | 1 - .../arm-versatile-926ejs.cfg | 105 +- .../arm-versatile-926ejs.scc | 9 +- 7 files changed, 75 insertions(+), 66 deletions(-) create mode 100644 bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg index 5e7519e0dfe2..83c71ae6b03e 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg @@ -1,8 +1,16 @@ # SPDX-License-Identifier: MIT +CONFIG_INPUT=y +CONFIG_USB_HID=y + +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y + +CONFIG_DRM_PANEL=y +CONFIG_DRM_PANEL_ARM_VERSATILE=y +CONFIG_DRM_PL111=y + CONFIG_FB=y CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_INPUT_TABLET=y -CONFIG_HID_WACOM=y -CONFIG_INPUT_MISC=y +CONFIG_AUXDISPLAY=y +CONFIG_ARM_CHARLCD=y diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg new file mode 100644 index ..8d4d4e2fc53b --- /dev/null +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +# CONFIG_LEDS_TRIGGER_CPU is not set +# CONFIG_FUNCTION_GRAPH_TRACER is not set diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc index 8dbe0e8601f5..c1a9d34e4058 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc @@ -1,10 +1,14 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE preempt-rt define KARCH arm # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc +branch arm-versatile-926ejs + include arm-versatile-926ejs.scc +kconf hardware arm-versatile-926ejs-preempt-rt.cfg + +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc index 6edfe67bbd57..a88f385d2236 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE standard define KARCH arm diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc index d22969f0de5e..0fa5dae7ec99 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE tiny define KARCH arm diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg index 1f41220f9449..7cec7f886b9c 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg @@ -1,78 +1,77 @@ # SPDX-License-Identifier: MIT -#. -#WARNING -# -# This file is a kernel configuration fragment, and not a full kernel -# configuration file. The final kernel configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on kernel configuration, please -# consult the product documentation. -# -#. -CONFIG_ARM=y -CONFIG_ARM_AMBA=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=n +CONFIG_ARCH_MULTI_V6=n CONFIG_ARCH_MULTI_V5=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_PCI_VERSATILE=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_ABRT_EV5TJ=y CONFIG_ARCH_VERSATILE=y +CONFIG_PLAT_VERSATILE=y +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_FPE_NWFPE=y CONFIG_VFP=y - -# CONFIG_PHYLIB is not set - +CONFIG_CMA=y
[linux-yocto] [kernel-cache][PATCH v2 6/8] qemuarma15: fix tiny and preempt-rt
Reorganize enablements to get tiny and preempt-rt working again, as well as a general clean-up. Many of the tiny things were moved into the general config, as it won't hurt to have it there and it keeps the tiny config smaller. Signed-off-by: Jon Mason --- bsp/qemuarma15/qemuarma15-gfx.cfg| 7 +-- bsp/qemuarma15/qemuarma15-preempt-rt.scc | 5 + bsp/qemuarma15/qemuarma15-standard.scc | 7 +-- bsp/qemuarma15/qemuarma15-tiny.cfg | 20 bsp/qemuarma15/qemuarma15-tiny.scc | 9 - bsp/qemuarma15/qemuarma15.cfg| 10 -- bsp/qemuarma15/qemuarma15.scc| 7 +++ 7 files changed, 18 insertions(+), 47 deletions(-) delete mode 100644 bsp/qemuarma15/qemuarma15-tiny.cfg diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg b/bsp/qemuarma15/qemuarma15-gfx.cfg index 193ff9850d22..c3e36f0da75d 100644 --- a/bsp/qemuarma15/qemuarma15-gfx.cfg +++ b/bsp/qemuarma15/qemuarma15-gfx.cfg @@ -1,11 +1,6 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y +CONFIG_INPUT=y CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y - -CONFIG_DRM=y -CONFIG_DRM_VIRTIO_GPU=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.scc b/bsp/qemuarma15/qemuarma15-preempt-rt.scc index 216757bb016b..18bbbd4690e8 100644 --- a/bsp/qemuarma15/qemuarma15-preempt-rt.scc +++ b/bsp/qemuarma15/qemuarma15-preempt-rt.scc @@ -3,11 +3,8 @@ define KMACHINE qemuarma15 define KTYPE preempt-rt define KARCH arm -# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +include features/pci/pci.scc diff --git a/bsp/qemuarma15/qemuarma15-standard.scc b/bsp/qemuarma15/qemuarma15-standard.scc index cdee6332c35f..b3210ed900f4 100644 --- a/bsp/qemuarma15/qemuarma15-standard.scc +++ b/bsp/qemuarma15/qemuarma15-standard.scc @@ -4,12 +4,7 @@ define KTYPE standard define KARCH arm include ktypes/standard/standard.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +include features/pci/pci.scc diff --git a/bsp/qemuarma15/qemuarma15-tiny.cfg b/bsp/qemuarma15/qemuarma15-tiny.cfg deleted file mode 100644 index ed47939f0a62.. --- a/bsp/qemuarma15/qemuarma15-tiny.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: MIT -CONFIG_MMU=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_V7=y - -CONFIG_ARM_AMBA=y - -CONFIG_ARM_THUMB=y -CONFIG_KUSER_HELPERS=y -CONFIG_OABI_COMPAT=y -CONFIG_EXT4_FS=y - -# to keep things small, you really don't want these on. But to -# keep qemuarm's hvc0 console happy, we have them on for now -CONFIG_TTY=y -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_HVC_DRIVER=y diff --git a/bsp/qemuarma15/qemuarma15-tiny.scc b/bsp/qemuarma15/qemuarma15-tiny.scc index 406f811145fa..331dbbba3a0b 100644 --- a/bsp/qemuarma15/qemuarma15-tiny.scc +++ b/bsp/qemuarma15/qemuarma15-tiny.scc @@ -4,14 +4,5 @@ define KTYPE tiny define KARCH arm include ktypes/tiny/tiny.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc - - -kconf hardware qemuarma15-tiny.cfg diff --git a/bsp/qemuarma15/qemuarma15.cfg b/bsp/qemuarma15/qemuarma15.cfg index 32187155d2a0..df8181ff5061 100644 --- a/bsp/qemuarma15/qemuarma15.cfg +++ b/bsp/qemuarma15/qemuarma15.cfg @@ -1,4 +1,7 @@ # SPDX-License-Identifier: MIT +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_VIRT=y CONFIG_SMP=y CONFIG_NR_CPUS=8 @@ -8,6 +11,7 @@ CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_HW_RANDOM=y @@ -28,6 +32,8 @@ CONFIG_CRYPTO_GHASH_ARM_CE=y CONFIG_CRYPTO_CRC32_ARM_CE=y CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_ARM_LPAE=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y CONFIG_HIGHMEM=y +CONFIG_ARM_AMBA=y +CONFIG_ARM_THUMB=y + +# CONFIG_FUNCTION_GRAPH_TRACER is not set diff --git a/bsp/qemuarma15/qemuarma15.scc b/bsp/qemuarma15/qemuarma15.scc index 68d9e710a258..ff3da3702bb6 100644 --- a/bsp/qemuarma15/qemuarma15.scc +++ b/bsp/qemuarma15/qemuarma15.scc @@ -1,3 +1,10 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarma15.cfg kconf hardware qemuarma15-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc + +include cfg/virtio.scc +include cfg/dmaengine.scc +include cfg/timer/rtc.scc -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#4): https://lists.yoctoproject.org/g/linux-yocto
[linux-yocto] [kernel-cache][PATCH v2 5/8] tiny: make more generic
From: "Jon Mason via lists.yoctoproject.org" Remove CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_START, as they are x86 specific (and currently the defaults are being set). Also, add CONFIG_VT and CONFIG_POSIX_TIMERS, as they are generic and needed by default (due to default n turning them off for tiny). Signed-off-by: Jon Mason --- ktypes/tiny/tiny.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ktypes/tiny/tiny.cfg b/ktypes/tiny/tiny.cfg index 4a7b23dfa325..11752d0678f3 100644 --- a/ktypes/tiny/tiny.cfg +++ b/ktypes/tiny/tiny.cfg @@ -11,9 +11,6 @@ CONFIG_SLUB=y CONFIG_BASE_SMALL=1 -CONFIG_PHYSICAL_START=0x100 -CONFIG_PHYSICAL_ALIGN=0x100 - # -15% of bzImage size over gz CONFIG_KERNEL_LZMA=y @@ -31,3 +28,6 @@ CONFIG_BINFMT_SCRIPT=y # Support /proc/sys CONFIG_PROC_SYSCTL=y + +CONFIG_VT=y +CONFIG_POSIX_TIMERS=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#3): https://lists.yoctoproject.org/g/linux-yocto/message/3 Mute This Topic: https://lists.yoctoproject.org/mt/90161232/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH v2 2/8] common-pc: add CONFIG_ISA_DMA_API for tiny
CONFIG_BLK_DEV_FD has a dependency on CONFIG_ISA_DMA_API, otherwise a kernel config warning will be logged and it will not be enabled. Signed-off-by: Jon Mason --- bsp/common-pc/common-pc-drivers.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp/common-pc/common-pc-drivers.cfg b/bsp/common-pc/common-pc-drivers.cfg index e511c94428a7..5e2018d6aac0 100644 --- a/bsp/common-pc/common-pc-drivers.cfg +++ b/bsp/common-pc/common-pc-drivers.cfg @@ -54,6 +54,7 @@ CONFIG_I2C_I801=y CONFIG_SATA_AHCI=y +CONFIG_ISA_DMA_API=y CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#0): https://lists.yoctoproject.org/g/linux-yocto/message/0 Mute This Topic: https://lists.yoctoproject.org/mt/90161229/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH v2 4/8] pci: remove CONFIG_PCI_MMCONFIG
CONFIG_PCI_MMCONFIG is x86 specific and the default is 'y'. Remove it from the generic PCI config, as it causes warnings without adding anything. Signed-off-by: Jon Mason --- features/pci/pci.cfg | 4 1 file changed, 4 deletions(-) diff --git a/features/pci/pci.cfg b/features/pci/pci.cfg index f3c57c54d70f..124824dcb35e 100644 --- a/features/pci/pci.cfg +++ b/features/pci/pci.cfg @@ -1,12 +1,8 @@ # SPDX-License-Identifier: MIT CONFIG_PCI=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MSI=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_PCIE is not set - - - -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#2): https://lists.yoctoproject.org/g/linux-yocto/message/2 Mute This Topic: https://lists.yoctoproject.org/mt/90161231/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH v2 3/8] virtio: Add prereqs for tiny
The default 'n' of tiny is causing some of the prerequisites for the virtio drivers to not be enabled. Add them here so that they will work if enabled in a tiny config. Signed-off-by: Jon Mason --- cfg/virtio.cfg | 7 +++ 1 file changed, 7 insertions(+) diff --git a/cfg/virtio.cfg b/cfg/virtio.cfg index 938d2da51e8c..0ef99c6b8bb0 100644 --- a/cfg/virtio.cfg +++ b/cfg/virtio.cfg @@ -1,16 +1,23 @@ # SPDX-License-Identifier: MIT CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y +CONFIG_NET=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y +CONFIG_BLK_MQ_VIRTIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_INPUT=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_SCSI=y +CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_VIRTIO=y +CONFIG_CRYPTO=y CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y CONFIG_VSOCKETS=y CONFIG_VSOCKETS_DIAG=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#1): https://lists.yoctoproject.org/g/linux-yocto/message/1 Mute This Topic: https://lists.yoctoproject.org/mt/90161230/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH v2 0/8] poky-tiny fixes and cleanups
Changes in v2 * Removal of preempt-rt.scc and move of that change into the general qemuarma15.cfg file * Addition of SPDX headers where necessary * Clean-ups and minor changes requested by Bruce I believe I covered all of the comments, but please double check me. I did a rough test (with the other changes) in gitlab, and the results can be seen at https://gitlab.com/jonmason00/poky/-/pipelines/506117127 --- This series is to get poky-tiny working for qemuarmv5, qemuarm, and qemuarm64 (which was added in parallel while I was developing this series), as well as the resulting fallout from building and testing qemux86 and qemux86-64. There will be additional patches needed in oe-core, etc to use these. With these patches and the patches to oe-core/poky, I am able to run a limited testimage on all of the arm and x86 qemu machines for poky-tiny, rt, and regular kernel. Thanks, Jon Jon Mason (7): x2apic: enable iommu for tiny common-pc: add CONFIG_ISA_DMA_API for tiny virtio: Add prereqs for tiny pci: remove CONFIG_PCI_MMCONFIG qemuarma15: fix tiny and preempt-rt arm-versatile-926ejs: reorg for tiny and preempt-rt qemuarm64: cleanup for tiny enablement Jon Mason via lists.yoctoproject.org (1): tiny: make more generic .../arm-versatile-926ejs-gfx.cfg | 16 ++- .../arm-versatile-926ejs-preempt-rt.cfg | 3 + .../arm-versatile-926ejs-preempt-rt.scc | 6 +- .../arm-versatile-926ejs-standard.scc | 1 - .../arm-versatile-926ejs-tiny.scc | 1 - .../arm-versatile-926ejs.cfg | 105 +- .../arm-versatile-926ejs.scc | 9 +- bsp/common-pc/common-pc-drivers.cfg | 1 + bsp/qemuarm64/qemuarm64-gfx.cfg | 9 +- bsp/qemuarm64/qemuarm64-preempt-rt.scc| 1 - bsp/qemuarm64/qemuarm64-standard.scc | 2 - bsp/qemuarm64/qemuarm64-tiny.scc | 5 +- bsp/qemuarm64/qemuarm64.cfg | 1 + bsp/qemuarm64/qemuarm64.scc | 5 + bsp/qemuarma15/qemuarma15-gfx.cfg | 7 +- bsp/qemuarma15/qemuarma15-preempt-rt.scc | 5 +- bsp/qemuarma15/qemuarma15-standard.scc| 7 +- bsp/qemuarma15/qemuarma15-tiny.cfg| 20 bsp/qemuarma15/qemuarma15-tiny.scc| 9 -- bsp/qemuarma15/qemuarma15.cfg | 10 +- bsp/qemuarma15/qemuarma15.scc | 7 ++ cfg/virtio.cfg| 7 ++ features/debug/printk.cfg | 3 - features/pci/pci.cfg | 4 - features/x2apic/x2apic.cfg| 2 + ktypes/tiny/tiny.cfg | 6 +- ktypes/tiny/yocto.cfg | 1 - 27 files changed, 114 insertions(+), 139 deletions(-) create mode 100644 bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg delete mode 100644 bsp/qemuarma15/qemuarma15-tiny.cfg -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11108): https://lists.yoctoproject.org/g/linux-yocto/message/11108 Mute This Topic: https://lists.yoctoproject.org/mt/90161227/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH v2 1/8] x2apic: enable iommu for tiny
IOMMU_SUPPORT is needed by tiny for CONFIG_X86_X2APIC to be enabled, otherwise a kernel config warning will be logged. Signed-off-by: Jon Mason --- features/x2apic/x2apic.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/features/x2apic/x2apic.cfg b/features/x2apic/x2apic.cfg index ca91dc0d25ac..8efa10f86bc4 100644 --- a/features/x2apic/x2apic.cfg +++ b/features/x2apic/x2apic.cfg @@ -1,3 +1,5 @@ # SPDX-License-Identifier: MIT + +CONFIG_IOMMU_SUPPORT=y CONFIG_IRQ_REMAP=y CONFIG_X86_X2APIC=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11109): https://lists.yoctoproject.org/g/linux-yocto/message/11109 Mute This Topic: https://lists.yoctoproject.org/mt/90161228/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [kernel-cache][PATCH 0/8] poky-tiny fixes and cleanups
On Wed, Feb 9, 2022 at 5:09 PM Bruce Ashfield wrote: > > In message: [linux-yocto] [kernel-cache][PATCH 0/8] poky-tiny fixes and > cleanups > on 08/02/2022 Jon Mason wrote: > > > This series is to get poky-tiny working for qemuarmv5, qemuarm, and > > qemuarm64 (which was added in parallel while I was developing this > > series), as well as the resulting fallout from building and testing > > qemux86 and qemux86-64. There will be additional patches needed in > > oe-core, etc to use these. With these patches and the patches to > > oe-core/poky, I am able to run a limited testimage on all of the arm > > and x86 qemu machines for poky-tiny, rt, and regular kernel. > > A few comments from me, nothing major. Just a few tweaks and it > looks good to go. If I didn't comment on a patch, I had no issues > with it. So sorry for not seeing this sooner. It got lost in my inbox due to threading :( I've responded to the two that had comments and I'll do my best to get the turnaround to your responses in less than 2 months :) Thanks, Jon > > Bruce > > > > > Thanks, > > Jon > > > > Jon Mason (8): > > x2apic: enable iommu for tiny > > common-pc: add CONFIG_ISA_DMA_API for tiny > > virtio: Add prereqs for tiny > > pci: remove CONFIG_PCI_MMCONFIG > > tiny: make more generic > > qemuarma15: fix tiny and preempt-rt > > arm-versatile-926ejs: reorg for tiny and preempt-rt > > qemuarm64: cleanup for tiny enablement > > > > .../arm-versatile-926ejs-gfx.cfg | 16 ++- > > .../arm-versatile-926ejs-preempt-rt.cfg | 2 + > > .../arm-versatile-926ejs-preempt-rt.scc | 5 +- > > .../arm-versatile-926ejs-standard.scc | 3 - > > .../arm-versatile-926ejs-tiny.scc | 2 - > > .../arm-versatile-926ejs.cfg | 106 +- > > .../arm-versatile-926ejs.scc | 11 +- > > bsp/arm-versatile-926ejs/hardware.cfg | 9 -- > > bsp/common-pc/common-pc-drivers.cfg | 1 + > > bsp/qemuarm64/qemuarm64-gfx.cfg | 9 +- > > bsp/qemuarm64/qemuarm64-preempt-rt.scc| 1 - > > bsp/qemuarm64/qemuarm64-standard.scc | 2 - > > bsp/qemuarm64/qemuarm64-tiny.scc | 5 +- > > bsp/qemuarm64/qemuarm64.cfg | 1 + > > bsp/qemuarm64/qemuarm64.scc | 5 + > > bsp/qemuarma15/qemuarma15-gfx.cfg | 7 +- > > bsp/qemuarma15/qemuarma15-preempt-rt.cfg | 1 + > > bsp/qemuarma15/qemuarma15-preempt-rt.scc | 6 +- > > bsp/qemuarma15/qemuarma15-standard.scc| 7 +- > > bsp/qemuarma15/qemuarma15-tiny.cfg| 20 > > bsp/qemuarma15/qemuarma15-tiny.scc| 9 -- > > bsp/qemuarma15/qemuarma15.cfg | 8 +- > > bsp/qemuarma15/qemuarma15.scc | 7 ++ > > cfg/virtio.cfg| 7 ++ > > features/debug/printk.cfg | 3 - > > features/pci/pci.cfg | 4 - > > features/x2apic/x2apic.cfg| 2 + > > ktypes/tiny/tiny.cfg | 6 +- > > ktypes/tiny/yocto.cfg | 1 - > > 29 files changed, 116 insertions(+), 150 deletions(-) > > create mode 100644 > > bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > delete mode 100644 bsp/arm-versatile-926ejs/hardware.cfg > > create mode 100644 bsp/qemuarma15/qemuarma15-preempt-rt.cfg > > delete mode 100644 bsp/qemuarma15/qemuarma15-tiny.cfg > > > > -- > > 2.30.2 > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11101): https://lists.yoctoproject.org/g/linux-yocto/message/11101 Mute This Topic: https://lists.yoctoproject.org/mt/88998535/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [kernel-cache][PATCH 7/8] arm-versatile-926ejs: reorg for tiny and preempt-rt
On Wed, Feb 9, 2022 at 5:00 PM Bruce Ashfield wrote: > > In message: [linux-yocto] [kernel-cache][PATCH 7/8] arm-versatile-926ejs: > reorg for tiny and preempt-rt > on 08/02/2022 Jon Mason wrote: > > > Make the necessary changes to get tiny and preempt-rt working again, as > > well as a general reorg to make things simpler. > > > > Signed-off-by: Jon Mason > > --- > > .../arm-versatile-926ejs-gfx.cfg | 16 ++- > > .../arm-versatile-926ejs-preempt-rt.cfg | 2 + > > .../arm-versatile-926ejs-preempt-rt.scc | 5 +- > > .../arm-versatile-926ejs-standard.scc | 3 - > > .../arm-versatile-926ejs-tiny.scc | 2 - > > .../arm-versatile-926ejs.cfg | 106 +- > > .../arm-versatile-926ejs.scc | 11 +- > > bsp/arm-versatile-926ejs/hardware.cfg | 9 -- > > 8 files changed, 77 insertions(+), 77 deletions(-) > > create mode 100644 > > bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > delete mode 100644 bsp/arm-versatile-926ejs/hardware.cfg > > > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > index 5e7519e0dfe2..83c71ae6b03e 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > > @@ -1,8 +1,16 @@ > > # SPDX-License-Identifier: MIT > > +CONFIG_INPUT=y > > +CONFIG_USB_HID=y > > + > > +CONFIG_INPUT_MISC=y > > +CONFIG_INPUT_UINPUT=y > > + > > +CONFIG_DRM_PANEL=y > > +CONFIG_DRM_PANEL_ARM_VERSATILE=y > > +CONFIG_DRM_PL111=y > > + > > CONFIG_FB=y > > CONFIG_FB_ARMCLCD=y > > -CONFIG_FRAMEBUFFER_CONSOLE=y > > > > -CONFIG_INPUT_TABLET=y > > -CONFIG_HID_WACOM=y > > -CONFIG_INPUT_MISC=y > > +CONFIG_AUXDISPLAY=y > > +CONFIG_ARM_CHARLCD=y > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > new file mode 100644 > > index ..02840f431a0c > > --- /dev/null > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > It's minor, but we were asked to put a SPDX header on all the files in > the kernel-cache, so this would need one. > > > @@ -0,0 +1,2 @@ > > +CONFIG_LEDS_TRIGGER_CPU=n > > +CONFIG_FUNCTION_GRAPH_TRACER=n > > And for clearing a value, it's old school in the yocto kernel land and > everything (for the most part), uses "# CONFIG_FOO is not set" for > these (versus =n) > > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > index 8dbe0e8601f5..6170625eed62 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > > @@ -1,10 +1,13 @@ > > # SPDX-License-Identifier: MIT > > define KMACHINE arm-versatile-926ejs > > define KMACHINE qemuarmv5 > > -define KMACHINE qemuarm > > define KTYPE preempt-rt > > define KARCH arm > > > > # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc > > branch > > include ktypes/preempt-rt/preempt-rt.scc > > + > > include arm-versatile-926ejs.scc > > +kconf hardware arm-versatile-926ejs-preempt-rt.cfg > > + > > +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch > > This will apply the patch to the common prempt-rt branch, which is > what we've avoided for the versatile patches in the past, so we can > have a 'branch' statement before the patch to be safe (see my comment > below for more context). I was attempting to merge all the random stuff into the main branch, but if there is logic to not do so then I can undo this change. It's probably worth opening a bug to track why this isn't usptreamed, as this platform is very old. > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > index 6edfe67bbd57..2e4f06e2c370 100644 > > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > > @@ -1,13 +1,10 @@ > > # SPDX-License-Identifier: MIT > > define KMACHINE arm-versatile-926ejs > > define KMACHINE qemuarmv5 > > -define KMACHINE qemuarm > > define KTYPE standard > > define KARCH arm > > > > include ktypes/s
Re: [linux-yocto] [kernel-cache][PATCH 6/8] qemuarma15: fix tiny and preempt-rt
On Wed, Feb 9, 2022 at 5:08 PM Bruce Ashfield wrote: > > In message: [linux-yocto] [kernel-cache][PATCH 6/8] qemuarma15: fix tiny and > preempt-rt > on 08/02/2022 Jon Mason wrote: > > > Reorganize enablements to get tiny and preempt-rt working again, as well > > as a general clean-up. Many of the tiny things were moved into the > > general config, as it won't hurt to have it there and it keeps the tiny > > config smaller. > > > > Signed-off-by: Jon Mason > > --- > > bsp/qemuarma15/qemuarma15-gfx.cfg| 7 +-- > > bsp/qemuarma15/qemuarma15-preempt-rt.cfg | 1 + > > bsp/qemuarma15/qemuarma15-preempt-rt.scc | 6 ++ > > bsp/qemuarma15/qemuarma15-standard.scc | 7 +-- > > bsp/qemuarma15/qemuarma15-tiny.cfg | 20 > > bsp/qemuarma15/qemuarma15-tiny.scc | 9 - > > bsp/qemuarma15/qemuarma15.cfg| 8 ++-- > > bsp/qemuarma15/qemuarma15.scc| 7 +++ > > 8 files changed, 18 insertions(+), 47 deletions(-) > > create mode 100644 bsp/qemuarma15/qemuarma15-preempt-rt.cfg > > delete mode 100644 bsp/qemuarma15/qemuarma15-tiny.cfg > > > > diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg > > b/bsp/qemuarma15/qemuarma15-gfx.cfg > > index 193ff9850d22..c3e36f0da75d 100644 > > --- a/bsp/qemuarma15/qemuarma15-gfx.cfg > > +++ b/bsp/qemuarma15/qemuarma15-gfx.cfg > > @@ -1,11 +1,6 @@ > > # SPDX-License-Identifier: MIT > > -CONFIG_INPUT_TABLET=y > > -CONFIG_USB=y > > +CONFIG_INPUT=y > > CONFIG_USB_HID=y > > -CONFIG_USB_XHCI_HCD=y > > - > > -CONFIG_DRM=y > > -CONFIG_DRM_VIRTIO_GPU=y > > > > CONFIG_INPUT_MISC=y > > CONFIG_INPUT_UINPUT=y > > diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.cfg > > b/bsp/qemuarma15/qemuarma15-preempt-rt.cfg > > new file mode 100644 > > index ..74cd6a0c1073 > > --- /dev/null > > +++ b/bsp/qemuarma15/qemuarma15-preempt-rt.cfg > > @@ -0,0 +1 @@ > > +CONFIG_FUNCTION_GRAPH_TRACER=n > > The header will be bigger than the fragment, but we should still put the SPDX > header. > > > diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.scc > > b/bsp/qemuarma15/qemuarma15-preempt-rt.scc > > index 216757bb016b..a893e110d22f 100644 > > --- a/bsp/qemuarma15/qemuarma15-preempt-rt.scc > > +++ b/bsp/qemuarma15/qemuarma15-preempt-rt.scc > > @@ -3,11 +3,9 @@ define KMACHINE qemuarma15 > > define KTYPE preempt-rt > > define KARCH arm > > > > -# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc > > branch > > include ktypes/preempt-rt/preempt-rt.scc > > > > -include cfg/virtio.scc > > -include cfg/dmaengine.scc > > -include cfg/timer/rtc.scc > > include qemuarma15.scc > > +kconf hardware qemuarma15-preempt-rt.cfg > > The option in the qemuarma15-preempt-rt.cfg file doesn't look > hardware, so maybe this should be non-hardware ? Or if it is > causing a boot/runtime issue, then hardware is fine. If memory serves, this was a compile warning and not hardware (as this was ftrace related). Would you prefer I put in into another include and pull it in that way? Thanks, Jon > > Bruce > > > > > +include features/pci/pci.scc > > diff --git a/bsp/qemuarma15/qemuarma15-standard.scc > > b/bsp/qemuarma15/qemuarma15-standard.scc > > index cdee6332c35f..b3210ed900f4 100644 > > --- a/bsp/qemuarma15/qemuarma15-standard.scc > > +++ b/bsp/qemuarma15/qemuarma15-standard.scc > > @@ -4,12 +4,7 @@ define KTYPE standard > > define KARCH arm > > > > include ktypes/standard/standard.scc > > -# we aren't carrying patches specific to this platform, so let's > > -# skip the branch for now. > > -# branch qemuarma15 > > > > -include cfg/virtio.scc > > -include cfg/dmaengine.scc > > -include cfg/timer/rtc.scc > > include qemuarma15.scc > > > > +include features/pci/pci.scc > > diff --git a/bsp/qemuarma15/qemuarma15-tiny.cfg > > b/bsp/qemuarma15/qemuarma15-tiny.cfg > > deleted file mode 100644 > > index ed47939f0a62.. > > --- a/bsp/qemuarma15/qemuarma15-tiny.cfg > > +++ /dev/null > > @@ -1,20 +0,0 @@ > > -# SPDX-License-Identifier: MIT > > -CONFIG_MMU=y > > -CONFIG_ARCH_MULTIPLATFORM=y > > -CONFIG_ARCH_MULTI_V7=y > > - > > -CONFIG_ARM_AMBA=y > > - > > -CONFIG_ARM_THUMB=y > > -CONFIG_KUSER_HELPERS=y > > -CONFIG_OABI_COMPAT=y > > -CONFIG_EXT4_FS=y > > - > > -# to keep things small, you really don't want these on. But to > > -#
[linux-yocto] [kernel-cache][PATCH 8/8] qemuarm64: cleanup for tiny enablement
Move the USB and VIRTIO GPU stuff out of gfx, as those should be handled in the which and virtio scc files. Add the PCI scc for virtio (which thinks it's PCI on this QEMU setup), and add a tiny.scc/cfg to get tiny working. Also, EARLY_PRINTK does not exist for arm64. So remove those from the common configs. Signed-off-by: Jon Mason --- bsp/qemuarm64/qemuarm64-gfx.cfg| 9 + bsp/qemuarm64/qemuarm64-preempt-rt.scc | 1 - bsp/qemuarm64/qemuarm64-standard.scc | 2 -- bsp/qemuarm64/qemuarm64-tiny.scc | 5 + bsp/qemuarm64/qemuarm64.cfg| 1 + bsp/qemuarm64/qemuarm64.scc| 5 + features/debug/printk.cfg | 3 --- ktypes/tiny/yocto.cfg | 1 - 8 files changed, 8 insertions(+), 19 deletions(-) diff --git a/bsp/qemuarm64/qemuarm64-gfx.cfg b/bsp/qemuarm64/qemuarm64-gfx.cfg index 193ff9850d22..ceae36c5831f 100644 --- a/bsp/qemuarm64/qemuarm64-gfx.cfg +++ b/bsp/qemuarm64/qemuarm64-gfx.cfg @@ -1,11 +1,4 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y -CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y - -CONFIG_DRM=y -CONFIG_DRM_VIRTIO_GPU=y - +CONFIG_INPUT=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarm64/qemuarm64-preempt-rt.scc b/bsp/qemuarm64/qemuarm64-preempt-rt.scc index f2004be0e44a..8705450152f7 100644 --- a/bsp/qemuarm64/qemuarm64-preempt-rt.scc +++ b/bsp/qemuarm64/qemuarm64-preempt-rt.scc @@ -6,7 +6,6 @@ define KARCH arm64 # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-standard.scc b/bsp/qemuarm64/qemuarm64-standard.scc index 361f4a20639f..17bc7bb60fa6 100644 --- a/bsp/qemuarm64/qemuarm64-standard.scc +++ b/bsp/qemuarm64/qemuarm64-standard.scc @@ -4,9 +4,7 @@ define KTYPE standard define KARCH arm64 include ktypes/standard/standard.scc -branch qemuarm64 -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-tiny.scc b/bsp/qemuarm64/qemuarm64-tiny.scc index 0ec933dc5d05..e4928b43416e 100644 --- a/bsp/qemuarm64/qemuarm64-tiny.scc +++ b/bsp/qemuarm64/qemuarm64-tiny.scc @@ -4,11 +4,8 @@ define KTYPE tiny define KARCH arm64 include ktypes/tiny/tiny.scc -branch qemuarm64 -include cfg/virtio.scc -include cfg/fs/ext4.scc include qemuarm64.scc # enable the ability to run 32 bit apps -include arch/arm/32bit-compat.scc \ No newline at end of file +include arch/arm/32bit-compat.scc diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg index ef8d3ed023de..2412d24e6258 100644 --- a/bsp/qemuarm64/qemuarm64.cfg +++ b/bsp/qemuarm64/qemuarm64.cfg @@ -14,6 +14,7 @@ CONFIG_ARM_AMBA=y # # Non-8250 serial port support # +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/bsp/qemuarm64/qemuarm64.scc b/bsp/qemuarm64/qemuarm64.scc index dee5741eb2a1..f6c5d07318c9 100644 --- a/bsp/qemuarm64/qemuarm64.scc +++ b/bsp/qemuarm64/qemuarm64.scc @@ -1,3 +1,8 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarm64.cfg kconf hardware qemuarm64-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/virtio.scc diff --git a/features/debug/printk.cfg b/features/debug/printk.cfg index 0df20f914836..5beb425f73ae 100644 --- a/features/debug/printk.cfg +++ b/features/debug/printk.cfg @@ -5,8 +5,5 @@ CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=y - -CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EFI_EARLYCON=y CONFIG_TTY_PRINTK=y diff --git a/ktypes/tiny/yocto.cfg b/ktypes/tiny/yocto.cfg index 2e51a7d73c6e..e891070b83c4 100644 --- a/ktypes/tiny/yocto.cfg +++ b/ktypes/tiny/yocto.cfg @@ -20,7 +20,6 @@ CONFIG_RT_MUTEXES=y # Basic logging facilities CONFIG_PRINTK=y -CONFIG_EARLY_PRINTK=y CONFIG_PRINTK_TIME=y # Provide a minimal dynamic device fs -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10916): https://lists.yoctoproject.org/g/linux-yocto/message/10916 Mute This Topic: https://lists.yoctoproject.org/mt/88998546/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH 6/8] qemuarma15: fix tiny and preempt-rt
Reorganize enablements to get tiny and preempt-rt working again, as well as a general clean-up. Many of the tiny things were moved into the general config, as it won't hurt to have it there and it keeps the tiny config smaller. Signed-off-by: Jon Mason --- bsp/qemuarma15/qemuarma15-gfx.cfg| 7 +-- bsp/qemuarma15/qemuarma15-preempt-rt.cfg | 1 + bsp/qemuarma15/qemuarma15-preempt-rt.scc | 6 ++ bsp/qemuarma15/qemuarma15-standard.scc | 7 +-- bsp/qemuarma15/qemuarma15-tiny.cfg | 20 bsp/qemuarma15/qemuarma15-tiny.scc | 9 - bsp/qemuarma15/qemuarma15.cfg| 8 ++-- bsp/qemuarma15/qemuarma15.scc| 7 +++ 8 files changed, 18 insertions(+), 47 deletions(-) create mode 100644 bsp/qemuarma15/qemuarma15-preempt-rt.cfg delete mode 100644 bsp/qemuarma15/qemuarma15-tiny.cfg diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg b/bsp/qemuarma15/qemuarma15-gfx.cfg index 193ff9850d22..c3e36f0da75d 100644 --- a/bsp/qemuarma15/qemuarma15-gfx.cfg +++ b/bsp/qemuarma15/qemuarma15-gfx.cfg @@ -1,11 +1,6 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y +CONFIG_INPUT=y CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y - -CONFIG_DRM=y -CONFIG_DRM_VIRTIO_GPU=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.cfg b/bsp/qemuarma15/qemuarma15-preempt-rt.cfg new file mode 100644 index ..74cd6a0c1073 --- /dev/null +++ b/bsp/qemuarma15/qemuarma15-preempt-rt.cfg @@ -0,0 +1 @@ +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.scc b/bsp/qemuarma15/qemuarma15-preempt-rt.scc index 216757bb016b..a893e110d22f 100644 --- a/bsp/qemuarma15/qemuarma15-preempt-rt.scc +++ b/bsp/qemuarma15/qemuarma15-preempt-rt.scc @@ -3,11 +3,9 @@ define KMACHINE qemuarma15 define KTYPE preempt-rt define KARCH arm -# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +kconf hardware qemuarma15-preempt-rt.cfg +include features/pci/pci.scc diff --git a/bsp/qemuarma15/qemuarma15-standard.scc b/bsp/qemuarma15/qemuarma15-standard.scc index cdee6332c35f..b3210ed900f4 100644 --- a/bsp/qemuarma15/qemuarma15-standard.scc +++ b/bsp/qemuarma15/qemuarma15-standard.scc @@ -4,12 +4,7 @@ define KTYPE standard define KARCH arm include ktypes/standard/standard.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +include features/pci/pci.scc diff --git a/bsp/qemuarma15/qemuarma15-tiny.cfg b/bsp/qemuarma15/qemuarma15-tiny.cfg deleted file mode 100644 index ed47939f0a62.. --- a/bsp/qemuarma15/qemuarma15-tiny.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: MIT -CONFIG_MMU=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_V7=y - -CONFIG_ARM_AMBA=y - -CONFIG_ARM_THUMB=y -CONFIG_KUSER_HELPERS=y -CONFIG_OABI_COMPAT=y -CONFIG_EXT4_FS=y - -# to keep things small, you really don't want these on. But to -# keep qemuarm's hvc0 console happy, we have them on for now -CONFIG_TTY=y -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_HVC_DRIVER=y diff --git a/bsp/qemuarma15/qemuarma15-tiny.scc b/bsp/qemuarma15/qemuarma15-tiny.scc index 406f811145fa..331dbbba3a0b 100644 --- a/bsp/qemuarma15/qemuarma15-tiny.scc +++ b/bsp/qemuarma15/qemuarma15-tiny.scc @@ -4,14 +4,5 @@ define KTYPE tiny define KARCH arm include ktypes/tiny/tiny.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc - - -kconf hardware qemuarma15-tiny.cfg diff --git a/bsp/qemuarma15/qemuarma15.cfg b/bsp/qemuarma15/qemuarma15.cfg index 32187155d2a0..57f3b8e8e107 100644 --- a/bsp/qemuarma15/qemuarma15.cfg +++ b/bsp/qemuarma15/qemuarma15.cfg @@ -1,4 +1,7 @@ # SPDX-License-Identifier: MIT +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_VIRT=y CONFIG_SMP=y CONFIG_NR_CPUS=8 @@ -8,6 +11,7 @@ CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_HW_RANDOM=y @@ -28,6 +32,6 @@ CONFIG_CRYPTO_GHASH_ARM_CE=y CONFIG_CRYPTO_CRC32_ARM_CE=y CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_ARM_LPAE=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y CONFIG_HIGHMEM=y +CONFIG_ARM_AMBA=y +CONFIG_ARM_THUMB=y diff --git a/bsp/qemuarma15/qemuarma15.scc b/bsp/qemuarma15/qemuarma15.scc index 68d9e710a258..ff3da3702bb6 100644 --- a/bsp/qemuarma15/qemuarma15.scc +++ b/bsp/qemuarma15/qemuarma15.scc @@ -1,3 +1,10 @@ # SPDX-License-Identifier: MIT kconf
[linux-yocto] [kernel-cache][PATCH 7/8] arm-versatile-926ejs: reorg for tiny and preempt-rt
Make the necessary changes to get tiny and preempt-rt working again, as well as a general reorg to make things simpler. Signed-off-by: Jon Mason --- .../arm-versatile-926ejs-gfx.cfg | 16 ++- .../arm-versatile-926ejs-preempt-rt.cfg | 2 + .../arm-versatile-926ejs-preempt-rt.scc | 5 +- .../arm-versatile-926ejs-standard.scc | 3 - .../arm-versatile-926ejs-tiny.scc | 2 - .../arm-versatile-926ejs.cfg | 106 +- .../arm-versatile-926ejs.scc | 11 +- bsp/arm-versatile-926ejs/hardware.cfg | 9 -- 8 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg delete mode 100644 bsp/arm-versatile-926ejs/hardware.cfg diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg index 5e7519e0dfe2..83c71ae6b03e 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg @@ -1,8 +1,16 @@ # SPDX-License-Identifier: MIT +CONFIG_INPUT=y +CONFIG_USB_HID=y + +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y + +CONFIG_DRM_PANEL=y +CONFIG_DRM_PANEL_ARM_VERSATILE=y +CONFIG_DRM_PL111=y + CONFIG_FB=y CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_INPUT_TABLET=y -CONFIG_HID_WACOM=y -CONFIG_INPUT_MISC=y +CONFIG_AUXDISPLAY=y +CONFIG_ARM_CHARLCD=y diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg new file mode 100644 index ..02840f431a0c --- /dev/null +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg @@ -0,0 +1,2 @@ +CONFIG_LEDS_TRIGGER_CPU=n +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc index 8dbe0e8601f5..6170625eed62 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc @@ -1,10 +1,13 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE preempt-rt define KARCH arm # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc + include arm-versatile-926ejs.scc +kconf hardware arm-versatile-926ejs-preempt-rt.cfg + +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc index 6edfe67bbd57..2e4f06e2c370 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc @@ -1,13 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE standard define KARCH arm include ktypes/standard/standard.scc -branch arm-versatile-926ejs - include arm-versatile-926ejs.scc diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc index d22969f0de5e..e82162ba6f67 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc @@ -1,12 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE tiny define KARCH arm include ktypes/tiny/tiny.scc -branch arm-versatile-926ejs include arm-versatile-926ejs.scc diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg index 1f41220f9449..f406106731a3 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg @@ -1,78 +1,76 @@ -# SPDX-License-Identifier: MIT -#. -#WARNING -# -# This file is a kernel configuration fragment, and not a full kernel -# configuration file. The final kernel configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on kernel configuration, please -# consult the product documentation. -# -#. -CONFIG_ARM=y -CONFIG_ARM_AMBA=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=n +CONFIG_ARCH_MULTI_V6=n CONFIG_ARCH_MULTI_V5=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_PCI_VERSATILE=y -CONFIG_CPU_CACHE_VIVT=y
[linux-yocto] [kernel-cache][PATCH 4/8] pci: remove CONFIG_PCI_MMCONFIG
CONFIG_PCI_MMCONFIG is x86 specific and the default is 'y'. Remove it from the generic PCI config, as it causes warnings without adding anything. Signed-off-by: Jon Mason --- features/pci/pci.cfg | 4 1 file changed, 4 deletions(-) diff --git a/features/pci/pci.cfg b/features/pci/pci.cfg index f3c57c54d70f..124824dcb35e 100644 --- a/features/pci/pci.cfg +++ b/features/pci/pci.cfg @@ -1,12 +1,8 @@ # SPDX-License-Identifier: MIT CONFIG_PCI=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MSI=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_PCIE is not set - - - -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10912): https://lists.yoctoproject.org/g/linux-yocto/message/10912 Mute This Topic: https://lists.yoctoproject.org/mt/88998541/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH 5/8] tiny: make more generic
Remove CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_START, as they are x86 specific (and currently the defaults are being set). Also, add CONFIG_VT and CONFIG_POSIX_TIMERS, as they are generic and needed by default (due to default n turning them off for tiny). Signed-off-by: Jon Mason --- ktypes/tiny/tiny.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ktypes/tiny/tiny.cfg b/ktypes/tiny/tiny.cfg index 4a7b23dfa325..11752d0678f3 100644 --- a/ktypes/tiny/tiny.cfg +++ b/ktypes/tiny/tiny.cfg @@ -11,9 +11,6 @@ CONFIG_SLUB=y CONFIG_BASE_SMALL=1 -CONFIG_PHYSICAL_START=0x100 -CONFIG_PHYSICAL_ALIGN=0x100 - # -15% of bzImage size over gz CONFIG_KERNEL_LZMA=y @@ -31,3 +28,6 @@ CONFIG_BINFMT_SCRIPT=y # Support /proc/sys CONFIG_PROC_SYSCTL=y + +CONFIG_VT=y +CONFIG_POSIX_TIMERS=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10913): https://lists.yoctoproject.org/g/linux-yocto/message/10913 Mute This Topic: https://lists.yoctoproject.org/mt/88998542/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH 2/8] common-pc: add CONFIG_ISA_DMA_API for tiny
CONFIG_BLK_DEV_FD has a dependency on CONFIG_ISA_DMA_API, otherwise a kernel config warning will be logged and it will not be enabled. Signed-off-by: Jon Mason --- bsp/common-pc/common-pc-drivers.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/bsp/common-pc/common-pc-drivers.cfg b/bsp/common-pc/common-pc-drivers.cfg index e511c94428a7..5e2018d6aac0 100644 --- a/bsp/common-pc/common-pc-drivers.cfg +++ b/bsp/common-pc/common-pc-drivers.cfg @@ -54,6 +54,7 @@ CONFIG_I2C_I801=y CONFIG_SATA_AHCI=y +CONFIG_ISA_DMA_API=y CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10910): https://lists.yoctoproject.org/g/linux-yocto/message/10910 Mute This Topic: https://lists.yoctoproject.org/mt/88998539/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH 1/8] x2apic: enable iommu for tiny
IOMMU_SUPPORT is needed by tiny for CONFIG_X86_X2APIC to be enabled, otherwise a kernel config warning will be logged. Signed-off-by: Jon Mason --- features/x2apic/x2apic.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/features/x2apic/x2apic.cfg b/features/x2apic/x2apic.cfg index ca91dc0d25ac..8efa10f86bc4 100644 --- a/features/x2apic/x2apic.cfg +++ b/features/x2apic/x2apic.cfg @@ -1,3 +1,5 @@ # SPDX-License-Identifier: MIT + +CONFIG_IOMMU_SUPPORT=y CONFIG_IRQ_REMAP=y CONFIG_X86_X2APIC=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10909): https://lists.yoctoproject.org/g/linux-yocto/message/10909 Mute This Topic: https://lists.yoctoproject.org/mt/88998538/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH 3/8] virtio: Add prereqs for tiny
The default 'n' of tiny is causing some of the prerequisites for the virtio drivers to not be enabled. Add them here so that they will work if enabled in a tiny config. Signed-off-by: Jon Mason --- cfg/virtio.cfg | 7 +++ 1 file changed, 7 insertions(+) diff --git a/cfg/virtio.cfg b/cfg/virtio.cfg index 938d2da51e8c..0ef99c6b8bb0 100644 --- a/cfg/virtio.cfg +++ b/cfg/virtio.cfg @@ -1,16 +1,23 @@ # SPDX-License-Identifier: MIT CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y +CONFIG_NET=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y +CONFIG_BLK_MQ_VIRTIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_INPUT=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_SCSI=y +CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_VIRTIO=y +CONFIG_CRYPTO=y CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y CONFIG_VSOCKETS=y CONFIG_VSOCKETS_DIAG=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10911): https://lists.yoctoproject.org/g/linux-yocto/message/10911 Mute This Topic: https://lists.yoctoproject.org/mt/88998540/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH 0/8] poky-tiny fixes and cleanups
This series is to get poky-tiny working for qemuarmv5, qemuarm, and qemuarm64 (which was added in parallel while I was developing this series), as well as the resulting fallout from building and testing qemux86 and qemux86-64. There will be additional patches needed in oe-core, etc to use these. With these patches and the patches to oe-core/poky, I am able to run a limited testimage on all of the arm and x86 qemu machines for poky-tiny, rt, and regular kernel. Thanks, Jon Jon Mason (8): x2apic: enable iommu for tiny common-pc: add CONFIG_ISA_DMA_API for tiny virtio: Add prereqs for tiny pci: remove CONFIG_PCI_MMCONFIG tiny: make more generic qemuarma15: fix tiny and preempt-rt arm-versatile-926ejs: reorg for tiny and preempt-rt qemuarm64: cleanup for tiny enablement .../arm-versatile-926ejs-gfx.cfg | 16 ++- .../arm-versatile-926ejs-preempt-rt.cfg | 2 + .../arm-versatile-926ejs-preempt-rt.scc | 5 +- .../arm-versatile-926ejs-standard.scc | 3 - .../arm-versatile-926ejs-tiny.scc | 2 - .../arm-versatile-926ejs.cfg | 106 +- .../arm-versatile-926ejs.scc | 11 +- bsp/arm-versatile-926ejs/hardware.cfg | 9 -- bsp/common-pc/common-pc-drivers.cfg | 1 + bsp/qemuarm64/qemuarm64-gfx.cfg | 9 +- bsp/qemuarm64/qemuarm64-preempt-rt.scc| 1 - bsp/qemuarm64/qemuarm64-standard.scc | 2 - bsp/qemuarm64/qemuarm64-tiny.scc | 5 +- bsp/qemuarm64/qemuarm64.cfg | 1 + bsp/qemuarm64/qemuarm64.scc | 5 + bsp/qemuarma15/qemuarma15-gfx.cfg | 7 +- bsp/qemuarma15/qemuarma15-preempt-rt.cfg | 1 + bsp/qemuarma15/qemuarma15-preempt-rt.scc | 6 +- bsp/qemuarma15/qemuarma15-standard.scc| 7 +- bsp/qemuarma15/qemuarma15-tiny.cfg| 20 bsp/qemuarma15/qemuarma15-tiny.scc| 9 -- bsp/qemuarma15/qemuarma15.cfg | 8 +- bsp/qemuarma15/qemuarma15.scc | 7 ++ cfg/virtio.cfg| 7 ++ features/debug/printk.cfg | 3 - features/pci/pci.cfg | 4 - features/x2apic/x2apic.cfg| 2 + ktypes/tiny/tiny.cfg | 6 +- ktypes/tiny/yocto.cfg | 1 - 29 files changed, 116 insertions(+), 150 deletions(-) create mode 100644 bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg delete mode 100644 bsp/arm-versatile-926ejs/hardware.cfg create mode 100644 bsp/qemuarma15/qemuarma15-preempt-rt.cfg delete mode 100644 bsp/qemuarma15/qemuarma15-tiny.cfg -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10908): https://lists.yoctoproject.org/g/linux-yocto/message/10908 Mute This Topic: https://lists.yoctoproject.org/mt/88998535/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [kernel-cache][PATCH] bsp/qemuarm*-gfx: use virtio graphics
On Thu, Sep 23, 2021 at 8:29 PM Bruce Ashfield wrote: > > sorry for the slow reply, I was bogged down with 5.14 and 5.15. > > What branches (kernel versions) did you want this applied to ? 5.10+ ? Since this is only for honister and newer, I would say 5.14+ Thanks, Jon > > Bruce > > In message: [linux-yocto] [kernel-cache][PATCH] bsp/qemuarm*-gfx: use virtio > graphics > on 16/09/2021 Jon Mason wrote: > > > Remove Bochs and start using virtio graphics > > > > Signed-off-by: Jon Mason > > --- > > bsp/qemuarm64/qemuarm64-gfx.cfg | 2 +- > > bsp/qemuarma15/qemuarma15-gfx.cfg | 5 - > > bsp/qemuarma9/qemuarma9-gfx.cfg | 13 - > > 3 files changed, 13 insertions(+), 7 deletions(-) > > > > diff --git a/bsp/qemuarm64/qemuarm64-gfx.cfg > > b/bsp/qemuarm64/qemuarm64-gfx.cfg > > index 0e1f47d7d52a..193ff9850d22 100644 > > --- a/bsp/qemuarm64/qemuarm64-gfx.cfg > > +++ b/bsp/qemuarm64/qemuarm64-gfx.cfg > > @@ -5,7 +5,7 @@ CONFIG_USB_HID=y > > CONFIG_USB_XHCI_HCD=y > > > > CONFIG_DRM=y > > -CONFIG_DRM_BOCHS=y > > +CONFIG_DRM_VIRTIO_GPU=y > > > > CONFIG_INPUT_MISC=y > > CONFIG_INPUT_UINPUT=y > > diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg > > b/bsp/qemuarma15/qemuarma15-gfx.cfg > > index 039bfae5dc5f..193ff9850d22 100644 > > --- a/bsp/qemuarma15/qemuarma15-gfx.cfg > > +++ b/bsp/qemuarma15/qemuarma15-gfx.cfg > > @@ -5,4 +5,7 @@ CONFIG_USB_HID=y > > CONFIG_USB_XHCI_HCD=y > > > > CONFIG_DRM=y > > -CONFIG_DRM_BOCHS=y > > +CONFIG_DRM_VIRTIO_GPU=y > > + > > +CONFIG_INPUT_MISC=y > > +CONFIG_INPUT_UINPUT=y > > diff --git a/bsp/qemuarma9/qemuarma9-gfx.cfg > > b/bsp/qemuarma9/qemuarma9-gfx.cfg > > index 5e7519e0dfe2..193ff9850d22 100644 > > --- a/bsp/qemuarma9/qemuarma9-gfx.cfg > > +++ b/bsp/qemuarma9/qemuarma9-gfx.cfg > > @@ -1,8 +1,11 @@ > > # SPDX-License-Identifier: MIT > > -CONFIG_FB=y > > -CONFIG_FB_ARMCLCD=y > > -CONFIG_FRAMEBUFFER_CONSOLE=y > > - > > CONFIG_INPUT_TABLET=y > > -CONFIG_HID_WACOM=y > > +CONFIG_USB=y > > +CONFIG_USB_HID=y > > +CONFIG_USB_XHCI_HCD=y > > + > > +CONFIG_DRM=y > > +CONFIG_DRM_VIRTIO_GPU=y > > + > > CONFIG_INPUT_MISC=y > > +CONFIG_INPUT_UINPUT=y > > -- > > 2.20.1 > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10456): https://lists.yoctoproject.org/g/linux-yocto/message/10456 Mute This Topic: https://lists.yoctoproject.org/mt/85663601/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH] README: Update mail address
linux-yo...@yoctoproject.org bounces with a: I'm sorry to have to inform you that your message could not be delivered to one or more recipients. It's attached below. Update the email address to the new one to correct the issue. Signed-off-by: Jon Mason --- 00-README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/00-README b/00-README index 85e7c85e885c..214a3a7fd778 100644 --- a/00-README +++ b/00-README @@ -9,7 +9,7 @@ mailing list (subscripion only) and should cc' the maintainer. When sending single patches, please using something like: - $ git send-email -1 --to linux-yo...@yoctoproject.org --subject-prefix='kernel-cache][PATCH' + $ git send-email -1 --to=linux-yocto@lists.yoctoproject.org --subject-prefix='kernel-cache][PATCH' 1.0 Overview -- 2.20.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10426): https://lists.yoctoproject.org/g/linux-yocto/message/10426 Mute This Topic: https://lists.yoctoproject.org/mt/85663653/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache][PATCH] bsp/qemuarm*-gfx: use virtio graphics
Remove Bochs and start using virtio graphics Signed-off-by: Jon Mason --- bsp/qemuarm64/qemuarm64-gfx.cfg | 2 +- bsp/qemuarma15/qemuarma15-gfx.cfg | 5 - bsp/qemuarma9/qemuarma9-gfx.cfg | 13 - 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bsp/qemuarm64/qemuarm64-gfx.cfg b/bsp/qemuarm64/qemuarm64-gfx.cfg index 0e1f47d7d52a..193ff9850d22 100644 --- a/bsp/qemuarm64/qemuarm64-gfx.cfg +++ b/bsp/qemuarm64/qemuarm64-gfx.cfg @@ -5,7 +5,7 @@ CONFIG_USB_HID=y CONFIG_USB_XHCI_HCD=y CONFIG_DRM=y -CONFIG_DRM_BOCHS=y +CONFIG_DRM_VIRTIO_GPU=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg b/bsp/qemuarma15/qemuarma15-gfx.cfg index 039bfae5dc5f..193ff9850d22 100644 --- a/bsp/qemuarma15/qemuarma15-gfx.cfg +++ b/bsp/qemuarma15/qemuarma15-gfx.cfg @@ -5,4 +5,7 @@ CONFIG_USB_HID=y CONFIG_USB_XHCI_HCD=y CONFIG_DRM=y -CONFIG_DRM_BOCHS=y +CONFIG_DRM_VIRTIO_GPU=y + +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarma9/qemuarma9-gfx.cfg b/bsp/qemuarma9/qemuarma9-gfx.cfg index 5e7519e0dfe2..193ff9850d22 100644 --- a/bsp/qemuarma9/qemuarma9-gfx.cfg +++ b/bsp/qemuarma9/qemuarma9-gfx.cfg @@ -1,8 +1,11 @@ # SPDX-License-Identifier: MIT -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y - CONFIG_INPUT_TABLET=y -CONFIG_HID_WACOM=y +CONFIG_USB=y +CONFIG_USB_HID=y +CONFIG_USB_XHCI_HCD=y + +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y + CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y -- 2.20.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10425): https://lists.yoctoproject.org/g/linux-yocto/message/10425 Mute This Topic: https://lists.yoctoproject.org/mt/85663601/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
