From patchwork Fri Jul 28 04:30:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 127319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp198545vqg; Thu, 27 Jul 2023 21:58:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlHODYVf1tNupHQxwGHJ5xw7DsiGy2s/9jZYp08PetEFFWXKq/THtW6LyYWqN21i//v1kky1 X-Received: by 2002:a17:906:cc50:b0:997:ea90:96b4 with SMTP id mm16-20020a170906cc5000b00997ea9096b4mr1229860ejb.61.1690520313598; Thu, 27 Jul 2023 21:58:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690520313; cv=none; d=google.com; s=arc-20160816; b=larK167Nysho00F45tJxZuSy7ewerExZjSjX+VBRcaStJ+gTcAXss3XKMmzcmcHn8D 5s4BWN9AF/owgBpui44ZxXwxriSU/LzDOrFNdzuZB1F380fbAumIxcJD74JOcV5BjdHg 6UJSDvpme7tO050qAKcplAFtHNAkF+cHBvOmI4Bll0yKNsp4Irfd4pJ6l0YRxxKllvPd G8KjFwY9WNRv+70E4AUl1/hOdSpABqVXNjvIIrRTe4/5kSqpviUyrcGVp4JuPFKW3dgf aZVB7dOu/71AdhWTU7g0e2thsoYyJ2z3FIVA/bBYcx0l0iCTcf4QoESlWMITp5GcUxge vWMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=f31BEnj08TA18IRJPg1rQ+2g1aO39BvBW1yPkSzAkKo=; fh=ix/qGwugQyy9DIiXMrBe9LCjlioyNt04GdJe+fD/djs=; b=bdAA7tGTMqj6X+5aqr747Xyv+UYSstJ6KFRHEan3+D4IIXKm8XEum7Mm++R6sy6c1Y XwsJiXS0/VE4TGApedez3IiieE/XJyzpvXPfHi/F2QTKRPz6/dOzgI3jAjiybR2DNOYB jWuljN26radpmOQeecOJPtL5Q/9hq/KNs5NJsqfMN0M7PyaXmpA0Ohv1oqiqFr5tVipv yBU8E3nUhad80jVYo2YiJKl/Q+1aQKT8/2EpeDBx2OL0KclyR3r6EIMHa7bBgeE/UPLx gb/UYD5GYS+U7XjNlcgQ9xQvzl7VJzgD6OMMNk0nxqdqnP2YM7O22qegq2z3mDjmeat/ sU+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="K9oKFf/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k13-20020a17090627cd00b00992feae388bsi2064261ejc.457.2023.07.27.21.58.07; Thu, 27 Jul 2023 21:58:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="K9oKFf/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232628AbjG1Eae (ORCPT + 99 others); Fri, 28 Jul 2023 00:30:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229933AbjG1Eab (ORCPT ); Fri, 28 Jul 2023 00:30:31 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A15A2119; Thu, 27 Jul 2023 21:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=f31BEnj08TA18IRJPg1rQ+2g1aO39BvBW1yPkSzAkKo=; b=K9oKFf/4ZoF1KVdVbEbKVRjZk7 Q8n0iyRlJDK8zaOFsyl5FpcawWsEsXeZWHyznQvQOAoXkK8oPdLPyrqJtKP5sXMJQA7I1Eh73iEKe ojkoPftfjtAJPRZL9Huwf+KQEDuLHX0WfMmi1UH17ZEj5AE24iKiXW9E8peLNMt8MkpxyQkFgqdhj H4Nf+Vczx0+dR/mPE3MBVlBA7WC6IIasnRSVItmwUsBK3BNJCmL8dOM5Qq0QzOZcg0A4u+cLJ/Bb2 c6mNtyOYPqnJyYKVtZxXRaDxGnvaBOi4rYpvmJfLzftdd9kGGgtxAEP7/pEByo1KmkL3Iinr5vXcd 5298hSIQ==; Received: from [2601:1c2:980:9ec0::2764] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qPF7G-001aUX-2x; Fri, 28 Jul 2023 04:30:14 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , kernel test robot , Richard Weinberger , Anton Ivanov , Johannes Berg , linux-um@lists.infradead.org, Tejun Heo , Takashi Iwai , Jaroslav Kysela , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kbuild@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v3] um/drivers: fix hostaudio build errors Date: Thu, 27 Jul 2023 21:30:13 -0700 Message-ID: <20230728043013.27776-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772639028611559749 X-GMAIL-MSGID: 1772639028611559749 Use "select"s to ensure that the required kconfig symbols are set as expected. Drop HOSTAUDIO since it is now equivalent to UML_SOUND. Allow SOUND with UML regardless of HAS_IOMEM. Otherwise there is a kconfig warning for unmet dependencies. (This was not an issue when SOUND was defined in arch/um/drivers/Kconfig. I have done 50 randconfig builds and didn't find any issues.) This fixes build errors when CONFIG_SOUND is not set: ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_cleanup_module': hostaudio_kern.c:(.exit.text+0xa): undefined reference to `unregister_sound_mixer' ld: hostaudio_kern.c:(.exit.text+0x15): undefined reference to `unregister_sound_dsp' ld: arch/um/drivers/hostaudio_kern.o: in function `hostaudio_init_module': hostaudio_kern.c:(.init.text+0x19): undefined reference to `register_sound_dsp' ld: hostaudio_kern.c:(.init.text+0x31): undefined reference to `register_sound_mixer' ld: hostaudio_kern.c:(.init.text+0x49): undefined reference to `unregister_sound_dsp' and this kconfig warning: WARNING: unmet direct dependencies detected for SOUND Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Fixes: d886e87cb82b ("sound: make OSS sound core optional") Signed-off-by: Randy Dunlap Reported-by: kernel test robot Link: lore.kernel.org/r/202307141416.vxuRVpFv-lkp@intel.com Cc: Richard Weinberger Cc: Anton Ivanov Cc: Johannes Berg Cc: linux-um@lists.infradead.org Cc: Tejun Heo Cc: Takashi Iwai Cc: Jaroslav Kysela Cc: Masahiro Yamada Cc: Nathan Chancellor Cc: Nick Desaulniers Cc: Nicolas Schier Cc: linux-kbuild@vger.kernel.org Cc: alsa-devel@alsa-project.org Reviewed-by: Takashi Iwai Reviewed-by: Masahiro Yamada --- v2: don't delete the HOSTAUDIO Kconfig entry (Masahiro) v3: drop HOSTAUDIO and use CONFIG_UML_SOUND for it in Makefile (Takashi); add SOUND depends on "|| UML" to HAS_IOMEM arch/um/drivers/Kconfig | 14 ++------------ arch/um/drivers/Makefile | 2 +- sound/Kconfig | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff -- a/arch/um/drivers/Kconfig b/arch/um/drivers/Kconfig --- a/arch/um/drivers/Kconfig +++ b/arch/um/drivers/Kconfig @@ -111,24 +111,14 @@ config SSL_CHAN config UML_SOUND tristate "Sound support" + select SOUND + select SOUND_OSS_CORE help This option enables UML sound support. If enabled, it will pull in soundcore and the UML hostaudio relay, which acts as a intermediary between the host's dsp and mixer devices and the UML sound system. It is safe to say 'Y' here. -config SOUND - tristate - default UML_SOUND - -config SOUND_OSS_CORE - bool - default UML_SOUND - -config HOSTAUDIO - tristate - default UML_SOUND - endmenu menu "UML Network Devices" diff -- a/sound/Kconfig b/sound/Kconfig --- a/sound/Kconfig +++ b/sound/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig SOUND tristate "Sound card support" - depends on HAS_IOMEM + depends on HAS_IOMEM || UML help If you have a sound card in your computer, i.e. if it can say more than an occasional beep, say Y. diff -- a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile --- a/arch/um/drivers/Makefile +++ b/arch/um/drivers/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_UML_NET) += net.o obj-$(CONFIG_MCONSOLE) += mconsole.o obj-$(CONFIG_MMAPPER) += mmapper_kern.o obj-$(CONFIG_BLK_DEV_UBD) += ubd.o -obj-$(CONFIG_HOSTAUDIO) += hostaudio.o +obj-$(CONFIG_UML_SOUND) += hostaudio.o obj-$(CONFIG_NULL_CHAN) += null.o obj-$(CONFIG_PORT_CHAN) += port.o obj-$(CONFIG_PTY_CHAN) += pty.o