kernel: backport fix for a page pool related race condition

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 801-v5.11-0001-nvmem-core-Add-support-for-keepout-regions.patch

diff --git a/target/linux/generic/backport-5.10/801-v5.11-0001-nvmem-core-Add-support-for-keepout-regions.patch b/target/linux/generic/backport-5.10/801-v5.11-0001-nvmem-core-Add-support-for-keepout-regions.patch
index 6fe5032f33dadac262ddba866d527ddfecff308e..a0f8c4715e4d822ec4984bfd0875245b0bca8fc0 100644 (file)
--- a/target/linux/generic/backport-5.10/801-v5.11-0001-nvmem-core-Add-support-for-keepout-regions.patch
+++ b/target/linux/generic/backport-5.10/801-v5.11-0001-nvmem-core-Add-support-for-keepout-regions.patch
@@ -203,7 +203,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
  {
        struct device_node *parent, *child;
-@@ -655,6 +792,8 @@ struct nvmem_device *nvmem_register(cons
+@@ -656,6 +793,8 @@ struct nvmem_device *nvmem_register(cons
        nvmem->type = config->type;
        nvmem->reg_read = config->reg_read;
        nvmem->reg_write = config->reg_write;
@@ -212,9 +212,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (!config->no_of_node)
                nvmem->dev.of_node = config->dev->of_node;
  
-@@ -679,6 +818,12 @@ struct nvmem_device *nvmem_register(cons
-       nvmem->dev.groups = nvmem_dev_groups;
- #endif
+@@ -703,6 +842,12 @@ struct nvmem_device *nvmem_register(cons
+       if (rval)
+               goto err_remove_cells;
  
 +      if (nvmem->nkeepout) {
 +              rval = nvmem_validate_keepouts(nvmem);
@@ -224,7 +224,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +
        dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
  
-       rval = device_register(&nvmem->dev);
+       rval = device_add(&nvmem->dev);
 --- a/include/linux/nvmem-provider.h
 +++ b/include/linux/nvmem-provider.h
 @@ -31,6 +31,19 @@ enum nvmem_type {
@@ -256,8 +256,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * @type:     Type of the nvmem storage
   * @read_only:        Device is read-only.
   * @root_only:        Device is accessibly to root only.
-@@ -66,6 +81,8 @@ struct nvmem_config {
-       struct gpio_desc        *wp_gpio;
+@@ -65,6 +80,8 @@ struct nvmem_config {
+       struct module           *owner;
        const struct nvmem_cell_info    *cells;
        int                     ncells;
 +      const struct nvmem_keepout *keepout;