Promotion of kernel.lnx.4.4-160428.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1004842   I6e666390ddbdd8128b6ebff8e2deb8c85cf35b21   input: touchscreen: synaptics_dsx: Set power specificati
1005619   Icbd93ed592a7d79dcd7f72b52d73572ced384759   msm: mdss: add scr rev support for dsc
1006168   Ic5d079d615d5b87abb7e1db6e345f77f6066a6ae   ARM: dts: msm: use railway resources for SSC_MX and SSC_
1001375   I269e805465200ef1aa76476110946ee89d432cbd   ARM: dts: msm: update bw limits for msmcobalt
1001375   Id488793e9bb6aa7a2578af828f31d1d2b27d51e5   msm: mdss: update mdp clk calculation for qseed3
1008368   I464549b185625314a9f2844272bdce617ce988e4   Revert "Perf: arm64: support hotplug and power collapse"
987777   I2a62b0fbd15e678b21329184a5edc0502c33b413   msm: mdss: update sde bandwidth vote for amortized prefi
1008368   Ieaa6da68173aaf31c8a38bce64f1bc46bae957c4   Revert "Perf: arm64: restore registers after reset"
1004396   Iff4c24064312501221c1d5abfab49e11a94f9197   ARM: dts: msm: enable touchscreen on Cobalt CDP and MTP
1006303   I608f5fa8b0baff8d9e998731dcddec59c9073d20   sched: take into account of limited CPU min and max freq
1005492   If127a18f70cb13f98d8d5443e0c3b617d2601954   msm: ipa: usb: change IPC logging to common buffer
998828   I4be0dcaa9fabbd81e4875255d808707bf1e97e8e   msm: mdss: parse and populate PPB offsets separately
988990   Ie267f0fd81cd8cf04a5c1f1c6a8c48d456a3035e   msm: mdss: Adding interface for supporting destination s
1001375   I7cfac789576300f421de076ac9abca9b85c6168d   msm: mdss: update vbif remapper for sde 3.0
987054   Icb8ef62c8263ae7b17d6883c0e6a1c93d2156a6a   net: rmnet_data: Change the print format for addresses
1005492   Iee4f6e7b5da3ca27e9ef619bfb2bacc45970d3cc   msm: ipa: ipahal: change IPC logging to common buffer
996292   I151400624f374262a955a04d211a96c43feb6d98   msm: ipa3: use user parameter for GSI ring len
972831 989206   I2fd07a957b0d8414c855fafcff7a2613695efff0   msm: sde: Add dynamic OT support for rotator REGDMA
987777   I764e75bcb73b9db8c9c3615b601ae465dcc4beac   ARM: dts: msm: add additional mdss dma pipes to msmcobal
1000756   Ic4270b96ca893b7fd1e1c42628ff13a590107834   defconfig: arm64: enable MDSS PLL driver for msmcobalt
972831   I5e0f8f06897ff0d4b55aa1f9fc8114dd02451649   ARM: dts: msm: Add rotator node to msmcobalt
1007738   I80e16f8cd449f6183810304bd92cc5f302125237   msm: ipa3: Flush Filtering and Routing cache on SSR even
1008368   Ic946deff2433ada458eb8040ddf40615a0a80959   ARM: perf: Set ARMv7 SDER SUNIDEN bit
998973   I8badb0aa9e6ff604d8d0b2a932df0ea5ef6a70f9   diag: Add support for extended header over dci
1004396   Ie0ee0c0c5bc841c86ac0f45eec3ec71fb657098c   devicetree: binding: add Synaptics to vendor prefixes
999551   I3d1aa4a44701192e4bd85bdee29d6f2a49b9e5a7   msm: vidc: Add support for output crop extra data
1005638   Ib16bf546721ba204f8a47733327e7be77b76b821   msm: mdss: add dynamic fps support for hdmi
991688   I9841ddc88a114fa94aa93571ee27c8c2f7bf6d39   soc: qcom: Add offlining state to subsystem private stat
996008   Icd495a5a98a068b5c47c9c25dfa3c0bda676c6f0   ARM: dts: msm: add post init delay parameter to truly pa
1000848   Ie01df24b72a3247a24ab6fbd7a90ec8cfee7236f   iommu/arm-smmu: Disable clocks in reverse order
1006865   I549baca7a69ff777e1a30a95e695cbd530035858   pinctrl: qcom: Fix sdc2 offset
1008481   I76d4c0366a090c4ef6d67df876231bdf50f6dbfa   pinctrl: qcom: Fix the base address for GPIO 35
1001375   I6a7ba7573a67a52bddb4881415217d7401c97cf3   msm: mdss: add support for non-compressed bw for ib
988266   Ib2908b2495b1b01a6a130033143a7da8e5c0c231   soc: qcom: glink: Refactor rwref lock mechanism
1008368   Ia96c64f56d9cb480a2f62ca6fc717d15da77e487   drivers/perf: arm-pmu: fix RCU usage on pmu resume from
1006763   I586e34c542b8dccd6a3b9a50019b3d11b371f46f   soc: qcom: Fix minor bugs in service-notifier
1005492   Id2f1a32ee61e894fe78d5efcd76edded19becd0b   msm: ipa: add IPC logging to IPA RM
1008368   I2901cd11e3832ef671581ac6e4f0e3edce630e6d   drivers/perf: arm_pmu: implement CPU_PM notifier
998826   Iea6e77be1eaab5ccf2fd89f7c98e2dd328af7de0   msm: mdss: handle multiple MDP interrupt register sets
987962   Ibb7f3477d5030bcb4ae3b28cda5afc612063b2b7   ARM: dts: msm: Add additional clocks to VFE node on msmc
996600   I523130bac65f9c4b736e19eb5888c83b9542ed27   msm: mdss: remove usage of DSI ctrl mutex during ESD/sus
1004941   I866eb6915717ce54c52061a22e29c1dfc88c1c7b   devicetree: binding: add binding doc for qpnp-haptic dri
1002334   I4de587aec0b54d942637fbea3cbe13cb2bdac893   mdss: mdp: avoid mdp done isr wait for split ctrl during
997586   I33c09b2dcfc7b49ce94f5e31b5b297b0445fd073   msm: mdss: add lineptr interrupt support for video mode
1008368   Ibf007132366486ae70c1d919f32e933744a1721e   Revert "Perf: arm64: stop counters when going into hotpl
997202   Iff7cf58363a83e9a4999115382c5551110104ead   msm: mdss: Fix destination bpp on writeback panel
991792   Ib1af02d00e438f48619eacee291b1875671978e1   net: rmnet_data: Update copyright for rmnet_data_trace.h
986579   Ic9605be675c10ea2973e57ea5aae0e8ee2f893f2   icnss: Reset Adrastea before executing cold boot
972831   I5bb308e552d7ed6edd314a4574181e1ee3498960   msm: sde: Add mdss 3.0.0 support to sde v4l2 rotator dri
1007932   Ia2c9be4ec36f522968364ebb66190278cfbb9244   platform: qpnp-revid: switch to PMCOBALT and PMICOBALT n
987777   I588ecd7829a45908241f6d9fa1e97147e79798f6   msm: mdss: add support for multi-rect feature
988266   Ib40da2ecd413e7712cacc9663394e725ebd64a0a   soc: qcom: glink: Reorganize glink lock hierarchy
1007896   Ib799e8c082977ac226d6bd31ffad8ca63597c0fc   clk: msm: osm: model LMh RCG to ensure OSM clock runs at
1008368   Ic19addb342e20c6e87f7781a02bed4f0094e80c5   Revert "perf: replace cpu_up/down with device_online/off
1007896   I493e711463e2458abe735d440f98fbc80b11c208   ARM: dts: msm: Add APCS common base to OSM clock device
1001770   Ic36b8e3c01af2fde1827a53c8c52baed240c238e   spmi: pmic_arb: add support for PMIC bus arbiter v3
1009926   I990fb3317b4c19ad9b1c8c114a5bbc3faf208ff8   defconfig: msm: Enable dm-crypt
991470   I863f7e57cce9fa12e0d8a603ac50c42775d62414   ARM: dts: msm: add mdss smmu register range for msm8996
1001768   I36f0bd69765d6e47fe76bbccc9550de7056f8640   ARM: dts: msm: Fix the address mapping of SPMI bus arbit
1008621   I4e50943923aabae104c8d2c8f512b28693132bbb   ARM: dts: msm: increase VDD_APC LowSVS/SVS ceiling volta
990751   Ifea5b1ae26b154bb047044e4bc3ad579d0da7f6d   rmnet_data: skip padding count for non linear skbs
1002396   I86459b7bc18da16b66f6c701ac324f28be8848fa   net: rmnet_data: Stop adding pad bytes for MAPv3 uplink
997404   I4c44011b7fa3b59cbe70a125735e04a076c4d3ca   soc: qcom: glink_smd_xprt: Serialized open ack notify an
1006637   Ia300cafb7246c08ba35fb24c2dc79489edb280a3   dt-bindings: clock: Add audio external clock of_idx entr
1008368   I446e06972d714f7a405ff8c264d7851958e69484   drivers/perf: arm_pmu: avoid NULL dereference when not u
1008368   I6d250a614d26dbb218f1f2e4ee087db41e8202a7   drivers/perf: arm_pmu: make info messages more verbose
1008368   Ief4b49a866ec8b056b6552bbd1745be8f002a1da   drivers/perf: kill armpmu_register
991639   I4be0a9d5d163b0630e8cfeb930e72c32f487ccb1   msm: mdss: fix frame rate calculation for resolution swi
972831   If3a1b0f41eaa912a30c20c4c188a896c7bc1efe4   msm: mdss: report separate rotator capability
1006303   I6f75d4d0179a79544b4180a3ba155916c861edb5   sched: use proper typedef for cpumask
1008012   I24378a4a654f872a096031ad945df3d378c02532   defconfig: automatic update
996243   Ia4825e96b2e12f2328c9cc3197051f5e47c4daff   msm: fb: aggregate buffer length for each sg node
987777   I501e11325365ec900a2ef8ee5bcbcd66f5647f64   msm: mdss: add support for amortized prefill
1008552 993591   Ia7517c0e6beab1178d70b72b3f5c0b512b400bd8   msm: vidc: Clean session immediately after session end
1006303   I93b187efd7bc225db80da0184683694f5ab99738   sched: add support for CPU frequency estimation with cyc
1005638   I8c75ef09121c2d20e04380ead2b805c7b114acad   msm: mdss: add multi-mode support for dynamic fps
984339   I86a1ef673b560663ff7f387454e4a8857303be46   msm: mdss: Remove CDP from MDSS caps on msm8937/msm8917/
961186   Ie8d76c493d61f3f4c256dbaa0378b22a361eed49   net: rmnet_data: Add a GRO flush timer
1004256   I392bca629cfa87343f3a82ed13f48bafba592a51   ARM: dts: msm: add blsp devices config for msmcobalt
1005638   Ibbce17bb85d82cca42c0bcf0f53fadecace103fb   ARM: dts: msm: enable MPP4 invert on 8996
1005386   Ic8278191a7352d1e0a339251dacd028ef5a02e95   soc: qcom: pil-q6v5: Update max voltage level to INT_MAX
996008   I503ce32546483a6eac79c41b581486e7a3ae8735   ARM: dts: msm: update the delay values for truly 1080p p
1008505   I0f590b621719a99abc7bfa071b2f45a25ebe1310   defconfig: arm64: enable msm mdss fb driver for msmcobal
972831   Iddbaaceaeba6cee5c7935077f4a92a0361fa8c75   msm: sde: Update v4l2 rotator driver to latest v4l2 fram
987777   Ide1fa99b876a3347a4e46c11261a9e7a32b8f47a   msm: mdss: perform hardware rev init earlier during prob
1008368   Ie3140289f1f4dd2bdf0c3fdb315369d763d53b22   Revert "Perf: arm64: fix disable of pmu irq during hotpl
980550   I265259c5c79efef1d79f31c4f00c6557250434b1   xfrm: Fix crash observed during device unregistration an
994713   Iaa11755b46417db1e2a12cb2f2b6028cd7530c0b   msm: mdss: Dither support in PingPong buffer
1005492   I6e7ac15ea7256c18e4174de56adb532ab6c6b0d0   msm: ipa3: allocate ipa_low IPC only when needed
1004856   I8002e61887e11ae15c5a503d9caedc880d56d952   ARM: dts: msm: enable PMIC WLED on Cobalt
1004232   Ia56b436c026927d2b7015b004e51b44be1450519   defconfig: msm: Enable serial bus drivers
991389   I4830fd3af4cdeb6fcef5f34d5d8dd41d44a73b24   msm: vidc: Fix macro blocks number issue for intra refre
991470   I2a833a4b5e81e36f4d7af23a3968c9755424b7a7   msm: mdss: register smmu context fault handler
1000453   I50e038d838eded30ee8304fefb2c13328eaf9683   net: rmnet_data: Change the log level for unknown IOCTL'
973565   I172949f677eaa996cd77cb591b86980fa5ebeaf8   ARM: dts: msm: Change GPU idle timeout to 80ms for msmco
1006637   Ib51007d544c240fd17c058dcb133f12e7bf2c5d7   audio-ext-clk: include audio external clock header file

