lkml.org 
[lkml]   [2014]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch Part3 v4 07/38] x86, irq: Simplify the way to print IOAPIC entry
    Date
    Simplify the way to print IOAPIC entry content, so we could kill
    native_io_apic_print_entries(), intel_ir_io_apic_print_entries()
    and x86_io_apic_ops.print_entries() later.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Tested-by: Joerg Roedel <jroedel@suse.de>
    ---
    arch/x86/kernel/apic/io_apic.c | 30 ++++++++++++++++++++++++++++--
    1 file changed, 28 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
    index 74a0e95cfb3d..b2618d48d572 100644
    --- a/arch/x86/kernel/apic/io_apic.c
    +++ b/arch/x86/kernel/apic/io_apic.c
    @@ -1424,6 +1424,33 @@ void ioapic_zap_locks(void)
    raw_spin_lock_init(&ioapic_lock);
    }

    +static void io_apic_print_entries(unsigned int apic, unsigned int nr_entries)
    +{
    + int i;
    + char buf[256];
    + struct IO_APIC_route_entry entry;
    + struct IR_IO_APIC_route_entry *ir_entry = (void *)&entry;
    +
    + printk(KERN_DEBUG "IOAPIC %d:\n", apic);
    + for (i = 0; i <= nr_entries; i++) {
    + entry = ioapic_read_entry(apic, i);
    + snprintf(buf, sizeof(buf),
    + " pin%02x, %s, %s, %s, V(%02X), IRR(%1d), S(%1d)",
    + i, entry.mask ? "enabled" : "disabled",
    + entry.trigger ? "level" : "edge",
    + entry.polarity ? "high" : "low",
    + entry.vector, entry.irr, entry.delivery_status);
    + if (ir_entry->format)
    + printk(KERN_DEBUG "%s, remapped, I(%04X), Z(%X)\n",
    + buf, (ir_entry->index << 15) | ir_entry->index,
    + ir_entry->zero);
    + else
    + printk(KERN_DEBUG "%s, %s, D(%02X), M(%1d)\n",
    + buf, entry.dest_mode ? "logical" : "physical",
    + entry.dest, entry.delivery_mode);
    + }
    +}
    +
    static void __init print_IO_APIC(int ioapic_idx)
    {
    union IO_APIC_reg_00 reg_00;
    @@ -1477,8 +1504,7 @@ static void __init print_IO_APIC(int ioapic_idx)
    }

    printk(KERN_DEBUG ".... IRQ redirection table:\n");
    -
    - x86_io_apic_ops.print_entries(ioapic_idx, reg_01.bits.entries);
    + io_apic_print_entries(ioapic_idx, reg_01.bits.entries);
    }

    void __init print_IO_APICs(void)
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2014-11-25 10:01    [W:5.036 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site