Merge tag '5.20-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd

[linux-2.6-microblaze.git] / lib / devres.c

diff --git a/lib/devres.c b/lib/devres.c
index b0e1c67..55eb07e 100644 (file)
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -29,7 +29,8 @@ static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset,
 {
        void __iomem **ptr, *addr = NULL;
 
-       ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
+       ptr = devres_alloc_node(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL,
+                               dev_to_node(dev));
        if (!ptr)
                return NULL;
 
@@ -292,7 +293,8 @@ void __iomem *devm_ioport_map(struct device *dev, unsigned long port,
 {
        void __iomem **ptr, *addr;
 
-       ptr = devres_alloc(devm_ioport_map_release, sizeof(*ptr), GFP_KERNEL);
+       ptr = devres_alloc_node(devm_ioport_map_release, sizeof(*ptr), GFP_KERNEL,
+                               dev_to_node(dev));
        if (!ptr)
                return NULL;
 
@@ -366,7 +368,8 @@ void __iomem * const *pcim_iomap_table(struct pci_dev *pdev)
        if (dr)
                return dr->table;
 
-       new_dr = devres_alloc(pcim_iomap_release, sizeof(*new_dr), GFP_KERNEL);
+       new_dr = devres_alloc_node(pcim_iomap_release, sizeof(*new_dr), GFP_KERNEL,
+                                  dev_to_node(&pdev->dev));
        if (!new_dr)
                return NULL;
        dr = devres_get(&pdev->dev, new_dr, NULL, NULL);
@@ -528,3 +531,87 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
 }
 EXPORT_SYMBOL(pcim_iounmap_regions);
 #endif /* CONFIG_PCI */
+
+static void devm_arch_phys_ac_add_release(struct device *dev, void *res)
+{
+       arch_phys_wc_del(*((int *)res));
+}
+
+/**
+ * devm_arch_phys_wc_add - Managed arch_phys_wc_add()
+ * @dev: Managed device
+ * @base: Memory base address
+ * @size: Size of memory range
+ *
+ * Adds a WC MTRR using arch_phys_wc_add() and sets up a release callback.
+ * See arch_phys_wc_add() for more information.
+ */
+int devm_arch_phys_wc_add(struct device *dev, unsigned long base, unsigned long size)
+{
+       int *mtrr;
+       int ret;
+
+       mtrr = devres_alloc_node(devm_arch_phys_ac_add_release, sizeof(*mtrr), GFP_KERNEL,
+                                dev_to_node(dev));
+       if (!mtrr)
+               return -ENOMEM;
+
+       ret = arch_phys_wc_add(base, size);
+       if (ret < 0) {
+               devres_free(mtrr);
+               return ret;
+       }
+
+       *mtrr = ret;
+       devres_add(dev, mtrr);
+
+       return ret;
+}
+EXPORT_SYMBOL(devm_arch_phys_wc_add);
+
+struct arch_io_reserve_memtype_wc_devres {
+       resource_size_t start;
+       resource_size_t size;
+};
+
+static void devm_arch_io_free_memtype_wc_release(struct device *dev, void *res)
+{
+       const struct arch_io_reserve_memtype_wc_devres *this = res;
+
+       arch_io_free_memtype_wc(this->start, this->size);
+}
+
+/**
+ * devm_arch_io_reserve_memtype_wc - Managed arch_io_reserve_memtype_wc()
+ * @dev: Managed device
+ * @start: Memory base address
+ * @size: Size of memory range
+ *
+ * Reserves a memory range with WC caching using arch_io_reserve_memtype_wc()
+ * and sets up a release callback See arch_io_reserve_memtype_wc() for more
+ * information.
+ */
+int devm_arch_io_reserve_memtype_wc(struct device *dev, resource_size_t start,
+                                   resource_size_t size)
+{
+       struct arch_io_reserve_memtype_wc_devres *dr;
+       int ret;
+
+       dr = devres_alloc_node(devm_arch_io_free_memtype_wc_release, sizeof(*dr), GFP_KERNEL,
+                              dev_to_node(dev));
+       if (!dr)
+               return -ENOMEM;
+
+       ret = arch_io_reserve_memtype_wc(start, size);
+       if (ret < 0) {
+               devres_free(dr);
+               return ret;
+       }
+
+       dr->start = start;
+       dr->size = size;
+       devres_add(dev, dr);
+
+       return ret;
+}
+EXPORT_SYMBOL(devm_arch_io_reserve_memtype_wc);