Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp5512055ybe; Tue, 10 Sep 2019 05:03:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqwXSm3BMHLeZlu4HN2gs/O44o6zIc/EH0aliIiamJzND0ei9VcDYuSkkw67cOAwa0jB5M3Z X-Received: by 2002:a50:ee98:: with SMTP id f24mr21364892edr.52.1568116993743; Tue, 10 Sep 2019 05:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568116993; cv=none; d=google.com; s=arc-20160816; b=MMmtOZ/oVRGk4c0w5C4ikEpOu/4JKTsk1Hf6D9HQBxYvPdOIHtOsnkWXq9GbFvHIPl WiEVWIeUUbckLk3XAke3ofRux43+GuMVdW9+XgHhSrBegP7lb6pCee0paoIJWMjsEXoR 4HvGRjmOzACJSPWmvolE+Dna4kf7gl/DHRCKfVbXyG6wJot1tCvf1LSoNc2JOsxwDXOT BRGvMigebgbQ+UNakTzBtmu6CzT6WK2hfC0GqO2Ejqki/7MX+21SUjGD1VSSE6SithT3 LQ9R5rZX6mLeR5M9hBlyUUZu6RjN1fkCLzgG8H8BgQWfps6ivP7/OdHgjPc9kH3w/F0X V5Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=mTnSd5K48HUvkTFKOuCKJIWuBpZFeLQZSv1zWTZ0KFQ=; b=Eng4ahMeCuOA/PUWMY3PtwEhMds2XK9VMfXNZ52j9Lz6w7IwagyqeKJbRkrnnDfbei X0bcghMuFdsSprEWgWJjZ64P2jFX5/c7g52SDH3nmaofofeXLIQwIJipQ/6mxqubx1Qb 9dANvQL0jFzkKDdPh8OnSSNsjv/FkuEBs5SUPAZfEUPnr3yAMYG+dO+hEfHpuL0MDWG6 b7kCMV+QaE726cfQfaN6MhqNNVNy4Sh5dMneA9kvJANY4uiq04LOd4FzONiW5eisXwZl SAgvhq/sn0olx+H1DkCmG9xYOTuiAJHD8YKoHlLVUD0EymTXVslkKLsKfDUSiBZL43nN 1LSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=mehlS9yO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p14si10104356ejn.192.2019.09.10.05.02.49; Tue, 10 Sep 2019 05:03:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=mehlS9yO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388808AbfIJJRq (ORCPT + 99 others); Tue, 10 Sep 2019 05:17:46 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:59526 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730121AbfIJJRT (ORCPT ); Tue, 10 Sep 2019 05:17:19 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 46SKDY1QFRz9txWD; Tue, 10 Sep 2019 11:17:17 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=mehlS9yO; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id CJDhCwFp9eEg; Tue, 10 Sep 2019 11:17:17 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 46SKDY0NzGz9txW2; Tue, 10 Sep 2019 11:17:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1568107037; bh=mTnSd5K48HUvkTFKOuCKJIWuBpZFeLQZSv1zWTZ0KFQ=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=mehlS9yOkzdzZGbhUI3YXYnb0EZmc5cw/zlnMff2KRNVjwsQ7JjxjXlRaoBOyg5bj lHNHrOK6JtRcNSF3il6suaMq1AQNN0QJve94ejDjU9gqb7yI/sZnZGT/etO5zd+xOP NRWAE2qaJTl5TfbN6/JvM293Iv6wGTMXBehGo1kc= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D6FE38B880; Tue, 10 Sep 2019 11:17:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id R3WPsqFaJEFb; Tue, 10 Sep 2019 11:17:15 +0200 (CEST) Received: from pc16032vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9E7218B899; Tue, 10 Sep 2019 11:16:31 +0200 (CEST) Received: by pc16032vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 4D4106B739; Tue, 10 Sep 2019 09:16:31 +0000 (UTC) Message-Id: <1d8d2a762115ca6c5700a33a1d782a975c886a4a.1568106758.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v3 12/15] powerpc/8xx: split breakpoint exception To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com, dja@axtens.net Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org Date: Tue, 10 Sep 2019 09:16:31 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Breakpoint exception is big. Split it to support future growth on exception prolog. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_8xx.S | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 1e718e47fe3c..225e242ce1c5 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -490,14 +490,7 @@ DARFixed:/* Return from dcbx instruction bug workaround */ * support of breakpoints and such. Someday I will get around to * using them. */ - . = 0x1c00 -DataBreakpoint: - EXCEPTION_PROLOG_0 - mfspr r11, SPRN_SRR0 - cmplwi cr1, r11, (.Ldtlbie - PAGE_OFFSET)@l - cmplwi cr7, r11, (.Litlbie - PAGE_OFFSET)@l - beq- cr1, 11f - beq- cr7, 11f +do_databreakpoint: EXCEPTION_PROLOG_1 EXCEPTION_PROLOG_2 addi r3,r1,STACK_FRAME_OVERHEAD @@ -505,7 +498,15 @@ DataBreakpoint: stw r4,_DAR(r11) mfspr r5,SPRN_DSISR EXC_XFER_STD(0x1c00, do_break) -11: + + . = 0x1c00 +DataBreakpoint: + EXCEPTION_PROLOG_0 + mfspr r11, SPRN_SRR0 + cmplwi cr1, r11, (.Ldtlbie - PAGE_OFFSET)@l + cmplwi cr7, r11, (.Litlbie - PAGE_OFFSET)@l + cror 4*cr1+eq, 4*cr1+eq, 4*cr7+eq + bne cr1, do_databreakpoint mtcr r10 mfspr r10, SPRN_SPRG_SCRATCH0 mfspr r11, SPRN_SPRG_SCRATCH1 -- 2.13.3