Skip to content

Revert "pm: allow reset when reset type is set" #83

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

Merged
kwd-doodling merged 1 commit into from
Aug 28, 2026
Merged

Revert "pm: allow reset when reset type is set" #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion bsp_sedi/soc/intel_ish/pm/aon/include/ish_registers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
#define PMU_RST_PREP (SEDI_REG_BASE(PMU) + 0x5c)
#define PMU_RST_PREP_GET BIT(0)
#define PMU_RST_PREP_AVAIL BIT(1)
#define PMU_RST_PREP_RESET_TYPE 0x3FC
#define PMU_RST_PREP_INT_MASK BIT(31)

#define VNN_ID_DMA0 4
Expand Down
12 changes: 2 additions & 10 deletions bsp_sedi/soc/intel_ish/pm/aon/ish_aontask.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#define AON_IDT_ENTRY_VEC_FIRST SEDI_VEC_RESET_PREP
#define AON_IDT_ENTRY_VEC_LAST SEDI_VEC_PMU2IOAPIC

#define PMU_RST_AP_REBOOT 0x40
static void handle_reset(enum ish_pm_state pm_state);

/* ISR for PMU wakeup interrupt */
Expand Down Expand Up @@ -653,8 +652,6 @@ static void sram_exit_sleep_mode(void)

static void handle_d0i2(void)
{
uint32_t reg_val;

ish_pg_exit_save_ctx();
aon_share.pg_exit = 0;

Expand Down Expand Up @@ -701,9 +698,7 @@ static void handle_d0i2(void)
continue;
#endif

reg_val = read32(PMU_RST_PREP);
if ((reg_val & PMU_RST_PREP_AVAIL) ||
((reg_val & PMU_RST_PREP_RESET_TYPE) == PMU_RST_AP_REBOOT)) {
if (read32(PMU_RST_PREP) & PMU_RST_PREP_AVAIL) {
handle_reset(ISH_PM_STATE_RESET_PREP);
}

Expand All @@ -715,7 +710,6 @@ static void handle_d0i2(void)
static void handle_d0i3(void)
{
int ret;
uint32_t reg_val;

ish_pg_exit_save_ctx();
aon_share.pg_exit = 0;
Expand Down Expand Up @@ -749,9 +743,7 @@ static void handle_d0i3(void)

clear_vnnred_aoncg();

reg_val = read32(PMU_RST_PREP);
if ((reg_val & PMU_RST_PREP_AVAIL) ||
((reg_val & PMU_RST_PREP_RESET_TYPE) == PMU_RST_AP_REBOOT)) {
if (read32(PMU_RST_PREP) & PMU_RST_PREP_AVAIL) {
handle_reset(ISH_PM_STATE_RESET_PREP);
}

Expand Down
Loading