11 files changed, 110 insertions, 41 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index e2894b23efb6..3e0b662cae09 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1353,20 +1353,6 @@ config RCU_CPU_STALL_TIMEOUT
           RCU grace period persists, additional CPU stall warnings are
           printed at more widely spaced intervals.
 
-config RCU_CPU_STALL_INFO
-        bool "Print additional diagnostics on RCU CPU stall"
-        depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL
-        default y
-        help
-          For each stalled CPU that is aware of the current RCU grace
-          period, print out additional per-CPU diagnostic information
-          regarding scheduling-clock ticks, idle state, and,
-          for RCU_FAST_NO_HZ kernels, idle-entry state.
-
-          Say N if you are unsure.
-
-          Say Y if you want to enable such diagnostics.
-
 config RCU_TRACE
         bool "Enable tracing for RCU"
         depends on DEBUG_KERNEL
@@ -1379,7 +1365,7 @@ config RCU_TRACE
           Say N if you are unsure.
 
 config RCU_EQS_DEBUG
-        bool "Use this when adding any sort of NO_HZ support to your arch"
+        bool "Provide debugging asserts for adding NO_HZ support to an arch"
         depends on DEBUG_KERNEL
         help
           This option provides consistency checks in RCU's handling of
diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan
index 777eda7d1ab4..39f24d6721e5 100644
--- a/lib/Kconfig.kasan
+++ b/lib/Kconfig.kasan
@@ -18,10 +18,6 @@ config KASAN
           For better error detection enable CONFIG_STACKTRACE,
           and add slub_debug=U to boot cmdline.
 
-config KASAN_SHADOW_OFFSET
-        hex
-        default 0xdffffc0000000000 if X86_64
-
 choice
         prompt "Instrumentation type"
         depends on KASAN
diff --git a/lib/decompress.c b/lib/decompress.c
index 528ff932d8e4..62696dff5730 100644
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -59,8 +59,11 @@ decompress_fn __init decompress_method(const unsigned char *inbuf, long len,
 {
         const struct compress_format *cf;
 
-        if (len < 2)
+        if (len < 2) {
+                if (name)
+                        *name = NULL;
                 return NULL;    /* Need at least this much... */
+        }
 
         pr_debug("Compressed data magic: %#.2x %#.2x\n", inbuf[0], inbuf[1]);
 
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index ae4b65e17e64..dace71fe41f7 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *page)
         unsigned long flags;
         phys_addr_t cln;
 
+        if (dma_debug_disabled())
+                return;
+
         if (!page)
                 return;
 
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 7ea09699855d..8d74c20d8595 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -11,6 +11,7 @@
 #include <linux/ctype.h>
 #include <linux/kernel.h>
 #include <linux/export.h>
+#include <asm/unaligned.h>
 
 const char hex_asc[] = "0123456789abcdef";
 EXPORT_SYMBOL(hex_asc);
@@ -139,7 +140,7 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
                 for (j = 0; j < ngroups; j++) {
                         ret = snprintf(linebuf + lx, linebuflen - lx,
                                        "%s%16.16llx", j ? " " : "",
-                                       (unsigned long long)*(ptr8 + j));
+                                       get_unaligned(ptr8 + j));
                         if (ret >= linebuflen - lx)
                                 goto overflow1;
                         lx += ret;
@@ -150,7 +151,7 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
                 for (j = 0; j < ngroups; j++) {
                         ret = snprintf(linebuf + lx, linebuflen - lx,
                                        "%s%8.8x", j ? " " : "",
-                                       *(ptr4 + j));
+                                       get_unaligned(ptr4 + j));
                         if (ret >= linebuflen - lx)
                                 goto overflow1;
                         lx += ret;
@@ -161,7 +162,7 @@ int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize,
                 for (j = 0; j < ngroups; j++) {
                         ret = snprintf(linebuf + lx, linebuflen - lx,
                                        "%s%4.4x", j ? " " : "",
-                                       *(ptr2 + j));
+                                       get_unaligned(ptr2 + j));
                         if (ret >= linebuflen - lx)
                                 goto overflow1;
                         lx += ret;
diff --git a/lib/iommu-common.c b/lib/iommu-common.c
index df30632f0bef..ff19f66d3f7f 100644
--- a/lib/iommu-common.c
+++ b/lib/iommu-common.c
@@ -119,7 +119,7 @@ unsigned long iommu_tbl_range_alloc(struct device *dev,
         unsigned long align_mask = 0;
 
         if (align_order > 0)
-                align_mask = 0xffffffffffffffffl >> (64 - align_order);
+                align_mask = ~0ul >> (BITS_PER_LONG - align_order);
 
         /* Sanity check */
         if (unlikely(npages == 0)) {
diff --git a/lib/kobject.c b/lib/kobject.c
index 2e3bd01964a9..3e3a5c3cb330 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -337,8 +337,9 @@ error:
 }
 EXPORT_SYMBOL(kobject_init);
 
-static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
-                            const char *fmt, va_list vargs)
+static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
+                                           struct kobject *parent,
+                                           const char *fmt, va_list vargs)
 {
         int retval;
 
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index bc0a1da8afba..95c52a95259e 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -146,18 +146,25 @@ 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;
+        int i, lzeros = 0;
 
-        if (buf_len < n || !buf)
+        if (buf_len < n || !buf || !nbytes)
                 return -EINVAL;
 
         if (sign)
                 *sign = a->sign;
 
-        if (nbytes)
-                *nbytes = n;
+        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;
 
         for (i = a->nlimbs - 1; i >= 0; i--) {
                 alimb = a->d[i];
@@ -178,6 +185,19 @@ int mpi_read_buffer(MPI a, uint8_t *buf, unsigned buf_len, unsigned *nbytes,
 #else
 #error please implement for this limb size.
 #endif
+
+                if (lzeros > 0) {
+                        if (lzeros >= sizeof(alimb)) {
+                                p -= sizeof(alimb);
+                        } else {
+                                mpi_limb_t *limb1 = (void *)p - sizeof(alimb);
+                                mpi_limb_t *limb2 = (void *)p - sizeof(alimb)
+                                                        + lzeros;
+                                *limb1 = *limb2;
+                                p -= lzeros;
+                        }
+                        lzeros -= sizeof(alimb);
+                }
         }
         return 0;
 }
@@ -197,7 +217,7 @@ EXPORT_SYMBOL_GPL(mpi_read_buffer);
  */
 void *mpi_get_buffer(MPI a, unsigned *nbytes, int *sign)
 {
-        uint8_t *buf, *p;
+        uint8_t *buf;
         unsigned int n;
         int ret;
 
@@ -220,14 +240,6 @@ void *mpi_get_buffer(MPI a, unsigned *nbytes, int *sign)
                 kfree(buf);
                 return NULL;
         }
-
-        /* this is sub-optimal but we need to do the shift operation
-         * because the caller has to free the returned buffer */
-        for (p = buf; !*p && *nbytes; p++, --*nbytes)
-                ;
-        if (p != buf)
-                memmove(buf, p, *nbytes);
-
         return buf;
 }
 EXPORT_SYMBOL_GPL(mpi_get_buffer);
