sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary PMC burst loop

Browse Source
This commit is contained in:
Jeremy Soller 2020-02-17 14:38:01 -07:00
parent ebcb6af3f5
commit fa8447cd4d
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
3 changed files with 249 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
src/board/system76/darp5/pmc.c
View File

@ -54,99 +54,92 @@ void pmc_event(struct Pmc * pmc) {
static enum PmcState state = PMC_STATE_DEFAULT; static enum PmcState state = PMC_STATE_DEFAULT;
static uint8_t state_data = 0; static uint8_t state_data = 0;
uint8_t burst_timeout; uint8_t sts = pmc_status(pmc);
for (burst_timeout = 1; burst_timeout > 0; burst_timeout--) { if (!(sts & PMC_STS_OBF)) {
uint8_t sts = pmc_status(pmc); switch (state) {
if (!(sts & PMC_STS_OBF)) { case PMC_STATE_WRITE:
switch (state) { DEBUG("pmc write: %02X\n", state_data);
case PMC_STATE_WRITE:
DEBUG("pmc write: %02X\n", state_data);
state = PMC_STATE_DEFAULT;
pmc_write(pmc, state_data);
// Send SCI for OBF=1
pmc_sci_interrupt();
break;
}
}
if (sts & PMC_STS_IBF) {
uint8_t data = pmc_read(pmc);
if (sts & PMC_STS_CMD) {
DEBUG("pmc cmd: %02X\n", data);
state = PMC_STATE_DEFAULT; state = PMC_STATE_DEFAULT;
switch (data) { pmc_write(pmc, state_data);
case 0x80: // Send SCI for OBF=1
state = PMC_STATE_ACPI_READ; pmc_sci_interrupt();
// Send SCI for IBF=0 break;
pmc_sci_interrupt(); }
break; }
case 0x81:
state = PMC_STATE_ACPI_WRITE; if (sts & PMC_STS_IBF) {
// Send SCI for IBF=0 uint8_t data = pmc_read(pmc);
pmc_sci_interrupt(); if (sts & PMC_STS_CMD) {
break; DEBUG("pmc cmd: %02X\n", data);
case 0x82:
DEBUG(" burst enable\n");
// Run pmc_event in a tight loop for more iterations
burst_timeout = 100;
// Set burst bit
pmc_set_status(pmc, sts | (1 << 4));
// Send acknowledgement byte
state = PMC_STATE_WRITE;
state_data = 0x90;
break;
case 0x83:
DEBUG(" burst disable\n");
// Exit pmc_event tight loop
burst_timeout = 0;
// Clear burst bit
pmc_set_status(pmc, sts & ~(1 << 4));
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x84:
DEBUG(" SCI queue\n");
// Clear SCI pending bit
pmc_set_status(pmc, sts & ~(1 << 5));
// Send SCI queue
state = PMC_STATE_WRITE;
state_data = pmc_sci_queue;
// Clear SCI queue
pmc_sci_queue = 0;
break;
case 0xEC: state = PMC_STATE_DEFAULT;
DEBUG(" scratch rom\n"); switch (data) {
pmc_write(pmc, 0x76); case 0x80:
scratch_trampoline(); state = PMC_STATE_ACPI_READ;
break; // Send SCI for IBF=0
} pmc_sci_interrupt();
} else { break;
DEBUG("pmc data: %02X\n", data); case 0x81:
state = PMC_STATE_ACPI_WRITE;
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x82:
DEBUG(" burst enable\n");
// Set burst bit
pmc_set_status(pmc, sts | (1 << 4));
// Send acknowledgement byte
state = PMC_STATE_WRITE;
state_data = 0x90;
break;
case 0x83:
DEBUG(" burst disable\n");
// Clear burst bit
pmc_set_status(pmc, sts & ~(1 << 4));
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x84:
DEBUG(" SCI queue\n");
// Clear SCI pending bit
pmc_set_status(pmc, sts & ~(1 << 5));
// Send SCI queue
state = PMC_STATE_WRITE;
state_data = pmc_sci_queue;
// Clear SCI queue
pmc_sci_queue = 0;
break;
switch (state) { case 0xEC:
case PMC_STATE_ACPI_READ: DEBUG(" scratch rom\n");
// Send byte from ACPI space pmc_write(pmc, 0x76);
state = PMC_STATE_WRITE; scratch_trampoline();
state_data = acpi_read(data); break;
break; }
case PMC_STATE_ACPI_WRITE: } else {
state = PMC_STATE_ACPI_WRITE_ADDR; DEBUG("pmc data: %02X\n", data);
state_data = data;
// Send SCI for IBF=0 switch (state) {
pmc_sci_interrupt(); case PMC_STATE_ACPI_READ:
break; // Send byte from ACPI space
case PMC_STATE_ACPI_WRITE_ADDR: state = PMC_STATE_WRITE;
state = PMC_STATE_DEFAULT; state_data = acpi_read(data);
acpi_write(state_data, data); break;
// Send SCI for IBF=0 case PMC_STATE_ACPI_WRITE:
pmc_sci_interrupt(); state = PMC_STATE_ACPI_WRITE_ADDR;
break; state_data = data;
default: // Send SCI for IBF=0
state = PMC_STATE_DEFAULT; pmc_sci_interrupt();
break; break;
} case PMC_STATE_ACPI_WRITE_ADDR:
state = PMC_STATE_DEFAULT;
acpi_write(state_data, data);
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
default:
state = PMC_STATE_DEFAULT;
break;
} }
} }
} }

