From patchwork Fri Jan 27 04:24:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 720473 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v8m1q4n1Pz9t0J for ; Fri, 27 Jan 2017 15:26:07 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gL0CrAJf"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v8m1q3X7BzDqDf for ; Fri, 27 Jan 2017 15:26:07 +1100 (AEDT) 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="gL0CrAJf"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::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 3v8m0K4s0ZzDq96 for ; Fri, 27 Jan 2017 15:24:49 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gL0CrAJf"; dkim-atps=neutral Received: by mail-pf0-x243.google.com with SMTP id e4so17688804pfg.0 for ; Thu, 26 Jan 2017 20:24:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=7ZSM8DfCGYDt6NCYADc1byMKFucjgXraCm7jRuftE/E=; b=gL0CrAJf6MowiguuRDCpJ5/WSdA4ztkJrmp+QQVKL2Y+GqXsU3mUe1BQ4sO+v7ELL8 NOlXVPqxj9Axkg3XhWMkjpsIEQs7KesEn4m86AugcAnV8T3Ron5tMYYDcJcKeoE3/Nzo OOoL1yNXmehSden9Be04ubtarsKCMBASaVv+p3ohaHtLkt5sAp0bg7ajB+8UfG/vzmnM IDvjm4g/xnMoMeW6m4fS7h1mficUHlV7DwCyOROZ4vNY+OpIlQaezNsT76KVRuuL5PrP bl82Uldiv1x1+Ydo/8lvKJrMC5Xhr76f+F9+fp6dgHGngS1wGtoETOoiGCr33vjacKLE b1Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7ZSM8DfCGYDt6NCYADc1byMKFucjgXraCm7jRuftE/E=; b=DaQ9Xhhum4F9yPVFBQ2mF7zfHR6gkVHJpQO1v48vJL8+MW90WQo9PjYDd4NITiIG+w Q+RY4EsKqvSzXvfqb3U09LzFX6HfowZNW0p/kJl5b9Y4XWDb1pvEA+Xxqlv4UAY+mAOW XID40Eu/rqu7+YsaNXw6uciLJdyUtboXU7mzgLVa9Ovti3CSgXXEjfy4PF1XerawrYEQ 34EyzE+UppncyxC5HvoVSGKwPtRhZnSnLC6sufS+/xdAwrwWj0FxuiGJwCOyuRYqOhc0 369mKnx6nOwZqznm/dowBrwWkTt4jJnWmhSTc1pXdg5lnpRuz2r3JgXmSR2taZLIyrha 44HA== X-Gm-Message-State: AIkVDXJwJko8mP9WM82UlLByYF0O032qHo9kx+efFiXKNFHqNbbzadrbKsXyd0c3wSQ8kA== X-Received: by 10.84.129.67 with SMTP id 61mr9459490plb.103.1485491087480; Thu, 26 Jan 2017 20:24:47 -0800 (PST) Received: from roar.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id d69sm6825913pfd.11.2017.01.26.20.24.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 20:24:46 -0800 (PST) From: Nicholas Piggin To: Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc/64: CONFIG_RELOCATABLE support for hmi interrupts Date: Fri, 27 Jan 2017 14:24:33 +1000 Message-Id: <20170127042433.14259-1-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The branch from hmi_exception_early to hmi_exception_realmode must use a "relocatable-style" branch, because it is branching from unrelocated exception code to beyond __end_interrupts. Signed-off-by: Nicholas Piggin --- This applies after the KVM RELOCATABLE series, and was split out from patch 3. arch/powerpc/include/asm/exception-64s.h | 8 ++++++++ arch/powerpc/kernel/exceptions-64s.S | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index 9a5dbfb2d9f2..6868b8739791 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h @@ -236,6 +236,11 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) mtctr reg; \ bctr +#define BRANCH_LINK_TO_FAR(reg, label) \ + __LOAD_FAR_HANDLER(reg, label); \ + mtctr reg; \ + bctrl + /* * KVM requires __LOAD_FAR_HANDLER. * @@ -260,6 +265,9 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) #define BRANCH_TO_COMMON(reg, label) \ b label +#define BRANCH_LINK_TO_FAR(reg, label) \ + bl label + #define BRANCH_TO_KVM(reg, label) \ b label diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 65a2559eeb7f..ee489b6ce5f9 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -977,7 +977,7 @@ TRAMP_REAL_BEGIN(hmi_exception_early) EXCEPTION_PROLOG_COMMON_2(PACA_EXGEN) EXCEPTION_PROLOG_COMMON_3(0xe60) addi r3,r1,STACK_FRAME_OVERHEAD - bl hmi_exception_realmode + BRANCH_LINK_TO_FAR(r4, hmi_exception_realmode) /* Windup the stack. */ /* Move original HSRR0 and HSRR1 into the respective regs */ ld r9,_MSR(r1)