Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ets intr lock nest #6484

Merged
merged 10 commits into from
Sep 11, 2019
Merged

Ets intr lock nest #6484

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f9281f
Replace the SDK's use of ets_intr_lock/unlock with nestable versions
ChocolateFrogsNuts Sep 1, 2019
7fd5307
make ets_intr_lock_stack uint16_t and behave like the original on ove…
ChocolateFrogsNuts Sep 3, 2019
e5177ac
Rename ets_intr_(un)lock_nest to ets_intr_(un)lock
ChocolateFrogsNuts Sep 3, 2019
78da5b7
Remove ets_intr_(un)lock from the rom .ld as we no longer use them
ChocolateFrogsNuts Sep 4, 2019
ce22692
ets_post() wrapper to preserve interrupt state
ChocolateFrogsNuts Sep 8, 2019
29da3fe
Add IRAM_ATTR to ets_intr_(un)lock and ets_post wrappers.
ChocolateFrogsNuts Sep 9, 2019
89ca430
Merge branch 'master' into ets_intr_lock_nest
earlephilhower Sep 9, 2019
4203e3f
Throw in a few comments and make ets_intr_lock_stack* static.
ChocolateFrogsNuts Sep 10, 2019
cf1da0e
Merge branch 'ets_intr_lock_nest' of https://github.com/ChocolateFrog…
ChocolateFrogsNuts Sep 10, 2019
6c21ed8
Merge branch 'master' into ets_intr_lock_nest
devyte Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions cores/esp8266/core_esp8266_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ static os_event_t s_loop_queue[LOOP_QUEUE_SIZE];
/* Used to implement optimistic_yield */
static uint32_t s_micros_at_task_start;

/* For ets_intr_lock_nest / ets_intr_unlock_nest
* Max nesting seen by SDK so far is 2.
*/
#define ETS_INTR_LOCK_NEST_MAX 7
static uint16_t ets_intr_lock_stack[ETS_INTR_LOCK_NEST_MAX];
static byte ets_intr_lock_stack_ptr=0;


extern "C" {
extern const uint32_t __attribute__((section(".ver_number"))) core_version = ARDUINO_ESP8266_GIT_VER;
Expand Down Expand Up @@ -121,6 +128,35 @@ extern "C" void optimistic_yield(uint32_t interval_us) {
}
}


// Replace ets_intr_(un)lock with nestable versions
extern "C" void IRAM_ATTR ets_intr_lock() {
if (ets_intr_lock_stack_ptr < ETS_INTR_LOCK_NEST_MAX)
ets_intr_lock_stack[ets_intr_lock_stack_ptr++] = xt_rsil(3);
else
xt_rsil(3);
}

extern "C" void IRAM_ATTR ets_intr_unlock() {
if (ets_intr_lock_stack_ptr > 0)
xt_wsr_ps(ets_intr_lock_stack[--ets_intr_lock_stack_ptr]);
else
xt_rsil(0);
}


// Save / Restore the PS state across the rom ets_post call as the rom code
// does not implement this correctly.
extern "C" bool ets_post_rom(uint8 prio, ETSSignal sig, ETSParam par);

extern "C" bool IRAM_ATTR ets_post(uint8 prio, ETSSignal sig, ETSParam par) {
uint32_t saved;
asm volatile ("rsr %0,ps":"=a" (saved));
bool rc=ets_post_rom(prio, sig, par);
xt_wsr_ps(saved);
return rc;
}

extern "C" void __loop_end (void)
{
run_scheduled_functions();
Expand Down
5 changes: 5 additions & 0 deletions tools/sdk/ld/eagle.rom.addr.v6.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,21 @@ PROVIDE ( ets_install_external_printf = 0x40002450 );
PROVIDE ( ets_install_putc1 = 0x4000242c );
PROVIDE ( ets_install_putc2 = 0x4000248c );
PROVIDE ( ets_install_uart_printf = 0x40002438 );
/* permanently hide reimplemented ets_intr_*lock(), see #6484
PROVIDE ( ets_intr_lock = 0x40000f74 );
PROVIDE ( ets_intr_unlock = 0x40000f80 );
*/
PROVIDE ( ets_isr_attach = 0x40000f88 );
PROVIDE ( ets_isr_mask = 0x40000f98 );
PROVIDE ( ets_isr_unmask = 0x40000fa8 );
PROVIDE ( ets_memcmp = 0x400018d4 );
PROVIDE ( ets_memcpy = 0x400018b4 );
PROVIDE ( ets_memmove = 0x400018c4 );
PROVIDE ( ets_memset = 0x400018a4 );
/* renamed to ets_post_rom(), see #6484
PROVIDE ( ets_post = 0x40000e24 );
*/
PROVIDE ( ets_post_rom = 0x40000e24 );
PROVIDE ( ets_printf = 0x400024cc );
PROVIDE ( ets_putc = 0x40002be8 );
PROVIDE ( ets_rtc_int_register = 0x40002a40 );
Expand Down