173
src/board/system76/galp3-c/pmc.c
View File

@ -54,99 +54,92 @@ void pmc_event(struct Pmc * pmc) {
static enum PmcState state = PMC_STATE_DEFAULT; static enum PmcState state = PMC_STATE_DEFAULT;
static uint8_t state_data = 0; static uint8_t state_data = 0;
uint8_t burst_timeout; uint8_t sts = pmc_status(pmc);
for (burst_timeout = 1; burst_timeout > 0; burst_timeout--) { if (!(sts & PMC_STS_OBF)) {
uint8_t sts = pmc_status(pmc); switch (state) {
if (!(sts & PMC_STS_OBF)) { case PMC_STATE_WRITE:
switch (state) { DEBUG("pmc write: %02X\n", state_data);
case PMC_STATE_WRITE:
DEBUG("pmc write: %02X\n", state_data);
state = PMC_STATE_DEFAULT;
pmc_write(pmc, state_data);
// Send SCI for OBF=1
pmc_sci_interrupt();
break;
}
}
if (sts & PMC_STS_IBF) {
uint8_t data = pmc_read(pmc);
if (sts & PMC_STS_CMD) {
DEBUG("pmc cmd: %02X\n", data);
state = PMC_STATE_DEFAULT; state = PMC_STATE_DEFAULT;
switch (data) { pmc_write(pmc, state_data);
case 0x80: // Send SCI for OBF=1
state = PMC_STATE_ACPI_READ; pmc_sci_interrupt();
// Send SCI for IBF=0 break;
pmc_sci_interrupt(); }
break; }
case 0x81:
state = PMC_STATE_ACPI_WRITE; if (sts & PMC_STS_IBF) {
// Send SCI for IBF=0 uint8_t data = pmc_read(pmc);
pmc_sci_interrupt(); if (sts & PMC_STS_CMD) {
break; DEBUG("pmc cmd: %02X\n", data);
case 0x82:
DEBUG(" burst enable\n");
// Run pmc_event in a tight loop for more iterations
burst_timeout = 100;
// Set burst bit
pmc_set_status(pmc, sts | (1 << 4));
// Send acknowledgement byte
state = PMC_STATE_WRITE;
state_data = 0x90;
break;
case 0x83:
DEBUG(" burst disable\n");
// Exit pmc_event tight loop
burst_timeout = 0;
// Clear burst bit
pmc_set_status(pmc, sts & ~(1 << 4));
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x84:
DEBUG(" SCI queue\n");
// Clear SCI pending bit
pmc_set_status(pmc, sts & ~(1 << 5));
// Send SCI queue
state = PMC_STATE_WRITE;
state_data = pmc_sci_queue;
// Clear SCI queue
pmc_sci_queue = 0;
break;
case 0xEC: state = PMC_STATE_DEFAULT;
DEBUG(" scratch rom\n"); switch (data) {
pmc_write(pmc, 0x76); case 0x80:
scratch_trampoline(); state = PMC_STATE_ACPI_READ;
break; // Send SCI for IBF=0
} pmc_sci_interrupt();
} else { break;
DEBUG("pmc data: %02X\n", data); case 0x81:
state = PMC_STATE_ACPI_WRITE;
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x82:
DEBUG(" burst enable\n");
// Set burst bit
pmc_set_status(pmc, sts | (1 << 4));
// Send acknowledgement byte
state = PMC_STATE_WRITE;
state_data = 0x90;
break;
case 0x83:
DEBUG(" burst disable\n");
// Clear burst bit
pmc_set_status(pmc, sts & ~(1 << 4));
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x84:
DEBUG(" SCI queue\n");
// Clear SCI pending bit
pmc_set_status(pmc, sts & ~(1 << 5));
// Send SCI queue
state = PMC_STATE_WRITE;
state_data = pmc_sci_queue;
// Clear SCI queue
pmc_sci_queue = 0;
break;
switch (state) { case 0xEC:
case PMC_STATE_ACPI_READ: DEBUG(" scratch rom\n");
// Send byte from ACPI space pmc_write(pmc, 0x76);
state = PMC_STATE_WRITE; scratch_trampoline();
state_data = acpi_read(data); break;
break; }
case PMC_STATE_ACPI_WRITE: } else {
state = PMC_STATE_ACPI_WRITE_ADDR; DEBUG("pmc data: %02X\n", data);
state_data = data;
// Send SCI for IBF=0 switch (state) {
pmc_sci_interrupt(); case PMC_STATE_ACPI_READ:
break; // Send byte from ACPI space
case PMC_STATE_ACPI_WRITE_ADDR: state = PMC_STATE_WRITE;
state = PMC_STATE_DEFAULT; state_data = acpi_read(data);
acpi_write(state_data, data); break;
// Send SCI for IBF=0 case PMC_STATE_ACPI_WRITE:
pmc_sci_interrupt(); state = PMC_STATE_ACPI_WRITE_ADDR;
break; state_data = data;
default: // Send SCI for IBF=0
state = PMC_STATE_DEFAULT; pmc_sci_interrupt();
break; break;
} case PMC_STATE_ACPI_WRITE_ADDR:
state = PMC_STATE_DEFAULT;
acpi_write(state_data, data);
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
default:
state = PMC_STATE_DEFAULT;
break;
} }
} }
} }

