Commit 19207ea8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.8-of' of... 

Merge tag 'tegra-for-5.8-of' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

of: Changes for v5.8-rc1

These changes add support for multiple reserved-memory regions per
device.

* tag 'tegra-for-5.8-of' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  of: Make <linux/of_reserved_mem.h> self-contained
  of: reserved-memory: Support multiple regions per device
  of: reserved-memory: Support lookup of regions by name

Link: https://lore.kernel.org/r/20200515145311.1580134-5-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2e60fac7 4a470f00

drivers/of/of_reserved_mem.c

+29 −12
Original line number Diff line number Diff line
@@ -357,6 +357,25 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, 
}

EXPORT_SYMBOL_GPL(of_reserved_mem_device_init_by_idx);



/**

 * of_reserved_mem_device_init_by_name() - assign named reserved memory region

 *					   to given device

 * @dev: pointer to the device to configure

 * @np: pointer to the device node with 'memory-region' property

 * @name: name of the selected memory region

 *

 * Returns: 0 on success or a negative error-code on failure.

 */

int of_reserved_mem_device_init_by_name(struct device *dev,

					struct device_node *np,

					const char *name)

{

	int idx = of_property_match_string(np, "memory-region-names", name);



	return of_reserved_mem_device_init_by_idx(dev, np, idx);

}

EXPORT_SYMBOL_GPL(of_reserved_mem_device_init_by_name);



/**

 * of_reserved_mem_device_release() - release reserved memory device structures

 * @dev:	Pointer to the device to deconfigure
@@ -366,24 +385,22 @@ EXPORT_SYMBOL_GPL(of_reserved_mem_device_init_by_idx); 
 */

void of_reserved_mem_device_release(struct device *dev)

{

	struct rmem_assigned_device *rd;

	struct reserved_mem *rmem = NULL;

	struct rmem_assigned_device *rd, *tmp;

	LIST_HEAD(release_list);



	mutex_lock(&of_rmem_assigned_device_mutex);

	list_for_each_entry(rd, &of_rmem_assigned_device_list, list) {

		if (rd->dev == dev) {

			rmem = rd->rmem;

			list_del(&rd->list);

			kfree(rd);

			break;

		}

	list_for_each_entry_safe(rd, tmp, &of_rmem_assigned_device_list, list) {

		if (rd->dev == dev)

			list_move_tail(&rd->list, &release_list);

	}

	mutex_unlock(&of_rmem_assigned_device_mutex);



	if (!rmem || !rmem->ops || !rmem->ops->device_release)

		return;

	list_for_each_entry_safe(rd, tmp, &release_list, list) {

		if (rd->rmem && rd->rmem->ops && rd->rmem->ops->device_release)

			rd->rmem->ops->device_release(rd->rmem, dev);



	rmem->ops->device_release(rmem, dev);

		kfree(rd);

	}

}

EXPORT_SYMBOL_GPL(of_reserved_mem_device_release);

include/linux/of_reserved_mem.h

+12 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define __OF_RESERVED_MEM_H



#include <linux/device.h>

#include <linux/of.h>



struct of_phandle_args;

struct reserved_mem_ops;
@@ -33,6 +34,9 @@ typedef int (*reservedmem_of_init_fn)(struct reserved_mem *rmem); 


int of_reserved_mem_device_init_by_idx(struct device *dev,

				       struct device_node *np, int idx);

int of_reserved_mem_device_init_by_name(struct device *dev,

					struct device_node *np,

					const char *name);

void of_reserved_mem_device_release(struct device *dev);



void fdt_init_reserved_mem(void);
@@ -45,6 +49,14 @@ static inline int of_reserved_mem_device_init_by_idx(struct device *dev, 
{

	return -ENOSYS;

}



static inline int of_reserved_mem_device_init_by_name(struct device *dev,

						      struct device_node *np,

						      const char *name)

{

	return -ENOSYS;

}



static inline void of_reserved_mem_device_release(struct device *pdev) { }



static inline void fdt_init_reserved_mem(void) { }

CRA Git | Maintained and supported by SUSTech CRA and CCSE