Skip to contentSkip to conversation

resource: Prevent irqresource_disabled() from erasing flags

PATCH Applied Angela Czubak 2 participants 2 messages Apr 8, 2021 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 resource: Prevent irqresource_disabled() from erasing flags

Do not overwrite flags as it leads to erasing triggering and polarity information which might be useful in case of hard-coded interrupts. This way the information can be read later on even though mapping to APIC domain failed.

---
Some Chromebooks use hard-coded interrupts in their ACPI tables. This is an excerpt as dumped on Relm:

...

            Name (_HID, "ELAN0001")  // _HID: Hardware ID
            Name (_DDN, "Elan Touchscreen ")  // _DDN: DOS Device Name
            Name (_UID, 0x05)  // _UID: Unique ID
            Name (ISTP, Zero)
            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
            {
                Name (BUF0, ResourceTemplate ()
                {
                    I2cSerialBusV2 (0x0010, ControllerInitiated, 0x00061A80,
                        AddressingMode7Bit, "\\_SB.I2C1", 
                        0x00, ResourceConsumer, , Exclusive,
                        )
                    Interrupt (ResourceConsumer, Edge, ActiveLow, Exclusive, ,, )
                    {
                        0x000000B8,
                    }
                })
                Return (BUF0) /* \_SB_.I2C1.ETSA._CRS.BUF0 */ 
            }

...

This interrupt is hard-coded to 0xB8 = 184 which is too high to be mapped to IO-APIC, so no triggering information is propagated as acpi_register_gsi() fails and irqresource_disabled() is issued, which leads to erasing triggering and polarity information.
If that function added its flags instead of overwriting them the correct IRQ type would be set even for the hard-coded interrupts, which allows device driver to retrieve it.
This patch was originaly sent to [email protected].
I am resending it to [email protected] as per request of Rafael J. Wysocki to gather more visibility.
Please let us know if you see possible issues with not erasing the flags or this modification seems acceptable.
Best Regards,
Angela

 include/linux/ioport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ioport.h +1 -1
index 55de385c839cf..647744d8514e0 100644
@@ -331,7 +331,7 @@ static inline void irqresource_disabled(struct resource *res, u32 irq)
 {
 	res->start = irq;
 	res->end = irq;
-	res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
+	res->flags |= IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
 }
 
 extern struct address_space *iomem_get_mapping(void);
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw
Quoted 33 lines · Angela Czubak

Do not overwrite flags as it leads to erasing triggering and polarity information which might be useful in case of hard-coded interrupts. This way the information can be read later on even though mapping to APIC domain failed.

---
Some Chromebooks use hard-coded interrupts in their ACPI tables. This is an excerpt as dumped on Relm:

...

            Name (_HID, "ELAN0001")  // _HID: Hardware ID
            Name (_DDN, "Elan Touchscreen ")  // _DDN: DOS Device Name
            Name (_UID, 0x05)  // _UID: Unique ID
            Name (ISTP, Zero)
            Method (_CRS, 0, NotSerialized)  // _CRS: Current Resource Settings
            {
                Name (BUF0, ResourceTemplate ()
                {
                    I2cSerialBusV2 (0x0010, ControllerInitiated, 0x00061A80,
                        AddressingMode7Bit, "\\_SB.I2C1",
                        0x00, ResourceConsumer, , Exclusive,
                        )
                    Interrupt (ResourceConsumer, Edge, ActiveLow, Exclusive, ,, )
                    {
                        0x000000B8,
                    }
                })
                Return (BUF0) /* \_SB_.I2C1.ETSA._CRS.BUF0 */
            }

...

Quoted 12 lines

This interrupt is hard-coded to 0xB8 = 184 which is too high to be mapped to IO-APIC, so no triggering information is propagated as acpi_register_gsi() fails and irqresource_disabled() is issued, which leads to erasing triggering and polarity information.
If that function added its flags instead of overwriting them the correct IRQ type would be set even for the hard-coded interrupts, which allows device driver to retrieve it.
This patch was originaly sent to [email protected].
I am resending it to [email protected] as per request of Rafael J. Wysocki to gather more visibility.
Please let us know if you see possible issues with not erasing the flags or this modification seems acceptable.

I've applied the patch as 5.13 material, thanks!

Quoted 19 lines
 include/linux/ioport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ioport.h +1 -2
index 55de385c839cf..647744d8514e0 100644
@@ -331,7 +331,7 @@ static inline void irqresource_disabled(struct resource *res, u32 irq)
 {
        res->start = irq;
        res->end = irq;
-       res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
+       res->flags |= IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
 }
 
 extern struct address_space *iomem_get_mapping(void);
--

2.17.1