Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Subject: [PATCH 2/7] ALSA: control: Add power state check commonly for ioctl handlers
Date: Tue, 18 May 2021 18:51:56 +0200	[thread overview]
Message-ID: <20210518165201.24376-3-tiwai@suse.de> (raw)
In-Reply-To: <20210518165201.24376-1-tiwai@suse.de>

The card power state check can be better put in the common ioctl
handler, as basically we want to prevent ioctls during the power off
state.  Although this situation won't happen normally any longer (*),
it'll be helpful for catching this for the future implementation like
the faked suspend that is needed for PCI rescan.

(*) Long long time ago, before the proper PM framework was introduced,
it was still possible to reach SNDRV_CTL_IOCTL_POWER ioctl during the
power off state.  This ioctl existed as a main control for the suspend
resume state in the past, but the feature was already dropped along
with the standard PM framework.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/core/control.c        | 3 +++
 sound/core/control_compat.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sound/core/control.c b/sound/core/control.c
index 498e3701514a..c22c3fad0c64 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1772,6 +1772,9 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg
 	card = ctl->card;
 	if (snd_BUG_ON(!card))
 		return -ENXIO;
+	err = snd_power_wait(card, SNDRV_CTL_POWER_D0);
+	if (err < 0)
+		return err;
 	switch (cmd) {
 	case SNDRV_CTL_IOCTL_PVERSION:
 		return put_user(SNDRV_CTL_VERSION, ip) ? -EFAULT : 0;
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 1d708aab9c98..d5b562ff237b 100644
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -438,6 +438,9 @@ static inline long snd_ctl_ioctl_compat(struct file *file, unsigned int cmd, uns
 	if (snd_BUG_ON(!ctl || !ctl->card))
 		return -ENXIO;
 
+	err = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0);
+	if (err < 0)
+		return err;
 	switch (cmd) {
 	case SNDRV_CTL_IOCTL_PVERSION:
 	case SNDRV_CTL_IOCTL_CARD_INFO:
-- 
2.26.2


  parent reply	other threads:[~2021-05-18 16:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-18 16:51 [PATCH 0/7] ALSA: Prep work for PCI rescan support Takashi Iwai
2021-05-18 16:51 ` [PATCH 1/7] ALSA: core: Use READ_ONCE() / WRITE_ONCE() for power state change Takashi Iwai
2021-05-18 16:51 ` Takashi Iwai [this message]
2021-05-18 18:00   ` [PATCH 2/7] ALSA: control: Add power state check commonly for ioctl handlers Jaroslav Kysela
2021-05-18 19:31     ` Takashi Iwai
2021-05-18 16:51 ` [PATCH 3/7] ALSA: control: Drop superfluous snd_power_wait() calls Takashi Iwai
2021-05-18 16:51 ` [PATCH 4/7] ALSA: control: Minor optimization for SNDRV_CTL_IOCTL_POWER_STATE Takashi Iwai
2021-05-18 16:51 ` [PATCH 5/7] ALSA: control: Track in-flight control read/write/tlv accesses Takashi Iwai
2021-05-18 18:01   ` Jaroslav Kysela
2021-05-18 18:54     ` Takashi Iwai
2021-05-18 16:52 ` [PATCH 6/7] ALSA: pcm: Block the release until the system resume finishes Takashi Iwai
2021-05-18 16:52 ` [PATCH 7/7] ALSA: Drop superfluous argument from snd_power_wait() Takashi Iwai

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=20210518165201.24376-3-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=andrey.grodzovsky@amd.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox