* [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up
@ 2018-10-10 10:29 Andrew Murray
2018-10-10 10:29 ` [PATCH 1/2] iommu/arm-smmu-v3: Add SPDX header Andrew Murray
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Andrew Murray @ 2018-10-10 10:29 UTC (permalink / raw)
To: linux-arm-kernel
Remove unnecessary code and license text.
Andrew Murray (2):
iommu/arm-smmu-v3: Add SPDX header
iommu/arm-smmu-v3: Remove unnecessary wrapper function
drivers/iommu/arm-smmu-v3.c | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] iommu/arm-smmu-v3: Add SPDX header
2018-10-10 10:29 [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Andrew Murray
@ 2018-10-10 10:29 ` Andrew Murray
2018-10-10 10:37 ` Robin Murphy
2018-10-10 10:29 ` [PATCH 2/2] iommu/arm-smmu-v3: Remove unnecessary wrapper function Andrew Murray
2018-10-10 14:49 ` [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Will Deacon
2 siblings, 1 reply; 8+ messages in thread
From: Andrew Murray @ 2018-10-10 10:29 UTC (permalink / raw)
To: linux-arm-kernel
Replace license text with SDPX header
Signed-off-by: Andrew Murray <andrew.murray@arm.com>
---
drivers/iommu/arm-smmu-v3.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index db402e8..c7bd18e 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1,18 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* IOMMU API for ARM architected SMMUv3 implementations.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
* Copyright (C) 2015 ARM Limited
*
* Author: Will Deacon <will.deacon@arm.com>
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] iommu/arm-smmu-v3: Remove unnecessary wrapper function
2018-10-10 10:29 [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Andrew Murray
2018-10-10 10:29 ` [PATCH 1/2] iommu/arm-smmu-v3: Add SPDX header Andrew Murray
@ 2018-10-10 10:29 ` Andrew Murray
2018-10-10 10:42 ` Robin Murphy
2018-10-10 14:49 ` [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Will Deacon
2 siblings, 1 reply; 8+ messages in thread
From: Andrew Murray @ 2018-10-10 10:29 UTC (permalink / raw)
To: linux-arm-kernel
Simplify the code by removing an unnecessary wrapper function.
This was left behind by commit 2f657add07a8
("iommu/arm-smmu-v3: Specialise CMD_SYNC handling")
Signed-off-by: Andrew Murray <andrew.murray@arm.com>
---
drivers/iommu/arm-smmu-v3.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index c7bd18e..6947ccf 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -1371,15 +1371,11 @@ static irqreturn_t arm_smmu_combined_irq_handler(int irq, void *dev)
}
/* IO_PGTABLE API */
-static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu)
-{
- arm_smmu_cmdq_issue_sync(smmu);
-}
-
static void arm_smmu_tlb_sync(void *cookie)
{
struct arm_smmu_domain *smmu_domain = cookie;
- __arm_smmu_tlb_sync(smmu_domain->smmu);
+
+ arm_smmu_cmdq_issue_sync(smmu_domain->smmu);
}
static void arm_smmu_tlb_inv_context(void *cookie)
@@ -1404,7 +1400,7 @@ static void arm_smmu_tlb_inv_context(void *cookie)
* to guarantee those are observed before the TLBI. Do be careful, 007.
*/
arm_smmu_cmdq_issue_cmd(smmu, &cmd);
- __arm_smmu_tlb_sync(smmu);
+ arm_smmu_cmdq_issue_sync(smmu);
}
static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size,
@@ -1793,7 +1789,7 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain)
struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;
if (smmu)
- __arm_smmu_tlb_sync(smmu);
+ arm_smmu_cmdq_issue_sync(smmu);
}
static phys_addr_t
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] iommu/arm-smmu-v3: Add SPDX header
2018-10-10 10:29 ` [PATCH 1/2] iommu/arm-smmu-v3: Add SPDX header Andrew Murray
@ 2018-10-10 10:37 ` Robin Murphy
0 siblings, 0 replies; 8+ messages in thread
From: Robin Murphy @ 2018-10-10 10:37 UTC (permalink / raw)
To: linux-arm-kernel
On 10/10/18 11:29, Andrew Murray wrote:
> Replace license text with SDPX header
Acked-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Andrew Murray <andrew.murray@arm.com>
> ---
> drivers/iommu/arm-smmu-v3.c | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
> index db402e8..c7bd18e 100644
> --- a/drivers/iommu/arm-smmu-v3.c
> +++ b/drivers/iommu/arm-smmu-v3.c
> @@ -1,18 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0
> /*
> * IOMMU API for ARM architected SMMUv3 implementations.
> *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 as
> - * published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program. If not, see <http://www.gnu.org/licenses/>.
> - *
> * Copyright (C) 2015 ARM Limited
> *
> * Author: Will Deacon <will.deacon@arm.com>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] iommu/arm-smmu-v3: Remove unnecessary wrapper function
2018-10-10 10:29 ` [PATCH 2/2] iommu/arm-smmu-v3: Remove unnecessary wrapper function Andrew Murray
@ 2018-10-10 10:42 ` Robin Murphy
0 siblings, 0 replies; 8+ messages in thread
From: Robin Murphy @ 2018-10-10 10:42 UTC (permalink / raw)
To: linux-arm-kernel
On 10/10/18 11:29, Andrew Murray wrote:
> Simplify the code by removing an unnecessary wrapper function.
>
> This was left behind by commit 2f657add07a8
> ("iommu/arm-smmu-v3: Specialise CMD_SYNC handling")
Oops, sorry about that ;)
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Andrew Murray <andrew.murray@arm.com>
> ---
> drivers/iommu/arm-smmu-v3.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
> index c7bd18e..6947ccf 100644
> --- a/drivers/iommu/arm-smmu-v3.c
> +++ b/drivers/iommu/arm-smmu-v3.c
> @@ -1371,15 +1371,11 @@ static irqreturn_t arm_smmu_combined_irq_handler(int irq, void *dev)
> }
>
> /* IO_PGTABLE API */
> -static void __arm_smmu_tlb_sync(struct arm_smmu_device *smmu)
> -{
> - arm_smmu_cmdq_issue_sync(smmu);
> -}
> -
> static void arm_smmu_tlb_sync(void *cookie)
> {
> struct arm_smmu_domain *smmu_domain = cookie;
> - __arm_smmu_tlb_sync(smmu_domain->smmu);
> +
> + arm_smmu_cmdq_issue_sync(smmu_domain->smmu);
> }
>
> static void arm_smmu_tlb_inv_context(void *cookie)
> @@ -1404,7 +1400,7 @@ static void arm_smmu_tlb_inv_context(void *cookie)
> * to guarantee those are observed before the TLBI. Do be careful, 007.
> */
> arm_smmu_cmdq_issue_cmd(smmu, &cmd);
> - __arm_smmu_tlb_sync(smmu);
> + arm_smmu_cmdq_issue_sync(smmu);
> }
>
> static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size,
> @@ -1793,7 +1789,7 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain)
> struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;
>
> if (smmu)
> - __arm_smmu_tlb_sync(smmu);
> + arm_smmu_cmdq_issue_sync(smmu);
> }
>
> static phys_addr_t
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up
2018-10-10 10:29 [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Andrew Murray
2018-10-10 10:29 ` [PATCH 1/2] iommu/arm-smmu-v3: Add SPDX header Andrew Murray
2018-10-10 10:29 ` [PATCH 2/2] iommu/arm-smmu-v3: Remove unnecessary wrapper function Andrew Murray
@ 2018-10-10 14:49 ` Will Deacon
2018-10-10 16:10 ` Joerg Roedel
2 siblings, 1 reply; 8+ messages in thread
From: Will Deacon @ 2018-10-10 14:49 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 10, 2018 at 11:29:25AM +0100, Andrew Murray wrote:
> Remove unnecessary code and license text.
These two look fine to me.
Joerg -- you can pick them up if you're still queueing patches, otherwise
I'll include them for 4.21.
Cheers,
Will
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up
2018-10-10 14:49 ` [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Will Deacon
@ 2018-10-10 16:10 ` Joerg Roedel
2018-10-10 16:28 ` Will Deacon
0 siblings, 1 reply; 8+ messages in thread
From: Joerg Roedel @ 2018-10-10 16:10 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 10, 2018 at 03:49:48PM +0100, Will Deacon wrote:
> Joerg -- you can pick them up if you're still queueing patches, otherwise
> I'll include them for 4.21.
Applied to arm/smmu.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up
2018-10-10 16:10 ` Joerg Roedel
@ 2018-10-10 16:28 ` Will Deacon
0 siblings, 0 replies; 8+ messages in thread
From: Will Deacon @ 2018-10-10 16:28 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 10, 2018 at 06:10:32PM +0200, Joerg Roedel wrote:
> On Wed, Oct 10, 2018 at 03:49:48PM +0100, Will Deacon wrote:
> > Joerg -- you can pick them up if you're still queueing patches, otherwise
> > I'll include them for 4.21.
>
> Applied to arm/smmu.
Thanks, Joerg.
Will
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-10-10 16:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-10 10:29 [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Andrew Murray
2018-10-10 10:29 ` [PATCH 1/2] iommu/arm-smmu-v3: Add SPDX header Andrew Murray
2018-10-10 10:37 ` Robin Murphy
2018-10-10 10:29 ` [PATCH 2/2] iommu/arm-smmu-v3: Remove unnecessary wrapper function Andrew Murray
2018-10-10 10:42 ` Robin Murphy
2018-10-10 14:49 ` [PATCH 0/2] iommu/arm-smmu-v3: Miscellaneous clean up Will Deacon
2018-10-10 16:10 ` Joerg Roedel
2018-10-10 16:28 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).