From patchwork Wed Sep 11 16:07:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 274337 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 53FE62C0239 for ; Thu, 12 Sep 2013 02:13:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756601Ab3IKQKb (ORCPT ); Wed, 11 Sep 2013 12:10:31 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:64339 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756600Ab3IKQK1 (ORCPT ); Wed, 11 Sep 2013 12:10:27 -0400 Received: by mail-pb0-f48.google.com with SMTP id ma3so9193534pbc.7 for ; Wed, 11 Sep 2013 09:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+KQJN7lIoQHRAd2VvEEhxrnwgzeL7zBs/CC9vZVE1UU=; b=oRRiien/aMCesEAadX1YHdNQb0qlmOLp7GUIHFBBkeDXMzXspq6pJIyobviZcQNwYN QCld771zAFmFwk462Fqxz5yyQS1kmKC2UIHkgGlGL11haW0tS7h2AXMMTpXEllF3nH4Z lB5WXYVngZwi5WpqB+QDlYBQLqTKUaKBrcDhumG8xFPqp8oxtv7boHv1up6Ri3Zfmgn+ 1ryG9qF+7c3ar+UUBGypS53N3qVOS97t0EqCK3BtPmcecuOXN0nd2LdzFvnVIFMs2aVB eakoAbEtfnff/tVfaTHNP6/7ex5wVZClzgRdDVyP2FYrbjYHgKoecsjFdBYneaoE3khD bMig== X-Received: by 10.68.211.65 with SMTP id na1mr2608094pbc.191.1378915826389; Wed, 11 Sep 2013 09:10:26 -0700 (PDT) Received: from localhost.localdomain ([114.250.76.12]) by mx.google.com with ESMTPSA id u7sm12734166pbf.12.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Sep 2013 09:10:25 -0700 (PDT) From: Jiang Liu To: Andrew Morton , "David S. Miller" , Sam Ravnborg , Shaohua Li Cc: liuj97@gmail.com, Jiang Liu , Ingo Molnar , Peter Zijlstra , Steven Rostedt , Jiri Kosina , Wang YanQing , Kefeng Wang , sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: [RFC PATCH v2 18/25] smp, sparc64: kill SMP single function call interrupt Date: Thu, 12 Sep 2013 00:07:22 +0800 Message-Id: <1378915649-16395-19-git-send-email-liuj97@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1378915649-16395-1-git-send-email-liuj97@gmail.com> References: <1378915649-16395-1-git-send-email-liuj97@gmail.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Jiang Liu Commit 9a46ad6d6df3b54 "smp: make smp_call_function_many() use logic similar to smp_call_function_single()" has unified the way to handle single and multiple cross-CPU function calls. Now only one interrupt is needed for architecture specific code to support generic SMP function call interfaces, so kill the redundant single function call interrupt. Signed-off-by: Jiang Liu Cc: Jiang Liu --- arch/sparc/include/asm/pil.h | 5 ++--- arch/sparc/kernel/smp_64.c | 11 +---------- arch/sparc/kernel/ttable_64.S | 12 ++++-------- arch/sparc/mm/ultra.S | 5 ----- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/arch/sparc/include/asm/pil.h b/arch/sparc/include/asm/pil.h index 2669370..5ffb15d 100644 --- a/arch/sparc/include/asm/pil.h +++ b/arch/sparc/include/asm/pil.h @@ -22,9 +22,8 @@ #define PIL_SMP_CAPTURE 3 #define PIL_SMP_CTX_NEW_VERSION 4 #define PIL_DEVICE_IRQ 5 -#define PIL_SMP_CALL_FUNC_SNGL 6 -#define PIL_DEFERRED_PCR_WORK 7 -#define PIL_KGDB_CAPTURE 8 +#define PIL_DEFERRED_PCR_WORK 6 +#define PIL_KGDB_CAPTURE 7 #define PIL_NORMAL_MAX 14 #define PIL_NMI 15 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index e142545..65338c4 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c @@ -811,12 +811,9 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask) xcall_deliver((u64) &xcall_call_function, 0, 0, mask); } -extern unsigned long xcall_call_function_single; - void arch_send_call_function_single_ipi(int cpu) { - xcall_deliver((u64) &xcall_call_function_single, 0, 0, - cpumask_of(cpu)); + xcall_deliver((u64) &xcall_call_function, 0, 0, cpumask_of(cpu)); } void __irq_entry smp_call_function_client(int irq, struct pt_regs *regs) @@ -825,12 +822,6 @@ void __irq_entry smp_call_function_client(int irq, struct pt_regs *regs) generic_smp_call_function_interrupt(); } -void __irq_entry smp_call_function_single_client(int irq, struct pt_regs *regs) -{ - clear_softint(1 << irq); - generic_smp_call_function_single_interrupt(); -} - static void tsb_sync(void *info) { struct trap_per_cpu *tp = &trap_block[raw_smp_processor_id()]; diff --git a/arch/sparc/kernel/ttable_64.S b/arch/sparc/kernel/ttable_64.S index c6dfdaa..defa2db 100644 --- a/arch/sparc/kernel/ttable_64.S +++ b/arch/sparc/kernel/ttable_64.S @@ -58,17 +58,13 @@ tl0_irq3: BTRAP(0x43) tl0_irq4: BTRAP(0x44) #endif tl0_irq5: TRAP_IRQ(handler_irq, 5) -#ifdef CONFIG_SMP -tl0_irq6: TRAP_IRQ(smp_call_function_single_client, 6) -#else -tl0_irq6: BTRAP(0x46) -#endif -tl0_irq7: TRAP_IRQ(deferred_pcr_work_irq, 7) +tl0_irq6: TRAP_IRQ(deferred_pcr_work_irq, 6) #if defined(CONFIG_KGDB) && defined(CONFIG_SMP) -tl0_irq8: TRAP_IRQ(smp_kgdb_capture_client, 8) +tl0_irq7: TRAP_IRQ(smp_kgdb_capture_client, 7) #else -tl0_irq8: BTRAP(0x48) +tl0_irq7: BTRAP(0x47) #endif +tl0_irq8: BTRAP(0x48) tl0_irq9: BTRAP(0x49) tl0_irq10: BTRAP(0x4a) BTRAP(0x4b) BTRAP(0x4c) BTRAP(0x4d) tl0_irq14: TRAP_IRQ(timer_interrupt, 14) diff --git a/arch/sparc/mm/ultra.S b/arch/sparc/mm/ultra.S index 432aa0c..9b23d97 100644 --- a/arch/sparc/mm/ultra.S +++ b/arch/sparc/mm/ultra.S @@ -780,11 +780,6 @@ xcall_call_function: wr %g0, (1 << PIL_SMP_CALL_FUNC), %set_softint retry - .globl xcall_call_function_single -xcall_call_function_single: - wr %g0, (1 << PIL_SMP_CALL_FUNC_SNGL), %set_softint - retry - .globl xcall_receive_signal xcall_receive_signal: wr %g0, (1 << PIL_SMP_RECEIVE_SIGNAL), %set_softint