From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jon Hunter <jonathanh@nvidia.com>, Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.11 14/44] ASoC: soc-core: Prevent warning if no DMI table is present Date: Thu, 25 Mar 2021 07:24:29 -0400 [thread overview] Message-ID: <20210325112459.1926846-14-sashal@kernel.org> (raw) In-Reply-To: <20210325112459.1926846-1-sashal@kernel.org> From: Jon Hunter <jonathanh@nvidia.com> [ Upstream commit 7de14d581dbed57c2b3c6afffa2c3fdc6955a3cd ] Many systems do not use ACPI and hence do not provide a DMI table. On non-ACPI systems a warning, such as the following, is printed on boot. WARNING KERN tegra-audio-graph-card sound: ASoC: no DMI vendor name! The variable 'dmi_available' is not exported and so currently cannot be used by kernel modules without adding an accessor. However, it is possible to use the function is_acpi_device_node() to determine if the sound card is an ACPI device and hence indicate if we expect a DMI table to be present. Therefore, call is_acpi_device_node() to see if we are using ACPI and only parse the DMI table if we are booting with ACPI. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Link: https://lore.kernel.org/r/20210303115526.419458-1-jonathanh@nvidia.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/soc/soc-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f6d4e99b590c..0cffc9527e28 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -31,6 +31,7 @@ #include <linux/of.h> #include <linux/of_graph.h> #include <linux/dmi.h> +#include <linux/acpi.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -1573,6 +1574,9 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) if (card->long_name) return 0; /* long name already set by driver or from DMI */ + if (!is_acpi_device_node(card->dev->fwnode)) + return 0; + /* make up dmi long name as: vendor-product-version-board */ vendor = dmi_get_system_info(DMI_BOARD_VENDOR); if (!vendor || !is_dmi_valid(vendor)) { -- 2.30.1
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin <sashal@kernel.org>, alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>, Jon Hunter <jonathanh@nvidia.com> Subject: [PATCH AUTOSEL 5.11 14/44] ASoC: soc-core: Prevent warning if no DMI table is present Date: Thu, 25 Mar 2021 07:24:29 -0400 [thread overview] Message-ID: <20210325112459.1926846-14-sashal@kernel.org> (raw) In-Reply-To: <20210325112459.1926846-1-sashal@kernel.org> From: Jon Hunter <jonathanh@nvidia.com> [ Upstream commit 7de14d581dbed57c2b3c6afffa2c3fdc6955a3cd ] Many systems do not use ACPI and hence do not provide a DMI table. On non-ACPI systems a warning, such as the following, is printed on boot. WARNING KERN tegra-audio-graph-card sound: ASoC: no DMI vendor name! The variable 'dmi_available' is not exported and so currently cannot be used by kernel modules without adding an accessor. However, it is possible to use the function is_acpi_device_node() to determine if the sound card is an ACPI device and hence indicate if we expect a DMI table to be present. Therefore, call is_acpi_device_node() to see if we are using ACPI and only parse the DMI table if we are booting with ACPI. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Link: https://lore.kernel.org/r/20210303115526.419458-1-jonathanh@nvidia.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/soc/soc-core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f6d4e99b590c..0cffc9527e28 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -31,6 +31,7 @@ #include <linux/of.h> #include <linux/of_graph.h> #include <linux/dmi.h> +#include <linux/acpi.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -1573,6 +1574,9 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) if (card->long_name) return 0; /* long name already set by driver or from DMI */ + if (!is_acpi_device_node(card->dev->fwnode)) + return 0; + /* make up dmi long name as: vendor-product-version-board */ vendor = dmi_get_system_info(DMI_BOARD_VENDOR); if (!vendor || !is_dmi_valid(vendor)) { -- 2.30.1
next prev parent reply other threads:[~2021-03-25 11:26 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-25 11:24 [PATCH AUTOSEL 5.11 01/44] virtiofs: Fail dax mount if device does not support it Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 02/44] ext4: shrink race window in ext4_should_retry_alloc() Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 03/44] ext4: add reclaim checks to xattr code Sasha Levin 2021-03-25 14:30 ` Jan Kara 2021-03-30 21:14 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 04/44] fs/ext4: fix integer overflow in s_log_groups_per_flex Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 05/44] ext4: fix bh ref count on error paths Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 06/44] fs: nfsd: fix kconfig dependency warning for NFSD_V4 Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 07/44] rpc: fix NULL dereference on kmalloc failure Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 08/44] iomap: Fix negative assignment to unsigned sis->pages in iomap_swapfile_activate Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 09/44] ASoC: rt1015: fix i2c communication error Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 10/44] ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10 Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 11/44] ASoC: rt5651: " Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 12/44] ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 13/44] ASoC: es8316: Simplify adc_pga_gain_tlv table Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` Sasha Levin [this message] 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 14/44] ASoC: soc-core: Prevent warning if no DMI table is present Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 15/44] ASoC: cs42l42: Fix Bitclock polarity inversion Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 16/44] ASoC: cs42l42: Fix channel width support Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 17/44] ASoC: cs42l42: Fix mixer volume control Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 18/44] ASoC: cs42l42: Always wait at least 3ms after reset Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 19/44] NFSD: fix error handling in NFSv4.0 callbacks Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 20/44] ASoC: mediatek: mt8192: fix tdm out data is valid on rising edge Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 21/44] kernel: freezer should treat PF_IO_WORKER like PF_KTHREAD for freezing Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 22/44] powerpc: Force inlining of cpu_has_feature() to avoid build failure Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 23/44] vhost: Fix vhost_vq_reset() Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 24/44] io_uring: fix ->flags races by linked timeouts Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 25/44] io_uring: halt SQO submission on ctx exit Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 26/44] btrfs: track qgroup released data in own variable in insert_prealloc_file_extent Sasha Levin 2021-03-25 12:08 ` David Sterba 2021-03-30 21:15 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 27/44] scsi: st: Fix a use after free in st_open() Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 28/44] scsi: qla2xxx: Fix broken #endif placement Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 29/44] staging: comedi: cb_pcidas: fix request_irq() warn Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 30/44] staging: comedi: cb_pcidas64: " Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 31/44] ASoC: rt5659: Update MCLK rate in set_sysclk() Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 32/44] ASoC: rt711: add snd_soc_component remove callback Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 33/44] thermal/core: Add NULL pointer check before using cooling device stats Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 34/44] locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 35/44] locking/ww_mutex: Fix acquire/release imbalance in ww_acquire_init()/ww_acquire_fini() Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 36/44] nvmet-tcp: fix kmap leak when data digest in use Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 37/44] io_uring: imply MSG_NOSIGNAL for send[msg]()/recv[msg]() calls Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 38/44] Revert "PM: ACPI: reboot: Use S5 for reboot" Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 39/44] nouveau: Skip unvailable ttm page entries Sasha Levin 2021-03-25 11:24 ` Sasha Levin 2021-03-25 11:24 ` [Nouveau] " Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 40/44] static_call: Align static_call_is_init() patching condition Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 41/44] ext4: do not iput inode under running transaction in ext4_rename() Sasha Levin 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 42/44] signal: don't allow sending any signals to PF_IO_WORKER threads Sasha Levin 2021-03-25 11:32 ` Stefan Metzmacher 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 43/44] signal: don't allow STOP on " Sasha Levin 2021-03-25 11:34 ` Stefan Metzmacher 2021-03-25 12:04 ` Eric W. Biederman 2021-03-25 12:11 ` Stefan Metzmacher 2021-03-25 13:38 ` Jens Axboe 2021-03-25 13:56 ` Stefan Metzmacher 2021-03-25 14:02 ` Jens Axboe 2021-03-25 15:00 ` Sasha Levin 2021-03-25 15:10 ` Jens Axboe 2021-03-25 11:24 ` [PATCH AUTOSEL 5.11 44/44] io_uring: call req_set_fail_links() on short send[msg]()/recv[msg]() with MSG_WAITALL Sasha Levin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210325112459.1926846-14-sashal@kernel.org \ --to=sashal@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=jonathanh@nvidia.com \ --cc=linux-kernel@vger.kernel.org \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.