From nobody Tue May 14 20:28:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) ARC-Seal: i=2; a=rsa-sha256; t=1646323144; cv=pass; d=zohomail.com; s=zohoarc; b=EW4CwA1Oiliww0286D09an3yy7Lz2b45REtIJg/uftnlsxA0qrNK3jvrlniqldX8yYQBjtGY/IzJ8vCpPna/Cn2ECYzeiFU82AURuIZkn7sUhocY44OQnKMsW9pXwQS5//CxGr4Dk+KfbYSRw6iKoMoA50TE24gmojc24e451eo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646323144; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YvMZnnXoq7ABum4xoQIYpBWVD1T9n29JKJ9rBolgcds=; b=ZhAFNy4h16HcOLH8+O0CrsAtgpeoDpEh1/kpeTGIkbDMWccYgTLi8sL5NFcawR25cjdj0waCAAb7esOoVIQcQfNdUCuXr4EXj+5euMZ0kjzL9C4qr5Y/6SKLzSUK238ybRKfN2SNGXBuSuR3cWaHMEXqK1k/bjJPPVio1XGr5vc= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646323144585785.3560934736958; Thu, 3 Mar 2022 07:59:04 -0800 (PST) Received: from localhost ([::1]:58070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPnr5-0003ie-BU for importer@patchew.org; Thu, 03 Mar 2022 10:59:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnY1-0002Fy-PN for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:39:21 -0500 Received: from [2a01:111:f400:7d00::731] (port=1505 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnXz-0001Is-Jx for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:39:21 -0500 Received: from AS8P189CA0022.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:31f::14) by VI1PR09MB4176.eurprd09.prod.outlook.com (2603:10a6:800:129::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 15:39:15 +0000 Received: from AM5EUR02FT047.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:31f:cafe::f5) by AS8P189CA0022.outlook.office365.com (2603:10a6:20b:31f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:15 +0000 Received: from nb-o365.localdomain (192.116.190.34) by AM5EUR02FT047.mail.protection.outlook.com (10.152.9.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:14 +0000 Received: from amirgonnen-vm.neuroblade.corp (amirgonnen-vm.neuroblade.corp [192.168.3.87]) by nb-o365.localdomain (Postfix) with ESMTP id 4F347211B5; Thu, 3 Mar 2022 17:38:59 +0200 (IST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DzA98/lcX36xbfFi0Xsf1368TEVW5pkaKNbJzMfWdKIGQn14TIaMG7V2mwX1S1/JCPDhcqU51AMLtfu7nVkPiWBzb4Q+w/T29uafXFlPai/YOtq68t5/wNABee/U1Ms0US4ZhnovQ6KSKUQxu8je3cICJ4hUtJAUO+gtwho78uR4ZSrn+wX3YzlI88AiO72oi9sWPJMBi0TE7Z1exUdvdCUVnSErhBwr8fz9ULHKznXA4r1Qk0bd8lAoOuvvz+speyQuV3698y7Q2I+ChnQQwe/pAkTRyqQBy+pz4sthBJo7f31T9Ok7hl8OSpe7FYDbmWBBKzP0r22PudaBpnW9ow== 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=YvMZnnXoq7ABum4xoQIYpBWVD1T9n29JKJ9rBolgcds=; b=M8t2wQqOAs5Kh3ZclcQ6HrpS4czZKjimXbzMsYZpFOFav70EHhnD/ZXn4lgbQHxqzpNFXvtXAlhKs9YVnKBnkJZ5ZM5AnCwYIjLiIU5qaGwbLutcJEiMtMnk90STiePZMbey/LtYKtKAmFS+5A/p0BdZBZl24uQWDqCZ5oKEOSCw710Nx87koPFoaTM5hS/jbkTYgCSAqXfJBrRjzlNYe9eu4sjEX8oAsr3r9NypbrvNWvW5vDUzvQHRlJuOyyIWp63/9hLuaVMIC1xGOTqwoHk/VDgr18ZbU569JQ6q7o7zHFY8Srok1J11eNr2DsUMct8iemcH7dHcYiEroIvSWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 192.116.190.34) smtp.rcpttodomain=denx.de smtp.mailfrom=neuroblade.ai; dmarc=none action=none header.from=neuroblade.ai; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=neuroblade.ai; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YvMZnnXoq7ABum4xoQIYpBWVD1T9n29JKJ9rBolgcds=; b=kPQCXi+m/jkH1jBEzmJ8fQin8dz+UY+TD9m91oHke2RxSOjnhnRUBLn9B0tQ5AM5q69OWQr9LSsX2u6pyXPHnuCsjyJAS7irYuvtuRbzBML8+pAsmjxi4BL/+vMgk11J4m4PDKsjloXNPKKGPQzfnUt/CIzpsa/LVkRapCI72bA= X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 192.116.190.34) smtp.mailfrom=neuroblade.ai; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=neuroblade.ai; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Fail (protection.outlook.com: domain of neuroblade.ai does not designate 192.116.190.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.116.190.34; helo=nb-o365.localdomain; From: Amir Gonnen To: qemu-devel@nongnu.org, Peter Maydell , Chris Wulff , Marek Vasut , Richard Henderson Subject: [PATCH v3 1/5] target/nios2: Check supervisor on eret Date: Thu, 3 Mar 2022 17:39:02 +0200 Message-Id: <20220303153906.2024748-2-amir.gonnen@neuroblade.ai> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> References: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 558315c1-771d-46fb-c6f4-08d9fd2bf8ca X-MS-TrafficTypeDiagnostic: VI1PR09MB4176:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oej0Oci84hhYh1mZDrhU2wz/s802S1k/3HBWFExQ6rBDhlFWwuXfUnNIJp2VmjqiJ0urhGjnTKa2tAW4nglEHPfui3/xssMoTCB+xZ5mhiyh9qmY4wOuGthQMkejSuLR0TEOvNx86zbj7mwC6QNPxlFvYqQPZNLfVrfne9vvYRxaJMzgP1WxGtiHRRODrLlL7O4mdUHzJ3BsMkNhd2DXpBnn04XNWohVv7Ikx4juoc/sO67GdbB2qJwj3liKMooMShWlhT66KA01iLzieJdrX7indvv4buld10uIgWzJzqi4UCeC9Vq/nON556xt6dDdNdq5Un2yQ9Yqfx80hIP08/vgnrdq/cRqbRZKeYqwqZDDViJNysyo97gAKnN49FoHWb5U20wRnvJ0TOmNZcRUMfWwn4J1jAlXGL4DQ5XfyajkqMXqZ3zakq9/15ZC9lhddsAZkzrj0LcAkkxKiOVUaGbljHhACIoYtql8ECoNQsYWXhd9n429n6abyhTYEYlHAvbwuMoeTBn7bGwnXOhdQYnBMSoJ3OKhh9MijhXuNrvjKQMhzp5mCa43q95pNu3vYXMKqQDEKXgrpL+4u/nKyxLvV0ulsjRUXkRm5PyLbfSwjt2cO18JRSVcAGbDQLf2LSJzV3pmfeMtv3XgbEe8nQdh4Mdd+mFEFM6RwK4PFKFQSrmq/clt9q5OL6r/DXT4WsxdJFytP7jzVf6Ng9dm5dRJRWz/+BStPUqtH9u2oHQ= X-Forefront-Antispam-Report: CIP:192.116.190.34; CTRY:IL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:nb-o365.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(376002)(346002)(39840400004)(396003)(136003)(46966006)(36840700001)(81166007)(44832011)(356005)(5660300002)(6666004)(2906002)(47076005)(82310400004)(4744005)(107886003)(70206006)(70586007)(4326008)(8676002)(6266002)(336012)(110136005)(40480700001)(1076003)(2616005)(86362001)(508600001)(186003)(8936002)(26005)(36860700001)(316002)(36756003)(36900700001)(27056005); DIR:OUT; SFP:1102; X-OriginatorOrg: neuroblade.ai X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 15:39:14.7377 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 558315c1-771d-46fb-c6f4-08d9fd2bf8ca X-MS-Exchange-CrossTenant-Id: 63c61203-65af-4cf8-98e5-d12f35edaefa X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=63c61203-65af-4cf8-98e5-d12f35edaefa; Ip=[192.116.190.34]; Helo=[nb-o365.localdomain] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT047.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR09MB4176 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:111:f400:7d00::731 (failed) Received-SPF: pass client-ip=2a01:111:f400:7d00::731; envelope-from=amir.gonnen@neuroblade.ai; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amir Gonnen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @neuroblade.ai) X-ZM-MESSAGEID: 1646323147332100001 Content-Type: text/plain; charset="utf-8" eret instruction is only allowed in supervisor mode. Signed-off-by: Amir Gonnen Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson --- target/nios2/translate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index ce3aacf59d..007c17e6e9 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -384,6 +384,8 @@ static const Nios2Instruction i_type_instructions[] =3D= { */ static void eret(DisasContext *dc, uint32_t code, uint32_t flags) { + gen_check_supervisor(dc); + tcg_gen_mov_tl(cpu_R[CR_STATUS], cpu_R[CR_ESTATUS]); tcg_gen_mov_tl(cpu_R[R_PC], cpu_R[R_EA]); =20 --=20 2.25.1 From nobody Tue May 14 20:28:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) ARC-Seal: i=2; a=rsa-sha256; t=1646325074; cv=pass; d=zohomail.com; s=zohoarc; b=RfsG6ut579m7CSdw2cdhHpOR4o0Jouj/1M9CY/3aov1bsUlVrel9uGMUrD1lFV4RB1Ixj6GVNgA+p08ZS4ZYeQqPZCSXu/W0/9TvuOKm0swlwCT1V98mXBP1qGEtieXdXB57dnYUeMyWBIkPQ3+SKgeAQ9Sn91s01DgjUqUknwQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646325074; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XnRX4QqQnYeCrWi+0WKskJZoibLneU2+aAlzIcjH2G0=; b=U21ewSXD8ra/V3S01ZJps7dx6J4x4B/XbnOZMUJtd1OnNHVF4RUoJNL1Cy1habp3KKZtnOaXH+GR3GCiH3ebfb291F5HBelL/BYH2sw/l1H8G0Been4yReyO0ZQ4FQxpM8yRu+uSlL0g4UdsKvHL2QppEqlIZphfQ510q8fNU1g= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646325074948223.25777796313457; Thu, 3 Mar 2022 08:31:14 -0800 (PST) Received: from localhost ([::1]:36412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPoMD-0000bt-58 for importer@patchew.org; Thu, 03 Mar 2022 11:31:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo3o-0005Ia-DD for qemu-devel@nongnu.org; Thu, 03 Mar 2022 11:12:13 -0500 Received: from [2a01:111:f400:fe02::72c] (port=30979 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPo3l-0000QG-IA for qemu-devel@nongnu.org; Thu, 03 Mar 2022 11:12:11 -0500 Received: from AM6PR10CA0004.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:89::17) by AS8PR09MB5272.eurprd09.prod.outlook.com (2603:10a6:20b:373::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 15:39:18 +0000 Received: from AM5EUR02FT063.eop-EUR02.prod.protection.outlook.com (2603:10a6:209:89:cafe::59) by AM6PR10CA0004.outlook.office365.com (2603:10a6:209:89::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:15 +0000 Received: from nb-o365.localdomain (192.116.190.34) by AM5EUR02FT063.mail.protection.outlook.com (10.152.9.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:14 +0000 Received: from amirgonnen-vm.neuroblade.corp (amirgonnen-vm.neuroblade.corp [192.168.3.87]) by nb-o365.localdomain (Postfix) with ESMTP id 5ECEA211BB; Thu, 3 Mar 2022 17:38:59 +0200 (IST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OPmMuOYv0Bzm4btgU3gU0r4i8mas+a14G5EIwlPPsUulWybQtCTp1tP90RSgSC5XSAWpUhZA4meHrt+Kf0NnVludaiP3D0Q8To9zRakWyRe5o1cjba+koniq5zMduNfTeexRfb/KufyqJmtP817+Xjb1WU0cI+eUtq3fCZgZcGxC/HtGb/OBZ+F9juUZkkpZHtiftUK5Gvo5g+rQbz32eJF1ncUKOQJQpbyRgJ3q18sLEU0xYs0RqGW8+n4+5gW2cZeS2aapR0L4qVNGnnH7G6DBDTNaLLNvf7iVciJpWnKksgA52c0n6pmkSkf7YaRrAc5zhClKeFaR/Vz2eAXwHQ== 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=XnRX4QqQnYeCrWi+0WKskJZoibLneU2+aAlzIcjH2G0=; b=Jy0pMFoU5viNpByNYMmH8SAYv40/WCwXgqxZJYU6RdaeClfyZMzgCvjfUVIFmGmtdgXJqJhcJpxNuwvztOpVlFsI37xazvlIoaWM17Bm/RKaTlNRaQnordOVWPq/1FdQXNDsmFH5rbunpN7njvJWzI1IYn2YBmx+og9pEyKWi3aib6Z4YP/D8fCgAJMH2a2ES9btDezifsus8bpgLoEV2U849RDI8SZyFxvLvm4tsVpBazOX2Eneqc9luJYq4L4aDDxjQVAesIiheqiEeacWh9Gt66TEoTu+SmYwph3ewa/I4HM7YQkHv1iuLXtzo5j1JT7G9FobNd8YYCeH9Dd5Vg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 192.116.190.34) smtp.rcpttodomain=denx.de smtp.mailfrom=neuroblade.ai; dmarc=none action=none header.from=neuroblade.ai; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=neuroblade.ai; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XnRX4QqQnYeCrWi+0WKskJZoibLneU2+aAlzIcjH2G0=; b=H3gHw1V7ECuPiy+AgpmWG8bRlOMjOnNssOpEnS/CR8m5t+j63T6GXHYOcAB+B6QEs8gqSbE7OSwIFtOjUxSDQb638y6PHbIZGhFV6e7eQM7DW4l+xWeZ6lE/MUBVT3EjRjoOuK5N8dkw2OV4Z6dXt/QymMAtEc77DF5UNYc6wJw= X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 192.116.190.34) smtp.mailfrom=neuroblade.ai; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=neuroblade.ai; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Fail (protection.outlook.com: domain of neuroblade.ai does not designate 192.116.190.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.116.190.34; helo=nb-o365.localdomain; From: Amir Gonnen To: qemu-devel@nongnu.org, Peter Maydell , Chris Wulff , Marek Vasut , Richard Henderson Subject: [PATCH v3 2/5] target/nios2: Shadow register set Date: Thu, 3 Mar 2022 17:39:03 +0200 Message-Id: <20220303153906.2024748-3-amir.gonnen@neuroblade.ai> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> References: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0cb63ed-5c4a-4fad-5672-08d9fd2bf8d4 X-MS-TrafficTypeDiagnostic: AS8PR09MB5272:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MVObgxw9CFgZfmo0Gedke0gr3YrXO44YYbA7GRZ6WYlxnq/ec8mWe26DJ8QxeSqM4/BwURH5UZp1D9JBnEIHa6j8WfFRcLiJ4c6SiTHfFnFqrE5MNLTclJ+WNVJRUlHEse7/cKe0EqPVRydjdqoysaDmUpNquF1K1HPTY6d9oBGM/z5VfdPZuFNLkY8CB0toNz6PyX0xTxKoFEP8ax5iEF7JiJ400sj4+TZI9xFzlgoaUjPIW+X/97dGe4RqmFsGYVGNyFX69BKXeMaA7sue4uv/eGViwNZxbXz0scwrUbxgqpc7w+pOS59nDjSmSPbadGWAP+vb4uvvPF6ZuCZ8ZfcK2cLdqx/CLetgTgHbN/Xd9+b+bmqRJ4nN8eLSacxuM8lPrdgcFGBSoLwddKmYU6vzj8mxLRSIqv0ndKjkTfK45d41stwcIi1TtC/25mLibSRFJRce7WGCFGnDQQFefJ2znaY/vu9Ofg5c28Tq/BCOqQWixrEbVAyxMu/aXP8ZLemaQjyOYzu+IsJXqPCcoSoPERl0yXrVBiftKUk/MwEXD+PZa+tW3xj1a5NuI9igSgpoxn1G4SJ+1XPYd9j7bqlbi3PmQilphQhT+SnVY2ymqoGpccDTdFC/gM44WDeCBC+rOFnjtJ9li2JkMXU9HVsZbHMnlO5c6BIIqKsja+1DZBe2E3cCdJqv3y7TI7626SidBtljmURhpz8t1wce9JCJTBD9ksa/VzlxqboOFwwltsQ5Gkh8ppc1j5OwJ8eMKs7751a2Oi/8rwci5TE0tjdU2bo+KYVgE4lzD1scaYa/0CnlfiTMkAmnpktpahsn X-Forefront-Antispam-Report: CIP:192.116.190.34; CTRY:IL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:nb-o365.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(136003)(39840400004)(396003)(346002)(376002)(46966006)(36840700001)(336012)(70206006)(8676002)(186003)(4326008)(70586007)(81166007)(2616005)(1076003)(26005)(6266002)(107886003)(6666004)(5660300002)(8936002)(44832011)(86362001)(2906002)(36756003)(82310400004)(316002)(508600001)(110136005)(47076005)(83380400001)(40480700001)(36860700001)(356005)(27056005)(36900700001); DIR:OUT; SFP:1102; X-OriginatorOrg: neuroblade.ai X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 15:39:14.8003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0cb63ed-5c4a-4fad-5672-08d9fd2bf8d4 X-MS-Exchange-CrossTenant-Id: 63c61203-65af-4cf8-98e5-d12f35edaefa X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=63c61203-65af-4cf8-98e5-d12f35edaefa; Ip=[192.116.190.34]; Helo=[nb-o365.localdomain] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT063.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR09MB5272 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:111:f400:fe02::72c (failed) Received-SPF: pass client-ip=2a01:111:f400:fe02::72c; envelope-from=amir.gonnen@neuroblade.ai; helo=EUR01-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amir Gonnen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @neuroblade.ai) X-ZM-MESSAGEID: 1646325077854100001 Content-Type: text/plain; charset="utf-8" Implement shadow register set and related instructions rdprs, wrprs. Fix eret to update either status or sstatus according to current register set. eret also changes register set when needed. Signed-off-by: Amir Gonnen --- target/nios2/cpu.c | 1 + target/nios2/cpu.h | 48 +++++++++++++++++++++++++++--- target/nios2/helper.h | 1 + target/nios2/op_helper.c | 18 +++++++++++ target/nios2/translate.c | 64 ++++++++++++++++++++++++++++++++++++---- 5 files changed, 123 insertions(+), 9 deletions(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 6975ae4bdb..026ee18b01 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -54,6 +54,7 @@ static void nios2_cpu_reset(DeviceState *dev) ncc->parent_reset(dev); =20 memset(env->regs, 0, sizeof(uint32_t) * NUM_CORE_REGS); + memset(env->shadow_regs, 0, sizeof(uint32_t) * NUM_REG_SETS * NUM_GP_R= EGS); env->regs[R_PC] =3D cpu->reset_addr; =20 #if defined(CONFIG_USER_ONLY) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index a00e4229ce..dbb4c968df 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -23,6 +23,7 @@ =20 #include "exec/cpu-defs.h" #include "hw/core/cpu.h" +#include "hw/registerfields.h" #include "qom/object.h" =20 typedef struct CPUNios2State CPUNios2State; @@ -57,9 +58,14 @@ struct Nios2CPUClass { #define EXCEPTION_ADDRESS 0x00000004 #define FAST_TLB_MISS_ADDRESS 0x00000008 =20 +#define NUM_GP_REGS 32 +#define NUM_CR_REGS 32 =20 /* GP regs + CR regs + PC */ -#define NUM_CORE_REGS (32 + 32 + 1) +#define NUM_CORE_REGS (NUM_GP_REGS + NUM_CR_REGS + 1) + +/* 63 shadow register sets. 0 is the primary set */ +#define NUM_REG_SETS 64 =20 /* General purpose register aliases */ #define R_ZERO 0 @@ -80,15 +86,15 @@ struct Nios2CPUClass { #define R_RA 31 =20 /* Control register aliases */ -#define CR_BASE 32 +#define CR_BASE NUM_GP_REGS #define CR_STATUS (CR_BASE + 0) #define CR_STATUS_PIE (1 << 0) #define CR_STATUS_U (1 << 1) #define CR_STATUS_EH (1 << 2) #define CR_STATUS_IH (1 << 3) #define CR_STATUS_IL (63 << 4) -#define CR_STATUS_CRS (63 << 10) -#define CR_STATUS_PRS (63 << 16) +FIELD(CR_STATUS, CRS, 10, 6) +FIELD(CR_STATUS, PRS, 16, 6) #define CR_STATUS_NMI (1 << 22) #define CR_STATUS_RSIE (1 << 23) #define CR_ESTATUS (CR_BASE + 1) @@ -131,6 +137,7 @@ struct Nios2CPUClass { =20 /* Other registers */ #define R_PC 64 +#define R_SSTATUS 30 =20 /* Exceptions */ #define EXCP_BREAK 0x1000 @@ -157,6 +164,7 @@ struct Nios2CPUClass { =20 struct CPUNios2State { uint32_t regs[NUM_CORE_REGS]; + uint32_t shadow_regs[NUM_REG_SETS][NUM_GP_REGS]; =20 #if !defined(CONFIG_USER_ONLY) Nios2MMU mmu; @@ -245,4 +253,36 @@ static inline void cpu_get_tb_cpu_state(CPUNios2State = *env, target_ulong *pc, *flags =3D (env->regs[CR_STATUS] & (CR_STATUS_EH | CR_STATUS_U)); } =20 +static inline uint32_t cpu_get_crs(const CPUNios2State *env) +{ + return FIELD_EX32(env->regs[CR_STATUS], CR_STATUS, CRS); +} + +static inline uint32_t cpu_get_prs(const CPUNios2State *env) +{ + return FIELD_EX32(env->regs[CR_STATUS], CR_STATUS, PRS); +} + +static inline void cpu_change_reg_set(CPUNios2State *env, uint32_t prev_se= t, + uint32_t new_set) +{ + if (new_set =3D=3D prev_set) { + return; + } + memcpy(env->shadow_regs[prev_set], env->regs, + sizeof(uint32_t) * NUM_GP_REGS); + memcpy(env->regs, env->shadow_regs[new_set], + sizeof(uint32_t) * NUM_GP_REGS); + env->regs[CR_STATUS] =3D + FIELD_DP32(env->regs[CR_STATUS], CR_STATUS, PRS, prev_set); + env->regs[CR_STATUS] =3D + FIELD_DP32(env->regs[CR_STATUS], CR_STATUS, CRS, new_set); +} + +static inline void cpu_set_crs(CPUNios2State *env, uint32_t value) +{ + uint32_t crs =3D cpu_get_crs(env); + cpu_change_reg_set(env, crs, value); +} + #endif /* NIOS2_CPU_H */ diff --git a/target/nios2/helper.h b/target/nios2/helper.h index a44ecfdf7a..2e400b1f12 100644 --- a/target/nios2/helper.h +++ b/target/nios2/helper.h @@ -18,6 +18,7 @@ * */ =20 +DEF_HELPER_2(eret, void, env, i32) DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) =20 #if !defined(CONFIG_USER_ONLY) diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index caa885f7b4..c8ce399332 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -30,3 +30,21 @@ void helper_raise_exception(CPUNios2State *env, uint32_t= index) cs->exception_index =3D index; cpu_loop_exit(cs); } + +void helper_eret(CPUNios2State *env, uint32_t new_pc) +{ + uint32_t crs =3D cpu_get_crs(env); + if (crs =3D=3D 0) { + env->regs[CR_STATUS] =3D env->regs[CR_ESTATUS]; + } else { + env->regs[CR_STATUS] =3D env->regs[R_SSTATUS]; + } + + /* + * At this point CRS was updated by the above assignment to CR_STATUS. + * Therefore we need to retrieve the new value of CRS and potentially + * switch the register set + */ + cpu_change_reg_set(env, crs, cpu_get_crs(env)); + env->regs[R_PC] =3D new_pc; +} diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 007c17e6e9..f1ac1bf126 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -205,6 +205,34 @@ static void call(DisasContext *dc, uint32_t code, uint= 32_t flags) /* * I-Type instructions */ + +/* + * rB <- prs.rA + sigma(IMM16) + */ +static void rdprs(DisasContext *dc, uint32_t code, uint32_t flags) +{ + I_TYPE(instr, code); + + gen_check_supervisor(dc); + + TCGv_i32 t =3D tcg_temp_new_i32(); + TCGv_ptr p =3D tcg_temp_new_ptr(); + + tcg_gen_extract_i32(t, cpu_R[CR_STATUS], + R_CR_STATUS_PRS_SHIFT, + R_CR_STATUS_PRS_LENGTH); + tcg_gen_muli_i32(t, t, sizeof(uint32_t) * NUM_GP_REGS); + tcg_gen_ext_i32_ptr(p, t); + + tcg_gen_add_ptr(p, p, cpu_env); + tcg_gen_ld_i32(t, p, offsetof(CPUNios2State, shadow_regs) + + sizeof(uint32_t) * instr.a); + tcg_gen_addi_i32(cpu_R[instr.b], t, instr.imm16.s); + + tcg_temp_free_ptr(p); + tcg_temp_free_i32(t); +} + /* Load instructions */ static void gen_ldx(DisasContext *dc, uint32_t code, uint32_t flags) { @@ -365,7 +393,7 @@ static const Nios2Instruction i_type_instructions[] =3D= { INSTRUCTION_FLG(gen_stx, MO_SL), /* stwio */ INSTRUCTION_FLG(gen_bxx, TCG_COND_LTU), /* bltu */ INSTRUCTION_FLG(gen_ldx, MO_UL), /* ldwio */ - INSTRUCTION_UNIMPLEMENTED(), /* rdprs */ + INSTRUCTION(rdprs), /* rdprs */ INSTRUCTION_ILLEGAL(), INSTRUCTION_FLG(handle_r_type_instr, 0), /* R-Type */ INSTRUCTION_NOP(), /* flushd */ @@ -378,16 +406,42 @@ static const Nios2Instruction i_type_instructions[] = =3D { /* * R-Type instructions */ + +/* + * prs.rC <- rA + */ +static void wrprs(DisasContext *dc, uint32_t code, uint32_t flags) +{ + R_TYPE(instr, code); + + gen_check_supervisor(dc); + + TCGv_i32 t =3D tcg_temp_new_i32(); + TCGv_ptr p =3D tcg_temp_new_ptr(); + + tcg_gen_extract_i32(t, cpu_R[CR_STATUS], + R_CR_STATUS_PRS_SHIFT, + R_CR_STATUS_PRS_LENGTH); + tcg_gen_muli_i32(t, t, sizeof(uint32_t) * NUM_GP_REGS); + tcg_gen_ext_i32_ptr(p, t); + + tcg_gen_add_ptr(p, p, cpu_env); + tcg_gen_st_i32(cpu_R[instr.a], p, offsetof(CPUNios2State, shadow_regs) + + sizeof(uint32_t) * instr.c); + + tcg_temp_free_ptr(p); + tcg_temp_free_i32(t); +} + /* - * status <- estatus + * status <- CRS =3D=3D 0? estatus: sstatus * PC <- ea */ static void eret(DisasContext *dc, uint32_t code, uint32_t flags) { gen_check_supervisor(dc); =20 - tcg_gen_mov_tl(cpu_R[CR_STATUS], cpu_R[CR_ESTATUS]); - tcg_gen_mov_tl(cpu_R[R_PC], cpu_R[R_EA]); + gen_helper_eret(cpu_env, cpu_R[R_EA]); =20 dc->base.is_jmp =3D DISAS_JUMP; } @@ -665,7 +719,7 @@ static const Nios2Instruction r_type_instructions[] =3D= { INSTRUCTION_ILLEGAL(), INSTRUCTION(slli), /* slli */ INSTRUCTION(sll), /* sll */ - INSTRUCTION_UNIMPLEMENTED(), /* wrprs */ + INSTRUCTION(wrprs), /* wrprs */ INSTRUCTION_ILLEGAL(), INSTRUCTION(or), /* or */ INSTRUCTION(mulxsu), /* mulxsu */ --=20 2.25.1 From nobody Tue May 14 20:28:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) ARC-Seal: i=2; a=rsa-sha256; t=1646323305; cv=pass; d=zohomail.com; s=zohoarc; b=DkF7WdF7mb9iXT7NcRkciupMcp1fTxHCpXNxvafbN1n03fEl0+jLw3H3PXDN8jKpNCr+Z4Brv91SfWanpUEXNOpJjgf0gGCfYV4upSrKnUiBA9ZKbvfNXII/L9DtpR4dw83ltBPEG89dTEreaD8ShcV9TPczUU1iCCFxLI6FvIE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646323305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FvSQ+7OuZydc8Kk+1+ILomXbr5tU3bNf1qZ/mx21liA=; b=SLT94H9falCiZM0BaYsx+tE+eYZXuDPbsnuerbU0H2sd6QQcAC5b78ZSRqEGAhZIYewT4XYQes07gIFSbIG12/2p0N+tr3rwYR2oLqL3byWVURWLLc9xVLKmgJNo8AUfP8mWSPr4/y5zwl7zW+lQL7av+Z6nxXRc/vqRF4g5zrE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646323305073947.4371914391512; Thu, 3 Mar 2022 08:01:45 -0800 (PST) Received: from localhost ([::1]:38530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPntg-00018o-Gk for importer@patchew.org; Thu, 03 Mar 2022 11:01:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnY2-0002Jz-O5 for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:39:22 -0500 Received: from [2a01:111:f400:fe08::722] (port=34694 helo=EUR03-AM5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnY0-0001Iw-4E for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:39:22 -0500 Received: from OL1P279CA0024.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:13::11) by AM5PR0901MB1617.eurprd09.prod.outlook.com (2603:10a6:203:4f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 15:39:16 +0000 Received: from HE1EUR02FT025.eop-EUR02.prod.protection.outlook.com (2603:10a6:e10:13:cafe::90) by OL1P279CA0024.outlook.office365.com (2603:10a6:e10:13::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.15 via Frontend Transport; Thu, 3 Mar 2022 15:39:16 +0000 Received: from nb-o365.localdomain (192.116.190.34) by HE1EUR02FT025.mail.protection.outlook.com (10.152.10.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:14 +0000 Received: from amirgonnen-vm.neuroblade.corp (amirgonnen-vm.neuroblade.corp [192.168.3.87]) by nb-o365.localdomain (Postfix) with ESMTP id 6BCD1212D7; Thu, 3 Mar 2022 17:38:59 +0200 (IST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BrzWt0nDKHrWcIPV2KyilCF9Jj046RVqsKcD0X50oXeMg2el9EPb4JqzaZPmgzTbN/Ts0bCMiFF9Jg4eBR1+9G5KypPCSvPzKdG2l+qPpBX/+7Y7wdwxeccV059xO0+I7C20jeXU+fDh8GFpbfmcB4psK1CrwblsV+mNm6Qvx1unhBaVVfWWqY8HTngmApm9Vy9f8TZ/d4SgdpHigoM9PNNabyBGC4W2bnMVtIFMQhyvS1+rSIQ3Fx7ugCrAOkhDczGa2UR3J5R42IjhCKNXPbilsmF4ouEjOTkCKa7NdajxhxO6UwmR7oTKz7HLI6NptxwT8DdqNTZZnFSWG1rNmQ== 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=FvSQ+7OuZydc8Kk+1+ILomXbr5tU3bNf1qZ/mx21liA=; b=eCivZXJrVH5szw5HWn35jRtLG0cWoSg6Z/6G3SrBJnqsqsTqUxHUQV4X5gwSo0O4xnMLz4XeiNUjSgQvIjPtAzWc0sIEOohn2uKmD6OVhh4JsAv29gURbK994G8PlsX6AevVxzkZ00hSD67H0K3k7UzT4J+E3uzWE/Jf4FbnRuwZ+XlMrgQHawQzRO9sDb+wjyzgbM36KTSxwcN2jR4v/HnRK/sW13HN3igB1C1S4NpTaBK+mZ810e4S9RYY2XnkkW+I89xH2Tl87GiKO2SR4dlbQ21/oaSQNsiiADrIzFR7sW1XhPxKtEX9uskCo6Ps8hQA3q5FQLz5L1TcWPu5gQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 192.116.190.34) smtp.rcpttodomain=denx.de smtp.mailfrom=neuroblade.ai; dmarc=none action=none header.from=neuroblade.ai; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=neuroblade.ai; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FvSQ+7OuZydc8Kk+1+ILomXbr5tU3bNf1qZ/mx21liA=; b=xD6XQUTYZZi0xbE8EEHD7QbN2/Za8+v1xDHMqo3dmpkjUswUwfOVueyCMdp7EPgYByWDnlydZilBA+cANJak8cuMGb1HBMdU9l9Zx7rRSf9QNSkjCEot864nlFLfDEEdU4a9FGzWLUBQ2v8Y8VqW0J2AuE3FXb5sh50bg0YOgkg= X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 192.116.190.34) smtp.mailfrom=neuroblade.ai; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=neuroblade.ai; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Fail (protection.outlook.com: domain of neuroblade.ai does not designate 192.116.190.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.116.190.34; helo=nb-o365.localdomain; From: Amir Gonnen To: qemu-devel@nongnu.org, Peter Maydell , Chris Wulff , Marek Vasut , Richard Henderson Subject: [PATCH v3 3/5] target/nios2: Exteral Interrupt Controller (EIC) Date: Thu, 3 Mar 2022 17:39:04 +0200 Message-Id: <20220303153906.2024748-4-amir.gonnen@neuroblade.ai> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> References: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fff34ca1-c0f7-4d7e-494b-08d9fd2bf8f3 X-MS-TrafficTypeDiagnostic: AM5PR0901MB1617:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JnOycWijuSDMUtMPY6HWudt9YVRSZXpzs7jxUs4O8pSg2J08yEYTN3v80isXZmhT9ScR8gNhccGwxTmx+PPLDE15L3UoD7etW5rlkrW8CQ9qwp52ENlSmJPMH8+NNPmFPOEgCegvrf0EpHJlITT3nRCC1QbaP3/N4+UgWb0wiaDMJw5mzVF2rrLb8n26hlW8IhdGn1jt54cyFo7YHapnRZPbFdLSIhn8KNaZo3YTGlq1IU/u6fIzIM0O7yj+2ySe1j0TmBz7R5NHuoJBRdgghqngpFo3JqTaBuYxcOF3O5Zb35/ykY62VqHFGpzPa59Gn6KOAVaVWAFpd1PM9zlhwgg4uk/yaiFSul7fsSW/heKy9ArvTK0q43HE7PhMGjoQ9fAG8Po16WbYJejqfwDZoLq+DX3RxOeEQStZeUfgSpUOCXFU1Nb+gsguui6KXtxoWqIFZSoPT15Ndldjcz1aWsU0YAKSQO/BkyDVzormvQoFFK+fFnMyfez2l84aciQcnZh+6W9FI+vlRNWqLNCO2ouBmucuzQWIqdX5Sz/l3f7l/ZvOLusw+YEoBU2W6blzay8qDqn6oLdD/5PH4amLstTtl8/WRWkbD4lxPa+DpG6tyQUeOSNJ6M+PxaQll3tjmiU2F5x861uJHykNorIU9Cv0D5idDJJwWM2FIEu/j+gp0DAUz9aJ9pAC1gZVO8ubERMZIxL7b9+lPvISdhSv2AitaRMBr2OjtRJFbyKeSjw= X-Forefront-Antispam-Report: CIP:192.116.190.34; CTRY:IL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:nb-o365.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(396003)(346002)(39840400004)(376002)(136003)(36840700001)(46966006)(36860700001)(316002)(47076005)(36756003)(86362001)(6666004)(110136005)(81166007)(40480700001)(356005)(508600001)(2906002)(8676002)(4326008)(107886003)(82310400004)(2616005)(6266002)(1076003)(44832011)(8936002)(336012)(5660300002)(83380400001)(70206006)(70586007)(26005)(186003)(27056005)(36900700001); DIR:OUT; SFP:1102; X-OriginatorOrg: neuroblade.ai X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 15:39:14.9875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fff34ca1-c0f7-4d7e-494b-08d9fd2bf8f3 X-MS-Exchange-CrossTenant-Id: 63c61203-65af-4cf8-98e5-d12f35edaefa X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=63c61203-65af-4cf8-98e5-d12f35edaefa; Ip=[192.116.190.34]; Helo=[nb-o365.localdomain] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT025.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0901MB1617 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:111:f400:fe08::722 (failed) Received-SPF: pass client-ip=2a01:111:f400:fe08::722; envelope-from=amir.gonnen@neuroblade.ai; helo=EUR03-AM5-obe.outbound.protection.outlook.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amir Gonnen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @neuroblade.ai) X-ZM-MESSAGEID: 1646323306681100001 Content-Type: text/plain; charset="utf-8" Implement Exteral Interrupt Controller interface (EIC). Added intc_present property, true by default. When set to false, nios2 uses the EIC interface when handling IRQ. When set to true (default) it uses the internal interrupt controller. When nios2 recieves irq, it first checks intc_present to decide whether to use the internal interrupt controller or the EIC. The EIC is triggered by IRQ gpio but also recieves additional data from the external interrupt controller (such as VIC): rha, ril, rrs and rnmi. The interrupt controller is expected to raise IRQ after setting these fields on Nios2CPU. rha, ril, rrs and rnmi are used when EIC handles external interrupt, in order to decide if to take the interrupt now, which shadow register set to use, which PC to jump to, whether to set NMI flag, etc. Signed-off-by: Amir Gonnen --- target/nios2/cpu.c | 54 ++++++++++++++++++++++++++++++++----------- target/nios2/cpu.h | 21 ++++++++++++++++- target/nios2/helper.c | 33 ++++++++++++++++++++++---- 3 files changed, 90 insertions(+), 18 deletions(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 026ee18b01..d09f20c8db 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -55,6 +55,7 @@ static void nios2_cpu_reset(DeviceState *dev) =20 memset(env->regs, 0, sizeof(uint32_t) * NUM_CORE_REGS); memset(env->shadow_regs, 0, sizeof(uint32_t) * NUM_REG_SETS * NUM_GP_R= EGS); + env->regs[CR_STATUS] |=3D CR_STATUS_RSIE; env->regs[R_PC] =3D cpu->reset_addr; =20 #if defined(CONFIG_USER_ONLY) @@ -65,6 +66,25 @@ static void nios2_cpu_reset(DeviceState *dev) #endif } =20 +static bool nios2_take_eic_irq(const Nios2CPU *cpu) +{ + const CPUNios2State *env =3D &cpu->env; + + if (cpu->rnmi) { + return !(env->regs[CR_STATUS] & CR_STATUS_NMI); + } + + if (((env->regs[CR_STATUS] & CR_STATUS_PIE) =3D=3D 0) || + (cpu->ril <=3D cpu_get_il(env)) || + (cpu->rrs =3D=3D cpu_get_crs(env) && + !(env->regs[CR_STATUS] & CR_STATUS_RSIE))) { + + return false; + } + + return true; +} + #ifndef CONFIG_USER_ONLY static void nios2_cpu_set_irq(void *opaque, int irq, int level) { @@ -91,13 +111,6 @@ static void nios2_cpu_initfn(Object *obj) #if !defined(CONFIG_USER_ONLY) mmu_init(&cpu->env); =20 - /* - * These interrupt lines model the IIC (internal interrupt - * controller). QEMU does not currently support the EIC - * (external interrupt controller) -- if we did it would be - * a separate device in hw/intc with a custom interface to - * the CPU, and boards using it would not wire up these IRQ lines. - */ qdev_init_gpio_in_named(DEVICE(cpu), nios2_cpu_set_irq, "IRQ", 32); #endif } @@ -131,13 +144,26 @@ static bool nios2_cpu_exec_interrupt(CPUState *cs, in= t interrupt_request) Nios2CPU *cpu =3D NIOS2_CPU(cs); CPUNios2State *env =3D &cpu->env; =20 - if ((interrupt_request & CPU_INTERRUPT_HARD) && - (env->regs[CR_STATUS] & CR_STATUS_PIE) && - (env->regs[CR_IPENDING] & env->regs[CR_IENABLE])) { - cs->exception_index =3D EXCP_IRQ; - nios2_cpu_do_interrupt(cs); - return true; + if (cpu->intc_present) { + if ((interrupt_request & CPU_INTERRUPT_HARD) && + (env->regs[CR_STATUS] & CR_STATUS_PIE) && + (env->regs[CR_IPENDING] & env->regs[CR_IENABLE])) { + cs->exception_index =3D EXCP_IRQ; + nios2_cpu_do_interrupt(cs); + return true; + } + } else { + /* + * IPENDING does not exist with external interrupt controller + * but we still use it to signal an external interrupt + */ + if (env->regs[CR_IPENDING] && nios2_take_eic_irq(cpu)) { + cs->exception_index =3D EXCP_IRQ; + nios2_cpu_do_interrupt(cs); + return true; + } } + return false; } #endif /* !CONFIG_USER_ONLY */ @@ -200,6 +226,8 @@ static Property nios2_properties[] =3D { DEFINE_PROP_UINT32("mmu_tlb_num_ways", Nios2CPU, tlb_num_ways, 16), /* ALTR,tlb-num-entries */ DEFINE_PROP_UINT32("mmu_pid_num_entries", Nios2CPU, tlb_num_entries, 2= 56), + /* interrupt-controller (internal) */ + DEFINE_PROP_BOOL("intc_present", Nios2CPU, intc_present, true), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index dbb4c968df..24d2d65aa9 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -92,11 +92,12 @@ struct Nios2CPUClass { #define CR_STATUS_U (1 << 1) #define CR_STATUS_EH (1 << 2) #define CR_STATUS_IH (1 << 3) -#define CR_STATUS_IL (63 << 4) +FIELD(CR_STATUS, IL, 4, 6) FIELD(CR_STATUS, CRS, 10, 6) FIELD(CR_STATUS, PRS, 16, 6) #define CR_STATUS_NMI (1 << 22) #define CR_STATUS_RSIE (1 << 23) +#define CR_STATUS_SRS (1 << 31) #define CR_ESTATUS (CR_BASE + 1) #define CR_BSTATUS (CR_BASE + 2) #define CR_IENABLE (CR_BASE + 3) @@ -187,6 +188,7 @@ struct Nios2CPU { CPUNios2State env; =20 bool mmu_present; + bool intc_present; uint32_t pid_num_bits; uint32_t tlb_num_ways; uint32_t tlb_num_entries; @@ -195,6 +197,12 @@ struct Nios2CPU { uint32_t reset_addr; uint32_t exception_addr; uint32_t fast_tlb_miss_addr; + + /* External Interrupt Controller Interface */ + uint32_t rha; /* Requested handler address */ + uint32_t ril; /* Requested interrupt level */ + uint32_t rrs; /* Requested register set */ + uint32_t rnmi; /* Requested nonmaskable interrupt */ }; =20 =20 @@ -253,6 +261,17 @@ static inline void cpu_get_tb_cpu_state(CPUNios2State = *env, target_ulong *pc, *flags =3D (env->regs[CR_STATUS] & (CR_STATUS_EH | CR_STATUS_U)); } =20 +static inline uint32_t cpu_get_il(const CPUNios2State *env) +{ + return FIELD_EX32(env->regs[CR_STATUS], CR_STATUS, IL); +} + +static inline void cpu_set_il(CPUNios2State *env, uint32_t value) +{ + env->regs[CR_STATUS] =3D + FIELD_DP32(env->regs[CR_STATUS], CR_STATUS, IL, value); +} + static inline uint32_t cpu_get_crs(const CPUNios2State *env) { return FIELD_EX32(env->regs[CR_STATUS], CR_STATUS, CRS); diff --git a/target/nios2/helper.c b/target/nios2/helper.c index e5c98650e1..bc022e969d 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -54,21 +54,46 @@ void nios2_cpu_do_interrupt(CPUState *cs) Nios2CPU *cpu =3D NIOS2_CPU(cs); CPUNios2State *env =3D &cpu->env; =20 + if (cs->exception_index !=3D EXCP_IRQ) { + cpu_set_crs(env, 0); + } + switch (cs->exception_index) { case EXCP_IRQ: assert(env->regs[CR_STATUS] & CR_STATUS_PIE); =20 qemu_log_mask(CPU_LOG_INT, "interrupt at pc=3D%x\n", env->regs[R_P= C]); =20 - env->regs[CR_ESTATUS] =3D env->regs[CR_STATUS]; - env->regs[CR_STATUS] |=3D CR_STATUS_IH; + uint32_t last_status =3D env->regs[CR_STATUS]; env->regs[CR_STATUS] &=3D ~(CR_STATUS_PIE | CR_STATUS_U); =20 env->regs[CR_EXCEPTION] &=3D ~(0x1F << 2); env->regs[CR_EXCEPTION] |=3D (cs->exception_index & 0x1F) << 2; =20 - env->regs[R_EA] =3D env->regs[R_PC] + 4; - env->regs[R_PC] =3D cpu->exception_addr; + if (!cpu->intc_present) { + cpu_set_crs(env, cpu->rrs); + cpu_set_il(env, cpu->ril); + if (cpu->rnmi) { + env->regs[CR_STATUS] |=3D CR_STATUS_NMI; + } else { + env->regs[CR_STATUS] &=3D ~CR_STATUS_NMI; + } + if (cpu->rrs =3D=3D 0) { + env->regs[CR_ESTATUS] =3D last_status; + } else { + env->regs[R_SSTATUS] =3D last_status; + env->regs[R_SSTATUS] |=3D CR_STATUS_SRS; + } + env->regs[CR_STATUS] |=3D CR_STATUS_IH; + env->regs[R_EA] =3D env->regs[R_PC] + 4; + env->regs[R_PC] =3D cpu->rha; + + } else { + env->regs[CR_ESTATUS] =3D last_status; + env->regs[R_EA] =3D env->regs[R_PC] + 4; + env->regs[R_PC] =3D cpu->exception_addr; + } + break; =20 case EXCP_TLBD: --=20 2.25.1 From nobody Tue May 14 20:28:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) ARC-Seal: i=2; a=rsa-sha256; t=1646323633; cv=pass; d=zohomail.com; s=zohoarc; b=Od+uSayl7YbcFSZFNgN+zIEB+tOUnFilFpjHMbyOar4/GD5V3M0POlnOYoFy1jQrA3eTS8VVF9tWiYt4ujgXjN+IAtSgNYWAz5xYRp6ry340TlNRJSrRxbt5b41Zh0IkwtfO7SHJol+o5IZzd76r1WTol0AO/FmKEA20DH4bVWw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646323633; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pDMnew4MZZVrhJUCSupMHmST/BoGSBa4NBKL4vr9Q8w=; b=dWM3kJT+Y3N8oG14ZOjjKWcAydhZhYqDfoB7V3ANDF/bQrbCpKeP/SysFFnJNW213Scy1eEqNO+NkmRVDhtZlvTOOnWRJGCSzk2DsWKaw29yT7couCkW2TxNJ1c2b2JrNmU+Ubc0KsluXt8vxKzppMpgno98h/Y6SPrSa933WZI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646323632895228.41368809161122; Thu, 3 Mar 2022 08:07:12 -0800 (PST) Received: from localhost ([::1]:50660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPnyx-0001H6-Ny for importer@patchew.org; Thu, 03 Mar 2022 11:07:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnmB-0003Gr-KU for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:54:00 -0500 Received: from [2a01:111:f400:fe06::709] (port=27107 helo=EUR02-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnm8-0005GJ-CF for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:53:58 -0500 Received: from AS9P194CA0005.EURP194.PROD.OUTLOOK.COM (2603:10a6:20b:46d::13) by DB8PR09MB4074.eurprd09.prod.outlook.com (2603:10a6:10:127::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 15:39:17 +0000 Received: from AM5EUR02FT003.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:46d:cafe::91) by AS9P194CA0005.outlook.office365.com (2603:10a6:20b:46d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:17 +0000 Received: from nb-o365.localdomain (192.116.190.34) by AM5EUR02FT003.mail.protection.outlook.com (10.152.8.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:14 +0000 Received: from amirgonnen-vm.neuroblade.corp (amirgonnen-vm.neuroblade.corp [192.168.3.87]) by nb-o365.localdomain (Postfix) with ESMTP id 79AF4212D8; Thu, 3 Mar 2022 17:38:59 +0200 (IST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=imAfG7QLKKU74mmw9ml9DCZLbye9rZp0sT/6L7t8BJ/Wd/bXs3xXhzpSZg45m/9xRYSqYQEo8V67nEzEynO72M9BwJXIJRKFyVKd9JGKqxwY/5IHgO9YmzQCE1CnHoeVWSsknr+FN3jW3cZv7l4ukyF7ICFL5CCjeHJUNCaiLrNSU7r9cWpwEufJavKZKYM12NpNsyCnkmq5QVDS9SwEpel9eHCfrJMefyhLzmrWOrYn/hPX+FXKXoLiHbfvs8OxJiMIB25pmWohrxHwnoISHGWmveL8kHJ5iRgBpe6R2IoRMsFb4zdVcCZrG/aG4NyvF4xXeG0R1EzlGJhovZElQg== 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=pDMnew4MZZVrhJUCSupMHmST/BoGSBa4NBKL4vr9Q8w=; b=dUo0NkV5PcRq2khhYXZOs5wJ+sYATHJhVmnY5UbAq0GS1UEYeVt0HDD0DOgu00smqleouxHdx7uESP/fgZrZveGipd5YPZcwOGVaQ4EW4FfXGk0CcbXEup5qiW+xEWUzXeT2KghVtF/5k6yFMqs3ZCoFj54i0YDl6bBKthN3zUAJbIL7VzcLwvxg/hr9x1FQr321lrQwRsmFKYtwHdLYHt5yF6rFTR6pQkQLdu5Q7c5UjBcz28sDfXP8NbLpWTUYRgUi6U/HYPVl0Mz6G1RXqESpBXrVIa7FaXZLiHrmA2vj/lXwtGO6SoBpFJm3Ta1FY7gsvZSmsRYZ1FFpCH0U1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 192.116.190.34) smtp.rcpttodomain=denx.de smtp.mailfrom=neuroblade.ai; dmarc=none action=none header.from=neuroblade.ai; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=neuroblade.ai; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pDMnew4MZZVrhJUCSupMHmST/BoGSBa4NBKL4vr9Q8w=; b=OeexDnENOhSjUB8X7VCCafwGCQf+qsVxmNmd86XFuO8Yz/GCHGpyMyYa0zmLbLpfYhAQFXJpnpypaShJLogzBMOGFvpPlYT+kKldSpiZocGXhSaKSKbAak5tH9ZMz8UgmSwSqiR5yGcSHavboHQfImvcA4ZcdyJXZLgK5i2dZwI= X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 192.116.190.34) smtp.mailfrom=neuroblade.ai; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=neuroblade.ai; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Fail (protection.outlook.com: domain of neuroblade.ai does not designate 192.116.190.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.116.190.34; helo=nb-o365.localdomain; From: Amir Gonnen To: qemu-devel@nongnu.org, Peter Maydell , Chris Wulff , Marek Vasut , Richard Henderson Subject: [PATCH v3 4/5] hw/intc: Vectored Interrupt Controller (VIC) Date: Thu, 3 Mar 2022 17:39:05 +0200 Message-Id: <20220303153906.2024748-5-amir.gonnen@neuroblade.ai> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> References: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ffb338b-53c3-4781-6072-08d9fd2bf8e1 X-MS-TrafficTypeDiagnostic: DB8PR09MB4074:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QDzLABmLhoqZ2HxiEZJB7buWg8XY8KuxIBAhM20Z/xL/Qu63gwCDYO+KvkD5Onj7VCa9kRgv/HGuFhmci10OH0OWFsumf0+6KzoKrntMGM3KFv5qkSk1egNhv1ZSnNONZGpgXzu8pjYY9YQQ2u6lXFZcUmLIdlnuHU4zXuT03ULDLw+ifNqr4m8OzstcuNG8cZ2GS/Ldwsq2fOZU/bt703tFEC8j0zA01V/fmGP9w1kIVvToaLtOROTblXNE4qLkylAoL3aub5HOwcTZ1BQpjBt/kIbo+YjJVCBnjRXs67K1rIh/WpHhmGhHgrlW6CPigWm9H7+V4rSJ/DtvtQkxNqBC/yrPZ83Ag0EdT1UJGhXFp3pcEyDYNpz6YoErjcP6KVexy40S+QvCwCTRvIYvBhaXmG/qRrgTWitcYwGWBd3dQCwWdzUcfEu0r/MDtK7X2vHPBLNgUKbJyn46GPupurk3qPbRa49SbYmZDspy3aWRj2I/gMlNtS+XKONuuQGSq1zxFjfdEtMDQxg9ig6gwXMKTNbE/RoFAG3pdeCbP4bIIWewmAj9Vc6mkGpO8yJS+ItEngPE+uqOx/iJVEWboz8ruWp1Afd6nGxSUSB0kJ7CbGrbZP44VU+hple7QwLrLxuy3gsQthY9VkyqCy1kqGYr2MIRjIxLLhtLc7zObAFfknTLRLiRRPx8BQzcaKFEisrMMpKJmjPcsshB2zU1jSVr23Duh9NjC7uxErlIiIOYwW9UhnwODjk0R7gmkTGxb68dFAd2+QfLxbJlnfA2yCJELJw+h+8/Gujw+DEESNZsz/W3o3IWvJEQjzBDE03o X-Forefront-Antispam-Report: CIP:192.116.190.34; CTRY:IL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:nb-o365.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(39840400004)(136003)(396003)(376002)(346002)(46966006)(36840700001)(82310400004)(2906002)(186003)(356005)(336012)(81166007)(6266002)(110136005)(44832011)(5660300002)(30864003)(8936002)(4326008)(8676002)(70586007)(6666004)(70206006)(1076003)(107886003)(86362001)(316002)(2616005)(36756003)(508600001)(47076005)(40480700001)(36860700001)(966005)(83380400001)(26005)(36900700001)(27056005); DIR:OUT; SFP:1102; X-OriginatorOrg: neuroblade.ai X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 15:39:14.8914 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ffb338b-53c3-4781-6072-08d9fd2bf8e1 X-MS-Exchange-CrossTenant-Id: 63c61203-65af-4cf8-98e5-d12f35edaefa X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=63c61203-65af-4cf8-98e5-d12f35edaefa; Ip=[192.116.190.34]; Helo=[nb-o365.localdomain] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT003.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR09MB4074 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:111:f400:fe06::709 (failed) Received-SPF: pass client-ip=2a01:111:f400:fe06::709; envelope-from=amir.gonnen@neuroblade.ai; helo=EUR02-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amir Gonnen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @neuroblade.ai) X-ZM-MESSAGEID: 1646323636448100001 Implement nios2 Vectored Interrupt Controller (VIC). VIC is connected to EIC. It needs to update rha, ril, rrs and rnmi fields on Nios2CPU before raising an IRQ. For that purpose, VIC has a "cpu" property which should refer to the nios2 cpu and set by the board that connects VIC. Signed-off-by: Amir Gonnen Reviewed-by: Peter Maydell --- hw/intc/Kconfig | 3 + hw/intc/meson.build | 1 + hw/intc/nios2_vic.c | 341 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 345 insertions(+) create mode 100644 hw/intc/nios2_vic.c diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 528e77b4a6..0a8e8d1d84 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -81,3 +81,6 @@ config GOLDFISH_PIC =20 config M68K_IRQC bool + +config NIOS2_VIC + bool diff --git a/hw/intc/meson.build b/hw/intc/meson.build index d953197413..c33b075859 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -61,3 +61,4 @@ specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], if_true: files('spapr_xive_kvm.c')) specific_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.= c')) specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c')) +specific_ss.add(when: 'CONFIG_NIOS2_VIC', if_true: files('nios2_vic.c')) diff --git a/hw/intc/nios2_vic.c b/hw/intc/nios2_vic.c new file mode 100644 index 0000000000..b59d3f6f4c --- /dev/null +++ b/hw/intc/nios2_vic.c @@ -0,0 +1,341 @@ +/* + * Vectored Interrupt Controller for nios2 processor + * + * Copyright (c) 2022 Neuroblade + * + * Interface: + * QOM property "cpu": link to the Nios2 CPU (must be set) + * Unnamed GPIO inputs 0..NIOS2_VIC_MAX_IRQ-1: input IRQ lines + * IRQ should be connected to nios2 IRQ0. + * + * Reference: "Embedded Peripherals IP User Guide + * for Intel=C2=AE Quartus=C2=AE Prime Design Suite: 21.4" + * Chapter 38 "Vectored Interrupt Controller Core" + * See: https://www.intel.com/content/www/us/en/docs/programmable/683130/2= 1-4/vectored-interrupt-controller-core.html + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" + +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "hw/sysbus.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "qom/object.h" +#include "cpu.h" + +#define TYPE_NIOS2_VIC "nios2-vic" + +OBJECT_DECLARE_SIMPLE_TYPE(Nios2Vic, NIOS2_VIC) + +#define NIOS2_VIC_MAX_IRQ 32 + +enum { + INT_CONFIG0 =3D 0, + INT_CONFIG31 =3D 31, + INT_ENABLE =3D 32, + INT_ENABLE_SET =3D 33, + INT_ENABLE_CLR =3D 34, + INT_PENDING =3D 35, + INT_RAW_STATUS =3D 36, + SW_INTERRUPT =3D 37, + SW_INTERRUPT_SET =3D 38, + SW_INTERRUPT_CLR =3D 39, + VIC_CONFIG =3D 40, + VIC_STATUS =3D 41, + VEC_TBL_BASE =3D 42, + VEC_TBL_ADDR =3D 43, + CSR_COUNT /* Last! */ +}; + +struct Nios2Vic { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + qemu_irq output_int; + + /* properties */ + CPUState *cpu; + MemoryRegion csr; + + uint32_t int_config[32]; + uint32_t vic_config; + uint32_t int_raw_status; + uint32_t int_enable; + uint32_t sw_int; + uint32_t vic_status; + uint32_t vec_tbl_base; + uint32_t vec_tbl_addr; +}; + +/* Requested interrupt level (INT_CONFIG[0:5]) */ +static inline uint32_t vic_int_config_ril(const Nios2Vic *vic, int irq_num) +{ + return extract32(vic->int_config[irq_num], 0, 6); +} + +/* Requested NMI (INT_CONFIG[6]) */ +static inline uint32_t vic_int_config_rnmi(const Nios2Vic *vic, int irq_nu= m) +{ + return extract32(vic->int_config[irq_num], 6, 1); +} + +/* Requested register set (INT_CONFIG[7:12]) */ +static inline uint32_t vic_int_config_rrs(const Nios2Vic *vic, int irq_num) +{ + return extract32(vic->int_config[irq_num], 7, 6); +} + +static inline uint32_t vic_config_vec_size(const Nios2Vic *vic) +{ + return 1 << (2 + extract32(vic->vic_config, 0, 3)); +} + +static inline uint32_t vic_int_pending(const Nios2Vic *vic) +{ + return (vic->int_raw_status | vic->sw_int) & vic->int_enable; +} + +static void vic_update_irq(Nios2Vic *vic) +{ + Nios2CPU *cpu =3D NIOS2_CPU(vic->cpu); + uint32_t pending =3D vic_int_pending(vic); + int irq =3D -1; + int max_ril =3D 0; + /* Note that if RIL is 0 for an interrupt it is effectively disabled */ + + vic->vec_tbl_addr =3D 0; + vic->vic_status =3D 0; + + if (pending =3D=3D 0) { + qemu_irq_lower(vic->output_int); + return; + } + + for (int i =3D 0; i < NIOS2_VIC_MAX_IRQ; i++) { + if (pending & BIT(i)) { + int ril =3D vic_int_config_ril(vic, i); + if (ril > max_ril) { + irq =3D i; + max_ril =3D ril; + } + } + } + + if (irq < 0) { + qemu_irq_lower(vic->output_int); + return; + } + + vic->vec_tbl_addr =3D irq * vic_config_vec_size(vic) + vic->vec_tbl_ba= se; + vic->vic_status =3D irq | BIT(31); + + /* + * In hardware, the interface between the VIC and the CPU is via the + * External Interrupt Controller interface, where the interrupt contro= ller + * presents the CPU with a packet of data containing: + * - Requested Handler Address (RHA): 32 bits + * - Requested Register Set (RRS) : 6 bits + * - Requested Interrupt Level (RIL) : 6 bits + * - Requested NMI flag (RNMI) : 1 bit + * In our emulation, we implement this by writing the data directly to + * fields in the CPU object and then raising the IRQ line to tell + * the CPU that we've done so. + */ + + cpu->rha =3D vic->vec_tbl_addr; + cpu->ril =3D max_ril; + cpu->rrs =3D vic_int_config_rrs(vic, irq); + cpu->rnmi =3D vic_int_config_rnmi(vic, irq); + + qemu_irq_raise(vic->output_int); +} + +static void vic_set_irq(void *opaque, int irq_num, int level) +{ + Nios2Vic *vic =3D opaque; + + if (level) { + vic->int_raw_status |=3D BIT(irq_num); + } else { + vic->int_raw_status &=3D ~BIT(irq_num); + } + + vic_update_irq(vic); +} + +static void nios2_vic_reset(DeviceState *dev) +{ + Nios2Vic *vic =3D NIOS2_VIC(dev); + memset(&vic->int_config, 0, sizeof(vic->int_config)); + vic->vic_config =3D 0; + vic->int_raw_status =3D 0; + vic->int_enable =3D 0; + vic->sw_int =3D 0; + vic->vic_status =3D 0; + vic->vec_tbl_base =3D 0; + vic->vec_tbl_addr =3D 0; +} + +static uint64_t nios2_vic_csr_read(void *opaque, hwaddr offset, unsigned s= ize) +{ + Nios2Vic *vic =3D opaque; + int index =3D offset / 4; + + switch (index) { + case INT_CONFIG0 ... INT_CONFIG31: + return vic->int_config[index - INT_CONFIG0]; + case INT_ENABLE: + return vic->int_enable; + case INT_PENDING: + return vic_int_pending(vic); + case INT_RAW_STATUS: + return vic->int_raw_status; + case SW_INTERRUPT: + return vic->sw_int; + case VIC_CONFIG: + return vic->vic_config; + case VIC_STATUS: + return vic->vic_status; + case VEC_TBL_BASE: + return vic->vec_tbl_base; + case VEC_TBL_ADDR: + return vic->vec_tbl_addr; + default: + return 0; + } +} + +static void nios2_vic_csr_write(void *opaque, hwaddr offset, uint64_t valu= e, + unsigned size) +{ + Nios2Vic *vic =3D opaque; + int index =3D offset / 4; + + switch (index) { + case INT_CONFIG0 ... INT_CONFIG31: + vic->int_config[index - INT_CONFIG0] =3D value; + break; + case INT_ENABLE: + vic->int_enable =3D value; + break; + case INT_ENABLE_SET: + vic->int_enable |=3D value; + break; + case INT_ENABLE_CLR: + vic->int_enable &=3D ~value; + break; + case SW_INTERRUPT: + vic->sw_int =3D value; + break; + case SW_INTERRUPT_SET: + vic->sw_int |=3D value; + break; + case SW_INTERRUPT_CLR: + vic->sw_int &=3D ~value; + break; + case VIC_CONFIG: + vic->vic_config =3D value; + break; + case VEC_TBL_BASE: + vic->vec_tbl_base =3D value; + break; + default: + qemu_log_mask(LOG_GUEST_ERROR, + "nios2-vic: write to invalid CSR address 0x%x\n", (int)offset); + } + + vic_update_irq(vic); +} + +static const MemoryRegionOps nios2_vic_csr_ops =3D { + .read =3D nios2_vic_csr_read, + .write =3D nios2_vic_csr_write, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { .min_access_size =3D 4, .max_access_size =3D 4 } +}; + +static void nios2_vic_realize(DeviceState *dev, Error **errp) +{ + Nios2Vic *vic =3D NIOS2_VIC(dev); + + if (!vic->cpu) { + /* This is a programming error in the code using this device */ + error_setg(errp, "nios2-vic 'cpu' link property was not set"); + return; + } + + sysbus_init_irq(SYS_BUS_DEVICE(dev), &vic->output_int); + qdev_init_gpio_in(dev, vic_set_irq, NIOS2_VIC_MAX_IRQ); + + memory_region_init_io(&vic->csr, OBJECT(dev), &nios2_vic_csr_ops, vic, + "nios2.vic.csr", CSR_COUNT * sizeof(uint32_t)); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &vic->csr); +} + +static Property nios2_vic_properties[] =3D { + DEFINE_PROP_LINK("cpu", Nios2Vic, cpu, TYPE_CPU, CPUState *), + DEFINE_PROP_END_OF_LIST() +}; + +static const VMStateDescription nios2_vic_vmstate =3D { + .name =3D "nios2-vic", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]){ + VMSTATE_UINT32_ARRAY(int_config, Nios2Vic, 32), + VMSTATE_UINT32(vic_config, Nios2Vic), + VMSTATE_UINT32(int_raw_status, Nios2Vic), + VMSTATE_UINT32(int_enable, Nios2Vic), + VMSTATE_UINT32(sw_int, Nios2Vic), + VMSTATE_UINT32(vic_status, Nios2Vic), + VMSTATE_UINT32(vec_tbl_base, Nios2Vic), + VMSTATE_UINT32(vec_tbl_addr, Nios2Vic), + VMSTATE_END_OF_LIST() + }, +}; + +static void nios2_vic_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D nios2_vic_reset; + dc->realize =3D nios2_vic_realize; + dc->vmsd =3D &nios2_vic_vmstate; + device_class_set_props(dc, nios2_vic_properties); +} + +static const TypeInfo nios2_vic_info =3D { + .name =3D TYPE_NIOS2_VIC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(Nios2Vic), + .class_init =3D nios2_vic_class_init, +}; + +static void nios2_vic_register_types(void) +{ + type_register_static(&nios2_vic_info); +} + +type_init(nios2_vic_register_types); --=20 2.25.1 From nobody Tue May 14 20:28:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) ARC-Seal: i=2; a=rsa-sha256; t=1646323878; cv=pass; d=zohomail.com; s=zohoarc; b=Qg2rAxFSQpW3pi0aqLDmzmTlTTn/WPruZlmWiqoa4hABVs8/B0hQhmncnUKW2oxuZe1/ZAK+7SEKaxDtujl3Rw/SMH1bOFWmzwHB08RAJZVZPr+XO5z6cBmBc7nofOKRSsDq9uQcjb8dQlLYjEYXQ5yYurA7TwsxcqLAAzSRt/I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646323878; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wPSVYKVE+bOznm2xZGglxeOAZMqhgEfH1a1c8UMIJnU=; b=KZcGG+Vt8czmBRKYaKTBhm6C0X9F2/qg9wyQqAZy/YISRNuGQSB0CIn15V6Lad44t+aqLb9LtPAcBWHftJPq+h185f8wIEIXWjXpjY5Uf1JZxsYlU1ZrLd2m5CFFcg22f5gLg+E1hYaHcW052JQtrEDNjvkQt5NkMNilRgCnjKw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=neuroblade.ai) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646323878519724.2801898628883; Thu, 3 Mar 2022 08:11:18 -0800 (PST) Received: from localhost ([::1]:34594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nPo2v-0001GW-Q9 for importer@patchew.org; Thu, 03 Mar 2022 11:11:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnn4-0004ks-JK for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:54:54 -0500 Received: from [2a01:111:f400:7d00::70f] (port=7905 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPnn2-0005Mq-UY for qemu-devel@nongnu.org; Thu, 03 Mar 2022 10:54:54 -0500 Received: from AS9PR07CA0015.eurprd07.prod.outlook.com (2603:10a6:20b:46c::19) by VI1PR09MB4334.eurprd09.prod.outlook.com (2603:10a6:800:15b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 3 Mar 2022 15:39:16 +0000 Received: from AM5EUR02FT015.eop-EUR02.prod.protection.outlook.com (2603:10a6:20b:46c:cafe::2d) by AS9PR07CA0015.outlook.office365.com (2603:10a6:20b:46c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.4 via Frontend Transport; Thu, 3 Mar 2022 15:39:16 +0000 Received: from nb-o365.localdomain (192.116.190.34) by AM5EUR02FT015.mail.protection.outlook.com (10.152.8.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Thu, 3 Mar 2022 15:39:16 +0000 Received: from amirgonnen-vm.neuroblade.corp (amirgonnen-vm.neuroblade.corp [192.168.3.87]) by nb-o365.localdomain (Postfix) with ESMTP id 8662C21303; Thu, 3 Mar 2022 17:38:59 +0200 (IST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hSY0vAkAUB4I1+G9NN51J6XDzBB8dYk5cJxxX1ddvNA1c8bfeuWPINzZgLHueXJq9P4KQdsjmaEvHMsdQH2hbiqlwlNKHcafjcpZ5gQiA95d6DPF6CrOcQxMOdfACTuTcOhcngvi/lkfjQXje6ZkRccwwFFIYDMqVd0JEIBgLq/ettPpO8fvK7HHsuyDietcceVOxS61piw7kxLjDn7oYl6a8M4BXxLEign4Ym1yG5nEM7ckZUhxy4PCBhVp9PBV3PYXsTA7ZGcrdvXZySHfj7xJDLcEXOnl6CJ1RUrum+G4Unk1253c1iEeZg6Xbp/+aQqOEfiPriuAoWWKDHO1HA== 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=wPSVYKVE+bOznm2xZGglxeOAZMqhgEfH1a1c8UMIJnU=; b=ciEaYQwLRv00uV7LEA4CT/+9DH3u/fZsAmOB6bIffhgQQzuNeASjLnkdf12WebSN0YyVHUxj98Zljhj+jPbK0vvFRGEg1wfXICmGVcKpBCBzyamaKcoOWkq8Iq9ZXp3/8r9ukok7wi1DI3lII6drsbQpsswM0UEwcSDcd/MXCQAVk2nC9sqSYtradTTkb2LQwQr1bMGvD/6MWpKc5SN/1ru9s211BgjFE5iYHoCjNRSZjUEGhHe8Em7jVl55eIzP939p4avY+UKV9DFUnKb6FQ9pOQvjajgYWto2DwSweAQlJdXaLCQO51lxZ2I4WdKIzqN4LiUhgICfXJJKVw5nOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 192.116.190.34) smtp.rcpttodomain=denx.de smtp.mailfrom=neuroblade.ai; dmarc=none action=none header.from=neuroblade.ai; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=neuroblade.ai; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wPSVYKVE+bOznm2xZGglxeOAZMqhgEfH1a1c8UMIJnU=; b=rc4lczrPCioxP8LBo8Q3qCIwWxcqTfe/9KvJg1dqO006FgBg/zYuvCMCOJgOUlK6/uXzE+oDJi+KEy6CJ4xhv6Lv3AV2Si12s90w82CIRa1Tt7hEvT0VTH/m2b1LE5J9h9pPlbWA6rLLF1mclxxPs67a79i5ShP4WML0/JQI8ZU= X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 192.116.190.34) smtp.mailfrom=neuroblade.ai; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=neuroblade.ai; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Fail (protection.outlook.com: domain of neuroblade.ai does not designate 192.116.190.34 as permitted sender) receiver=protection.outlook.com; client-ip=192.116.190.34; helo=nb-o365.localdomain; From: Amir Gonnen To: qemu-devel@nongnu.org, Peter Maydell , Chris Wulff , Marek Vasut , Richard Henderson Subject: [PATCH v3 5/5] hw/nios2: Machine with a Vectored Interrupt Controller Date: Thu, 3 Mar 2022 17:39:06 +0200 Message-Id: <20220303153906.2024748-6-amir.gonnen@neuroblade.ai> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> References: <20220303153906.2024748-1-amir.gonnen@neuroblade.ai> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dea22d16-1dfc-4b41-5c3c-08d9fd2bf9e3 X-MS-TrafficTypeDiagnostic: VI1PR09MB4334:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HhMkvN3pXNNFK5FNdwt4rqYNmdM6DFAhYwPIN/sf+F/obKYhNnDWG5eQsB8AtKdyxT28knlPEOct3fF5XQE8bMMgYxhAllCygOy+8H62qPLnKb/TSIfp/6JTEcKDMtq5c8Hy8I2aPwyPkWea/ejsaIGP8ZjPlylRCe7wc0UuD98GGRrHe6hRt3dT3jGWRGPyXMuE0W2Bsbl5NmbAinHEkZs5ZbPDyfWZ1OFKKJU1nX9eHEFHEz14PybWCYwP+1Ssu6hlNEB3/H6fpkQGg2o+Qm8Zd3/3fNgT+QfjmEvjOl5xVw3trm5rT37rIQmlNXHxPB1nsR/xRuhQqMCXfKgZ/aS9YOaButZQeUuFDV4E5Ed2JJwry8PWjfTF4YyuOPKLsD5S1+OUknQcVP0MutAZYWBqkZ+M+Z6SL9/D0VLl4mxCPMI5C1Uvpt4FByw7Hlbk35CjJj22UzGzDUj2et5J/7C6SsROKz/CRt+lG95x0xgQVNxMHwxAJTNaThgCLwaI/wOk+UNLpKFj5zODAY49hVDLB1/IKFlaLt2ePS1p0Wi1RsQDeHR1nqo8g0ZwhG9Qt4u32PCBTjwxyzYCVfm4KXbH7HrSC9BG9TYPRCj6rMjH/5seSUxfdQqeInHu8bZQghpUp5qSTKWFfBVtCLXei2soWThybmcEKLf/pflL2xPez07mEdf0RoyhJqEZGSqMJe+w83Y78soMsNx2RM1EM7vzHA3d+wzu9iJcFWnGhro= X-Forefront-Antispam-Report: CIP:192.116.190.34; CTRY:IL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:nb-o365.localdomain; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(376002)(346002)(396003)(39840400004)(136003)(46966006)(36840700001)(26005)(82310400004)(2906002)(36756003)(6266002)(1076003)(36860700001)(186003)(6666004)(336012)(83380400001)(4326008)(107886003)(5660300002)(44832011)(47076005)(8936002)(70586007)(70206006)(86362001)(8676002)(2616005)(508600001)(110136005)(40480700001)(81166007)(356005)(316002)(36900700001)(27056005); DIR:OUT; SFP:1102; X-OriginatorOrg: neuroblade.ai X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 15:39:16.5765 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dea22d16-1dfc-4b41-5c3c-08d9fd2bf9e3 X-MS-Exchange-CrossTenant-Id: 63c61203-65af-4cf8-98e5-d12f35edaefa X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=63c61203-65af-4cf8-98e5-d12f35edaefa; Ip=[192.116.190.34]; Helo=[nb-o365.localdomain] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT015.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR09MB4334 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a01:111:f400:7d00::70f (failed) Received-SPF: pass client-ip=2a01:111:f400:7d00::70f; envelope-from=amir.gonnen@neuroblade.ai; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amir Gonnen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @neuroblade.ai) X-ZM-MESSAGEID: 1646323880890100001 Content-Type: text/plain; charset="utf-8" Demonstrate how to use nios2 VIC on a machine. Introduce a new machine "10m50-ghrd-vic" which is based on "10m50-ghrd" with a VIC attached and internal interrupt controller removed. When VIC is present, irq0 connects the VIC to the cpu, intc_present is set to false to disable the internal interrupt controller, and the devices on the machine are attached to the VIC (and not directly to cpu). To allow VIC update EIC fields, we set the "cpu" property of the VIC with a reference to the nios2 cpu. Signed-off-by: Amir Gonnen --- hw/nios2/10m50_devboard.c | 64 ++++++++++++++++++++++++++++++++++++--- hw/nios2/Kconfig | 1 + 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c index 3d1205b8bd..9f62a2993f 100644 --- a/hw/nios2/10m50_devboard.c +++ b/hw/nios2/10m50_devboard.c @@ -36,10 +36,23 @@ =20 #include "boot.h" =20 +#define TYPE_NIOS2_MACHINE MACHINE_TYPE_NAME("10m50-ghrd") +typedef struct Nios2MachineClass Nios2MachineClass; +DECLARE_OBJ_CHECKERS(MachineState, Nios2MachineClass, + NIOS2_MACHINE, TYPE_NIOS2_MACHINE) + #define BINARY_DEVICE_TREE_FILE "10m50-devboard.dtb" =20 +struct Nios2MachineClass { + MachineClass parent_obj; + + bool vic; +}; + static void nios2_10m50_ghrd_init(MachineState *machine) { + Nios2MachineClass *nmc =3D NIOS2_MACHINE_GET_CLASS(machine); + Nios2CPU *cpu; DeviceState *dev; MemoryRegion *address_space_mem =3D get_system_memory(); @@ -74,8 +87,24 @@ static void nios2_10m50_ghrd_init(MachineState *machine) =20 /* Create CPU -- FIXME */ cpu =3D NIOS2_CPU(cpu_create(TYPE_NIOS2_CPU)); - for (i =3D 0; i < 32; i++) { - irq[i] =3D qdev_get_gpio_in_named(DEVICE(cpu), "IRQ", i); + + if (nmc->vic) { + DeviceState *dev =3D qdev_new("nios2-vic"); + + object_property_set_link(OBJECT(dev), "cpu", OBJECT(cpu), &error_f= atal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + cpu->intc_present =3D false; + qemu_irq cpu_irq =3D qdev_get_gpio_in_named(DEVICE(cpu), "IRQ", 0); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq); + for (int i =3D 0; i < 32; i++) { + irq[i] =3D qdev_get_gpio_in(dev, i); + } + MemoryRegion *dev_mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev= ), 0); + memory_region_add_subregion(address_space_mem, 0x18002000, dev_mr); + } else { + for (i =3D 0; i < 32; i++) { + irq[i] =3D qdev_get_gpio_in_named(DEVICE(cpu), "IRQ", i); + } } =20 /* Register: Altera 16550 UART */ @@ -105,11 +134,38 @@ static void nios2_10m50_ghrd_init(MachineState *machi= ne) BINARY_DEVICE_TREE_FILE, NULL); } =20 -static void nios2_10m50_ghrd_machine_init(struct MachineClass *mc) +static void nios2_10m50_ghrd_machine_class_init(ObjectClass *oc, void *dat= a) { + MachineClass *mc =3D MACHINE_CLASS(oc); + Nios2MachineClass *nmc =3D NIOS2_MACHINE_CLASS(oc); mc->desc =3D "Altera 10M50 GHRD Nios II design"; mc->init =3D nios2_10m50_ghrd_init; mc->is_default =3D true; + nmc->vic =3D false; } =20 -DEFINE_MACHINE("10m50-ghrd", nios2_10m50_ghrd_machine_init); +static void nios2_10m50_ghrd_vic_machine_class_init(ObjectClass *oc, void = *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + Nios2MachineClass *nmc =3D NIOS2_MACHINE_CLASS(oc); + mc->desc =3D "Altera 10M50 GHRD Nios II design with VIC"; + mc->init =3D nios2_10m50_ghrd_init; + mc->is_default =3D false; + nmc->vic =3D true; +} + +static const TypeInfo nios_machine_types[] =3D { + { + .name =3D MACHINE_TYPE_NAME("10m50-ghrd"), + .parent =3D TYPE_MACHINE, + .class_size =3D sizeof(Nios2MachineClass), + .class_init =3D nios2_10m50_ghrd_machine_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("10m50-ghrd-vic"), + .parent =3D TYPE_MACHINE, + .class_size =3D sizeof(Nios2MachineClass), + .class_init =3D nios2_10m50_ghrd_vic_machine_class_init, + } +}; + +DEFINE_TYPES(nios_machine_types) diff --git a/hw/nios2/Kconfig b/hw/nios2/Kconfig index b10ea640da..4748ae27b6 100644 --- a/hw/nios2/Kconfig +++ b/hw/nios2/Kconfig @@ -3,6 +3,7 @@ config NIOS2_10M50 select NIOS2 select SERIAL select ALTERA_TIMER + select NIOS2_VIC =20 config NIOS2_GENERIC_NOMMU bool --=20 2.25.1