13 files changed, 284 insertions, 217 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 75cdb77fa49d..3958dc4389f9 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -322,7 +322,7 @@ config CPUMASK_OFFSTACK
 
 config DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
        bool "Disable obsolete cpumask functions" if DEBUG_PER_CPU_MAPS
-       depends on EXPERIMENTAL && BROKEN
+       depends on BROKEN
 
 config CPU_RMAP
         bool
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 67604e599384..e4a7f808fa06 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -243,8 +243,7 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
         default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
 
 config PANIC_ON_OOPS
-        bool "Panic on Oops" if EXPERT
-        default n
+        bool "Panic on Oops"
         help
           Say Y here to enable the kernel to panic when it oopses. This
           has the same effect as setting oops=panic on the kernel command
@@ -455,7 +454,7 @@ config HAVE_DEBUG_KMEMLEAK
 
 config DEBUG_KMEMLEAK
         bool "Kernel memory leak detector"
-        depends on DEBUG_KERNEL && EXPERIMENTAL && HAVE_DEBUG_KMEMLEAK
+        depends on DEBUG_KERNEL && HAVE_DEBUG_KMEMLEAK
         select DEBUG_FS
         select STACKTRACE if STACKTRACE_SUPPORT
         select KALLSYMS
@@ -605,61 +604,6 @@ config PROVE_LOCKING
 
          For more details, see Documentation/lockdep-design.txt.
 
-config PROVE_RCU
-        bool "RCU debugging: prove RCU correctness"
-        depends on PROVE_LOCKING
-        default n
-        help
-         This feature enables lockdep extensions that check for correct
-         use of RCU APIs.  This is currently under development.  Say Y
-         if you want to debug RCU usage or help work on the PROVE_RCU
-         feature.
-
-         Say N if you are unsure.
-
-config PROVE_RCU_REPEATEDLY
-        bool "RCU debugging: don't disable PROVE_RCU on first splat"
-        depends on PROVE_RCU
-        default n
-        help
-         By itself, PROVE_RCU will disable checking upon issuing the
-         first warning (or "splat").  This feature prevents such
-         disabling, allowing multiple RCU-lockdep warnings to be printed
-         on a single reboot.
-
-         Say Y to allow multiple RCU-lockdep warnings per boot.
-
-         Say N if you are unsure.
-
-config PROVE_RCU_DELAY
-        bool "RCU debugging: preemptible RCU race provocation"
-        depends on DEBUG_KERNEL && PREEMPT_RCU
-        default n
-        help
-         There is a class of races that involve an unlikely preemption
-         of __rcu_read_unlock() just after ->rcu_read_lock_nesting has
-         been set to INT_MIN.  This feature inserts a delay at that
-         point to increase the probability of these races.
-
-         Say Y to increase probability of preemption of __rcu_read_unlock().
-
-         Say N if you are unsure.
-
-config SPARSE_RCU_POINTER
-        bool "RCU debugging: sparse-based checks for pointer usage"
-        default n
-        help
-         This feature enables the __rcu sparse annotation for
-         RCU-protected pointers.  This annotation will cause sparse
-         to flag any non-RCU used of annotated pointers.  This can be
-         helpful when debugging RCU usage.  Please note that this feature
-         is not intended to enforce code cleanliness; it is instead merely
-         a debugging aid.
-
-         Say Y to make sparse flag questionable use of RCU-protected pointers
-
-         Say N if you are unsure.
-
 config LOCKDEP
         bool
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -937,6 +881,63 @@ config BOOT_PRINTK_DELAY
           BOOT_PRINTK_DELAY also may cause LOCKUP_DETECTOR to detect
           what it believes to be lockup conditions.
 
+menu "RCU Debugging"
+
+config PROVE_RCU
+        bool "RCU debugging: prove RCU correctness"
+        depends on PROVE_LOCKING
+        default n
+        help
+         This feature enables lockdep extensions that check for correct
+         use of RCU APIs.  This is currently under development.  Say Y
+         if you want to debug RCU usage or help work on the PROVE_RCU
+         feature.
+
+         Say N if you are unsure.
+
+config PROVE_RCU_REPEATEDLY
+        bool "RCU debugging: don't disable PROVE_RCU on first splat"
+        depends on PROVE_RCU
+        default n
+        help
+         By itself, PROVE_RCU will disable checking upon issuing the
+         first warning (or "splat").  This feature prevents such
+         disabling, allowing multiple RCU-lockdep warnings to be printed
+         on a single reboot.
+
+         Say Y to allow multiple RCU-lockdep warnings per boot.
+
+         Say N if you are unsure.
+
+config PROVE_RCU_DELAY
+        bool "RCU debugging: preemptible RCU race provocation"
+        depends on DEBUG_KERNEL && PREEMPT_RCU
+        default n
+        help
+         There is a class of races that involve an unlikely preemption
+         of __rcu_read_unlock() just after ->rcu_read_lock_nesting has
+         been set to INT_MIN.  This feature inserts a delay at that
+         point to increase the probability of these races.
+
+         Say Y to increase probability of preemption of __rcu_read_unlock().
+
+         Say N if you are unsure.
+
+config SPARSE_RCU_POINTER
+        bool "RCU debugging: sparse-based checks for pointer usage"
+        default n
+        help
+         This feature enables the __rcu sparse annotation for
+         RCU-protected pointers.  This annotation will cause sparse
+         to flag any non-RCU used of annotated pointers.  This can be
+         helpful when debugging RCU usage.  Please note that this feature
+         is not intended to enforce code cleanliness; it is instead merely
+         a debugging aid.
+
+         Say Y to make sparse flag questionable use of RCU-protected pointers
+
+         Say N if you are unsure.
+
 config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL
