Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756785AbZFZHRm (ORCPT ); Fri, 26 Jun 2009 03:17:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751252AbZFZHRf (ORCPT ); Fri, 26 Jun 2009 03:17:35 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:39683 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbZFZHRe (ORCPT ); Fri, 26 Jun 2009 03:17:34 -0400 Date: Fri, 26 Jun 2009 09:17:25 +0200 From: Ingo Molnar To: "Pan, Jacob jun" , Jeremy Fitzhardinge Cc: "linux-kernel@vger.kernel.org" , "H. Peter Anvin" Subject: Re: [PATCH 8/9] x86/apic: match destination id with destination mode Message-ID: <20090626071725.GE14078@elte.hu> References: <43F901BD926A4E43B106BF17856F07556412B7E7@orsmsx508.amr.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <43F901BD926A4E43B106BF17856F07556412B7E7@orsmsx508.amr.corp.intel.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3480 Lines: 93 * Pan, Jacob jun wrote: > >From 791a44040dde6670f90a729cf91ed302d84b875a Mon Sep 17 00:00:00 2001 > From: Jacob Pan > Date: Tue, 12 May 2009 10:51:08 -0700 > Subject: [PATCH] x86/apic: match destination id with destination mode > > current code assigns logical destination IDs regardless of destination modes, this is not a problem since we only use logical delivery so far. but it could be a problem with platforms only supports physical mode Please fix your commit msg line-warps to be at 70 cols or so. > > Signed-off-by: Jacob Pan > --- > arch/x86/kernel/apic/io_apic.c | 27 +++++++++++++++++++-------- > 1 files changed, 19 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c > index 4d0216f..c84dc3d 100644 > --- a/arch/x86/kernel/apic/io_apic.c > +++ b/arch/x86/kernel/apic/io_apic.c > @@ -1431,7 +1431,10 @@ int setup_ioapic_entry(int apic_id, int irq, > } else { > entry->delivery_mode = apic->irq_delivery_mode; > entry->dest_mode = apic->irq_dest_mode; > - entry->dest = destination; > + if (apic->irq_dest_mode) > + entry->dest = destination; > + else /* physical ID of BSP */ > + entry->dest = boot_cpu_id; > entry->vector = vector; > } > > @@ -1576,7 +1579,10 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic_id, unsigned int pin, > */ > entry.dest_mode = apic->irq_dest_mode; > entry.mask = 0; /* don't mask IRQ for edge */ > - entry.dest = apic->cpu_mask_to_apicid(apic->target_cpus()); > + if (!apic->irq_dest_mode) > + entry.dest = boot_cpu_id; /* physical apic id */ > + else > + entry.dest = apic->cpu_mask_to_apicid(apic->target_cpus()); > entry.delivery_mode = apic->irq_delivery_mode; > entry.polarity = 0; > entry.trigger = 0; > @@ -2343,7 +2349,8 @@ set_ioapic_affinity_irq_desc(struct irq_desc *desc, const struct cpumask *mask) > dest = set_desc_affinity(desc, mask); > if (dest != BAD_APICID) { > /* Only the high 8 bits are valid. */ > - dest = SET_APIC_LOGICAL_ID(dest); > + if (apic->irq_dest_mode) > + dest = SET_APIC_LOGICAL_ID(dest); > __target_IO_APIC_irq(irq, dest, cfg); > ret = 0; > } > @@ -3273,9 +3280,11 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms > err = assign_irq_vector(irq, cfg, apic->target_cpus()); > if (err) > return err; > - > - dest = apic->cpu_mask_to_apicid_and(cfg->domain, apic->target_cpus()); > - > + if (apic->irq_dest_mode) > + dest = apic->cpu_mask_to_apicid_and(cfg->domain, > + apic->target_cpus()); > + else > + dest = boot_cpu_id; > if (irq_remapped(irq)) { > struct irte irte; > int ir_index; > @@ -3339,8 +3348,10 @@ static int set_msi_irq_affinity(unsigned int irq, const struct cpumask *mask) > struct irq_cfg *cfg; > struct msi_msg msg; > unsigned int dest; > - > - dest = set_desc_affinity(desc, mask); > + if (apic->irq_dest_mode) > + dest = set_desc_affinity(desc, mask); > + else > + dest = boot_cpu_id; > if (dest == BAD_APICID) > return -1; The question here is whether this should layer on top of Jeremy's IO-APIC driverization patches. I think it should. Ingo -- 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/