Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4"

This reverts commit 9d6fd2c3e9fcfb ("Merge remote-tracking branch
'msm-4.4/tmp-510d0a3f' into msm-4.4"), because it breaks the
dump parsing tools due to kernel can be loaded anywhere in the memory
now and not fixed at linear mapping.

Change-Id: Id416f0a249d803442847d09ac47781147b0d0ee6
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>

1 files changed, 18 insertions, 21 deletions

diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index e00ff00e861c..3db76b8c1115 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -128,23 +128,6 @@ 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)
  *
@@ -163,7 +146,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;
+	int i, lzeros = 0;
 
 	if (buf_len < n || !buf || !nbytes)
 		return -EINVAL;
@@ -171,7 +154,14 @@ int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,
 	if (sign)
 		*sign = a->sign;
 
-	lzeros = count_lzeros(a);
+	p = (void *)&a->d[a->nlimbs] - 1;
+
+	for (i = a->nlimbs * sizeof(alimb) - 1; i >= 0; i--, p--) {
+		if (!*p)
+			lzeros++;
+		else
+			break;
+	}
 
 	p = buf;
 	*nbytes = n - lzeros;
@@ -353,7 +343,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, buf_len;
+	int i, x, y = 0, lzeros = 0, buf_len;
 
 	if (!nbytes || *nbytes < n)
 		return -EINVAL;
@@ -361,7 +351,14 @@ int mpi_write_to_sgl(MPI a, struct scatterlist *sgl, unsigned *nbytes,
 	if (sign)
 		*sign = a->sign;
 
-	lzeros = count_lzeros(a);
+	p = (void *)&a->d[a->nlimbs] - 1;
+
+	for (i = a->nlimbs * sizeof(alimb) - 1; i >= 0; i--, p--) {
+		if (!*p)
+			lzeros++;
+		else
+			break;
+	}
 
 	*nbytes = n - lzeros;
 	buf_len = sgl->length;