Advertisement
Guest User

kernel.patch

a guest
Nov 21st, 2019
637
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.24 KB | None | 0 0
  1. diff -ruN a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
  2. --- a/drivers/mfd/intel-lpss.c  2019-11-20 20:41:11.000000000 +0100
  3. +++ b/drivers/mfd/intel-lpss.c  2019-11-21 14:53:42.643199518 +0100
  4. @@ -395,8 +395,8 @@
  5.     if (!lpss)
  6.         return -ENOMEM;
  7.  
  8. -   lpss->priv = devm_ioremap(dev, info->mem->start + LPSS_PRIV_OFFSET,
  9. -                 LPSS_PRIV_SIZE);
  10. +   lpss->priv = devm_ioremap_uc(dev, info->mem->start + LPSS_PRIV_OFFSET,
  11. +                 LPSS_PRIV_SIZE);
  12.     if (!lpss->priv)
  13.         return -ENOMEM;
  14.  
  15. diff -ruN a/include/linux/io.h b/include/linux/io.h
  16. --- a/include/linux/io.h    2019-11-20 20:41:11.000000000 +0100
  17. +++ b/include/linux/io.h    2019-11-21 14:54:14.855593598 +0100
  18. @@ -64,6 +64,8 @@
  19.  
  20.  void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
  21.                resource_size_t size);
  22. +void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
  23. +                  resource_size_t size);
  24.  void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
  25.                    resource_size_t size);
  26.  void __iomem *devm_ioremap_wc(struct device *dev, resource_size_t offset,
  27. diff -ruN a/lib/devres.c b/lib/devres.c
  28. --- a/lib/devres.c  2019-11-20 20:41:11.000000000 +0100
  29. +++ b/lib/devres.c  2019-11-21 14:55:36.996598780 +0100
  30. @@ -9,6 +9,7 @@
  31.  enum devm_ioremap_type {
  32.     DEVM_IOREMAP = 0,
  33.     DEVM_IOREMAP_NC,
  34. +   DEVM_IOREMAP_UC,
  35.     DEVM_IOREMAP_WC,
  36.  };
  37.  
  38. @@ -39,6 +40,9 @@
  39.     case DEVM_IOREMAP_NC:
  40.         addr = ioremap_nocache(offset, size);
  41.         break;
  42. +   case DEVM_IOREMAP_UC:
  43. +       addr = ioremap_uc(offset, size);
  44. +       break;
  45.     case DEVM_IOREMAP_WC:
  46.         addr = ioremap_wc(offset, size);
  47.         break;
  48. @@ -69,6 +73,21 @@
  49.  EXPORT_SYMBOL(devm_ioremap);
  50.  
  51.  /**
  52. + * devm_ioremap_uc - Managed ioremap_uc()
  53. + * @dev: Generic device to remap IO address for
  54. + * @offset: Resource address to map
  55. + * @size: Size of map
  56. + *
  57. + * Managed ioremap_uc().  Map is automatically unmapped on driver detach.
  58. + */
  59. +void __iomem *devm_ioremap_uc(struct device *dev, resource_size_t offset,
  60. +                 resource_size_t size)
  61. +{
  62. +   return __devm_ioremap(dev, offset, size, DEVM_IOREMAP_UC);
  63. +}
  64. +EXPORT_SYMBOL(devm_ioremap_uc);
  65. +
  66. +/**
  67.   * devm_ioremap_nocache - Managed ioremap_nocache()
  68.   * @dev: Generic device to remap IO address for
  69.   * @offset: Resource address to map
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement