Commit 47743669 authored by Zhou Wang's avatar Zhou Wang Committed by Will Deacon

Revert "iommu/arm-smmu-v3: Decrease the queue size of evtq and priq"

The commit f115f3c0 ("iommu/arm-smmu-v3: Decrease the queue size of
evtq and priq") decreases evtq and priq, which may lead evtq/priq to be
full with fault events, e.g HiSilicon ZIP/SEC/HPRE have maximum 1024 queues
in one device, every queue could be binded with one process and trigger a
fault event. So let's revert f115f3c0.

In fact, if an implementation of SMMU really does not need so long evtq
and priq, value of IDR1_EVTQS and IDR1_PRIQS can be set to proper ones.
Signed-off-by: default avatarZhou Wang <wangzhou1@hisilicon.com>
Acked-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/1638858768-9971-1-git-send-email-wangzhou1@hisilicon.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent a556cfe4
...@@ -184,7 +184,6 @@ ...@@ -184,7 +184,6 @@
#else #else
#define Q_MAX_SZ_SHIFT (PAGE_SHIFT + MAX_ORDER - 1) #define Q_MAX_SZ_SHIFT (PAGE_SHIFT + MAX_ORDER - 1)
#endif #endif
#define Q_MIN_SZ_SHIFT (PAGE_SHIFT)
/* /*
* Stream table. * Stream table.
...@@ -374,7 +373,7 @@ ...@@ -374,7 +373,7 @@
/* Event queue */ /* Event queue */
#define EVTQ_ENT_SZ_SHIFT 5 #define EVTQ_ENT_SZ_SHIFT 5
#define EVTQ_ENT_DWORDS ((1 << EVTQ_ENT_SZ_SHIFT) >> 3) #define EVTQ_ENT_DWORDS ((1 << EVTQ_ENT_SZ_SHIFT) >> 3)
#define EVTQ_MAX_SZ_SHIFT (Q_MIN_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT) #define EVTQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - EVTQ_ENT_SZ_SHIFT)
#define EVTQ_0_ID GENMASK_ULL(7, 0) #define EVTQ_0_ID GENMASK_ULL(7, 0)
...@@ -400,7 +399,7 @@ ...@@ -400,7 +399,7 @@
/* PRI queue */ /* PRI queue */
#define PRIQ_ENT_SZ_SHIFT 4 #define PRIQ_ENT_SZ_SHIFT 4
#define PRIQ_ENT_DWORDS ((1 << PRIQ_ENT_SZ_SHIFT) >> 3) #define PRIQ_ENT_DWORDS ((1 << PRIQ_ENT_SZ_SHIFT) >> 3)
#define PRIQ_MAX_SZ_SHIFT (Q_MIN_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT) #define PRIQ_MAX_SZ_SHIFT (Q_MAX_SZ_SHIFT - PRIQ_ENT_SZ_SHIFT)
#define PRIQ_0_SID GENMASK_ULL(31, 0) #define PRIQ_0_SID GENMASK_ULL(31, 0)
#define PRIQ_0_SSID GENMASK_ULL(51, 32) #define PRIQ_0_SSID GENMASK_ULL(51, 32)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment