diff options
author | David P <megver83@parabola.nu> | 2020-02-10 11:32:32 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2020-02-10 11:32:32 -0300 |
commit | 0da6a95ac24f166b1585d132d7737d333f47bae2 (patch) | |
tree | f4c1c26ad8784874eccd14d5e28b0b961d3604d1 /libre/linux-libre-pae/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch | |
parent | db67d270b3c02f3406cdb213ad8675ca1a92265b (diff) | |
download | abslibre-0da6a95ac24f166b1585d132d7737d333f47bae2.tar.gz abslibre-0da6a95ac24f166b1585d132d7737d333f47bae2.tar.bz2 abslibre-0da6a95ac24f166b1585d132d7737d333f47bae2.zip |
updpkg: libre/linux-libre-pae 5.5.2-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'libre/linux-libre-pae/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch')
-rw-r--r-- | libre/linux-libre-pae/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/libre/linux-libre-pae/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch b/libre/linux-libre-pae/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch deleted file mode 100644 index 3ecc89738..000000000 --- a/libre/linux-libre-pae/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 78b64515af95e12dac806fa630ae4499e9527100 Mon Sep 17 00:00:00 2001 -From: Tuowen Zhao <ztuowen@gmail.com> -Date: Wed, 16 Oct 2019 15:06:28 -0600 -Subject: [PATCH 02/15] lib: devres: add a helper function for ioremap_uc - -Implement a resource managed strongly uncachable ioremap function. - -Cc: <stable@vger.kernel.org> # v4.19+ -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> -Signed-off-by: Lee Jones <lee.jones@linaro.org> ---- - include/linux/io.h | 2 ++ - lib/devres.c | 19 +++++++++++++++++++ - 2 files changed, 21 insertions(+) - -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.25.0 - |