diff options
author | Hans de Goede <hdegoede@redhat.com> | 2018-03-16 16:28:08 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2018-04-01 08:25:31 -0400 |
commit | bb5208b314c5127b716b2ee4f55803a8bb73b750 (patch) | |
tree | ca71cf1e81ebc4d6c90c5ae54987158886cd4e2a | |
parent | e09070c51b280567695022237e57c428e548b355 (diff) |
Bluetooth: hci_bcm: Treat Interrupt ACPI resources as always being active-low
Older devices with a serdev attached bcm bt hci, use an Interrupt ACPI
resource to describe the IRQ (rather then a GpioInt resource).
These device seem to all claim the IRQ is active-high and seem to all need
a DMI quirk to treat it as active-low. Instead simply always assume that
Interrupt resource specified IRQs are always active-low.
This fixes the bt device not being able to wake the host from runtime-
suspend on the: Asus T100TAM, Asus T200TA, Lenovo Yoga2 and the Toshiba
Encore, without the need to add 4 new DMI quirks for these models.
This also allows us to remove 2 DMI quirks for the Asus T100TA and Asus
T100CHI series. Likely the 2 remaining quirks can also be removed but I
could not find a DSDT of these devices to verify this.
Cc: stable@vger.kernel.org
Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=198953
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1554835
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | drivers/bluetooth/hci_bcm.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 50c8523f8653..ce8c629c0eac 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c | |||
@@ -799,22 +799,6 @@ static const struct acpi_gpio_mapping acpi_bcm_int_first_gpios[] = { | |||
799 | #ifdef CONFIG_ACPI | 799 | #ifdef CONFIG_ACPI |
800 | /* IRQ polarity of some chipsets are not defined correctly in ACPI table. */ | 800 | /* IRQ polarity of some chipsets are not defined correctly in ACPI table. */ |
801 | static const struct dmi_system_id bcm_active_low_irq_dmi_table[] = { | 801 | static const struct dmi_system_id bcm_active_low_irq_dmi_table[] = { |
802 | { | ||
803 | .ident = "Asus T100TA", | ||
804 | .matches = { | ||
805 | DMI_EXACT_MATCH(DMI_SYS_VENDOR, | ||
806 | "ASUSTeK COMPUTER INC."), | ||
807 | DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"), | ||
808 | }, | ||
809 | }, | ||
810 | { | ||
811 | .ident = "Asus T100CHI", | ||
812 | .matches = { | ||
813 | DMI_EXACT_MATCH(DMI_SYS_VENDOR, | ||
814 | "ASUSTeK COMPUTER INC."), | ||
815 | DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100CHI"), | ||
816 | }, | ||
817 | }, | ||
818 | { /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */ | 802 | { /* Handle ThinkPad 8 tablets with BCM2E55 chipset ACPI ID */ |
819 | .ident = "Lenovo ThinkPad 8", | 803 | .ident = "Lenovo ThinkPad 8", |
820 | .matches = { | 804 | .matches = { |
@@ -842,7 +826,9 @@ static int bcm_resource(struct acpi_resource *ares, void *data) | |||
842 | switch (ares->type) { | 826 | switch (ares->type) { |
843 | case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: | 827 | case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: |
844 | irq = &ares->data.extended_irq; | 828 | irq = &ares->data.extended_irq; |
845 | dev->irq_active_low = irq->polarity == ACPI_ACTIVE_LOW; | 829 | if (irq->polarity != ACPI_ACTIVE_LOW) |
830 | dev_info(dev->dev, "ACPI Interrupt resource is active-high, this is usually wrong, treating the IRQ as active-low\n"); | ||
831 | dev->irq_active_low = true; | ||
846 | break; | 832 | break; |
847 | 833 | ||
848 | case ACPI_RESOURCE_TYPE_GPIO: | 834 | case ACPI_RESOURCE_TYPE_GPIO: |