4 files changed, 80 insertions, 27 deletions

diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 896c3f45503b..e8346784cf3f 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -81,6 +81,7 @@ struct hdac_device {
         atomic_t in_pm;         /* suspend/resume being performed */
 
         /* sysfs */
+        struct mutex widget_lock;
         struct hdac_widget_tree *widgets;
 
         /* regmap */
diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c
index 95b073ee4b32..4769f4c03e14 100644
--- a/sound/hda/hdac_device.c
+++ b/sound/hda/hdac_device.c
@@ -55,6 +55,7 @@ int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus,
         codec->bus = bus;
         codec->addr = addr;
         codec->type = HDA_DEV_CORE;
+        mutex_init(&codec->widget_lock);
         pm_runtime_set_active(&codec->dev);
         pm_runtime_get_noresume(&codec->dev);
         atomic_set(&codec->in_pm, 0);
@@ -141,7 +142,9 @@ int snd_hdac_device_register(struct hdac_device *codec)
         err = device_add(&codec->dev);
         if (err < 0)
                 return err;
+        mutex_lock(&codec->widget_lock);
         err = hda_widget_sysfs_init(codec);
+        mutex_unlock(&codec->widget_lock);
         if (err < 0) {
                 device_del(&codec->dev);
                 return err;
@@ -158,7 +161,9 @@ EXPORT_SYMBOL_GPL(snd_hdac_device_register);
 void snd_hdac_device_unregister(struct hdac_device *codec)
 {
         if (device_is_registered(&codec->dev)) {
+                mutex_lock(&codec->widget_lock);
                 hda_widget_sysfs_exit(codec);
+                mutex_unlock(&codec->widget_lock);
                 device_del(&codec->dev);
                 snd_hdac_bus_remove_device(codec->bus, codec);
         }
@@ -404,7 +409,9 @@ int snd_hdac_refresh_widgets(struct hdac_device *codec, bool sysfs)
         }
 
         if (sysfs) {
+                mutex_lock(&codec->widget_lock);
                 err = hda_widget_sysfs_reinit(codec, start_nid, nums);
+                mutex_unlock(&codec->widget_lock);
                 if (err < 0)
                         return err;
         }
diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c
index fb2aa344981e..909d5ef1179c 100644
--- a/sound/hda/hdac_sysfs.c
+++ b/sound/hda/hdac_sysfs.c
@@ -395,6 +395,7 @@ static int widget_tree_create(struct hdac_device *codec)
         return 0;
 }
 
+/* call with codec->widget_lock held */
 int hda_widget_sysfs_init(struct hdac_device *codec)
 {
         int err;
@@ -411,11 +412,13 @@ int hda_widget_sysfs_init(struct hdac_device *codec)
         return 0;
 }
 
+/* call with codec->widget_lock held */
 void hda_widget_sysfs_exit(struct hdac_device *codec)
 {
         widget_tree_free(codec);
 }
 
+/* call with codec->widget_lock held */
 int hda_widget_sysfs_reinit(struct hdac_device *codec,
                             hda_nid_t start_nid, int num_nodes)
 {
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index c53ca589c930..f83f21d64dd4 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -478,12 +478,45 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool on)
                 set_eapd(codec, *p, on);
 }
 
