Promotion of kernel.lnx.4.4-161028.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1080392   I05345b8f5d108e59863ee4e37ed75fd32a284ee5   ASoC: wcd-dsp-mgr: fix restart logic when codec comes ba
1081345   I69981b603526575758376695d7a5e9affd389dbe   ARM: dts: msm: add SLPI fw name property for msmcobalt
1024862   I600c646a0c23b654392d8e00a829bfd88b71c38c   msm: mdss: Fix memleak in panel_debug_reg_write
1069060   Icbdb05aeb9211665420a872d3453dbbd24fd347b   msm: ipa: fix ioctl input param validation
1061018   I738eeb141d323ae1a77f352b11525556888a9243   ARM: dts: msm: fix sd card detection for msmcobalt QRD S
1050304   I9c7afdd74122318fc5f7ebd7c0381a4078d1fb01   msm: mdss: edid: fix dtd parsing
1082022   Iad90353f66cf5ad7f83e3fc252d82cec45abce60   platform: qpnp-revid: Add REVID details for PM/PM2FALCON
1077762   I8121d45fedab6197f8466d25674d5b0decd45f1b   ARM: dts: msm: enable esd for nt35597 panels in msmcobal
1080014   Ic5dbac9c2cd31f3193ede7cdc64249f7514e3e98   icnss: Do top level reset when timeout to pull register
1077766   Ie60587aa4a4a48bae70ceac4e053e63fc29f516a   ASoC: msm: Add routes for all TDM modes
1078147   I0aa3443a2fddfa200631b6fe9eb22de10178fe46   icnss: Do not parse VBATT DT entry if VBATT feature is d
1080392   Id9cbda04a4c36070e52919d3a34ebc871ac22a8e   ASoC: wcd934x: Trigger codec DSP subsystem restart
1081806   I42a47e4386ca7a1bbbec428c8d2cbe307634cd1e   ARM: dts: msm: Add support for Modem PIL on msmtriton
1081547   I64f0f5b15cc5d9185e415f0b26e276e111c885ec   usb: dwc3: gadget: Remove dev_WARN_ONCE in dwc3_gadget_e
1082650   Iab7fc8551b628c443ce751026b06c5ff4ebba39a   sched: Fix compilation issue with reset_hmp_stats
1082650   Idb74e9df4fcb55085ac869f5ba273cef4a3eb9eb   sched/fair: Fix compilation issue
1069188   I2939e9fd37e96f37101b93dabd86cfdaaf06907f   ASoC: wcd934x: Add support for audio subsystem restart
1081010   I16e500aa87813cd3a1e18f134ea1ed145b9e1ef8   msm: sde: Fix SDE rotator clock disable sequence
1074914   I94b9091b8349d6388fbe5c29eabe3666c86e5cce   ASoC: msm: Enable Media Format converter for all resampl
1081806   I3e700bdae21b6e18b28cf5982e42e73d7ae953a5   ARM: dts: msm: Add support for Modem PIL on msmfalcon
1077762   I3df0889c1225dcb613910cb90f050a2994f5834d   msm: mdss: fix crash when wrong params are passed on the
1065513   I29b9ea41df467d0092be8005733016843dc26f60   input: touchscreen: replace macros used inside the funct
1082047   I6a678d9133b06dda2de1c6cfe4bbafacc594f299   leds: qpnp-wled: add a secure write API
1076402   If06c421c559277066cf9ffd86e71fe366ab7bf8d   leds: qpnp-flash-v2: fix safety timer configuration
1081279   I1b614cb70aa43087c122ce6c42305491e5f5b34b   clk: qcom: Change clock index for mmssnoc_axi clock for
1081803   Ib0d27c13c0ebdfac629c1469c9a91a0b84d03640   soc: qcom: pil-q6v5: Add support for qdspv62.1.5 reset
1080796   Ife9d6a16e1607b40c71eb1897947bf4645ac9561   USB: dwc3-msm: Disable pipe clock requirement for HS/FS
1025311   I5f9627964d86c51cb8fb0c5c5f7c9f5f2e19b3e7   cfg80211: Add support to configure a beacon data rate
1081430   I2abd67a8ff647165ddedb385e80f8705d73d3100   input: touchscreen: fix compilation errors for Goodix dr
1077525   I012484aa92e8f25ed0ad4f6709a54f40409ab8d2   msm: ipa: Fix the memory leak in error cases
1079971   Ib6bddd5f43b41660304d240db39f4e273ede3af0   input: misc: hbtp_input: Add support for multiple AFE
1082047   I4c99b598d5f484368712eab239f7de70b727c2aa   leds: qpnp-wled: Fix configuration of AVDD TRIM and OVP
1075303   I0552bf8a48c214b89e160fe4df145973f02c2788   ASoC: wcd934x-dsp-cntl: fix memory enable/disable sequen
1079311   I58421ba7f784f7467015a5943aecc2dd0022145a   leds: qpnp-flash-v2: fix ITARGET configuration
1048242   I2ef9f3e122b39682a743334668fcd0aeb085e147   qcom-charger: set optimal buck switching frequency
1080290   I0f48666ac948a9571e249598ae7cc19df9036b1d   qseecom: check buffer size when loading firmware images
1022917   Ib846318dc3d359672314485d386a23fd8621bfda   ARM: dts: msm: Add dmic clock rate on ECPP path for msmc
1072280   I9640112b8945dc603e3af55fc1096bea9f7e6634   ASoC: qdsp6v2: fix potential bug of infinite loop
1082047   If0646f5ae111f75ababc405cbd2f7bcea899360e   leds: qpnp-wled: add support to read pmic revid
1043802   I1d9d7a6b6bd2d3420a28a8c09868143bb9bd3b27   soc: qcom: add support for fingerprint sensor driver
1076516   If68d029c87db2370f07f279aacbc51d139f00aae   msm: mdss: dp: trigger link retraining on link status up
1077773   I99fcbc5c1b36f62ecfa7631f1b51633a7fb08417   ASoC: msmcobalt: Add support for all TDM modes
1080331   Iaec3a17e5eed952ba0abdcffbf321ad942486769   drivers: mfd: wcd934x: Set MBHC registers to volatile
1082440   I287761ce5b13dc139f59270dceac67cc9ae45cff   defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmfalco
1082440   I6028d4a01ddfd8f8589a1de5322c2780d256d5bc   defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmcorte
1024872   I03ce718b0456d437d31d701586965d0aa7443b51   msm: mdss: Correct the format specifiers in sscanf funct
1076227   Ic756deeabeb0eaaf95e5354b565cf20a85fd7cca   msm: mdss: dp: remove programming of maud/naud for audio
1024934   I533e2d6a760ebd52047c521c1a1e85bfc754fce1   msm: mdss: Fix memleak in framebuffer register and remov
1081757   I13156d82f544cd28a1579c23b18182c879c85767   clk: osm: msm: allow WDOG status register to be enabled
1077761   I9cc07edd7d72e7fae8f95b16461aac75c3fa1fc9   ARM: dts: msm: add support for all TDM modes
1024850   I10ea6f2b22d554d02f302f5700f6674d08e4777d   msm: mdss: Check for buffer boundary condition in panel_
1073650   I2836ef5b7f37f627a32a0b4332dc299a60012704   msm: mdss: Avoid adaptive variable refresh during dynami
1081345   I9ecc0cc1b5de5e0bd47c658747463a4498123655   sensors: ssc: add support to read SLPI fw name
1077762   Ia03f76cf13d3787e2e13e27ae0360723fe36d615   ARM: dts: msm: enable esd for jdi qhd cmd mode panel in
1077684   I340f778583bb63d6436c4ef8f51ead77a2871625   msm: mdss: Correct settings when on/off happens in dest-
1022917   I772e05990a796c99c3b6b6f50323d87b5894231b   ASoC: msmcobalt: Fix MCLK routing on msmcobalt for WCD93
1082191   If3d964840362b6147ba7c9e26c4a3f5d20e5a557   clk: msm: clock: Remove controlling some graphics clocks
1051643 1054360   I1b3af2a59dabf67a947a59334883ce0437c9ee6f   ARM: dts: msm: add PCIe PHY sequence for msmcobalt v2