@@ -970,7 +971,7 @@ config RCU_TORTURE_TEST_RUNNABLE
 
 config RCU_CPU_STALL_TIMEOUT
         int "RCU CPU stall timeout in seconds"
-        depends on TREE_RCU || TREE_PREEMPT_RCU
+        depends on RCU_STALL_COMMON
         range 3 300
         default 21
         help
@@ -1008,6 +1009,7 @@ config RCU_CPU_STALL_INFO
 config RCU_TRACE
         bool "Enable tracing for RCU"
         depends on DEBUG_KERNEL
+        select TRACE_CLOCK
         help
           This option provides tracing in RCU which presents stats
           in debugfs for debugging RCU implementation.
@@ -1015,6 +1017,8 @@ config RCU_TRACE
           Say Y here if you want to enable RCU tracing
           Say N if you are unsure.
 
+endmenu # "RCU Debugging"
+
 config KPROBES_SANITY_TEST
         bool "Kprobes sanity tests"
         depends on DEBUG_KERNEL
diff --git a/lib/Kconfig.kgdb b/lib/Kconfig.kgdb
index 43cb93fa2651..dbb58ae1b8e0 100644
--- a/lib/Kconfig.kgdb
+++ b/lib/Kconfig.kgdb
@@ -5,7 +5,7 @@ config HAVE_ARCH_KGDB
 menuconfig KGDB
         bool "KGDB: kernel debugger"
         depends on HAVE_ARCH_KGDB
-        depends on DEBUG_KERNEL && EXPERIMENTAL
+        depends on DEBUG_KERNEL
         help
           If you say Y here, it will be possible to remotely debug the
           kernel using gdb.  It is recommended but not required, that
@@ -22,6 +22,7 @@ config KGDB_SERIAL_CONSOLE
         tristate "KGDB: use kgdb over the serial console"
         select CONSOLE_POLL
         select MAGIC_SYSRQ
+        depends on TTY
         default y
         help
           Share a serial console with kgdb. Sysrq-g must be used
diff --git a/lib/devres.c b/lib/devres.c
index 80b9c76d436a..88ad75952a76 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -1,3 +1,4 @@
+#include <linux/err.h>
 #include <linux/pci.h>
 #include <linux/io.h>
 #include <linux/gfp.h>
@@ -86,22 +87,24 @@ void devm_iounmap(struct device *dev, void __iomem *addr)
 EXPORT_SYMBOL(devm_iounmap);
 
 /**
- * devm_request_and_ioremap() - Check, request region, and ioremap resource
- * @dev: Generic device to handle the resource for
+ * devm_ioremap_resource() - check, request region, and ioremap resource
+ * @dev: generic device to handle the resource for
  * @res: resource to be handled
  *
- * Takes all necessary steps to ioremap a mem resource. Uses managed device, so
- * everything is undone on driver detach. Checks arguments, so you can feed
- * it the result from e.g. platform_get_resource() directly. Returns the
- * remapped pointer or NULL on error. Usage example:
+ * Checks that a resource is a valid memory region, requests the memory region
+ * and ioremaps it either as cacheable or as non-cacheable memory depending on
+ * the resource's flags. All operations are managed and will be undone on
+ * driver detach.
+ *
+ * Returns a pointer to the remapped memory or an ERR_PTR() encoded error code
+ * on failure. Usage example:
  *
  *      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- *      base = devm_request_and_ioremap(&pdev->dev, res);
- *      if (!base)
- *              return -EADDRNOTAVAIL;
+ *      base = devm_ioremap_resource(&pdev->dev, res);
+ *      if (IS_ERR(base))
+ *              return PTR_ERR(base);
  */
-void __iomem *devm_request_and_ioremap(struct device *dev,
-                        struct resource *res)
+void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
 {
         resource_size_t size;
         const char *name;
@@ -111,7 +114,7 @@ void __iomem *devm_request_and_ioremap(struct device *dev,
 
         if (!res || resource_type(res) != IORESOURCE_MEM) {
                 dev_err(dev, "invalid resource\n");
-                return NULL;
+                return ERR_PTR(-EINVAL);
         }
 
         size = resource_size(res);
@@ -119,7 +122,7 @@ void __iomem *devm_request_and_ioremap(struct device *dev,
 
         if (!devm_request_mem_region(dev, res->start, size, name)) {
                 dev_err(dev, "can't request region for resource %pR\n", res);
-                return NULL;
+                return ERR_PTR(-EBUSY);
         }
 
         if (res->flags & IORESOURCE_CACHEABLE)
@@ -130,10 +133,39 @@ void __iomem *devm_request_and_ioremap(struct device *dev,
         if (!dest_ptr) {
                 dev_err(dev, "ioremap failed for resource %pR\n", res);
                 devm_release_mem_region(dev, res->start, size);
+                dest_ptr = ERR_PTR(-ENOMEM);
         }
 
         return dest_ptr;
 }
+EXPORT_SYMBOL(devm_ioremap_resource);
+
+/**
+ * devm_request_and_ioremap() - Check, request region, and ioremap resource
+ * @dev: Generic device to handle the resource for
+ * @res: resource to be handled
+ *
+ * Takes all necessary steps to ioremap a mem resource. Uses managed device, so
+ * everything is undone on driver detach. Checks arguments, so you can feed
+ * it the result from e.g. platform_get_resource() directly. Returns the
+ * remapped pointer or NULL on error. Usage example:
+ *
+ *      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ *      base = devm_request_and_ioremap(&pdev->dev, res);
+ *      if (!base)
+ *              return -EADDRNOTAVAIL;
+ */
+void __iomem *devm_request_and_ioremap(struct device *device,
+                                       struct resource *res)
+{
+        void __iomem *dest_ptr;
+
+        dest_ptr = devm_ioremap_resource(device, res);
+        if (IS_ERR(dest_ptr))
+                return NULL;
+
+        return dest_ptr;
+}
 EXPORT_SYMBOL(devm_request_and_ioremap);
 
 #ifdef CONFIG_HAS_IOPORT
diff --git a/lib/digsig.c b/lib/digsig.c
index dc2be7ed1765..2f31e6a45f0a 100644
--- a/lib/digsig.c
+++ b/lib/digsig.c
@@ -30,11 +30,10 @@
 
 static struct crypto_shash *shash;
 
-static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
-                        unsigned long  msglen,
-                        unsigned long  modulus_bitlen,
-                        unsigned char *out,
-                        unsigned long *outlen)
+static const char *pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
+                                                unsigned long  msglen,
+                                                unsigned long  modulus_bitlen,
+                                                unsigned long *outlen)
 {
         unsigned long modulus_len, ps_len, i;
 
@@ -42,11 +41,11 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
 
         /* test message size */
         if ((msglen > modulus_len) || (modulus_len < 11))
-                return -EINVAL;
+                return NULL;
 
         /* separate encoded message */
-        if ((msg[0] != 0x00) || (msg[1] != (unsigned char)1))
-                return -EINVAL;
+        if (msg[0] != 0x00 || msg[1] != 0x01)
+                return NULL;
 
         for (i = 2; i < modulus_len - 1; i++)
                 if (msg[i] != 0xFF)
@@ -56,19 +55,13 @@ static int pkcs_1_v1_5_decode_emsa(const unsigned char *msg,
         if (msg[i] != 0)
                 /* There was no octet with hexadecimal value 0x00
                 to separate ps from m. */
-                return -EINVAL;
+                return NULL;
 
         ps_len = i - 2;
 
-        if (*outlen < (msglen - (2 + ps_len + 1))) {
-                *outlen = msglen - (2 + ps_len + 1);
-                return -EOVERFLOW;
-        }
-
         *outlen = (msglen - (2 + ps_len + 1));
-        memcpy(out, &msg[2 + ps_len + 1], *outlen);
 
-        return 0;
+        return msg + 2 + ps_len + 1;
 }
 
 /*
@@ -83,7 +76,8 @@ static int digsig_verify_rsa(struct key *key,
         unsigned long mlen, mblen;
         unsigned nret, l;
         int head, i;
-        unsigned char *out1 = NULL, *out2 = NULL;
+        unsigned char *out1 = NULL;
+        const char *m;
         MPI in = NULL, res = NULL, pkey[2];
         uint8_t *p, *datap, *endp;
         struct user_key_payload *ukp;
@@ -120,7 +114,7 @@ static int digsig_verify_rsa(struct key *key,
         }
 
         mblen = mpi_get_nbits(pkey[0]);
-        mlen = (mblen + 7)/8;
+        mlen = DIV_ROUND_UP(mblen, 8);
 
         if (mlen == 0)
                 goto err;
@@ -129,10 +123,6 @@ static int digsig_verify_rsa(struct key *key,
         if (!out1)
                 goto err;
 
-        out2 = kzalloc(mlen, GFP_KERNEL);
-        if (!out2)
-                goto err;
-
         nret = siglen;
         in = mpi_read_from_buffer(sig, &nret);
         if (!in)
@@ -164,18 +154,15 @@ static int digsig_verify_rsa(struct key *key,
 
         kfree(p);
 
-        err = pkcs_1_v1_5_decode_emsa(out1, len, mblen, out2, &len);
-        if (err)
-                goto err;
+        m = pkcs_1_v1_5_decode_emsa(out1, len, mblen, &len);
 
-        if (len != hlen || memcmp(out2, h, hlen))
+        if (!m || len != hlen || memcmp(m, h, hlen))
                 err = -EINVAL;
 
 err:
         mpi_free(in);
         mpi_free(res);
         kfree(out1);
-        kfree(out2);
         while (--i >= 0)
                 mpi_free(pkey[i]);
 err1:
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 1db1fc660538..5276b99ca650 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -59,7 +59,7 @@ struct ddebug_iter {
 
 static DEFINE_MUTEX(ddebug_lock);
 static LIST_HEAD(ddebug_tables);
-static int verbose = 0;
+static int verbose;
 module_param(verbose, int, 0644);
 
 /* Return the path relative to source root */
@@ -100,24 +100,32 @@ static char *ddebug_describe_flags(struct _ddebug *dp, char *buf,
         return buf;
 }
 
-#define vpr_info(fmt, ...) \
-        if (verbose) do { pr_info(fmt, ##__VA_ARGS__); } while (0)
-
-#define vpr_info_dq(q, msg)                                     \
+#define vpr_info(fmt, ...)                                      \
 do {                                                            \
-        /* trim last char off format print */                   \
-        vpr_info("%s: func=\"%s\" file=\"%s\" "                 \
-                "module=\"%s\" format=\"%.*s\" "                \
-                "lineno=%u-%u",                                 \
-                msg,                                            \
-                q->function ? q->function : "",                 \
-                q->filename ? q->filename : "",                 \
-                q->module ? q->module : "",                     \
-                (int)(q->format ? strlen(q->format) - 1 : 0),   \
-                q->format ? q->format : "",                     \
-                q->first_lineno, q->last_lineno);               \
+        if (verbose)                                            \
+                pr_info(fmt, ##__VA_ARGS__);                    \
 } while (0)
 
+static void vpr_info_dq(const struct ddebug_query *query, const char *msg)
+{
+        /* trim any trailing newlines */
+        int fmtlen = 0;
+
+        if (query->format) {
+                fmtlen = strlen(query->format);
+                while (fmtlen && query->format[fmtlen - 1] == '\n')
+                        fmtlen--;
+        }
+
+        vpr_info("%s: func=\"%s\" file=\"%s\" module=\"%s\" format=\"%.*s\" lineno=%u-%u\n",
+                 msg,
+                 query->function ? query->function : "",
+                 query->filename ? query->filename : "",
+                 query->module ? query->module : "",
+                 fmtlen, query->format ? query->format : "",
+                 query->first_lineno, query->last_lineno);
+}
+
 /*
  * Search the tables for _ddebug's which match the given `query' and
  * apply the `flags' and `mask' to them.  Returns number of matching
@@ -141,7 +149,7 @@ static int ddebug_change(const struct ddebug_query *query,
                 if (query->module && strcmp(query->module, dt->mod_name))
                         continue;
 
-                for (i = 0 ; i < dt->num_ddebugs ; i++) {
+                for (i = 0; i < dt->num_ddebugs; i++) {
                         struct _ddebug *dp = &dt->ddebugs[i];
 
                         /* match against the source filename */
@@ -176,10 +184,10 @@ static int ddebug_change(const struct ddebug_query *query,
                                 continue;
                         dp->flags = newflags;
                         vpr_info("changed %s:%d [%s]%s =%s\n",
-                                trim_prefix(dp->filename), dp->lineno,
-                                dt->mod_name, dp->function,
-                                ddebug_describe_flags(dp, flagbuf,
-                                                sizeof(flagbuf)));
+                                 trim_prefix(dp->filename), dp->lineno,
+                                 dt->mod_name, dp->function,
+                                 ddebug_describe_flags(dp, flagbuf,
+                                                       sizeof(flagbuf)));
                 }
         }
         mutex_unlock(&ddebug_lock);
@@ -213,19 +221,23 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
                 /* find `end' of word, whitespace separated or quoted */
                 if (*buf == '"' || *buf == '\'') {
                         int quote = *buf++;
-                        for (end = buf ; *end && *end != quote ; end++)
+                        for (end = buf; *end && *end != quote; end++)
                                 ;
-                        if (!*end)
+                        if (!*end) {
+                                pr_err("unclosed quote: %s\n", buf);
                                 return -EINVAL; /* unclosed quote */
+                        }
                 } else {
-                        for (end = buf ; *end && !isspace(*end) ; end++)
+                        for (end = buf; *end && !isspace(*end); end++)
                                 ;
                         BUG_ON(end == buf);
                 }
 
                 /* `buf' is start of word, `end' is one past its end */
-                if (nwords == maxwords)
+                if (nwords == maxwords) {
+                        pr_err("too many words, legal max <=%d\n", maxwords);
                         return -EINVAL; /* ran out of words[] before bytes */
+                }
                 if (*end)
                         *end++ = '\0';  /* terminate the word */
                 words[nwords++] = buf;
@@ -235,7 +247,7 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords)
         if (verbose) {
                 int i;
                 pr_info("split into words:");
-                for (i = 0 ; i < nwords ; i++)
+                for (i = 0; i < nwords; i++)
                         pr_cont(" \"%s\"", words[i]);
                 pr_cont("\n");
         }
@@ -257,7 +269,11 @@ static inline int parse_lineno(const char *str, unsigned int *val)
                 return 0;
         }
         *val = simple_strtoul(str, &end, 10);
-        return end == NULL || end == str || *end != '\0' ? -EINVAL : 0;
+        if (end == NULL || end == str || *end != '\0') {
+                pr_err("bad line-number: %s\n", str);
+                return -EINVAL;
+        }
+        return 0;
 }
 
 /*
@@ -286,11 +302,11 @@ static char *unescape(char *str)
                                 in += 2;
                                 continue;
                         } else if (isodigit(in[1]) &&
-                                 isodigit(in[2]) &&
-                                 isodigit(in[3])) {
-                                *out++ = ((in[1] - '0')<<6) |
-                                          ((in[2] - '0')<<3) |
-                                          (in[3] - '0');
+                                   isodigit(in[2]) &&
+                                   isodigit(in[3])) {
+                                *out++ = (((in[1] - '0') << 6) |
+                                          ((in[2] - '0') << 3) |
+                                          (in[3] - '0'));
                                 in += 4;
                                 continue;
                         }
@@ -308,8 +324,8 @@ static int check_set(const char **dest, char *src, char *name)
 
         if (*dest) {
                 rc = -EINVAL;
-                pr_err("match-spec:%s val:%s overridden by %s",
-                        name, *dest, src);
+                pr_err("match-spec:%s val:%s overridden by %s\n",
+                       name, *dest, src);
         }
         *dest = src;
         return rc;
@@ -337,40 +353,46 @@ static int ddebug_parse_query(char *words[], int nwords,
         int rc;
 
         /* check we have an even number of words */
