crosscore_int: add support for FREQ_SWITCH event
This commit is contained in:
parent
2e8441df9e
commit
566f018996
2 changed files with 57 additions and 24 deletions
|
@ -34,20 +34,25 @@
|
||||||
#include "freertos/portmacro.h"
|
#include "freertos/portmacro.h"
|
||||||
|
|
||||||
|
|
||||||
#define REASON_YIELD (1<<0)
|
#define REASON_YIELD BIT(0)
|
||||||
|
#define REASON_FREQ_SWITCH BIT(1)
|
||||||
|
|
||||||
static portMUX_TYPE reasonSpinlock = portMUX_INITIALIZER_UNLOCKED;
|
static portMUX_TYPE reason_spinlock = portMUX_INITIALIZER_UNLOCKED;
|
||||||
static volatile uint32_t reason[ portNUM_PROCESSORS ];
|
static volatile uint32_t reason[ portNUM_PROCESSORS ];
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
ToDo: There is a small chance the CPU already has yielded when this ISR is serviced. In that case, it's running the intended task but
|
ToDo: There is a small chance the CPU already has yielded when this ISR is serviced. In that case, it's running the intended task but
|
||||||
the ISR will cause it to switch _away_ from it. portYIELD_FROM_ISR will probably just schedule the task again, but have to check that.
|
the ISR will cause it to switch _away_ from it. portYIELD_FROM_ISR will probably just schedule the task again, but have to check that.
|
||||||
*/
|
*/
|
||||||
|
static void esp_crosscore_isr_handle_yield()
|
||||||
|
{
|
||||||
|
portYIELD_FROM_ISR();
|
||||||
|
}
|
||||||
|
|
||||||
static void IRAM_ATTR esp_crosscore_isr(void *arg) {
|
static void IRAM_ATTR esp_crosscore_isr(void *arg) {
|
||||||
uint32_t myReasonVal;
|
uint32_t my_reason_val;
|
||||||
//A pointer to the correct reason array item is passed to this ISR.
|
//A pointer to the correct reason array item is passed to this ISR.
|
||||||
volatile uint32_t *myReason=arg;
|
volatile uint32_t *my_reason=arg;
|
||||||
|
|
||||||
//Clear the interrupt first.
|
//Clear the interrupt first.
|
||||||
if (xPortGetCoreID()==0) {
|
if (xPortGetCoreID()==0) {
|
||||||
|
@ -56,43 +61,59 @@ static void IRAM_ATTR esp_crosscore_isr(void *arg) {
|
||||||
DPORT_WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_1_REG, 0);
|
DPORT_WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_1_REG, 0);
|
||||||
}
|
}
|
||||||
//Grab the reason and clear it.
|
//Grab the reason and clear it.
|
||||||
portENTER_CRITICAL(&reasonSpinlock);
|
portENTER_CRITICAL(&reason_spinlock);
|
||||||
myReasonVal=*myReason;
|
my_reason_val=*my_reason;
|
||||||
*myReason=0;
|
*my_reason=0;
|
||||||
portEXIT_CRITICAL(&reasonSpinlock);
|
portEXIT_CRITICAL(&reason_spinlock);
|
||||||
|
|
||||||
//Check what we need to do.
|
//Check what we need to do.
|
||||||
if (myReasonVal&REASON_YIELD) {
|
if (my_reason_val & REASON_YIELD) {
|
||||||
portYIELD_FROM_ISR();
|
esp_crosscore_isr_handle_yield();
|
||||||
|
}
|
||||||
|
if (my_reason_val & REASON_FREQ_SWITCH) {
|
||||||
|
/* Nothing to do here; the frequency switch event was already
|
||||||
|
* handled by a hook in xtensa_vectors.S. Could be used in the future
|
||||||
|
* to allow DFS features without the extra latency of the ISR hook.
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Initialize the crosscore interrupt on this core. Call this once
|
//Initialize the crosscore interrupt on this core. Call this once
|
||||||
//on each active core.
|
//on each active core.
|
||||||
void esp_crosscore_int_init() {
|
void esp_crosscore_int_init() {
|
||||||
portENTER_CRITICAL(&reasonSpinlock);
|
portENTER_CRITICAL(&reason_spinlock);
|
||||||
reason[xPortGetCoreID()]=0;
|
reason[xPortGetCoreID()]=0;
|
||||||
portEXIT_CRITICAL(&reasonSpinlock);
|
portEXIT_CRITICAL(&reason_spinlock);
|
||||||
esp_err_t err;
|
esp_err_t err;
|
||||||
if (xPortGetCoreID()==0) {
|
if (xPortGetCoreID()==0) {
|
||||||
err = esp_intr_alloc(ETS_FROM_CPU_INTR0_SOURCE, ESP_INTR_FLAG_IRAM, esp_crosscore_isr, (void*)&reason[xPortGetCoreID()], NULL);
|
err = esp_intr_alloc(ETS_FROM_CPU_INTR0_SOURCE, ESP_INTR_FLAG_IRAM, esp_crosscore_isr, (void*)&reason[0], NULL);
|
||||||
} else {
|
} else {
|
||||||
err = esp_intr_alloc(ETS_FROM_CPU_INTR1_SOURCE, ESP_INTR_FLAG_IRAM, esp_crosscore_isr, (void*)&reason[xPortGetCoreID()], NULL);
|
err = esp_intr_alloc(ETS_FROM_CPU_INTR1_SOURCE, ESP_INTR_FLAG_IRAM, esp_crosscore_isr, (void*)&reason[1], NULL);
|
||||||
}
|
}
|
||||||
assert(err == ESP_OK);
|
assert(err == ESP_OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IRAM_ATTR esp_crosscore_int_send_yield(int coreId) {
|
static void IRAM_ATTR esp_crosscore_int_send(int core_id, uint32_t reason_mask) {
|
||||||
assert(coreId<portNUM_PROCESSORS);
|
assert(core_id<portNUM_PROCESSORS);
|
||||||
//Mark the reason we interrupt the other CPU
|
//Mark the reason we interrupt the other CPU
|
||||||
portENTER_CRITICAL(&reasonSpinlock);
|
portENTER_CRITICAL(&reason_spinlock);
|
||||||
reason[coreId]|=REASON_YIELD;
|
reason[core_id] |= reason_mask;
|
||||||
portEXIT_CRITICAL(&reasonSpinlock);
|
portEXIT_CRITICAL(&reason_spinlock);
|
||||||
//Poke the other CPU.
|
//Poke the other CPU.
|
||||||
if (coreId==0) {
|
if (core_id==0) {
|
||||||
DPORT_WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_0_REG, DPORT_CPU_INTR_FROM_CPU_0);
|
DPORT_WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_0_REG, DPORT_CPU_INTR_FROM_CPU_0);
|
||||||
} else {
|
} else {
|
||||||
DPORT_WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_1_REG, DPORT_CPU_INTR_FROM_CPU_1);
|
DPORT_WRITE_PERI_REG(DPORT_CPU_INTR_FROM_CPU_1_REG, DPORT_CPU_INTR_FROM_CPU_1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void IRAM_ATTR esp_crosscore_int_send_yield(int core_id)
|
||||||
|
{
|
||||||
|
esp_crosscore_int_send(core_id, REASON_YIELD);
|
||||||
|
}
|
||||||
|
|
||||||
|
void IRAM_ATTR esp_crosscore_int_send_freq_switch(int core_id)
|
||||||
|
{
|
||||||
|
esp_crosscore_int_send(core_id, REASON_FREQ_SWITCH);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,20 @@ void esp_crosscore_int_init();
|
||||||
* This is used internally by FreeRTOS in multicore mode
|
* This is used internally by FreeRTOS in multicore mode
|
||||||
* and should not be called by the user.
|
* and should not be called by the user.
|
||||||
*
|
*
|
||||||
* @param coreID Core that should do the yielding
|
* @param core_id Core that should do the yielding
|
||||||
*/
|
*/
|
||||||
void esp_crosscore_int_send_yield(int coreId);
|
void esp_crosscore_int_send_yield(int core_id);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send an interrupt to a CPU indicating it should update its
|
||||||
|
* CCOMPARE1 value due to a frequency switch.
|
||||||
|
*
|
||||||
|
* This is used internally when dynamic frequency switching is
|
||||||
|
* enabled, and should not be called from application code.
|
||||||
|
*
|
||||||
|
* @param core_id Core that should update its CCOMPARE1 value
|
||||||
|
*/
|
||||||
|
void esp_crosscore_int_send_freq_switch(int core_id);
|
||||||
|
|
||||||
#endif
|
#endif
|
Loading…
Reference in a new issue