Commit 0c385190 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe
Browse files

resource: add a not device managed request_free_mem_region variant 

Factor out the guts of devm_request_free_mem_region so that we can
implement both a device managed and a manually release version as tiny
wrappers around it.

Link: https://lore.kernel.org/r/20190818090557.17853-2-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarBharata B Rao <bharata@linux.ibm.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 8402ce61

include/linux/ioport.h

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ static inline bool resource_overlaps(struct resource *r1, struct resource *r2) 


struct resource *devm_request_free_mem_region(struct device *dev,

		struct resource *base, unsigned long size);

struct resource *request_free_mem_region(struct resource *base,

		unsigned long size, const char *name);



#endif /* __ASSEMBLY__ */

#endif	/* _LINUX_IOPORT_H */

kernel/resource.c

+31 −14
Original line number Diff line number Diff line
@@ -1644,19 +1644,8 @@ void resource_list_free(struct list_head *head) 
EXPORT_SYMBOL(resource_list_free);



#ifdef CONFIG_DEVICE_PRIVATE

/**

 * devm_request_free_mem_region - find free region for device private memory

 *

 * @dev: device struct to bind the resource to

 * @size: size in bytes of the device memory to add

 * @base: resource tree to look in

 *

 * This function tries to find an empty range of physical address big enough to

 * contain the new resource, so that it can later be hotplugged as ZONE_DEVICE

 * memory, which in turn allocates struct pages.

 */

struct resource *devm_request_free_mem_region(struct device *dev,

		struct resource *base, unsigned long size)

static struct resource *__request_free_mem_region(struct device *dev,

		struct resource *base, unsigned long size, const char *name)

{

	resource_size_t end, addr;

	struct resource *res;
@@ -1670,7 +1659,10 @@ struct resource *devm_request_free_mem_region(struct device *dev, 
				REGION_DISJOINT)

			continue;



		res = devm_request_mem_region(dev, addr, size, dev_name(dev));

		if (dev)

			res = devm_request_mem_region(dev, addr, size, name);

		else

			res = request_mem_region(addr, size, name);

		if (!res)

			return ERR_PTR(-ENOMEM);

		res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY;
@@ -1679,7 +1671,32 @@ struct resource *devm_request_free_mem_region(struct device *dev, 


	return ERR_PTR(-ERANGE);

}



/**

 * devm_request_free_mem_region - find free region for device private memory

 *

 * @dev: device struct to bind the resource to

 * @size: size in bytes of the device memory to add

 * @base: resource tree to look in

 *

 * This function tries to find an empty range of physical address big enough to

 * contain the new resource, so that it can later be hotplugged as ZONE_DEVICE

 * memory, which in turn allocates struct pages.

 */

struct resource *devm_request_free_mem_region(struct device *dev,

		struct resource *base, unsigned long size)

{

	return __request_free_mem_region(dev, base, size, dev_name(dev));

}

EXPORT_SYMBOL_GPL(devm_request_free_mem_region);



struct resource *request_free_mem_region(struct resource *base,

		unsigned long size, const char *name)

{

	return __request_free_mem_region(NULL, base, size, name);

}

EXPORT_SYMBOL_GPL(request_free_mem_region);



#endif /* CONFIG_DEVICE_PRIVATE */



static int __init strict_iomem(char *str)

CRA Git | Maintained and supported by SUSTech CRA and CCSE