-        if (nwords % 2 != 0)
+        if (nwords % 2 != 0) {
+                pr_err("expecting pairs of match-spec <value>\n");
                 return -EINVAL;
+        }
         memset(query, 0, sizeof(*query));
 
         if (modname)
                 /* support $modname.dyndbg=<multiple queries> */
                 query->module = modname;
 
-        for (i = 0 ; i < nwords ; i += 2) {
-                if (!strcmp(words[i], "func"))
+        for (i = 0; i < nwords; i += 2) {
+                if (!strcmp(words[i], "func")) {
                         rc = check_set(&query->function, words[i+1], "func");
-                else if (!strcmp(words[i], "file"))
+                } else if (!strcmp(words[i], "file")) {
                         rc = check_set(&query->filename, words[i+1], "file");
-                else if (!strcmp(words[i], "module"))
+                } else if (!strcmp(words[i], "module")) {
                         rc = check_set(&query->module, words[i+1], "module");
-                else if (!strcmp(words[i], "format"))
+                } else if (!strcmp(words[i], "format")) {
                         rc = check_set(&query->format, unescape(words[i+1]),
-                                "format");
-                else if (!strcmp(words[i], "line")) {
+                                       "format");
+                } else if (!strcmp(words[i], "line")) {
                         char *first = words[i+1];
                         char *last = strchr(first, '-');
                         if (query->first_lineno || query->last_lineno) {
-                                pr_err("match-spec:line given 2 times\n");
+                                pr_err("match-spec: line used 2x\n");
                                 return -EINVAL;
                         }
                         if (last)
                                 *last++ = '\0';
-                        if (parse_lineno(first, &query->first_lineno) < 0)
+                        if (parse_lineno(first, &query->first_lineno) < 0) {
+                                pr_err("line-number is <0\n");
                                 return -EINVAL;
+                        }
                         if (last) {
                                 /* range <first>-<last> */
                                 if (parse_lineno(last, &query->last_lineno)
                                     < query->first_lineno) {
-                                        pr_err("last-line < 1st-line\n");
+                                        pr_err("last-line:%d < 1st-line:%d\n",
+                                                query->last_lineno,
+                                                query->first_lineno);
                                         return -EINVAL;
                                 }
                         } else {
@@ -406,19 +428,22 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp,
                 op = *str++;
                 break;
         default:
+                pr_err("bad flag-op %c, at start of %s\n", *str, str);
                 return -EINVAL;
         }
         vpr_info("op='%c'\n", op);
 
-        for ( ; *str ; ++str) {
+        for (; *str ; ++str) {
                 for (i = ARRAY_SIZE(opt_array) - 1; i >= 0; i--) {
                         if (*str == opt_array[i].opt_char) {
                                 flags |= opt_array[i].flag;
                                 break;
                         }
                 }
-                if (i < 0)
+                if (i < 0) {
+                        pr_err("unknown flag '%c' in \"%s\"\n", *str, str);
                         return -EINVAL;
+                }
         }
         vpr_info("flags=0x%x\n", flags);
 
@@ -450,16 +475,22 @@ static int ddebug_exec_query(char *query_string, const char *modname)
         char *words[MAXWORDS];
 
         nwords = ddebug_tokenize(query_string, words, MAXWORDS);
-        if (nwords <= 0)
+        if (nwords <= 0) {
+                pr_err("tokenize failed\n");
                 return -EINVAL;
-        if (ddebug_parse_query(words, nwords-1, &query, modname))
+        }
+        /* check flags 1st (last arg) so query is pairs of spec,val */
+        if (ddebug_parse_flags(words[nwords-1], &flags, &mask)) {
+                pr_err("flags parse failed\n");
                 return -EINVAL;
-        if (ddebug_parse_flags(words[nwords-1], &flags, &mask))
+        }
+        if (ddebug_parse_query(words, nwords-1, &query, modname)) {
+                pr_err("query parse failed\n");
                 return -EINVAL;
-
+        }
         /* actually go and implement the change */
         nfound = ddebug_change(&query, flags, mask);
-        vpr_info_dq((&query), (nfound) ? "applied" : "no-match");
+        vpr_info_dq(&query, nfound ? "applied" : "no-match");
 
         return nfound;
 }
@@ -488,8 +519,9 @@ static int ddebug_exec_queries(char *query, const char *modname)
                 if (rc < 0) {
                         errs++;
                         exitcode = rc;
-                } else
+                } else {
                         nfound += rc;
+                }
                 i++;
         }
         vpr_info("processed %d queries, with %d matches, %d errs\n",
@@ -765,7 +797,7 @@ static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos)
         struct _ddebug *dp;
 
         vpr_info("called m=%p p=%p *pos=%lld\n",
-                m, p, (unsigned long long)*pos);
+                 m, p, (unsigned long long)*pos);
 
         if (p == SEQ_START_TOKEN)
                 dp = ddebug_iter_first(iter);
