b931b147da
- surface-acpi:
- integrate dGPU hot-plug system
- fix MODULE_ALIAS definitions for auto-loading SID battery and ac
drivers
- disable DMA for surface3-spi touchscreen driver
- new wifi suspend patch (only 5.3/5.4)
- ipts:
- do not automatically switch sensor modes (only 5.3)
98 lines
3.2 KiB
Diff
98 lines
3.2 KiB
Diff
From 9c0380701b988307a75832e0eb1c083291fddc7c Mon Sep 17 00:00:00 2001
|
|
From: Tuowen Zhao <ztuowen@gmail.com>
|
|
Date: Wed, 16 Oct 2019 15:06:28 -0600
|
|
Subject: [PATCH 09/10] ioremap_uc
|
|
|
|
---
|
|
.../driver-api/driver-model/devres.rst | 1 +
|
|
drivers/mfd/intel-lpss.c | 2 +-
|
|
include/linux/io.h | 2 ++
|
|
lib/devres.c | 19 +++++++++++++++++++
|
|
4 files changed, 23 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst
|
|
index a100bef54952..92628fdc2f11 100644
|
|
--- a/Documentation/driver-api/driver-model/devres.rst
|
|
+++ b/Documentation/driver-api/driver-model/devres.rst
|
|
@@ -314,6 +314,7 @@ IOMAP
|
|
devm_ioport_unmap()
|
|
devm_ioremap()
|
|
devm_ioremap_nocache()
|
|
+ devm_ioremap_uc()
|
|
devm_ioremap_wc()
|
|
devm_ioremap_resource() : checks resource, requests memory region, ioremaps
|
|
devm_iounmap()
|
|
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
|
|
index 277f48f1cc1c..06106c9320bb 100644
|
|
--- a/drivers/mfd/intel-lpss.c
|
|
+++ b/drivers/mfd/intel-lpss.c
|
|
@@ -395,7 +395,7 @@ int intel_lpss_probe(struct device *dev,
|
|
if (!lpss)
|
|
return -ENOMEM;
|
|
|
|
- lpss->priv = devm_ioremap(dev, info->mem->start + LPSS_PRIV_OFFSET,
|
|
+ lpss->priv = devm_ioremap_uc(dev, info->mem->start + LPSS_PRIV_OFFSET,
|
|
LPSS_PRIV_SIZE);
|
|
if (!lpss->priv)
|
|
return -ENOMEM;
|
|
diff --git a/include/linux/io.h b/include/linux/io.h
|
|
index accac822336a..a59834bc0a11 100644
|
|
--- a/include/linux/io.h
|
|
+++ b/include/linux/io.h
|
|
@@ -64,6 +64,8 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
|
|
|
|
void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
|
|
resource_size_t size);
|
|
+void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
|
|
+ resource_size_t size);
|
|
void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
|
|
resource_size_t size);
|
|
void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,
|
|
diff --git a/lib/devres.c b/lib/devres.c
|
|
index 6a0e9bd6524a..17624d35e82d 100644
|
|
--- a/lib/devres.c
|
|
+++ b/lib/devres.c
|
|
@@ -9,6 +9,7 @@
|
|
enum devm_ioremap_type {
|
|
DEVM_IOREMAP = 0,
|
|
DEVM_IOREMAP_NC,
|
|
+ DEVM_IOREMAP_UC,
|
|
DEVM_IOREMAP_WC,
|
|
};
|
|
|
|
@@ -39,6 +40,9 @@ static void __iomem *__devm_ioremap(struct device *dev, resource_size_t offset,
|
|
case DEVM_IOREMAP_NC:
|
|
addr = ioremap_nocache(offset, size);
|
|
break;
|
|
+ case DEVM_IOREMAP_UC:
|
|
+ addr = ioremap_uc(offset, size);
|
|
+ break;
|
|
case DEVM_IOREMAP_WC:
|
|
addr = ioremap_wc(offset, size);
|
|
break;
|
|
@@ -68,6 +72,21 @@ void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
|
|
}
|
|
EXPORT_SYMBOL(devm_ioremap);
|
|
|
|
+/**
|
|
+ * devm_ioremap_uc - Managed ioremap_uc()
|
|
+ * @dev: Generic device to remap IO address for
|
|
+ * @offset: Resource address to map
|
|
+ * @size: Size of map
|
|
+ *
|
|
+ * Managed ioremap_uc(). Map is automatically unmapped on driver detach.
|
|
+ */
|
|
+void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
|
|
+ resource_size_t size)
|
|
+{
|
|
+ return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_UC);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(devm_ioremap_uc);
|
|
+
|
|
/**
|
|
* devm_ioremap_nocache - Managed ioremap_nocache()
|
|
* @dev: Generic device to remap IO address for
|
|
--
|
|
2.24.1
|
|
|