Paths

Table of Contentst

Differential D37773

Fix loading the hwpmc module when ACPI is enabled
ClosedPublic
Actions

Authored by andrew on Dec 21 2022, 1:36 PM.

Tags

None

Referenced Files

	F137677794: D37773.id114359.diff
	Mon, Nov 24, 9:24 PM

	Unknown Object (File)
	Mon, Nov 24, 8:38 AM

	Unknown Object (File)
	Mon, Nov 10, 6:34 AM

	Unknown Object (File)
	Wed, Oct 29, 6:48 PM

	Unknown Object (File)
	Wed, Oct 29, 5:47 PM

	Unknown Object (File)
	Wed, Oct 29, 3:57 PM

	Unknown Object (File)
	Oct 11 2025, 6:20 AM

	Unknown Object (File)
	Oct 9 2025, 6:25 PM

Subscribers

Details

Reviewers

gnn
manu

Group Reviewers

Commits

rG751d88119fdc: Fix loading the hwpmc module when ACPI is enabled

Summary

In 0a9a4d2cd6092 a check for OPT_ACPI was added to the hwpmc Makefile
to fix loading the module in a kernel where ACPI has been disabled.
This broke loading the module when ACPI was enabled in the build as
OPT_ACPI isn't a Makefile macro so was always disabled.

Move this check to the C files where the DEV_ACPI macro does exist.

Sponsored by: Arm Ltd

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

andrew created this revision.Dec 21 2022, 1:36 PM

Herald added a reviewer: gnn. · View Herald TranscriptDec 21 2022, 1:36 PM

Herald added a reviewer: manu. · View Herald Transcript

Herald added subscribers: emaste, imp. · View Herald Transcript

andrew requested review of this revision.Dec 21 2022, 1:36 PM

Harbormaster completed remote builds in B48786: Diff 114359.Dec 21 2022, 1:36 PM

andrew added a parent revision: D37772: Check for the IORT before adding the ITS driver.Dec 21 2022, 1:36 PM

andrew added a reviewer: arm64.Dec 21 2022, 1:37 PM

LGTM

This revision is now accepted and ready to land.Dec 21 2022, 3:11 PM

emaste added inline comments.Dec 21 2022, 3:19 PM

sys/arm64/arm64/cmn600.c
1–2	We should update the `SPDX` tag while here

Closed by commit rG751d88119fdc: Fix loading the hwpmc module when ACPI is enabled (authored by andrew). · Explain WhyDec 22 2022, 10:46 AM

This revision was automatically updated to reflect the committed changes.

andrew added a commit: rG751d88119fdc: Fix loading the hwpmc module when ACPI is enabled.

jhb added a reverting change: D38736: hwpmc: Don't wrap entire files in #ifdef DEV_ACPI..Feb 22 2023, 10:02 PM

jhb added a reverting change: rGd90188eff5c5: hwpmc: Don't wrap entire files in #ifdef DEV_ACPI..Mar 1 2023, 6:33 PM

Revision Contents
Changeset List

Path

Size

sys/

arm64/

arm64/

7 lines

dev/

hwpmc/

9 lines

6 lines

modules/

hwpmc/

2 lines

Diff 114402

sys/arm64/arm64/cmn600.c

Loading...

sys/dev/hwpmc/hwpmc_cmn600.c

Loading...

sys/dev/hwpmc/pmu_dmc620.c

Loading...

sys/modules/hwpmc/Makefile

Loading...