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 */