From patchwork Mon Sep 9 19:51:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 173418 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp4818355ilq; Mon, 9 Sep 2019 12:52:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzB9tze0/ZZU/vHv9GOhnGr6V3vF++56ackut7jIK3C/TyJNSYl9MWIh5FHa3zxkfwmMa8m X-Received: by 2002:a05:6402:3ca:: with SMTP id t10mr26550112edw.271.1568058732947; Mon, 09 Sep 2019 12:52:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568058732; cv=none; d=google.com; s=arc-20160816; b=DqvLtkW0S+RbZeNSh1EgVSmeviLq4PvKQPdjSODINM4skXTGcQgDGHfnkXrDQ5+nm8 ljqZfgzxdMgw6Ihw4ztD5Fl50x+/JRT/b/s3Pc1pjQ137fc74IZZ2wTd7/+esr/Kf2YP KhzdHT9du5WN8bJe4PnZ/6ry9GOakI/k+whWQmz85VZR7yRZzqsTxdmxbmjv+2CG/Cmr XeXiFyPOmatfXyvqxCvM3Zlqgbatfzt2dS8v2Dd2ac786PAQoGecBxiK9EfG0TCAWSbU r6pdICMTJPsbl+q042vyWjrLG5gUTlmmvCZfQN5KAng18CsFvA5/IJjPLvbvinXCetZg DvpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=fCILGhZCIeyaKnOm4vjdbcjelpCSEF8HuKAuJcGvXmA=; b=MZSkZOXgyxifA+rea8jgp+Llso0yvEt+1VrVhxIzeBOREbMgvRs1nOHbbcSGcrQWeg oLqMJLVMRYnk4edUa2p8Qb5sCicmjv18NzGsj1TgEy9zqoNSlA5r7Tep3PAfOHCt8Zpe z8VX9KkqfFjhZEnGQIl0mZaiHHiS7+uMNKfN+s+P0PU1iF62TNLr2GcZvyl/I0nHzKZD EyB9p9g1NTu2IcSBCKRme0RY7VARplVl/C43a539Co7ydTkP+1dJw1YIokKtRwMwy08i owuJ+HQXSStVDZRCBplvVrA30BsfDgkt411u4SqgsxKFAJK8htKa1B158NduMD79imA1 X47A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n31si9312311edd.433.2019.09.09.12.52.12; Mon, 09 Sep 2019 12:52:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391546AbfIITwL (ORCPT + 28 others); Mon, 9 Sep 2019 15:52:11 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:50183 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731163AbfIITwL (ORCPT ); Mon, 9 Sep 2019 15:52:11 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1N1x2P-1iIZj622rR-012H2S; Mon, 09 Sep 2019 21:52:01 +0200 From: Arnd Bergmann To: Liam Girdwood , Mark Brown Cc: Arnd Bergmann , Pierre-Louis Bossart , Pan Xiuli , Evan Green , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: SOF: Intel: work around snd_hdac_aligned_read link failure Date: Mon, 9 Sep 2019 21:51:43 +0200 Message-Id: <20190909195159.3326134-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:gapkT++dW/u0T3Hv/dXCemLrT+qeHLxTRC7Df4YYvlCWiLXXb89 Z9FHg4c/nG9ra4DLNXZ0PcJkJ7cnzAgDLI6ZwLI2is1EJmyHtbzJ3bvrf9t7OAGaA1Xn95Q +47ZpbYw45l5GBldArJvAbecHUuaQrpMktX/zG9Oevaff1iVX4FBt2UzsNtCup/0u7N+0+S pB2ej5Z3stbRaf0bHVyaw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:5We9ZmG2fbc=:bEn6ODlb9DT5uU5/ve/uek jLpamsrcMYhJNidVceg3twMkEVGkFUVfweyUIBg9ZjGWYw0KFGjM9oqjtjVEoU49fBkoBK2ar cGn49aGt6XSME7QBKqMW0DZniDdBTMlReapev877tM6J1bfFRsDTIW97rXmCwV2AARRX/5iY/ XS+FjfaVDqJIBs8jNX6zd8sczJtRsEErVhwgWiq37BSVsFPfX65neuWJpFRhngDztD6MkziWd 0XWXSIPcqcA8tjRybiYT+wZZVqGXgT6usyiGu+06UWY5pYL162znoOSEkLyYbLlXrZrmchloG HKjT58PqGoPurmn7/cGfYjpc2aLBQQvSaRPBHLUMsXmyS/6S4wK2HD3tIvl0JVr89HxIRBq4L PtvTyJhM6esx3WeQ/YpBhZ05IdQqC2o3mdgbarzPtD+KcPg4hdR1dI17NsuCOhNI6ZNYxSR4J DyK7Vy5/9K0Lf7QRW8Av3VyEByNCql4GkifPCvW/JHCWebRJRcIrCnfN+PkzQ5kRMg1dzeIMR gHqVFJ6gaHYT9xmqjt6iHqFrZdUDy0dUb3l1gk+AW2OpjZhawPPNIbpf7Lakvedm6TqL9sCK+ 6Vy5I7r6Ej40l2jlxkLSIZ5hexbkIhux9dX2fyWt/z1sIzDXNImJEXFXnoDTL0cOFUfY8ocSs z831na6maxRBhKU/61FRzwoOSmWuLZ/qBTsDjLhiVJYFz61WkOslDA0j/EeEi3wjJq+zo/b7O h7vPC8XdHnbLotL9o/RrE7BK4Mqg9fuupc7KB4/aMQM5/vFlk3mKByAIBFcBE3pEHHmED9YED fBURvS36QpmMJaVD4SiLx8cfQOllWS04/4z7SCHagt7PzHHSs8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_SND_HDA_ALIGNED_MMIO is selected by another driver (i.e. Tegra) that selects CONFIG_SND_HDA_CORE as a loadable module, but SND_SOC_SOF_HDA_COMMON is built-in, we get a link failure from some functions that access the hda register: sound/soc/sof/intel/hda.o: In function `hda_ipc_irq_dump': hda.c:(.text+0x784): undefined reference to `snd_hdac_aligned_read' sound/soc/sof/intel/hda-stream.o: In function `hda_dsp_stream_threaded_handler': hda-stream.c:(.text+0x12e4): undefined reference to `snd_hdac_aligned_read' hda-stream.c:(.text+0x12f8): undefined reference to `snd_hdac_aligned_write' Add an explicit 'select' statement as a workaround. This is not a great solution, but it's the easiest way I could come up with. Signed-off-by: Arnd Bergmann --- sound/soc/sof/intel/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.0 diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index 479ba249e219..9180184026e1 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -248,6 +248,7 @@ config SND_SOC_SOF_HDA_COMMON tristate select SND_SOC_SOF_INTEL_COMMON select SND_SOC_SOF_HDA_LINK_BASELINE + select SND_HDA_CORE if SND_HDA_ALIGNED_MMIO help This option is not user-selectable but automagically handled by 'select' statements at a higher level