From: Jiang Liu <jiang.liu@linux.intel.com>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Thomas Gleixner <tglx@linutronix.de>,
Grant Likely <grant.likely@linaro.org>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Bjorn Helgaas <bhelgaas@google.com>,
Randy Dunlap <rdunlap@infradead.org>,
Yinghai Lu <yinghai@kernel.org>,
x86@kernel.org, Rob Herring <rob.herring@calxeda.com>,
Michal Simek <monstr@monstr.eu>, Tony Lindgren <tony@atomide.com>,
Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Andrew Morton <akpm@linux-foundation.org>,
Tony Luck <tony.luck@intel.com>, Joerg Roedel <joro@8bytes.org>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linux-acpi@vger.kernel.org
Subject: [Patch Part1 V2 28/29] x86, irq, devicetree: use common irqdomain map interface to program IOAPIC pins
Date: Tue, 20 May 2014 00:23:12 +0800 [thread overview]
Message-ID: <1400516594-11544-29-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1400516594-11544-1-git-send-email-jiang.liu@linux.intel.com>
Refine devicetree 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/devicetree.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index a44d45df49f5..3bd30eb92d9d 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -280,10 +280,8 @@ static int ioapic_xlate(struct irq_domain *domain,
const u32 *intspec, u32 intsize,
irq_hw_number_t *out_hwirq, u32 *out_type)
{
- struct io_apic_irq_attr attr;
struct of_ioapic_type *it;
u32 line, idx;
- int rc;
if (WARN_ON(intsize < 2))
return -EINVAL;
@@ -296,12 +294,9 @@ static int ioapic_xlate(struct irq_domain *domain,
it = &of_ioapic_type[intspec[1]];
idx = (u32)(long)domain->host_data;
- set_io_apic_irq_attr(&attr, idx, line, it->trigger, it->polarity);
-
- rc = io_apic_setup_irq_pin_once(irq_find_mapping(domain, line),
- cpu_to_node(0), &attr);
- if (rc)
- return rc;
+ if (mp_set_pin_attr(idx, line, it->trigger, it->polarity,
+ cpu_to_node(0)))
+ return -EBUSY;
*out_hwirq = line;
*out_type = it->out_type;
@@ -309,6 +304,7 @@ static int ioapic_xlate(struct irq_domain *domain,
}
const struct irq_domain_ops ioapic_irq_domain_ops = {
+ .map = mp_irqdomain_map,
.xlate = ioapic_xlate,
};
--
1.7.10.4
next prev parent reply other threads:[~2014-05-19 16:25 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 16:22 [Patch Part1 V2 00/29] use irqdomain to dynamically allocate IRQ for IOAPIC Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 01/29] x86, irq: update high address field when updating affinity for MSI IRQ Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 02/29] genirq, trivial: improve documentation to match current implementation Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 03/29] x86, mpparse: use pr_lvl() helper utilities to replace printk(KERN_LVL) Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 04/29] x86, mpparse: simplify arch/x86/include/asm/mpspec.h Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 05/29] x86, PCI, ACPI: use kmalloc_node() to optimize for performance Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 06/29] x86, acpi, irq: kill static function irq_to_gsi() Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 07/29] x86, ACPI, trivial: minor improvements to arch/x86/kernel/acpi/boot.c Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 08/29] x86, ACPI, irq: enhance error handling in function acpi_register_gsi() Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 09/29] x86, ACPI, irq: fix possible eror in GSI to IRQ mapping for legacy IRQ Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 10/29] x86, irq, trivial: minor improvements of IRQ related code Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 11/29] x86, ioapic: kill unused global variable timer_through_8259 Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 12/29] x86, ioapic: kill static variable nr_irqs_gsi Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 13/29] x86, ioapic: introduce helper utilities to walk ioapics and pins Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 14/29] x86, ioapic: use irq_cfg() instead of irq_get_chip_data() for better readability Jiang Liu
2014-05-19 16:22 ` [Patch Part1 V2 15/29] x86, irq: reorganize IO_APIC_get_PCI_irq_vector() to prepare for irqdomain Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 16/29] x86, irq: introduce some helper utilities to improve readability Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 17/29] x86, ACPI, irq: consolidate algorithm of mapping (ioapic, pin) to IRQ number Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 18/29] x86, irq: introduce mechanisms to support dynamically allocate IRQ for IOAPIC Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 19/29] x86, irq: enhance mp_register_ioapic() to support irqdomain Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 20/29] x86, ACPI, irq: provide basic irqdomain support Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 21/29] x86, mpparse, " Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 22/29] x86, devicetree, irq: use common mechanism to support irqdomain Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 23/29] x86, SFI, irq: provide basic irqdomain support Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 24/29] x86, irq: introduce two helper functions to support irqdomain map operation Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 25/29] x86, irq, ACPI: use common irqdomain map interface to program IOAPIC pins Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 26/29] x86, irq, mpparse: " Jiang Liu
2014-05-19 16:23 ` [Patch Part1 V2 27/29] x86, irq, SFI: " Jiang Liu
2014-05-19 16:23 ` Jiang Liu [this message]
2014-05-19 16:23 ` [Patch Part1 V2 29/29] x86, irq: clean up unused IOAPIC interface Jiang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400516594-11544-29-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=paul.gortmaker@windriver.com \
--cc=rdunlap@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=rob.herring@calxeda.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=tony@atomide.com \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).