5 files changed, 110 insertions, 36 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index c20dfbfc49b4..4639419522da 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -785,6 +785,8 @@ extern const char *dev_driver_string(const struct device *dev);
 
 #ifdef CONFIG_PRINTK
 
+extern int __dev_printk(const char *level, const struct device *dev,
+                        struct va_format *vaf);
 extern int dev_printk(const char *level, const struct device *dev,
                       const char *fmt, ...)
         __attribute__ ((format (printf, 3, 4)));
@@ -805,6 +807,9 @@ extern int _dev_info(const struct device *dev, const char *fmt, ...)
 
 #else
 
+static inline int __dev_printk(const char *level, const struct device *dev,
+                               struct va_format *vaf)
+         { return 0; }
 static inline int dev_printk(const char *level, const struct device *dev,
                       const char *fmt, ...)
         __attribute__ ((format (printf, 3, 4)));
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index e747ecd48e1c..13aae8087b56 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -1,13 +1,6 @@
 #ifndef _DYNAMIC_DEBUG_H
 #define _DYNAMIC_DEBUG_H
 
-/* dynamic_printk_enabled, and dynamic_printk_enabled2 are bitmasks in which
- * bit n is set to 1 if any modname hashes into the bucket n, 0 otherwise. They
- * use independent hash functions, to reduce the chance of false positives.
- */
-extern long long dynamic_debug_enabled;
-extern long long dynamic_debug_enabled2;
-
 /*
  * An instance of this structure is created in a special
  * ELF section at every dynamic debug callsite.  At runtime,
@@ -47,26 +40,55 @@ extern int ddebug_remove_module(const char *mod_name);
 extern int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...)
         __attribute__ ((format (printf, 2, 3)));
 
-#define dynamic_pr_debug(fmt, ...) do {                                 \
-        static struct _ddebug descriptor                                \
-        __used                                                          \
-        __attribute__((section("__verbose"), aligned(8))) =             \
-        { KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,            \
-                _DPRINTK_FLAGS_DEFAULT };                               \
-        if (unlikely(descriptor.enabled))                               \
-                __dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__); \
-        } while (0)
-
-
-#define dynamic_dev_dbg(dev, fmt, ...) do {                             \
-        static struct _ddebug descriptor                                \
-        __used                                                          \
-        __attribute__((section("__verbose"), aligned(8))) =             \
-        { KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,            \
-                _DPRINTK_FLAGS_DEFAULT };                               \
-        if (unlikely(descriptor.enabled))                               \
-                dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__);        \
-        } while (0)
+struct device;
+
+extern int __dynamic_dev_dbg(struct _ddebug *descriptor,
+                             const struct device *dev,
+                             const char *fmt, ...)
+        __attribute__ ((format (printf, 3, 4)));
+
+struct net_device;
+
+extern int __dynamic_netdev_dbg(struct _ddebug *descriptor,
+                             const struct net_device *dev,
+                             const char *fmt, ...)
+        __attribute__ ((format (printf, 3, 4)));
+
+#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)                \
+        static struct _ddebug __used __aligned(8)               \
+        __attribute__((section("__verbose"))) name = {          \
+                .modname = KBUILD_MODNAME,                      \
+                .function = __func__,                           \
+                .filename = __FILE__,                           \
+                .format = (fmt),                                \
+                .lineno = __LINE__,                             \
+                .flags =  _DPRINTK_FLAGS_DEFAULT,               \
+                .enabled = false,                               \
+        }
+
+#define dynamic_pr_debug(fmt, ...)                              \
+do {                                                            \
+        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);         \
+        if (unlikely(descriptor.enabled))                       \
+                __dynamic_pr_debug(&descriptor, pr_fmt(fmt),    \
+                                   ##__VA_ARGS__);              \
+} while (0)
+
+#define dynamic_dev_dbg(dev, fmt, ...)                          \
+do {                                                            \
+        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
+        if (unlikely(descriptor.enabled))                       \
+                __dynamic_dev_dbg(&descriptor, dev, fmt,        \
+                                  ##__VA_ARGS__);               \
+} while (0)
+
+#define dynamic_netdev_dbg(dev, fmt, ...)                       \
+do {                                                            \
+        DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt);         \
+        if (unlikely(descriptor.enabled))                       \
+                __dynamic_netdev_dbg(&descriptor, dev, fmt,     \
+                                     ##__VA_ARGS__);            \
+} while (0)
 
 #else
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index ddee79bb8f15..279726039f00 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2617,6 +2617,9 @@ static inline const char *netdev_name(const struct net_device *dev)
         return dev->name;
 }
 
+extern int __netdev_printk(const char *level, const struct net_device *dev,
+                        struct va_format *vaf);
+
 extern int netdev_printk(const char *level, const struct net_device *dev,
                          const char *format, ...)
         __attribute__ ((format (printf, 3, 4)));
@@ -2644,8 +2647,7 @@ extern int netdev_info(const struct net_device *dev, const char *format, ...)
 #elif defined(CONFIG_DYNAMIC_DEBUG)
 #define netdev_dbg(__dev, format, args...)                      \
 do {                                                            \
-        dynamic_dev_dbg((__dev)->dev.parent, "%s: " format,     \
-                        netdev_name(__dev), ##args);            \
+        dynamic_netdev_dbg(__dev, format, ##args);              \
 } while (0)
 #else
 #define netdev_dbg(__dev, format, args...)                      \
@@ -2712,9 +2714,7 @@ do {								\
 #define netif_dbg(priv, type, netdev, format, args...)          \
 do {                                                            \
         if (netif_msg_##type(priv))                             \
-                dynamic_dev_dbg((netdev)->dev.parent,           \
-                                "%s: " format,                  \
-                                netdev_name(netdev), ##args);   \
+                dynamic_netdev_dbg(netdev, format, ##args);     \
 } while (0)
 #else
 #define netif_dbg(priv, type, dev, format, args...)                     \
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 27bb05aae70d..651a066686ac 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -49,10 +49,54 @@ extern struct resource *platform_get_resource_byname(struct platform_device *, u
 extern int platform_get_irq_byname(struct platform_device *, const char *);
 extern int platform_add_devices(struct platform_device **, int);
 
-extern struct platform_device *platform_device_register_resndata(
+struct platform_device_info {
+                struct device *parent;
+
+                const char *name;
+                int id;
+
+                const struct resource *res;
+                unsigned int num_res;
+
+                const void *data;
+                size_t size_data;
+                u64 dma_mask;
+};
+extern struct platform_device *platform_device_register_full(
+                struct platform_device_info *pdevinfo);
+
+/**
+ * platform_device_register_resndata - add a platform-level device with
+ * resources and platform-specific data
+ *
+ * @parent: parent device for the device we're adding
+ * @name: base name of the device we're adding
+ * @id: instance id
+ * @res: set of resources that needs to be allocated for the device
+ * @num: number of resources
+ * @data: platform specific data for this platform device
+ * @size: size of platform specific data
+ *
+ * Returns &struct platform_device pointer on success, or ERR_PTR() on error.
+ */
+static inline struct platform_device *platform_device_register_resndata(
                 struct device *parent, const char *name, int id,
                 const struct resource *res, unsigned int num,
-                const void *data, size_t size);
+                const void *data, size_t size) {
+
+        struct platform_device_info pdevinfo = {
+                .parent = parent,
+                .name = name,
+                .id = id,
+                .res = res,
+                .num_res = num,
+                .data = data,
+                .size_data = size,
+                .dma_mask = 0,
+        };
+
+        return platform_device_register_full(&pdevinfo);
+}
 
 /**
  * platform_device_register_simple - add a platform-level device and its resources
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index 665517c05eaf..fd99ff9298c6 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -23,7 +23,10 @@ struct uio_map;
 /**
  * struct uio_mem - description of a UIO memory region
  * @name:               name of the memory region for identification
- * @addr:               address of the device's memory
+ * @addr:               address of the device's memory (phys_addr is used since
+ *                      addr can be logical, virtual, or physical & phys_addr_t
+ *                      should always be large enough to handle any of the
+ *                      address types)
  * @size:               size of IO
  * @memtype:            type of memory addr points to
  * @internal_addr:      ioremap-ped version of addr, for driver internal use
@@ -31,7 +34,7 @@ struct uio_map;
  */
 struct uio_mem {
         const char              *name;
-        unsigned long           addr;
+        phys_addr_t             addr;
         unsigned long           size;
         int                     memtype;
         void __iomem            *internal_addr;