Page MenuHomeFreeBSD
Differential D7154

Allocate non-contiguous pages for the ACPI wakeup handler
ClosedPublic
Actions

Authored by markj on Jul 8 2016, 12:46 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Nov 25, 6:10 PM
Unknown Object (File)
Oct 16 2024, 5:21 PM
Unknown Object (File)
Oct 4 2024, 2:58 PM
Unknown Object (File)
Oct 4 2024, 5:44 AM
Unknown Object (File)
Oct 2 2024, 1:55 PM
Unknown Object (File)
Oct 2 2024, 7:59 AM
Unknown Object (File)
Oct 1 2024, 7:21 PM
Unknown Object (File)
Oct 1 2024, 7:10 PM
View All 85 Files
Subscribers
imp

Details

Reviewers
kib
jkim
Commits
rS302793: Allow ACPI wakeup code and page tables to be stored in non-contiguous pages.
Summary

This implements the suggestion in D6945. With this change, we allocate
four pages. The first is used for the wakeup code, and on amd64 the last
three are used for page tables. This change makes it easier for the kernel
to satisfy the allocation request(s), without adding much complexity.

Test Plan

ACPI S3 suspend/resume on my Lenovo G580 laptop

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markj updated this revision to Diff 18216.Jul 8 2016, 12:46 AM
markj retitled this revision from to Allocate non-contiguous pages for the ACPI wakeup handler.
markj edited the test plan for this revision. (Show Details)
markj updated this object.
Herald added a subscriber: imp. · View Herald TranscriptJul 8 2016, 12:46 AM
markj updated this object.Jul 8 2016, 12:50 AM
markj edited the test plan for this revision. (Show Details)
markj added reviewers: kib, jkim.
kib accepted this revision.Jul 8 2016, 2:11 AM
kib edited edge metadata.
kib added inline comments.
sys/x86/acpica/acpi_wakeup.c
346 ↗(On Diff #18216)

For this to work, you should clear all pages in array before doing contigmalloc() loop.

This revision is now accepted and ready to land.Jul 8 2016, 2:11 AM
markj added inline comments.Jul 8 2016, 2:16 AM
sys/x86/acpica/acpi_wakeup.c
346 ↗(On Diff #18216)

Yikes, thanks. This array was static in an earlier revision, so I didn't bother.

markj updated this revision to Diff 18219.Jul 8 2016, 2:27 AM
markj edited edge metadata.
  • Zero out the page array to fix cleanup code.
This revision now requires review to proceed.Jul 8 2016, 2:27 AM
jkim requested changes to this revision.EditedJul 8 2016, 4:11 PM
jkim edited edge metadata.

WAKECODE_PADDR() and WAKECODE_VADDR() macros do nothing now. Please replace them with sc->acpi_wakephys and sc->acpi_wakeaddr.

This revision now requires changes to proceed.Jul 8 2016, 4:11 PM
jkim added a comment.EditedJul 8 2016, 4:21 PM

ACPI_PAGETABLES does nothing now. Please replace it with ACPI_WAKEPAGES, e.g.,

#ifdef __amd64__
#define ACPI_WAKEPAGES       4
#else
#define ACPI_WAKEPAGES       1
#endif
markj updated this revision to Diff 18222.Jul 8 2016, 4:27 PM
markj edited edge metadata.
  • Remove WAKECODE_{P,V}ADDR and ACPI_PAGETABLES.
markj added a comment.Jul 13 2016, 5:05 PM

Are there any further comments?

jkim added a comment.EditedJul 13 2016, 5:20 PM
In D7154#149808, @markj wrote:

Are there any further comments?

I am not sure the page tables are correct. I'll take a closer look when I find some free time today.

jkim accepted this revision.Jul 13 2016, 5:57 PM
jkim edited edge metadata.

Looks good. Please commit.

This revision is now accepted and ready to land.Jul 13 2016, 5:57 PM
Closed by commit rS302793: Allow ACPI wakeup code and page tables to be stored in non-contiguous pages. (authored by markj). · Explain WhyJul 14 2016, 12:38 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
head/
sys/
x86/
acpica/
87 lines

Diff 18395

View Options

head/sys/x86/acpica/acpi_wakeup.c

Loading...