From patchwork Sun Feb 13 08:09:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1592078 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=l3rPmitT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JxKlz0WT4z9sFh for ; Sun, 13 Feb 2022 19:10:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 56637838AF; Sun, 13 Feb 2022 09:10:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="l3rPmitT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE51C838C4; Sun, 13 Feb 2022 09:10:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0F2B283095 for ; Sun, 13 Feb 2022 09:09:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=90432c20ec=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21D851OQ027847; Sun, 13 Feb 2022 00:09:53 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=93xexNKxTNFTNYNfR535RdO7yGwS2TYT1k53GVqTYis=; b=l3rPmitTl5yC9LgQS30ae//Qr9yCGp3b8H4ZJ869WiAZAtqSPuRSTPUMQlH+rymggJa/ sCzeBxOOqs++refEtWgyUCBiX8887+SO0bmnVnN00J3KmzFb9C3ZH5t44IwZFbnVFcMS PimP3Leo7jEUHnmIBS39QJuNogjuTYVmBkp/U19DQdKil7X2hztRFimaT5kkWslh4NxM OTlIfaHqYbgXXle6kH15a8ydnG/e6igXsT5IzQ7wdrb53Ud5mZfFtEElZuZOCsbOjj1n E6ZH3ePnKdrSV8H04aaQhp96HmmlgjQQRMjMN81uLWssK6kxNJ6f+GqdgkauEOp1dOO/ iA== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3e69248jju-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 00:09:53 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YEOm7S34gg/r+t//lHdcKfjLJwBf8Yplaks5NZv0HgPnge+Z8B7JMEBCyk3MeP30ktA8scx2CKknbxKANW2gdwz00HsxiGpVzGu+Nxc3b0Ei+L5q6t10JUQQb7jBvXy5wfbvJoUtQkTsruQ38EttHHqc7VjHStakcpJffi07Sybl/G5Czhn9zfJVgHECkmWBywptmy3/Qgwvz7gZT87o4oHG0LEkA4srmuiQzeOVSQA93fHH2LBx6+dsae7r2tNsSDz38nNY3xsWRiMKTLU2yugaoUE7+JG5OWJD/nJQUNJ3zPbj/uF3tA4clxlYkr3+eaAG7xzxHqneRyHeyQzufg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=93xexNKxTNFTNYNfR535RdO7yGwS2TYT1k53GVqTYis=; b=Bc9sn/Hdz5WdFx/4yRGvQ4NebmYNSSUjvC45WtoE0+0QSq3rqGIbf3JWaccXFUMiCrFAEmpgDbi+8ah+vDgHkFFViewYw3n7+SBPGcPvbYp/njhItzf0L8S11ui7DyIFZ/zQL11GWUlCDplXokNB5eSadJIe2G2k464zOXwLcHTN6fur8iWV6qATID1gHxwGaumMf7lHKE7SbbvG8RGdw8pyrKzzKIHyCSk7Zdnc7i0KEBgq1p8NyO2p5PbHc1G+U+hr8sbpv0LlgiYp9oYcn6PDaKUwC3xDqqCNAA8hhG4c6LNIA6L5GyjGXKMhNIhprS1/EJm0UehzOtM4czW8cQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by BYAPR11MB2535.namprd11.prod.outlook.com (2603:10b6:a02:be::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sun, 13 Feb 2022 08:09:48 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e%4]) with mapi id 15.20.4975.015; Sun, 13 Feb 2022 08:09:47 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Michal Simek Subject: [PATCH 1/7] microblaze: exception: move privileged instruction exception out of v5 ifdef Date: Sun, 13 Feb 2022 10:09:19 +0200 Message-Id: <20220213080925.1548411-1-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: VI1PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:802:2::31) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd4baa24-7dff-45bc-4fee-08d9eec8335e X-MS-TrafficTypeDiagnostic: BYAPR11MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8vF9w/pvnb1lg41oWbV6mho8gy9wI/1WyoAZYpfQWbkJ4JriV/YWhqd/MjM/WF83RaJmYv7zUoDqja5xWYH7gOSP2ez7znktXV1bz1xdEy88m8gZcHLcCH6nMggrnEB1EI2Paz2ivc9fxRc7etoE3g7w2+myldRlqt8B4WhNJ+3eov29aApGTIxMkZbYyOimSGyrcUTByFcbKOnJol+C3ZwpKtm8ACKsgPq/lAr6ViB3ZtBZMzagBe5ayMv4NaG1ptZ7ahH0H2nIJZmQGbKcC30FNkRx+pJ7wzD8xrFNbJz7lviVb9cPoZJWLCKHjnmEkBgeDc64sWmVKowoExCezqIQ8DrHWQozTaTsPpT/2fRWmQc1nLj/UuTmbdBKQ03X5U0GXeC/vQ88aqy0QXUOJ6ldajVeGy7sQ2/QT0lHc9NwcLOx5HOeFriAMBiTvjDJhSs9ocmsH5IwCZrTZH2GTrPgSGTBHlmBlo1JoJ8RIP0WG+4y/cRjJGpZRpJq4bdqfAE4Ecsnj/AYL56SIGidGjaB6Pbeajpxo/rDl5jRHJ4PAdo08EnfrBHYoyZfA7SeDwQLQ7lk4eg2BkOxL1V3iq+X79qDn6Wl67FUQLEQOh/Egp09iLp955BjqND9hj+PzEdZo9/4JKl4vjq2TgbkALmGvEX7YI2f2/juR9FU3DJE07kf4EoUhwl3mBNPtzltFW3NJSOc/Lo36KRJxSG1hQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6512007)(6486002)(66476007)(6506007)(4744005)(83380400001)(52116002)(6666004)(508600001)(6916009)(66946007)(2616005)(38350700002)(4326008)(186003)(44832011)(1076003)(38100700002)(66556008)(5660300002)(26005)(36756003)(8936002)(8676002)(316002)(2906002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2h8KrY00KasKTQSa7vsurx2DyN31K8kOOoELypNx+TBM3CzfzqQH2Pr3ojiES3Is0qtuYMeB8EblfDq+tJwrQmZpeQqiQ29Zf/ffIKXFdhpdN02YO8y9STGrMc+mKqw0wKHV0kam7LtmgZ3vVewPAhD18UZxoAbT5YFWe9VeSQtDj0LaXU48hm4wJyLy1naRxOkoYHpU47guvuK438X8BfpXsWv7cA0RfNC+vSaiJR+xG4IzImYlJmLBRPwv+p5V+rDtZOsIexx2gvKFSgtz2gDBusaCq4Kb2I/QzCTuFLPVi1iCCYY8RHRuK+MRhiWEkJxmsXQVbAPLqw1QCiUynpiT0Jq/gS+P8+RdHrGmDe2bJQxDmgzfoBGK7moUG742DokYYqK/o9FEFlrFzd9Uozpr/AqBmJ7pXvUiadJ1V8gfZWqFjiq4vdlXFtdEkYSwx+erC54QX+P5tmSksTY4Q6YhqrYN3zaNoJRtHVKGgcjJUt27c3q0qv4P9GWbiSE8cDqCppip143SmpDVC1JvYpWBKqUss29yoNOZCBP0ZUAa4YxREdOw/ypU6HmjLP4JMCt966CvDDywikZGGNg+KXm86BTqH3EYoYXhZqB7h+tGj/8ljdBmwSYZ+dhS5Em2V5tCaJ1nrX7lhjxKUlU877hzdMIu1yQkil9Idz1AHl5mBbMZKwMeOqTRNGvnaCNT+9RXGh8wklLlKx3PkrQPys4CfqKgebW5MUEw/3uN9AUCynbOTVNEyp7YchtpxKPYcF6OCE58Pkwk97IW1tFk/dzlTRgMbO9iXECDBarHIiilVLxEbVUgESdjdYpHrhLCKzCSSbZAkn2FHAlbadzA8h9eNuMDXrS1y6d5yFxhnr3JYAEJh5dMB6TU89fYfzJpVriJD3XljtjBNOrTWekoTfS+z50vn/6AZ4zpl+Urc7qGaE9xm58k0QtuHVfLOMVwYcjhsp+2vT0y3xkZBzvWNRi8aD7uW4NJUkm7nHzf4fAG8avaJn/ARDgIKdcEmRgPeZb7/PgZQZoZRb5+pdiNL7s3qOrjsolnKN9VkeIhVZ26K1XIVI/CaMs1IvRsIHKTr1BFxuGinpym3FW9QY8PHcwAf6v1WkSamMh4DwoYXdYUtRt7m4an/jRXYfeGKsI5PzionCoi8bzpcQW+UWlZi0W7oShNiHjdChE5g7Ru8ykxb7p+VQVok5EYF7Kpfry+7M4T+Lu2/xCrMqfy+VwUzKr6mjfaAnGt7PVJovSbpG5Y5MoR4/G5ocy3yQXFpehj9xqCpzsb5pBdnXazd0kT0HaUGP558S8+YA5IZUl/KBY08FKeezuy8h/glEuaacqbdDq1f6WjWNPLcXjdmd71vUHjRULPkH6rSNtVq8lQ72y893DKIynqgqDOhUH7LVjWksblr+hJ9vE7x41jp6LTT8AwXVU5KGD/7eXkT5ALPWulARASs2zuS3g4bipANdM/LsrDqtp+/gEmEEfYIj+ys41VZGeSz+zM3FPko4ZQEDPCqBpZqky0gCl53bqLUcQWm/eBko+JXaW8NzWTK5SxOPcYImLyIibAF/xx6TadlXlbahGMDVpbKybEmbRPSCG9+m1p1G7Z4Xwg3olLYvGpy2JqIkNHnXaFvXG8GkLIRMWtC6ljgTTkSC+lNKqZbTD4I4bMyc5vcQgI7w0yIdzBxg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd4baa24-7dff-45bc-4fee-08d9eec8335e X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 08:09:47.6711 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aGxocfh2hslq+FpH3q3GRQo6dR5Qy35fujGeOLW+tDMWFh4VptiURCxhxTbktiq/QhRP4qnwkhUdbTf7A8SyN/E0DymQpQVtw+Yh2ZYeibk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2535 X-Proofpoint-GUID: dxjzftjnu8SMm-SyTQ-FxL95J168Ys5G X-Proofpoint-ORIG-GUID: dxjzftjnu8SMm-SyTQ-FxL95J168Ys5G X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-13_02,2022-02-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=742 mlxscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202130052 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The privileged instruction exception seems to have been introduced in microblaze v7.00 along with MMU support, so having it wrapped in MICROBLAZE_v5 ifdefs seems incorrect. Move it out of the ifdef, since all recent microblaze versions support it. Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index e9476abedb..f60f1fc693 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -37,10 +37,10 @@ void _hw_exception_handler (void) case 0x5: puts("Divide by zero exception\n"); break; -#ifdef MICROBLAZE_V5 case 0x7: puts("Priviledged or stack protection violation exception\n"); break; +#ifdef MICROBLAZE_V5 case 0x1000: puts("Exception in delay slot\n"); break; From patchwork Sun Feb 13 08:09:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1592083 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=Jc887j7q; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JxKmv03QLz9sFh for ; Sun, 13 Feb 2022 19:11:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0372183A2B; Sun, 13 Feb 2022 09:10:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="Jc887j7q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2C8C68389A; Sun, 13 Feb 2022 09:10:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1607B837EF for ; Sun, 13 Feb 2022 09:09:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=90432c20ec=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21D851OP027847; Sun, 13 Feb 2022 00:09:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=uE3lGHiYmVGHx9VwdiwZy53aoqAINIevAsRTzsU0hh8=; b=Jc887j7qKNMoIN5nG0VF+QqCEg0s5UHQeYUYBVOuNTugvnfWPYas8NifTSSzyIRajTan RAS6Se0V1yVlWK0asut6wBN/p3TAAV2Yc5xWzh66ttHeuZaH/JdepLcTDc0yptBmUluz rpvQ7xdEz4Rma0oUelA3wQuyj9BB1vPZrMLHTWD3vswrhIa4mN6XW9WBvBAEWR8/QNJ0 Rps+73csW+ZatcGBRtE0FE+IF0+Fr+n+ywZRx4WE/wwp/gTHlfC1326qwiVVS5/57qiO i7r5DTBqe7eMsj9zA4qJOfxRibr69gwtNmecC3GaFgvwMJZpKH7w1ShZk9nakd0quCHQ Nw== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3e69248jju-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 00:09:52 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XLeHEK+UKK2l92hwNCHimFB+bbR86ywKL9ouMeqpvzBjj7jF6xMBWAZoFhMJFfSZ7yeRcpjYu+EKy9/8oHAr/VjZDZdhwRLXtgFR7JifQKtmVdDKdsXfEDEhBuW91X2MgqQK1caUK8NKmp6aUmOMDlETGGJ3att6o6IC4FCdAHbIZdizk9V46yAK+sYPdgR8h7UFOLMbpGFOGu80+c/f8ctmzSZf7yHA+JdALJNg7U3zODutq+nfKR69e9TUqWvitc/cQuni9jUavWoTtjniHjc3NkGmKsm8EAHN7j/cgcL2KP/YE8Ejz5HU81xhf9VVQotPX8zvwl2XQDu8X7MLWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uE3lGHiYmVGHx9VwdiwZy53aoqAINIevAsRTzsU0hh8=; b=QOn/OCGU2tiUJjg5MGbTdspW10siHYbQMVp0Z5gfg8kHdB3TZyM2beJuJiUSJsdlBN4W15oUDmEksen+Qqc4p2xvj9PCe2GgaMG/LRDghKuKlskCHkO2Okt83HCBPrU5Sdw7BCeHlbdvH2U4JDWrZUmpAiD+fOfPkD9IbaOuKxhr0qrwQGMDGycH1BaD4qjJWPvvFO5mx+QiVjnMUmf0VKka8WCtkdWlDTh7JiwOrPn8x+m6+l3Qtf6182+9AmhEFrgddHXGVtU8XIsgcL1ce1weIr0gC/MSis9qWnKHZCIoSPegPThI+63tHWjvpXetQ6SFpcEDXO0ZaFtzcpJOvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by BYAPR11MB2535.namprd11.prod.outlook.com (2603:10b6:a02:be::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sun, 13 Feb 2022 08:09:49 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e%4]) with mapi id 15.20.4975.015; Sun, 13 Feb 2022 08:09:49 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Michal Simek Subject: [PATCH 2/7] microblaze: exception: migrate MICROBLAZE_V5 to Kconfig Date: Sun, 13 Feb 2022 10:09:20 +0200 Message-Id: <20220213080925.1548411-2-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220213080925.1548411-1-ovidiu.panait@windriver.com> References: <20220213080925.1548411-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:802:2::31) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f2a9671-30b9-43b0-187d-08d9eec83467 X-MS-TrafficTypeDiagnostic: BYAPR11MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P3TxFccpcd2j6I8Ink1+2uDKocpiPqR/fsGS95OTYt/WEnLADTyL3ddUXcI6s6vPR4MLQKwKHAhtpV3kx6JKZlKERtUdvXX/vY4LGKBZ6OheZOx3m8mByfCLiObVt4hYGul6+0cn3SKgzcRAOhR3v/glDgWz+CxHfaIqZOHRIyuOqK+cXyeX6ZCPEQy9ddAAjzTklinX/wr4wPwE65YQkxXJU4NJer0G2oMrxYfNvgpWKUzHzJSe3DTEZlv/hcHHVz7uS07yGEkczy6igP2sitiz51WiThwfN+0rBbGDogV/rC8WpLbMBauyPU4a8flcgzFjGBS546PzZO8lBvlk3cmv7XjIBenFlZ+VBdGcLWQIaHthj7adjCcNOeIySsFZW8FcZbVMwb1bY188wbFQP+T0CPT4W/Cdi0ftWBgbkeGIWyV8+LGReInvikL00C60cJcJxHWoElJOe1mac+5Xlt8LsDzyrBHZGhicZyq8baoR2StnQQ4vOayh66DImK7E7whm9M/wOndRhEQ5HY0OP9dfCPBMc44EaHtUvEBgYSNdT8poqPnzzl8RuByiT2vhY+U2jW2UDUfdOtL2LO4PI9LIXRG/zNWm6i6C8AZpv/FL6ZtaB320GHhpqrFhIthoiD1D49oc7/aU9e8/UEatGjyk7FgrHHW9RlhAikbkr0fophBgwe5URXEGnDI+1xpTqoRpNjDl04K67LIYo8Avtg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6512007)(6486002)(66476007)(6506007)(83380400001)(52116002)(6666004)(508600001)(6916009)(66946007)(2616005)(38350700002)(4326008)(186003)(44832011)(1076003)(38100700002)(66556008)(5660300002)(26005)(36756003)(8936002)(8676002)(316002)(2906002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lh1E54YpQ+PE/bva8XA3gtETWSJYmTX+PrqPsM0ha4bStrxSNyquQtYnfX7+ovYTVJv3zpxMchzVp2yF4L73J+JS4RkbS+9T90DMzX6gSg7LakdpkvaSCbBTXhRSOJh54yOXhV/Pb53gtgdAgRRpF+oivDH7brewQ2KtfNTYM+QBRNT1XFfz9yQ9i1scIKgHM1+VDNZAWdXv0f0FNvqALRaLE9zZzIJUxTPlud/OWtB60zrY8RnllCrw8kDq0KAEgUBtuLZv/DJCVp8C7IKTs1/qJl8E301J0A0WzY6pHrSfAersZTH6niNDvYtQP0ngSf2IXsbR/g4Jl8a8jIjgni8DTT6Bt9a1XNHOQ+FXtxDeTpt6x/1vK0YXGVdO3sUgglmHpZz483XSuJvqdvosJTWlXl/ocRiT3nTm2iLInjSQKdz64/1mV5qfrKxTkm/njCQFoiJ8HnHlH4gRRmUZZ40JvL+0jCb9bIBKghGN0WxvE+2/Hx2TDr050ihuELZPtzX4OzbZvwStiQUuyBIVHD62fro0fVsDtFy7tlJZNPCR2jw9NTdMdcRoMa7/+nA+UVlx+g7G40LQZO3m1JfYV4GNYVzbXoUyR713Wfop2hmVJ9aqgSfNCXFIqoVTqt8QQfosIFwaK9mr8uJ/WOw0kXOuVhMQnzT6wmFGNE2WP/bhu7NbUg06zFRpp007n9Q1owfU/GjZAjfGGT1fgxb0lz2bFJDBBK0/QBeujaspocBAR2MZF047ARC41crPaKdftd0pNm8KL4aQ0bbj9gkSI6suUcLi05YxL62F3hdTX/+hKVS31cQ4xMcUk2nsAMu//5wBqInHWTLvgp7ktyMJE6zIjc8kzBjvAr1jQB1wGEOb+b+X0BHJCc8Y8VeKk7vKUg+CYhBTV265ga+Q/aLR2Tc8jFXtVePBz0RgtOTYqyBrbxAN27AinOVh3CTvzix6sf5MZAIqN7e4MEqlffkgpJeJmmn1RZVu+iAt1d4F6OTlSP5NJ3LU610+lfGyg1y8ynieR1yK0GYVuikG5T6DG1yjvXuSMB6oa8g0eAzmos67v3/ondly9zWt0Fr6toi5sXHcNM9h4T4kU43f9RUoKE2VcvS79S/fEq0vmP13C9NbWTizEfyRwYWLw2oARKuJYEsHrtc47jgNZeHvOslvujCp+/azIZZ0D2n6tHdGCdGC8TgSnzpHETZzSRCJ9t2Z9lXOgj8fXu39zz9kxeSuqRxg7FBmYf5WObDLSSTNUz5vyguaxNYBpjhjbfW3jdqOWT9v3GIZM8nCILOLBLw+uEf0Wu8gJveJT+PAeyvYKsFge8Sz82V/QsbmsR1u7CFL1cnHAUDXvwQ02U1ojNTdBrUgZKQHRrFOFlgDOYlAMq9EVmYzs2aYcZxrN18tpGNcukIzHXxznwNyEInmvi/xtFYM5MYgsB9YCXMevhY+rbr0iksy2a4wWTYrkJhx/cBZuFAT/d1B73yaUa9pD4i8HEGasD/El3kmiZGZnIDnVXNahjmXSsIKQD52bKRjkX9VZ8bjlZpD8sM9MYXs0mG4fgQh6GckAMcf6CzLzl2OLNPsd+vPfWV/o4t8LHg0atwOyNkzNg4L0ogP/hBc3R/Vld7qc+07ejWUsidupKAyMRfBK//Cl6cIWCMhSVn4tbVIoCQk0qqk07cHb31SFKb5Pg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f2a9671-30b9-43b0-187d-08d9eec83467 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 08:09:49.1552 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Pf/SviBG05U4kUjbdSVaEWzDZoSard1IwZvH+MsrreI7tUXxF9fspH4QpWMQcOrmzgUEetfdZqrhLgU865KXX9AgsVcuaaRBm62BtVId5QA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2535 X-Proofpoint-GUID: OBstIHgdI2lTOoyShhEMavy3DGrAS40C X-Proofpoint-ORIG-GUID: OBstIHgdI2lTOoyShhEMavy3DGrAS40C X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-13_02,2022-02-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=421 mlxscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 clxscore=1011 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202130052 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Also, rename it to XILINX_MICROBLAZE0_DELAY_SLOT_EXCEP, since it only covers delay slot exception support. Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/exception.c | 2 +- board/xilinx/microblaze-generic/Kconfig | 9 +++++++++ include/configs/microblaze-generic.h | 3 --- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index f60f1fc693..5601dde5b4 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -40,7 +40,7 @@ void _hw_exception_handler (void) case 0x7: puts("Priviledged or stack protection violation exception\n"); break; -#ifdef MICROBLAZE_V5 +#if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_DELAY_SLOT_EXCEP) case 0x1000: puts("Exception in delay slot\n"); break; diff --git a/board/xilinx/microblaze-generic/Kconfig b/board/xilinx/microblaze-generic/Kconfig index e31257d335..117b476f3f 100644 --- a/board/xilinx/microblaze-generic/Kconfig +++ b/board/xilinx/microblaze-generic/Kconfig @@ -47,6 +47,15 @@ config XILINX_MICROBLAZE0_USR_EXCEP the exception vector table. The user exception vector is located at C_BASE_VECTORS + 0x8 address. +config XILINX_MICROBLAZE0_DELAY_SLOT_EXCEP + bool "MicroBlaze delay slot exception support" + default y + help + Enable this option if the MicroBlaze processor supports exceptions + caused by delay slot instructions (processor version >= v5.00). When + enabled, the hw exception handler will print a message indicating + whether the exception was triggered by a delay slot instruction. + config XILINX_MICROBLAZE0_VECTOR_BASE_ADDR hex "Location of MicroBlaze vectors" default 0x0 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index ca749ed18a..fd5a9cf8b8 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -11,9 +11,6 @@ /* Microblaze is microblaze_0 */ #define XILINX_FSL_NUMBER 3 -/* MicroBlaze CPU */ -#define MICROBLAZE_V5 1 - #define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) /* uart */ From patchwork Sun Feb 13 08:09:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1592080 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=Ha3tD72c; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JxKmJ246Zz9sFh for ; Sun, 13 Feb 2022 19:10:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AFCD5838A4; Sun, 13 Feb 2022 09:10:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="Ha3tD72c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9E4F483886; Sun, 13 Feb 2022 09:10:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1107D83381 for ; Sun, 13 Feb 2022 09:09:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=90432c20ec=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21D851OR027847; Sun, 13 Feb 2022 00:09:53 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=5Ya7M4/LcRiGjZEhei8tw7+Re++K20JJ8eN4mbI2oj0=; b=Ha3tD72c5A7Nm9AJSEnm1FMqFDDpFGSSX4HW8mn2DDdn+ChJTb7Q+UOBF/FSILsv2xZ2 jPF3hnLBcqZFy+CwoyDc4QoGP0NKp8HxoiA19AEdEIX9VA0Rcv95gZrAv/99JhlU4hha +IGReOJcwM8Xzps6S0ZiTxmBdU4kbM66B1hMqrUYZ8cXowqYCjJaC7uzKrGbAKO8NgUY 5k4pGf1dulvrngVzK97Fo3h5r4mKoPW/oAwEgJXe5NQKHPwvNcXcGEkypRNUNNBgxKOE olgiJO55wNlxxj8yOTV9B2U4gZGQzfsbPEFNKm/zpGzQG3Ybh3gsFOkiTZhS1yuU272p Tg== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3e69248jju-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 00:09:53 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kyJQfSBoT3ceycVWugtK9FFa4rFjoAyrt66kHLKcUjbR4wx4/olryYwNyahLOdFWwBQ1RRFsdZcyjZ2TJMaBa3mwOdvzlrywuBoMRgKsrDTI5OjYf85tw7zm7D8UmzF/6fE6a4wX2VeLdSO16xnWqzuI7LCXNnoFEpNtQsSq2CcWVhd0m71N0wXhvCP6Q2OIr2upwdkrtTFzlzI/zrDOw3o2DsYKDF2ivmnvpANCvNWvIgKDjJ7uHLjV5d38jHomldVUWAtg5vpPc7QPDMr4Px3emFHtTBH++w9KxfakdZixwz09TfsJr1NN5GgIww1hjYXgA4ek/v8w5+kB9xEv8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5Ya7M4/LcRiGjZEhei8tw7+Re++K20JJ8eN4mbI2oj0=; b=eAQDqMte5GuFw2/1PhZBAeIwA4kVL6T03YKuR1DJ+hTEtei5lmHbimGrNl5tZHtvkuZiRSSG8rw3jIxDZx1R/1Px2G12hxCl7coxj2PM2iVKy52VRhSAJcBrjTM0fhsIt+Z86QN2/ESZ1tpO+9yqDrEfsxLDM55piMq3nqHPisFqiU47q6QRdWyBYnerkT5NwnVTbzilFH4gzK8VxFLFNo6M0JvrtYaZuf/OjaYdsJdubNAPBC7ZqWfdSZt6KNMFKfM/EOg14GRs8xOYGzSS1BeSTek9U7zH4S4TNcBvymrGeMoWZF0qc9vmvqyEQ4YBXG4As5SRPD4XS+Gyo7hMlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by BYAPR11MB2535.namprd11.prod.outlook.com (2603:10b6:a02:be::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sun, 13 Feb 2022 08:09:50 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e%4]) with mapi id 15.20.4975.015; Sun, 13 Feb 2022 08:09:50 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Michal Simek Subject: [PATCH 3/7] microblaze: exception: fix delay slot exception handling Date: Sun, 13 Feb 2022 10:09:21 +0200 Message-Id: <20220213080925.1548411-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220213080925.1548411-1-ovidiu.panait@windriver.com> References: <20220213080925.1548411-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:802:2::31) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ac70aa4-04ba-4af9-8e37-08d9eec83549 X-MS-TrafficTypeDiagnostic: BYAPR11MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kmNgBmEX92I978NQONPPOaFGqm3lhydnKHcn6lC7jwn8XT0e+bWAy2PH2KD5XWgvL5PiDlYHbTJuCVbycs3dPB6EKUZD5DZOiHudPnoYxysO/6JN/OnZRQmlf7iYy9YBeEBzWdNy1hBWCJ7Ivt3fWWZcyfqViZOXpI2xwsMyphhs1cikPiWxx4V+C0x2w1hfXOkgUgxBfK01N8z2Dd/IkfZEVltjaIWI+onEdhESmAPD8OlS0mhw1335r693eRi+AGgzYsZdM5+9X1xgzT9XncS/MvIs6onJ5ri4npgFYHmvLpA8AhzOA+3P2V3b8l0sYfR1gtXIt9oTsC9KUJhz+n0yP+WyaiLUsQZrCufqkqHpGnLKse1nIp+VX266pB+7+XxppfWJR0PrJuRG5Y+W792ovgMTDldgcytbQpYbFaWcrBL0hFhn/FUEowSwFjNLekgAWW65wRwr5HGwHSqxP+hdJQcPqQE8fkgNVXd2CEdcNemxzz4aUsUpJKm2fyeJqqubgV/POqEcF8VTz/pYXkPnrMjzNMJtW1hd9Huod8gcKxzfgeVrjcOHLWD+fdJicy29c5DhwRA28QeGmVTOV6RIIJ33wDmKbcPfKVAmcRkKrcCjWAnPr0dXpi0wE7BupRJAwX51g2EW8lSHyxm8hQ3ks0qEyGD0XuwDmkMlZkcVki9ElNcI8IF0py2wZE46hfCzotbbp1Z9PJfYGSB3Fw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6512007)(6486002)(66476007)(6506007)(83380400001)(52116002)(6666004)(508600001)(6916009)(66946007)(2616005)(38350700002)(4326008)(186003)(44832011)(1076003)(38100700002)(66556008)(5660300002)(26005)(36756003)(8936002)(8676002)(316002)(2906002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1nY6huJ6oKz8QtmESTQOsXvDh08TKGaekMuxAYJgWys/+DkASfPJpos1nOgPS5oQsA65p7lE7rHoyZI1kzrZ8dubEUbhbULgmMYwVRIo79Nuz8Uk8vHWSVNzTcTmb9jqEdIiUaZTfei5pBPwTkMec9tt2Bmlue2DaKhZrCJV2OPbLtGpaPX+xYmvrYNTGyCU7INNawmFLNnqTbyTCf94tvxL1FvQqBOKrDp2s9iSTiE/Ao+WG+lJJcijTiNhXLr0ecI3ZKfbbaH2GzBxa68THbPK0qnrexgcXebfmWd24sskoNdbj3fugv8cR9sknd6kWZWh+zSlZX7011y9ierBOHadFrCQjRnxhffvphTrd8z5KtLDLQwJr8nyVkT75vae65Mupw/tzi8Z9pJYhZVDRnc0pvcTpGAhhBZo4LN5KyElbuWMI+EPpvtQ/lXNEO75oYxmDTLWc7BCJ45X45gDDXqsmx1IWjF3r3oLgLIB5gHaItkoPsidF/7vaXq2F7/smE3mkwKCQoddB8dn0CcnLsaowsmVCDFoeVWBRwwakU8UBhigIIlvHl23BshQ8MzKOH1MsfwxUDuaxp9mJOtzujOn+7Mcl10mqALUP0dJRPV+4sYN92SYNxoIckHBejF4KUmxEdwUtL3yf/V6MV/oFz6fPb13QrpVoFVMZHNgBbj9CXKyVqNfL2WOm0FwnEYDhGcl08ZXcklRRAs/9WkyUXf+w+l+BTv4YOhGHZvioEHfvrjRREPKXSBnL0WN8Zt+CxJeOOfajGL+8uP6Kh9cQe/wCTPQrpQjKUulKhchwqoHfSonvChfAL8jpymX9pcP8YLDMSFKMHHYAHUvNmfo1RpzY5EzQfRDl0zDQLv4sGCudfUXOIJK015KRWWpIm9ytFrqWQx6zaLu/flJZ3ejV7QVeQ5TCmIHxdfzgJBLqTQChuR13H+6nygqUBXD25HorhYpKqWLz70gDM5EC3t5y3r8Za3zW2864m4sqFG2U0+ympatP48NAa8VpJOtThJ7KsLBird5X8szKPHL/fSaib7zsWpaUpmEhPEu83B+6RRnwvz+xFdMAuzIPld+1xRLfUWGW1O0wqGcwkaG++bv6jg0SGDQfTK/xRWU2iCKPLcy7Me6sLsVH/+BfoEG5TEFurdeexkjhlQxaBvDJ0rjO116CMkvQlY5RdnQMNcN8AqPdM7o1An+ikQLR97gxHgF2+nRUcSXfJ84+3Przhvpb1n+6fSZRD49c0MUD4TCbWxySJf9oTs0kbvsn7IFN0KGJaA+eR6qB2e/G2K0HLWayYi2bXMNimuVOl5WvLli/Eg/p46QGFU+KrFFf+TZGwXUy9rQ7pN1Y0RpWyZDxtLVxhf2oiouIf5MJleaCuzb88trYrHhS8vIc92awk2aaQxMUMNQ4l/ZHwCAomnNUv0cC24++bhIm4GDhVn+aZQbxtsTHpliVIzTS6sh4T+G2hHTucg2Pzx5+uWwdg+o/azUYlMuE2CQLQxyQ/kU04mbtY6L99BQ4TJR49TQ5c8c+Y89WIWkGivuptKHkXQtJZlEWE/8NZ10fulOqgWIekZibbiKwnYMmt1cM2gViGAy4ng/q3C8Tggqi7wfwpyC/wj6oUWo3auQFXHGwosc8zrat1hWH44zKaLxfee2AoQDIMHAJPeYQDgCLzF79g2NKc1uMQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ac70aa4-04ba-4af9-8e37-08d9eec83549 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 08:09:50.6238 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: N91J61u6cqU/IpgJIUiqFllfzONHQHVSxHAfRz87bobFpQKnl4eHYS4W4Ch9TTF/HGHK60Zjk4WVmt28kg+6MB1O/ADylWELyQQUjytGca4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2535 X-Proofpoint-GUID: 3-bM4VrblOujC2INlIeA2Y8etSgeFifc X-Proofpoint-ORIG-GUID: 3-bM4VrblOujC2INlIeA2Y8etSgeFifc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-13_02,2022-02-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=497 mlxscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202130052 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The switch statement in _hw_exception_handler() only covers the rightmost 5 bits that encode the exception cause: switch (state & 0x1f) { ... } For this reason, the "0x1000" case will never be reached, because the 13th bit was zeroed out. To fix this, move delay slot exception handling before the switch statement (delay slot (DS) bit in Exception Status Register is independent of the exception cause (EC)). Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/exception.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index 5601dde5b4..64d5fe4a80 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -21,6 +21,11 @@ void _hw_exception_handler (void) printf("Hardware exception at 0x%x address\n", address); R17(address); printf("Return address from exception 0x%x\n", address); + + if (CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_DELAY_SLOT_EXCEP) && + (state & 0x1000)) + puts("Exception in delay slot\n"); + switch (state & 0x1f) { /* mask on exception cause */ case 0x1: puts("Unaligned data access exception\n"); @@ -40,11 +45,6 @@ void _hw_exception_handler (void) case 0x7: puts("Priviledged or stack protection violation exception\n"); break; -#if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_DELAY_SLOT_EXCEP) - case 0x1000: - puts("Exception in delay slot\n"); - break; -#endif default: puts("Undefined cause\n"); break; From patchwork Sun Feb 13 08:09:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1592084 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=gYKExEca; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JxKn54WK1z9sFh for ; Sun, 13 Feb 2022 19:11:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 99CB983A45; Sun, 13 Feb 2022 09:10:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="gYKExEca"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1221A838AE; Sun, 13 Feb 2022 09:10:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 245DB837F2 for ; Sun, 13 Feb 2022 09:09:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=90432c20ec=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21D851OS027847; Sun, 13 Feb 2022 00:09:54 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=CMqyX00At+XQr7orZlPy/uKENZtykIHRFQQW0UXyC60=; b=gYKExEcaaUA2BvR9lbLWz8a+lPO/FT+rZlYXWg3FMoMfMGpeaXzsynTucV32UFeHhlF6 3DVtGB+8g8ac7clzK9x+FFGiNuMgqZWUvg7zgm/E7aWMtMv5EEYoY06Odavvdc1pqDQW DC3mBaJ0EpHSIbzly3R00bH4K/yBmGMtVgdcUH+QPSvzjGVGz3BMnUe7Q/bAOiArMjsR lDfrJHgb86oRxERzmotMa7LHHkhypRUunTeMW6U5+knD6ztC8TmKxLGD3ewCXe7ORBT8 v+iwRlB6oIFUEI5+WryC5Bc01vc/led767G+r8zGIuu/w3EZyIqCdWEL/WhOXmv+i4IO FQ== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3e69248jju-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 00:09:54 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mTV3R8t5VJqnT/Gu5VIZ5X3W8i+WzGxDzQ2UgaZH4cfTncFpkrilKaid/IjwvWTrqTFoO4pZLOQSwFAyEcICKvtrt1YyYPxp97TMPfauduDk+f3TcXycP9X3MYnVaUvXkvmNex/eKQykRq2giL+08FCfmqbBOhWdGtOF7Hf+5EIDqc2g6rQBKMqII/LxiS2Neubb1ZcpYr2uN6jYEIbnT5o4+vOlCuBMF7oLE5062WQNQRfn9+B/Hws4k+GrMq+6PnfQgAPiCqDeKF9bSoOeDmrjG45nm5IHYCkc0D9Bn586zS1Rn/+eucPE1lgFdCEtGvHYMkEtdiLQFH4pPMvbog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CMqyX00At+XQr7orZlPy/uKENZtykIHRFQQW0UXyC60=; b=GFkWDJI0+fFKnFrJBSIjxCgyABIfQ512A1sw5BQnZXUbu+ei/au0DDbKvpR0i8OklTE6coTDhiAxsPR4QIDBnYkoozWq3nLTMjsrAAhA/pnB4BOvlKicOpNMzqmNirxyyNsUwn97u/E+Zc+joiuGbkMIy+TBnyvpXC5fSEO/+BzMHh0uc+iSJfF6wIoc3TdeQUpRB1UOXHeKd8wLAZCC7thPSGxqKCiQna9Lcg/WeS6caAqdp+oL3NVgxZk0WB8QS2reqsg0Zs9LqKJ9vZkkvdXWkRTRchED/vrGEwe53pkNmKNeRUeIKKbr33XXOL/Fz5OXtDQZjfl1j8POEpGjrg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by BYAPR11MB2535.namprd11.prod.outlook.com (2603:10b6:a02:be::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sun, 13 Feb 2022 08:09:52 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e%4]) with mapi id 15.20.4975.015; Sun, 13 Feb 2022 08:09:52 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Michal Simek Subject: [PATCH 4/7] microblaze: exception: fix return address for delay slot exceptions Date: Sun, 13 Feb 2022 10:09:22 +0200 Message-Id: <20220213080925.1548411-4-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220213080925.1548411-1-ovidiu.panait@windriver.com> References: <20220213080925.1548411-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:802:2::31) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c241a398-7dfe-4fba-0a57-08d9eec83625 X-MS-TrafficTypeDiagnostic: BYAPR11MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Vm3ptUcOsVeBtDk/ZpuLZjTDZObBSMolmSUvMc11VzCcx/0kHHLrLeR/q6f0MjY6sgyJ/pxksyu4gt9cZ598gnLJG+5GLzvfRGEAKvdhR5zesqGJv8Q2bct9CGluM3M5+P7AcWGpuQv4wNIteFxFfEAqJrddSH9/ZSfK1URYcAWC7Ow+VlG1oKxY6FT6j7NM0lA9D0Jmo+BmqF7nJxyIe1noEAuG0KTnkXTnz+/1kiSPQDt9EQms+XdRGLISXaM4Fi7z8Dm1SXTANycvkz4R0a9Rhyh9R6LsT5qp/dsxhrVtIibqdFSEfsdl4YCGw3bPK9sk/wASGi85/H8Z5wUlRf4U+mLlmXnOF5JhzqTu2kCQP6Oy63/o9hE7vUjZ7OVnjXg8ugB5Z75jdyx2lGYj9CHl1x44K2b2ekSL0ZybPRBubEV25CUeo0cPCk3kcitXnZQp4TGlFcglnieWL10DSqx6a/ylVg05t+etw/ul1dztsao+9pcNXdV1xKWMY/UflCsc3sQPpXH95wIZjhzzI0RD//Mq9qhthLm08gYzBP+LJx35schPHX4SBRljTUIO5qKsbeek3101NGM/Ei6P9mCQCLitjD7sTVEnYVbVUXcWdsaZBXriDixJ8SfjK+7rSWbTJcPuFuyF+TYByHjWBIecmfeBg51QfUhNIUbYVjaETFgOo5kBlvPLTJAZLB3685IuFuJIu36ZmCqXrRtdjw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6512007)(6486002)(66476007)(6506007)(83380400001)(52116002)(6666004)(508600001)(6916009)(66946007)(2616005)(38350700002)(4326008)(186003)(44832011)(1076003)(38100700002)(66556008)(5660300002)(26005)(36756003)(8936002)(8676002)(316002)(2906002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5vWJN+G+ATK1Rd6//x36Bzmtc7z1yUROPBMQBHcnt9ETb2/FKCIGqodg2IPSA4W4Ou9vwC6f/Xlly5xisov5mtok0bY5nhB5gkaDgC71Ixk/6W+uw70QSnf2bq/ZDCTtad6IH/MFqccGFCWbz+h/z1Jzb21Ar2duiwPDQpqLx8aYMrJXjlAgANgwBZEA5k37GoubcrtcZ8J9b9xPF4RSa/mGicm4tVshAgkVnLwDWqdxHzcw+IJF3KsnZcBbQk3xZCm8a/le3P3lVDesVrGRJmwKwragg+S3JsD3Kw6mwu66Kb7MTSVS31jd5L2rKGccxYbgEyBSo5ITzWqkz7CLA4AflOF3zQhqKTtKUEgA/lSc0YTlLIYCs3XVOteBwhUSM6KNWtAmQknhbM5+Z5/1pKeQTvWDCHaJXBfaw+aEIwABnZIoG8ly2OvzxRFGbsE+lXQ6MrCSKzgHvWPVWEfxP2Z+/Jsz+4DrExhBf+70or6a89eYZktfAn3MYwOc0QJ2f0Jc7dcIuZinsP7+EAojT44ZAnP6VoRnrMMe+bnzfihy6OgK3nMULK7N6oA39lHbK8/8sD+ifPFiuSvyfVEwvOEGD+okRpN3FqfMwAycZuuGKCWlhfqCU0JvZALwu35+Wy7tivIjRglm0+/I9oW0WLTs3Pxl28ZerjTB36RqWe+NONGz0AjXhP27H9mQb8NFIIP2WKayE72fHjzefiV9hYR9idW51GuK6XaZc8OwJ+07UYdG++afNCBRw7JWHZNT1Mp0OykB5IbXimYNy2y1HI2/vT7Uxusxmd2XzZVGv/UexWXXlWSh1QOVH10spBbLyX2x59jQ5bjJedHCvw5tSP5D8buJ5YVES4WuekOji/0v0+ghh5oUTjhdKKAxTFdeFwbAkPlTXh3utTpe8rwGTg86ZZutQRgIKWkJXdW9M3MUHj/Ijw6pLx7UadD5dGQxhZNzNJdJg3/+UkHyRmsCC3m67THTjIPCKm58Q3oiBuHv2FEQ1DWP/jj8XlouPr3ZH2buxsGrCPYfVwny6IUQlENhUr1pGKm9DRzcl5SkWTWylbU3siqT0AE3NSiK30KT5hpvzvQpPd4+mwRI+qD5cyK4G5wubZCPz1DgIohTCzgJ1oGpCAM6ofILEp86FB/zxdq8cJ6ZS8eswfiSPxpZbngbaJLc2Gs3Eedif/l+5sn/tpa4f0fYvhpvtcpHUUFr84s/zRxAE4IhgPuNn6i9dxdODJQy1xgBWQG8E0CiZjmIfIrFww/eRL86/XPND6/1stRGZtNtwyl66J9t26P4Vo9FMi52z9OmtP/6AdUu0L7thAH2skMBS17VnwT2UVMN3AN9DreAdB94mbv7JNfK4MTAk/2ziz7Kn95IkPQKo8YDqtn0Xm7FEFnZWo06zkqq2pa1jxi8iK3ZwR5f9AkmZ2cPxZo+RFVmgZGgsAfAV19ToiMCQ86lRnTiqINIlXqGPbSCSfXv0mLXzn10s6XoH0NilXwsE8KXji/rhHuxThcAyjWI51AuMkVPxm86VhMccrM3DGqAnm3TLyt4M3MAAmcRCV3Y5jDRLv/7+UwkIymHDAFyYZURnObMheTdj4TFqibE9OBmiuIFbYsjxyKF0xHHGm6u8aXNpDVrFP2EcjKkNVpMwx5+vh7uot3G7OtEBxkzcmyt4Ae/sVhpwD12JA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c241a398-7dfe-4fba-0a57-08d9eec83625 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 08:09:52.0152 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SUBEJPsp3j3H3kD12aIVrQnTY9HUGYf+p/Dtkfz8cQelau1JfzQxDyoTDV5Yb3I/eKZ7eEjciq254/o+o2ZsAny/gDXA2XmXQl0YoxbebvY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2535 X-Proofpoint-GUID: hi7g_ODZ2qbEXqICL99Ol4R4_DHUr32z X-Proofpoint-ORIG-GUID: hi7g_ODZ2qbEXqICL99Ol4R4_DHUr32z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-13_02,2022-02-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=536 mlxscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202130052 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean According to the MicroBlaze reference manual (xilinx2021.2/ug984/page-37): """ If an exception is caused by an instruction in a delay slot (that is, ESR[DS]=1), the exception handler should return execution to the address stored in BTR instead of the normal exception return address stored in R17. """ Adjust the code to print the proper return address for delay slot exceptions. Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/exception.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index 64d5fe4a80..f79e465e1f 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -20,11 +20,17 @@ void _hw_exception_handler (void) MFS(state, resr); printf("Hardware exception at 0x%x address\n", address); R17(address); - printf("Return address from exception 0x%x\n", address); if (CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_DELAY_SLOT_EXCEP) && - (state & 0x1000)) + (state & 0x1000)) { + /* + * For exceptions in delay slots, the return address is stored + * in the Branch Target Register (BTR), rather than R17. + */ + MFS(address, rbtr); + puts("Exception in delay slot\n"); + } switch (state & 0x1f) { /* mask on exception cause */ case 0x1: @@ -49,6 +55,8 @@ void _hw_exception_handler (void) puts("Undefined cause\n"); break; } + + printf("Return address from exception 0x%x\n", address); printf("Unaligned %sword access\n", ((state & 0x800) ? "" : "half")); printf("Unaligned %s access\n", ((state & 0x400) ? "store" : "load")); printf("Register R%x\n", (state & 0x3E) >> 5); From patchwork Sun Feb 13 08:09:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1592079 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=hs6XWXQi; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JxKm80M67z9sFh for ; Sun, 13 Feb 2022 19:10:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B916A837EF; Sun, 13 Feb 2022 09:10:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="hs6XWXQi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6ACAF838AF; Sun, 13 Feb 2022 09:10:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D5F828384C for ; Sun, 13 Feb 2022 09:09:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=90432c20ec=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21D851OT027847; Sun, 13 Feb 2022 00:09:54 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=phzT+Dy3zYyj8uwAjxcCfDmGmYD7KsNAusqWIca0rwQ=; b=hs6XWXQi9vxnobf39G6Q4z1W3ayAsP3wU8QKC3ZYS5H8m893lvtchd7sb6xQIh2gI4Ie 4//u370iv8yDAyqNFGFa5UVu5//xzdhNVhBBHHsiydgL+poKyWmCwJLLq98xAArBS0WS sVcAD899EdjBdvrbgrx7jefaksQaPfAQkUMro+T84x5h1Pc7rqv5QZqAcgUzL5rVZ19g XzZbWRgZFxZIF2ktn3QqO0cPszWEzLkx0b/20bmDeru6qDPnWM7HTt3WDXib26dvQEr5 B2Fy08S82ia8d5v6KbmY8WERnhDKDDDIjcY31zI/0x0LhW3Aq4VqnEyOCGkq3EQjOIsB SQ== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2101.outbound.protection.outlook.com [104.47.70.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3e69248jju-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 00:09:54 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YfsP1rq4g45DQmoBMPK2S7zXidFhM7G216lDR5ppf4iII8Z+7s3RXzOzLw2tAdqYAlfN2/fjCiVIS3sc0kQ2bZcIExSNUL/LJp17yr2SX2OrOEjXm+N6gD5yoSkkZdlnmGJe7SMDKRxWxyoXjcKtrIDlEv2t56h4wz0dhP6Zn2Vy0KcroB+xrG4GOdVFDJJHzHTNonEvXu0STqga62uLDNMokwjc9GOWHz1k24No+xrS/stzm/1ZiUHho0cOB8w28NwkeTs4J482ixBly6vhOeQ6kej098OhnRCeHMCTicx8dckd4frWy3VEoWQ8e+mq65etpCAvMqUMJx67ji8hxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=phzT+Dy3zYyj8uwAjxcCfDmGmYD7KsNAusqWIca0rwQ=; b=DklFNxdePGoiPl8aRSqTbIiBlGe/phRZBxAHYLE4EncDesm6xXobnKOJeCuPPk/MmvL0r2tlJoA3XpRKLEsgSx3zKUNaEWWcxlvkBji/P0gW8YxioBtiHT23fmiGZGu74RLG4fUOtRxXrXHP/6vD7lynM27Lagz5OrWGHa0pkIvtPPvU2zEiI2FmGBvb/F7QXCrWJiGl4NK9EqwG/7WIrvE/h53X7UCgFHowjWLhdmrzhAHiWYJgZKJN9Vy5mq9bXH8OZ39mAGzKgahbwW9+d29fJFQCbdJDN/mqL8wO3r0HPHkinIFyn+m4J6rwX7Nk6l0FmbxkvuzUU0t6olOoAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by BYAPR11MB2535.namprd11.prod.outlook.com (2603:10b6:a02:be::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sun, 13 Feb 2022 08:09:53 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e%4]) with mapi id 15.20.4975.015; Sun, 13 Feb 2022 08:09:53 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Michal Simek Subject: [PATCH 5/7] microblaze: exception: move unaligned access printfs inside switch case Date: Sun, 13 Feb 2022 10:09:23 +0200 Message-Id: <20220213080925.1548411-5-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220213080925.1548411-1-ovidiu.panait@windriver.com> References: <20220213080925.1548411-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:802:2::31) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aac29d79-21d9-4831-c74c-08d9eec836fb X-MS-TrafficTypeDiagnostic: BYAPR11MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:378; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ah2M9lK7fa/g6zFX+1GNUCcjEbB9E9Oo4uGVChulcVqLmN+skuedOqbxeGFWmpjUpqq8A/gURFD/L4LJYZSi2q9A200c2SCPLX0Dyni0CTUShpXTYpMlQf45OaZleZ/bwhbGPFVzZIJMZmwXdviLLo//I1Wxxx2Zsyxcw1nn7fmXK0Omo2q0O4cinxOMyz4P8Udn49pTyMYHDNWriIMYZ6iTPj0IedyihqmT7k6eJ4iCCZoVjegLfkPtibRMA66r7nGmRCMYeu4CcXpx3LcPweVhhnfxjGdvj5HJw6dTKtzBSAs8X3/+FZ2yNhslMmZATnWrS1kbmfL1h/k/Y64Jq0z/CfGaG49oKvWg6TP1QVnw5pOgOgA7Eln5+BiEp4RgqQrPuKgqbjKeFzQ5mnhlW8HEktDouYPGXxWoo0ai2U/1GDN6Su4CzMm2K+3aIiEmIQhCM5EgOGaNRVY4ODSAEWCh5h+zOqt7Lyg4cYgom51lPFTBu9SsgCzbXCfyUUmUQwbGM8orLRmxiw6FSg6p42QNCMH/G1d7jCFi/sZvFSQnN2+BFIYaPud9OWGp65Pg1YvjU9hIu63agSzQq6Xhxagkb0lmPyKGyrwJz45P6pxEyRCxrKomg4RA+W47fztEEWtJPgN3CZ2d3RxE1+ZC314SzHoV9xow+O77237QVV6DJAKa5ZNjZYjsKRBmqdeDQ6pZb+ideUV9GT/kmB1QcQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6512007)(6486002)(66476007)(6506007)(83380400001)(52116002)(6666004)(508600001)(6916009)(66946007)(2616005)(38350700002)(4326008)(186003)(44832011)(1076003)(38100700002)(66556008)(5660300002)(26005)(36756003)(8936002)(8676002)(316002)(2906002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: asLS3uUdmyupFE7X7X3yBZpdG9AhZLlspvaPDyjMKZbvSz2jWrh0OsbH8eRuFjWn0gYS841/I/EF1XxTqtaomrYVolptyP3OTUFUCoJawXYdxVklzIjHQPhbJfb2E4CeRUBfKcHwmtP7x7pwp+9Cm13PjGlVJhtprL93lVoSkApe3XvgVYSSZxlF9ep0J9elVP5uFCB2RH7Bs1AKtS2MlqUQin3iEmtHEpO/PzeFDVLlM2zlF3H8AUnHSbozY2RQsuGb6zrexuZAjb1IOb/t9jUzshePd6hbNxAAMgFlGPDkVrQ6La4TKTSXjOr3ENAuNtdpvql0E+cHZ2EVHuEwNhGmR3RGoWyYhHvFvmfSdwtFIqaiyBPLTYZRCHngMojmfqwWXRPwxtQosgxQoCHsRkU/7A4mpPE7mZRk/itxZVV8/eOKaDEzZcS0ePJM3jEa1tV/pmc0f+xWDtEgmgF1xmbwGeeflhcWyeW41mElu4lnSFAOH/7oAtCPAzddbNsiFsOV11KBZ5sCYLWXVXS2GlqrdMrbCyDJUkFAHt+IlUtk+oXrJ8IPHYKiCbHFpTZzckIc7aC2NpUBZ8ssAED8CfaciUdoGdgMHDQyp9EnD5A7bDO9Zip8m4bcyRlDUxLukfKunUPxja4jJ66VTXeJjRjAHlbaBvL97gdIeK6b/Cge41AIHAz3Kvb4gbtI4mdkDWvg34CM66ZUdVZsbgaix5XhwAukrhgUx5iWcTAXx9brW/6BFPxT2zstuOdzPoEA/6t5VjS195vQd+ipfuJb5mbbV6MdB5kfR7evuYdzRQvHOVHDBzVkOuY+dNpg20FquSfxG0IbEzBvqiNHAoicSOUhfZ+eW5wf/xTcyBqQDtEwFp6QlKVNIFnY0VonCcWyMSfhfiTyiu2d/DXufFAmsWBb4Tp0EYmaupg1GpN7m5LJJpRhO1uHlnrxlrIZnpW6kqkOXp3h32DFyt2O/fJkTyVig4rHmlXsO9JPlRUpcwHI66nAonWWHGufFB7rXRJNi5zO87oMNeiLz9NCOyjOBrrFxsvDsZX8y6amtZQD0K1bNq3nBdq0t8oKZ+HSg9sZJBry1bQnnk0aSTNTA29T4M1L8WT2/A3HoFitO349wsLpAm96d7T0Ob4NaSvKCxsW7V+QGrYZ5XbTw4+42hRKxkb3aC75GWvxgV+FBApSjPlP0IkX3zWRCupv44PF3eYcMmqZEnvoLCoVYzllUDKDnqDhctReF+QpY3cTLHE9l2kwFvIGqlVShe1wYvVQvz5Y+t1bVLBNNGNAJ3QbPwktlUgKGUh4FSZ3CRFOo7ysdWK5xa0A32q6pRKnBp8yFbi7NNiGzNRhQASTpfSXwvkG+GaxJm1uKZFaWTc7OBV0GOjvmACU/DVMB8uXZmwo9SQkWBtZ6uQq2u6twAmiEK6tnUUp3avDaFOPaS4aqrv7+957Hp1u3Rswjytsz0TAXe2pihUa8ihXR0+wzqx5CO0jQz+fjF1ScwOvqEqQsNOlu4V3XpVsIbX5gVa6Jm4BF7v41yKmOIqalDjWa+gZHKquAT1VXLxoWKX09+C++EoIJs/zcFnVDRVx6wMzgruEn2DJtKYWgYHsTIG+8sjaJihBY4iCH+7Di2FVSP9fCYFo4Y1bLNTwmnwyWj5h8yuIeXRFDfbKoZiyV69xS16olEBd2g== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: aac29d79-21d9-4831-c74c-08d9eec836fb X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 08:09:53.5631 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bLXrZUN5l1xRuoO6GuOo9zOPKWuvaP8/ou4ro0dY2RVk15psdjqaF7yYuUQl0PbdFoKUCHp/OEzuVzkY59FGFuUnNIeP8H5zLI76b/gAO1Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2535 X-Proofpoint-GUID: ZR_SP8Vcm1iVm4QeEALjsd6MXYxVSgBK X-Proofpoint-ORIG-GUID: ZR_SP8Vcm1iVm4QeEALjsd6MXYxVSgBK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-13_02,2022-02-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxlogscore=618 mlxscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202130052 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The unaligned access messages are only valid in the case of an unaligned data access exception. Do not print them for other types of hw exceptions. Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/exception.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index f79e465e1f..d37f04364a 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -35,6 +35,10 @@ void _hw_exception_handler (void) switch (state & 0x1f) { /* mask on exception cause */ case 0x1: puts("Unaligned data access exception\n"); + + printf("Unaligned %sword access\n", ((state & 0x800) ? "" : "half")); + printf("Unaligned %s access\n", ((state & 0x400) ? "store" : "load")); + printf("Register R%x\n", (state & 0x3E) >> 5); break; case 0x2: puts("Illegal op-code exception\n"); @@ -57,9 +61,6 @@ void _hw_exception_handler (void) } printf("Return address from exception 0x%x\n", address); - printf("Unaligned %sword access\n", ((state & 0x800) ? "" : "half")); - printf("Unaligned %s access\n", ((state & 0x400) ? "store" : "load")); - printf("Register R%x\n", (state & 0x3E) >> 5); hang(); } From patchwork Sun Feb 13 08:09:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1592082 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=dvswz33b; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JxKmh5Mzjz9sFh for ; Sun, 13 Feb 2022 19:11:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 010ED838F5; Sun, 13 Feb 2022 09:10:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="dvswz33b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36C6F8384C; Sun, 13 Feb 2022 09:10:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 72ADD8389A for ; Sun, 13 Feb 2022 09:09:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=90432c20ec=ovidiu.panait@windriver.com Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21D867Dq030673; Sun, 13 Feb 2022 08:09:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=DrItnQ07bXvNMAZP/Cd6JPd2i+YO/TmASPJl29kN4K0=; b=dvswz33bB5Jphmuyzt/OQsfE413Oq6q94+nm/5H80OS6ryFFzSM8cGI/ZuU3NIABx5nr auSWAiW+70YVvdFlQkoY0DgkpQSXoBnD6dzEJK8DkgskoF1FXDmgLPP1NIkEkEjGMeVA 0L8j2+WUbnAqo7Nja/Nz2HGalnMzDTm2iQA92i3ZM3cyz6JQV5QjjSU5kFlg2eCNbOpn 1AaDsqdnhMxPI03wOTHTBKvk/dVcaKKA90Dicm3S9Vwc1RNAWQf4YJMAH/7YO9ZRnT17 f+TIJ7/mtczoxNq5pwL58v5IYxRKuT7PY2e9/bgVUZk422JOYgIs6WSrnc1ZJIXcKESx EQ== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3e6240gshh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 08:09:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lHiaXjqo7+AYgmhubbSCt9EStfaxAkqYnuAjU4k5N9WkzzNC7rbuxruHTISE82qijig8o9EnDfk3Z9MOvE2mL51TQTYbXx4p1Kv5iafPZ8ed9QIRMcvs2Oiakfo0m2xesDQE9zo7tkHhewUMzpWmxkwDxOmKZ5xYjL88rVLM7rdW8xHPEA91jLeb1qbciAMwojO/g6fXI3QFVPCqJxrch1+ZIfiSJKMlwFMMoJNHN76QrSTCxxwTVmHI86VMTpFXWSIP1LeFEYM28f6gXNfUESTPSAL/wVrYn2yYJ0LcNsznku4qRUnm3YPqtxOImge6C5l0QUFsd56a0dbhl6KZig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DrItnQ07bXvNMAZP/Cd6JPd2i+YO/TmASPJl29kN4K0=; b=CYQhNcsKINWd3ltCsJTgvnL5o7g6b6xYnGqO/mlEQo5btz3/ZAC514w/odZqnfiQ69E3KQCuYuYbEkDTebyBq03GtCq0bDTgTZDkdDW+YfpqKSa+qujtbNuPioCehwz9J5K6cottruJ5XhI9Ac97LX99tuMQ1eWZd3GDwdtWOqCu0XjzFFNY+jFXjagZxsvankYd3SpI1n52T1edrHPWJJcEHQfrdAIw5KQ75YyMUjR5Bx7Z2LGk/t7IiIlab/3wcKR//fBD3D9lKPila4Bqqz19YhNWFM4QlMqRKKeSPNKFuuqU2LxR4Shu+HD14EE2mi+QtUf0K1wynCmznJCvWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by BYAPR11MB2535.namprd11.prod.outlook.com (2603:10b6:a02:be::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sun, 13 Feb 2022 08:09:55 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e%4]) with mapi id 15.20.4975.015; Sun, 13 Feb 2022 08:09:55 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Michal Simek Subject: [PATCH 6/7] microblaze: exception: fix unaligned data access register mask Date: Sun, 13 Feb 2022 10:09:24 +0200 Message-Id: <20220213080925.1548411-6-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220213080925.1548411-1-ovidiu.panait@windriver.com> References: <20220213080925.1548411-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:802:2::31) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e196911-7c59-4e35-eb7b-08d9eec837ee X-MS-TrafficTypeDiagnostic: BYAPR11MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GG5iBI7p4q62HFQ5PjE6SNYLcwjoxtX9oo8Dmhx2uMiNZzKLZu20IO6gvNfs9pvXn9LcgwZvddQ4dPtvbyxlQomh74zjYVRW496SyVQXYWFLuTwnhvwWX1rDFUhn+CQ+DXcN1IrzpXks80nuZD5RF9YJMwUgQ+juLZisbaeGmfSJs1NQdDRrWUOdt9he+ZQTe+IHKJauIzXJNUmQNHS+oVXKHw7+fjX7NeHVu3CfJnZ6PpyY3ystbXkn0O3Hvm12iR0KBJcb73WlW/D9r6Z2VcQ1qlzGK5JAA2uIzI4gch9WOFG5MeTeohHzWHN+U76Lsjsx0HydwntZ0GIRoDXeHPbmxenBU3t2Tky3poLayQaSpFjadxYR+j36OTFrwUtKUuDSDAptk1YGb28pXo0FlnvFL7I3k6QTslWX4bp+/I0km9wNI+LjV0SKrWIhmifrREGClBfcbt25XtSq38HP628tNrN3wk+calPjjySVKoL5lxu5LPTnJnVv4ONizbHyu0jyAW+S+Nhlnqrppuujxm3p6nrjfAfZhKMxOrNM4B02N5060+X98Vbz6tKyWW42FJv1UP7waRlWKYRG+3kVDn4aDIjWN3HJQkyssRBFW7e0tMEw7qDo5dyrCvCBa0G8o2OMlVK4jB1uNAiWjlpFFfx1BqpcnQpcoHGQmp09fQ8GPBt3x0g+538x0cQD+WoQVIpZEcxqCinvEzKqXQQgCg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6512007)(6486002)(66476007)(6506007)(83380400001)(52116002)(6666004)(508600001)(6916009)(66946007)(2616005)(38350700002)(4326008)(186003)(44832011)(1076003)(38100700002)(66556008)(5660300002)(26005)(36756003)(8936002)(8676002)(316002)(2906002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7dQVTWNTpAp/8ZE5veJG/oo8yWUY1H97LwvZo0Hmj36xaaOo8ckbC419t6yw9SCPWixS7WqoN/nkqYLLKrQMNRVoH6Eq2eco6UeAcGjiLOP0DmE5V3hVheykBhnaH03Gg4A/GRYymQcpBOoYrSzCJMz9vIDgtXmtpr//+OZNC2LwwGyElGhVvhaq1+MQ9kLMfLlTFhibR0rKF0T1w++esknWnEfChIQyA2Z0+JIbSlRvfYW2Da4/ukCCHDfKHa1dKofF5rfEUnqEomg7mWHIG93zMIGOH+ttkfwrAL34xkNQUBdBLMSpJrb7ZgBEWtWU80X8ZCxM0br43rZ6Y+LK23soLmoTdY08s/JC1JNMRVnEIF0+Z4OTTSMHQY8kdA/3agcwMWTKV9aCXYpJsOEnsupSJRXSB37LALJ1+BityJW4qiSFf4lsmJDmU3HJN4RCe2TDnUCSzD/01iVj1udR/XyxiUDmZbDt1n3xxNqXWgRyDtekzmBoX1ZxscgWf9/BZWFcLIaTFT6Kx3JZ8E1d3o9O2E2k2MnNNMOEUJdP8UxCvFgb4/F1vuYeIXfNmlFXNG3/GCfVaFj4wWJ2egvqCNBqlOVwJRePkfGXPuEB7DDEnkSSCvHfpwnYnOftGwBz/YQMMSb6+uS9p46kE6xkGbfvjkh6UT4ZEyL8WYG2/+MW2DYWbSi9yH7LlT7MuYro6hIIwIQH6SIfT6O+6gk4oRunjsTlmzt8rehxWVQc92lwXentvDN4ryhfQdw/Xu/3VDF24a0WApBZ0UbR5J165nNZeoQzpZjKhVsv2sOf5rNu8zgy423SWPFHh17GsNsHd+cN2NTINm4yba8Wq0g8Ha2syc16AHZ+CLd5cu1VgDUROYALn0rRDJzlBBZudhBj64azVK+qxcwxpfoZZNPOQOr6u1V5WwAT9kAbs6YcvgFU3fIfbnrIMZB88UN606g6roUaVpUvoth9ASOWu8/3MEMDSGKc1Aq7shH2dOEBr4NbWDytlUeO4yCIk/hFxx6iyY+tT8nD87oO+odMgvf3vze517THkShvszJ6bLJhZhPLpLRte+uJ346E8/WUUwkZw/tnpQnfO/sRoVdK08bNOKt0poP7pktZDrT4WOYkHBspVynu9+88uTbVk1GXyk8gMkXzqqHYWto2kzM+cmCy3eGbBwP6Mpfyu6YhWcdh8yUENsZsv2sYo+9QZOQzJXFp6vV/4xydvJ4gNPvPRzKocx4RQkJc7XZsX2x8jSCRvDI0vpY8PvEx041axKXKOry3Q1y/gnFlcVGqhzsakKMutWxSsmTGgD+FFChnbA1lA+serkN0dro0CmbJzpUw89P998OOY7BBGENbXYnWGen794mP6Lpaau04xA/WcAzjmCp7lLLdhsGD1b/Cciae8WqP5jsr6dKnPj/87e4M79RQM9DPsL8O4gRabQVDske+LN6kVYFvzbKlIPyepDEro1B/qbmdaHgqlKFLKGYtDxvFw5AngWdvzGz38k038BL05L7L6/3J35EXDgG52GshjlKtNV7AocUO5V23oaILAIjpUbolmuLpnevfNy2RACV+YghFEm018B8Tz7kUPwJp7RJ23IAdC7jHQdxJtcWVwnYCBoDo6AAKO9DqJY/hq83BL30RJDxNmOj+2BAaG1QAA/uCxkC/+SnRhnagh9nKD103ZQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e196911-7c59-4e35-eb7b-08d9eec837ee X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 08:09:55.1554 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fBsYyRDSN8UT7IG1g513AjYZ4b8H8vpjKbGiC/8khUkL4naa7f5ZTq8N2m5g81hE+tHoOUqCmJ5K4T8uBPKgnKld8CPXlky10Bz1pe/TiUs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2535 X-Proofpoint-GUID: oqkucMCfSOsmTivv9Bzn-a5A97iLllKb X-Proofpoint-ORIG-GUID: oqkucMCfSOsmTivv9Bzn-a5A97iLllKb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-13_02,2022-02-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=686 suspectscore=0 spamscore=0 impostorscore=0 lowpriorityscore=0 phishscore=0 clxscore=1015 mlxscore=0 bulkscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202130052 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The correct mask for getting the source/destination register from ESR in the case of an unaligned access exception is 0x3E0. With this change, a dummy unaligned store produces the expected info: """ >> swi r5, r0, 0x111 ... Hardware exception at 0x111 address Unaligned data access exception Unaligned word access Unaligned store access Register R5 Return address from exception 0x7f99dfc ### ERROR ### Please RESET the board ### """ Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index d37f04364a..d3640d3903 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -38,7 +38,7 @@ void _hw_exception_handler (void) printf("Unaligned %sword access\n", ((state & 0x800) ? "" : "half")); printf("Unaligned %s access\n", ((state & 0x400) ? "store" : "load")); - printf("Register R%x\n", (state & 0x3E) >> 5); + printf("Register R%x\n", (state & 0x3E0) >> 5); break; case 0x2: puts("Illegal op-code exception\n"); From patchwork Sun Feb 13 08:09:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1592081 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.a=rsa-sha256 header.s=PPS06212021 header.b=lI5s0DbV; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JxKmV251qz9sFh for ; Sun, 13 Feb 2022 19:10:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 426F283A1E; Sun, 13 Feb 2022 09:10:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=windriver.com header.i=@windriver.com header.b="lI5s0DbV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 707FB83381; Sun, 13 Feb 2022 09:10:09 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 72707838AE for ; Sun, 13 Feb 2022 09:10:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=prvs=90432c20ec=ovidiu.panait@windriver.com Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 21D88jxJ001772; Sun, 13 Feb 2022 00:09:58 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=FCZJ/i5GTZap7h7I5MCs57ajKTx6Pkk2nw+wZ18pB1s=; b=lI5s0DbVm16KZL9rXmmbWZWpgJCjlQVT1SY+31E5Wj0PR8Qwu3MTCZiQxs/BrzbyacCv Y346cGeun9P2VOr2rDfBt6ZETKKByhzmX+exHdk5DCcsqXcwMQKgnmk85NvCR3A0jUKr jW9hqyMRpctNQQYnaH66qwnpi0eGTQDrKCL9pZBlkXT3zHxRh2jtyx2WfosvkzjYOJwG vHwMtDWXNtZ+RMtpCkZgGd/dznrsNqdULGBmljMu9uvGcZP1sQNWtaFjK02vM09e0geQ tKq0PFNiAGXOmViJGl2xu4NC0844FSXqTgZQG8JkWc6w+WrNuHYBzzbdt9oPp3s8KgTc 6g== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2103.outbound.protection.outlook.com [104.47.70.103]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3e69248jjw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 13 Feb 2022 00:09:58 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DvcTJxiJtAJ5x5N3Ph3kOQyTW8bBygo2+D8OuzBZciV3Y0tHjSHpKAGiEWDfp6OlPTWcnElm2DKWunN5mxx0OW38RO6fiyNTF2bRk1B1hP6Tran7/kJpwjJu4sLjdifSmD1ow0by3xo0+vlV4ik/YSajwXX8B4QOLo3S27jGR1xbS40/rRMdZ93P1EMHsEgUMNmA9p7RBMM5zf7nuWebXMdEa2ham0MebPwud5xF7udBJlg0uCXLOHXztMVBcXIgBlExJfaCMs9vehiuI5AbO2pmkNZQw7J/DbW1460G/Bp0VLoWXrXXpMj/MrKZStQudhpH4669GV4C1n0jMk9ewA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FCZJ/i5GTZap7h7I5MCs57ajKTx6Pkk2nw+wZ18pB1s=; b=RgfpsXnSjAXxg1IbP7n+fwPknG9o1R/EIYo87DmRETSJvx+Qrq+hdBKvH/dO3/qIKRs9lxPlyvX6/sFu/Juhg4Rf59Ba5Q2HthMPPEsVexkYpbokzokoc4mAN1N8u4fnPwOWIIHfOJEsre6UMyI5BNFd9UT9xHfT/OLpBCpf6BEXd4oz+HAMvqx3DPy7RJkn9727jdHO1fXDdPSbLk+zOttTbq7ZfGoBzchYLKy/JL+Esugiz8uTQEzrx+LP47C0+8wMgpLA/ht/RqRo6SOsbhRXUx5C9kQDtLFe03il/Ful5d3O5weu9m5+616KmkC7Hj8tVubRIFGnLG6NLV3OZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by BYAPR11MB2535.namprd11.prod.outlook.com (2603:10b6:a02:be::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Sun, 13 Feb 2022 08:09:56 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::59a6:893f:534b:139e%4]) with mapi id 15.20.4975.015; Sun, 13 Feb 2022 08:09:56 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Michal Simek Subject: [PATCH 7/7] microblaze: exception: drop user exception support Date: Sun, 13 Feb 2022 10:09:25 +0200 Message-Id: <20220213080925.1548411-7-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220213080925.1548411-1-ovidiu.panait@windriver.com> References: <20220213080925.1548411-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VI1PR04CA0060.eurprd04.prod.outlook.com (2603:10a6:802:2::31) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e42848a1-2236-4eeb-b603-08d9eec838df X-MS-TrafficTypeDiagnostic: BYAPR11MB2535:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0SIqR03tDwWuRe34oMdKiFyYwQFRemX02YmUuN5mz0eMEreoXJE/vbGCAZv2xZAMEas2rYd/+c5J/ATs5uDpoL1bZV7cdHIvLR0Est7pGByEWwcwOh/hucUSth3HywoLblROoWJJPgt1sk010V90Vhe4NzCW8DfsvXvK56ux1T6u/vK7O/cEOaa+BoKzAX/Z4e1PF6Fji9eLgvGBFR8gdnYNfz2x3VcECZ7H8efRb9jGZqEEfqmVHdnIVouniVod+y87I+SZDl6zC8VJEUpaoRPhQFtZ3n8yveTYChp1h6xGfYTceyvmwUPkehxKr4pVRoDmqJY3UDBpDYnAawSoCzRfrIclakKmjE7zUHnN4DNGP9G7Gok2nsKMvyVuvlUpNRT/SqLhs8fHRQQaTWuCiGdupnTD8YzhBJO0h5irt7efqFRIf8Fvs3Lma5lLcMzyNEflBjL9BvjzgIFI2eNuGfdmuKBl0mFQOU+iDb1rcKwhOGUd5gNZojzjCG7f2u6+P7ENHOl884Zwf+Rgzk/reiezjbCgeYTdBUquT/e3Fz54zHYUOO+xvcAGGgRvMqIiUnEKcCB7BjHoLcTYYW9LrvAHqesPoNQAuWBwlypkEgYYsjICaJ/UtKfsguSKAfDVf5LHV4iyE9hWK7itcMum2azs+pzM3/d6toJ8ZWpUk+zft+aV68gl75aY6v97O/4EvpkpFE4/ssD9D/nUZajz1g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5327.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(86362001)(6512007)(6486002)(66476007)(6506007)(83380400001)(52116002)(6666004)(508600001)(6916009)(66946007)(2616005)(38350700002)(4326008)(186003)(44832011)(1076003)(38100700002)(66556008)(5660300002)(26005)(36756003)(8936002)(8676002)(316002)(2906002)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qF26qCMoxxw4+kd68klxh6hwvRRV4Jtv3aiDXUTebNOID5wxq8wiHuki+/kMXfXffFJlvQrbNFemdN7tAHJi7C6HJptElTrKTIPm7saq8W1FaIuXnbt1H7jTSByw9C+li72BrBnXx5IeWEGouBVaVhQAeCYJSmvO0ZfL2iWxmc5RUBn48u8ng8EvQw51paLoypvnnjhzg6krYou07FCdb8y4dyU5DuE5bES9yUaoRZFU6rWadOsIrdXVxSl3ACJ7P2TEuSxINnbt5Z3YBqEbd0BzXZOWmzMUGdzBd4kw7rmdavVBCCUZoRNXje+a2zepONKR3h2Kpup7svCGXmUvT2dsJUWNURXH9b8E/rB8FIlKT/0D4gAqbOPUrFyE2nm1S/Exb3bitx3L2CjfdikVuGyGxsmVHLoD9PrAnLXE8a6fjAtPkdq87l9cUB9EdzroXRUdcvRqSzfZvSQmRNCx3nn5PQk/B7/TqYtRCDu+pqwarrYGX1Zk9xYxJ6z5+dVPuMVhFmw2ii0bhnUW/UUa8JNLx0fVhgMrz7r6u6YJFQehsbOLmzu4ud+x8rRgEBRiH2pwuHGFdKjiYE756IlBJoDPq+TL3TozcK9Dg/pmH7pqNP98Ic+JfIbNYjkcKbAcqOwodeEFqDnf6ke7UkE4Ehs784S3JGgMeexNA7+KwZolu+QOpUW1v+g7xiwb+dJ+PRHdoBwp2znS3qGozIRBmBFS/hwd1YNHD/n6O2argnl+8DL7MOSctGSN1ZWSrX76JIyaMn/Bg0YVxePS3D4T52/r71MdHRO89Zl0iww6iGb5rBKRImLZzWXrullXD0MJE112nTHkXizO1joaGCVjKf5aptP4O2fnpjBtVcqHTC2H7AJS7rhOKuf/ZCiX62hdyDjAit6fftuIja5h1sKfPrkAkZCckfMsXuYH99mpgF9oWhoMtCkawsOy+spJKIi3sWa49XSJex4pWY6R76tL+fSOPXbHYMsuu0RB4lVrIhrQV6ktPFdKE0Z1TlWL/nE4jJE7L6u6fs22lhMYsZzW90clGbuzdNmjmo34nhJIrU7q8si619/3CfuBVEAx8xujebqKkpsDHm1dx0sElr12CXwu34KYLveP/6TVQ0W6AqGPhe0WFc16jvN9j0QKrj1Xv0XH9jnE24SJMw4rnrUg/YdelBnM2i7mUSBNrM5e/+/IIB9eyKMbQN96VFjfRt0/yplcX2A8K5P5ECRLQ+zeQPHT64dP17tyVu/wW4nMZ6d02P4dqlU+iXIzSJVofWkgMXGapoFkRNbBy82uWc3nUwHU3lLzJVERlBpfRPsSkiEpwJhuo4lYHFIXCDFBLR24J5v8xWZODUCd2Ks8hvAy+aZJva/kNF05I92LYaLi56SDVZX/i16KCO0JtwLMdJioij/z2DQIXPjlrDs4z2q7cmjqua/pbvYeKZaqHHft/qzrtqiSC9BdfClP/O7c91kdXgHmHMyfo4JK4MzYMitdgDBIUZYuNm03UtreZhmp37AX7ciWFbX2VWOH2DhizEombcNDlMINagDZTIyw1LXRNfgWmWZN218Nsm4BIb6Pn7hP4uOo2qyiklCC7bxFg/9B+WjBhwqDay9g7XINb9d+YOfuMC+TIgOqlS1boviLNl935z5wfzBHB3zX8ftJ1wfMsJFrz6CRTnbB8c7JFWWfXA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e42848a1-2236-4eeb-b603-08d9eec838df X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 08:09:56.5952 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bP+1ygzpua1sCTjPfZsJ9jeEXTMP6ZcU8q3D077l36zMiKdvYf6hflkPx4uZbJFY+u/6ndHx5eRZDEJw66Iw9/xop7W0QCICo1FBPdNHfsg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2535 X-Proofpoint-GUID: VxJ_gCtHNluIN4vdVvLOaEG5Hji5br4F X-Proofpoint-ORIG-GUID: VxJ_gCtHNluIN4vdVvLOaEG5Hji5br4F X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-02-13_02,2022-02-11_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=1 bulkscore=0 mlxlogscore=199 mlxscore=1 adultscore=0 spamscore=1 lowpriorityscore=0 phishscore=0 impostorscore=0 clxscore=1015 malwarescore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202130052 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean A user exception is triggered by inserting a bralid/brki jump to "C_BASE_VECTORS+0x8" in the software flow. Because u-boot microblaze code does not deal with MMU-related features such as user-mode/privileged-mode separation, there are no code sequences that call into the user exception handler. It seems there is no real usecase for having user exception support in u-boot, so drop the code that installs the nop handler. Signed-off-by: Ovidiu Panait --- arch/microblaze/cpu/exception.c | 8 ----- arch/microblaze/cpu/start.S | 40 ++----------------------- board/xilinx/microblaze-generic/Kconfig | 9 ------ 3 files changed, 3 insertions(+), 54 deletions(-) diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c index d3640d3903..1f7c44d1f3 100644 --- a/arch/microblaze/cpu/exception.c +++ b/arch/microblaze/cpu/exception.c @@ -63,11 +63,3 @@ void _hw_exception_handler (void) printf("Return address from exception 0x%x\n", address); hang(); } - -#if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USR_EXCEP) -void _exception_handler (void) -{ - puts("User vector_exception\n"); - hang(); -} -#endif diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index 645f7cb038..0ea0b78da9 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -97,9 +97,9 @@ clear_bss: * r5 - relocation offset (zero when setting up vectors before * relocation, and gd->reloc_off when setting up vectors after * relocation) - * - the relocation offset is added to the _exception_handler, - * _interrupt_handler and _hw_exception_handler symbols to reflect the - * post-relocation memory addresses + * - the relocation offset is added to the _interrupt_handler and + * _hw_exception_handler symbols to reflect the post-relocation memory + * addresses * * Reserve registers: * r10: Stores little/big endian offset for vectors @@ -149,40 +149,6 @@ __setup_exceptions: rsubi r8, r10, 0x6 sh r6, r4, r8 -#if CONFIG_IS_ENABLED(XILINX_MICROBLAZE0_USR_EXCEP) - /* user_vector_exception */ - swi r2, r4, 0x8 /* user vector exception - imm opcode */ - swi r3, r4, 0xC /* user vector exception - brai opcode */ - - addik r6, r5, _exception_handler - sw r6, r1, r0 - /* - * BIG ENDIAN memory map for user exception - * 0x8: 0xB000XXXX - * 0xC: 0xB808XXXX - * - * then it is necessary to count address for storing the most significant - * 16bits from _exception_handler address and copy it to - * 0xa address. Big endian use offset in r10=0 that's why is it just - * 0xa address. The same is done for the least significant 16 bits - * for 0xe address. - * - * LITTLE ENDIAN memory map for user exception - * 0x8: 0xXXXX00B0 - * 0xC: 0xXXXX08B8 - * - * Offset is for little endian setup to 0x2. rsubi instruction decrease - * address value to ensure that points to proper place which is - * 0x8 for the most significant 16 bits and - * 0xC for the least significant 16 bits - */ - lhu r7, r1, r10 - rsubi r8, r10, 0xa - sh r7, r4, r8 - rsubi r8, r10, 0xe - sh r6, r4, r8 -#endif - /* interrupt_handler */ swi r2, r4, 0x10 /* interrupt - imm opcode */ swi r3, r4, 0x14 /* interrupt - brai opcode */ diff --git a/board/xilinx/microblaze-generic/Kconfig b/board/xilinx/microblaze-generic/Kconfig index 117b476f3f..a0af2e9abd 100644 --- a/board/xilinx/microblaze-generic/Kconfig +++ b/board/xilinx/microblaze-generic/Kconfig @@ -38,15 +38,6 @@ config XILINX_MICROBLAZE0_HW_VER string "Core version number" default "7.10.d" -config XILINX_MICROBLAZE0_USR_EXCEP - bool "MicroBlaze user exception support" - default y - help - Enable this option in order to install the user exception handler - (_exception_handler routine from arch/microblaze/cpu/exception.c) in - the exception vector table. The user exception vector is located at - C_BASE_VECTORS + 0x8 address. - config XILINX_MICROBLAZE0_DELAY_SLOT_EXCEP bool "MicroBlaze delay slot exception support" default y