From: "Ard Biesheuvel" <ard.biesheuvel@linaro.org>
To: devel@edk2.groups.io
Cc: leif.lindholm@linaro.org, Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-platforms 1/3] Platform/Overdrive: revert streamID DT changes for first SATA port
Date: Mon, 9 Dec 2019 17:15:19 +0100 [thread overview]
Message-ID: <20191209161521.1986-2-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20191209161521.1986-1-ard.biesheuvel@linaro.org>
Commit 7a1cd6efbb483564dcf0ff3dda701bd09acf4b08 updated the stream ID
assignment for various masters on the Seattle SoC, primarily to address
a conflict between the second SATA port and the crypto accelerator on
platforms that implement them (B1 silicon). Unfortunately, B0 variants
turn out to exist where the stream ID assignment deviates from the
observed assignment on the B0 Overdrive that I tested these changes on,
leading to DMA access faults when using the first SATA port.
Since that port does not share its SMMU with any other masters, let's
revert the change to its stream ID assignment in the device tree, and
switch back to matching the entire range [0x0, 0x1f].
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts
index a92ab695fb2e..a1575d0a623b 100644
--- a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts
+++ b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts
@@ -86,7 +86,7 @@
*/
<0 332 4>,
<0 332 4>;
- #iommu-cells = <1>;
+ #iommu-cells = <2>;
dma-coherent;
};
@@ -109,12 +109,7 @@
interrupts = <0x0 0x163 0x4>;
clocks = <&sata_clk>;
dma-coherent;
- iommus = <&sata0_smmu 0x0a>,
- <&sata0_smmu 0x0b>,
- <&sata0_smmu 0x0e>,
- <&sata0_smmu 0x0f>,
- <&sata0_smmu 0x1a>,
- <&sata0_smmu 0x1e>;
+ iommus = <&sata0_smmu 0x0 0x1f>;
};
sata@e0d00000 {
--
2.17.1
next prev parent reply other threads:[~2019-12-09 16:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 16:15 [PATCH edk2-platforms 0/3] Seattle Overdrive fixes Ard Biesheuvel
2019-12-09 16:15 ` Ard Biesheuvel [this message]
2019-12-09 16:15 ` [PATCH edk2-platforms 2/3] Silicon/AMD/Styx: add some more stream IDs for SATA0 to the IORT Ard Biesheuvel
2019-12-09 16:15 ` [PATCH edk2-platforms 3/3] Silicon/AMD/Styx/PlatInitPei: ignore bogus MAC addresses provided by the SCP Ard Biesheuvel
2019-12-09 16:47 ` [PATCH edk2-platforms 0/3] Seattle Overdrive fixes Leif Lindholm
2019-12-09 17:38 ` Ard Biesheuvel
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-list 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=20191209161521.1986-2-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox