diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 43021d2722538d7a408ea2152daf141cd498fe0a..fe47221f0f31318c58ad28968d8cb941b34f5f88 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -819,6 +819,19 @@ config HISILICON_ERRATUM_162100801
 
 	If unsure, say Y.
 
+config HISILICON_ERRATUM_162100803
+	bool "Hip09/10/10c/12 162100803/162200807/162400807/165010802 erratum support"
+	default y
+	help
+	  There is a hardware conflict between vSGI and vLPI, fix it by
+	  configure a max ITS ITT size 0xf when doing MAPD with V = 1, clear V
+	  field in ITS device table and clear ITS cache to implement MAPD with
+	  V = 0 instead. Hip09/10/10c/12 have this same problem, just use
+	  HISILICON_ERRATUM_162100803 as the compile macro and
+	  ITS_FLAGS_WORKAROUND_HISILICON_162100803 as ITS flag for convenience
+
+	  If unsure, say Y.
+
 config HISILICON_ERRATUM_162100602
 	bool "Hisilicon erratum 162100602"
 	depends on ARM_SMMU_V3 && ARCH_HISI
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 218595287e12f484bed72317ef67fa27d33f8ef6..edb96059bcd9b5a4ed3e3bd58fc495a389683bc0 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -145,6 +145,7 @@ static int build_devid_pools(void)
 #define ITS_FLAGS_WORKAROUND_CAVIUM_22375	(1ULL << 1)
 #define ITS_FLAGS_WORKAROUND_CAVIUM_23144	(1ULL << 2)
 #define ITS_FLAGS_WORKAROUND_HISILICON_162100801	(1ULL << 3)
+#define ITS_FLAGS_WORKAROUND_HISILICON_162100803	(1ULL << 5)
 
 #define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING	(1 << 0)
 #define RDIST_FLAGS_RD_TABLES_PREALLOCATED	(1 << 1)
@@ -868,7 +869,12 @@ static struct its_collection *its_build_mapd_cmd(struct its_node *its,
 
 	its_encode_cmd(cmd, GITS_CMD_MAPD);
 	its_encode_devid(cmd, desc->its_mapd_cmd.dev->device_id);
-	its_encode_size(cmd, size - 1);
+	
+        if (its->flags & ITS_FLAGS_WORKAROUND_HISILICON_162100803)
+		its_encode_size(cmd, 0xf);
+	else
+		its_encode_size(cmd, size - 1);
+
 	its_encode_itt(cmd, itt_addr);
 	its_encode_valid(cmd, desc->its_mapd_cmd.valid);
 
@@ -877,6 +883,61 @@ static struct its_collection *its_build_mapd_cmd(struct its_node *its,
 	return NULL;
 }
 
+static struct its_baser *its_get_baser(struct its_node *its, u32 type)
+{
+	int i;
+
+	for (i = 0; i < GITS_BASER_NR_REGS; i++) {
+		if (GITS_BASER_TYPE(its->tables[i].val) == type)
+			return &its->tables[i];
+	}
+
+	return NULL;
+}
+
+static struct its_collection
+*its_build_mapd_cmd_hisi_quirk(struct its_node *its, struct its_cmd_block *cmd,
+			       struct its_cmd_desc *desc)
+{
+	struct its_baser *baser = its_get_baser(its, GITS_BASER_TYPE_DEVICE);
+	u32 devid = desc->its_mapd_cmd.dev->device_id;
+	void *base = baser->base;
+	u32 *dt_entry;
+	void __iomem *its_func_en = its->sgir_base + 0x80;
+	u32 tmp, tmp1, mask = 1 << 19;
+	int i = 100;
+
+	/*
+	 * The device table is flat. Modify v to 0 in the dt entry of devid,
+	 * dt entry format as below: word0: [0-31] ITT address; word1: [0-7]
+	 * ITT address, [8-12]: ITT size, [13]: V
+	 */
+	dt_entry = (u32 *)(base + devid * 8 + 4);
+	*dt_entry &= ~(1 << 13);
+
+	dsb(ishst);
+
+	/*
+	 * Invalidate cache by a private register GITS_FUNC_EN, whose offset
+	 * is 0x20080 of ITS base address. GICv4.1 already maps sgir_base
+	 * (offset is 0x20000), so address of GITS_FUNC_EN can be got by
+	 * sgir_base + 0x80. Bit 16 is used to clear DT cache, the flip of
+	 * bit 19 indicates that DT cache has been cleared.
+	 */
+	while (--i) {
+		tmp = readl_relaxed(its_func_en) & mask;
+		writel_relaxed(tmp | (1 << 16), its_func_en);
+		tmp1 = readl_relaxed(its_func_en) & mask;
+		if (tmp != tmp1)
+			break;
+	}
+
+	if (i == 0)
+		WARN_ON(1);
+
+	return NULL;
+}
+
 static struct its_collection *its_build_mapc_cmd(struct its_node *its,
 						 struct its_cmd_block *cmd,
 						 struct its_cmd_desc *desc)
@@ -1458,11 +1519,18 @@ static void its_send_inv(struct its_device *dev, u32 event_id)
 static void its_send_mapd(struct its_device *dev, int valid)
 {
 	struct its_cmd_desc desc;
+        its_cmd_builder_t fn;
+
+	if (dev->its->flags & ITS_FLAGS_WORKAROUND_HISILICON_162100803 &&
+	    valid == 0)
+		fn = its_build_mapd_cmd_hisi_quirk;
+	else
+		fn = its_build_mapd_cmd;
 
 	desc.its_mapd_cmd.dev = dev;
 	desc.its_mapd_cmd.valid = !!valid;
 
-	its_send_single_command(dev->its, its_build_mapd_cmd, &desc);
+        its_send_single_command(dev->its, fn, &desc);
 }
 
 static void its_send_mapc(struct its_node *its, struct its_collection *col,
@@ -3597,18 +3665,6 @@ static struct its_device *its_find_device(struct its_node *its, u32 dev_id)
 	return its_dev;
 }
 
-static struct its_baser *its_get_baser(struct its_node *its, u32 type)
-{
-	int i;
-
-	for (i = 0; i < GITS_BASER_NR_REGS; i++) {
-		if (GITS_BASER_TYPE(its->tables[i].val) == type)
-			return &its->tables[i];
-	}
-
-	return NULL;
-}
-
 static bool its_alloc_table_entry(struct its_node *its,
 				  struct its_baser *baser, u32 id)
 {
@@ -5111,6 +5167,16 @@ static bool __maybe_unused its_enable_quirk_hip09_162100801(void *data)
 	return true;
 }
 
+static bool __maybe_unused its_enable_quirk_162100803(void *data)
+{
+	struct its_node *its = data;
+
+	if (is_v4_1(its))
+		its->flags |= ITS_FLAGS_WORKAROUND_HISILICON_162100803;
+
+	return true;
+}
+
 static const struct gic_quirk its_quirks[] = {
 #ifdef CONFIG_CAVIUM_ERRATUM_22375
 	{
@@ -5164,6 +5230,32 @@ static const struct gic_quirk its_quirks[] = {
 		.mask = 0xffffffff,
 		.init = its_enable_quirk_hip09_162100801,
 	},
+#endif
+#ifdef CONFIG_HISILICON_ERRATUM_162100803
+	{
+		.desc = "ITS: Hip09 erratum 162100803",
+		.iidr = 0x00051736,
+		.mask = 0xffffffff,
+		.init = its_enable_quirk_162100803,
+	},
+	{
+		.desc = "ITS: Hip10 erratum 162200807",
+		.iidr = 0x01051736,
+		.mask = 0xffffffff,
+		.init = its_enable_quirk_162100803,
+	},
+	{
+		.desc = "ITS: Hip10c erratum 162400807",
+		.iidr = 0x00061736,
+		.mask = 0xffffffff,
+		.init = its_enable_quirk_162100803,
+	},
+	{
+		.desc = "ITS: Hip12 erratum 165010802",
+		.iidr = 0x00070736,
+		.mask = 0xffffffff,
+		.init = its_enable_quirk_162100803,
+	},
 #endif
 	{
 	}