Commit 5decdcc6 authored by Kunkun Jiang's avatar Kunkun Jiang Committed by Dongxu Sun
Browse files

irqchip/gic-v4.1: Detect ITS vtimer interrupt bypass capability 

virt inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8K89F


CVE: NA

------------------------------------------------------------------

According to Hisilicon spec, using GITS_VERSION(0xC000) bit[12] to
indicate ITS vtimer interrupt bypass capability.

Signed-off-by: default avatarKunkun Jiang <jiangkunkun@huawei.com>
Signed-off-by: default avatarDongxu Sun <sundongxu3@huawei.com>
parent 212e82b2

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

+5 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct its_node { 
	int			numa_node;

	unsigned int		msi_domain_flags;

	u32			pre_its_base; /* for Socionext Synquacer */

	u32			version;

	int			vlpi_redist_offset;

};
@@ -126,6 +127,8 @@ struct its_node { 
#define is_v4_1(its)		(!!((its)->typer & GITS_TYPER_VMAPP))

#define device_ids(its)		(FIELD_GET(GITS_TYPER_DEVBITS, (its)->typer) + 1)



#define is_vtimer_irqbypass(its)	(!!((its)->version & GITS_VERSION_VTIMER))



#define ITS_ITT_ALIGN		SZ_256



/* The maximum number of VPEID bits supported by VLPI commands */
@@ -5292,6 +5295,8 @@ static int __init its_probe_one(struct resource *res, 
	INIT_LIST_HEAD(&its->its_device_list);

	typer = gic_read_typer(its_base + GITS_TYPER);

	its->typer = typer;

	if (readl_relaxed(its_base + GITS_IIDR) == 0x00051736)

		its->version = readl_relaxed(its_base + GITS_VERSION);

	its->base = its_base;

	its->phys_base = res->start;

	if (is_v4(its)) {

include/linux/irqchip/arm-gic-v3.h

+11 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ 


#define GITS_SGIR			0x20020



/* HiSilicon IMP DEF register */

#define GITS_VERSION			0xC000



#define GITS_SGIR_VPEID			GENMASK_ULL(47, 32)

#define GITS_SGIR_VINTID		GENMASK_ULL(3, 0)
@@ -402,6 +405,14 @@ 
#define GITS_TYPER_VMAPP		(1ULL << 40)

#define GITS_TYPER_SVPET		GENMASK_ULL(42, 41)



/**

 * HiSilicon IMP DEF field which indicates if the vPPI direct injection

 * is supported.

 * - 0: not supported

 * - 1: supported

 */

#define GITS_VERSION_VTIMER		(1ULL << 12)



#define GITS_IIDR_REV_SHIFT		12

#define GITS_IIDR_REV_MASK		(0xf << GITS_IIDR_REV_SHIFT)

#define GITS_IIDR_REV(r)		(((r) >> GITS_IIDR_REV_SHIFT) & 0xf)