Merge tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver patchset for 4.11-rc1.

  Lots of different driver subsystems updated here: rework for the
  hyperv subsystem to handle new platforms better, mei and w1 and extcon
  driver updates, as well as a number of other "minor" driver updates.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (169 commits)
  goldfish: Sanitize the broken interrupt handler
  x86/platform/goldfish: Prevent unconditional loading
  vmbus: replace modulus operation with subtraction
  vmbus: constify parameters where possible
  vmbus: expose hv_begin/end_read
  vmbus: remove conditional locking of vmbus_write
  vmbus: add direct isr callback mode
  vmbus: change to per channel tasklet
  vmbus: put related per-cpu variable together
  vmbus: callback is in softirq not workqueue
  binder: Add support for file-descriptor arrays
  binder: Add support for scatter-gather
  binder: Add extra size to allocator
  binder: Refactor binder_transact()
  binder: Support multiple /dev instances
  binder: Deal with contexts in debugfs
  binder: Support multiple context managers
  binder: Split flat_binder_object
  auxdisplay: ht16k33: remove private workqueue
  auxdisplay: ht16k33: rework input device initialization
  ...

1 files changed, 24 insertions, 31 deletions

diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index b33ab8ce47ab..d1185b78cf9a 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -31,35 +31,9 @@
 #include <linux/mfd/syscon.h>
 #include <soc/at91/atmel-secumod.h>
 
-#define SRAM_GRANULARITY        32
-
-struct sram_partition {
-        void __iomem *base;
-
-        struct gen_pool *pool;
-        struct bin_attribute battr;
-        struct mutex lock;
-};
-
-struct sram_dev {
-        struct device *dev;
-        void __iomem *virt_base;
-
-        struct gen_pool *pool;
-        struct clk *clk;
+#include "sram.h"
 
-        struct sram_partition *partition;
-        u32 partitions;
-};
-
-struct sram_reserve {
-        struct list_head list;
-        u32 start;
-        u32 size;
-        bool export;
-        bool pool;
-        const char *label;
-};
+#define SRAM_GRANULARITY        32
 
 static ssize_t sram_read(struct file *filp, struct kobject *kobj,
                          struct bin_attribute *attr,
@@ -148,6 +122,18 @@ static int sram_add_partition(struct sram_dev *sram, struct sram_reserve *block,
                 if (ret)
                         return ret;
         }
+        if (block->protect_exec) {
+                ret = sram_check_protect_exec(sram, block, part);
+                if (ret)
+                        return ret;
+
+                ret = sram_add_pool(sram, block, start, part);
+                if (ret)
+                        return ret;
+
+                sram_add_protect_exec(part);
+        }
+
         sram->partitions++;
 
         return 0;
@@ -233,7 +219,11 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
                 if (of_find_property(child, "pool", NULL))
                         block->pool = true;
 
-                if ((block->export || block->pool) && block->size) {
+                if (of_find_property(child, "protect-exec", NULL))
+                        block->protect_exec = true;
+
+                if ((block->export || block->pool || block->protect_exec) &&
+                    block->size) {
                         exports++;
 
                         label = NULL;
@@ -249,8 +239,10 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
 
                         block->label = devm_kstrdup(sram->dev,
                                                     label, GFP_KERNEL);
-                        if (!block->label)
+                        if (!block->label) {
+                                ret = -ENOMEM;
                                 goto err_chunks;
+                        }
 
                         dev_dbg(sram->dev, "found %sblock '%s' 0x%x-0x%x\n",
                                 block->export ? "exported " : "", block->label,
@@ -293,7 +285,8 @@ static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
                         goto err_chunks;
                 }
 
-                if ((block->export || block->pool) && block->size) {
+                if ((block->export || block->pool || block->protect_exec) &&
+                    block->size) {
                         ret = sram_add_partition(sram, block,
                                                  res->start + block->start);
                         if (ret) {