Change-Id: I4552689a95bf5c307096891a253fbdeb64f5496a
CRs-Fixed: 1006303, 1005619, 1002334, 987054, 1004842, 1001768, 1007932, 991470, 1008481, 1005492, 986579, 1007738, 1001375, 996243, 1006763, 987962, 1005386, 1000756, 973565, 996008, 998973, 1002396, 961186, 1004256, 1008012, 993591, 1008505, 1004232, 972831, 1000848, 1008621, 1004941, 996292, 994713, 988266, 999551, 996600, 989206, 1001770, 1004396, 1009926, 991688, 997404, 987777, 1006168, 990751, 1000453, 997202, 1004856, 1006637, 991389, 1006865, 1008552, 1007896, 1008368, 991792, 984339, 980550, 991639, 998828, 988990, 1005638, 998826, 997586

5 files changed, 23 insertions, 20 deletions

diff --git a/include/linux/ipa.h b/include/linux/ipa.h
index 3a87177b623f..0dd2f0bf9c23 100644
--- a/include/linux/ipa.h
+++ b/include/linux/ipa.h
@@ -524,7 +524,11 @@ struct ipa_ext_intf {
  * in system-BAM mode
  * @ipa_ep_cfg:	IPA EP configuration
  * @client:	the type of client who "owns" the EP
- * @desc_fifo_sz:	size of desc FIFO
+ * @desc_fifo_sz: size of desc FIFO. This number is used to allocate the desc
+ *		fifo for BAM. For GSI, this size is used by IPA driver as a
+ *		baseline to calculate the GSI ring size in the following way:
+ *		For PROD pipes, GSI ring is 4 * desc_fifo_sz.
+		For PROD pipes, GSI ring is 2 * desc_fifo_sz.
  * @priv:	callback cookie
  * @notify:	callback
  *		priv - callback cookie
diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h
index 136e2e9da1ee..654bb97a3188 100644
--- a/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@ -51,12 +51,6 @@ struct arm_pmu_platdata {
 	},								\
 }
 
