From nobody Thu Sep 25 18:49:16 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cXjS10Dldz68RgR for ; Thu, 25 Sep 2025 18:49:21 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Received: from mail-yw1-x1130.google.com (mail-yw1-x1130.google.com [IPv6:2607:f8b0:4864:20::1130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXjRz2C9Zz3wdx for ; Thu, 25 Sep 2025 18:49:19 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=MUFpz79l; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of ahmadkhalifa570@gmail.com designates 2607:f8b0:4864:20::1130 as permitted sender) smtp.mailfrom=ahmadkhalifa570@gmail.com Received: by mail-yw1-x1130.google.com with SMTP id 00721157ae682-71d603acc23so12962067b3.1 for ; Thu, 25 Sep 2025 11:49:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758826157; x=1759430957; darn=freebsd.org; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9dbIQgdhupUMBqcwIO+ckxFLXSrd+izAuVjWMCR0cKU=; b=MUFpz79l3gQEu7onvf1vYL6d61Hm1Bm0SDzH7WEqqXb2FurTrAa8Z5hAUMGEXnbDP4 DpdS0LMlZRw7p3sgi2nxNGAoLSDCaXjw3XYS7YUJpr3Fhp0vdyI27G3GASakq6nM6Llq MXiUkBN+bw94vPK8/54VqHEDanwl7oV6LjscdwwXaKdwW2Y8zCiPUITrZzhqCiRjyROG FRe7wjou0XACjPPY4KogUz2NDijMi2Uii43qFx69BodyP0ElPIcCRnUIbvjBm1AuZ2Ft dgzfHObj/M8Ra4jslRFS85zEz6NuIB6vY9Rr2ED4E0mdgErrWezWaJ5fSmm6OplBy82q MUkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758826157; x=1759430957; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9dbIQgdhupUMBqcwIO+ckxFLXSrd+izAuVjWMCR0cKU=; b=S8s3iQErE3YlNCYwoDHgyGkI0C/ab6Bsj5v8+R3XPMqWyxjKqGXFkCnewM5laehS0R OE9Ah+3fZjn7T4sNRdz0DD5sVXmO17hDmhVq2UD2NNAid4IfMiFQ33fCZL/VLi7kA9NN T6CZ2LV+ISMWHi0quiUzoCwDHBR3zPJnWl0oLPAvT2k63r/LLSX3soaC4jWrJ1LFafDk qmh+nIQ6YpbYS1ECP4tdzvQ+Z9DWKPaDMVDkFGPwY+TzDXwCzl04tEfC90A6zHoO1xdZ xoXUlkbwZC2vMICSiJKe6rRNpcWtQR/MHDrZWj07aMEO6QJzYLnCJo3C42Uhc+/gkm2y ac1w== X-Forwarded-Encrypted: i=1; AJvYcCV57ayrTW/ZVP9hef7V7K1Iz+pQpvnlfyibH63br77KmWD1sbMPkxaYNGRoXiOZF32ZUnZBzO3WbyluFxLdVIIGMKRsaA==@freebsd.org X-Gm-Message-State: AOJu0YzkJgBQ33gSkEECObBUitSO+xyfKlHlfH2Q3Mx1yknAlUEg7jRq cljoXdTOE0LHo6yU61eBTSsyM70ggYt165n8ynh3u+mXx8cmiMI7DEA3085y/R42WAVB7bA95j1 F6xUSk3htKcwn4j3JTAnrjHML6ts14oFrhJHb X-Gm-Gg: ASbGncvMGmc8C1eSnd1xL+e5vrLzR2peqllRURUMjq52rHpsNCvBKczIqDQlxDgb9ZA hQAWTx4cJpz2WohT+P5aQqrIryFvFMvEGMCe55a7N2PgHZuqGe4eBLxxQM1TduCh91kSfJ2pFWD YkS5jAp67HT2hc1t3G2WTHAwgiazcqiM17De0JsgQw6yzhWXsSxkFHnbNVxCFB5ADyldrMEXB8B WKLNPF+wA== X-Google-Smtp-Source: AGHT+IFPvQKRWXYqYtK/kCbRVg5Wyj71GfJoDkjTQ1fmswhijb1KRsMS8fB6dRvMSgskNmsxImvt4Qj1dVvLYfK7hlY= X-Received: by 2002:a05:690e:2442:b0:628:2e16:6566 with SMTP id 956f58d0204a3-6361a5ef399mr2622803d50.0.1758826157316; Thu, 25 Sep 2025 11:49:17 -0700 (PDT) Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Thu, 25 Sep 2025 11:49:16 -0700 Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Thu, 25 Sep 2025 11:49:16 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 From: Ahmad Khalifa X-Mailer: aerc 0.21.0 References: <202509231709.58NH9XaU077251@gitrepo.freebsd.org> In-Reply-To: <202509231709.58NH9XaU077251@gitrepo.freebsd.org> Date: Thu, 25 Sep 2025 11:49:16 -0700 X-Gm-Features: AS18NWDZfpONaI0aInDzIMUrwYyE_AKGhj8p6vxI3NP_j9miz8TbqFtFBgghZz8 Message-ID: Subject: Re: git: f38792ffc2db - main - arm64/vmm: Clean up enabling guest timer access To: Andrew Turner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1130:from]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; DKIM_TRACE(0.00)[gmail.com:+] X-Rspamd-Queue-Id: 4cXjRz2C9Zz3wdx On Tue Sep 23, 2025 at 8:09 PM +0300, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f38792ffc2db67ca82026eb4861f37fe7ac7c38e > > commit f38792ffc2db67ca82026eb4861f37fe7ac7c38e > Author: Andrew Turner > AuthorDate: 2025-09-22 17:08:06 +0000 > Commit: Andrew Turner > CommitDate: 2025-09-23 17:08:36 +0000 > > arm64/vmm: Clean up enabling guest timer access > > Clean up the name of CNTHCTL_EL2 field macros and expand to include > more fields. This makes it easier to see which accesses are trapped or > not trapped. > > While here set the register directly. We already set it in locore.S so > there is no need to read that and modify it. > > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D51817 > --- > sys/arm64/arm64/locore.S | 4 +-- > sys/arm64/include/hypervisor.h | 79 ++++++++++++++++++++++++++++++++++++------ > sys/arm64/vmm/io/vtimer.c | 31 ++++++++++------- > 3 files changed, 88 insertions(+), 26 deletions(-) > > diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S > index 50a3eda846da..d35e334905a7 100644 > --- a/sys/arm64/arm64/locore.S > +++ b/sys/arm64/arm64/locore.S > @@ -418,7 +418,7 @@ LENTRY(enter_kernel_el) > > msr SCTLR_EL12_REG, x2 > mov x2, xzr /* CPTR_EL2 is managed by vfp.c */ > - ldr x3, =(CNTHCTL_E2H_EL1PCTEN | CNTHCTL_E2H_EL1PTEN) > + ldr x3, =(CNTHCTL_E2H_EL1PCTEN_NOTRAP | CNTHCTL_E2H_EL1PTEN_NOTRAP) > ldr x5, =(PSR_DAIF | PSR_M_EL2h) > b .Ldone_vhe Just an FYI: The clang-14 cross build fails on this. Seems like it doesn't like having a suffix on the integer literal. /home/runner/work/freebsd-src/freebsd-src/sys/arm64/arm64/locore.S:421:16: error: expected ')' ldr x3, =((0x1ul << 10) | (0x1ul << 11)) ^ /home/runner/work/freebsd-src/freebsd-src/sys/arm64/arm64/locore.S:432:16: error: expected ')' ldr x3, =((0x1ul << 0) | (0x1ul << 1)) ^ --- locore.o --- *** [locore.o] Error code 1 https://github.com/freebsd/freebsd-src/actions/runs/18014912022/job/51257258696