Skip to content

Commit d4b353d

Browse files
ztuowenqzed
authored andcommitted
lib: devres: add a helper function for ioremap_uc
Implement a resource managed strongly uncachable ioremap function. Cc: <stable@vger.kernel.org> Tested-by: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Tuowen Zhao <ztuowen@gmail.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Luis Chamberlain <mcgrof@kernel.org> Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org>
1 parent 841fce3 commit d4b353d

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

include/linux/io.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
7575

7676
void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
7777
resource_size_t size);
78+
void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
79+
resource_size_t size);
7880
void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
7981
resource_size_t size);
8082
void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,

lib/devres.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
enum devm_ioremap_type {
1010
DEVM_IOREMAP = 0,
1111
DEVM_IOREMAP_NC,
12+
DEVM_IOREMAP_UC,
1213
DEVM_IOREMAP_WC,
1314
};
1415

@@ -39,6 +40,9 @@ static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset,
3940
case DEVM_IOREMAP_NC:
4041
addr = ioremap_nocache(offset, size);
4142
break;
43+
case DEVM_IOREMAP_UC:
44+
addr = ioremap_uc(offset, size);
45+
break;
4246
case DEVM_IOREMAP_WC:
4347
addr = ioremap_wc(offset, size);
4448
break;
@@ -68,6 +72,21 @@ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
6872
}
6973
EXPORT_SYMBOL(devm_ioremap);
7074

75+
/**
76+
* devm_ioremap_uc - Managed ioremap_uc()
77+
* @dev: Generic device to remap IO address for
78+
* @offset: Resource address to map
79+
* @size: Size of map
80+
*
81+
* Managed ioremap_uc(). Map is automatically unmapped on driver detach.
82+
*/
83+
void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
84+
resource_size_t size)
85+
{
86+
return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_UC);
87+
}
88+
EXPORT_SYMBOL_GPL(devm_ioremap_uc);
89+
7190
/**
7291
* devm_ioremap_nocache - Managed ioremap_nocache()
7392
* @dev: Generic device to remap IO address for

0 commit comments

Comments
 (0)