lkml.org 
[lkml]   [2010]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    Date
    From
    SubjectRe: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
    On Wed, 8 Dec 2010 06:32:46 +0800
    Thomas Gleixner <tglx@linutronix.de> wrote:


    > Nice archaelogical detective work ! :)
    >
    > So now I have Fengs patch plus Yinghais series which seem to go nicely
    > together, but I have the feeling that there is some stuff unresolved.
    >
    > Yinghai, Feng: could you please work out the missing bits an pieces
    > (if any) and provide me a delta patch on top of the existing patches?
    >
    > Thanks,
    >
    > tglx

    Here is the incremental patch against my last one (I also put the full
    patch in attachment)

    Thanks,
    Feng
    ----------------


    x86: more simplification for saving irq info code

    Signed-off-by: Feng Tang <feng.tang@linux.intel.com>

    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index 4aa4dbc..43eade5 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -126,39 +126,6 @@ static int __init parse_noapic(char *str)
    }
    early_param("noapic", parse_noapic);

    -static void assign_to_mp_irq(struct mpc_intsrc *m,
    - struct mpc_intsrc *mp_irq)
    -{
    - mp_irq->dstapic = m->dstapic;
    - mp_irq->type = m->type;
    - mp_irq->irqtype = m->irqtype;
    - mp_irq->irqflag = m->irqflag;
    - mp_irq->srcbus = m->srcbus;
    - mp_irq->srcbusirq = m->srcbusirq;
    - mp_irq->dstirq = m->dstirq;
    -}
    -
    -static int mp_irq_mpc_intsrc_cmp(struct mpc_intsrc *mp_irq,
    - struct mpc_intsrc *m)
    -{
    - if (mp_irq->dstapic != m->dstapic)
    - return 1;
    - if (mp_irq->type != m->type)
    - return 2;
    - if (mp_irq->irqtype != m->irqtype)
    - return 3;
    - if (mp_irq->irqflag != m->irqflag)
    - return 4;
    - if (mp_irq->srcbus != m->srcbus)
    - return 5;
    - if (mp_irq->srcbusirq != m->srcbusirq)
    - return 6;
    - if (mp_irq->dstirq != m->dstirq)
    - return 7;
    -
    - return 0;
    -}
    -
    /* Will be called in mpparse/acpi/sfi codes for saving IRQ info */
    void mp_save_irq(struct mpc_intsrc *m)
    {
    @@ -170,11 +137,11 @@ void mp_save_irq(struct mpc_intsrc *m)
    m->srcbusirq, m->dstapic, m->dstirq);

    for (i = 0; i < mp_irq_entries; i++) {
    - if (!mp_irq_mpc_intsrc_cmp(&mp_irqs[i], m))
    + if (!memcmp(&mp_irqs[i], m, sizeof(*m)))
    return;
    }

    - assign_to_mp_irq(m, &mp_irqs[mp_irq_entries]);
    + memcpy(&mp_irqs[mp_irq_entries], m, sizeof(*m));
    if (++mp_irq_entries == MAX_IRQ_SOURCES)
    panic("Max # of irq sources exceeded!!\n");
    }
    diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
    index 1fe4e79..c2c2e56 100644
    --- a/arch/x86/kernel/mpparse.c
    +++ b/arch/x86/kernel/mpparse.c
    @@ -118,21 +118,8 @@ static void __init MP_bus_info(struct mpc_bus *m)

    static void __init MP_ioapic_info(struct mpc_ioapic *m)
    {
    - if (!(m->flags & MPC_APIC_USABLE))
    - return;
    -
    - printk(KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n",
    - m->apicid, m->apicver, m->apicaddr);
    -
    - mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);
    -}
    -
    -static void print_MP_intsrc_info(struct mpc_intsrc *m)
    -{
    - apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"
    - " IRQ %02x, APIC ID %x, APIC INT %02x\n",
    - m->irqtype, m->irqflag & 3, (m->irqflag >> 2) & 3, m->srcbus,
    - m->srcbusirq, m->dstapic, m->dstirq);
    + if (m->flags & MPC_APIC_USABLE)
    + mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);
    }

    static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
    @@ -144,23 +131,11 @@ static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
    mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq);
    }

    -static void __init assign_to_mpc_intsrc(struct mpc_intsrc *mp_irq,
    - struct mpc_intsrc *m)
    -{
    - m->dstapic = mp_irq->dstapic;
    - m->type = mp_irq->type;
    - m->irqtype = mp_irq->irqtype;
    - m->irqflag = mp_irq->irqflag;
    - m->srcbus = mp_irq->srcbus;
    - m->srcbusirq = mp_irq->srcbusirq;
    - m->dstirq = mp_irq->dstirq;
    -}
    #else /* CONFIG_X86_IO_APIC */
    static inline void __init MP_bus_info(struct mpc_bus *m) {}
    static inline void __init MP_ioapic_info(struct mpc_ioapic *m) {}
    #endif /* CONFIG_X86_IO_APIC */

    -
    static void __init MP_lintsrc_info(struct mpc_lintsrc *m)
    {
    apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x,"
    @@ -172,7 +147,6 @@ static void __init MP_lintsrc_info(struct mpc_lintsrc *m)
    /*
    * Read/parse the MPC
    */
    -
    static int __init smp_check_mpc(struct mpc_table *mpc, char *oem, char *str)
    {

    @@ -734,11 +708,11 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
    int i;

    apic_printk(APIC_VERBOSE, "OLD ");
    - print_MP_intsrc_info(m);
    + print_mp_irq_info(m);

    i = get_MP_intsrc_index(m);
    if (i > 0) {
    - assign_to_mpc_intsrc(&mp_irqs[i], m);
    + memcpy(m, &mp_irqs[i], sizeof(*m));
    apic_printk(APIC_VERBOSE, "NEW ");
    print_mp_irq_info(&mp_irqs[i]);
    return;
    @@ -825,14 +799,14 @@ static int __init replace_intsrc_all(struct mpc_table *mpc,
    if (nr_m_spare > 0) {
    apic_printk(APIC_VERBOSE, "*NEW* found\n");
    nr_m_spare--;
    - assign_to_mpc_intsrc(&mp_irqs[i], m_spare[nr_m_spare]);
    + memcpy(m_spare[nr_m_spare], &mp_irqs[i], sizeof(mp_irqs[i]));
    m_spare[nr_m_spare] = NULL;
    } else {
    struct mpc_intsrc *m = (struct mpc_intsrc *)mpt;
    count += sizeof(struct mpc_intsrc);
    if (check_slot(mpc_new_phys, mpc_new_length, count) < 0)
    goto out;
    - assign_to_mpc_intsrc(&mp_irqs[i], m);
    + memcpy(m, &mp_irqs[i], sizeof(*m));
    mpc->length = count;
    mpt += sizeof(struct mpc_intsrc);
    }From 115d8b756a14b685a12a60e89ab60e25b05c18c4 Mon Sep 17 00:00:00 2001
    From: Feng Tang <feng.tang@intel.com>
    Date: Fri, 19 Nov 2010 11:33:35 +0800
    Subject: [PATCH] x86: unify current 3 similar ways of saving IRQ info

    There are 3 places defining the similar function of saving IRQ
    vector info into mp_irqs[] array: mmparse/acpi/mrst. This patch
    will reduce the redundant code, and make it only one API in
    io_apic.c:
    void mp_save_irq(struct mpc_intsrc *m);
    as that func will only get called when CONFIG_X86_IO_APIC=y.

    Also this patch does some minor clearup for mmparse.c.

    Signed-off-by: Feng Tang <feng.tang@intel.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Yinghai Lu <yinghai@kernel.org>
    ---
    arch/x86/include/asm/io_apic.h | 2 +
    arch/x86/kernel/acpi/boot.c | 32 +------------
    arch/x86/kernel/apic/io_apic.c | 21 +++++++++
    arch/x86/kernel/mpparse.c | 94 ++++------------------------------------
    arch/x86/platform/mrst/mrst.c | 30 +------------
    5 files changed, 37 insertions(+), 142 deletions(-)

    diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
    index a6b28d0..df49dd6 100644
    --- a/arch/x86/include/asm/io_apic.h
    +++ b/arch/x86/include/asm/io_apic.h
    @@ -184,6 +184,8 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi);
    void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
    extern void __init pre_init_apic_IRQ0(void);

    +extern void mp_save_irq(struct mpc_intsrc *m);
    +
    #else /* !CONFIG_X86_IO_APIC */

    #define io_apic_assign_pci_irqs 0
    diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
    index 71232b9..006f896 100644
    --- a/arch/x86/kernel/acpi/boot.c
    +++ b/arch/x86/kernel/acpi/boot.c
    @@ -949,32 +949,6 @@ static int __init acpi_parse_madt_lapic_entries(void)
    extern int es7000_plat;
    #endif

    -static void assign_to_mp_irq(struct mpc_intsrc *m,
    - struct mpc_intsrc *mp_irq)
    -{
    - memcpy(mp_irq, m, sizeof(struct mpc_intsrc));
    -}
    -
    -static int mp_irq_cmp(struct mpc_intsrc *mp_irq,
    - struct mpc_intsrc *m)
    -{
    - return memcmp(mp_irq, m, sizeof(struct mpc_intsrc));
    -}
    -
    -static void save_mp_irq(struct mpc_intsrc *m)
    -{
    - int i;
    -
    - for (i = 0; i < mp_irq_entries; i++) {
    - if (!mp_irq_cmp(&mp_irqs[i], m))
    - return;
    - }
    -
    - assign_to_mp_irq(m, &mp_irqs[mp_irq_entries]);
    - if (++mp_irq_entries == MAX_IRQ_SOURCES)
    - panic("Max # of irq sources exceeded!!\n");
    -}
    -
    void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
    {
    int ioapic;
    @@ -1005,7 +979,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
    mp_irq.dstapic = mp_ioapics[ioapic].apicid; /* APIC ID */
    mp_irq.dstirq = pin; /* INTIN# */

    - save_mp_irq(&mp_irq);
    + mp_save_irq(&mp_irq);

    isa_irq_to_gsi[bus_irq] = gsi;
    }
    @@ -1080,7 +1054,7 @@ void __init mp_config_acpi_legacy_irqs(void)
    mp_irq.srcbusirq = i; /* Identity mapped */
    mp_irq.dstirq = pin;

    - save_mp_irq(&mp_irq);
    + mp_save_irq(&mp_irq);
    }
    }

    @@ -1117,7 +1091,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
    mp_irq.dstapic = mp_ioapics[ioapic].apicid;
    mp_irq.dstirq = mp_find_ioapic_pin(ioapic, gsi);

    - save_mp_irq(&mp_irq);
    + mp_save_irq(&mp_irq);
    #endif
    return 0;
    }
    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index 7cc0a72..43eade5 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -126,6 +126,26 @@ static int __init parse_noapic(char *str)
    }
    early_param("noapic", parse_noapic);

    +/* Will be called in mpparse/acpi/sfi codes for saving IRQ info */
    +void mp_save_irq(struct mpc_intsrc *m)
    +{
    + int i;
    +
    + apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"
    + " IRQ %02x, APIC ID %x, APIC INT %02x\n",
    + m->irqtype, m->irqflag & 3, (m->irqflag >> 2) & 3, m->srcbus,
    + m->srcbusirq, m->dstapic, m->dstirq);
    +
    + for (i = 0; i < mp_irq_entries; i++) {
    + if (!memcmp(&mp_irqs[i], m, sizeof(*m)))
    + return;
    + }
    +
    + memcpy(&mp_irqs[mp_irq_entries], m, sizeof(*m));
    + if (++mp_irq_entries == MAX_IRQ_SOURCES)
    + panic("Max # of irq sources exceeded!!\n");
    +}
    +
    struct irq_pin_list {
    int apic, pin;
    struct irq_pin_list *next;
    @@ -136,6 +156,7 @@ static struct irq_pin_list *alloc_irq_pin_list(int node)
    return kzalloc_node(sizeof(struct irq_pin_list), GFP_KERNEL, node);
    }

    +
    /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */
    #ifdef CONFIG_SPARSE_IRQ
    static struct irq_cfg irq_cfgx[NR_IRQS_LEGACY];
    diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
    index 9af64d9..c2c2e56 100644
    --- a/arch/x86/kernel/mpparse.c
    +++ b/arch/x86/kernel/mpparse.c
    @@ -118,21 +118,8 @@ static void __init MP_bus_info(struct mpc_bus *m)

    static void __init MP_ioapic_info(struct mpc_ioapic *m)
    {
    - if (!(m->flags & MPC_APIC_USABLE))
    - return;
    -
    - printk(KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n",
    - m->apicid, m->apicver, m->apicaddr);
    -
    - mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);
    -}
    -
    -static void print_MP_intsrc_info(struct mpc_intsrc *m)
    -{
    - apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"
    - " IRQ %02x, APIC ID %x, APIC INT %02x\n",
    - m->irqtype, m->irqflag & 3, (m->irqflag >> 2) & 3, m->srcbus,
    - m->srcbusirq, m->dstapic, m->dstirq);
    + if (m->flags & MPC_APIC_USABLE)
    + mp_register_ioapic(m->apicid, m->apicaddr, gsi_top);
    }

    static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
    @@ -144,73 +131,11 @@ static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
    mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq);
    }

    -static void __init assign_to_mp_irq(struct mpc_intsrc *m,
    - struct mpc_intsrc *mp_irq)
    -{
    - mp_irq->dstapic = m->dstapic;
    - mp_irq->type = m->type;
    - mp_irq->irqtype = m->irqtype;
    - mp_irq->irqflag = m->irqflag;
    - mp_irq->srcbus = m->srcbus;
    - mp_irq->srcbusirq = m->srcbusirq;
    - mp_irq->dstirq = m->dstirq;
    -}
    -
    -static void __init assign_to_mpc_intsrc(struct mpc_intsrc *mp_irq,
    - struct mpc_intsrc *m)
    -{
    - m->dstapic = mp_irq->dstapic;
    - m->type = mp_irq->type;
    - m->irqtype = mp_irq->irqtype;
    - m->irqflag = mp_irq->irqflag;
    - m->srcbus = mp_irq->srcbus;
    - m->srcbusirq = mp_irq->srcbusirq;
    - m->dstirq = mp_irq->dstirq;
    -}
    -
    -static int __init mp_irq_mpc_intsrc_cmp(struct mpc_intsrc *mp_irq,
    - struct mpc_intsrc *m)
    -{
    - if (mp_irq->dstapic != m->dstapic)
    - return 1;
    - if (mp_irq->type != m->type)
    - return 2;
    - if (mp_irq->irqtype != m->irqtype)
    - return 3;
    - if (mp_irq->irqflag != m->irqflag)
    - return 4;
    - if (mp_irq->srcbus != m->srcbus)
    - return 5;
    - if (mp_irq->srcbusirq != m->srcbusirq)
    - return 6;
    - if (mp_irq->dstirq != m->dstirq)
    - return 7;
    -
    - return 0;
    -}
    -
    -static void __init MP_intsrc_info(struct mpc_intsrc *m)
    -{
    - int i;
    -
    - print_MP_intsrc_info(m);
    -
    - for (i = 0; i < mp_irq_entries; i++) {
    - if (!mp_irq_mpc_intsrc_cmp(&mp_irqs[i], m))
    - return;
    - }
    -
    - assign_to_mp_irq(m, &mp_irqs[mp_irq_entries]);
    - if (++mp_irq_entries == MAX_IRQ_SOURCES)
    - panic("Max # of irq sources exceeded!!\n");
    -}
    #else /* CONFIG_X86_IO_APIC */
    static inline void __init MP_bus_info(struct mpc_bus *m) {}
    static inline void __init MP_ioapic_info(struct mpc_ioapic *m) {}
    -static inline void __init MP_intsrc_info(struct mpc_intsrc *m) {}
    #endif /* CONFIG_X86_IO_APIC */

    -
    static void __init MP_lintsrc_info(struct mpc_lintsrc *m)
    {
    apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x,"
    @@ -222,7 +147,6 @@ static void __init MP_lintsrc_info(struct mpc_lintsrc *m)
    /*
    * Read/parse the MPC
    */
    -
    static int __init smp_check_mpc(struct mpc_table *mpc, char *oem, char *str)
    {

    @@ -337,7 +261,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
    skip_entry(&mpt, &count, sizeof(struct mpc_ioapic));
    break;
    case MP_INTSRC:
    - MP_intsrc_info((struct mpc_intsrc *)mpt);
    + mp_save_irq((struct mpc_intsrc *)mpt);
    skip_entry(&mpt, &count, sizeof(struct mpc_intsrc));
    break;
    case MP_LINTSRC:
    @@ -429,13 +353,13 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)

    intsrc.srcbusirq = i;
    intsrc.dstirq = i ? i : 2; /* IRQ0 to INTIN2 */
    - MP_intsrc_info(&intsrc);
    + mp_save_irq(&intsrc);
    }

    intsrc.irqtype = mp_ExtINT;
    intsrc.srcbusirq = 0;
    intsrc.dstirq = 0; /* 8259A to INTIN0 */
    - MP_intsrc_info(&intsrc);
    + mp_save_irq(&intsrc);
    }


    @@ -784,11 +708,11 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
    int i;

    apic_printk(APIC_VERBOSE, "OLD ");
    - print_MP_intsrc_info(m);
    + print_mp_irq_info(m);

    i = get_MP_intsrc_index(m);
    if (i > 0) {
    - assign_to_mpc_intsrc(&mp_irqs[i], m);
    + memcpy(m, &mp_irqs[i], sizeof(*m));
    apic_printk(APIC_VERBOSE, "NEW ");
    print_mp_irq_info(&mp_irqs[i]);
    return;
    @@ -875,14 +799,14 @@ static int __init replace_intsrc_all(struct mpc_table *mpc,
    if (nr_m_spare > 0) {
    apic_printk(APIC_VERBOSE, "*NEW* found\n");
    nr_m_spare--;
    - assign_to_mpc_intsrc(&mp_irqs[i], m_spare[nr_m_spare]);
    + memcpy(m_spare[nr_m_spare], &mp_irqs[i], sizeof(mp_irqs[i]));
    m_spare[nr_m_spare] = NULL;
    } else {
    struct mpc_intsrc *m = (struct mpc_intsrc *)mpt;
    count += sizeof(struct mpc_intsrc);
    if (check_slot(mpc_new_phys, mpc_new_length, count) < 0)
    goto out;
    - assign_to_mpc_intsrc(&mp_irqs[i], m);
    + memcpy(m, &mp_irqs[i], sizeof(*m));
    mpc->length = count;
    mpt += sizeof(struct mpc_intsrc);
    }
    diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
    index fee0b49..ea6529e 100644
    --- a/arch/x86/platform/mrst/mrst.c
    +++ b/arch/x86/platform/mrst/mrst.c
    @@ -71,32 +71,6 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
    EXPORT_SYMBOL_GPL(sfi_mrtc_array);
    int sfi_mrtc_num;

    -static inline void assign_to_mp_irq(struct mpc_intsrc *m,
    - struct mpc_intsrc *mp_irq)
    -{
    - memcpy(mp_irq, m, sizeof(struct mpc_intsrc));
    -}
    -
    -static inline int mp_irq_cmp(struct mpc_intsrc *mp_irq,
    - struct mpc_intsrc *m)
    -{
    - return memcmp(mp_irq, m, sizeof(struct mpc_intsrc));
    -}
    -
    -static void save_mp_irq(struct mpc_intsrc *m)
    -{
    - int i;
    -
    - for (i = 0; i < mp_irq_entries; i++) {
    - if (!mp_irq_cmp(&mp_irqs[i], m))
    - return;
    - }
    -
    - assign_to_mp_irq(m, &mp_irqs[mp_irq_entries]);
    - if (++mp_irq_entries == MAX_IRQ_SOURCES)
    - panic("Max # of irq sources exceeded!!\n");
    -}
    -
    /* parse all the mtimer info to a static mtimer array */
    static int __init sfi_parse_mtmr(struct sfi_table_header *table)
    {
    @@ -130,7 +104,7 @@ static int __init sfi_parse_mtmr(struct sfi_table_header *table)
    mp_irq.srcbusirq = pentry->irq; /* IRQ */
    mp_irq.dstapic = MP_APIC_ALL;
    mp_irq.dstirq = pentry->irq;
    - save_mp_irq(&mp_irq);
    + mp_save_irq(&mp_irq);
    }

    return 0;
    @@ -200,7 +174,7 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table)
    mp_irq.srcbusirq = pentry->irq; /* IRQ */
    mp_irq.dstapic = MP_APIC_ALL;
    mp_irq.dstirq = pentry->irq;
    - save_mp_irq(&mp_irq);
    + mp_save_irq(&mp_irq);
    }
    return 0;
    }
    --
    1.7.0.4
    \
     
     \ /
      Last update: 2010-12-08 08:23    [W:0.055 / U:60.648 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site