Merge "platform: msm_shared: add buffer overread check" into lk.lnx.1.0-dev.1.0
diff --git a/platform/msm_shared/qgic_v3.c b/platform/msm_shared/qgic_v3.c
index 692801b..7549e3a 100644
--- a/platform/msm_shared/qgic_v3.c
+++ b/platform/msm_shared/qgic_v3.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2015, 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
@@ -77,9 +77,6 @@
uint32_t eoimode = 0;
uint32_t grpen1 = 0x1;
- /* For cpu init need to wake up the redistributor */
- writel((readl(GICR_WAKER_CPU0) & ~GIC_WAKER_PROCESSORSLEEP), GICR_WAKER_CPU0);
-
/* Wait until redistributor is up */
while(readl(GICR_WAKER_CPU0) & GIC_WAKER_CHILDRENASLEEP)
{
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index 8ea4a1e..f6bd8d9 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -447,11 +447,16 @@
MSM8953 = 293,
MSM8937 = 294,
APQ8037 = 295,
+ MSM8996L = 302,
MSMGOLD = 303,
+ APQ8053 = 304,
+ MSM8996SG = 305,
APQGOLD = 307,
MSMGOLD2 = 308,
MSMGOLD3 = 309,
- APQ8053 = 304,
+ MSM8996AU = 310,
+ APQ8096AU = 311,
+ APQ8096SG = 312,
};
enum platform {
diff --git a/target/msm8996/init.c b/target/msm8996/init.c
index 42a0614..9463dee 100644
--- a/target/msm8996/init.c
+++ b/target/msm8996/init.c
@@ -456,13 +456,15 @@
{
switch(platform) {
case APQ8096:
+ case APQ8096AU:
+ case APQ8096SG:
board->baseband = BASEBAND_APQ;
break;
case MSM8996:
- if (board->platform_version == 0x10000)
- board->baseband = BASEBAND_APQ;
- else
- board->baseband = BASEBAND_MSM;
+ case MSM8996SG:
+ case MSM8996AU:
+ case MSM8996L:
+ board->baseband = BASEBAND_MSM;
break;
default:
dprintf(CRITICAL, "Platform type: %u is not supported\n",platform);