+static int find_ext_mic_pin(struct hda_codec *codec);
+
+static void alc_headset_mic_no_shutup(struct hda_codec *codec)
+{
+        const struct hda_pincfg *pin;
+        int mic_pin = find_ext_mic_pin(codec);
+        int i;
+
+        /* don't shut up pins when unloading the driver; otherwise it breaks
+         * the default pin setup at the next load of the driver
+         */
+        if (codec->bus->shutdown)
+                return;
+
+        snd_array_for_each(&codec->init_pins, i, pin) {
+                /* use read here for syncing after issuing each verb */
+                if (pin->nid != mic_pin)
+                        snd_hda_codec_read(codec, pin->nid, 0,
+                                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
+        }
+
+        codec->pins_shutup = 1;
+}
+
 static void alc_shutup_pins(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
-        if (!spec->no_shutup_pins)
-                snd_hda_shutup_pins(codec);
+        switch (codec->core.vendor_id) {
+        case 0x10ec0286:
+        case 0x10ec0288:
+        case 0x10ec0298:
+                alc_headset_mic_no_shutup(codec);
+                break;
+        default:
+                if (!spec->no_shutup_pins)
+                        snd_hda_shutup_pins(codec);
+                break;
+        }
 }
 
 /* generic shutup callback;
@@ -502,7 +535,6 @@ static void alc_eapd_shutup(struct hda_codec *codec)
 /* generic EAPD initialization */
 static void alc_auto_init_amp(struct hda_codec *codec, int type)
 {
-        alc_fill_eapd_coef(codec);
         alc_auto_setup_eapd(codec, true);
         alc_write_gpio(codec);
         switch (type) {
@@ -797,10 +829,22 @@ static int alc_build_controls(struct hda_codec *codec)
  * Common callbacks
  */
 
+static void alc_pre_init(struct hda_codec *codec)
+{
+        alc_fill_eapd_coef(codec);
+}
+
+#define is_s4_resume(codec) \
+        ((codec)->core.dev.power.power_state.event == PM_EVENT_RESTORE)
+
 static int alc_init(struct hda_codec *codec)
 {
         struct alc_spec *spec = codec->spec;
 
+        /* hibernation resume needs the full chip initialization */
+        if (is_s4_resume(codec))
+                alc_pre_init(codec);
+
         if (spec->init_hook)
                 spec->init_hook(codec);
 
@@ -1538,6 +1582,8 @@ static int patch_alc880(struct hda_codec *codec)
 
         codec->patch_ops.unsol_event = alc880_unsol_event;
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, alc880_fixup_models, alc880_fixup_tbl,
                        alc880_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -1789,6 +1835,8 @@ static int patch_alc260(struct hda_codec *codec)
 
         spec->shutup = alc_eapd_shutup;
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, alc260_fixup_models, alc260_fixup_tbl,
                            alc260_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -2492,6 +2540,8 @@ static int patch_alc882(struct hda_codec *codec)
                 break;
         }
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, alc882_fixup_models, alc882_fixup_tbl,
                        alc882_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -2666,6 +2716,8 @@ static int patch_alc262(struct hda_codec *codec)
 #endif
         alc_fix_pll_init(codec, 0x20, 0x0a, 10);
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, alc262_fixup_models, alc262_fixup_tbl,
                        alc262_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
@@ -2810,6 +2862,8 @@ static int patch_alc268(struct hda_codec *codec)
 
         spec->shutup = alc_eapd_shutup;
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
@@ -2924,27 +2978,6 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
         return alc_parse_auto_config(codec, alc269_ignore, ssids);
 }
 
-static int find_ext_mic_pin(struct hda_codec *codec);
-
-static void alc286_shutup(struct hda_codec *codec)
-{
-        const struct hda_pincfg *pin;
-        int i;
-        int mic_pin = find_ext_mic_pin(codec);
-        /* don't shut up pins when unloading the driver; otherwise it breaks
-         * the default pin setup at the next load of the driver
-         */
-        if (codec->bus->shutdown)
-                return;
-        snd_array_for_each(&codec->init_pins, i, pin) {
-                /* use read here for syncing after issuing each verb */
-                if (pin->nid != mic_pin)
-                        snd_hda_codec_read(codec, pin->nid, 0,
-                                        AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
-        }
-        codec->pins_shutup = 1;
-}
-
 static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up)
 {
         alc_update_coef_idx(codec, 0x04, 1 << 11, power_up ? (1 << 11) : 0);
@@ -6964,7 +6997,9 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x1558, 0x1325, "System76 Darter Pro (darp5)", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
         SND_PCI_QUIRK(0x1558, 0x8550, "System76 Gazelle (gaze14)", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
-        SND_PCI_QUIRK(0x1558, 0x8560, "System76 Gazelle (gaze14)", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x8551, "System76 Gazelle (gaze14)", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
+        SND_PCI_QUIRK(0x1558, 0x8560, "System76 Gazelle (gaze14)", ALC269_FIXUP_HEADSET_MIC),
+        SND_PCI_QUIRK(0x1558, 0x8561, "System76 Gazelle (gaze14)", ALC269_FIXUP_HEADSET_MIC),
         SND_PCI_QUIRK(0x17aa, 0x1036, "Lenovo P520", ALC233_FIXUP_LENOVO_MULTI_CODECS),
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x17aa, 0x215e, "Thinkpad L512", ALC269_FIXUP_SKU_IGNORE),
@@ -7007,7 +7042,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x313c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
         SND_PCI_QUIRK(0x17aa, 0x3902, "Lenovo E50-80", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
         SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC),
-        SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP),
+        SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo B50-70", ALC269_FIXUP_DMIC_THINKPAD_ACPI),
         SND_PCI_QUIRK(0x17aa, 0x5013, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
         SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC),
         SND_PCI_QUIRK(0x17aa, 0x501e, "Thinkpad L440", ALC292_FIXUP_TPT440_DOCK),
@@ -7736,7 +7771,6 @@ static int patch_alc269(struct hda_codec *codec)
         case 0x10ec0286:
         case 0x10ec0288:
                 spec->codec_variant = ALC269_TYPE_ALC286;
-                spec->shutup = alc286_shutup;
                 break;
         case 0x10ec0298:
                 spec->codec_variant = ALC269_TYPE_ALC298;
@@ -7805,6 +7839,8 @@ static int patch_alc269(struct hda_codec *codec)
                 spec->init_hook = alc5505_dsp_init;
         }
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, alc269_fixup_models,
                        alc269_fixup_tbl, alc269_fixups);
         snd_hda_pick_pin_fixup(codec, alc269_pin_fixup_tbl, alc269_fixups);
@@ -7947,6 +7983,8 @@ static int patch_alc861(struct hda_codec *codec)
         spec->power_hook = alc_power_eapd;
 #endif
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
@@ -8044,6 +8082,8 @@ static int patch_alc861vd(struct hda_codec *codec)
 
         spec->shutup = alc_eapd_shutup;
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
         snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
 
@@ -8779,6 +8819,8 @@ static int patch_alc662(struct hda_codec *codec)
                 break;
         }
 
+        alc_pre_init(codec);
+
         snd_hda_pick_fixup(codec, alc662_fixup_models,
                        alc662_fixup_tbl, alc662_fixups);
         snd_hda_pick_pin_fixup(codec, alc662_pin_fixup_tbl, alc662_fixups);