From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757412AbYIISqg (ORCPT ); Tue, 9 Sep 2008 14:46:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755246AbYIISq1 (ORCPT ); Tue, 9 Sep 2008 14:46:27 -0400 Received: from mail-gx0-f16.google.com ([209.85.217.16]:52064 "EHLO mail-gx0-f16.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754914AbYIISq0 (ORCPT ); Tue, 9 Sep 2008 14:46:26 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=ZYcWs4qRZa3gKK6OZKvXQ6hM+oaFpJnmmrwvZjFXkW5n10ZOYo42qdHVvOl29Po40e X99Tt4TgSdGgeTeEXrqU4M2Zev9jYHWC6sd+IzG1iotkv6q0np0eINEcL5URvPZjLVnc 2LJ3wTPwSS4JJ7fNNISeetti4GpiFPOmKnE0M= Date: Tue, 9 Sep 2008 22:46:15 +0400 From: Cyrill Gorcunov To: Ingo Molnar Cc: "H. Peter Anvin" , Thomas Gleixner , "Maciej W. Rozycki" , LKML Subject: [PATCH] x86: io-apic - get rid of __DO_ACTION macro Message-ID: <20080909184615.GA7303@lenovo> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace __DO_ACTION macro with io_apic_modify_irq function. This allow us to 'grep' definitions being hided by the macro, ie the following: __unmask_IO_APIC_irq __mask_IO_APIC_irq __mask_and_edge_IO_APIC_irq __unmask_and_level_IO_APIC_irq Also I removed R parameter which was to define offset inside route table but always being zero for now and I don't think if it ever will be other then that. Signed-off-by: Cyrill Gorcunov --- Please review. This modification doesn't map object file into the same former state 'cause of 'for(entry)' cycle form changed and new mask 'mask_and_not' added to be able to fill register with pure zeros - ie clear register completely. Any comments are quite welcome! Index: linux-2.6.git/arch/x86/kernel/io_apic.c =================================================================== --- linux-2.6.git.orig/arch/x86/kernel/io_apic.c 2008-09-09 22:27:57.000000000 +0400 +++ linux-2.6.git/arch/x86/kernel/io_apic.c 2008-09-09 22:34:03.000000000 +0400 @@ -643,65 +643,66 @@ static void __init replace_pin_at_irq(un add_pin_to_irq(irq, newapic, newpin); } -#define __DO_ACTION(R, ACTION_ENABLE, ACTION_DISABLE, FINAL) \ - \ -{ \ - int pin; \ - struct irq_cfg *cfg; \ - struct irq_pin_list *entry; \ - \ - cfg = irq_cfg(irq); \ - entry = cfg->irq_2_pin; \ - for (;;) { \ - unsigned int reg; \ - if (!entry) \ - break; \ - pin = entry->pin; \ - reg = io_apic_read(entry->apic, 0x10 + R + pin*2); \ - reg ACTION_DISABLE; \ - reg ACTION_ENABLE; \ - io_apic_modify(entry->apic, 0x10 + R + pin*2, reg); \ - FINAL; \ - if (!entry->next) \ - break; \ - entry = entry->next; \ - } \ -} - -#define DO_ACTION(name,R, ACTION_ENABLE, ACTION_DISABLE, FINAL) \ - \ - static void name##_IO_APIC_irq (unsigned int irq) \ - __DO_ACTION(R, ACTION_ENABLE, ACTION_DISABLE, FINAL) +static inline void io_apic_modify_irq(unsigned int irq, + int mask_and, int mask_or, + int mask_and_not, int read_after_mod) +{ + int pin; + struct irq_cfg *cfg; + struct irq_pin_list *entry; -/* mask = 0 */ -DO_ACTION(__unmask, 0, |= 0, &= ~IO_APIC_REDIR_MASKED, ) + cfg = irq_cfg(irq); + for (entry = cfg->irq_2_pin; entry != NULL; entry = entry->next) { + unsigned int reg; + pin = entry->pin; + reg = io_apic_read(entry->apic, 0x10 + pin * 2); + if (mask_and) + reg &= mask_and; + if (mask_or) + reg |= mask_or; + if (mask_and_not) + reg &= !mask_and_not; + io_apic_modify(entry->apic, 0x10 + pin * 2, reg); + if (read_after_mod) { + /* + * Synchronize the IO-APIC and the CPU by doing + * a dummy read from the IO-APIC + */ + struct io_apic __iomem *io_apic; + io_apic = io_apic_base(entry->apic); + readl(&io_apic->data); + } + } +} -#ifdef CONFIG_X86_64 -/* - * Synchronize the IO-APIC and the CPU by doing - * a dummy read from the IO-APIC - */ -static inline void io_apic_sync(unsigned int apic) +static void __unmask_IO_APIC_irq(unsigned int irq) { - struct io_apic __iomem *io_apic = io_apic_base(apic); - readl(&io_apic->data); + io_apic_modify_irq(irq, ~IO_APIC_REDIR_MASKED, 0, 0, 0); } -/* mask = 1 */ -DO_ACTION(__mask, 0, |= IO_APIC_REDIR_MASKED, &= ~0, io_apic_sync(entry->apic)) - -#else - -/* mask = 1 */ -DO_ACTION(__mask, 0, |= IO_APIC_REDIR_MASKED, &= ~0, ) - -/* mask = 1, trigger = 0 */ -DO_ACTION(__mask_and_edge, 0, |= IO_APIC_REDIR_MASKED, &= ~IO_APIC_REDIR_LEVEL_TRIGGER, ) +#ifdef CONFIG_X86_64 +static void __mask_IO_APIC_irq(unsigned int irq) +{ + io_apic_modify_irq(irq, ~0, IO_APIC_REDIR_MASKED, 0, 1); +} +#else /* CONFIG_X86_32 */ +static void __mask_IO_APIC_irq(unsigned int irq) +{ + io_apic_modify_irq(irq, ~0, IO_APIC_REDIR_MASKED, 0, 0); +} -/* mask = 0, trigger = 1 */ -DO_ACTION(__unmask_and_level, 0, |= IO_APIC_REDIR_LEVEL_TRIGGER, &= ~IO_APIC_REDIR_MASKED, ) +static void __mask_and_edge_IO_APIC_irq(unsigned int irq) +{ + io_apic_modify_irq(irq, ~IO_APIC_REDIR_LEVEL_TRIGGER, + IO_APIC_REDIR_MASKED, 0, 0); +} -#endif +static void __unmask_and_level_IO_APIC_irq(unsigned int irq) +{ + io_apic_modify_irq(irq, ~IO_APIC_REDIR_MASKED, + IO_APIC_REDIR_LEVEL_TRIGGER, 0, 0); +} +#endif /* CONFIG_X86_32 */ static void mask_IO_APIC_irq (unsigned int irq) {