From nobody Fri Apr 19 02:06:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602958061; cv=none; d=zohomail.com; s=zohoarc; b=MMzYpioaoA/6aKVXFqV+HkJIjfaoMo37qPNJQe7VBlZkq9v7qwADm04zrG1pFz3ttHISt4fIHYJrTTMVdeE09Sw7yKFc9LPHjIouYK4Cilke2Kw9qZ/LnJMJ1kuSCwqMKv1ZRO7fkkYRXGv22V39257NH+TbhPVLSdXcoToFJMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602958061; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Oqn2dPFn8mKbR1de5rALVSO4XjboTwebIxIYduVVNiA=; b=ENaWrrL+Z0eIqpKHMqfsQSPTJ0uj5HCfxnaaOUdT71qrCBWzmla6FUbFFZzCp0/Ggxt9DVv/d9BZiIpYxTvdjfyeB0y/dj+RVi2gjc+ZnlMB701tX6SMsupdtvifSwwHaMibGCDJDWi1Gk/6deTnI3CJRrxMslONqbX4L9CMS9Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1602958061167136.2885072278574; Sat, 17 Oct 2020 11:07:41 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id t9so6946177wrq.11 for ; Sat, 17 Oct 2020 11:07:40 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (117.red-83-52-172.dynamicip.rima-tde.net. [83.52.172.117]) by smtp.gmail.com with ESMTPSA id v6sm3503342wrp.69.2020.10.17.11.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 11:07:38 -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=Oqn2dPFn8mKbR1de5rALVSO4XjboTwebIxIYduVVNiA=; b=QyaAtxeJXVu/7u6sAccHxcHgusL8VK2T9LODq95t1dGJjFOxLuZcGIrOaUPgGrTEzR Hvq30rnw1X8vZ8pwQzDEm05lTTaZ68sTu1RlGc6Ke674NKx/neMlfTFYi5seGHazvdIU 8AOGO1ed51nCTqiYtfCtYBKAnhjBAdn0vkB2QJVllVc5to0+b/yHcv9ELkUKoIiRxRHJ v0sOAUb54k434IQ92ASck4QqQL+spw9gRML/qsElC2XoxINqzjvQ4HY57rcfVzqh15jC 358/HxTa9yKiiPwoZubuqE2cJ0EhmfTEznJPWgU7AYJrkHOo8/psKWRLWTl1jtZxau40 h2Uw== 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=Oqn2dPFn8mKbR1de5rALVSO4XjboTwebIxIYduVVNiA=; b=B7dg//RKRZQMOCODWOPIFM/QbKVgaP0gFQVC9g09J1xH57jw+Px+iLUSLF8nckaNGp qbkJaAaBktGkfgsoMcdfgfxmUK5JuEy5jgvf+o0axAa8vnZB7bD2yRfxeMLSBIeFN7k4 LaPFg5TL0cHmmFkSEIzVqVKBHx2nF4SmKJjOE5Lf0RuOEkm4NJinuZrGiDImNLTr9j58 EAQMda3icBy1ruue6UQGLR3l4QEliwOY6p+qwlRoedONLM4kAmKqQWg1oK+cpCqBJbW1 bdzZQT6NZfhcLRDbL5dTH5P0Fa2OGBu3BTSSiG6k27OG3mr7YAX+YZ2kh8HwIRBNsEnz 2blA== X-Gm-Message-State: AOAM531kjgdxp0zM9N+2StU2kLaOH0TTg0zSjLl6S4WR8G4yW34LESHe FHiiJnVDChM7Ol6PCeZ3CLU= X-Google-Smtp-Source: ABdhPJzRndVMEA7K+LRLSUy/iH21kzjMnX4RcSIgh4FGiHtUpBD1MvAdYl7WVK5GrrYaAfCBJ4fqVQ== X-Received: by 2002:adf:eb41:: with SMTP id u1mr10659131wrn.94.1602958059356; Sat, 17 Oct 2020 11:07:39 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Luc Michel , Peter Maydell , Andrew Baumann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Luc Michel Subject: [PATCH 1/2] hw/intc/bcm2835_ic: Trace GPU/CPU IRQ handlers Date: Sat, 17 Oct 2020 20:07:30 +0200 Message-Id: <20201017180731.1165871-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201017180731.1165871-1-f4bug@amsat.org> References: <20201017180731.1165871-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add trace events for GPU and CPU IRQs. Reviewed-by: Luc Michel Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/bcm2835_ic.c | 4 +++- hw/intc/trace-events | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/intc/bcm2835_ic.c b/hw/intc/bcm2835_ic.c index 53ab8f58810..9000d995e81 100644 --- a/hw/intc/bcm2835_ic.c +++ b/hw/intc/bcm2835_ic.c @@ -18,6 +18,7 @@ #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" +#include "trace.h" =20 #define GPU_IRQS 64 #define ARM_IRQS 8 @@ -51,7 +52,6 @@ static void bcm2835_ic_update(BCM2835ICState *s) set =3D (s->gpu_irq_level & s->gpu_irq_enable) || (s->arm_irq_level & s->arm_irq_enable); qemu_set_irq(s->irq, set); - } =20 static void bcm2835_ic_set_gpu_irq(void *opaque, int irq, int level) @@ -59,6 +59,7 @@ static void bcm2835_ic_set_gpu_irq(void *opaque, int irq,= int level) BCM2835ICState *s =3D opaque; =20 assert(irq >=3D 0 && irq < 64); + trace_bcm2835_ic_set_gpu_irq(irq, level); s->gpu_irq_level =3D deposit64(s->gpu_irq_level, irq, 1, level !=3D 0); bcm2835_ic_update(s); } @@ -68,6 +69,7 @@ static void bcm2835_ic_set_arm_irq(void *opaque, int irq,= int level) BCM2835ICState *s =3D opaque; =20 assert(irq >=3D 0 && irq < 8); + trace_bcm2835_ic_set_cpu_irq(irq, level); s->arm_irq_level =3D deposit32(s->arm_irq_level, irq, 1, level !=3D 0); bcm2835_ic_update(s); } diff --git a/hw/intc/trace-events b/hw/intc/trace-events index 527c3f76cae..22782b3f089 100644 --- a/hw/intc/trace-events +++ b/hw/intc/trace-events @@ -199,3 +199,7 @@ nvic_sysreg_write(uint64_t addr, uint32_t value, unsign= ed size) "NVIC sysreg wri heathrow_write(uint64_t addr, unsigned int n, uint64_t value) "0x%"PRIx64"= %u: 0x%"PRIx64 heathrow_read(uint64_t addr, unsigned int n, uint64_t value) "0x%"PRIx64" = %u: 0x%"PRIx64 heathrow_set_irq(int num, int level) "set_irq: num=3D0x%02x level=3D%d" + +# bcm2835_ic.c +bcm2835_ic_set_gpu_irq(int irq, int level) "GPU irq #%d level %d" +bcm2835_ic_set_cpu_irq(int irq, int level) "CPU irq #%d level %d" --=20 2.26.2 From nobody Fri Apr 19 02:06:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602958065; cv=none; d=zohomail.com; s=zohoarc; b=IenPHsC4kDM7QPmbFq+tBAhFeolPs9gPsJC3dZYJNFrtQ99fWQ8aVVArW0pGYTtvqp7vnNXTRuO7txpLPXrFeLFusfKNpV4Gs94hmahpQ/Gq8uTdEZ/eNJp7red4x4yxjQqhheaujskrVnIF8zKH7Mw6HdNJu4hiIjuz+AMm5T0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602958065; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fV1sc6OWYGYAEKTgUKDN1x3UErFGbkghLLV029wOF5g=; b=NsV0htKDbS/bjeCdfFQ/0T1y3MMp9aL4tKgIeXUyxs0bfX4s/lghqKFMR5QxYclD8W/z8XBQcdsgtFtk4f+JHrKavyrMgCr3Fen5O/e88zCTjoXRu3VP1dep/zDNes/PC08J7N/GvKXk4y4iPHO6EuAP8Txhbv5KxRsWY7ENCaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1602958065710796.8170832028896; Sat, 17 Oct 2020 11:07:45 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id e17so6939612wru.12 for ; Sat, 17 Oct 2020 11:07:45 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (117.red-83-52-172.dynamicip.rima-tde.net. [83.52.172.117]) by smtp.gmail.com with ESMTPSA id 205sm8753097wme.38.2020.10.17.11.07.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 11:07:43 -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=fV1sc6OWYGYAEKTgUKDN1x3UErFGbkghLLV029wOF5g=; b=YUFg92JVjU8rwd9lMc/qsrM++qm1N9XutE5OAb2vJg8hfMZhFmMKvAGXxIDB/o7FrV liqv7DUE2rrR4c9RUgglY6gPvc7w4QTTA7iwGgptg3RTorg07NYZEBxXjj8DZ0wRise8 KHwQ+BBVpxLz4mQ8diPXSh9BXVpqIFXL+mLP3RDZ4fNuLVE9hbn+0JoHKWFz561Wv49c EgJWq1vL+J1JI/pDheP/kWf8zFgOEIJkiybomMth8TtaQ/Y95Qj1xiwIAAvjNF65YWo4 Ryddfk00/A7Z8508c1tRO7kIym2KsDe9HtfwSvSwi1xMfu/FpodI1OqU0ScygUS+Kz4b 7s0A== 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=fV1sc6OWYGYAEKTgUKDN1x3UErFGbkghLLV029wOF5g=; b=tY465c5sk3g2Cmdgc+fwGr1NwA3opyGGaj/Y306y8pfk8KncZC8hu2/co/S364waqE TgkxRpSSpbxg62xRKZ8uGzBsnAy7VHLUsL+VPn0DHurwB50UvFdcHfNlBeIjZt8OHZL+ NTQVfUu2mPoW+LorC9mJb+XSJMsmjwBIG0H2n8Jde93qYk/+UG/6cDRMHRCM/RlA6AEN wBCjZKC7nGvlkklkpUZdZW1sT3Eonb13dKjH3ztrSSMjnzaHMVOxJQwyxgX5AOIzA4i+ Gxf6QHU390qZrcYBsj/52APonDcp5xjy53DK1OQzk3ymP1nUy4AZ788qA4k25ieC5RGW dSUw== X-Gm-Message-State: AOAM530F/RnhezG5/ha766FI++106FLcaJV0Im0lsym6Wlos2ls1OWzp JwStPFdNBUxm5cVcMcdoqCY= X-Google-Smtp-Source: ABdhPJxxrKR+iCGvHgSjlD0e5FmfzDocqvlIoWg23mQOwOUBJ9NErlWgqsyWxca+b7oneVDvgB0ntA== X-Received: by 2002:adf:e6c4:: with SMTP id y4mr11531583wrm.423.1602958063882; Sat, 17 Oct 2020 11:07:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Luc Michel , Peter Maydell , Andrew Baumann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/intc/bcm2836_control: Use IRQ definitions instead of magic numbers Date: Sat, 17 Oct 2020 20:07:31 +0200 Message-Id: <20201017180731.1165871-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201017180731.1165871-1-f4bug@amsat.org> References: <20201017180731.1165871-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The IRQ values are defined few lines earlier, use them instead of the magic numbers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/bcm2836_control.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/intc/bcm2836_control.c b/hw/intc/bcm2836_control.c index 53dba0080ca..2ead76ffdce 100644 --- a/hw/intc/bcm2836_control.c +++ b/hw/intc/bcm2836_control.c @@ -157,22 +157,22 @@ static void bcm2836_control_set_local_irq(void *opaqu= e, int core, int local_irq, =20 static void bcm2836_control_set_local_irq0(void *opaque, int core, int lev= el) { - bcm2836_control_set_local_irq(opaque, core, 0, level); + bcm2836_control_set_local_irq(opaque, core, IRQ_CNTPSIRQ, level); } =20 static void bcm2836_control_set_local_irq1(void *opaque, int core, int lev= el) { - bcm2836_control_set_local_irq(opaque, core, 1, level); + bcm2836_control_set_local_irq(opaque, core, IRQ_CNTPNSIRQ, level); } =20 static void bcm2836_control_set_local_irq2(void *opaque, int core, int lev= el) { - bcm2836_control_set_local_irq(opaque, core, 2, level); + bcm2836_control_set_local_irq(opaque, core, IRQ_CNTHPIRQ, level); } =20 static void bcm2836_control_set_local_irq3(void *opaque, int core, int lev= el) { - bcm2836_control_set_local_irq(opaque, core, 3, level); + bcm2836_control_set_local_irq(opaque, core, IRQ_CNTVIRQ, level); } =20 static void bcm2836_control_set_gpu_irq(void *opaque, int irq, int level) --=20 2.26.2