Change-Id: I673d05df7b013787ac73574a972dd7bade7332af
CRs-Fixed: 1076227, 1081757, 1077766, 1077761, 1072280, 1077762, 1022917, 1074914, 1069060, 1051643, 1076516, 1081430, 1080290, 1077525, 1078147, 1081803, 1024862, 1077684, 1048242, 1081806, 1025311, 1081345, 1050304, 1065513, 1081547, 1061018, 1073650, 1082191, 1077773, 1079311, 1082440, 1082650, 1081010, 1080796, 1024872, 1076402, 1054360, 1024934, 1080331, 1079971, 1043802, 1075303, 1024850, 1080392, 1069188, 1082022, 1082047, 1080014, 1081279

5 files changed, 126 insertions, 55 deletions

diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index 03dd576e6773..59fd7c0b119c 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -524,7 +524,9 @@ static bool assoc_array_insert_into_terminal_node(struct assoc_array_edit *edit,
 			free_slot = i;
 			continue;
 		}
-		if (ops->compare_object(assoc_array_ptr_to_leaf(ptr), index_key)) {
+		if (assoc_array_ptr_is_leaf(ptr) &&
+		    ops->compare_object(assoc_array_ptr_to_leaf(ptr),
+					index_key)) {
 			pr_devel("replace in slot %d\n", i);
 			edit->leaf_p = &node->slots[i];
 			edit->dead_leaf = node->slots[i];
diff --git a/lib/extable.c b/lib/extable.c
index 4cac81ec225e..0be02ad561e9 100644
--- a/lib/extable.c
+++ b/lib/extable.c
@@ -14,7 +14,37 @@
 #include <linux/sort.h>
 #include <asm/uaccess.h>
 
+#ifndef ARCH_HAS_RELATIVE_EXTABLE
+#define ex_to_insn(x)	((x)->insn)
+#else
+static inline unsigned long ex_to_insn(const struct exception_table_entry *x)
+{
+	return (unsigned long)&x->insn + x->insn;
+}
+#endif
+
 #ifndef ARCH_HAS_SORT_EXTABLE
+#ifndef ARCH_HAS_RELATIVE_EXTABLE
+#define swap_ex		NULL
+#else
+static void swap_ex(void *a, void *b, int size)
+{
+	struct exception_table_entry *x = a, *y = b, tmp;
+	int delta = b - a;
+
+	tmp = *x;
+	x->insn = y->insn + delta;
+	y->insn = tmp.insn - delta;
+
+#ifdef swap_ex_entry_fixup
+	swap_ex_entry_fixup(x, y, tmp, delta);
+#else
+	x->fixup = y->fixup + delta;
+	y->fixup = tmp.fixup - delta;
+#endif
+}
+#endif /* ARCH_HAS_RELATIVE_EXTABLE */
+
 /*
  * The exception table needs to be sorted so that the binary
  * search that we use to find entries in it works properly.
@@ -26,9 +56,9 @@ static int cmp_ex(const void *a, const void *b)
 	const struct exception_table_entry *x = a, *y = b;
 
 	/* avoid overflow */
-	if (x->insn > y->insn)
+	if (ex_to_insn(x) > ex_to_insn(y))
 		return 1;
-	if (x->insn < y->insn)
+	if (ex_to_insn(x) < ex_to_insn(y))
 		return -1;
 	return 0;
 }
@@ -37,7 +67,7 @@ void sort_extable(struct exception_table_entry *start,
 		  struct exception_table_entry *finish)
 {
 	sort(start, finish - start, sizeof(struct exception_table_entry),
-	     cmp_ex, NULL);
+	     cmp_ex, swap_ex);
 }
 
 #ifdef CONFIG_MODULES
