Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755402AbYJBRSe (ORCPT ); Thu, 2 Oct 2008 13:18:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754118AbYJBRS0 (ORCPT ); Thu, 2 Oct 2008 13:18:26 -0400 Received: from relay1.sgi.com ([192.48.171.29]:47094 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753709AbYJBRSZ (ORCPT ); Thu, 2 Oct 2008 13:18:25 -0400 Date: Thu, 2 Oct 2008 12:18:21 -0500 From: Dean Nelson To: Ingo Molnar Cc: "Eric W. Biederman" , Alan Mayer , jeremy@goop.org, rusty@rustcorp.com.au, suresh.b.siddha@intel.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, "H. Peter Anvin" , Thomas Gleixner , Yinghai Lu Subject: [PATCH] x86, UV: add uv_setup_irq() and uv_teardown_irq() functions v.3 Message-ID: <20081002171821.GA31601@sgi.com> References: <20081001114415.GA3281@sgi.com> <86802c440810020919p4391cbebva0eaa5591e7915be@mail.gmail.com> <48E4FA53.7050401@zytor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <48E4FA53.7050401@zytor.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9000 Lines: 298 Provide a means for UV interrupt MMRs to be setup with the message to be sent when an MSI is raised. Signed-off-by: Dean Nelson --- On Thu, Oct 02, 2008 at 10:42:14AM +0200, Ingo Molnar wrote: > > * Dean Nelson wrote: > > > +static struct irq_chip uv_irq_chip = { > > + .name = "UV_MSI", > > + .startup = noop_ret, > > + .shutdown = noop, > > + .enable = noop, > > + .disable = noop, > > + .ack = noop, > > + .mask = noop, > > + .unmask = noop, > > + .eoi = ack_apic, > > + .end = noop, > > +}; > > hm, why isnt this in uv_irq.c? Good question. Sometimes the obvious gets overlooked in the midst of having rewritten a patch a dozen different ways. It's now in uv_irq.c. > > Index: linux/kernel/irq/chip.c > > =================================================================== > > --- linux.orig/kernel/irq/chip.c 2008-09-30 09:07:42.000000000 -0500 > > +++ linux/kernel/irq/chip.c 2008-09-30 09:07:44.000000000 -0500 > > @@ -79,6 +79,7 @@ void dynamic_irq_cleanup(unsigned int ir > > desc->chip_data = NULL; > > desc->handle_irq = handle_bad_irq; > > desc->chip = &no_irq_chip; > > + desc->name = "none"; > > spin_unlock_irqrestore(&desc->lock, flags); > > unrelated change that belongs into a separate patch. Agreed. The change is needed by drivers/misc/sgi-xp once it has been modified to call uv_setup_irq() and uv_teardown_irq(). I'll move this change into that patch (or should it be in a patch all by itself?). On Thu, Oct 02, 2008 at 09:44:03AM -0700, H. Peter Anvin wrote: > Yinghai Lu wrote: > >>+ > >>+static struct irq_chip uv_irq_chip = { > >>+ .name = "UV_MSI", > > > >anything to do with MSI? > > > > Not really. It probably should be called "UV-CORE" or something like that. Agreed and changed. The patch to drivers/misc/sgi-xp to call the functions introduced by this patch, will be submitted shortly. Thanks, Dean arch/x86/kernel/Makefile | 2 - arch/x86/kernel/io_apic.c | 68 +++++++++++++++++++++++++++++++++++ arch/x86/kernel/uv_irq.c | 77 ++++++++++++++++++++++++++++++++++++++++ include/asm-x86/uv/uv_irq.h | 36 ++++++++++++++++++ 4 files changed, 182 insertions(+), 1 deletion(-) Index: linux/arch/x86/kernel/io_apic.c =================================================================== --- linux.orig/arch/x86/kernel/io_apic.c 2008-10-02 06:12:54.000000000 -0500 +++ linux/arch/x86/kernel/io_apic.c 2008-10-02 06:15:48.000000000 -0500 @@ -58,6 +58,8 @@ #include #include #include +#include +#include #include #include @@ -3694,6 +3696,72 @@ int arch_setup_ht_irq(unsigned int irq, } #endif /* CONFIG_HT_IRQ */ +#ifdef CONFIG_X86_64 +/* + * Re-target the irq to the specified CPU and enable the specified MMR located + * on the specified blade to allow the sending of MSIs to the specified CPU. + */ +int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, + unsigned long mmr_offset) +{ + const cpumask_t *eligible_cpu = get_cpu_mask(cpu); + struct irq_cfg *cfg; + int mmr_pnode; + unsigned long mmr_value; + struct uv_IO_APIC_route_entry *entry; + unsigned long flags; + int err; + + err = assign_irq_vector(irq, *eligible_cpu); + if (err != 0) + return err; + + spin_lock_irqsave(&vector_lock, flags); + set_irq_chip_and_handler_name(irq, &uv_irq_chip, handle_percpu_irq, + irq_name); + spin_unlock_irqrestore(&vector_lock, flags); + + cfg = irq_cfg(irq); + + mmr_value = 0; + entry = (struct uv_IO_APIC_route_entry *)&mmr_value; + BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long)); + + entry->vector = cfg->vector; + entry->delivery_mode = INT_DELIVERY_MODE; + entry->dest_mode = INT_DEST_MODE; + entry->polarity = 0; + entry->trigger = 0; + entry->mask = 0; + entry->dest = cpu_mask_to_apicid(*eligible_cpu); + + mmr_pnode = uv_blade_to_pnode(mmr_blade); + uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); + + return irq; +} + +/* + * Disable the specified MMR located on the specified blade so that MSIs are + * longer allowed to be sent. + */ +void arch_disable_uv_irq(int mmr_blade, unsigned long mmr_offset) +{ + unsigned long mmr_value; + struct uv_IO_APIC_route_entry *entry; + int mmr_pnode; + + mmr_value = 0; + entry = (struct uv_IO_APIC_route_entry *)&mmr_value; + BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long)); + + entry->mask = 1; + + mmr_pnode = uv_blade_to_pnode(mmr_blade); + uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); +} +#endif /* CONFIG_X86_64 */ + int __init io_apic_get_redir_entries (int ioapic) { union IO_APIC_reg_01 reg_01; Index: linux/arch/x86/kernel/uv_irq.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux/arch/x86/kernel/uv_irq.c 2008-10-02 12:08:04.000000000 -0500 @@ -0,0 +1,77 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * SGI UV IRQ functions + * + * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. + */ + +#include +#include +#include + +static void uv_noop(unsigned int irq) +{ +} + +static unsigned int uv_noop_ret(unsigned int irq) +{ + return 0; +} + +static void uv_ack_apic(unsigned int irq) +{ + ack_APIC_irq(); +} + +struct irq_chip uv_irq_chip = { + .name = "UV-CORE", + .startup = uv_noop_ret, + .shutdown = uv_noop, + .enable = uv_noop, + .disable = uv_noop, + .ack = uv_noop, + .mask = uv_noop, + .unmask = uv_noop, + .eoi = uv_ack_apic, + .end = uv_noop, +}; + +/* + * Set up a mapping of an available irq and vector, and enable the specified + * MMR that defines the MSI that is to be sent to the specified CPU when an + * interrupt is raised. + */ +int uv_setup_irq(char *irq_name, int cpu, int mmr_blade, + unsigned long mmr_offset) +{ + int irq; + int ret; + + irq = create_irq(); + if (irq <= 0) + return -EBUSY; + + ret = arch_enable_uv_irq(irq_name, irq, cpu, mmr_blade, mmr_offset); + if (ret != irq) + destroy_irq(irq); + + return ret; +} +EXPORT_SYMBOL(uv_setup_irq); + +/* + * Tear down a mapping of an irq and vector, and disable the specified MMR that + * defined the MSI that was to be sent to the specified CPU when an interrupt + * was raised. + * + * Set mmr_blade and mmr_offset to what was passed in on uv_setup_irq(). + */ +void uv_teardown_irq(unsigned int irq, int mmr_blade, unsigned long mmr_offset) +{ + arch_disable_uv_irq(mmr_blade, mmr_offset); + destroy_irq(irq); +} +EXPORT_SYMBOL(uv_teardown_irq); Index: linux/include/asm-x86/uv/uv_irq.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux/include/asm-x86/uv/uv_irq.h 2008-10-02 06:15:53.000000000 -0500 @@ -0,0 +1,36 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * SGI UV IRQ definitions + * + * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. + */ + +#ifndef ASM_X86__UV__UV_IRQ_H +#define ASM_X86__UV__UV_IRQ_H + +/* If a generic version of this structure gets defined, eliminate this one. */ +struct uv_IO_APIC_route_entry { + __u64 vector : 8, + delivery_mode : 3, + dest_mode : 1, + delivery_status : 1, + polarity : 1, + __reserved_1 : 1, + trigger : 1, + mask : 1, + __reserved_2 : 15, + dest : 32; +}; + +extern struct irq_chip uv_irq_chip; + +extern int arch_enable_uv_irq(char *, unsigned int, int, int, unsigned long); +extern void arch_disable_uv_irq(int, unsigned long); + +extern int uv_setup_irq(char *, int, int, unsigned long); +extern void uv_teardown_irq(unsigned int, int, unsigned long); + +#endif /* ASM_X86__UV__UV_IRQ_H */ Index: linux/arch/x86/kernel/Makefile =================================================================== --- linux.orig/arch/x86/kernel/Makefile 2008-10-02 06:12:54.000000000 -0500 +++ linux/arch/x86/kernel/Makefile 2008-10-02 06:13:01.000000000 -0500 @@ -107,7 +107,7 @@ obj-$(CONFIG_OLPC) += olpc.o # 64 bit specific files ifeq ($(CONFIG_X86_64),y) obj-y += genapic_64.o genapic_flat_64.o genx2apic_uv_x.o tlb_uv.o - obj-y += bios_uv.o uv_sysfs.o + obj-y += bios_uv.o uv_sysfs.o uv_irq.o obj-y += genx2apic_cluster.o obj-y += genx2apic_phys.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/