From nobody Wed Mar 1 18:32:58 2023 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 4PRjXV444jz3vBgj; Wed, 1 Mar 2023 18:32:58 +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 4PRjXV3NMVz46dP; Wed, 1 Mar 2023 18:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695578; 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=aXasxH+BT7i9uzTS6CuabTUWXaZGBegEJLsIBoIEeyo=; b=LQX9pC+6ZYy7R1Qr9kPqhUzjcSh0Q3LBfYa4IDRLnmNSofz9U4q1KcWAl0YXRh9HhVuMGb gMORcgfy8PEiUrH/174ZoVyym3aiVDwQ9VCRkVxbOiqHS1zAke4jKEyqXmr3lHRlJXHlhU 7IKzBS6jzuDti78LL5t0E15m7UboTc+oZNFlw31qcJJG5NvZgCYtWdhpZ2GPzZS8xIYkQ0 Kjq0l738TEpPsFep5vYNskrn+PSMPXPJuO99H+t7K4wbQclBePnif/UPZZfBPUDuQaHMdX 9k/nO0n494NM1jDU+JTRjLHKnp6qSc8LHWyNtCkIRLo/55J+UTawxltGmDTCVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695578; 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=aXasxH+BT7i9uzTS6CuabTUWXaZGBegEJLsIBoIEeyo=; b=NjHcGAk9fSblc8CvW7gTh3vzPImL/9vhtKYd5r1LVDQppWJSM2hfA2zj1r7eJY3G7xkuOA k3MrEImslD1ucB6avpXNCHRFGiCEJBX59He/ZfshEx4HNuh9hIPEFGmxCUTWMq8CY8TcDT ZxdoVq5eYdW5WVdDoiFe5SosjYz73NYis1yRzkcBPmE7Ni8oNBtj1prh36NkePxwB3FpNO WQsqmV/vyzUCCbUjInh/qpwjOwTO3GQZthU/cL1MQwNMWnAfKzUCp3gcXGAMeW1JoNWB25 KNAwmSk6RhSKTW947p41rCBT2sb2F/RtF42HTtwHKnOivIJoJ7IuFwAgo4iVsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677695578; a=rsa-sha256; cv=none; b=jos7Z2JUvaCYfFBWVvRt1seDn7cSHGJSGMJIHTCGeWf0HLL1lStL0R08SM+R769N8r7ynZ ZICbexK2rDDykz1Hx/EyR4E0tHwwLsy3b26+7hKeRs0fepy/zNHckTIxI21wzW6iARsHQ2 AnWnSR9Dl3NZUDdiu7/1FYRxYWghNBpI2g4yFe1xdjNYseB99mh7759Qg7EOaLwuTAcYWe LwkxHgn4YPt+z3gpCcjtt+UUJBT+O1TNs1uzIftZy4BoP+/AY5jIgUQjBlzCXbEAk8UfqU b3gguoSah089ZngJyvtNu9zy/p0U11/PkK93AIU8W/dYGmIv/aCbQ4qpcLubgg== 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 4PRjXV2PBCzl4t; Wed, 1 Mar 2023 18:32:58 +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 321IWwZW099785; Wed, 1 Mar 2023 18:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IWwLL099784; Wed, 1 Mar 2023 18:32:58 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:32:58 GMT Message-Id: <202303011832.321IWwLL099784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d90188eff5c5 - main - hwpmc: Don't wrap entire files in #ifdef DEV_ACPI. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d90188eff5c5e67d6d33926d6bb4c7b25e37cc4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d90188eff5c5e67d6d33926d6bb4c7b25e37cc4a commit d90188eff5c5e67d6d33926d6bb4c7b25e37cc4a Author: John Baldwin AuthorDate: 2023-03-01 18:31:53 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:31:53 +0000 hwpmc: Don't wrap entire files in #ifdef DEV_ACPI. A subsequent commit will instead use existing infrastructure to exclude the files from hwpmc.ko for non-ACPI builds. Note that the original commit left the files as optional in sys/conf/files.arm64. This reverts commit 751d88119fdc1dff71d1390c7768942a9b857bc6. Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D38736 --- sys/arm64/arm64/cmn600.c | 7 +------ sys/dev/hwpmc/hwpmc_cmn600.c | 9 +-------- sys/dev/hwpmc/pmu_dmc620.c | 6 ------ sys/modules/hwpmc/Makefile | 2 ++ 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/sys/arm64/arm64/cmn600.c b/sys/arm64/arm64/cmn600.c index c01abc444c8e..e71afa7c6a6c 100644 --- a/sys/arm64/arm64/cmn600.c +++ b/sys/arm64/arm64/cmn600.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2021-2022 Arm Ltd + * Copyright (c) 2021 ARM Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,10 +34,6 @@ __FBSDID("$FreeBSD$"); #include "opt_acpi.h" -/* - * This depends on ACPI, but is built unconditionally in the hwpmc module. - */ -#ifdef DEV_ACPI #include #include #include @@ -835,4 +831,3 @@ static driver_t cmn600_acpi_driver = { DRIVER_MODULE(cmn600, acpi, cmn600_acpi_driver, 0, 0); MODULE_VERSION(cmn600, 1); -#endif /* DEV_ACPI */ diff --git a/sys/dev/hwpmc/hwpmc_cmn600.c b/sys/dev/hwpmc/hwpmc_cmn600.c index 700a680514a9..fe98fdf969fc 100644 --- a/sys/dev/hwpmc/hwpmc_cmn600.c +++ b/sys/dev/hwpmc/hwpmc_cmn600.c @@ -3,7 +3,7 @@ * * Copyright (c) 2003-2008 Joseph Koshy * Copyright (c) 2007 The FreeBSD Foundation - * Copyright (c) 2021-2022 ARM Ltd + * Copyright (c) 2021 ARM Ltd * * Portions of this software were developed by A. Joseph Koshy under * sponsorship from the FreeBSD Foundation and Google, Inc. @@ -35,12 +35,6 @@ #include __FBSDID("$FreeBSD$"); -#include "opt_acpi.h" - -/* - * This depends on ACPI, but is built unconditionally in the hwpmc module. - */ -#ifdef DEV_ACPI #include #include #include @@ -830,4 +824,3 @@ pmc_cmn600_finalize(struct pmc_mdep *md) } MODULE_DEPEND(pmc, cmn600, 1, 1, 1); -#endif /* DEV_ACPI */ diff --git a/sys/dev/hwpmc/pmu_dmc620.c b/sys/dev/hwpmc/pmu_dmc620.c index 87efcc8b2b11..e8a9d83d4251 100644 --- a/sys/dev/hwpmc/pmu_dmc620.c +++ b/sys/dev/hwpmc/pmu_dmc620.c @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021 Ampere Computing LLC - * Copyright (c) 2022 Arm Ltd * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,10 +33,6 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" #include "opt_acpi.h" -/* - * This depends on ACPI, but is built unconditionally in the hwpmc module. - */ -#ifdef DEV_ACPI #include #include #include @@ -280,4 +275,3 @@ DRIVER_MODULE(pmu_dmc620, acpi, pmu_dmc620_acpi_driver, 0, 0); /* Reverse dependency. hwpmc needs DMC-620 on ARM64. */ MODULE_DEPEND(pmc, pmu_dmc620, 1, 1, 1); MODULE_VERSION(pmu_dmc620, 1); -#endif /* DEV_ACPI */ diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile index 0db4c55e64f3..a72b3cf8d2fd 100644 --- a/sys/modules/hwpmc/Makefile +++ b/sys/modules/hwpmc/Makefile @@ -12,9 +12,11 @@ SRCS+= vnode_if.h .if ${MACHINE_CPUARCH} == "aarch64" SRCS+= hwpmc_arm64.c hwpmc_arm64_md.c +.if !empty(OPT_ACPI) SRCS+= cmn600.c hwpmc_cmn600.c SRCS+= hwpmc_dmc620.c pmu_dmc620.c .endif +.endif .if ${MACHINE_CPUARCH} == "amd64" SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_tsc.c