From patchwork Mon May 30 06:18:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 627612 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 3rJ64n4Nqjz9t79 for ; Mon, 30 May 2016 16:23:21 +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=i3YNULot; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rJ64n3FkJzDqZQ for ; Mon, 30 May 2016 16:23:21 +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=i3YNULot; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x242.google.com (mail-pa0-x242.google.com [IPv6:2607:f8b0:400e:c03::242]) (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 3rJ5zb2hM6zDqYc for ; Mon, 30 May 2016 16:18:51 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=i3YNULot; dkim-atps=neutral Received: by mail-pa0-x242.google.com with SMTP id x1so4002977pav.1 for ; Sun, 29 May 2016 23:18:51 -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=1B1tldvo2VTGX585iGrI64vfYVsV64Iy7tnD0jSbQ7Y=; b=i3YNULotkSVi18ZVJHJxX7Qf/uuIskdf6+Rv+o1eE+grQpDy6ceygI5HoVvOGKZALa 2r3fmL+s6jQUgnOyvBfWMD+3cJcSL/HlYgTm1Pfj/2l2y281Cb5F4chnV17yQXA3L/M9 T+TMZyRO8X8Rjqcyffjqt79xQ+iQWUDmcFtZQOErMgQ/4wkflyppv+KQL5gJElkjIeP5 a5XLhKnH6khV02qiHA9KYVVMsJA+Cw6t1C8fYdkvnlbThLnwoG3AqD4WH1dD9Z+hSoHW g0W/SOrPsj7smzUmLJCkL2oUW02IDB5NZHOwBl9Z+8+UaqHzeKg9UTebwMZBiHRBBzKd TU8A== 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=1B1tldvo2VTGX585iGrI64vfYVsV64Iy7tnD0jSbQ7Y=; b=GRK0eO+/IGWoTl1v5js3TSuqj49zmiJ9eMF1Yu+eRghLb5ppAng98+37idAc/R8ddj V5JumCsDI9/n52Lvtq5H1+SVfbD/Q2jktvNooO8Dh0SELWnTAu/KM131SJDHx1inkXYJ acgROUco1zsWgDVCfd4NjBpbs1q5b3wvF1fh2ScCTvx4Wc7Hr4ypxlimw3spgbk8v5V/ lqBLUgkoEaUGE6WQyq/IHYC8s6x300UY1so5Avf+Mmr13RXKHBxFZVOFFO1IV+TOHVtK 4rO4hhir8Ddn6oGmBWZ1WWLWkwC4LfyKxI+SR+mu0+sSwtOBO90M7ic8lJAX9lVi8189 xBOw== X-Gm-Message-State: ALyK8tK1KrtPIGzDmzhemY9ARkJlJXVt3Nirv8YdAk3LCBI/LIj4u8rXsOjI4fBwWRBp6A== X-Received: by 10.66.1.99 with SMTP id 3mr43159425pal.26.1464589129073; Sun, 29 May 2016 23:18:49 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 May 2016 23:18:48 -0700 (PDT) From: Rashmica Gupta To: mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, nfont@linux.vnet.ibm.com Subject: [PATCH 3/5] powerpc/pseries: Remove MPIC from pseries kexec Date: Mon, 30 May 2016 16:18:13 +1000 Message-Id: <1464589095-442-3-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/kexec.c | 23 +---------------------- arch/powerpc/platforms/pseries/pseries.h | 8 +------- arch/powerpc/platforms/pseries/setup.c | 2 +- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c index 13fa95b3aa8b..f7a93e6bb630 100644 --- a/arch/powerpc/platforms/pseries/kexec.c +++ b/arch/powerpc/platforms/pseries/kexec.c @@ -14,14 +14,13 @@ #include #include #include -#include #include #include #include #include "pseries.h" -static void pseries_kexec_cpu_down(int crash_shutdown, int secondary) +void pSeries_kexec_cpu_down(int crash_shutdown, int secondary) { /* Don't risk a hypervisor call if we're crashing */ if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) { @@ -51,26 +50,6 @@ static void pseries_kexec_cpu_down(int crash_shutdown, int secondary) "(hw %d) failed with %d\n", cpu, hwcpu, ret); } } -} - -static void pseries_kexec_cpu_down_mpic(int crash_shutdown, int secondary) -{ - pseries_kexec_cpu_down(crash_shutdown, secondary); - mpic_teardown_this_cpu(secondary); -} -void __init setup_kexec_cpu_down_mpic(void) -{ - ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_mpic; -} - -static void pseries_kexec_cpu_down_xics(int crash_shutdown, int secondary) -{ - pseries_kexec_cpu_down(crash_shutdown, secondary); xics_kexec_teardown_cpu(secondary); } - -void __init setup_kexec_cpu_down_xics(void) -{ - ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics; -} diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index edeaec74b656..d81aa1e08478 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h @@ -36,13 +36,7 @@ extern void smp_init_pseries(void); static inline void smp_init_pseries(void) { }; #endif -#ifdef CONFIG_KEXEC -extern void setup_kexec_cpu_down_xics(void); -extern void setup_kexec_cpu_down_mpic(void); -#else -static inline void setup_kexec_cpu_down_xics(void) { } -static inline void setup_kexec_cpu_down_mpic(void) { } -#endif +extern void pSeries_kexec_cpu_down(int crash_shutdown, int secondary); extern void pSeries_final_fixup(void); diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 32a224d3eaa1..15ca3441cf1d 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -436,7 +436,6 @@ static void __init pSeries_setup_arch(void) set_arch_panic_timeout(10, ARCH_PANIC_TIMEOUT); /* Discover PIC type and setup ppc_md accordingly */ - setup_kexec_cpu_down_xics(); smp_init_pseries(); @@ -786,6 +785,7 @@ define_machine(pseries) { .machine_check_exception = pSeries_machine_check_exception, #ifdef CONFIG_KEXEC .machine_kexec = pSeries_machine_kexec, + .kexec_cpu_down = pSeries_kexec_cpu_down, #endif #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE .memory_block_size = pseries_memory_block_size,