From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031447AbbDXPyq (ORCPT ); Fri, 24 Apr 2015 11:54:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44390 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031419AbbDXPyl (ORCPT ); Fri, 24 Apr 2015 11:54:41 -0400 Date: Fri, 24 Apr 2015 08:53:38 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: jroedel@suse.de, jiang.liu@linux.intel.com, sivanich@sgi.com, david.a.cohen@linux.intel.com, konrad.wilk@oracle.com, linux@eikelenboom.it, tglx@linutronix.de, joro@8bytes.org, yinghai@kernel.org, bp@alien8.de, benh@kernel.crashing.org, grant.likely@linaro.org, linux-kernel@vger.kernel.org, tony.luck@intel.com, rdunlap@infradead.org, rjw@rjwysocki.net, gregkh@linuxfoundation.org, david.vrabel@citrix.com, bhelgaas@google.com, mingo@kernel.org, hpa@zytor.com Reply-To: gregkh@linuxfoundation.org, david.vrabel@citrix.com, bhelgaas@google.com, hpa@zytor.com, mingo@kernel.org, rjw@rjwysocki.net, benh@kernel.crashing.org, rdunlap@infradead.org, tony.luck@intel.com, grant.likely@linaro.org, linux-kernel@vger.kernel.org, joro@8bytes.org, bp@alien8.de, yinghai@kernel.org, linux@eikelenboom.it, tglx@linutronix.de, konrad.wilk@oracle.com, sivanich@sgi.com, david.a.cohen@linux.intel.com, jroedel@suse.de, jiang.liu@linux.intel.com In-Reply-To: <1428905519-23704-36-git-send-email-jiang.liu@linux.intel.com> References: <1428905519-23704-36-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irq: Simplify the way to print IOAPIC entry Git-Commit-ID: a44174ee7b380012cdb63d563617f67bb7757649 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a44174ee7b380012cdb63d563617f67bb7757649 Gitweb: http://git.kernel.org/tip/a44174ee7b380012cdb63d563617f67bb7757649 Author: Jiang Liu AuthorDate: Mon, 13 Apr 2015 14:11:57 +0800 Committer: Thomas Gleixner CommitDate: Fri, 24 Apr 2015 15:36:51 +0200 x86/irq: Simplify the way to print IOAPIC entry Simplify the way to print IOAPIC entry content, so we can remove native_io_apic_print_entries(), intel_ir_io_apic_print_entries() and x86_io_apic_ops.print_entries() later. Folded a patch from Thomas to fix errors in printed pin attributes, http://www.spinics.net/lists/linux-tip-commits/msg26108.html Signed-off-by: Jiang Liu Tested-by: Joerg Roedel Cc: Konrad Rzeszutek Wilk Cc: David Cohen Cc: Sander Eikelenboom Cc: David Vrabel Cc: Tony Luck Cc: Joerg Roedel Cc: Greg Kroah-Hartman Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Rafael J. Wysocki Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Dimitri Sivanich Cc: Grant Likely Link: http://lkml.kernel.org/r/1428905519-23704-36-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- 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 16d4ba3..3c66096 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 ? "disabled" : "enabled ", + entry.trigger ? "level" : "edge ", + entry.polarity ? "low " : "high", + 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)