@@ -791,14 +823,14 @@ static int ddebug_proc_show(struct seq_file *m, void *p)
 
         if (p == SEQ_START_TOKEN) {
                 seq_puts(m,
-                        "# filename:lineno [module]function flags format\n");
+                         "# filename:lineno [module]function flags format\n");
                 return 0;
         }
 
         seq_printf(m, "%s:%u [%s]%s =%s \"",
-                trim_prefix(dp->filename), dp->lineno,
-                iter->table->mod_name, dp->function,
-                ddebug_describe_flags(dp, flagsbuf, sizeof(flagsbuf)));
+                   trim_prefix(dp->filename), dp->lineno,
+                   iter->table->mod_name, dp->function,
+                   ddebug_describe_flags(dp, flagsbuf, sizeof(flagsbuf)));
         seq_escape(m, dp->format, "\t\r\n\"");
         seq_puts(m, "\"\n");
 
@@ -845,7 +877,7 @@ static int ddebug_proc_open(struct inode *inode, struct file *file)
                 kfree(iter);
                 return err;
         }
-        ((struct seq_file *) file->private_data)->private = iter;
+        ((struct seq_file *)file->private_data)->private = iter;
         return 0;
 }
 
@@ -1002,8 +1034,7 @@ static int __init dynamic_debug_init(void)
         int verbose_bytes = 0;
 
         if (__start___verbose == __stop___verbose) {
-                pr_warn("_ddebug table is empty in a "
-                        "CONFIG_DYNAMIC_DEBUG build");
+                pr_warn("_ddebug table is empty in a CONFIG_DYNAMIC_DEBUG build\n");
                 return 1;
         }
         iter = __start___verbose;
@@ -1030,18 +1061,16 @@ static int __init dynamic_debug_init(void)
                 goto out_err;
 
         ddebug_init_success = 1;
-        vpr_info("%d modules, %d entries and %d bytes in ddebug tables,"
-                " %d bytes in (readonly) verbose section\n",
-                modct, entries, (int)( modct * sizeof(struct ddebug_table)),
-                verbose_bytes + (int)(__stop___verbose - __start___verbose));
+        vpr_info("%d modules, %d entries and %d bytes in ddebug tables, %d bytes in (readonly) verbose section\n",
+                 modct, entries, (int)(modct * sizeof(struct ddebug_table)),
+                 verbose_bytes + (int)(__stop___verbose - __start___verbose));
 
         /* apply ddebug_query boot param, dont unload tables on err */
         if (ddebug_setup_string[0] != '\0') {
-                pr_warn("ddebug_query param name is deprecated,"
-                        " change it to dyndbg\n");
+                pr_warn("ddebug_query param name is deprecated, change it to dyndbg\n");
                 ret = ddebug_exec_queries(ddebug_setup_string, NULL);
                 if (ret < 0)
-                        pr_warn("Invalid ddebug boot param %s",
+                        pr_warn("Invalid ddebug boot param %s\n",
                                 ddebug_setup_string);
                 else
                         pr_info("%d changes by ddebug_query\n", ret);
diff --git a/lib/hexdump.c b/lib/hexdump.c
index 6540d657dca4..3f0494c9d57a 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -227,6 +227,7 @@ void print_hex_dump(const char *level, const char *prefix_str, int prefix_type,
 }
 EXPORT_SYMBOL(print_hex_dump);
 
+#if !defined(CONFIG_DYNAMIC_DEBUG)
 /**
  * print_hex_dump_bytes - shorthand form of print_hex_dump() with default params
  * @prefix_str: string to prefix each line with;
@@ -246,4 +247,5 @@ void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
                        buf, len, true);
 }
 EXPORT_SYMBOL(print_hex_dump_bytes);
-#endif
+#endif /* !defined(CONFIG_DYNAMIC_DEBUG) */
+#endif /* defined(CONFIG_PRINTK) */
diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
index 77adcf6bc257..60cf765628e9 100644
--- a/lib/mpi/mpi-internal.h
+++ b/lib/mpi/mpi-internal.h
@@ -65,10 +65,6 @@
 typedef mpi_limb_t *mpi_ptr_t;  /* pointer to a limb */
 typedef int mpi_size_t;         /* (must be a signed type) */
 
-#define ABS(x) (x >= 0 ? x : -x)
-#define MIN(l, o) ((l) < (o) ? (l) : (o))
-#define MAX(h, i) ((h) > (i) ? (h) : (i))
-
 static inline int RESIZE_IF_NEEDED(MPI a, unsigned b)
 {
         if (a->alloced < b)
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c
index 3962b7f7fe3f..5f9c44cdf1f5 100644
--- a/lib/mpi/mpicoder.c
+++ b/lib/mpi/mpicoder.c
@@ -52,7 +52,7 @@ MPI mpi_read_raw_data(const void *xbuffer, size_t nbytes)
         else
                 nbits = 0;
 
-        nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;
+        nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);
         val = mpi_alloc(nlimbs);
         if (!val)
                 return NULL;
@@ -96,8 +96,8 @@ MPI mpi_read_from_buffer(const void *xbuffer, unsigned *ret_nread)
         buffer += 2;
         nread = 2;
 
-        nbytes = (nbits + 7) / 8;
-        nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;
+        nbytes = DIV_ROUND_UP(nbits, 8);
+        nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);
         val = mpi_alloc(nlimbs);
         if (!val)
                 return NULL;
@@ -193,7 +193,7 @@ int mpi_set_buffer(MPI a, const void *xbuffer, unsigned nbytes, int sign)
         int nlimbs;
         int i;
 
-        nlimbs = (nbytes + BYTES_PER_MPI_LIMB - 1) / BYTES_PER_MPI_LIMB;
+        nlimbs = DIV_ROUND_UP(nbytes, BYTES_PER_MPI_LIMB);
         if (RESIZE_IF_NEEDED(a, nlimbs) < 0)
                 return -ENOMEM;
         a->sign = sign;
diff --git a/lib/parser.c b/lib/parser.c
index 52cfa69f73df..807b2aaa33fa 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -157,7 +157,7 @@ static int match_number(substring_t *s, int *result, int base)
  *
  * Description: Attempts to parse the &substring_t @s as a decimal integer. On
  * success, sets @result to the integer represented by the string and returns 0.
- * Returns either -ENOMEM or -EINVAL on failure.
+ * Returns -ENOMEM, -EINVAL, or -ERANGE on failure.
  */
 int match_int(substring_t *s, int *result)
 {
@@ -171,7 +171,7 @@ int match_int(substring_t *s, int *result)
  *
  * Description: Attempts to parse the &substring_t @s as an octal integer. On
  * success, sets @result to the integer represented by the string and returns
- * 0. Returns either -ENOMEM or -EINVAL on failure.
+ * 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure.
  */
 int match_octal(substring_t *s, int *result)
 {
@@ -185,7 +185,7 @@ int match_octal(substring_t *s, int *result)
  *
  * Description: Attempts to parse the &substring_t @s as a hexadecimal integer.
  * On success, sets @result to the integer represented by the string and
- * returns 0. Returns either -ENOMEM or -EINVAL on failure.
+ * returns 0. Returns -ENOMEM, -EINVAL, or -ERANGE on failure.
  */
 int match_hex(substring_t *s, int *result)
 {
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 196b06984dec..bfe02b8fc55b 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -122,11 +122,18 @@ static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
         return phys_to_dma(hwdev, virt_to_phys(address));
 }
 
+static bool no_iotlb_memory;
+
 void swiotlb_print_info(void)
 {
         unsigned long bytes = io_tlb_nslabs << IO_TLB_SHIFT;
         unsigned char *vstart, *vend;
 
+        if (no_iotlb_memory) {
+                pr_warn("software IO TLB: No low mem\n");
+                return;
+        }
+
         vstart = phys_to_virt(io_tlb_start);
         vend = phys_to_virt(io_tlb_end);
 
@@ -136,7 +143,7 @@ void swiotlb_print_info(void)
                bytes >> 20, vstart, vend - 1);
 }
 
-void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
+int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
 {
         void *v_overflow_buffer;
         unsigned long i, bytes;
@@ -150,9 +157,10 @@ void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
         /*
          * Get the overflow emergency buffer
          */
-        v_overflow_buffer = alloc_bootmem_low_pages(PAGE_ALIGN(io_tlb_overflow));
+        v_overflow_buffer = alloc_bootmem_low_pages_nopanic(
+                                                PAGE_ALIGN(io_tlb_overflow));
         if (!v_overflow_buffer)
-                panic("Cannot allocate SWIOTLB overflow buffer!\n");
+                return -ENOMEM;
 
         io_tlb_overflow_buffer = __pa(v_overflow_buffer);
 
@@ -169,15 +177,19 @@ void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)
 
         if (verbose)
                 swiotlb_print_info();
+
+        return 0;
 }
 
 /*
  * Statically reserve bounce buffer space and initialize bounce buffer data
  * structures for the software IO TLB used to implement the DMA API.
  */
-static void __init
-swiotlb_init_with_default_size(size_t default_size, int verbose)
+void  __init
+swiotlb_init(int verbose)
 {
+        /* default to 64MB */
+        size_t default_size = 64UL<<20;
         unsigned char *vstart;
         unsigned long bytes;
 
@@ -188,20 +200,16 @@ swiotlb_init_with_default_size(size_t default_size, int verbose)
 
         bytes = io_tlb_nslabs << IO_TLB_SHIFT;
 
-        /*
-         * Get IO TLB memory from the low pages
-         */
-        vstart = alloc_bootmem_low_pages(PAGE_ALIGN(bytes));
-        if (!vstart)
-                panic("Cannot allocate SWIOTLB buffer");
-
-        swiotlb_init_with_tbl(vstart, io_tlb_nslabs, verbose);
-}
+        /* Get IO TLB memory from the low pages */
+        vstart = alloc_bootmem_low_pages_nopanic(PAGE_ALIGN(bytes));
+        if (vstart && !swiotlb_init_with_tbl(vstart, io_tlb_nslabs, verbose))
+                return;
 
-void __init
-swiotlb_init(int verbose)
-{
-        swiotlb_init_with_default_size(64 * (1<<20), verbose);  /* default to 64MB */
+        if (io_tlb_start)
+                free_bootmem(io_tlb_start,
+                                 PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
+        pr_warn("Cannot allocate SWIOTLB buffer");
+        no_iotlb_memory = true;
 }
 
 /*
@@ -405,6 +413,9 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
         unsigned long offset_slots;
         unsigned long max_slots;
 
+        if (no_iotlb_memory)
+                panic("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer");
+
         mask = dma_get_seg_boundary(hwdev);
 
         tbl_dma_addr &= mask;
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index fab33a9c5318..0d62fd700f68 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1030,6 +1030,7 @@ int kptr_restrict __read_mostly;
  *              N no separator
  *            The maximum supported length is 64 bytes of the input. Consider
  *            to use print_hex_dump() for the larger input.
+ * - 'a' For a phys_addr_t type and its derivative types (passed by reference)
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
@@ -1120,6 +1121,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                         return netdev_feature_string(buf, end, ptr, spec);
                 }
                 break;
+        case 'a':
+                spec.flags |= SPECIAL | SMALL | ZEROPAD;
+                spec.field_width = sizeof(phys_addr_t) * 2 + 2;
+                spec.base = 16;
+                return number(buf, end,
+                              (unsigned long long) *((phys_addr_t *)ptr), spec);
         }
         spec.flags |= SMALL;
         if (spec.field_width == -1) {
diff --git a/lib/xz/Kconfig b/lib/xz/Kconfig
index 60a6088d0e5e..82a04d7ba99e 100644
--- a/lib/xz/Kconfig
+++ b/lib/xz/Kconfig
@@ -6,42 +6,40 @@ config XZ_DEC
           the .xz file format as the container. For integrity checking,
           CRC32 is supported. See Documentation/xz.txt for more information.
 
+if XZ_DEC
+
 config XZ_DEC_X86
-        bool "x86 BCJ filter decoder" if EXPERT
-        default y
-        depends on XZ_DEC
+        bool "x86 BCJ filter decoder"
+        default y if X86
         select XZ_DEC_BCJ
 
 config XZ_DEC_POWERPC
-        bool "PowerPC BCJ filter decoder" if EXPERT
-        default y
-        depends on XZ_DEC
+        bool "PowerPC BCJ filter decoder"
+        default y if POWERPC
         select XZ_DEC_BCJ
 
 config XZ_DEC_IA64
-        bool "IA-64 BCJ filter decoder" if EXPERT
-        default y
-        depends on XZ_DEC
+        bool "IA-64 BCJ filter decoder"
+        default y if IA64
         select XZ_DEC_BCJ
 
 config XZ_DEC_ARM
-        bool "ARM BCJ filter decoder" if EXPERT
-        default y
-        depends on XZ_DEC
+        bool "ARM BCJ filter decoder"
+        default y if ARM
         select XZ_DEC_BCJ
 
 config XZ_DEC_ARMTHUMB
-        bool "ARM-Thumb BCJ filter decoder" if EXPERT
-        default y
-        depends on XZ_DEC
+        bool "ARM-Thumb BCJ filter decoder"
+        default y if (ARM && ARM_THUMB)
         select XZ_DEC_BCJ
 
 config XZ_DEC_SPARC
-        bool "SPARC BCJ filter decoder" if EXPERT
-        default y
-        depends on XZ_DEC
+        bool "SPARC BCJ filter decoder"
+        default y if SPARC
         select XZ_DEC_BCJ
 
+endif
+
 config XZ_DEC_BCJ
         bool
         default n