| Message ID | 1525383771-11105-3-git-send-email-conmanx360@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, 03 May 2018 23:42:44 +0200, Connor McAdams wrote: > > @@ -4691,8 +4699,17 @@ static void ca0132_free(struct hda_codec *codec) > > cancel_delayed_work_sync(&spec->unsol_hp_work); > snd_hda_power_up(codec); > - snd_hda_sequence_write(codec, spec->base_exit_verbs); > - ca0132_exit_chip(codec); > + switch (spec->quirk) { > + case QUIRK_SBZ: > + iounmap(spec->mem_base); > + snd_hda_sequence_write(codec, spec->base_exit_verbs); > + ca0132_exit_chip(codec); > + break; Do you need to unmap before the rest procedure? Usually the unmapping happens at the last, after all commands finished. > + default: > + snd_hda_sequence_write(codec, spec->base_exit_verbs); > + ca0132_exit_chip(codec); > + break; > + } > snd_hda_power_down(codec); > kfree(spec->spec_init_verbs); > kfree(codec->spec); So in this case, a cleaner way would be to add the conditional iounmap like: snd_hda_power_down(codec); if (spec->mem_base) iounmap(spec->mem_base); kfree(spec->spec_init_verbs); kfree(codec->spec); > @@ -4909,6 +4926,15 @@ static int patch_ca0132(struct hda_codec *codec) > else > spec->quirk = QUIRK_NONE; > > + /* Setup BAR Region 2 for Sound Blaster Z */ > + if (spec->quirk == QUIRK_SBZ) { > + spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); > + if (spec->mem_base == NULL) { > + codec_dbg(codec, "pci_iomap failed!"); > + codec_dbg(codec, "perhaps this is not an SBZ?"); This should be shown more explicitly, so better to be codec_warn() or codec_info(). thanks, Takashi
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 9347c9d..2f7f964 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -29,6 +29,9 @@ #include <linux/firmware.h> #include <linux/kernel.h> #include <sound/core.h> +#include <linux/types.h> +#include <linux/io.h> +#include <linux/pci.h> #include "hda_codec.h" #include "hda_local.h" #include "hda_auto_parser.h" @@ -760,6 +763,11 @@ struct ca0132_spec { #ifdef ENABLE_TUNING_CONTROLS long cur_ctl_vals[TUNING_CTLS_COUNT]; #endif + /* + * Sound Blaster Z PCI region 2 iomem, used for input and output + * switching, and other unknown commands. + */ + void __iomem *mem_base; }; /* @@ -4691,8 +4699,17 @@ static void ca0132_free(struct hda_codec *codec) cancel_delayed_work_sync(&spec->unsol_hp_work); snd_hda_power_up(codec); - snd_hda_sequence_write(codec, spec->base_exit_verbs); - ca0132_exit_chip(codec); + switch (spec->quirk) { + case QUIRK_SBZ: + iounmap(spec->mem_base); + snd_hda_sequence_write(codec, spec->base_exit_verbs); + ca0132_exit_chip(codec); + break; + default: + snd_hda_sequence_write(codec, spec->base_exit_verbs); + ca0132_exit_chip(codec); + break; + } snd_hda_power_down(codec); kfree(spec->spec_init_verbs); kfree(codec->spec); @@ -4909,6 +4926,15 @@ static int patch_ca0132(struct hda_codec *codec) else spec->quirk = QUIRK_NONE; + /* Setup BAR Region 2 for Sound Blaster Z */ + if (spec->quirk == QUIRK_SBZ) { + spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); + if (spec->mem_base == NULL) { + codec_dbg(codec, "pci_iomap failed!"); + codec_dbg(codec, "perhaps this is not an SBZ?"); + spec->quirk = QUIRK_NONE; + } + } spec->dsp_state = DSP_DOWNLOAD_INIT; spec->num_mixers = 1; spec->mixers[0] = ca0132_mixer;
This patch adds iomapping for the region2 section of memory on the SBZ. This memory region is used in later patches for setting inputs and outputs. If the mapping fails, the quirk is changed back to QUIRK_NONE to avoid attempts to write to uninitialized memory. It also adds a new exit sequence to unmap the iomem for the SBZ. Signed-off-by: Connor McAdams <conmanx360@gmail.com> --- sound/pci/hda/patch_ca0132.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-)