From patchwork Wed Jan 4 12:18:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Jonas X-Patchwork-Id: 17701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8C45C4708E for ; Wed, 4 Jan 2023 12:18:42 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.groups.io with SMTP id smtpd.web10.10594.1672834713703742996 for ; Wed, 04 Jan 2023 04:18:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HM2j4S8S; spf=pass (domain: gmail.com, ip: 209.85.221.48, mailfrom: toertel@gmail.com) Received: by mail-wr1-f48.google.com with SMTP id z16so16264928wrw.1 for ; Wed, 04 Jan 2023 04:18:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vL0hH40U7zyQ9k6eTEteJxmFnvLHVjjGvlBjnXjxjQE=; b=HM2j4S8SMXK4qv6jI5qcHTUSC6sb+AXRLlRvkmV3qNnXBIiHlsknqxPV+vfW6ASWdR wAVoo2auWIHZU9OFdnhPlOiSf3t0t+v4yEgr75XalBLYPbgM+9ft95klJmk4JBqLpPyh /DtaQAAG1H+euI0TD3McQy2zi5ZZHTDIRpu4LBZfqJIFou/3FMFTJ3aqc7UPn//L4BDT zTTj+Bj5fbYQQoBR+KKvdw+f31qzeoXNFprQI7GI4e2rNvVSKCnr+epQnkT8a2bVP8/N p9y+t97Yv005wewLAi0HeG3c2Q+AK2TFCIf4O7j+ra07FTjLvOT4q/4JK0AddwxXx/un w5sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vL0hH40U7zyQ9k6eTEteJxmFnvLHVjjGvlBjnXjxjQE=; b=XGwUX+rhNLra2RCeI9tepBe7E0BFsZCw2PNsOeJVkkzv7FL9izWl3xOnc3dBB9uyZ8 y22A3i20i+zuyhFmGzgbF8YUWWgN+24DejZUA6KtLV5MPt63v0OjO3PeoQdJr/e91kJL ELBh1Rgv7BUSkai+/7xex6ILvLcpaiNHImEpUEFFgJ/27y6KI/09TpEosg55hN/hBToa oqXAKXwFnbaO7ymHLfoMdFvA/8f7PdXxhbIfXFb+1+ygUmzHsSnRHbXI7U50K1MEoy45 KTvNJHUXfwKzXgRUO4QQJ71rwz9Hi67Qu4KfVxpp8wGWmhgdb667PzzxdxzMcB9tLR7J ApqQ== X-Gm-Message-State: AFqh2koz/3pmyVr1djZ0108FzCeg11wElzViAsDzkRxCoF0rawx3A8pm aEeDlaHhnNBaajB6t33pHFZv70svw6o= X-Google-Smtp-Source: AMrXdXsQXnmLply2PPsfe03S6Htfv5+XBdcAAgOv7PKtD4V4m+eg9056AASDet/EI27govMdMWJL5w== X-Received: by 2002:a5d:444d:0:b0:242:48f8:3f56 with SMTP id x13-20020a5d444d000000b0024248f83f56mr28572751wrr.39.1672834711849; Wed, 04 Jan 2023 04:18:31 -0800 (PST) Received: from ThinkCentre.fritz.box (p200300cfaf4b81003e9287465d6a8a6d.dip0.t-ipconnect.de. [2003:cf:af4b:8100:3e92:8746:5d6a:8a6d]) by smtp.gmail.com with ESMTPSA id d11-20020adffd8b000000b00236545edc91sm33564176wrr.76.2023.01.04.04.18.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 04:18:31 -0800 (PST) From: toertel@gmail.com To: openembedded-core@lists.openembedded.org, michael.opdenacker@bootlin.com, richard.purdie@linuxfoundation.org Cc: Mark Jonas Subject: [PATCH 1/2] conf/machine: Match QEMU x86 sound kernel module Date: Wed, 4 Jan 2023 13:18:07 +0100 Message-Id: <20230104121808.1065203-2-toertel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104121808.1065203-1-toertel@gmail.com> References: <20230104121808.1065203-1-toertel@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 04 Jan 2023 12:18:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175470 From: Mark Jonas In "conf/machine: fix QEMU x86 sound options" b802a5dd the sound devices emulated by QEMU were changed from AC97 (intel8x0) and ES1370 (Soundblaster) to just AC97. Yet, the sound kernel modules added to the file system still matched ES1370. This patch adds the matching snd-intel8x0 kernel module for the emulated AC97 sound card. It removes the unused ES1370 kernel modules. Signed-off-by: Mark Jonas --- meta/conf/machine/qemux86-64.conf | 3 ++- meta/conf/machine/qemux86.conf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 8640867911..e249397d06 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -36,7 +36,8 @@ MACHINE_FEATURES += "x86 pci" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +# matches QEMU -device AC97 +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-intel8x0" WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 1e072e1ae2..d61c7816dd 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -33,7 +33,8 @@ MACHINE_FEATURES += "x86 pci" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +# matches QEMU -device AC97 +MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-intel8x0" WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" From patchwork Wed Jan 4 12:18:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Jonas X-Patchwork-Id: 17702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5611C4332F for ; Wed, 4 Jan 2023 12:18:42 +0000 (UTC) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.groups.io with SMTP id smtpd.web11.10525.1672834715183963889 for ; Wed, 04 Jan 2023 04:18:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eboIiaqQ; spf=pass (domain: gmail.com, ip: 209.85.221.53, mailfrom: toertel@gmail.com) Received: by mail-wr1-f53.google.com with SMTP id bk16so19540945wrb.11 for ; Wed, 04 Jan 2023 04:18:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UbHV1Co9g1YDYCom1Vxshi+hV9Ubn39ifN+K3n76azY=; b=eboIiaqQc7CsAn8mslCzd5neim0rKZtZx/jEHX2Giv6QDpyhusBxxAivIDtyoOzinJ GpA3AqXFlLag/xziPEU8Kq4oSDeK2fvCRXW7TUum48oeMAdruUu19qowIfOIaQUvIVd7 3AjoH6XNXvC4MU1npnEUe7St30KT5fbi87dJ/WXFkHKjnQnm7cPAIq1xgUzxXuDYERoQ KNnaoRzGxOO+UoWjRcgaqqnqSwhvUmfmaKqp+oCZg0K//fDXk0Xu4m9IZIQW13f+jgQM 0JKBFvOcBEFsxnvUr1CVDTW1QufoNu95+GQ2M18M8iNzXVa1vIPqyvQH8Ax768d48acd KqQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UbHV1Co9g1YDYCom1Vxshi+hV9Ubn39ifN+K3n76azY=; b=cdkKHCcwlbWtdsb+IFpensQzvyeHUZQODMzQd6J77pJQK5Pvy5S+1mm+Q3WRj1rSuM MEyiYT7pSEyUGdpZI6CTioXAphTfKkBPyus0E/a8VqxvzvmNOmIP1eXB0JmC3+RzcCcS /NfTMIffKN+65dWkTpgXFJzgQGdA/7PFqtdanG/+MWO9ALOTQmkhGy5A/7ntUvsvLn5/ f7/ixeh9AQ/sRQbLDoXT+qDOQOHNy/F1ib3YUdPDQkED0vEmorNcIHhHm+I4FTN/UqpD ogz96VE6ZF5J2HbD8+pFvdDtm1ZrVJ4KsIcp4/N+zXDkcwTth+3iti9Xru0Ra3lFou+l eLIw== X-Gm-Message-State: AFqh2koAGecAtVMor/STKooiBWTAXZGpYkm4vyEwo5bxFSK/5BnQfi16 EFigRpGeFSHzQOVjd1R7AFZ+3tmZAM8= X-Google-Smtp-Source: AMrXdXuQqoRy2OMbagMRug7roE5wo9TjcIJs2qsp+EYxvKngog5Ao+odmpyr1xqGNXwgpXV1avdo4Q== X-Received: by 2002:adf:fec6:0:b0:26a:ed4c:e3af with SMTP id q6-20020adffec6000000b0026aed4ce3afmr37046056wrs.49.1672834713319; Wed, 04 Jan 2023 04:18:33 -0800 (PST) Received: from ThinkCentre.fritz.box (p200300cfaf4b81003e9287465d6a8a6d.dip0.t-ipconnect.de. [2003:cf:af4b:8100:3e92:8746:5d6a:8a6d]) by smtp.gmail.com with ESMTPSA id d11-20020adffd8b000000b00236545edc91sm33564176wrr.76.2023.01.04.04.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 04:18:33 -0800 (PST) From: toertel@gmail.com To: openembedded-core@lists.openembedded.org, michael.opdenacker@bootlin.com, richard.purdie@linuxfoundation.org Cc: Mark Jonas Subject: [PATCH 2/2] linux-yocto: Autoload sound driver on QEMU x86 Date: Wed, 4 Jan 2023 13:18:08 +0100 Message-Id: <20230104121808.1065203-3-toertel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104121808.1065203-1-toertel@gmail.com> References: <20230104121808.1065203-1-toertel@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 04 Jan 2023 12:18:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/175471 From: Mark Jonas If DISTRO_FEATURES includes ALSA then automatically load the snd-intel8x0 kernel module on qemux86 and qemux86-64. This matches the machine configurations conf/machine/qemux86.conf and qemux86-64.conf. Signed-off-by: Mark Jonas --- meta/recipes-kernel/linux/linux-yocto.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 091003ed82..c8a9b0a1e3 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -37,6 +37,11 @@ KERNEL_FEATURES:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'cfg/ KERNEL_FEATURES:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'features/numa/numa.scc', '', d)}" KERNEL_FEATURES:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vfat', 'cfg/fs/vfat.scc', '', d)}" +# sound driver recommended by conf/machine/qemux86*.conf +ALSA_MODULES = "${@bb.utils.contains("DISTRO_FEATURES", "alsa", "snd-intel8x0", "", d)}" +KERNEL_MODULE_AUTOLOAD:qemux86 += "${ALSA_MODULES}" +KERNEL_MODULE_AUTOLOAD:qemux86-64 += "${ALSA_MODULES}" + # A KMACHINE is the mapping of a yocto $MACHINE to what is built # by the kernel. This is typically the branch that should be built, # and it can be specific to the machine or shared