Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp4345658ybc; Tue, 26 Nov 2019 07:32:27 -0800 (PST) X-Google-Smtp-Source: APXvYqzdJtCj3DGl3kwRSBEbdoPqPjWFcF/3JVPo0JQ63fyBf/SQ9Rx4s+/WqQUkybY1yn3GtJ2/ X-Received: by 2002:adf:f64b:: with SMTP id x11mr17368497wrp.355.1574782347071; Tue, 26 Nov 2019 07:32:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574782347; cv=none; d=google.com; s=arc-20160816; b=CPyeTdHoINGYGPbYQADj/VAwtOHRnAl947HT3IWecMh+GI/zyAo8oKqniy8AodHMiC cBDo7Q3eUYiAYyfjhPDXnKYTwYRMF8I5A0oroRguCsokkro0Kd9NNbiwl+Td9wc3Td3f IDm0Kt2/gSmcT8vWIdx1T/+meaR9wMdypT4p/WFHcZRKjyO9WsgJOy1rQ9C6oVHXHB85 9Pdt/ox/h2d25rmdP/U3blqhi5KvzXkCDrtezKlrbngxwrFix15y5qTGbt0xBpIxGsmF lscHSaS1/gP6TGNfGL34XWfsN5zglB41eQQF78jjogddx2wyR7m2NHs4SGrgvksn66oH AUXA== 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=kZWJIbJCu4RUYAxapswPeX8pzQ0QiOQwMeuz/yfcyprHU+ogY9DVZck3CWeqmCq/YT ZD4WacxwIBVQSHUTfDLaIJe7U2vid0pHrnBhlEnZ2Ao65CQH/a4z8/vnEj4pVueXxApK 7GnFVo8+QVjGbY4FDv511XswQ2hyPwq3MXBN+b73+zeL9uM/Fk7mX5svi6827W7U26SK wkv8DbWtPRhEbUGminqLXue5hUF4HDeWdFhk9GBmYGBoKLvpYEU5+e3jQIwb+BRyxt8/ jcaZhqrssX3UwNyXK5LcaphPF3yLPZuZQaHM8KGIfC3GKIAVP9r7tw0+1e4u1fBFlGXl OCaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=ST2yTTZp; 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 m3si7645172edp.357.2019.11.26.07.32.02; Tue, 26 Nov 2019 07:32:27 -0800 (PST) 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=ST2yTTZp; 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 S1727947AbfKZMgz (ORCPT + 99 others); Tue, 26 Nov 2019 07:36:55 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:44208 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728477AbfKZMgR (ORCPT ); Tue, 26 Nov 2019 07:36:17 -0500 Received: from localhost (mailhub1-ext [192.168.12.233]) by localhost (Postfix) with ESMTP id 47Mk0b696nz9v0G9; Tue, 26 Nov 2019 13:36:15 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=ST2yTTZp; 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 fgCG9oe60t4O; Tue, 26 Nov 2019 13:36:15 +0100 (CET) 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 47Mk0b55yCz9v0G3; Tue, 26 Nov 2019 13:36:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1574771775; bh=mTnSd5K48HUvkTFKOuCKJIWuBpZFeLQZSv1zWTZ0KFQ=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=ST2yTTZpS/fbPUWKHzXohvhcRAlknP15IEdRnAOKNJ/qnyyf7v3YdfLH7qXuqqU9M Rm5oFWe9KE9HXMP2+iZG+nfieb5FRjBiUVDZNBBp/TCeFxTiFJDrgSS3hCguC43yw7 bb1XbE/kBf2uDmTOdUqv3MllgnQWlG4gWO1MNH24= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id F20058B7FC; Tue, 26 Nov 2019 13:36:16 +0100 (CET) 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 0eE_v2FhZUyJ; Tue, 26 Nov 2019 13:36:16 +0100 (CET) Received: from po16098vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id C168A8B771; Tue, 26 Nov 2019 13:36:16 +0100 (CET) Received: by po16098vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 2AFBE6B76A; Tue, 26 Nov 2019 12:36:16 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v4 12/16] powerpc/8xx: split breakpoint exception To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org Date: Tue, 26 Nov 2019 12:36:16 +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