lkml.org 
[lkml]   [2014]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch Part1 V2 25/29] x86, irq, ACPI: use common irqdomain map interface to program IOAPIC pins
    Date
    Refine ACPI to use common irqdomain map interface to program IOAPIC pins,
    so we can unify the callsite to progam IOAPIC pins.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    ---
    arch/x86/kernel/acpi/boot.c | 48 ++++++++++++++++---------------------------
    1 file changed, 18 insertions(+), 30 deletions(-)

    diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
    index 4e8566b071c1..68baa34b8346 100644
    --- a/arch/x86/kernel/acpi/boot.c
    +++ b/arch/x86/kernel/acpi/boot.c
    @@ -332,7 +332,9 @@ static void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
    static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
    int polarity);

    -static struct irq_domain_ops acpi_irqdomain_ops;
    +static struct irq_domain_ops acpi_irqdomain_ops = {
    + .map = mp_irqdomain_map,
    +};

    static struct irq_domain *acpi_create_irqdomain(int idx, void *arg)
    {
    @@ -512,10 +514,6 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
    int irq = map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);

    if (irq >= 0) {
    -#ifdef CONFIG_X86_IO_APIC
    - if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC)
    - setup_IO_APIC_irq_extra(gsi);
    -#endif
    *irqp = irq;
    return 0;
    }
    @@ -1047,11 +1045,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
    static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
    int polarity)
    {
    - int irq;
    - int ioapic;
    - int ioapic_pin;
    - struct io_apic_irq_attr irq_attr;
    - int ret;
    + int irq, ioapic, pin, node;

    if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
    return gsi;
    @@ -1060,35 +1054,29 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
    if (acpi_gbl_FADT.sci_interrupt == gsi)
    return gsi;

    - irq = map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC);
    - if (irq < 0)
    - return ACPI_INVALID_GSI;
    -
    ioapic = mp_find_ioapic(gsi);
    if (ioapic < 0) {
    - printk(KERN_WARNING "No IOAPIC for GSI %u\n", gsi);
    - return gsi;
    + pr_warn("No IOAPIC for GSI %u\n", gsi);
    + return ACPI_INVALID_GSI;
    }

    - ioapic_pin = mp_find_ioapic_pin(ioapic, gsi);
    -
    - if (ioapic_pin > MP_MAX_IOAPIC_PIN) {
    - printk(KERN_ERR "Invalid reference to IOAPIC pin "
    - "%d-%d\n", mpc_ioapic_id(ioapic),
    - ioapic_pin);
    - return gsi;
    + pin = mp_find_ioapic_pin(ioapic, gsi);
    + node = dev ? dev_to_node(dev) : NUMA_NO_NODE;
    + if (mp_set_pin_attr(ioapic, pin,
    + trigger == ACPI_EDGE_SENSITIVE ? 0 : 1,
    + polarity == ACPI_ACTIVE_HIGH ? 0 : 1,
    + node)) {
    + pr_warn("Failed to set pin attr for GSI%d\n", gsi);
    + return ACPI_INVALID_GSI;
    }

    + irq = map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC);
    + if (irq < 0)
    + return ACPI_INVALID_GSI;
    +
    if (enable_update_mptable)
    mp_config_acpi_gsi(dev, gsi, trigger, polarity);

    - set_io_apic_irq_attr(&irq_attr, ioapic, ioapic_pin,
    - trigger == ACPI_EDGE_SENSITIVE ? 0 : 1,
    - polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
    - ret = io_apic_set_pci_routing(dev, irq, &irq_attr);
    - if (ret < 0)
    - gsi = ACPI_INVALID_GSI;
    -
    return gsi;
    }

    --
    1.7.10.4


    \
     
     \ /
      Last update: 2014-05-21 09:01    [W:2.952 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site