From: tip-bot for Thomas Gleixner <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, konrad.wilk@oracle.com, peterz@infradead.org, xen-devel@lists.xenproject.org, tglx@linutronix.de, david.vrabel@citrix.com Subject: [tip:irq/core] xen: Use the proper irq functions Date: Tue, 4 Mar 2014 08:40:51 -0800 [thread overview] Message-ID: <tip-589d03e93f6cd595f68891e48f0804f2c8f38aae@git.kernel.org> (raw) In-Reply-To: <20140223212738.222412125@linutronix.de> Commit-ID: 589d03e93f6cd595f68891e48f0804f2c8f38aae Gitweb: http://git.kernel.org/tip/589d03e93f6cd595f68891e48f0804f2c8f38aae Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Sun, 23 Feb 2014 21:40:18 +0000 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 4 Mar 2014 17:37:52 +0100 xen: Use the proper irq functions generic_handler_irq() already tests for !desc so use this instead of generic_handle_irq_desc(). Use irq_get_irq_data() instead of desc->irq_data. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: David Vrabel <david.vrabel@citrix.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Xen <xen-devel@lists.xenproject.org> Link: http://lkml.kernel.org/r/20140223212738.222412125@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/xen/events/events_2l.c | 15 ++++----------- drivers/xen/events/events_base.c | 7 ++----- drivers/xen/events/events_fifo.c | 8 ++------ 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c index d7ff917..5db43fc 100644 --- a/drivers/xen/events/events_2l.c +++ b/drivers/xen/events/events_2l.c @@ -166,7 +166,6 @@ static void evtchn_2l_handle_events(unsigned cpu) int start_word_idx, start_bit_idx; int word_idx, bit_idx; int i; - struct irq_desc *desc; struct shared_info *s = HYPERVISOR_shared_info; struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu); @@ -176,11 +175,8 @@ static void evtchn_2l_handle_events(unsigned cpu) unsigned int evtchn = evtchn_from_irq(irq); word_idx = evtchn / BITS_PER_LONG; bit_idx = evtchn % BITS_PER_LONG; - if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx)) { - desc = irq_to_desc(irq); - if (desc) - generic_handle_irq_desc(irq, desc); - } + if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx)) + generic_handle_irq(irq); } /* @@ -245,11 +241,8 @@ static void evtchn_2l_handle_events(unsigned cpu) port = (word_idx * BITS_PER_EVTCHN_WORD) + bit_idx; irq = get_evtchn_to_irq(port); - if (irq != -1) { - desc = irq_to_desc(irq); - if (desc) - generic_handle_irq_desc(irq, desc); - } + if (irq != -1) + generic_handle_irq(irq); bit_idx = (bit_idx + 1) % BITS_PER_EVTCHN_WORD; diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index f4a9e33..7fea02c 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -336,9 +336,8 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) BUG_ON(irq == -1); #ifdef CONFIG_SMP - cpumask_copy(irq_to_desc(irq)->irq_data.affinity, cpumask_of(cpu)); + cpumask_copy(irq_get_irq_data(irq)->affinity, cpumask_of(cpu)); #endif - xen_evtchn_port_bind_to_cpu(info, cpu); info->cpu = cpu; @@ -373,10 +372,8 @@ static void xen_irq_init(unsigned irq) { struct irq_info *info; #ifdef CONFIG_SMP - struct irq_desc *desc = irq_to_desc(irq); - /* By default all event channels notify CPU#0. */ - cpumask_copy(desc->irq_data.affinity, cpumask_of(0)); + cpumask_copy(irq_get_irq_data(irq)->affinity, cpumask_of(0)); #endif info = kzalloc(sizeof(*info), GFP_KERNEL); diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c index 1de2a19..96109a9 100644 --- a/drivers/xen/events/events_fifo.c +++ b/drivers/xen/events/events_fifo.c @@ -235,14 +235,10 @@ static uint32_t clear_linked(volatile event_word_t *word) static void handle_irq_for_port(unsigned port) { int irq; - struct irq_desc *desc; irq = get_evtchn_to_irq(port); - if (irq != -1) { - desc = irq_to_desc(irq); - if (desc) - generic_handle_irq_desc(irq, desc); - } + if (irq != -1) + generic_handle_irq(irq); } static void consume_one_event(unsigned cpu,
WARNING: multiple messages have this Message-ID (diff)
From: tip-bot for Thomas Gleixner <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: peterz@infradead.org, linux-kernel@vger.kernel.org, david.vrabel@citrix.com, hpa@zytor.com, xen-devel@lists.xenproject.org, tglx@linutronix.de, mingo@kernel.org Subject: [tip:irq/core] xen: Use the proper irq functions Date: Tue, 4 Mar 2014 08:40:51 -0800 [thread overview] Message-ID: <tip-589d03e93f6cd595f68891e48f0804f2c8f38aae@git.kernel.org> (raw) In-Reply-To: <20140223212738.222412125@linutronix.de> Commit-ID: 589d03e93f6cd595f68891e48f0804f2c8f38aae Gitweb: http://git.kernel.org/tip/589d03e93f6cd595f68891e48f0804f2c8f38aae Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Sun, 23 Feb 2014 21:40:18 +0000 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Tue, 4 Mar 2014 17:37:52 +0100 xen: Use the proper irq functions generic_handler_irq() already tests for !desc so use this instead of generic_handle_irq_desc(). Use irq_get_irq_data() instead of desc->irq_data. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: David Vrabel <david.vrabel@citrix.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Xen <xen-devel@lists.xenproject.org> Link: http://lkml.kernel.org/r/20140223212738.222412125@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/xen/events/events_2l.c | 15 ++++----------- drivers/xen/events/events_base.c | 7 ++----- drivers/xen/events/events_fifo.c | 8 ++------ 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/xen/events/events_2l.c b/drivers/xen/events/events_2l.c index d7ff917..5db43fc 100644 --- a/drivers/xen/events/events_2l.c +++ b/drivers/xen/events/events_2l.c @@ -166,7 +166,6 @@ static void evtchn_2l_handle_events(unsigned cpu) int start_word_idx, start_bit_idx; int word_idx, bit_idx; int i; - struct irq_desc *desc; struct shared_info *s = HYPERVISOR_shared_info; struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu); @@ -176,11 +175,8 @@ static void evtchn_2l_handle_events(unsigned cpu) unsigned int evtchn = evtchn_from_irq(irq); word_idx = evtchn / BITS_PER_LONG; bit_idx = evtchn % BITS_PER_LONG; - if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx)) { - desc = irq_to_desc(irq); - if (desc) - generic_handle_irq_desc(irq, desc); - } + if (active_evtchns(cpu, s, word_idx) & (1ULL << bit_idx)) + generic_handle_irq(irq); } /* @@ -245,11 +241,8 @@ static void evtchn_2l_handle_events(unsigned cpu) port = (word_idx * BITS_PER_EVTCHN_WORD) + bit_idx; irq = get_evtchn_to_irq(port); - if (irq != -1) { - desc = irq_to_desc(irq); - if (desc) - generic_handle_irq_desc(irq, desc); - } + if (irq != -1) + generic_handle_irq(irq); bit_idx = (bit_idx + 1) % BITS_PER_EVTCHN_WORD; diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index f4a9e33..7fea02c 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -336,9 +336,8 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu) BUG_ON(irq == -1); #ifdef CONFIG_SMP - cpumask_copy(irq_to_desc(irq)->irq_data.affinity, cpumask_of(cpu)); + cpumask_copy(irq_get_irq_data(irq)->affinity, cpumask_of(cpu)); #endif - xen_evtchn_port_bind_to_cpu(info, cpu); info->cpu = cpu; @@ -373,10 +372,8 @@ static void xen_irq_init(unsigned irq) { struct irq_info *info; #ifdef CONFIG_SMP - struct irq_desc *desc = irq_to_desc(irq); - /* By default all event channels notify CPU#0. */ - cpumask_copy(desc->irq_data.affinity, cpumask_of(0)); + cpumask_copy(irq_get_irq_data(irq)->affinity, cpumask_of(0)); #endif info = kzalloc(sizeof(*info), GFP_KERNEL); diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c index 1de2a19..96109a9 100644 --- a/drivers/xen/events/events_fifo.c +++ b/drivers/xen/events/events_fifo.c @@ -235,14 +235,10 @@ static uint32_t clear_linked(volatile event_word_t *word) static void handle_irq_for_port(unsigned port) { int irq; - struct irq_desc *desc; irq = get_evtchn_to_irq(port); - if (irq != -1) { - desc = irq_to_desc(irq); - if (desc) - generic_handle_irq_desc(irq, desc); - } + if (irq != -1) + generic_handle_irq(irq); } static void consume_one_event(unsigned cpu,
next prev parent reply other threads:[~2014-03-04 16:41 UTC|newest] Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-23 21:40 [patch 00/26] genirq: Another round of tree wide cleanups Thomas Gleixner 2014-02-23 21:40 ` [patch 01/26] powerpc: irq: Use generic_handle_irq Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-03-04 16:39 ` [tip:irq/core] powerpc: Irq: " tip-bot for Thomas Gleixner 2014-03-04 16:39 ` tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 02/26] powerpc:evh_pic: Kill irq_desc abuse Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-03-04 16:39 ` [tip:irq/core] powerpc:eVh_pic: " tip-bot for Thomas Gleixner 2014-03-04 16:39 ` tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 03/26] powerpc: eeh: Kill another abuse of irq_desc Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-02-23 22:26 ` Benjamin Herrenschmidt 2014-02-23 22:26 ` Benjamin Herrenschmidt 2014-02-24 7:56 ` Gavin Shan 2014-02-24 11:32 ` Thomas Gleixner 2014-02-24 11:32 ` Thomas Gleixner 2014-03-04 16:40 ` [tip:irq/core] powerpc: Eeh: " tip-bot for Thomas Gleixner 2014-03-04 16:40 ` tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 04/26] xtensa: Use irq_set_affinity instead of homebrewn code Thomas Gleixner 2014-02-24 0:32 ` Max Filippov 2014-03-04 16:43 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 05/26] sh: " Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-03-04 16:43 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-03-04 16:43 ` tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 06/26] metag: " Thomas Gleixner 2014-02-24 13:24 ` James Hogan 2014-02-24 13:24 ` James Hogan 2014-02-24 14:24 ` Thomas Gleixner 2014-02-24 14:24 ` Thomas Gleixner 2014-02-25 18:56 ` Thomas Gleixner 2014-02-25 18:56 ` Thomas Gleixner 2014-02-25 21:57 ` James Hogan 2014-02-27 10:59 ` Thomas Gleixner 2014-02-27 10:59 ` Thomas Gleixner 2014-02-23 21:40 ` [patch 07/26] pci: pcie-designware: Remove irq_desc abuse Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-03-04 16:40 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 08/26] arm: Replace various irq_desc accesses Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-02-24 2:55 ` Shawn Guo 2014-02-24 2:55 ` Shawn Guo 2014-02-24 2:55 ` Shawn Guo 2014-02-26 17:05 ` Tony Lindgren 2014-02-26 17:05 ` Tony Lindgren 2014-03-04 16:40 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-03-20 15:22 ` [patch 08/26] " Arnd Bergmann 2014-03-20 15:22 ` Arnd Bergmann 2014-03-20 15:22 ` Arnd Bergmann 2014-02-23 21:40 ` [patch 10/26] blackfin:Use generic /proc/interrupts implementation Thomas Gleixner 2014-02-26 10:00 ` Steven Miao 2014-02-23 21:40 ` [patch 09/26] arm: mmp: Remove pointless fiddling with irq internals Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-02-23 23:17 ` Uwe Kleine-König 2014-02-23 23:17 ` Uwe Kleine-König 2014-02-24 6:07 ` Chao Xie 2014-02-24 6:07 ` Chao Xie 2014-02-24 6:43 ` Haojian Zhuang 2014-02-24 6:43 ` Haojian Zhuang 2014-02-24 11:31 ` Thomas Gleixner 2014-02-24 11:31 ` Thomas Gleixner 2014-02-27 1:37 ` Chao Xie 2014-02-27 1:37 ` Chao Xie 2014-02-27 2:19 ` Haojian Zhuang 2014-02-27 2:19 ` Haojian Zhuang 2014-02-27 11:28 ` Thomas Gleixner 2014-02-27 11:28 ` Thomas Gleixner 2014-02-24 11:27 ` Thomas Gleixner 2014-02-24 11:27 ` Thomas Gleixner 2014-03-04 16:40 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 12/26] mips: Use the core irq stats function Thomas Gleixner 2014-03-04 16:41 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 11/26] genirq: Add a kstat helper to increment irq stats Thomas Gleixner 2014-03-04 16:41 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 13/26] sparc: Use the core irq stats function Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-03-04 16:41 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-03-04 18:57 ` [patch 13/26] " David Miller 2014-03-04 18:57 ` David Miller 2014-02-23 21:40 ` [patch 14/26] mn10300: " Thomas Gleixner 2014-03-04 16:42 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 15/26] x86: xen: " Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-02-24 14:20 ` David Vrabel 2014-02-24 14:20 ` [Xen-devel] " David Vrabel 2014-03-04 16:41 ` [tip:irq/core] x86: Xen: " tip-bot for Thomas Gleixner 2014-03-04 16:41 ` tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 17/26] ia64: " Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-03-04 16:42 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-03-04 16:42 ` tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 16/26] s390: cio: " Thomas Gleixner 2014-03-04 16:42 ` [tip:irq/core] s390: Cio: " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 18/26] xen: Use the proper irq functions Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-02-24 14:24 ` [Xen-devel] " David Vrabel 2014-02-24 21:13 ` Thomas Gleixner 2014-02-24 21:13 ` [Xen-devel] " Thomas Gleixner 2014-02-24 14:24 ` David Vrabel 2014-03-04 16:40 ` tip-bot for Thomas Gleixner [this message] 2014-03-04 16:40 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 19/26] genirq: Provide irqd_irq_has_actions() Thomas Gleixner 2014-02-23 21:40 ` [patch 20/26] genirq: Provide irq_is_allocated() Thomas Gleixner 2014-02-23 21:40 ` [patch 21/26] xen: Get rid of the last irq_desc abuse Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-02-24 14:33 ` David Vrabel 2014-02-24 14:33 ` [Xen-devel] " David Vrabel 2014-02-24 21:12 ` Thomas Gleixner 2014-02-24 21:12 ` [Xen-devel] " Thomas Gleixner 2014-03-04 16:41 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-03-04 16:41 ` tip-bot for Thomas Gleixner 2014-03-04 17:16 ` David Vrabel 2014-03-04 17:16 ` [Xen-devel] " David Vrabel 2014-02-23 21:40 ` [patch 22/26] x86: Add proper vector accounting for HyperV Thomas Gleixner 2014-02-25 12:24 ` KY Srinivasan 2014-03-04 16:42 ` [tip:irq/core] x86: Add proper vector accounting for HYPERVISOR_CALLBACK_VECTOR tip-bot for Thomas Gleixner 2014-09-22 21:03 ` [patch 22/26] x86: Add proper vector accounting for HyperV Elliott, Robert (Server Storage) 2014-02-23 21:40 ` [patch 23/26] xen: Add proper irq accounting for HYPERCALL vector Thomas Gleixner 2014-02-23 21:40 ` Thomas Gleixner 2014-02-24 14:48 ` David Vrabel 2014-02-24 14:48 ` [Xen-devel] " David Vrabel 2014-03-04 16:42 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2014-03-04 16:42 ` tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 24/26] genirq: Provide handle_percpu_simple_irq() Thomas Gleixner 2014-02-25 12:25 ` KY Srinivasan 2014-02-23 21:40 ` [patch 25/26] x86: hyperv: Cleanup the irq mess Thomas Gleixner 2014-02-25 12:24 ` KY Srinivasan 2014-02-25 19:10 ` Thomas Gleixner 2014-02-28 2:50 ` KY Srinivasan 2014-03-04 16:42 ` [tip:irq/core] x86: Hyperv: " tip-bot for Thomas Gleixner 2014-02-23 21:40 ` [patch 26/26] genirq: Move kstats_inc_irqs_this_cpu() to core Thomas Gleixner 2014-03-04 16:43 ` [tip:irq/core] genirq: Move kstat_incr_irqs_this_cpu() " tip-bot for Thomas Gleixner
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=tip-589d03e93f6cd595f68891e48f0804f2c8f38aae@git.kernel.org \ --to=tipbot@zytor.com \ --cc=david.vrabel@citrix.com \ --cc=hpa@zytor.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=mingo@kernel.org \ --cc=peterz@infradead.org \ --cc=tglx@linutronix.de \ --cc=xen-devel@lists.xenproject.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.