Skip to contentSkip to conversation

Fujitsu extra buttons not working on S6010

PATCH New Thomas Richter 2 participants 4 messages Oct 6, 2014 – Oct 12, 2014 2 messages not in the archive

Subsystems (2)
x86 ACPI
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 29964_1412366647_542F0137_29964_4513_9_542EFC10.7020508@math.tu-berlin.de

Thomas Richter

author
#1 lore raw

Dear experts,

Quoted 57 lines

following the bug report on bugzilla

https://bugzilla.kernel.org/show_bug.cgi?id=84381

the extra buttons (ACPI-driven buttons) on the R31 laptop do not work since kernel 3.17.0. Kernel 3.16.x worked fine. The same problem (or at least a very similar problem) exists on the Fujitsu-S6010 laptop.

After debugging for a while, the culprit seems to be in arch/x86/kernel/acpi/boot.c, in specific in acpi_gsi_to_irq(). The following changes fix this problem for at least the S6010:

static unsigned int gsi_to_irq(unsigned int gsi)

{
    unsigned int irq = gsi + NR_IRQS_LEGACY;
    unsigned int i;

    for (i = 0; i<  NR_IRQS_LEGACY; i++) {
        if (isa_irq_to_gsi[i] == gsi) {
            return i;
        }
    }

    /* Provide an identity mapping of gsi == irq
     * except on truly weird platforms that have
     * non isa irqs in the first 16 gsis.
     */
    if (gsi>= NR_IRQS_LEGACY)
        irq = gsi;
    else
        irq = gsi_top + gsi;

    return irq;
}

/* THOR: Experimental end */

int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp) {
int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC |
IOAPIC_MAP_CHECK);

    if (irq>= 0) {
        *irqp = irq;
        return 0;
    }

    /* THOR: Experimental start */
    irq = gsi_to_irq(gsi);
    if (irq>= 0) {
      *irqp = irq;
      return 0;
    }
    /* THOR Experimental end */

    return -1;
}
Quoted 1 line

Whether this works on the R31 is yet to be determined.

The above patch has now also been tested on the IBM R31, and yes, it also fixes the system keys there: Thinklight, volume up & down and various other system-driven key-combinations now work again.

Could you please pick this patch up or comment on better alternatives?

Thank you,
Thomas

#2 lore raw
Quoted 62 lines · Thomas Richter

Dear experts,

Quoted 61 lines

following the bug report on bugzilla

https://bugzilla.kernel.org/show_bug.cgi?id=84381

the extra buttons (ACPI-driven buttons) on the R31 laptop do not work since kernel 3.17.0.
Kernel 3.16.x worked fine. The same problem (or at least a very similar problem) exists
on the Fujitsu-S6010 laptop.

After debugging for a while, the culprit seems to be in arch/x86/kernel/acpi/boot.c, in specific
in acpi_gsi_to_irq(). The following changes fix this problem for at least the S6010:

static unsigned int gsi_to_irq(unsigned int gsi)

{
    unsigned int irq = gsi + NR_IRQS_LEGACY;
    unsigned int i;

    for (i = 0; i<  NR_IRQS_LEGACY; i++) {
        if (isa_irq_to_gsi[i] == gsi) {
            return i;
        }
    }

    /* Provide an identity mapping of gsi == irq
     * except on truly weird platforms that have
     * non isa irqs in the first 16 gsis.
     */
    if (gsi>= NR_IRQS_LEGACY)
        irq = gsi;
    else
        irq = gsi_top + gsi;

    return irq;
}

/* THOR: Experimental end */

int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp) {
int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC |
IOAPIC_MAP_CHECK);

    if (irq>= 0) {
        *irqp = irq;
        return 0;
    }

    /* THOR: Experimental start */
    irq = gsi_to_irq(gsi);
    if (irq>= 0) {
      *irqp = irq;
      return 0;
    }
    /* THOR Experimental end */

    return -1;
}
Quoted 8 lines
Quoted 1 line

Whether this works on the R31 is yet to be determined.

The above patch has now also been tested on the IBM R31, and yes, it also fixes the system keys there: Thinklight, volume up & down and various other system-driven key-combinations now work again.

Could you please pick this patch up or comment on better alternatives?

And can you please actually post a patch? The above is just a piece of C code entirely out of context.

Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

A message that is not in the archive (sent off-list or not yet received): 29964_1412634435_54331741_29964_16384_1_8031540.z3p2ny3Gns@vostro.rjw.lan

author
#4 lore raw

PATCH 1/1 Fujitsu extra buttons not working on S6010, Thinkpad Extra buttons not working on R31

Hi Rafael,

Quoted 2 lines

And can you please actually post a patch? The above is just a piece of C code entirely out of context.

Actually, it was rather supposed to start a discussion because I have almost no experience with the ACPI subsystem.

Anyhow, here is the same in a (hopefully) well-formed patch file, tested on a Fujitsu S6010 and an IBM R31 running the 3.17 kernel.

Thanks,
Thomas

Signed-off-by Thomas Richter <[email protected]>
arch/x86/kernel/acpi/boot.c 2014-10-07 16:04:33.000000000 +0200 renamed from arch/x86/kernel/acpi/boot.c.old 2014-10-07 15:43:44.000000000 +0200 +16 -2
@@ -609,9 +609,23 @@
        if (irq >= 0) {
                *irqp = irq;
                return 0;
-       }
+       } else {
+               unsigned int i;
+
+               for (i = 0; i < NR_IRQS_LEGACY; i++) {
+                       if (isa_irq_to_gsi[i] == gsi) {
+                               *irqp = i;
+                               return 0;
+                       }
+               }
+
+               if (gsi >= NR_IRQS_LEGACY)
+                       *irqp = gsi;
+               else
+                       *irqp = gsi_top + gsi;
 
-       return -1;
+               return 0;
+       }
 }
 EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);