From nobody Sat May 4 07:29:21 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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-Seal: i=1; a=rsa-sha256; t=1585652060; cv=none; d=zohomail.com; s=zohoarc; b=fwB+WnukgzRZqmtDFxQEONs4db03BECXUypcXd/d0KNGkOmvpBzo+2PtLzR9TMWc2vRtMNGw01w7tV02bPIwzLG4iM0fWpYzHJc5wyx9+MUtLiYSeyqQv7OgQPOjBJJEjowAnaGfmYzAJ0Fr3xVCo7WxQuhJxzoGDS2qFbtuwC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585652060; 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=ONe6r8GpThcKL7DODhjdJnCo+VHtig9T6C7dDsrvCOM=; b=WNH7QAa1/7YJk1wg1x50zXHwlBoz04FEysXHyF5RId9jclMPt1rC9iUnL5Hwo/WOI9ZLARrYRyjf9OGmgCGWTo/aU929jFoqiSvu3FdarDT2HBlFAPzb9sVSH9AKE5vRXthzIgXa3Uoc31s//2nLrzgfKj5sUVI2jLpP5A5RzUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585652060695959.8030198704392; Tue, 31 Mar 2020 03:54:20 -0700 (PDT) Received: from localhost ([::1]:35870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEXD-0006NM-O0 for importer@patchew.org; Tue, 31 Mar 2020 06:54:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52941) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU0-0002MB-CD for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJETy-0006GR-Nt for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:00 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:37271) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJETy-0006FM-IA for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:50:58 -0400 Received: by mail-wr1-x442.google.com with SMTP id w10so25375569wrm.4 for ; Tue, 31 Mar 2020 03:50:58 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ONe6r8GpThcKL7DODhjdJnCo+VHtig9T6C7dDsrvCOM=; b=OxFqDsHQFo3JUXB5y90BJtB/QXKJXAIFlqHWWbCVELj3X9bv6KvERbZrry5SVe0rnM QOVhPcTtAWSrvAro+SpRc7IcN31oJS4TMlXKCdniQ1GT72VeOy7F0qBvzeoufxwR9zp3 zubg9QXFIige3U0fe/dLcNOxdIxK8Aq+87Q1F5RtWOijwOmsqYRuwmDbQ1UXXXmj9b/g J7Jy34PtMbAeGAthKuOUoLswoGIWOxFY7JGpxVNhAE5fmf84OBlLN15FbaD0dwluhyPG i6RqcYdJlZ8jeeevxa6BSS9NCkLu0XQrYI5LlT4mjYEj7wh+0/+e99ok3jV7J6XRdWRs UXaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ONe6r8GpThcKL7DODhjdJnCo+VHtig9T6C7dDsrvCOM=; b=mGrFnQwYVrosa00u0c67COdXNb7iKdSlFijyTFqVhT/Vvbyz1mgPRCnhLdXwqRd1JG v0Q4rzIeY3h5amF8wI3v82qSkqlktIwa0jnrv4uIdp6PaDB3Z2ncFmkm6Fx0M86VCrNu TCw3Bgm1PIgiRj8xUnoTyvjS3LLOdo2MQZOSu9m+wW9cDREB04sWxAzIS9zttbqRWwkT yuZpWjS/64SbYL3CMSS5wiDoCG0w2tRZDfQcX7OX5PoFdV/5TNuqa7pHtqI/0tvZ7ka3 iAZn3ArrznSsuRhT4N2DiQMU5p+J/XKNVm9eA+/lvJIfAgwqUub7Sut+wY+FlFyPwGJA liAQ== X-Gm-Message-State: ANhLgQ1O1HXzXNfVVQ9DSULzsCZCiD261EcegHGrK7RLafYVL0siMdoC vvreeSvZE+VD+9t6A1YtewJ5cgkscG8= X-Google-Smtp-Source: ADFU+vvL6zgzSFx3/4B8OAiH9o7ME8WiuL8p9yLzLEH0mS1E2Nj5pPCVyIZi0t17Ll5+I4lbyhvA9g== X-Received: by 2002:adf:fa51:: with SMTP id y17mr20619972wrr.280.1585651856624; Tue, 31 Mar 2020 03:50:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0 1/7] tests/acceptance/machine_sparc_leon3: Disable HelenOS test Date: Tue, 31 Mar 2020 12:50:42 +0200 Message-Id: <20200331105048.27989-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This test was written/tested around beginning of 2019, but was extracted from a bigger series and posted end of June 2019 [*]. Unfortunately I did not notice commit 162abf1a8 was merged by then, which implements the AHB and APB plug and play devices. HelenOS 0.6 is expecting the PnP registers to be not implemented by QEMU, then forces the discovered AMBA devices (see [2]). Before 162abf1a8, the console was displaying: HelenOS bootloader, release 0.6.0 (Elastic Horse) Built on 2014-12-21 20:17:42 for sparc32 Copyright (c) 2001-2014 HelenOS project 0x4000bf20|0x4000bf20: kernel image (496640/128466 bytes) 0x4002b4f2|0x4002b4f2: ns image (154195/66444 bytes) 0x4003b87e|0x4003b87e: loader image (153182/66437 bytes) 0x4004bc03|0x4004bc03: init image (155339/66834 bytes) 0x4005c115|0x4005c115: locsrv image (162063/70267 bytes) 0x4006d390|0x4006d390: rd image (152678/65889 bytes) 0x4007d4f1|0x4007d4f1: vfs image (168480/73394 bytes) 0x4008f3a3|0x4008f3a3: logger image (158034/68368 bytes) 0x4009feb3|0x4009feb3: ext4fs image (234510/100301 bytes) 0x400b8680|0x400b8680: initrd image (8388608/1668901 bytes) ABMA devices: <1:00c> at 0x80000100 irq 3 <1:00d> at 0x80000200 <1:011> at 0x80000300 irq 8 Memory size: 64 MB As of this commit, it is now confused: ABMA devices: <1:3000> at 0x00000000 irq 0 <1:3000> at 0x00000000 irq 0 <1:3000> at 0x00000000 irq 0 <1:3000> at 0x00000000 irq 0 <1:3000> at 0x00000000 irq 0 <1:3000> at 0x00000000 irq 0 <1:3000> at 0x00000000 irq 0 ... As this test is not working as expected, simply disable it (by skipping it) for now. [1] https://www.mail-archive.com/qemu-devel@nongnu.org/msg627094.html [2] https://github.com/HelenOS/helenos/blob/0.6.0/boot/arch/sparc32/src/amb= app.c#L75 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Tested-by: Richard Henderson --- tests/acceptance/machine_sparc_leon3.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/acceptance/machine_sparc_leon3.py b/tests/acceptance/mac= hine_sparc_leon3.py index f77e210ccb..2405cd7a0d 100644 --- a/tests/acceptance/machine_sparc_leon3.py +++ b/tests/acceptance/machine_sparc_leon3.py @@ -7,12 +7,16 @@ =20 from avocado_qemu import Test from avocado_qemu import wait_for_console_pattern +from avocado import skip =20 =20 class Leon3Machine(Test): =20 timeout =3D 60 =20 + @skip("Test currently broken") + # A Window Underflow exception occurs before booting the kernel, + # and QEMU exit calling cpu_abort(), which makes this test to fail. def test_leon3_helenos_uimage(self): """ :avocado: tags=3Darch:sparc --=20 2.21.1 From nobody Sat May 4 07:29:21 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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-Seal: i=1; a=rsa-sha256; t=1585651974; cv=none; d=zohomail.com; s=zohoarc; b=Cifbc+V9TvxiZmT6HsCp6EE/o20Owsy4TCxgw6Mjoyr0BfQAWn+v5foq3toPIZZnP9SJlXFUNGHNTuTNJqNwlxjIUjwl8JVJXxXfxGqcd7x/v02Fos2X9tX3WXLDJNxSuJqggQ40PF8H9K5kPLNIcYXOqNgVQyGFb21MAV4/mQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585651974; 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=NTEVMDbO4wtPzpWjDeuq384PlojGr8aCfjPexjiQfbw=; b=S7oIhvlfXif3hCj6eBQDx5Ci5nNhYe5iiZwvT5l4TcHodZrozGZ6vjGjCkZWN7viYntvTyVLyyb9YOEYVGZ2FHIBmdy6ofJtBEu9jK72W+XDrN3qsHgqULcJnkPKjmDWcMVBvkRfiwiAf2uSXZ9AV6ucCWgF33AutTAc2Vb0kDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585651974965456.45354241290875; Tue, 31 Mar 2020 03:52:54 -0700 (PDT) Received: from localhost ([::1]:35856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEVq-00049J-5r for importer@patchew.org; Tue, 31 Mar 2020 06:52:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52953) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU1-0002OA-U2 for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJEU0-0006I1-Or for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:01 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40476) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJEU0-0006HD-Ih for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:00 -0400 Received: by mail-wm1-x343.google.com with SMTP id a81so2023465wmf.5 for ; Tue, 31 Mar 2020 03:51:00 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NTEVMDbO4wtPzpWjDeuq384PlojGr8aCfjPexjiQfbw=; b=gyepPOW6Hg+OHkFgwwNud5yofv8/3l8kv1+v59ajcufK2uFMCXl8ENXu3Y46SVaxGG v/Oun7ncY4HuqVNFPN6lj7hZSLiz8i+DUPridgNa7vb+JD5XN3x3MdDzu74ZisAO0kcF 27a8nD8xBgXY3Id3d7Bvy8BmRwMHULU4AgX4u7mWs4JbQCK2SjUihPEOM0CupEM9VVF0 Tc6GHkEyV0Km0F318LybAt/ACE+kmIzP7VSCFhdtqltn0qnsvLbAuOx7x0Lc7yeglTUu 8Kr4cecnNAiWQiRgf6CXXNNPHpWjlvxynjG6icsQoJ4F3qeyeyTS2PbJDWRuiZsXaima S99A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NTEVMDbO4wtPzpWjDeuq384PlojGr8aCfjPexjiQfbw=; b=I2lXzP4lWfx/b7PxL6uj4SusDhj4rrB8rHrcQdxLWOI8lzVMZ8gnlJxxZv+86KUFnQ CQCa0WPdiq267hOMuaHXedgEoa9Li5e7fCnr2r5HmO7a2rLBAILHxgWND0Jd5ux/KWld vmGHHv7JnRUe1enitegYC6OldSYPN7rP/UUk8mYH9cosbvaNQOdGRogspgCvNhWPwnjR oP9q05/uXgoq3gawqH6XPa8tDr0awb2STICUAaLl15CrPsJytvG0JvyqVi1RZwxTY3AE N1p4rdjdmaIimsAR1E3P+vz7DOIOMdLIl5rLs3No9xmqaBVzZVobgUOsz2rBypiAC/xF PSWw== X-Gm-Message-State: ANhLgQ3y8dze577852UIOUpK8w0MJS9wCnk8uLvhKyYHwCJWmjOkslee 1eWMz8hKmitn2O2axfWsr/qFDCaiNbc= X-Google-Smtp-Source: ADFU+vvNTqEIj0dE/ch21tINs+V7stnqZ8Q4J/YxzejW1IUiTyBHm1hi5RwHBDC5n27BUAhENpb3ug== X-Received: by 2002:a1c:4c1a:: with SMTP id z26mr2785273wmf.94.1585651859326; Tue, 31 Mar 2020 03:50:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0 2/7] hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to AHB PnP registers Date: Tue, 31 Mar 2020 12:50:43 +0200 Message-Id: <20200331105048.27989-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Similarly to commit 158b659451 with the APB PnP registers, guests can crash QEMU when writting to the AHB PnP registers: $ echo 'writeb 0xfffff042 69' | qemu-system-sparc -M leon3_generic -S -bi= os /etc/magic -qtest stdio [I 1571938309.932255] OPENED [R +0.063474] writeb 0xfffff042 69 Segmentation fault (core dumped) (gdb) bt #0 0x0000000000000000 in () #1 0x0000562999110df4 in memory_region_write_with_attrs_accessor (mr=3Dmr@entry=3D0x56299aa28ea0, addr=3D66, value=3Dvalue@entry=3D0x7= fff6abe13b8, size=3Dsize@entry=3D1, shift=3D, mask=3Dmask@en= try=3D255, attrs=3D...) at memory.c:503 #2 0x000056299911095e in access_with_adjusted_size (addr=3Daddr@entry=3D66, value=3Dvalue@entry=3D0x7fff6abe13b8, size= =3Dsize@entry=3D1, access_size_min=3D, access_size_max=3D, access_fn=3Daccess_fn@entry=3D 0x562999110d70 , mr=3D0x5629= 9aa28ea0, attrs=3D...) at memory.c:539 #3 0x0000562999114fba in memory_region_dispatch_write (mr=3Dmr@entry=3D0= x56299aa28ea0, addr=3D66, data=3D, op=3D, att= rs=3Dattrs@entry=3D...) at memory.c:1482 #4 0x00005629990c0860 in flatview_write_continue (fv=3Dfv@entry=3D0x56299aa7d8a0, addr=3Daddr@entry=3D4294963266, attr= s=3D..., ptr=3Dptr@entry=3D0x7fff6abe1540, len=3Dlen@entry=3D1, addr1=3D, l=3D, mr=3D0x56299aa28ea0) at include/qemu/host-utils.h:164 #5 0x00005629990c0a76 in flatview_write (fv=3D0x56299aa7d8a0, addr=3D429= 4963266, attrs=3D..., buf=3D0x7fff6abe1540, len=3D1) at exec.c:3165 #6 0x00005629990c4c1b in address_space_write (as=3D, addr= =3D, attrs=3D..., attrs@entry=3D..., buf=3Dbuf@entry=3D0x7ff= f6abe1540, len=3Dlen@entry=3D1) at exec.c:3256 #7 0x000056299910f807 in qtest_process_command (chr=3Dchr@entry=3D0x5629= 995ee920 , words=3Dwords@entry=3D0x56299acfcfa0) at qtest.c:437 Instead of crashing, log the access as unimplemented. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: KONRAD Frederic --- hw/misc/grlib_ahb_apb_pnp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c index e230e25363..72a8764776 100644 --- a/hw/misc/grlib_ahb_apb_pnp.c +++ b/hw/misc/grlib_ahb_apb_pnp.c @@ -136,8 +136,15 @@ static uint64_t grlib_ahb_pnp_read(void *opaque, hwadd= r offset, unsigned size) return ahb_pnp->regs[offset >> 2]; } =20 +static void grlib_ahb_pnp_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ + qemu_log_mask(LOG_UNIMP, "%s not implemented\n", __func__); +} + static const MemoryRegionOps grlib_ahb_pnp_ops =3D { .read =3D grlib_ahb_pnp_read, + .write =3D grlib_ahb_pnp_write, .endianness =3D DEVICE_BIG_ENDIAN, }; =20 --=20 2.21.1 From nobody Sat May 4 07:29:21 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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-Seal: i=1; a=rsa-sha256; t=1585652076; cv=none; d=zohomail.com; s=zohoarc; b=OpSn1YTtfP6R+79qBj13VvkzYg4a+0EHtUQzRlt/chTfZNQLmEl0Vc6zqKnuQsTwjVbZHqc1+Eocda4xsfHaZfAMbOxekepMuZg9jTZ1YyDLAPGrX5hxw/kH5l0tULSzcJQDwuVsYiI2/YLr7t8Y7UjL2eQNmPWaiNEG270opWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585652076; 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=DF8+zMwnTWpvkhxGJn3XQCWqhl7knakcPY4RQn/CDdU=; b=etUPlQxHxzofIvYM5oic4Fx09PRgbP7ope1LN+O98e4/rCmDNeQKorkSmeaXH2EmZk4vgyrcoYBukTNkrHz1XFUsT6RcllGNXC9cX7xaDd67W5kUWQW//xUeYfYz1RKiqiQPMuddPk3SgDP5TuoWs0SbbGDKbAjnFv+BFX6xmQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585652076616209.7229370688915; Tue, 31 Mar 2020 03:54:36 -0700 (PDT) Received: from localhost ([::1]:35874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEXT-0006f8-SI for importer@patchew.org; Tue, 31 Mar 2020 06:54:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52968) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU3-0002Q7-Lv for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJEU2-0006JF-If for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:03 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33150) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJEU2-0006Il-D0 for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:02 -0400 Received: by mail-wr1-x444.google.com with SMTP id a25so25350203wrd.0 for ; Tue, 31 Mar 2020 03:51:02 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DF8+zMwnTWpvkhxGJn3XQCWqhl7knakcPY4RQn/CDdU=; b=nJd40LozPdurEkzqGIMbNv9ByRGsAYjG175eDxp4BshF7wxW9MXR3XEJy+tG7rfxXy KkIDoHrYCww+0f1udT5fFf4PBXFBuRsQqjIe4+in/SGJLCQzbmSnYYPrPaPFJIFpGaFj pDxwoSwBSzig2VyvOzmkhpsK46bVnkhCqRiN8F7y0vSvcYQtBJy0r1UgMzU3C+2zqM2E 95HkIRsNznRyYdJR8nEKDMo4n3fhp7JGWssFE9iKZunfxscIvRAUXaYI5FYaOJzE4iGb jUbD1gVb77Pt6eH9AnWD2Y/GaBuP6Efp1m747ZctX7SsdT3iyHyeD+u2Y7GSVn5WmOTX wpEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DF8+zMwnTWpvkhxGJn3XQCWqhl7knakcPY4RQn/CDdU=; b=qL+6ZU48TVUE2zNysLWoT30AVCQA+5xWKN40OZj5VhUKxG21DyQa4ecB0G5e5+UAGp piiPuukCqVvSqfwSykd2FqAEEVCEttjS5+HdrCbT356RD/NXhKIPvTOhd2CjNjn4I7Bu Wheb3PJWCWnIOZd+23LprICWj7Zz/zFf5nxcCIZu4gjmHz3kzBW9ZKUx+gWONQhOR30B xDG29N+DBqjaC/BzRfHZ2Ezu5gdVPZ80oZk7T5RkMqAnt8nb71v7PehTu4u6CZq2q24o 0EyLsl6FFhnIEHquNAXz8/mgOilLrhT2l4yyoni/Lkqln2kLln40o6OdcSp3EmdZpigf VAQA== X-Gm-Message-State: ANhLgQ3N6YTSvclLJf9Tcac73YQtuIsRP5R8Xct53eFAAb+tGC+qZ6Ew BTD1NSjTBilqtS5YP3xudwCyoh+Pus8= X-Google-Smtp-Source: ADFU+vvLJG1OUdVDpwQwmuN/aB8lLj9Y2rK62Wcx1Y17tVS5NHJ5RKMuF3oINxiPZvKa+wIGuTDzxQ== X-Received: by 2002:a5d:6182:: with SMTP id j2mr19338959wru.131.1585651860923; Tue, 31 Mar 2020 03:51:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0 3/7] hw/misc/grlib_ahb_apb_pnp: Fix AHB PnP 8-bit accesses Date: Tue, 31 Mar 2020 12:50:44 +0200 Message-Id: <20200331105048.27989-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The Plug & Play region of the AHB/APB bridge can be accessed by various word size, however the implementation is clearly restricted to 32-bit: static uint64_t grlib_ahb_pnp_read(void *opaque, hwaddr offset, unsigned = size) { AHBPnp *ahb_pnp =3D GRLIB_AHB_PNP(opaque); return ahb_pnp->regs[offset >> 2]; } Similarly to commit 0fbe394a64 with the APB PnP registers, set the MemoryRegionOps::impl min/max fields to 32-bit, so memory.c::access_with_adjusted_size() can adjust when the access is not 32-bit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: KONRAD Frederic --- hw/misc/grlib_ahb_apb_pnp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c index 72a8764776..d22ed00206 100644 --- a/hw/misc/grlib_ahb_apb_pnp.c +++ b/hw/misc/grlib_ahb_apb_pnp.c @@ -146,6 +146,10 @@ static const MemoryRegionOps grlib_ahb_pnp_ops =3D { .read =3D grlib_ahb_pnp_read, .write =3D grlib_ahb_pnp_write, .endianness =3D DEVICE_BIG_ENDIAN, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, }; =20 static void grlib_ahb_pnp_realize(DeviceState *dev, Error **errp) --=20 2.21.1 From nobody Sat May 4 07:29:21 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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-Seal: i=1; a=rsa-sha256; t=1585652156; cv=none; d=zohomail.com; s=zohoarc; b=J/MiRUmOUzhUl+J2tGoMQAIosbBOLPNnQ3keZJq7ZYylFLi7CHp+aiWzAbNLalkzCsDKhRwOwNTDhdRs+8ZQvNPxlwDoPkPaVAia7UEgn9fMhaEh6v6FHAhW7iU9wOE12ES4Tbes17r1pklxesLXldHGEzFaWDN2mRGR980oBUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585652156; 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=dEC1bGb3P9A30oXg5tR4om/EOk+NZGxuzJFx+2IxYmA=; b=Z6zIysg87XVvcI850y8T+4Q89MNZn53Vyu8B7VIk3qSJqwEFroQtYB+DUQY81ffRxJds+VSDu67P0eErCVVa12bnBHC1EHnzoukUa4nynsXAKQ4LN7CdeJDszzD/CwqSo2U6kiVEqlj5fqiHYvpH+oXoqvz2RVArBXkA5CgmOeg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585652156302909.4951816255858; Tue, 31 Mar 2020 03:55:56 -0700 (PDT) Received: from localhost ([::1]:35892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEYl-00087t-Fp for importer@patchew.org; Tue, 31 Mar 2020 06:55:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52980) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU5-0002Rr-31 for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJEU3-0006Kn-Um for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:04 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:39868) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJEU3-0006Jo-OJ for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:03 -0400 Received: by mail-wr1-x42a.google.com with SMTP id p10so25307423wrt.6 for ; Tue, 31 Mar 2020 03:51:03 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:51:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dEC1bGb3P9A30oXg5tR4om/EOk+NZGxuzJFx+2IxYmA=; b=N8Jg/+Z9wzqrZ2RKQHcN41u9xSqe48OAgOB8KwoSTIkUiMhs02J+alroqO56KZj9Dr odx5y8AxsACmsU/sNaIPn+f9BbjsmA3F1JkzZMRwU+YGriwxWuwClpaZ9KDhtRYkC88Q wrwDyM16CRyDtr7oLT23FDV1JVJ33T7wLgGqRjxOcbO4Nw9UA13gXdjz/AdqP7MW/n9g 33Gx3mRywWZX6V/GTJsGjToiaCMrEwVyP3/OCSWHSxO9MCuo8gmzUiJjxTgSVNhobbrD TczWUTxoW1yxIIBiRhLBO5I1poYtMnQEPKo7CXNDmnUtEJjlm2O7T5EfnT+C1tNg7H9n PJOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dEC1bGb3P9A30oXg5tR4om/EOk+NZGxuzJFx+2IxYmA=; b=n9UUS8PwKxBcOnHhdoJyeLBnPH2Sro+RrLyA/LTzsbN6ptOplHVDLULpWjgg2lX8MF A3HCV3bhsl43AvsNBTTrLti2ZAIpXeX/6ztSfxJGO4JXeDHTABnwXI1f1mIQErsVuNKL TWVUuySFyxNMVjMnx2kXrANCojr2RFNw3w0OiNnCKOFSSIcMqph3qNXjf/sY2lHoaOBY CTeH/jUVULBt1wmCY7iZaXIhTPE2rjlGk92BPy/O4f+fmLCzqQEaQIF21jgoIwSAUo2J dblNj96h8VpzVbseF6gEMgEB8gpALS+klkJkdRoHg3pchu1+RkRpeUdQkdX6hdvceOfj CCPw== X-Gm-Message-State: ANhLgQ0Osx/uZrzKJZX6z31jSu8j0iVyexMWLk4oBc/o0G8L4kLAI8Qg 0SF2oari4+6fdqsdIHu+T5PoHHMgmrw= X-Google-Smtp-Source: ADFU+vsuqFR7gRmyHV8ugr5RIWVdBtijl4He6v/cvZKXw9SKrXeIm5DHGDINiMCK8qhD/R76pyFILQ== X-Received: by 2002:a5d:6a43:: with SMTP id t3mr18991985wrw.87.1585651862468; Tue, 31 Mar 2020 03:51:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 4/7] hw/misc/grlib_ahb_apb_pnp: Add trace events on read accesses Date: Tue, 31 Mar 2020 12:50:45 +0200 Message-Id: <20200331105048.27989-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: KONRAD Frederic --- hw/misc/grlib_ahb_apb_pnp.c | 13 +++++++++++-- hw/misc/trace-events | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c index d22ed00206..43e001c3c7 100644 --- a/hw/misc/grlib_ahb_apb_pnp.c +++ b/hw/misc/grlib_ahb_apb_pnp.c @@ -25,6 +25,7 @@ #include "qemu/log.h" #include "hw/sysbus.h" #include "hw/misc/grlib_ahb_apb_pnp.h" +#include "trace.h" =20 #define GRLIB_PNP_VENDOR_SHIFT (24) #define GRLIB_PNP_VENDOR_SIZE (8) @@ -132,8 +133,12 @@ void grlib_ahb_pnp_add_entry(AHBPnp *dev, uint32_t add= ress, uint32_t mask, static uint64_t grlib_ahb_pnp_read(void *opaque, hwaddr offset, unsigned s= ize) { AHBPnp *ahb_pnp =3D GRLIB_AHB_PNP(opaque); + uint32_t val; =20 - return ahb_pnp->regs[offset >> 2]; + val =3D ahb_pnp->regs[offset >> 2]; + trace_grlib_ahb_pnp_read(offset, val); + + return val; } =20 static void grlib_ahb_pnp_write(void *opaque, hwaddr addr, @@ -239,8 +244,12 @@ void grlib_apb_pnp_add_entry(APBPnp *dev, uint32_t add= ress, uint32_t mask, static uint64_t grlib_apb_pnp_read(void *opaque, hwaddr offset, unsigned s= ize) { APBPnp *apb_pnp =3D GRLIB_APB_PNP(opaque); + uint32_t val; =20 - return apb_pnp->regs[offset >> 2]; + val =3D apb_pnp->regs[offset >> 2]; + trace_grlib_apb_pnp_read(offset, val); + + return val; } =20 static void grlib_apb_pnp_write(void *opaque, hwaddr addr, diff --git a/hw/misc/trace-events b/hw/misc/trace-events index a5862b2bed..9387664823 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -198,3 +198,7 @@ via1_rtc_cmd_pram_read(int addr, int value) "addr=3D%u = value=3D0x%02x" via1_rtc_cmd_pram_write(int addr, int value) "addr=3D%u value=3D0x%02x" via1_rtc_cmd_pram_sect_read(int sector, int offset, int addr, int value) "= sector=3D%u offset=3D%u addr=3D%d value=3D0x%02x" via1_rtc_cmd_pram_sect_write(int sector, int offset, int addr, int value) = "sector=3D%u offset=3D%u addr=3D%d value=3D0x%02x" + +# grlib_ahb_apb_pnp.c +grlib_ahb_pnp_read(uint64_t addr, uint32_t value) "AHB PnP read addr:0x%03= "PRIx64" data:0x%08x" +grlib_apb_pnp_read(uint64_t addr, uint32_t value) "APB PnP read addr:0x%03= "PRIx64" data:0x%08x" --=20 2.21.1 From nobody Sat May 4 07:29:21 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1585652230; cv=none; d=zohomail.com; s=zohoarc; b=Any4TfvhEYd/iy3h433ItojcrTg/EXACa5h0ZfT5bPA05F+2ff5AKXkjmX54ajZTR4XGCzKgT288HbMvjIrPxxRi6j7mQSMMDn1vw9ZIpJRWzIEIVb98272N9B83LpAiLkPfQab4+xV7bNRtieoy5l7ZcWRnlKdWjvy9cDKcK4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585652230; 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=vchyfqhHHsr5zdUX8gddP8/yCJaBZyi/7DsQU28Nx7E=; b=LUkLezbab9mNeHultI8Hzs/Wf03dA1g41AN8DjLyKlybFpQa/gh2h50VgdYgFmqHu69lVwEYmMLQjVVkfU2KZ9RabEf+6Bhr47+8ioQ+EmAtCMYHXZe9xvpL1PYFjpJUmvbUCaClhegfG74zuHBqL3/3RWB5T50qWrvbiI6/D2Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585652230077831.9586907397601; Tue, 31 Mar 2020 03:57:10 -0700 (PDT) Received: from localhost ([::1]:35902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEZx-000150-BO for importer@patchew.org; Tue, 31 Mar 2020 06:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52991) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU6-0002Th-Hc for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJEU5-0006Mm-GC for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:06 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:40407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJEU5-0006MF-9v for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:05 -0400 Received: by mail-wr1-x443.google.com with SMTP id u10so25300335wro.7 for ; Tue, 31 Mar 2020 03:51:05 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.51.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vchyfqhHHsr5zdUX8gddP8/yCJaBZyi/7DsQU28Nx7E=; b=CGKhM70MIOYp3EQdgCnw1t+7WJMcow5uwPOYP6OTiHgoJLEo9CqbvyL+l1WHDsMqMl 8QUkgUBKH0MHB3z4ezDA1ecDJ6LLhunj3CoMVk5aNNwHq37/HkuVapbwU4hiJpDZ4t8G 7kvHpOCPtGSDi6MqV/zFZCZ9D4hxwQzLSYI+3ZrRjLbCrXM217BFtN/hf7BwVuV4kfsb BzGftEo/IF1Gw5weCQbIvdMfexqIpkA6yORjniqEt1S2gk43Dnev+mxo+oo1Kw+IJBmC gXh7hZba1SUgIymxUi1xOmb4kD/X9Yt7f/1xD6zRRyc1HimhW7Pc8cEYPtVamd9fa4KV BFBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vchyfqhHHsr5zdUX8gddP8/yCJaBZyi/7DsQU28Nx7E=; b=lpwIZh7+vTQ/xA0Bj+CgPnbMu6SFxhoItOD+5UxvweKNNuVaed7ycVwXJvopFn3Sfb UK+TWTnvj78f6po23MrgWpKpHBiLF2Wnla0Iw/TWxO/pXlG+/plsKiL0GBf59P7yGRpT BYSQJSnSXsIAV36yqSTVRoqc4Q9RfL80R5wfU2wo5cjn0qlbDYk91frAqXybPdL5JbEa 3X4hz78/FzSqFwKnQQwyIIb//wWdBRmiKi+Vi2LW0j+c/yJ+ZpE2FdOQzn07/10skwjl SkHrSfVfOAc1fPmUBs4PVQlDKQ8S8EUfCqhANLwJALZYefFZZy1pHNrFM/At+E7G4RSQ PQrQ== X-Gm-Message-State: ANhLgQ3IF6aQZ30pQ3aS2xBBNWHOLXfqyIRfXr5MkIi1IBk7hIQPEFrc oXSUrXEKQAZt61GJT/obBaE81/Y1meQ= X-Google-Smtp-Source: ADFU+vvkPiCIRDHwZIEZ+4lbePZE4C4/smpCL610+d5P3owpR9u1b2OI0k6Cx1Ljbgk0kq86xhhI/A== X-Received: by 2002:adf:8b5c:: with SMTP id v28mr18658671wra.98.1585651864193; Tue, 31 Mar 2020 03:51:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 5/7] hw/timer/grlib_gptimer: Display frequency in decimal Date: Tue, 31 Mar 2020 12:50:46 +0200 Message-Id: <20200331105048.27989-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: KONRAD Frederic --- hw/timer/trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/trace-events b/hw/timer/trace-events index 29fda7870e..96a6c9138c 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -19,7 +19,7 @@ slavio_timer_mem_writel_invalid(uint64_t addr) "invalid w= rite address 0x%"PRIx64 grlib_gptimer_enable(int id, uint32_t count) "timer:%d set count 0x%x and = run" grlib_gptimer_disabled(int id, uint32_t config) "timer:%d Timer disable co= nfig 0x%x" grlib_gptimer_restart(int id, uint32_t reload) "timer:%d reload val: 0x%x" -grlib_gptimer_set_scaler(uint32_t scaler, uint32_t freq) "scaler:0x%x freq= : 0x%x" +grlib_gptimer_set_scaler(uint32_t scaler, uint32_t freq) "scaler:0x%x freq= :%uHz" grlib_gptimer_hit(int id) "timer:%d HIT" grlib_gptimer_readl(int id, uint64_t addr, uint32_t val) "timer:%d addr 0x= %"PRIx64" 0x%x" grlib_gptimer_writel(int id, uint64_t addr, uint32_t val) "timer:%d addr 0= x%"PRIx64" 0x%x" --=20 2.21.1 From nobody Sat May 4 07:29:21 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1585652015; cv=none; d=zohomail.com; s=zohoarc; b=Qu1RQyKlOi+UUoHmjv8tOXEV3DkTT6qWngcIct0BtaW1IS2ytBsjlOrIZHPT/2RvucUAxs5P7p4YUTcGJrlcYeUQnzZoBUuBG0bXkhIF6nAHLAblJ65vf790ZnTLxgz6XY0dqAA6GlnA5EO5MY6rWZyaybNsxE6mSCXrOmQiCQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585652015; 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=7AsrAmCtFf8M+d+3PR/ZWRVO3rzbQ0QtqWSom6Etlcg=; b=DUsfUiuemSqNxeELNea2PuRO3V4AEkZmUc7O1L7YQJLTrAWtTKa/vW2lg8DXmRpN9yNkGa0HfmnFyVlQ3CvCY/V1zww3OxSpO8TtPWiSIUieKRodO/wx5tNMRP0dtz7fVlm52FncJGgWmjZrlMd3Lx05vRVDOYD9SPXop4d/XUM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585652015049566.5974813981169; Tue, 31 Mar 2020 03:53:35 -0700 (PDT) Received: from localhost ([::1]:35860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEWU-00057R-2q for importer@patchew.org; Tue, 31 Mar 2020 06:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53004) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU8-0002VI-7y for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJEU7-0006O8-6F for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:08 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:34030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJEU7-0006NP-0F for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:07 -0400 Received: by mail-wr1-x433.google.com with SMTP id 65so25327664wrl.1 for ; Tue, 31 Mar 2020 03:51:06 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.51.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:51:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7AsrAmCtFf8M+d+3PR/ZWRVO3rzbQ0QtqWSom6Etlcg=; b=ewFUCJ+kImsIGp9g94uCeB/hCfHGIfwuhS5E51hPmk0LDnK61dfxTqwY19LYk24EYl tkwSY6VRdlHorkW0+WU9YPBrHVxzWHpEv7N9x8xUH2gCfY0kfLJdEGbFDQmVUhknAT4u 2atRcLUkbEffgzoM7xjtZxvtCKEmDxhfxCAY0rvS8KRy6d/CiGsdSE3yTufGM0kJkHO6 rgtGBcmCLqsWIjOQ1M6nVJZKXPidltSgc3snsEoYIu/yS1bPigcpeKzKo2Mbnh0rtE52 D/Ge0nuYsqUPF2YFpNPjzzrT4LtQ8yR6XnNj2VvARSf/gbg/IQdSeWSrNsshW1ARJ3BY IjAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7AsrAmCtFf8M+d+3PR/ZWRVO3rzbQ0QtqWSom6Etlcg=; b=bnPEpjn/l+36rBXHzvjt/yqM8uMVLas/BypSqbP5yywG8v406cuSoXMYbn4RHbeW2o szPduiCln4gdEvSdWhJSyYfGz7WGYc8ib8P1ldeEBP3mXzc8ULGdBYiQ25YLbDdjcJbz 6N3tVdTOm9LCeetTVhcLDelwk6LZoES/1ArfJfL3tRIOTKlH6XDgo7JScRLAHsbGkwmT /A8Rni9dEEjz5fy0LY/yIf8L3ceCeE1K1tsZnzswGCuC42b9lcBdVmrQ8iJycPGifSwg 8GG5TOamTYvRJPeLW/Xo8T2QjX7rxWjn3RzvuYMJ55ur/h++JGGrTlVI3Qql0b5VTqWV gO/A== X-Gm-Message-State: ANhLgQ25anuT4gSSB0LrM8j/ifFuxwcXiVsyK+S9NU5zbC4TsqfZnamg apn1sXAmKxtHE7JHE0xYTKQSllEimSk= X-Google-Smtp-Source: ADFU+vvAwfEvmSQiMc2pGUEq7QuEuvyX659dMjF+uzTgZRAQ0M5pdAKz8rBq20riCxz4aj/2HlYPIg== X-Received: by 2002:adf:e584:: with SMTP id l4mr18062967wrm.388.1585651865782; Tue, 31 Mar 2020 03:51:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 6/7] target/sparc/int32_helper: Remove DEBUG_PCALL definition Date: Tue, 31 Mar 2020 12:50:47 +0200 Message-Id: <20200331105048.27989-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We define DEBUG_PCALL since b884fc5e (2012-10-06). 7.5 years later it is safe to assume we can remove it :) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: KONRAD Frederic --- target/sparc/int32_helper.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c index 813b47dbb2..c56dd3df18 100644 --- a/target/sparc/int32_helper.c +++ b/target/sparc/int32_helper.c @@ -23,9 +23,7 @@ #include "exec/log.h" #include "sysemu/runstate.h" =20 -#define DEBUG_PCALL =20 -#ifdef DEBUG_PCALL static const char * const excp_names[0x80] =3D { [TT_TFAULT] =3D "Instruction Access Fault", [TT_ILL_INSN] =3D "Illegal Instruction", @@ -58,7 +56,6 @@ static const char * const excp_names[0x80] =3D { [TT_DIV_ZERO] =3D "Division By Zero", [TT_NCP_INSN] =3D "Coprocessor Disabled", }; -#endif =20 void sparc_cpu_do_interrupt(CPUState *cs) { @@ -71,7 +68,6 @@ void sparc_cpu_do_interrupt(CPUState *cs) cpu_get_psr(env); } =20 -#ifdef DEBUG_PCALL if (qemu_loglevel_mask(CPU_LOG_INT)) { static int count; const char *name; @@ -104,7 +100,6 @@ void sparc_cpu_do_interrupt(CPUState *cs) #endif count++; } -#endif #if !defined(CONFIG_USER_ONLY) if (env->psret =3D=3D 0) { if (cs->exception_index =3D=3D 0x80 && --=20 2.21.1 From nobody Sat May 4 07:29:21 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1585652296; cv=none; d=zohomail.com; s=zohoarc; b=mueunCVMIvNoPGpv1rO3da1H/iY8AcNspkIf/xnuBGE8BhhK1OSDJIB8XD1u9g4ilL+HBkWoA+GK7iCpeXvrWpTWRxfKTYMbRPt6bgq8jS0IXm+Tw2B7JL6qG4c+cUuvGmMEh4pb+sySDhbMR3x9De0nMXsAGYnqmDPO0LeSVKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585652296; 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=qgAU0QvRTWi/e7o9YOkCjYOwtTnHaoxCvld4v/twtYk=; b=G89AgoMO9WH4hS4Pmcjo7QGPaNCOJEm10I0AI4CWe5WeTqIP5+tdXTI45LSsDHIaGwJbOYJ25zHu63odeYOItKBNed2tAFwFoI0PvflBrQMw9XbLXgHpHWV/x9OMOLnwyucxQmdRS1x0FM8fn7CTcLP0nft4yF08yEU/+YKsNuY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585652296681345.92239740886396; Tue, 31 Mar 2020 03:58:16 -0700 (PDT) Received: from localhost ([::1]:35908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEb1-0001yQ-At for importer@patchew.org; Tue, 31 Mar 2020 06:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53016) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJEU9-0002YM-St for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJEU8-0006PW-Nf for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:09 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:55607) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJEU8-0006Op-HY for qemu-devel@nongnu.org; Tue, 31 Mar 2020 06:51:08 -0400 Received: by mail-wm1-x32b.google.com with SMTP id r16so1909120wmg.5 for ; Tue, 31 Mar 2020 03:51:08 -0700 (PDT) Received: from localhost.localdomain (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id w3sm26042830wrn.31.2020.03.31.03.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 03:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qgAU0QvRTWi/e7o9YOkCjYOwtTnHaoxCvld4v/twtYk=; b=IXP39zqtXbhE9woqyKaxicyBMR6sptSrVaant6mSkoHsluQ+QRj8DbPZMrql2teZ5R FPjPV1Rvh30W44mXe4bERcCtTYwAb2c89EwUB1Y1U0ECUjRCwhv7/PKv5ULHzicyIHpT P0JDCccLoos8N+dcGrAlpPDz0I3aPfr+7TxR7T7gjVyQ3meFOCytW+3jf2mLvvmYzYpi oPPtJZiMFH96adfmaTdVxuS2nT5vfSGlT0M+UxxEyODqh1FC+toqfxdjdvx6UK7YqDNt WExFjxqg2uR66xCzfE0TFyyXG1q9ywddJ/oRUJhfRXCaqKjKElsNN4COiJZiTlybExjL F1HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qgAU0QvRTWi/e7o9YOkCjYOwtTnHaoxCvld4v/twtYk=; b=Pa4NOJHEr2EN+yURPyOduZSp8QbubvQ7m5h5U4CoSKg1j+V68WZf8MDRrrR2Rhrkbg zrxsyYRBto9MCljszLxEI6flLOblNqO0aZ/pWouzvhndtE585wnv4HqH3LHP60Y74SKs fbIgWueW4biZKiM4NU2mtk5b7ZDU2/MTnpCtXkHBc//G85/rGDFycdT6W/IfLNrzM+pu Pb5rpuSD1kLEM12tAo2LFPRtn5J15w9/JkArvdqM3696PkQ7cVYWwbvQLIOn0JYu5JhD 2Fk46ffwG4qvVGmSXgpciw7hm+S22n6zkgdSYPwljGs42jyNJqwslO50RyuNS/hd5GRG 6A1g== X-Gm-Message-State: ANhLgQ2ZdD4AK5kTXYMwROdW+GHUsdnX/Vk6KudJ1RevCyXusLJ9FQgo ukCZr8ES4Hax4I8vV6Z6P72GNnHlTgg= X-Google-Smtp-Source: ADFU+vuhaCSeNpKyWRK2ZM1WY6YgUYgFtQbtX+TGPvZ44qLLHLTmfnfou73iEZvjaufS0cf8rkfR7A== X-Received: by 2002:a7b:c5d8:: with SMTP id n24mr2233281wmk.158.1585651867337; Tue, 31 Mar 2020 03:51:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 7/7] target/sparc/int32_helper: Extract and use excp_name_str() Date: Tue, 31 Mar 2020 12:50:48 +0200 Message-Id: <20200331105048.27989-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200331105048.27989-1-f4bug@amsat.org> References: <20200331105048.27989-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32b X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabien Chouteau , KONRAD Frederic , Jiri Gaisler , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Improve exception error report: Before: qemu: fatal: Trap 0x06 while interrupts disabled, Error state After: qemu: fatal: Trap 0x06 (Window Underflow) while interrupts disabled, Erro= r state Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: KONRAD Frederic --- target/sparc/int32_helper.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c index c56dd3df18..9a71e1abd8 100644 --- a/target/sparc/int32_helper.c +++ b/target/sparc/int32_helper.c @@ -57,6 +57,14 @@ static const char * const excp_names[0x80] =3D { [TT_NCP_INSN] =3D "Coprocessor Disabled", }; =20 +static const char *excp_name_str(int32_t exception_index) +{ + if (exception_index < 0 || exception_index >=3D ARRAY_SIZE(excp_names)= ) { + return "Unknown"; + } + return excp_names[exception_index]; +} + void sparc_cpu_do_interrupt(CPUState *cs) { SPARCCPU *cpu =3D SPARC_CPU(cs); @@ -77,10 +85,7 @@ void sparc_cpu_do_interrupt(CPUState *cs) } else if (intno >=3D 0x80) { name =3D "Trap Instruction"; } else { - name =3D excp_names[intno]; - if (!name) { - name =3D "Unknown"; - } + name =3D excp_name_str(intno); } =20 qemu_log("%6d: %s (v=3D%02x)\n", count, name, intno); @@ -106,8 +111,9 @@ void sparc_cpu_do_interrupt(CPUState *cs) env->def.features & CPU_FEATURE_TA0_SHUTDOWN) { qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } else { - cpu_abort(cs, "Trap 0x%02x while interrupts disabled, Error st= ate", - cs->exception_index); + cpu_abort(cs, "Trap 0x%02x (%s) while interrupts disabled, " + "Error state", + cs->exception_index, excp_name_str(cs->exception_ind= ex)); } return; } --=20 2.21.1