Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp1843893ybl; Sat, 31 Aug 2019 03:20:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwe1z6HL6BEokyjQabUsRvRzsGYbF32biDAuba/CLQNH6suiyein+MhdmOGglCEnbMZkE8z X-Received: by 2002:a62:f94a:: with SMTP id g10mr23621998pfm.167.1567246800753; Sat, 31 Aug 2019 03:20:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567246800; cv=none; d=google.com; s=arc-20160816; b=f1hvp5lfsEdglTbvtSXpcBkFsTpkjhnO6rcCoqNmija1IUdJal1E1JDTaYwzEeyCuO 6zs5GclX7CMPl5Y2UJher6yN/DSS9WWgGsnjYhl32uBEADu2zf64yx7BYyeMZcptYBju LDOz435t+ZQWrdFrBFdxkOVS2WSjyR17cYL9h76RV9Rc+MfYfEvBLNn8vQCQkCs8U+4r mhOsRr0KxJYD1Tle11BIj/qPn1ikpbVnYbYxLDrcR1iWm233tcAYSAEHDHWcMfbmO29D 22z2nlUJi6+0dN6zrzmu40V6Ezl0IVON544U472i6GPVLfG+9JG6wFp1RO2oFGIpLtuR U7Tw== 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=0xISFeXI6V/VCCOBsr0ouHlrTV7K42C7OEIEr4+IWgQ=; b=la12ro9ZY1jlLlJ36fHAaDLZpLuP7ifLfmyBmbwY8Pp4MAFqbfY+EG1dC43oOY8Uhc g1tphap2I6q/GmmUkQ1vQz5mgSqLVl0om1l9i303WKuzksS3fnHhh8VHAeCaR/3kGSnw QrMSrSpkkZzL8wKPGAbefMCaOstLOYK7lVXc2jk9ay0ogMxCIPQh19hbSiYGkpDzFdBl xcKuW663CE0JRSDzJiU1zNZg1+M87hACIcwATEOGMnwvugHcLvfkGL4LJV3kl40F2chH U+8DZ+vceldbOzeWMkGJuxc638wztmHs8IQplaf/0ttzo0hnPpkAw/jrMVFKOKbT1A+N FOwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b="Jmj/RO2l"; 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 x2si6678988pgp.475.2019.08.31.03.19.45; Sat, 31 Aug 2019 03:20:00 -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="Jmj/RO2l"; 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 S1728337AbfHaKSj (ORCPT + 99 others); Sat, 31 Aug 2019 06:18:39 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:11844 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727428AbfHaKSd (ORCPT ); Sat, 31 Aug 2019 06:18:33 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 46LC3q1zqXz9v4gc; Sat, 31 Aug 2019 12:18:31 +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=Jmj/RO2l; 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 jafzeWdXOY5n; Sat, 31 Aug 2019 12:18:31 +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 46LC3q0zZjz9v4gL; Sat, 31 Aug 2019 12:18:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1567246711; bh=0xISFeXI6V/VCCOBsr0ouHlrTV7K42C7OEIEr4+IWgQ=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Jmj/RO2l4WetigK6XG738kWgb7OdVdK9Xi7B91eZf6ZOHOAkedigP8ow6/szcGceX UviE0n/X3952teG9t8O0K0GCFf52W+qCU9sFBLLDQSCAV7X7hev3GowszR3LPCQmgX fvdq5A/LjRXWqGnoDnqT8rMEXijy1+RrNqR8lLUU= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 7B91B8B7B9; Sat, 31 Aug 2019 12:18:32 +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 0vs0TmwIuvJt; Sat, 31 Aug 2019 12:18:32 +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 48D4B8B789; Sat, 31 Aug 2019 12:18:32 +0200 (CEST) Received: by pc16032vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 0EEEB6985C; Sat, 31 Aug 2019 10:18:31 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [RFC PATCH v2 07/10] 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 Date: Sat, 31 Aug 2019 10:18: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 d194cff6528b..2fa02ae7a88c 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S @@ -497,14 +497,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 cr0, r11, (.Ldtlbie - PAGE_OFFSET)@l - cmplwi cr7, r11, (.Litlbie - PAGE_OFFSET)@l - beq- cr0, 11f - beq- cr7, 11f +do_databreakpoint: EXCEPTION_PROLOG_1 EXCEPTION_PROLOG_2 addi r3,r1,STACK_FRAME_OVERHEAD @@ -512,7 +505,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 cr0, r11, (.Ldtlbie - PAGE_OFFSET)@l + cmplwi cr7, r11, (.Litlbie - PAGE_OFFSET)@l + cror 4*cr0+eq, 4*cr0+eq, 4*cr7+eq + bne do_databreakpoint mtcr r10 mfspr r10, SPRN_SPRG_SCRATCH0 mfspr r11, SPRN_SPRG_SCRATCH1 -- 2.13.3