Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753857AbaF3CEU (ORCPT ); Sun, 29 Jun 2014 22:04:20 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:55362 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753378AbaF3CET (ORCPT ); Sun, 29 Jun 2014 22:04:19 -0400 Message-ID: <53B0C596.6090007@canonical.com> Date: Mon, 30 Jun 2014 10:04:06 +0800 From: Hui Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Jan Kiszka CC: Hui Wang , tiwai@suse.de, alsa-devel@alsa-project.org, alex.hung@canonical.com, yk@canonical.com, david.henningsson@canonical.com, Linux Kernel Mailing List Subject: Re: [V2 PATCH] ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Conexant codec References: <1385534846-20829-1-git-send-email-hui.wang@canonical.com> <53AFF992.5030403@web.de> In-Reply-To: <53AFF992.5030403@web.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/29/2014 07:33 PM, Jan Kiszka wrote: > On 2013-11-27 07:47, Hui Wang wrote: >> Most Thinkpad Edge series laptops use conexant codec, so far although >> the codecs have different minor Vendor Id and minor Subsystem Id, >> they all belong to the cxt5066 family, this change can make the >> mute/mic-mute LEDs support more generic among cxt_5066 family. >> >> This design refers to the similar solution for the realtek codec >> ALC269 family in the patch_realtek.c. >> >> Cc: Alex Hung >> Cc: David Henningsson >> Signed-off-by: Hui Wang >> --- >> sound/pci/hda/patch_conexant.c | 23 +++++++++++++++++++++++ >> 1 file changed, 23 insertions(+) >> >> diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c >> index c205bb1..1f2717f 100644 >> --- a/sound/pci/hda/patch_conexant.c >> +++ b/sound/pci/hda/patch_conexant.c >> @@ -3244,9 +3244,29 @@ enum { >> #if IS_ENABLED(CONFIG_THINKPAD_ACPI) >> >> #include >> +#include >> >> static int (*led_set_func)(int, bool); >> >> +static acpi_status acpi_check_cb(acpi_handle handle, u32 lvl, void *context, >> + void **rv) >> +{ >> + bool *found = context; >> + *found = true; >> + return AE_OK; >> +} >> + >> +static bool is_thinkpad(struct hda_codec *codec) >> +{ >> + bool found = false; >> + if (codec->subsystem_id >> 16 != 0x17aa) >> + return false; >> + if (ACPI_SUCCESS(acpi_get_devices("LEN0068", acpi_check_cb, &found, NULL)) && found) >> + return true; >> + found = false; >> + return ACPI_SUCCESS(acpi_get_devices("IBM0068", acpi_check_cb, &found, NULL)) && found; >> +} >> + >> static void update_tpacpi_mute_led(void *private_data, int enabled) >> { >> struct hda_codec *codec = private_data; >> @@ -3279,6 +3299,8 @@ static void cxt_fixup_thinkpad_acpi(struct hda_codec *codec, >> bool removefunc = false; >> >> if (action == HDA_FIXUP_ACT_PROBE) { >> + if (!is_thinkpad(codec)) >> + return; >> if (!led_set_func) >> led_set_func = symbol_request(tpacpi_led_set); >> if (!led_set_func) { >> @@ -3494,6 +3516,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { >> SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), >> SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC), >> SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), >> + SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI), >> SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004), >> SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205), >> {} >> > Starting with this patch, my Lenovo Thinkpad X121e netbook (it's without > any mute LEDs, BTW, there is only a power LED) considers the power > button as hard reset. I have to exclude my machine from that ACPI fixup > (this is on top of current Linus master): It seems more like a firmware issue, in the acpi code, the "SSMS" is for mute led, and the "MMTS" is for micmute led, I don't know why your machine can pass "SSMS" or "MMTS" scanning even without mute LEDs. > diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c > index 6ba0b55..7e1a179 100644 > --- a/sound/pci/hda/thinkpad_helper.c > +++ b/sound/pci/hda/thinkpad_helper.c > @@ -21,7 +21,8 @@ static acpi_status acpi_check_cb(acpi_handle handle, u32 lvl, void *context, > static bool is_thinkpad(struct hda_codec *codec) > { > bool found = false; > - if (codec->subsystem_id >> 16 != 0x17aa) > + if (codec->subsystem_id >> 16 != 0x17aa || > + codec->subsystem_id == 0x17aa21ec) > return false; > if (ACPI_SUCCESS(acpi_get_devices("LEN0068", acpi_check_cb, &found, NULL)) && found) > return true; > > > Is that the way to address it? Then I can send a proper patch. Any hints > regarding the "why" will be incorporated into its description. > > Thanks, > Jan > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/