From: Bartosz Golaszewski <[email protected]> Provide two new variants of devm_platform_ioremap_resource() - one for nocache and one for write-combined ioremap.
Move the core functionality into a separate static function - __devm_platform_ioremap_resource() - that takes an additional type argument. Signed-off-by: Bartosz Golaszewski <[email protected]> --- .../driver-api/driver-model/devres.rst | 2 + drivers/base/platform.c | 70 +++++++++++++++++-- include/linux/platform_device.h | 6 ++ 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 20c4be0389ab..37d10e5cc44c 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -319,6 +319,8 @@ IOMAP devm_ioremap_resource_nocache() devm_ioremap_resource_wc() devm_platform_ioremap_resource() : calls devm_ioremap_resource() for platform device + devm_platform_ioremap_resource_nocache() + devm_platform_ioremap_resource_wc() devm_iounmap() pcim_iomap() pcim_iomap_regions() : do request_region() and iomap() on multiple BARs diff --git a/drivers/base/platform.c b/drivers/base/platform.c index ec974ba9c0c4..4191e776ebae 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -79,6 +79,37 @@ struct resource *platform_get_resource(struct platform_device *dev, } EXPORT_SYMBOL_GPL(platform_get_resource); +#ifdef CONFIG_HAS_IOMEM +enum { + IOREMAP_TYPE_NONE, + IOREMAP_TYPE_NOCACHE, + IOREMAP_TYPE_WC, +}; + +static void __iomem * +__devm_platform_ioremap_resource(struct platform_device *pdev, + unsigned int index, int type) +{ + struct resource *res = platform_get_resource(pdev, + IORESOURCE_MEM, index); + struct device *dev = &pdev->dev; + void __iomem *addr = NULL; + + switch (type) { + case IOREMAP_TYPE_NONE: + addr = devm_ioremap_resource(dev, res); + break; + case IOREMAP_TYPE_NOCACHE: + addr = devm_ioremap_resource_nocache(dev, res); + break; + case IOREMAP_TYPE_WC: + addr = devm_ioremap_resource_wc(dev, res); + break; + } + + return addr; +} + /** * devm_platform_ioremap_resource - call devm_ioremap_resource() for a platform * device @@ -87,16 +118,45 @@ EXPORT_SYMBOL_GPL(platform_get_resource); * resource management * @index: resource index */ -#ifdef CONFIG_HAS_IOMEM void __iomem *devm_platform_ioremap_resource(struct platform_device *pdev, unsigned int index) { - struct resource *res; - - res = platform_get_resource(pdev, IORESOURCE_MEM, index); - return devm_ioremap_resource(&pdev->dev, res); + return __devm_platform_ioremap_resource(pdev, index, IOREMAP_TYPE_NONE); } EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource); + +/** + * devm_platform_ioremap_resource_nocache - nocache variant of + * devm_platform_ioremap_resource() + * + * @pdev: platform device to use both for memory resource lookup as well as + * resource management + * @index: resource index + */ +void __iomem * +devm_platform_ioremap_resource_nocache(struct platform_device *pdev, + unsigned int index) +{ + return __devm_platform_ioremap_resource(pdev, index, + IOREMAP_TYPE_NOCACHE); +} +EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource_nocache); + +/** + * devm_platform_ioremap_resource_wc - write-combined variant of + * devm_platform_ioremap_resource() + * + * @pdev: platform device to use both for memory resource lookup as well as + * resource management + * @index: resource index + */ +void __iomem *devm_platform_ioremap_resource_wc(struct platform_device *pdev, + unsigned int index) +{ + return __devm_platform_ioremap_resource(pdev, index, IOREMAP_TYPE_WC); +} +EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource_wc); + #endif /* CONFIG_HAS_IOMEM */ /** diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 9bc36b589827..00ae0679396e 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -54,6 +54,12 @@ extern struct resource *platform_get_resource(struct platform_device *, extern void __iomem * devm_platform_ioremap_resource(struct platform_device *pdev, unsigned int index); +extern void __iomem * +devm_platform_ioremap_resource_nocache(struct platform_device *pdev, + unsigned int index); +extern void __iomem * +devm_platform_ioremap_resource_wc(struct platform_device *pdev, + unsigned int index); extern int platform_get_irq(struct platform_device *, unsigned int); extern int platform_irq_count(struct platform_device *); extern struct resource *platform_get_resource_byname(struct platform_device *, -- 2.21.0
