From: robin.murphy@arm•com (Robin Murphy)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 1/8] iommu: Add MMIO mapping type
Date: Tue, 16 Feb 2016 12:43:40 +0000 [thread overview]
Message-ID: <56C3197C.8090903@arm.com> (raw)
In-Reply-To: <20160216120626.GA26710@bigcity.dyn.berto.se>
On 16/02/16 12:06, Niklas S?derlund wrote:
> Hi Robin,
>
> Thanks for your update patch I will include it in my next version. But
> I'm sorry I do not understand, is your modification an addition or a
> substitution to your original patch?
Apologies for being confusing - that was a diff on top of the existing
patch, to be folded in. My original patch was only handling IOMMU_MMIO
for stage 2 PTEs, so we also need the extra code to handle the different
way of setting the appropriate memory type in stage 1 PTEs.
Robin.
> * Robin Murphy <robin.murphy@arm•com> [2016-02-11 15:57:26 +0000]:
>
>> On 11/02/16 00:02, Laurent Pinchart wrote:
>>> Hi Niklas,
>>>
>>> Thank you for the patch.
>>>
>>> On Wednesday 10 February 2016 01:57:51 Niklas S?derlund wrote:
>>>> From: Robin Murphy <robin.murphy@arm•com>
>>>>
>>>> On some platforms, MMIO regions might need slightly different treatment
>>>> compared to mapping regular memory; add the notion of MMIO mappings to
>>>> the IOMMU API's memory type flags, so that callers can let the IOMMU
>>>> drivers know to do the right thing.
>>>>
>>>> Signed-off-by: Robin Murphy <robin.murphy@arm•com>
>>>> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard•com>
>>>
>>> Answering the question from the cover letter, yes, it's totally fine to pick
>>> the ack, that's actually expected.
>>>
>>>> ---
>>>> drivers/iommu/io-pgtable-arm.c | 4 +++-
>>>> include/linux/iommu.h | 1 +
>>>
>>> You might be asked to split this patch in two.
>>
>> Worse than that, you might also be asked to fix it up when the silly author
>> remembers that he did this on a stage-2-only ARM SMMU, and the attributes
>> for the stage 1 tables that the IPMMU uses are in a different code path:
>>
>> --->8---
>> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
>> index 5b5c299..7622c6e 100644
>> --- a/drivers/iommu/io-pgtable-arm.c
>> +++ b/drivers/iommu/io-pgtable-arm.c
>> @@ -354,7 +354,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct
>> arm_lpae_io_pgtable *data,
>> if (!(prot & IOMMU_WRITE) && (prot & IOMMU_READ))
>> pte |= ARM_LPAE_PTE_AP_RDONLY;
>>
>> - if (prot & IOMMU_CACHE)
>> + if (prot & IOMMU_MMIO)
>> + pte |= (ARM_LPAE_MAIR_ATTR_IDX_DEV
>> + << ARM_LPAE_PTE_ATTRINDX_SHIFT);
>> + else if (prot & IOMMU_CACHE)
>> pte |= (ARM_LPAE_MAIR_ATTR_IDX_CACHE
>> << ARM_LPAE_PTE_ATTRINDX_SHIFT);
>> } else {
>> --->8---
>>
>> Sorry for the bother,
>> Robin.
>>
>>>> 2 files changed, 4 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
>>>> index 381ca5a..3ff4f87 100644
>>>> --- a/drivers/iommu/io-pgtable-arm.c
>>>> +++ b/drivers/iommu/io-pgtable-arm.c
>>>> @@ -364,7 +364,9 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct
>>>> arm_lpae_io_pgtable *data, pte |= ARM_LPAE_PTE_HAP_READ;
>>>> if (prot & IOMMU_WRITE)
>>>> pte |= ARM_LPAE_PTE_HAP_WRITE;
>>>> - if (prot & IOMMU_CACHE)
>>>> + if (prot & IOMMU_MMIO)
>>>> + pte |= ARM_LPAE_PTE_MEMATTR_DEV;
>>>> + else if (prot & IOMMU_CACHE)
>>>> pte |= ARM_LPAE_PTE_MEMATTR_OIWB;
>>>> else
>>>> pte |= ARM_LPAE_PTE_MEMATTR_NC;
>>>> diff --git a/include/linux/iommu.h b/include/linux/iommu.h
>>>> index a5c539f..34b6432 100644
>>>> --- a/include/linux/iommu.h
>>>> +++ b/include/linux/iommu.h
>>>> @@ -30,6 +30,7 @@
>>>> #define IOMMU_WRITE (1 << 1)
>>>> #define IOMMU_CACHE (1 << 2) /* DMA cache coherency */
>>>> #define IOMMU_NOEXEC (1 << 3)
>>>> +#define IOMMU_MMIO (1 << 4) /* e.g. things like MSI doorbells */
>>>>
>>>> struct iommu_ops;
>>>> struct iommu_group;
>>>
>>
>
next prev parent reply other threads:[~2016-02-16 12:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 0:57 [PATCH v3 0/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-02-10 0:57 ` [PATCH v3 1/8] iommu: Add MMIO mapping type Niklas Söderlund
2016-02-11 0:02 ` Laurent Pinchart
2016-02-11 15:57 ` Robin Murphy
2016-02-16 12:06 ` Niklas Söderlund
2016-02-16 12:43 ` Robin Murphy [this message]
2016-02-16 13:30 ` Niklas Söderlund
2016-02-10 0:57 ` [PATCH v3 2/8] dma-mapping: add {map,unmap}_resource to dma_map_ops Niklas Söderlund
2016-02-10 12:11 ` Sergei Shtylyov
2016-02-11 0:03 ` [PATCH v3 2/8] dma-mapping: add {map, unmap}_resource " Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 3/8] dma-mapping: add dma_{map,unmap}_resource Niklas Söderlund
2016-02-10 10:25 ` Robin Murphy
2016-02-10 0:57 ` [PATCH v3 4/8] arm: dma-mapping: add {map, unmap}_resource for iommu ops Niklas Söderlund
2016-02-11 0:12 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 5/8] dmaengine: rcar-dmac: group slave configuration Niklas Söderlund
2016-02-11 0:14 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 6/8] dmaengine: rcar-dmac: add iommu support for slave transfers Niklas Söderlund
2016-02-10 10:49 ` Robin Murphy
2016-02-11 0:33 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 7/8] ARM: dts: r8a7790: add iommus to dmac0 and dmac1 Niklas Söderlund
2016-02-10 17:55 ` Simon Horman
2016-02-11 0:50 ` Niklas Söderlund
2016-02-11 0:41 ` Laurent Pinchart
2016-02-10 0:57 ` [PATCH v3 8/8] ARM: dts: r8a7791: " Niklas Söderlund
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=56C3197C.8090903@arm.com \
--to=robin.murphy@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox