platform: msm_shared: integrate dload & normal reboot reason in a function
Integrate dload & normal reboot reason in a function, so that it could
avoid the normal reboot reason macro collision with dload mode.
Change-Id: Icc7c9d465e6c993d71e84bd793c5650bf51a4d28
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index e118136..2f8a853 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -3622,15 +3622,9 @@
if (keys_get_state(KEY_VOLUMEUP) && keys_get_state(KEY_VOLUMEDOWN))
{
dprintf(ALWAYS,"dload mode key sequence detected\n");
- if (set_download_mode(EMERGENCY_DLOAD))
- {
- dprintf(CRITICAL,"dload mode not supported by target\n");
- }
- else
- {
- reboot_device(DLOAD);
- dprintf(CRITICAL,"Failed to reboot into dload mode\n");
- }
+ reboot_device(EMERGENCY_DLOAD);
+ dprintf(CRITICAL,"Failed to reboot into dload mode\n");
+
boot_into_fastboot = true;
}
if (!boot_into_fastboot)
diff --git a/include/platform.h b/include/platform.h
index 31de506..f97273a 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -58,7 +58,7 @@
uint32_t check_alarm_boot(void);
void platform_uninit_timer(void);
void reboot_device(unsigned);
-int set_download_mode(enum dload_mode mode);
+int set_download_mode(enum reboot_reason mode);
uint32_t platform_get_smem_base_addr();
uint32_t platform_get_sclk_count(void);
void clock_config_cdc(uint32_t interface);
diff --git a/platform/msm_shared/debug.c b/platform/msm_shared/debug.c
index b8c3266..7c5a9b1 100644
--- a/platform/msm_shared/debug.c
+++ b/platform/msm_shared/debug.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2009, Google Inc.
* All rights reserved.
- * Copyright (c) 2009-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -151,16 +151,9 @@
#if PON_VIB_SUPPORT
vib_turn_off();
#endif
- if (set_download_mode(NORMAL_DLOAD) == 0)
- {
- dprintf(CRITICAL, "HALT: reboot into dload mode...\n");
- reboot_device(DLOAD);
- dprintf(CRITICAL, "HALT: reboot_device failed\n");
- }
- else
- {
- dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
- }
+ dprintf(CRITICAL, "HALT: reboot into dload mode...\n");
+ reboot_device(NORMAL_DLOAD);
+
dprintf(CRITICAL, "HALT: spinning forever...\n");
for (;;) ;
}
diff --git a/platform/msm_shared/dload_util.c b/platform/msm_shared/dload_util.c
index 7455a19..58f498a 100644
--- a/platform/msm_shared/dload_util.c
+++ b/platform/msm_shared/dload_util.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013, 2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -38,7 +38,7 @@
#define EMERGENCY_DLOAD_COOKIE_2 0x77777777
void dload_util_write_cookie(uint32_t target_dload_mode_addr,
- enum dload_mode mode)
+ enum reboot_reason mode)
{
if (mode == NORMAL_DLOAD)
{
@@ -46,7 +46,7 @@
writel(NORMAL_DLOAD_COOKIE_1,
target_dload_mode_addr + sizeof(uint32_t));
}
- else
+ else if (mode == EMERGENCY_DLOAD)
{
writel(EMERGENCY_DLOAD_COOKIE_0, target_dload_mode_addr);
writel(EMERGENCY_DLOAD_COOKIE_1,
diff --git a/platform/msm_shared/include/dload_util.h b/platform/msm_shared/include/dload_util.h
index d8e02b0..8f691e5 100644
--- a/platform/msm_shared/include/dload_util.h
+++ b/platform/msm_shared/include/dload_util.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013, 2016, The Linux Foundation. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,16 +30,9 @@
#define __DLOAD_UTIL_H
#include <sys/types.h>
-
-#define DLOAD 1
-
-enum dload_mode {
- NORMAL_DLOAD,
- EMERGENCY_DLOAD,
- NORMAL_MODE
-};
+#include <reboot.h>
void dload_util_write_cookie(uint32_t target_dload_mode_addr,
- enum dload_mode mode);
+ enum reboot_reason mode);
#endif
diff --git a/platform/msm_shared/include/scm.h b/platform/msm_shared/include/scm.h
index 2d454ed..8d81b29 100644
--- a/platform/msm_shared/include/scm.h
+++ b/platform/msm_shared/include/scm.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -29,6 +29,8 @@
#ifndef __SCM_H__
#define __SCM_H__
+#include <reboot.h>
+
/* ARM SCM format support related flags */
#define SIP_SVC_CALLS 0x02000000
#define MAKE_SIP_SCM_CMD(svc_id, cmd_id) ((((svc_id << 8) | (cmd_id)) & 0xFFFF) | SIP_SVC_CALLS)
@@ -461,7 +463,7 @@
/* Is armv8 supported */
bool is_scm_armv8_support();
-int scm_dload_mode(int mode);
+int scm_dload_mode(enum reboot_reason mode);
int scm_device_enter_dload();
int scm_call2_atomic(uint32_t svc, uint32_t cmd, uint32_t arg1, uint32_t arg2);
uint32_t scm_io_write(uint32_t address, uint32_t val);
diff --git a/platform/msm_shared/reboot.c b/platform/msm_shared/reboot.c
index 4c21d11..9071096 100644
--- a/platform/msm_shared/reboot.c
+++ b/platform/msm_shared/reboot.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -76,7 +76,7 @@
hard_restart_reason = REG_READ(PON_SOFT_RB_SPARE);
REG_WRITE(PON_SOFT_RB_SPARE, hard_restart_reason & 0x03);
- /* Extract the bits 5 to 7 and return */
+ /* Extract the bits 2 to 7 and return */
return (hard_restart_reason & 0xFC) >> 2;
}
@@ -103,11 +103,11 @@
uint8_t value;
#endif
- /* Need to clear the SW_RESET_ENTRY register and
- * write to the BOOT_MISC_REG for known reset cases
- */
- if(reboot_reason != DLOAD)
- scm_dload_mode(NORMAL_MODE);
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
#if USE_PON_REBOOT_REG
value = REG_READ(PON_SOFT_RB_SPARE);
@@ -120,9 +120,10 @@
* For other cases do a hard reset
*/
#if USE_PON_REBOOT_REG
- if(reboot_reason == DLOAD)
+ if(reboot_reason == NORMAL_DLOAD || reboot_reason == EMERGENCY_DLOAD)
#else
- if(reboot_reason == FASTBOOT_MODE || (reboot_reason == DLOAD) || (reboot_reason == RECOVERY_MODE))
+ if(reboot_reason == FASTBOOT_MODE || reboot_reason == NORMAL_DLOAD ||
+ reboot_reason == EMERGENCY_DLOAD || reboot_reason == RECOVERY_MODE)
#endif
reset_type = PON_PSHOLD_WARM_RESET;
else
diff --git a/platform/msm_shared/reboot.h b/platform/msm_shared/reboot.h
index 4773255..58085df 100644
--- a/platform/msm_shared/reboot.h
+++ b/platform/msm_shared/reboot.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -28,21 +28,30 @@
*/
#ifndef __REBOOT_H__
#define __REBOOT_H__
+
+enum reboot_reason {
#if USE_PON_REBOOT_REG
-#define RECOVERY_MODE 0x01
-#define FASTBOOT_MODE 0x02
-#define ALARM_BOOT 0x03
-#define DM_VERITY_LOGGING 0x04
-#define DM_VERITY_ENFORCING 0x05
-#define DM_VERITY_KEYSCLEAR 0x06
+ /* hard reset reason */
+ REBOOT_MODE_UNKNOWN = 0x00,
+ RECOVERY_MODE = 0x01,
+ FASTBOOT_MODE = 0x02,
+ ALARM_BOOT = 0x03,
+ DM_VERITY_LOGGING = 0x04,
+ DM_VERITY_ENFORCING = 0x05,
+ DM_VERITY_KEYSCLEAR = 0x06,
#else
-#define FASTBOOT_MODE 0x77665500
-#define RECOVERY_MODE 0x77665502
-#define ALARM_BOOT 0x77665503
-#define DM_VERITY_LOGGING 0x77665508
-#define DM_VERITY_ENFORCING 0x77665509
-#define DM_VERITY_KEYSCLEAR 0x7766550A
+ REBOOT_MODE_UNKNOWN = 0x00,
+ RECOVERY_MODE = 0x77665502,
+ FASTBOOT_MODE = 0x77665500,
+ ALARM_BOOT = 0x77665503,
+ DM_VERITY_LOGGING = 0x77665508,
+ DM_VERITY_ENFORCING = 0x77665509,
+ DM_VERITY_KEYSCLEAR = 0x7766550A,
#endif
+ /* warm reset start from 0xF0000000 */
+ NORMAL_DLOAD = 0xF0000001,
+ EMERGENCY_DLOAD,
+};
#define RTC_TRG 4
#define PON_SOFT_RB_SPARE 0x88F
diff --git a/platform/msm_shared/scm.c b/platform/msm_shared/scm.c
index f9a7377..b46a504 100644
--- a/platform/msm_shared/scm.c
+++ b/platform/msm_shared/scm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -1333,7 +1333,7 @@
}
#if PLATFORM_USE_SCM_DLOAD
-int scm_dload_mode(int mode)
+int scm_dload_mode(enum reboot_reason mode)
{
int ret = 0;
uint32_t dload_type;
diff --git a/target/fsm9010/init.c b/target/fsm9010/init.c
index 76382aa..35c19c8 100644
--- a/target/fsm9010/init.c
+++ b/target/fsm9010/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -328,8 +328,23 @@
return restart_reason;
}
+int set_download_mode(enum reboot_reason mode)
+{
+ if (mode == NORMAL_DLOAD || mode == EMERGENCY_DLOAD)
+ dload_util_write_cookie(mode == NORMAL_DLOAD ?
+ DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
+
+ return 0;
+}
+
void reboot_device(unsigned reboot_reason)
{
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
+
/* Write the reboot reason */
writel(reboot_reason, RESTART_REASON_ADDR_V2);
@@ -352,14 +367,6 @@
dprintf(CRITICAL, "Rebooting failed\n");
}
-int set_download_mode(enum dload_mode mode)
-{
- dload_util_write_cookie(mode == NORMAL_DLOAD ?
- DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
-
- return 0;
-}
-
/* Returns 1 if target supports continuous splash screen. */
int target_cont_splash_screen()
{
diff --git a/target/fsm9900/init.c b/target/fsm9900/init.c
index cc06e0e..4c2b319 100644
--- a/target/fsm9900/init.c
+++ b/target/fsm9900/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -379,8 +379,23 @@
return restart_reason;
}
+int set_download_mode(enum reboot_reason mode)
+{
+ if (mode == NORMAL_DLOAD || mode == EMERGENCY_DLOAD)
+ dload_util_write_cookie(mode == NORMAL_DLOAD ?
+ DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
+
+ return 0;
+}
+
void reboot_device(unsigned reboot_reason)
{
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
+
/* Write the reboot reason */
writel(reboot_reason, RESTART_REASON_ADDR_V2);
@@ -403,14 +418,6 @@
dprintf(CRITICAL, "Rebooting failed\n");
}
-int set_download_mode(enum dload_mode mode)
-{
- dload_util_write_cookie(mode == NORMAL_DLOAD ?
- DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
-
- return 0;
-}
-
/* Check if MSM needs VBUS mimic for USB */
static int target_needs_vbus_mimic()
{
diff --git a/target/init.c b/target/init.c
index b8a818b..7f8a432 100644
--- a/target/init.c
+++ b/target/init.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2008 Travis Geiselbrecht
*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
@@ -37,6 +37,7 @@
#include <smem.h>
#include <pm8x41_adc.h>
#include <pm8x41_hw.h>
+#include <scm.h>
#if CHECK_BAT_VOLTAGE
#include <pm_fg_adc_usr.h>
@@ -110,9 +111,17 @@
return 0;
}
-__WEAK int set_download_mode(enum dload_mode mode)
+__WEAK int set_download_mode(enum reboot_reason mode)
{
- return -1;
+ if(mode == NORMAL_DLOAD || mode == EMERGENCY_DLOAD) {
+#if PLATFORM_USE_SCM_DLOAD
+ return scm_dload_mode(mode);
+#else
+ return -1;
+#endif
+ }
+
+ return 0;
}
__WEAK unsigned target_pause_for_battery_charge(void)
diff --git a/target/msm8226/init.c b/target/msm8226/init.c
index 81ee581..31a75b4 100644
--- a/target/msm8226/init.c
+++ b/target/msm8226/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, 2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -381,10 +381,28 @@
return restart_reason;
}
+int set_download_mode(enum reboot_reason mode)
+{
+ if (mode == NORMAL_DLOAD || mode == EMERGENCY_DLOAD) {
+ dload_util_write_cookie(mode == NORMAL_DLOAD ?
+ DLOAD_MODE_ADDR : EMERGENCY_DLOAD_MODE_ADDR, mode);
+
+ pm8x41_clear_pmic_watchdog();
+ }
+
+ return 0;
+}
+
void reboot_device(unsigned reboot_reason)
{
int ret = 0;
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
+
writel(reboot_reason, RESTART_REASON_ADDR);
/* Configure PMIC for warm reset */
@@ -554,16 +572,6 @@
return _emmc_recovery_init();
}
-int set_download_mode(enum dload_mode mode)
-{
- dload_util_write_cookie(mode == NORMAL_DLOAD ?
- DLOAD_MODE_ADDR : EMERGENCY_DLOAD_MODE_ADDR, mode);
-
- pm8x41_clear_pmic_watchdog();
-
- return 0;
-}
-
static void set_sdc_power_ctrl()
{
/* Drive strength configs for sdc pins */
diff --git a/target/msm8610/init.c b/target/msm8610/init.c
index 46f5f7e..0816e17 100644
--- a/target/msm8610/init.c
+++ b/target/msm8610/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2014, 2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -51,6 +51,7 @@
#include <platform/clock.h>
#include <platform/timer.h>
#include <crypto5_wrapper.h>
+#include <scm.h>
#if LONG_PRESS_POWER_ON
#include <shutdown_detect.h>
@@ -358,10 +359,28 @@
return restart_reason;
}
+int set_download_mode(enum reboot_reason mode)
+{
+ if (mode == NORMAL_DLOAD || mode == EMERGENCY_DLOAD) {
+ dload_util_write_cookie(mode == NORMAL_DLOAD ?
+ DLOAD_MODE_ADDR : EMERGENCY_DLOAD_MODE_ADDR, mode);
+
+ pm8x41_clear_pmic_watchdog();
+ }
+
+ return 0;
+}
+
void reboot_device(unsigned reboot_reason)
{
int ret = 0;
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
+
writel(reboot_reason, RESTART_REASON_ADDR);
/* Configure PMIC for warm reset */
@@ -529,16 +548,6 @@
crypto_init_params(&ce_params);
}
-int set_download_mode(enum dload_mode mode)
-{
- dload_util_write_cookie(mode == NORMAL_DLOAD ?
- DLOAD_MODE_ADDR : EMERGENCY_DLOAD_MODE_ADDR, mode);
-
- pm8x41_clear_pmic_watchdog();
-
- return 0;
-}
-
/* Configure PMIC and Drop PS_HOLD for shutdown */
void shutdown_device()
{
diff --git a/target/msm8909/init.c b/target/msm8909/init.c
index e439c04..67aadfd 100644
--- a/target/msm8909/init.c
+++ b/target/msm8909/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -612,7 +612,7 @@
}
}
-int set_download_mode(enum dload_mode mode)
+int set_download_mode(enum reboot_reason mode)
{
int ret = 0;
ret = scm_dload_mode(mode);
diff --git a/target/msm8916/init.c b/target/msm8916/init.c
index 693db04..c6a43b7 100644
--- a/target/msm8916/init.c
+++ b/target/msm8916/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -407,7 +407,7 @@
}
}
-int set_download_mode(enum dload_mode mode)
+int set_download_mode(enum reboot_reason mode)
{
int ret = 0;
ret = scm_dload_mode(mode);
diff --git a/target/msm8952/init.c b/target/msm8952/init.c
index 88ff454..1d577d6 100644
--- a/target/msm8952/init.c
+++ b/target/msm8952/init.c
@@ -424,7 +424,7 @@
return hard_restart_reason;
}
-int set_download_mode(enum dload_mode mode)
+int set_download_mode(enum reboot_reason mode)
{
int ret = 0;
ret = scm_dload_mode(mode);
@@ -444,18 +444,19 @@
uint8_t reset_type = 0;
uint32_t ret = 0;
- /* Need to clear the SW_RESET_ENTRY register and
- * write to the BOOT_MISC_REG for known reset cases
- */
- if(reboot_reason != DLOAD)
- scm_dload_mode(NORMAL_MODE);
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
writel(reboot_reason, RESTART_REASON_ADDR);
/* For Reboot-bootloader and Dload cases do a warm reset
* For Reboot cases do a hard reset
*/
- if((reboot_reason == FASTBOOT_MODE) || (reboot_reason == DLOAD) || (reboot_reason == RECOVERY_MODE))
+ if((reboot_reason == FASTBOOT_MODE) || (reboot_reason == NORMAL_DLOAD) ||
+ (reboot_reason == EMERGENCY_DLOAD) || (reboot_reason == RECOVERY_MODE))
reset_type = PON_PSHOLD_WARM_RESET;
else
reset_type = PON_PSHOLD_HARD_RESET;
diff --git a/target/msm8974/init.c b/target/msm8974/init.c
index 266e091..73043df 100644
--- a/target/msm8974/init.c
+++ b/target/msm8974/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2014, 2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -516,11 +516,26 @@
return restart_reason;
}
+int set_download_mode(enum reboot_reason mode)
+{
+ if (mode == NORMAL_DLOAD || mode == EMERGENCY_DLOAD)
+ dload_util_write_cookie(mode == NORMAL_DLOAD ?
+ DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
+
+ return 0;
+}
+
void reboot_device(unsigned reboot_reason)
{
uint32_t soc_ver = 0;
uint8_t reset_type = 0;
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
+
soc_ver = board_soc_version();
/* Write the reboot reason */
@@ -548,14 +563,6 @@
dprintf(CRITICAL, "Rebooting failed\n");
}
-int set_download_mode(enum dload_mode mode)
-{
- dload_util_write_cookie(mode == NORMAL_DLOAD ?
- DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
-
- return 0;
-}
-
/* Check if MSM needs VBUS mimic for USB */
static int target_needs_vbus_mimic()
{
@@ -830,4 +837,4 @@
uint32_t target_get_pmic()
{
return PMIC_IS_PM8941;
-}
\ No newline at end of file
+}
diff --git a/target/msm8994/init.c b/target/msm8994/init.c
index 066b50f..07fff1e 100644
--- a/target/msm8994/init.c
+++ b/target/msm8994/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -500,11 +500,31 @@
return restart_reason;
}
+int set_download_mode(enum reboot_reason mode)
+{
+ if (mode == NORMAL_DLOAD || mode == EMERGENCY_DLOAD) {
+ if (platform_is_msm8994())
+ dload_util_write_cookie(mode == NORMAL_DLOAD ?
+ DLOAD_MODE_ADDR : EMERGENCY_DLOAD_MODE_ADDR, mode);
+ else
+ dload_util_write_cookie(mode == NORMAL_DLOAD ?
+ DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
+ }
+
+ return 0;
+}
+
void reboot_device(unsigned reboot_reason)
{
uint8_t reset_type = 0;
uint32_t restart_reason_addr;
+ /* Set cookie for dload mode */
+ if(set_download_mode(reboot_reason)) {
+ dprintf(CRITICAL, "HALT: set_download_mode not supported\n");
+ return;
+ }
+
if (platform_is_msm8994())
restart_reason_addr = RESTART_REASON_ADDR;
else
@@ -636,18 +656,6 @@
return DDR_CFG_DLY_VAL;
}
-int set_download_mode(enum dload_mode mode)
-{
- if (platform_is_msm8994())
- dload_util_write_cookie(mode == NORMAL_DLOAD ?
- DLOAD_MODE_ADDR : EMERGENCY_DLOAD_MODE_ADDR, mode);
- else
- dload_util_write_cookie(mode == NORMAL_DLOAD ?
- DLOAD_MODE_ADDR_V2 : EMERGENCY_DLOAD_MODE_ADDR_V2, mode);
-
- return 0;
-}
-
uint32_t target_get_pmic()
{
return PMIC_IS_PMI8994;
diff --git a/target/msm8996/init.c b/target/msm8996/init.c
index 5b3db4b..42a0614 100644
--- a/target/msm8996/init.c
+++ b/target/msm8996/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -586,7 +586,7 @@
return 0;
}
-int set_download_mode(enum dload_mode mode)
+int set_download_mode(enum reboot_reason mode)
{
int ret = 0;
ret = scm_dload_mode(mode);
diff --git a/target/msmtitanium/init.c b/target/msmtitanium/init.c
old mode 100755
new mode 100644
index d37e4a9..b40246a
--- a/target/msmtitanium/init.c
+++ b/target/msmtitanium/init.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -331,7 +331,8 @@
{
return board_baseband();
}
-int set_download_mode(enum dload_mode mode)
+
+int set_download_mode(enum reboot_reason mode)
{
int ret = 0;
ret = scm_dload_mode(mode);