-enum arm_pmu_state {
-	ARM_PMU_STATE_OFF       = 0,
-	ARM_PMU_STATE_GOING_DOWN,
-	ARM_PMU_STATE_RUNNING,
-};
-
 /* The events for a given PMU register set. */
 struct pmu_hw_events {
 	/*
@@ -70,8 +64,6 @@ struct pmu_hw_events {
 	 */
 	DECLARE_BITMAP(used_mask, ARMPMU_MAX_HWEVENTS);
 
-	u32			*from_idle;
-
 	/*
 	 * Hardware lock to serialize accesses to PMU registers. Needed for the
 	 * read/modify/write sequences.
@@ -109,16 +101,14 @@ struct arm_pmu {
 	void		(*free_irq)(struct arm_pmu *);
 	int		(*map_event)(struct perf_event *event);
 	int		num_events;
-	int		pmu_state;
-	int		percpu_irq;
 	atomic_t	active_events;
 	struct mutex	reserve_mutex;
 	u64		max_period;
+	bool		secure_access; /* 32-bit ARM only */
 	struct platform_device	*plat_device;
 	struct pmu_hw_events	__percpu *hw_events;
 	struct notifier_block	hotplug_nb;
-	void		(*save_pm_registers)(void *hcpu);
-	void		(*restore_pm_registers)(void *hcpu);
+	struct notifier_block	cpu_pm_nb;
 };
 
 #define to_arm_pmu(p) (container_of(p, struct arm_pmu, pmu))
