Page MenuHomeFreeBSD
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
Unknown Object (File)
Thu, Nov 7, 9:30 AM
Unknown Object (File)
Tue, Nov 5, 9:11 AM
Unknown Object (File)
Sun, Oct 20, 10:16 PM
Unknown Object (File)
Wed, Oct 16, 5:25 PM
Unknown Object (File)
Wed, Oct 16, 5:25 PM
Unknown Object (File)
Tue, Oct 15, 1:02 PM
Unknown Object (File)
Tue, Oct 15, 1:02 PM
Unknown Object (File)
Mon, Oct 14, 12:35 PM
View All 80 Files
Subscribers
emaste
imp

Details

Reviewers
gnn
manu
Group Reviewers
arm64
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
gnn accepted this revision.Dec 21 2022, 3:11 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

PathSize
sys/
arm64/
arm64/
7 lines
dev/
hwpmc/
9 lines
6 lines
modules/
hwpmc/
2 lines

Diff 114402

View Options

sys/arm64/arm64/cmn600.c

Loading...
View Options

sys/dev/hwpmc/hwpmc_cmn600.c

Loading...
View Options

sys/dev/hwpmc/pmu_dmc620.c

Loading...
View Options

sys/modules/hwpmc/Makefile

Loading...