qcacld-3.0: WLAN driver upgrade to 5.2.03.6P

c6facb7 qcacld-3.0: Add support for specifying ethernet protocol type
f34fb98 Release 5.2.03.6P
4134cf0 qcacld-3.0: Fix Integer overflow while sending beacon report
afd41bf Release 5.2.03.6O
72806c2 qcacld-3.0: Add stats for Rx gratuitous_arp and multicast_replay drops
741ad4a Release 5.2.03.6N
8d25c9f qcacld-3.0: Update connect_timeout correctly in case of scan for ssid
7fb2f45 Release 5.2.03.6M
46b9f5e qcacld-3.0: Fix mem leak for rrm channel list
fba75b1 Release 5.2.03.6L
c3213b0 qcacld-3.0: Fix use after free for txrx_vdev_handle
cbd8d3e Release 5.2.03.6K
36f53c2 qcacld-3.0: Check possible OOB while strncmp
240bde3 Release 5.2.03.6J
1808516 qcacld-3.0: Add mutex to protect rssi_disallow_bssid list
07c7c67 Release 5.2.03.6I
d6f1ee2 qcacld-3.0: Fix OOB read in hdd_populate_wifi_signal_info
1df6772 Release 5.2.03.6H
4df3e1f qcacld-3.0: Print a timestamp for each roam scan

Change-Id: If456ca37f419c308ba18abdb07b6c0c17c2a62bb
Bug: 127926180
Signed-off-by: Srinivas Girigowda <quic_sgirigow@quicinc.com>

3 files changed, 35 insertions, 3 deletions

diff --git a/core/pld/inc/pld_common.h b/core/pld/inc/pld_common.h
index bfb870853e..fec434d193 100644
--- a/core/pld/inc/pld_common.h
+++ b/core/pld/inc/pld_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -569,6 +569,7 @@ void pld_get_msi_address(struct device *dev, uint32_t *msi_addr_low,
 unsigned int pld_socinfo_get_serial_number(struct device *dev);
 int pld_is_qmi_disable(struct device *dev);
 int pld_is_fw_down(struct device *dev);
+void pld_block_shutdown(struct device *dev, bool status);
 int pld_force_assert_target(struct device *dev);
 bool pld_is_fw_dump_skipped(struct device *dev);
 
diff --git a/core/pld/src/pld_common.c b/core/pld/src/pld_common.c
index 81c39dd45e..bd81693abb 100644
--- a/core/pld/src/pld_common.c
+++ b/core/pld/src/pld_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -1563,3 +1563,27 @@ int pld_is_fw_rejuvenate(struct device *dev)
 	}
 	return ret;
 }
+
+/**
+ * pld_block_shutdown() - Block/Unblock modem shutdown
+ * @dev: device
+ * @status: status true or false
+ *
+ * This API will be called to Block/Unblock modem shutdown.
+ * True - Block shutdown
+ * False - Unblock shutdown
+ *
+ * Return: None
+ */
+void pld_block_shutdown(struct device *dev, bool status)
+{
+	enum pld_bus_type type = pld_get_bus_type(dev);
+
+	switch (type) {
+	case PLD_BUS_TYPE_SNOC:
+		pld_snoc_block_shutdown(status);
+		break;
+	default:
+		break;
+	}
+}
diff --git a/core/pld/src/pld_snoc.h b/core/pld/src/pld_snoc.h
index fdc550684f..69ea483512 100644
--- a/core/pld/src/pld_snoc.h
+++ b/core/pld/src/pld_snoc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -131,6 +131,9 @@ static inline int pld_snoc_is_fw_rejuvenate(void)
 {
 	return 0;
 }
+static inline void pld_snoc_block_shutdown(bool status)
+{
+}
 
 #else
 int pld_snoc_register_driver(void);
@@ -255,6 +258,10 @@ static inline int pld_snoc_is_fw_rejuvenate(void)
 {
 	return icnss_is_rejuvenate();
 }
+static inline void pld_snoc_block_shutdown(bool status)
+{
+	icnss_block_shutdown(status);
+}
 
 #endif
 #endif