From: mitchelh@codeaurora•org (Mitchel Humpherys)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 5/6] dmaengine: pl330: Make sure microcode is privileged
Date: Tue, 19 Jul 2016 13:36:54 -0700 [thread overview]
Message-ID: <20160719203655.16629-6-mitchelh@codeaurora.org> (raw)
In-Reply-To: <20160719203655.16629-1-mitchelh@codeaurora.org>
The PL330 performs privileged instruction fetches. This can result in
SMMU permission faults on SMMUs that implement the ARMv8 VMSA, which
specifies that mappings that are writeable at one execution level shall
not be executable at any higher-privileged level. Fix this by using the
DMA_ATTR_PRIVILEGED attribute, which will ensure that the microcode
IOMMU mapping is only accessible to the privileged level.
Cc: Dan Williams <dan.j.williams@intel•com>
Cc: Jassi Brar <jassi.brar@samsung•com>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora•org>
---
drivers/dma/pl330.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 372b4359da97..7297cd1d03c8 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1854,14 +1854,17 @@ static int dmac_alloc_resources(struct pl330_dmac *pl330)
{
int chans = pl330->pcfg.num_chan;
int ret;
+ DEFINE_DMA_ATTRS(attrs);
+ dma_set_attr(DMA_ATTR_PRIVILEGED, &attrs);
/*
* Alloc MicroCode buffer for 'chans' Channel threads.
* A channel's buffer offset is (Channel_Id * MCODE_BUFF_PERCHAN)
*/
- pl330->mcode_cpu = dma_alloc_coherent(pl330->ddma.dev,
+ pl330->mcode_cpu = dma_alloc_attrs(pl330->ddma.dev,
chans * pl330->mcbufsz,
- &pl330->mcode_bus, GFP_KERNEL);
+ &pl330->mcode_bus, GFP_KERNEL,
+ &attrs);
if (!pl330->mcode_cpu) {
dev_err(pl330->ddma.dev, "%s:%d Can't allocate memory!\n",
__func__, __LINE__);
--
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-07-19 20:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-19 20:36 [PATCH v3 0/6] Add support for privileged mappings Mitchel Humpherys
2016-07-19 20:36 ` [PATCH v3 1/6] iommu: add IOMMU_PRIV attribute Mitchel Humpherys
2016-07-19 20:36 ` [PATCH v3 2/6] iommu/io-pgtable-arm: add support for the IOMMU_PRIV flag Mitchel Humpherys
2016-07-19 20:36 ` [PATCH v3 3/6] common: DMA-mapping: add DMA_ATTR_PRIVILEGED attribute Mitchel Humpherys
2016-07-19 20:36 ` [PATCH v3 4/6] arm64/dma-mapping: Implement DMA_ATTR_PRIVILEGED Mitchel Humpherys
2016-07-19 20:36 ` Mitchel Humpherys [this message]
2016-07-19 20:36 ` [PATCH v3 6/6] Revert "iommu/arm-smmu: Treat all device transactions as unprivileged" Mitchel Humpherys
2016-07-22 16:51 ` [PATCH v3 0/6] Add support for privileged mappings Will Deacon
2016-07-22 20:39 ` Mitchel Humpherys
2016-07-25 9:50 ` Will Deacon
2016-07-25 19:01 ` Mitchel Humpherys
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=20160719203655.16629-6-mitchelh@codeaurora.org \
--to=mitchelh@codeaurora$(echo .)org \
--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