All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	iommu@lists.linux-foundation.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 04/26] iommu/dma: Cleanup dma-iommu.h
Date: Mon, 22 Apr 2019 19:59:20 +0200	[thread overview]
Message-ID: <20190422175942.18788-5-hch@lst.de> (raw)
In-Reply-To: <20190422175942.18788-1-hch@lst.de>

No need for a __KERNEL__ guard outside uapi and add a missing comment
describing the #else cpp statement.  Last but not least include
<linux/errno.h> instead of the asm version, which is frowned upon.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
---
 include/linux/dma-iommu.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
index e760dc5d1fa8..8741637941ca 100644
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
@@ -16,9 +16,8 @@
 #ifndef __DMA_IOMMU_H
 #define __DMA_IOMMU_H
 
-#ifdef __KERNEL__
+#include <linux/errno.h>
 #include <linux/types.h>
-#include <asm/errno.h>
 
 #ifdef CONFIG_IOMMU_DMA
 #include <linux/dma-mapping.h>
@@ -74,7 +73,7 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
 void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);
 void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
 
-#else
+#else /* CONFIG_IOMMU_DMA */
 
 struct iommu_domain;
 struct msi_msg;
@@ -108,5 +107,4 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
 }
 
 #endif	/* CONFIG_IOMMU_DMA */
-#endif	/* __KERNEL__ */
 #endif	/* __DMA_IOMMU_H */
-- 
2.20.1


WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/26] iommu/dma: Cleanup dma-iommu.h
Date: Mon, 22 Apr 2019 19:59:20 +0200	[thread overview]
Message-ID: <20190422175942.18788-5-hch@lst.de> (raw)
Message-ID: <20190422175920.BWr41lLshAlsL0xgLGDq6ipOm43fniibi4WQvALoTcU@z> (raw)
In-Reply-To: <20190422175942.18788-1-hch@lst.de>

No need for a __KERNEL__ guard outside uapi and add a missing comment
describing the #else cpp statement.  Last but not least include
<linux/errno.h> instead of the asm version, which is frowned upon.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
---
 include/linux/dma-iommu.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
index e760dc5d1fa8..8741637941ca 100644
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
@@ -16,9 +16,8 @@
 #ifndef __DMA_IOMMU_H
 #define __DMA_IOMMU_H
 
-#ifdef __KERNEL__
+#include <linux/errno.h>
 #include <linux/types.h>
-#include <asm/errno.h>
 
 #ifdef CONFIG_IOMMU_DMA
 #include <linux/dma-mapping.h>
@@ -74,7 +73,7 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
 void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);
 void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
 
-#else
+#else /* CONFIG_IOMMU_DMA */
 
 struct iommu_domain;
 struct msi_msg;
@@ -108,5 +107,4 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
 }
 
 #endif	/* CONFIG_IOMMU_DMA */
-#endif	/* __KERNEL__ */
 #endif	/* __DMA_IOMMU_H */
-- 
2.20.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de>
To: Robin Murphy <robin.murphy@arm.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Joerg Roedel <joro@8bytes.org>, Will Deacon <will.deacon@arm.com>,
	linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/26] iommu/dma: Cleanup dma-iommu.h
Date: Mon, 22 Apr 2019 19:59:20 +0200	[thread overview]
Message-ID: <20190422175942.18788-5-hch@lst.de> (raw)
In-Reply-To: <20190422175942.18788-1-hch@lst.de>

No need for a __KERNEL__ guard outside uapi and add a missing comment
describing the #else cpp statement.  Last but not least include
<linux/errno.h> instead of the asm version, which is frowned upon.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
---
 include/linux/dma-iommu.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
index e760dc5d1fa8..8741637941ca 100644
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
@@ -16,9 +16,8 @@
 #ifndef __DMA_IOMMU_H
 #define __DMA_IOMMU_H
 
-#ifdef __KERNEL__
+#include <linux/errno.h>
 #include <linux/types.h>
-#include <asm/errno.h>
 
 #ifdef CONFIG_IOMMU_DMA
 #include <linux/dma-mapping.h>
@@ -74,7 +73,7 @@ void iommu_dma_unmap_resource(struct device *dev, dma_addr_t handle,
 void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg);
 void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list);
 
-#else
+#else /* CONFIG_IOMMU_DMA */
 
 struct iommu_domain;
 struct msi_msg;
@@ -108,5 +107,4 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
 }
 
 #endif	/* CONFIG_IOMMU_DMA */
-#endif	/* __KERNEL__ */
 #endif	/* __DMA_IOMMU_H */
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-04-22 18:00 UTC|newest]

Thread overview: 155+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-22 17:59 implement generic dma_map_ops for IOMMUs v3 Christoph Hellwig
2019-04-22 17:59 ` Christoph Hellwig
2019-04-22 17:59 ` Christoph Hellwig
2019-04-22 17:59 ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 01/26] arm64/iommu: handle non-remapped addresses in ->mmap and ->get_sgtable Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 02/26] arm64/iommu: improve mmap bounds checking Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 12:35   ` Robin Murphy
2019-04-29 12:35     ` Robin Murphy
2019-04-29 12:35     ` Robin Murphy
2019-04-29 19:01     ` Christoph Hellwig
2019-04-29 19:01       ` Christoph Hellwig
2019-04-29 19:01       ` Christoph Hellwig
2019-04-30 11:38       ` Robin Murphy
2019-04-30 11:38         ` Robin Murphy
2019-04-30 11:38         ` Robin Murphy
2019-04-22 17:59 ` [PATCH 03/26] dma-mapping: add a Kconfig symbol to indicated arch_dma_prep_coherent presence Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` Christoph Hellwig [this message]
2019-04-22 17:59   ` [PATCH 04/26] iommu/dma: Cleanup dma-iommu.h Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 05/26] iommu/dma: Remove the flush_page callback Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 06/26] iommu/dma: Use for_each_sg in iommu_dma_alloc Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 07/26] iommu/dma: move the arm64 wrappers to common code Christoph Hellwig
2019-06-05  0:47   ` Hillf Danton
2019-06-05  0:47   ` Hillf Danton
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 12:56   ` Robin Murphy
2019-04-29 12:56     ` Robin Murphy
2019-04-29 12:56     ` Robin Murphy
2019-06-03 19:47     ` Jon Hunter
2019-06-03 19:47       ` Jon Hunter
2019-06-03 19:47       ` Jon Hunter
2019-06-03 19:47       ` Jon Hunter
     [not found]       ` <acb46c7f-0855-de30-485f-a6242968f947-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2019-06-04  6:05         ` Christoph Hellwig
2019-06-04  6:05           ` Christoph Hellwig
2019-06-04  6:05           ` Christoph Hellwig
2019-06-04  6:05           ` Christoph Hellwig
     [not found]           ` <20190604060554.GA14536-jcswGhMUV9g@public.gmane.org>
2019-06-04 11:35             ` Jon Hunter
2019-06-04 11:35               ` Jon Hunter
2019-06-04 11:35               ` Jon Hunter
2019-06-04 11:35               ` Jon Hunter
2019-04-22 17:59 ` [PATCH 08/26] iommu/dma: Move __iommu_dma_map Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 09/26] iommu/dma: Move domain lookup into __iommu_dma_{map,unmap} Christoph Hellwig
2019-04-22 17:59   ` [PATCH 09/26] iommu/dma: Move domain lookup into __iommu_dma_{map, unmap} Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 10/26] iommu/dma: Squash __iommu_dma_{map,unmap}_page helpers Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 11/26] iommu/dma: Factor out remapped pages lookup Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 13:05   ` Robin Murphy
2019-04-29 13:05     ` Robin Murphy
2019-04-29 13:05     ` Robin Murphy
2019-04-29 19:10     ` Christoph Hellwig
2019-04-29 19:10       ` Christoph Hellwig
2019-04-29 19:10       ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 12/26] iommu/dma: Refactor the page array remapping allocator Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 13:10   ` Robin Murphy
2019-04-29 13:10     ` Robin Murphy
2019-04-29 13:10     ` Robin Murphy
2019-04-22 17:59 ` [PATCH 13/26] iommu/dma: Remove __iommu_dma_free Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 13:18   ` Robin Murphy
2019-04-29 13:18     ` Robin Murphy
2019-04-29 13:18     ` Robin Murphy
2019-04-22 17:59 ` [PATCH 14/26] iommu/dma: Refactor iommu_dma_free Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 13:59   ` Robin Murphy
2019-04-29 13:59     ` Robin Murphy
2019-04-29 13:59     ` Robin Murphy
2019-04-29 19:03     ` Christoph Hellwig
2019-04-29 19:03       ` Christoph Hellwig
2019-04-29 19:03       ` Christoph Hellwig
2019-04-29 19:16       ` Christoph Hellwig
2019-04-29 19:16         ` Christoph Hellwig
2019-04-29 19:16         ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 15/26] iommu/dma: Refactor iommu_dma_alloc Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 16/26] iommu/dma: Don't remap CMA unnecessarily Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 17/26] iommu/dma: Merge the CMA and alloc_pages allocation paths Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 18/26] iommu/dma: Split iommu_dma_free Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 19/26] iommu/dma: Cleanup variable naming in iommu_dma_alloc Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 14:11   ` Robin Murphy
2019-04-29 14:11     ` Robin Murphy
2019-04-29 14:11     ` Robin Murphy
2019-04-22 17:59 ` [PATCH 20/26] iommu/dma: Refactor iommu_dma_alloc, part 2 Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 14:45   ` Robin Murphy
2019-04-29 14:45     ` Robin Murphy
2019-04-29 14:45     ` Robin Murphy
2019-04-29 14:45     ` Robin Murphy
2019-04-22 17:59 ` [PATCH 21/26] iommu/dma: Refactor iommu_dma_get_sgtable Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 14:08   ` Robin Murphy
2019-04-29 14:08     ` Robin Murphy
2019-04-29 14:08     ` Robin Murphy
2019-04-22 17:59 ` [PATCH 22/26] iommu/dma: Refactor iommu_dma_mmap Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 14:04   ` Robin Murphy
2019-04-29 14:04     ` Robin Murphy
2019-04-29 14:04     ` Robin Murphy
2019-04-22 17:59 ` [PATCH 23/26] iommu/dma: Don't depend on CONFIG_DMA_DIRECT_REMAP Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 14:46   ` Robin Murphy
2019-04-29 14:46     ` Robin Murphy
2019-04-29 14:46     ` Robin Murphy
2019-04-22 17:59 ` [PATCH 24/26] iommu/dma: Switch copyright boilerplace to SPDX Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 25/26] arm64: switch copyright boilerplace to SPDX in dma-mapping.c Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59 ` [PATCH 26/26] arm64: trim includes " Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-22 17:59   ` Christoph Hellwig
2019-04-29 15:00   ` Robin Murphy
2019-04-29 15:00     ` Robin Murphy
2019-04-29 15:00     ` Robin Murphy
2019-04-29 15:03 ` implement generic dma_map_ops for IOMMUs v3 Robin Murphy
2019-04-29 15:03   ` Robin Murphy
2019-04-29 15:03   ` Robin Murphy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190422175942.18788-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=catalin.marinas@arm.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=joro@8bytes.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=thomas.lendacky@amd.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.