From nobody Mon Oct 17 10:39:09 2022 X-Original-To: dev-commits-src-all@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 4MrYQ536G5z4fX5H; Mon, 17 Oct 2022 10:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MrYQ52ZCRz3XD2; Mon, 17 Oct 2022 10:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666003149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OKBe+ri6PGqeWc3FMoQGq/XreWOxArkg+wEnGPVxQM=; b=Ki6R3Ng7WGUx9sk5L2fKuXDs087RH15cX855atrUMBZkKL+MzR4TmRnK/98rhwh49a82dG t2BZsbQ6ufJ/IW4xU4F/YVSPqjwbDSvats45Q+R1GTJ3gcu59p1THnigNGritXrF1OzFNh Pvm6xXB4OVxhq+OgqYfCqLDfqf+/or7O/YrOxYtKa7rVdCqijHbImNdVqh5SQcqcovrlDf WTTqiioFYOLgiV/ViAWiPzCMMg/c6qHj3S2B4lcyPHlPt5UPzJcrokKacS2Qn2dcTNDAxr CunpLcgcUq3bLyXYgz8qcV+k6dHSOJbDq83aL3/AeJiVtzJdg4ljQMHfMJmHpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MrYQ51bpbzmpL; Mon, 17 Oct 2022 10:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29HAd9Mm032707; Mon, 17 Oct 2022 10:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HAd9TP032706; Mon, 17 Oct 2022 10:39:09 GMT (envelope-from git) Date: Mon, 17 Oct 2022 10:39:09 GMT Message-Id: <202210171039.29HAd9TP032706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 85194e20d047 - stable/13 - Create macros for the Arm timer IRQ indexes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 85194e20d047bdefd835478452c6f318f4875c08 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666003149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+OKBe+ri6PGqeWc3FMoQGq/XreWOxArkg+wEnGPVxQM=; b=inpzTKq38d/J2bo365A4aZF4VN/g7k1iK3OeX7xt8FoCgAqM+fB47gPwuHCCY7rXdxOWbp p9G5KtTU1oLzzVX8Usi+CILt2f1RE6HY9xcXtj2Iq8PA6G2Z6okVeMvDwK2G+Ay4x7evAn WHaE6hsF+Jxg/gOWywOYSVjfV75LDfel/NbRxRK603xlg5/yY8fAo+mVpRuuarSVpq9vqL UHofsCvMOL48E6wK07V3Bb/pwRDFyJvQ2H/Q0OWIjkGj6aMUSY6Qq7DiICCL8J7B/xNEn+ u4d74cXsq2P5Nn6aaleyGvz3p5rL099M4F2uRq1e7Lr5ZOmnRV9nBItLOqj5eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666003149; a=rsa-sha256; cv=none; b=qX0fWjmO3vLOrAE+G6U4PMHRepL7cHBk0uhO76wEEibG37HtQe7u69as7IKkRwTXGH+AyQ OZYNhuifO/6JSXAW+pgvtRcxOwuqHaOB09TWMzw9RA8wZfslYxC2DF+MjN3XXFV9THHhA2 u68LZ8VqPz9bfoS9nXIdMh4PwvzC2u9PuZi+7SFpg1V1zo1nB24M+1ChH11J/M1nY0OVi3 w8eRqPl0EuGQsu/0u0YDlkDL5mEA93e+VKuLyl8ZeU3QvCUGCARa+2+aciwpF7BgStx+VK 9PzqN/8IWcl1b3iH52b0yjFUABz8awDzrKJkbSvBtlZEOQZJURPEzs7Hvimx6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=85194e20d047bdefd835478452c6f318f4875c08 commit 85194e20d047bdefd835478452c6f318f4875c08 Author: Andrew Turner AuthorDate: 2022-09-14 16:29:29 +0000 Commit: Andrew Turner CommitDate: 2022-10-17 08:41:54 +0000 Create macros for the Arm timer IRQ indexes Rather than hard coding these values use a macro to document which interrupt is being used. Reviewed by: emaste Obtained from: https://github.com/FreeBSD-UPB/freebsd-src (earlier version) Sponsored by: Innovate UK Sponsored by: The FreeBSD Foundation Sponsored by: University Politehnica of Bucharest Differential Revision: https://reviews.freebsd.org/D36600 (cherry picked from commit 9526031cd5606fe590ef69224d0db1af1603dcfe) --- sys/arm/arm/generic_timer.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index e3c54c237967..e465d1afbb3d 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -74,6 +74,12 @@ __FBSDID("$FreeBSD$"); #include #endif +#define GT_PHYS_SECURE 0 +#define GT_PHYS_NONSECURE 1 +#define GT_VIRT 2 +#define GT_HYP 3 +#define GT_IRQ_COUNT 4 + #define GT_CTRL_ENABLE (1 << 0) #define GT_CTRL_INT_MASK (1 << 1) #define GT_CTRL_INT_STAT (1 << 2) @@ -89,8 +95,8 @@ __FBSDID("$FreeBSD$"); #define GT_CNTKCTL_PL0PCTEN (1 << 0) /* PL0 CNTPCT and CNTFRQ access */ struct arm_tmr_softc { - struct resource *res[4]; - void *ihl[4]; + struct resource *res[GT_IRQ_COUNT]; + void *ihl[GT_IRQ_COUNT]; uint64_t (*get_cntxct)(bool); uint32_t clkfreq; struct eventtimer et; @@ -100,10 +106,10 @@ struct arm_tmr_softc { static struct arm_tmr_softc *arm_tmr_sc = NULL; static struct resource_spec timer_spec[] = { - { SYS_RES_IRQ, 0, RF_ACTIVE }, /* Secure */ - { SYS_RES_IRQ, 1, RF_ACTIVE }, /* Non-secure */ - { SYS_RES_IRQ, 2, RF_ACTIVE | RF_OPTIONAL }, /* Virt */ - { SYS_RES_IRQ, 3, RF_ACTIVE | RF_OPTIONAL }, /* Hyp */ + { SYS_RES_IRQ, GT_PHYS_SECURE, RF_ACTIVE }, + { SYS_RES_IRQ, GT_PHYS_NONSECURE, RF_ACTIVE }, + { SYS_RES_IRQ, GT_VIRT, RF_ACTIVE | RF_OPTIONAL }, + { SYS_RES_IRQ, GT_HYP, RF_ACTIVE | RF_OPTIONAL }, { -1, 0 } }; @@ -366,9 +372,12 @@ arm_tmr_acpi_identify(driver_t *driver, device_t parent) goto out; } - arm_tmr_acpi_add_irq(parent, dev, 0, gtdt->SecureEl1Interrupt); - arm_tmr_acpi_add_irq(parent, dev, 1, gtdt->NonSecureEl1Interrupt); - arm_tmr_acpi_add_irq(parent, dev, 2, gtdt->VirtualTimerInterrupt); + arm_tmr_acpi_add_irq(parent, dev, GT_PHYS_SECURE, + gtdt->SecureEl1Interrupt); + arm_tmr_acpi_add_irq(parent, dev, GT_PHYS_NONSECURE, + gtdt->NonSecureEl1Interrupt); + arm_tmr_acpi_add_irq(parent, dev, GT_VIRT, + gtdt->VirtualTimerInterrupt); out: acpi_unmap_table(gtdt); @@ -434,17 +443,17 @@ arm_tmr_attach(device_t dev) #ifdef __aarch64__ /* Use the virtual timer if we have one. */ - if (sc->res[2] != NULL) { + if (sc->res[GT_VIRT] != NULL) { sc->physical = false; - first_timer = 2; - last_timer = 2; + first_timer = GT_VIRT; + last_timer = GT_VIRT; } else #endif /* Otherwise set up the secure and non-secure physical timers. */ { sc->physical = true; - first_timer = 0; - last_timer = 1; + first_timer = GT_PHYS_SECURE; + last_timer = GT_PHYS_NONSECURE; } arm_tmr_sc = sc; @@ -463,7 +472,7 @@ arm_tmr_attach(device_t dev) } /* Disable the virtual timer until we are ready */ - if (sc->res[2] != NULL) + if (sc->res[GT_VIRT] != NULL) arm_tmr_disable(false); /* And the physical */ if (sc->physical)