diff --git a/lib/pci_iomap.c b/lib/pci_iomap.c
index bcce5f149310..5f5d24d1d53f 100644
--- a/lib/pci_iomap.c
+++ b/lib/pci_iomap.c
@@ -52,6 +52,51 @@ void __iomem *pci_iomap_range(struct pci_dev *dev,
 EXPORT_SYMBOL(pci_iomap_range);
 
 /**
+ * pci_iomap_wc_range - create a virtual WC mapping cookie for a PCI BAR
+ * @dev: PCI device that owns the BAR
+ * @bar: BAR number
+ * @offset: map memory at the given offset in BAR
+ * @maxlen: max length of the memory to map
+ *
+ * Using this function you will get a __iomem address to your device BAR.
+ * You can access it using ioread*() and iowrite*(). These functions hide
+ * the details if this is a MMIO or PIO address space and will just do what
+ * you expect from them in the correct way. When possible write combining
+ * is used.
+ *
+ * @maxlen specifies the maximum length to map. If you want to get access to
+ * the complete BAR from offset to the end, pass %0 here.
+ * */
+void __iomem *pci_iomap_wc_range(struct pci_dev *dev,
+                                 int bar,
+                                 unsigned long offset,
+                                 unsigned long maxlen)
+{
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
+        unsigned long flags = pci_resource_flags(dev, bar);
+
+
+        if (flags & IORESOURCE_IO)
+                return NULL;
+
+        if (len <= offset || !start)
+                return NULL;
+
+        len -= offset;
+        start += offset;
+        if (maxlen && len > maxlen)
+                len = maxlen;
+
+        if (flags & IORESOURCE_MEM)
+                return ioremap_wc(start, len);
+
+        /* What? */
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(pci_iomap_wc_range);
+
+/**
  * pci_iomap - create a virtual mapping cookie for a PCI BAR
  * @dev: PCI device that owns the BAR
  * @bar: BAR number
@@ -70,4 +115,25 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
         return pci_iomap_range(dev, bar, 0, maxlen);
 }
 EXPORT_SYMBOL(pci_iomap);
+
+/**
+ * pci_iomap_wc - create a virtual WC mapping cookie for a PCI BAR
+ * @dev: PCI device that owns the BAR
+ * @bar: BAR number
+ * @maxlen: length of the memory to map
+ *
+ * Using this function you will get a __iomem address to your device BAR.
+ * You can access it using ioread*() and iowrite*(). These functions hide
+ * the details if this is a MMIO or PIO address space and will just do what
+ * you expect from them in the correct way. When possible write combining
+ * is used.
+ *
+ * @maxlen specifies the maximum length to map. If you want to get access to
+ * the complete BAR without checking for its length first, pass %0 here.
+ * */
+void __iomem *pci_iomap_wc(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+        return pci_iomap_wc_range(dev, bar, 0, maxlen);
+}
+EXPORT_SYMBOL_GPL(pci_iomap_wc);
 #endif /* CONFIG_PCI */
diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index a60a6d335a91..cc0c69710dcf 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -610,6 +610,8 @@ next:
                 iter->skip = 0;
         }
 
+        iter->p = NULL;
+
         /* Ensure we see any new tables. */
         smp_rmb();
 
@@ -620,8 +622,6 @@ next:
                 return ERR_PTR(-EAGAIN);
         }
 
-        iter->p = NULL;
-
         return NULL;
 }
 EXPORT_SYMBOL_GPL(rhashtable_walk_next);
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index da39c608a28c..95cd63b43b99 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -17,6 +17,7 @@
  */
 
 #include <stdarg.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/module.h>       /* for KSYM_SYMBOL_LEN */
 #include <linux/types.h>