173
src/board/system76/lemp9/pmc.c
View File

@ -54,99 +54,92 @@ void pmc_event(struct Pmc * pmc) {
static enum PmcState state = PMC_STATE_DEFAULT; static enum PmcState state = PMC_STATE_DEFAULT;
static uint8_t state_data = 0; static uint8_t state_data = 0;
uint8_t burst_timeout; uint8_t sts = pmc_status(pmc);
for (burst_timeout = 1; burst_timeout > 0; burst_timeout--) { if (!(sts & PMC_STS_OBF)) {
uint8_t sts = pmc_status(pmc); switch (state) {
if (!(sts & PMC_STS_OBF)) { case PMC_STATE_WRITE:
switch (state) { DEBUG("pmc write: %02X\n", state_data);
case PMC_STATE_WRITE:
DEBUG("pmc write: %02X\n", state_data);
state = PMC_STATE_DEFAULT;
pmc_write(pmc, state_data);
// Send SCI for OBF=1
pmc_sci_interrupt();
break;
}
}
if (sts & PMC_STS_IBF) {
uint8_t data = pmc_read(pmc);
if (sts & PMC_STS_CMD) {
DEBUG("pmc cmd: %02X\n", data);
state = PMC_STATE_DEFAULT; state = PMC_STATE_DEFAULT;
switch (data) { pmc_write(pmc, state_data);
case 0x80: // Send SCI for OBF=1
state = PMC_STATE_ACPI_READ; pmc_sci_interrupt();
// Send SCI for IBF=0 break;
pmc_sci_interrupt(); }
break; }
case 0x81:
state = PMC_STATE_ACPI_WRITE; if (sts & PMC_STS_IBF) {
// Send SCI for IBF=0 uint8_t data = pmc_read(pmc);
pmc_sci_interrupt(); if (sts & PMC_STS_CMD) {
break; DEBUG("pmc cmd: %02X\n", data);
case 0x82:
DEBUG(" burst enable\n");
// Run pmc_event in a tight loop for more iterations
burst_timeout = 100;
// Set burst bit
pmc_set_status(pmc, sts | (1 << 4));
// Send acknowledgement byte
state = PMC_STATE_WRITE;
state_data = 0x90;
break;
case 0x83:
DEBUG(" burst disable\n");
// Exit pmc_event tight loop
burst_timeout = 0;
// Clear burst bit
pmc_set_status(pmc, sts & ~(1 << 4));
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x84:
DEBUG(" SCI queue\n");
// Clear SCI pending bit
pmc_set_status(pmc, sts & ~(1 << 5));
// Send SCI queue
state = PMC_STATE_WRITE;
state_data = pmc_sci_queue;
// Clear SCI queue
pmc_sci_queue = 0;
break;
case 0xEC: state = PMC_STATE_DEFAULT;
DEBUG(" scratch rom\n"); switch (data) {
pmc_write(pmc, 0x76); case 0x80:
scratch_trampoline(); state = PMC_STATE_ACPI_READ;
break; // Send SCI for IBF=0
} pmc_sci_interrupt();
} else { break;
DEBUG("pmc data: %02X\n", data); case 0x81:
state = PMC_STATE_ACPI_WRITE;
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x82:
DEBUG(" burst enable\n");
// Set burst bit
pmc_set_status(pmc, sts | (1 << 4));
// Send acknowledgement byte
state = PMC_STATE_WRITE;
state_data = 0x90;
break;
case 0x83:
DEBUG(" burst disable\n");
// Clear burst bit
pmc_set_status(pmc, sts & ~(1 << 4));
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
case 0x84:
DEBUG(" SCI queue\n");
// Clear SCI pending bit
pmc_set_status(pmc, sts & ~(1 << 5));
// Send SCI queue
state = PMC_STATE_WRITE;
state_data = pmc_sci_queue;
// Clear SCI queue
pmc_sci_queue = 0;
break;
switch (state) { case 0xEC:
case PMC_STATE_ACPI_READ: DEBUG(" scratch rom\n");
// Send byte from ACPI space pmc_write(pmc, 0x76);
state = PMC_STATE_WRITE; scratch_trampoline();
state_data = acpi_read(data); break;
break; }
case PMC_STATE_ACPI_WRITE: } else {
state = PMC_STATE_ACPI_WRITE_ADDR; DEBUG("pmc data: %02X\n", data);
state_data = data;
// Send SCI for IBF=0 switch (state) {
pmc_sci_interrupt(); case PMC_STATE_ACPI_READ:
break; // Send byte from ACPI space
case PMC_STATE_ACPI_WRITE_ADDR: state = PMC_STATE_WRITE;
state = PMC_STATE_DEFAULT; state_data = acpi_read(data);
acpi_write(state_data, data); break;
// Send SCI for IBF=0 case PMC_STATE_ACPI_WRITE:
pmc_sci_interrupt(); state = PMC_STATE_ACPI_WRITE_ADDR;
break; state_data = data;
default: // Send SCI for IBF=0
state = PMC_STATE_DEFAULT; pmc_sci_interrupt();
break; break;
} case PMC_STATE_ACPI_WRITE_ADDR:
state = PMC_STATE_DEFAULT;
acpi_write(state_data, data);
// Send SCI for IBF=0
pmc_sci_interrupt();
break;
default:
state = PMC_STATE_DEFAULT;
break;
} }
} }
} }