diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2021-03-01 21:03:25 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2021-03-01 21:03:25 +0000 |
| commit | 76c328d82dcb88306fe44a414cb80a4b98c5a076 (patch) | |
| tree | 4a55efa340d15cb38b88a57223f70116e128d451 /sys | |
| parent | 5f59d29c00ffd6b990bf91e830d247bf255d00ce (diff) | |
Transactions on the AXI bus contain a Stream ID. SMMUs filter
based on Stream IDs. On the Armada 8040 these Stream IDs can
be configured in different registers. The PCIe controller has
a register which maps root port, bus, dev and func number to
the Stream ID. This should be set up by TF-A firmware, but on
the 8040 the current images don't do this. For chips with more
than one PCIe controller this register must be setup correctly
depending on the implementation, but on the 8040 there only is
one controller, so we can configure a fixed value to match what
is defined in the device tree. This allows the SMMU to properly
track the PCIe controller's transactions.
ok kettenis@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/fdt/dwpcie.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/dev/fdt/dwpcie.c b/sys/dev/fdt/dwpcie.c index 9da14732dbc..9d87788a8f5 100644 --- a/sys/dev/fdt/dwpcie.c +++ b/sys/dev/fdt/dwpcie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwpcie.c,v 1.26 2021/02/28 21:06:58 patrick Exp $ */ +/* $OpenBSD: dwpcie.c,v 1.27 2021/03/01 21:03:24 patrick Exp $ */ /* * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org> * @@ -100,6 +100,14 @@ #define PCIE_AXUSER_DOMAIN_MASK (0x3 << 4) #define PCIE_AXUSER_DOMAIN_INNER_SHARABLE (0x1 << 4) #define PCIE_AXUSER_DOMAIN_OUTER_SHARABLE (0x2 << 4) +#define PCIE_STREAMID 0x8064 +#define PCIE_STREAMID_FUNC_BITS(x) ((x) << 0) +#define PCIE_STREAMID_DEV_BITS(x) ((x) << 4) +#define PCIE_STREAMID_BUS_BITS(x) ((x) << 8) +#define PCIE_STREAMID_ROOTPORT(x) ((x) << 12) +#define PCIE_STREAMID_8040 \ + (PCIE_STREAMID_ROOTPORT(0x80) | PCIE_STREAMID_BUS_BITS(2) | \ + PCIE_STREAMID_DEV_BITS(2) | PCIE_STREAMID_FUNC_BITS(3)) /* Amlogic G12A registers */ #define PCIE_CFG0 0x0000 @@ -621,6 +629,12 @@ dwpcie_armada8k_init(struct dwpcie_softc *sc) HWRITE4(sc, PCIE_GLOBAL_CTRL, reg); } + /* + * Setup Requester-ID to Stream-ID mapping + * XXX: TF-A is supposed to set this up, but doesn't! + */ + HWRITE4(sc, PCIE_STREAMID, PCIE_STREAMID_8040); + /* Enable Root Complex mode. */ reg = HREAD4(sc, PCIE_GLOBAL_CTRL); reg &= ~PCIE_GLOBAL_CTRL_DEVICE_TYPE_MASK; |