@@ -48,13 +78,15 @@ void sort_extable(struct exception_table_entry *start,
 void trim_init_extable(struct module *m)
 {
 	/*trim the beginning*/
-	while (m->num_exentries && within_module_init(m->extable[0].insn, m)) {
+	while (m->num_exentries &&
+	       within_module_init(ex_to_insn(&m->extable[0]), m)) {
 		m->extable++;
 		m->num_exentries--;
 	}
 	/*trim the end*/
 	while (m->num_exentries &&
-		within_module_init(m->extable[m->num_exentries-1].insn, m))
+	       within_module_init(ex_to_insn(&m->extable[m->num_exentries - 1]),
+				  m))
 		m->num_exentries--;
 }
 #endif /* CONFIG_MODULES */
@@ -81,13 +113,13 @@ search_extable(const struct exception_table_entry *first,
 		 * careful, the distance between value and insn
 		 * can be larger than MAX_LONG:
 		 */
-		if (mid->insn < value)
+		if (ex_to_insn(mid) < value)
 			first = mid + 1;
-		else if (mid->insn > value)
+		else if (ex_to_insn(mid) > value)
 			last = mid - 1;
 		else
 			return mid;
-        }
-        return NULL;
+	}
+	return NULL;
 }
 #endif
diff --git a/lib/lz4/lz4defs.h b/lib/lz4/lz4defs.h
index abcecdc2d0f2..0710a62ad2f6 100644
--- a/lib/lz4/lz4defs.h
+++ b/lib/lz4/lz4defs.h
@@ -11,8 +11,7 @@
 /*
  * Detects 64 bits mode
  */
-#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) \
-	|| defined(__ppc64__) || defined(__LP64__))
+#if defined(CONFIG_64BIT)
 #define LZ4_ARCH64 1
 #else
 #define LZ4_ARCH64 0
@@ -35,6 +34,10 @@ typedef struct _U64_S { u64 v; } U64_S;
 
 #define PUT4(s, d) (A32(d) = A32(s))
 #define PUT8(s, d) (A64(d) = A64(s))
+
+#define LZ4_READ_LITTLEENDIAN_16(d, s, p)	\
+	(d = s - A16(p))
+
 #define LZ4_WRITE_LITTLEENDIAN_16(p, v)	\
 	do {	\
 		A16(p) = v; \
@@ -51,10 +54,13 @@ typedef struct _U64_S { u64 v; } U64_S;
 #define PUT8(s, d) \
 	put_unaligned(get_unaligned((const u64 *) s), (u64 *) d)
 
-#define LZ4_WRITE_LITTLEENDIAN_16(p, v)	\
-	do {	\
-		put_unaligned(v, (u16 *)(p)); \
-		p += 2; \
+#define LZ4_READ_LITTLEENDIAN_16(d, s, p)	\
+	(d = s - get_unaligned_le16(p))
+
+#define LZ4_WRITE_LITTLEENDIAN_16(p, v)			\
+	do {						\
+		put_unaligned_le16(v, (u16 *)(p));	\
+		p += 2;					\
 	} while (0)
 #endif
 
@@ -140,9 +146,6 @@ typedef struct _U64_S { u64 v; } U64_S;
 
 #endif
 
-#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
-	(d = s - get_unaligned_le16(p))
-
 #define LZ4_WILDCOPY(s, d, e)		\
 	do {				\
 		LZ4_COPYPACKET(s, d);	\
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index 3db76b8c1115..e00ff00e861c 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -128,6 +128,23 @@ leave:
 }
 EXPORT_SYMBOL_GPL(mpi_read_from_buffer);
 
+static int count_lzeros(MPI a)
+{
+	mpi_limb_t alimb;
+	int i, lzeros = 0;
+
+	for (i = a->nlimbs - 1; i >= 0; i--) {
+		alimb = a->d[i];
+		if (alimb == 0) {
+			lzeros += sizeof(mpi_limb_t);
+		} else {
+			lzeros += count_leading_zeros(alimb) / 8;
+			break;
+		}
+	}
+	return lzeros;
+}
+
 /**
  * mpi_read_buffer() - read MPI to a bufer provided by user (msb first)
  *
@@ -146,7 +163,7 @@ int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,
 	uint8_t *p;
 	mpi_limb_t alimb;
 	unsigned int n = mpi_get_size(a);
-	int i, lzeros = 0;
+	int i, lzeros;
 
 	if (buf_len < n || !buf || !nbytes)
 		return -EINVAL;
@@ -154,14 +171,7 @@ int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,
 	if (sign)
 		*sign = a->sign;
 
-	p = (void *)&a->d[a->nlimbs] - 1;
-
-	for (i = a->nlimbs * sizeof(alimb) - 1; i >= 0; i--, p--) {
-		if (!*p)
-			lzeros++;
-		else
-			break;
-	}
+	lzeros = count_lzeros(a);
 
 	p = buf;
 	*nbytes = n - lzeros;
@@ -343,7 +353,7 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned *nbytes,
 	u8 *p, *p2;
 	mpi_limb_t alimb, alimb2;
 	unsigned int n = mpi_get_size(a);
-	int i, x, y = 0, lzeros = 0, buf_len;
+	int i, x, y = 0, lzeros, buf_len;
 
 	if (!nbytes || *nbytes < n)
 		return -EINVAL;
@@ -351,14 +361,7 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned *nbytes,
 	if (sign)
 		*sign = a->sign;
 
-	p = (void *)&a->d[a->nlimbs] - 1;
-
-	for (i = a->nlimbs * sizeof(alimb) - 1; i >= 0; i--, p--) {
-		if (!*p)
-			lzeros++;
-		else
-			break;
-	}
+	lzeros = count_lzeros(a);
 
 	*nbytes = n - lzeros;
 	buf_len = sgl->length;
diff --git a/lib/test-string_helpers.c b/lib/test-string_helpers.c
index 98866a770770..25b5cbfb7615 100644
--- a/lib/test-string_helpers.c
+++ b/lib/test-string_helpers.c
@@ -327,36 +327,67 @@ out:
 }
 
 #define string_get_size_maxbuf 16
-#define test_string_get_size_one(size, blk_size, units, exp_result)            \
+#define test_string_get_size_one(size, blk_size, exp_result10, exp_result2)    \
 	do {                                                                   \
-		BUILD_BUG_ON(sizeof(exp_result) >= string_get_size_maxbuf);    \
-		__test_string_get_size((size), (blk_size), (units),            \
-				       (exp_result));                          \
+		BUILD_BUG_ON(sizeof(exp_result10) >= string_get_size_maxbuf);  \
+		BUILD_BUG_ON(sizeof(exp_result2) >= string_get_size_maxbuf);   \
+		__test_string_get_size((size), (blk_size), (exp_result10),     \
+				       (exp_result2));                         \
 	} while (0)
 
 
-static __init void __test_string_get_size(const u64 size, const u64 blk_size,
-					  const enum string_size_units units,
-					  const char *exp_result)
+static __init void test_string_get_size_check(const char *units,
+					      const char *exp,
+					      char *res,
+					      const u64 size,
+					      const u64 blk_size)
 {
-	char buf[string_get_size_maxbuf];
-
-	string_get_size(size, blk_size, units, buf, sizeof(buf));
-	if (!memcmp(buf, exp_result, strlen(exp_result) + 1))
+	if (!memcmp(res, exp, strlen(exp) + 1))
 		return;
 
-	buf[sizeof(buf) - 1] = '\0';
-	pr_warn("Test 'test_string_get_size_one' failed!\n");
-	pr_warn("string_get_size(size = %llu, blk_size = %llu, units = %d\n",
+	res[string_get_size_maxbuf - 1] = '\0';
+
+	pr_warn("Test 'test_string_get_size' failed!\n");
+	pr_warn("string_get_size(size = %llu, blk_size = %llu, units = %s)\n",
 		size, blk_size, units);
-	pr_warn("expected: '%s', got '%s'\n", exp_result, buf);
+	pr_warn("expected: '%s', got '%s'\n", exp, res);
+}
+
+static __init void __test_string_get_size(const u64 size, const u64 blk_size,
+					  const char *exp_result10,
+					  const char *exp_result2)
+{
+	char buf10[string_get_size_maxbuf];
+	char buf2[string_get_size_maxbuf];
+
+	string_get_size(size, blk_size, STRING_UNITS_10, buf10, sizeof(buf10));
+	string_get_size(size, blk_size, STRING_UNITS_2, buf2, sizeof(buf2));
+
+	test_string_get_size_check("STRING_UNITS_10", exp_result10, buf10,
+				   size, blk_size);
+
+	test_string_get_size_check("STRING_UNITS_2", exp_result2, buf2,
+				   size, blk_size);
 }
 
 static __init void test_string_get_size(void)
 {
-	test_string_get_size_one(16384, 512, STRING_UNITS_2, "8.00 MiB");
-	test_string_get_size_one(8192, 4096, STRING_UNITS_10, "32.7 MB");
-	test_string_get_size_one(1, 512, STRING_UNITS_10, "512 B");
+	/* small values */
+	test_string_get_size_one(0, 512, "0 B", "0 B");
+	test_string_get_size_one(1, 512, "512 B", "512 B");
+	test_string_get_size_one(1100, 1, "1.10 kB", "1.07 KiB");
+
+	/* normal values */
+	test_string_get_size_one(16384, 512, "8.39 MB", "8.00 MiB");
+	test_string_get_size_one(500118192, 512, "256 GB", "238 GiB");
+	test_string_get_size_one(8192, 4096, "33.6 MB", "32.0 MiB");
+
+	/* weird block sizes */
+	test_string_get_size_one(3000, 1900, "5.70 MB", "5.44 MiB");
+
+	/* huge values */
+	test_string_get_size_one(U64_MAX, 4096, "75.6 ZB", "64.0 ZiB");
+	test_string_get_size_one(4096, U64_MAX, "75.6 ZB", "64.0 ZiB");
 }
 
 static int __init test_string_helpers_init(void)