Unverified Commit 49fed033 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5931 irqchip/gicv3-its: Add workaround for hip09 ITS erratum 162100801 

Merge Pull Request from: @ci-robot 
 
PR sync from: chenxiang <chenxiang66@hisilicon.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FL7VCADHQLM6K5RGNAM5VWT27WRGW2KU/ 
 
https://gitee.com/openeuler/kernel/issues/I9EWDF 
 
Link:https://gitee.com/openeuler/kernel/pulls/5931

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents e7a28360 931d277d

Documentation/arch/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | LINXICORE9100   | #1980005        | HISILICON_ERRATUM_1980005   |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | Hip09           | #162100801      | HISILICON_ERRATUM_162100801 |

+----------------+-----------------+-----------------+-----------------------------+

| Hisilicon      | SMMUv3          | #162100602      | HISILICON_ERRATUM_162100602 |

+----------------+-----------------+-----------------+-----------------------------+

| Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |

arch/arm64/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -1203,6 +1203,16 @@ config HISILICON_ERRATUM_1980005 


	  If unsure, say N.



config HISILICON_ERRATUM_162100801

	bool "Hip09 162100801 erratum support"

	default y

	help

	  When enabled GICv4.1 in hip09, there are some invalid vPE config

	  in configuration tables for some situation, which will cause vSGI

	  interrupts lost. So fix it by sending vinvall commands after vmovp.



	  If unsure, say Y.



config HISILICON_ERRATUM_162100602

	bool "Hisilicon erratum 162100602"

	depends on ARM_SMMU_V3 && ARCH_HISI

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ CONFIG_HISILICON_ERRATUM_161600802=y 
CONFIG_HISILICON_ERRATUM_162100125=y

CONFIG_HISILICON_ERRATUM_162102203=y

# CONFIG_HISILICON_ERRATUM_1980005 is not set

CONFIG_HISILICON_ERRATUM_162100801=y

CONFIG_HISILICON_ERRATUM_162100602=y

CONFIG_QCOM_FALKOR_ERRATUM_1003=y

CONFIG_QCOM_FALKOR_ERRATUM_1009=y

drivers/irqchip/irq-gic-v3-its.c

+28 −8
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static int probe_devid_pool_one(void) 
#define ITS_FLAGS_WORKAROUND_CAVIUM_22375	(1ULL << 1)

#define ITS_FLAGS_WORKAROUND_CAVIUM_23144	(1ULL << 2)

#define ITS_FLAGS_FORCE_NON_SHAREABLE		(1ULL << 3)

#define ITS_FLAGS_WORKAROUND_HISILICON_162100801	(1ULL << 4)



#define RD_LOCAL_LPI_ENABLED                    BIT(0)

#define RD_LOCAL_PENDTABLE_PREALLOCATED         BIT(1)
@@ -1526,6 +1527,14 @@ static void its_send_vmapp(struct its_node *its, 
	its_send_single_vcommand(its, its_build_vmapp_cmd, &desc);

}



static void its_send_vinvall(struct its_node *its, struct its_vpe *vpe)

{

	struct its_cmd_desc desc;



	desc.its_vinvall_cmd.vpe = vpe;

	its_send_single_vcommand(its, its_build_vinvall_cmd, &desc);

}



static void its_send_vmovp(struct its_vpe *vpe)

{

	struct its_cmd_desc desc = {};
@@ -1565,19 +1574,14 @@ static void its_send_vmovp(struct its_vpe *vpe) 


		desc.its_vmovp_cmd.col = &its->collections[col_id];

		its_send_single_vcommand(its, its_build_vmovp_cmd, &desc);

		if (is_v4_1(its) && (its->flags &

			    ITS_FLAGS_WORKAROUND_HISILICON_162100801))

			its_send_vinvall(its, vpe);

	}



	raw_spin_unlock_irqrestore(&vmovp_lock, flags);

}



static void its_send_vinvall(struct its_node *its, struct its_vpe *vpe)

{

	struct its_cmd_desc desc;



	desc.its_vinvall_cmd.vpe = vpe;

	its_send_single_vcommand(its, its_build_vinvall_cmd, &desc);

}



static void its_send_vinv(struct its_device *dev, u32 event_id)

{

	struct its_cmd_desc desc;
@@ -5089,6 +5093,14 @@ static bool its_set_non_coherent(void *data) 
	return true;

}



static bool __maybe_unused its_enable_quirk_hip09_162100801(void *data)

{

	struct its_node *its = data;



	its->flags |= ITS_FLAGS_WORKAROUND_HISILICON_162100801;

	return true;

}



static const struct gic_quirk its_quirks[] = {

#ifdef CONFIG_CAVIUM_ERRATUM_22375

	{
@@ -5135,6 +5147,14 @@ static const struct gic_quirk its_quirks[] = { 
		.init	= its_enable_quirk_hip07_161600802,

	},

#endif

#ifdef CONFIG_HISILICON_ERRATUM_162100801

	{

		.desc = "ITS: Hip09 erratum 162100801",

		.iidr = 0x00051736,

		.mask = 0xffffffff,

		.init = its_enable_quirk_hip09_162100801,

	},

#endif

#ifdef CONFIG_ROCKCHIP_ERRATUM_3588001

	{

		.desc   = "ITS: Rockchip erratum RK3588001",