From patchwork Tue Nov 5 15:30:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Dennis-Jordan X-Patchwork-Id: 13863124 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A3101D2C13E for ; Tue, 5 Nov 2024 15:39:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8LWR-0005gR-A9; Tue, 05 Nov 2024 10:31:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8LWJ-0005cP-1L for qemu-devel@nongnu.org; Tue, 05 Nov 2024 10:31:03 -0500 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8LWH-000449-5O for qemu-devel@nongnu.org; Tue, 05 Nov 2024 10:31:02 -0500 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2fb49510250so57139371fa.0 for ; Tue, 05 Nov 2024 07:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philjordan-eu.20230601.gappssmtp.com; s=20230601; t=1730820659; x=1731425459; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IOlf/wzEJ+wM7g5BTurCACeEWddAq/2jF0kyAkwof9o=; b=KDXpFqK4NWohYhRAJenfaO4ayqLoIXIysNgfdMim2Vs31/6rrf2vzlsUZRnms6ffVo pGbnx90diKuhCz8wBacdrT5khXEyF8I96SilkDFObaq9eWp2cucuPClP9LRH15U+8GQr XpFhhGWrAXpcZYvNAZBR0ACRMIk1pfbsDHIfUNWR3TUBToKlZsm1MRMPs5BC+hPPvQnY qUzQ9TAdIIGNQUi+NKO/iHLwikEPMeLIMVkRI6iPm8idozPbBWveqpG0DPVDkrpqzDzQ kj2EDdjpomdKTw8pKg0l3hjfg8sjbTg5+Wsn6yZZ2isnoz8qjcX/qprLJr0Use70Xsb1 DQdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730820659; x=1731425459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IOlf/wzEJ+wM7g5BTurCACeEWddAq/2jF0kyAkwof9o=; b=h1/sONmOV5oKQYKLoS05h12oPKcpJMGxO248ZeYiWUXE/nwigbWvvA73csrBlN1jYH JeAHVcVUn+hsHObJD0dXNvM2Jqcr7HGQw6b01HefKYGq3eG6demXr1thYxOgoT+65lnu NDocl3QiCcTzTXamekDYqaFL2qelWWAnu2LXOtHdwU0pF5h8xMdEI1rgPAEWSd3qNciP RFgkz8TOr2IhKIaHbx3EhzP5uZu+5XJGi6Tal8NF9NvJ1nYKaplWuWawfo7O/eRxcqa/ +638QlrXKPGjz3S9r8RC4Cc2CQ6JuYfNvAopPavSkZxAMAcwimnDTAuD1fPTb25XGUS6 /WFw== X-Gm-Message-State: AOJu0YyYq7j3w2LdcuwWjSltihIEyUZGdDN8EKPO8IO60qf/Y/sxLf7S bxoet06TeqCTAi+TC9pfTQNJRfpZ99cHKpr4TyP/GY45XCNUd5B6sXogEoR7gMY/FidXUieKcuO rZg== X-Google-Smtp-Source: AGHT+IFAwdWUgU8L+fmyq8LOw3rkRwJ+JYij58AB5fmmswPaHdzdbotiGjCx9a4S8K8Th7uD5GFWHw== X-Received: by 2002:a2e:beac:0:b0:2fb:955e:5c17 with SMTP id 38308e7fff4ca-2fdecc4d509mr108404421fa.40.1730820658545; Tue, 05 Nov 2024 07:30:58 -0800 (PST) Received: from localhost.localdomain (h082218084190.host.wavenet.at. [82.218.84.190]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6aae3fcsm1419415a12.21.2024.11.05.07.30.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 05 Nov 2024 07:30:57 -0800 (PST) From: Phil Dennis-Jordan To: qemu-devel@nongnu.org Cc: agraf@csgraf.de, phil@philjordan.eu, peter.maydell@linaro.org, pbonzini@redhat.com, rad@semihalf.com, quic_llindhol@quicinc.com, stefanha@redhat.com, mst@redhat.com, slp@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, gaosong@loongson.cn, jiaxun.yang@flygoat.com, chenhuacai@kernel.org, kwolf@redhat.com, hreitz@redhat.com, philmd@linaro.org, shorne@gmail.com, palmer@dabbelt.com, alistair.francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com, dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com, jcmvbkbc@gmail.com, marcandre.lureau@redhat.com, berrange@redhat.com, akihiko.odaki@daynix.com, qemu-arm@nongnu.org, qemu-block@nongnu.org, qemu-riscv@nongnu.org, Alexander Graf Subject: [PATCH v7 08/15] hvf: arm: Ignore writes to CNTP_CTL_EL0 Date: Tue, 5 Nov 2024 16:30:15 +0100 Message-Id: <20241105153022.91101-9-phil@philjordan.eu> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20241105153022.91101-1-phil@philjordan.eu> References: <20241105153022.91101-1-phil@philjordan.eu> MIME-Version: 1.0 Received-SPF: neutral client-ip=2a00:1450:4864:20::22d; envelope-from=phil@philjordan.eu; helo=mail-lj1-x22d.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NEUTRAL=0.779 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Alexander Graf MacOS unconditionally disables interrupts of the physical timer on boot and then continues to use the virtual one. We don't really want to support a full physical timer emulation, so let's just ignore those writes. Signed-off-by: Alexander Graf Signed-off-by: Phil Dennis-Jordan Reviewed-by: Akihiko Odaki --- target/arm/hvf/hvf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 6cea483d422..b45b764dfd0 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/log.h" #include "sysemu/runstate.h" #include "sysemu/hvf.h" @@ -184,6 +185,7 @@ void hvf_arm_init_debug(void) #define SYSREG_OSLSR_EL1 SYSREG(2, 0, 1, 1, 4) #define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4) #define SYSREG_CNTPCT_EL0 SYSREG(3, 3, 14, 0, 1) +#define SYSREG_CNTP_CTL_EL0 SYSREG(3, 3, 14, 2, 1) #define SYSREG_PMCR_EL0 SYSREG(3, 3, 9, 12, 0) #define SYSREG_PMUSERENR_EL0 SYSREG(3, 3, 9, 14, 0) #define SYSREG_PMCNTENSET_EL0 SYSREG(3, 3, 9, 12, 1) @@ -1620,6 +1622,13 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val) case SYSREG_OSLAR_EL1: env->cp15.oslsr_el1 = val & 1; return 0; + case SYSREG_CNTP_CTL_EL0: + /* + * Guests should not rely on the physical counter, but macOS emits + * disable writes to it. Let it do so, but ignore the requests. + */ + qemu_log_mask(LOG_UNIMP, "Unsupported write to CNTP_CTL_EL0\n"); + return 0; case SYSREG_OSDLR_EL1: /* Dummy register */ return 0;