From patchwork Mon May 30 06:18:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 627611 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rJ62y3XMjz9t79 for ; Mon, 30 May 2016 16:21:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Cv+Nn5tk; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rJ62y2RPkzDqT8 for ; Mon, 30 May 2016 16:21:46 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Cv+Nn5tk; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x243.google.com (mail-pa0-x243.google.com [IPv6:2607:f8b0:400e:c03::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rJ5zR2vrVzDqJd for ; Mon, 30 May 2016 16:18:43 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Cv+Nn5tk; dkim-atps=neutral Received: by mail-pa0-x243.google.com with SMTP id gp3so13598731pac.2 for ; Sun, 29 May 2016 23:18:43 -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=6pWnzIxgkfA7Tf8pyGDB4/D3N1hupQ9lXcMGfpHP4PU=; b=Cv+Nn5tkR2/WCS55BZV1J87h+c94cXJuSwk+ZgKWf8nq36voQlL5L3vqfMV6irE3ZX L9Z0El3qr9Gg8f1PLQsoyG4ttUoNj0cagR5jGMC5RdOpnRaT/TBJxhbZYekvbiaR3Yen 4n03CljmOqSAuBnc5g8/ldLPEdcIXOJVOLB+czV0oa/K6JP+GgZASVm2SObFKOZOHio1 foJdmbDkU6wkBGh34TguNSDHJL9HiC/XAWL3u02Xwuyv8OOs0oruLI2f7jY+Sw2dXg25 XBf0O0HRYjlKljDJNmJnj4/Z2noqx+EVvVl640C3Bgc4ZQGNp7bjV5k4arA+CjJrVhJD ut3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6pWnzIxgkfA7Tf8pyGDB4/D3N1hupQ9lXcMGfpHP4PU=; b=NIERHAE5EjL0N8GBO0ciledp4m3k6FiyJAjuGTJsh2ms8zYqTtB+UVW0CyIwD9pVed YgupIauwD4kSCQgbJOR+PvN8ZoLINzuIcvWa1VgiVlGqHuKL3G7KQsJsgIxgQmHug6DF cw7vrtL2hQKaGJXzpmKzndbsqIXkS9Q420xJbID1eCeU18cgtwv1lSv5EuMSqaHMi/4/ md1qt08kqMFU+pmSrkaeyscwwzCGgUbIwiV4LIPjvvnbbL/g3yey9j334xoiKtk3Ry6x JKyHCEIWad32MDO2LuCPaZ/SXKvaNdDQ69jwFUw3t2yXlKQM2G/Ktmhjn8cablu/y6Mv UsEA== X-Gm-Message-State: ALyK8tLpEfmqTEqkJbt5dtuRKtmHY4Ay+r2K7dSVJgjdpuQEclG7v/rZl+xbUM8JYH815g== X-Received: by 10.66.165.40 with SMTP id yv8mr28507994pab.89.1464589121258; Sun, 29 May 2016 23:18:41 -0700 (PDT) Received: from circle.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id m81sm16432256pfi.51.2016.05.29.23.18.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 May 2016 23:18:40 -0700 (PDT) From: Rashmica Gupta To: mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, nfont@linux.vnet.ibm.com Subject: [PATCH 2/5] powerpc/pseries: Remove MPIC from pseries smp Date: Mon, 30 May 2016 16:18:12 +1000 Message-Id: <1464589095-442-2-git-send-email-rashmicy@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464589095-442-1-git-send-email-rashmicy@gmail.com> References: <1464589095-442-1-git-send-email-rashmicy@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" MPIC was only used by Power3 which is now unsupported, so remove MPIC code. XICS is now the only supported interrupt controller for pSeries so do some cleanups too. Signed-off-by: Rashmica Gupta --- arch/powerpc/platforms/pseries/pseries.h | 6 ++---- arch/powerpc/platforms/pseries/setup.c | 2 +- arch/powerpc/platforms/pseries/smp.c | 31 +++++-------------------------- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index 7aa83f00ac62..edeaec74b656 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -31,11 +31,9 @@ extern int pSeries_system_reset_exception(struct pt_regs *regs); extern int pSeries_machine_check_exception(struct pt_regs *regs); #ifdef CONFIG_SMP -extern void smp_init_pseries_mpic(void); -extern void smp_init_pseries_xics(void); +extern void smp_init_pseries(void); #else -static inline void smp_init_pseries_mpic(void) { }; -static inline void smp_init_pseries_xics(void) { }; +static inline void smp_init_pseries(void) { }; #endif #ifdef CONFIG_KEXEC diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index f83ac9be7f34..32a224d3eaa1 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -437,7 +437,7 @@ static void __init pSeries_setup_arch(void) /* Discover PIC type and setup ppc_md accordingly */ setup_kexec_cpu_down_xics(); - smp_init_pseries_xics(); + smp_init_pseries(); /* openpic global configuration register (64-bit format). */ diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index 6932ea803e33..93a8a67006c7 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -140,7 +139,7 @@ out: return 1; } -static void smp_xics_setup_cpu(int cpu) +static void smp_setup_cpu(int cpu) { if (cpu != boot_cpuid) xics_setup_cpu(); @@ -207,28 +206,22 @@ static __init void pSeries_smp_probe(void) } } -static struct smp_ops_t pSeries_mpic_smp_ops = { - .message_pass = smp_mpic_message_pass, - .probe = smp_mpic_probe, - .kick_cpu = smp_pSeries_kick_cpu, - .setup_cpu = smp_mpic_setup_cpu, -}; - -static struct smp_ops_t pSeries_xics_smp_ops = { +static struct smp_ops_t pSeries_smp_ops = { .message_pass = NULL, /* Use smp_muxed_ipi_message_pass */ .cause_ipi = NULL, /* Filled at runtime by pSeries_smp_probe() */ .probe = pSeries_smp_probe, .kick_cpu = smp_pSeries_kick_cpu, - .setup_cpu = smp_xics_setup_cpu, + .setup_cpu = smp_setup_cpu, .cpu_bootable = smp_generic_cpu_bootable, }; /* This is called very early */ -static void __init smp_init_pseries(void) +void __init smp_init_pseries(void) { int i; pr_debug(" -> smp_init_pSeries()\n"); + smp_ops = &pSeries_smp_ops; alloc_bootmem_cpumask_var(&of_spin_mask); @@ -258,17 +251,3 @@ static void __init smp_init_pseries(void) pr_debug(" <- smp_init_pSeries()\n"); } - -void __init smp_init_pseries_mpic(void) -{ - smp_ops = &pSeries_mpic_smp_ops; - - smp_init_pseries(); -} - -void __init smp_init_pseries_xics(void) -{ - smp_ops = &pSeries_xics_smp_ops; - - smp_init_pseries(); -}