@@ -128,8 +118,6 @@ extern const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
 						[PERF_COUNT_HW_CACHE_OP_MAX]
 						[PERF_COUNT_HW_CACHE_RESULT_MAX];
 
-int armpmu_register(struct arm_pmu *armpmu, int type);
-
 u64 armpmu_event_update(struct perf_event *event);
 
 int armpmu_event_set_period(struct perf_event *event);
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index a9cc2b530409..95fd207e63ca 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -471,7 +471,6 @@ struct perf_event {
 	struct pmu			*pmu;
 
 	enum perf_event_active_state	state;
-	enum perf_event_active_state hotplug_save_state;
 	unsigned int			attach_state;
 	local64_t			count;
 	atomic64_t			child_count;
diff --git a/include/linux/qpnp/qpnp-revid.h b/include/linux/qpnp/qpnp-revid.h
index 9e50fe48612f..13464f807f68 100644
--- a/include/linux/qpnp/qpnp-revid.h
+++ b/include/linux/qpnp/qpnp-revid.h
@@ -171,11 +171,11 @@
 /* PMI8996 */
 #define PMI8996_SUBTYPE		0x13
 
-/* PM8998 */
-#define PM8998_SUBTYPE		0x14
+/* PMCOBALT */
+#define PMCOBALT_SUBTYPE	0x14
 
-/* PMI8998 */
-#define PMI8998_SUBTYPE		0x15
+/* PMICOBALT */
+#define PMICOBALT_SUBTYPE	0x15
 
 /* PM8005 */
 #define PM8005_SUBTYPE		0x18
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 7ece18efd02b..5ad9cf84a581 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1470,6 +1470,7 @@ struct task_struct {
 	u64 last_switch_out_ts;
 	struct related_thread_group *grp;
 	struct list_head grp_list;
+	u64 cpu_cycles;
 #endif
 #ifdef CONFIG_CGROUP_SCHED
 	struct task_group *sched_task_group;
@@ -2375,6 +2376,8 @@ extern unsigned int sched_get_static_cpu_pwr_cost(int cpu);
 extern int sched_set_static_cluster_pwr_cost(int cpu, unsigned int cost);
 extern unsigned int sched_get_static_cluster_pwr_cost(int cpu);
 extern int sched_update_freq_max_load(const cpumask_t *cpumask);
+extern void sched_update_cpu_freq_min_max(const cpumask_t *cpus, u32 fmin, u32
+					  fmax);
 #else
 static inline int sched_set_boost(int enable)
 {
@@ -2385,6 +2388,9 @@ static inline int sched_update_freq_max_load(const cpumask_t *cpumask)
 {
 	return 0;
 }
+
+static inline void sched_update_cpu_freq_min_max(const cpumask_t *cpus,
+					u32 fmin, u32 fmax) { }
 #endif
 
 #ifdef CONFIG_NO_HZ_COMMON
@@ -3358,4 +3364,10 @@ static inline unsigned long rlimit_max(unsigned int limit)
 	return task_rlimit_max(current, limit);
 }
 
+struct cpu_cycle_counter_cb {
+	u64 (*get_cpu_cycle_counter)(int cpu);
+	u32 (*get_cpu_cycles_max_per_us)(int cpu);
+};
+int register_cpu_cycle_counter_cb(struct cpu_cycle_counter_cb *cb);
+
 #endif