From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: tiwai@suse.com
Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>,
Jaroslav Kysela <perex@perex.cz>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Alex Deucher <alexander.deucher@amd.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
alsa-devel@alsa-project.org (moderated list:SOUND),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/4] ALSA: hda: Stop mangling PCI MSI
Date: Fri, 23 Oct 2020 18:23:36 +0800 [thread overview]
Message-ID: <20201023102340.25494-2-kai.heng.feng@canonical.com> (raw)
In-Reply-To: <20201023102340.25494-1-kai.heng.feng@canonical.com>
The code predates 2005, it should be unnecessary now as PCI core handles
MSI much better nowadays.
So stop PCI MSI mangling in suspend/resume callbacks.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
sound/pci/hda/hda_intel.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 749b88090970..b4aa1dcf1aae 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1022,13 +1022,11 @@ static int azx_suspend(struct device *dev)
{
struct snd_card *card = dev_get_drvdata(dev);
struct azx *chip;
- struct hdac_bus *bus;
if (!azx_is_pm_ready(card))
return 0;
chip = card->private_data;
- bus = azx_bus(chip);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
/* An ugly workaround: direct call of __azx_runtime_suspend() and
* __azx_runtime_resume() for old Intel platforms that suffer from
@@ -1038,14 +1036,6 @@ static int azx_suspend(struct device *dev)
__azx_runtime_suspend(chip);
else
pm_runtime_force_suspend(dev);
- if (bus->irq >= 0) {
- free_irq(bus->irq, chip);
- bus->irq = -1;
- chip->card->sync_irq = -1;
- }
-
- if (chip->msi)
- pci_disable_msi(chip->pci);
trace_azx_suspend(chip);
return 0;
@@ -1060,11 +1050,6 @@ static int azx_resume(struct device *dev)
return 0;
chip = card->private_data;
- if (chip->msi)
- if (pci_enable_msi(chip->pci) < 0)
- chip->msi = 0;
- if (azx_acquire_irq(chip, 1) < 0)
- return -EIO;
if (chip->driver_caps & AZX_DCAPS_SUSPEND_SPURIOUS_WAKEUP)
__azx_runtime_resume(chip, false);
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: tiwai@suse.com
Cc: "moderated list:SOUND" <alsa-devel@alsa-project.org>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
open list <linux-kernel@vger.kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 2/4] ALSA: hda: Stop mangling PCI MSI
Date: Fri, 23 Oct 2020 18:23:36 +0800 [thread overview]
Message-ID: <20201023102340.25494-2-kai.heng.feng@canonical.com> (raw)
In-Reply-To: <20201023102340.25494-1-kai.heng.feng@canonical.com>
The code predates 2005, it should be unnecessary now as PCI core handles
MSI much better nowadays.
So stop PCI MSI mangling in suspend/resume callbacks.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
sound/pci/hda/hda_intel.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 749b88090970..b4aa1dcf1aae 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1022,13 +1022,11 @@ static int azx_suspend(struct device *dev)
{
struct snd_card *card = dev_get_drvdata(dev);
struct azx *chip;
- struct hdac_bus *bus;
if (!azx_is_pm_ready(card))
return 0;
chip = card->private_data;
- bus = azx_bus(chip);
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
/* An ugly workaround: direct call of __azx_runtime_suspend() and
* __azx_runtime_resume() for old Intel platforms that suffer from
@@ -1038,14 +1036,6 @@ static int azx_suspend(struct device *dev)
__azx_runtime_suspend(chip);
else
pm_runtime_force_suspend(dev);
- if (bus->irq >= 0) {
- free_irq(bus->irq, chip);
- bus->irq = -1;
- chip->card->sync_irq = -1;
- }
-
- if (chip->msi)
- pci_disable_msi(chip->pci);
trace_azx_suspend(chip);
return 0;
@@ -1060,11 +1050,6 @@ static int azx_resume(struct device *dev)
return 0;
chip = card->private_data;
- if (chip->msi)
- if (pci_enable_msi(chip->pci) < 0)
- chip->msi = 0;
- if (azx_acquire_irq(chip, 1) < 0)
- return -EIO;
if (chip->driver_caps & AZX_DCAPS_SUSPEND_SPURIOUS_WAKEUP)
__azx_runtime_resume(chip, false);
--
2.17.1
next prev parent reply other threads:[~2020-10-23 10:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 10:23 [PATCH 1/4] ALSA: hda: Refactor codec PM to use direct-complete optimization Kai-Heng Feng
2020-10-23 10:23 ` Kai-Heng Feng
2020-10-23 10:23 ` Kai-Heng Feng [this message]
2020-10-23 10:23 ` [PATCH 2/4] ALSA: hda: Stop mangling PCI MSI Kai-Heng Feng
2020-10-23 11:34 ` Takashi Iwai
2020-10-23 11:34 ` Takashi Iwai
2020-10-23 12:53 ` Kai-Heng Feng
2020-10-23 12:53 ` Kai-Heng Feng
2020-10-23 12:59 ` Takashi Iwai
2020-10-23 12:59 ` Takashi Iwai
2020-10-23 10:23 ` [PATCH 3/4] ALSA: hda: Refactor controller PM to use direct-complete optimization Kai-Heng Feng
2020-10-23 10:23 ` Kai-Heng Feng
2020-10-23 11:36 ` Takashi Iwai
2020-10-23 11:36 ` Takashi Iwai
2020-10-23 13:02 ` Kai-Heng Feng
2020-10-23 13:02 ` Kai-Heng Feng
2020-10-23 15:31 ` kernel test robot
2020-10-23 15:31 ` kernel test robot
2020-10-23 15:31 ` kernel test robot
2020-10-23 10:23 ` [PATCH 4/4] ALSA: hda: Reinstate runtime_allow() for all hda controllers Kai-Heng Feng
2020-10-23 10:23 ` Kai-Heng Feng
2020-10-23 11:32 ` [PATCH 1/4] ALSA: hda: Refactor codec PM to use direct-complete optimization Takashi Iwai
2020-10-23 11:32 ` Takashi Iwai
2020-10-23 12:44 ` Kai-Heng Feng
2020-10-23 12:44 ` Kai-Heng Feng
2020-10-23 13:04 ` Takashi Iwai
2020-10-23 13:04 ` 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=20201023102340.25494-2-kai.heng.feng@canonical.com \
--to=kai.heng.feng@canonical.com \
--cc=alexander.deucher@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=kai.vehmanen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.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 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.