Merge tag 'kvmarm-fixes-5.10-4' of... (545f6394) · Commits · 戴 / test

arch/arm64/kvm/hyp/nvhe/hyp.lds.S

+5 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,11 @@

		SECTIONS {
		HYP_SECTION(.text)
		/*
		* .hyp..data..percpu needs to be page aligned to maintain the same
		* alignment for when linking into vmlinux.
		*/
		. = ALIGN(PAGE_SIZE);
		HYP_SECTION_NAME(.data..percpu) : {
		PERCPU_INPUT(L1_CACHE_BYTES)
		}

+20 −2

Original line number	Diff line number	Diff line
		@@ -273,6 +273,23 @@ static unsigned long vgic_mmio_read_v3r_typer(struct kvm_vcpu *vcpu,
		return extract_bytes(value, addr & 7, len);
		}

		static unsigned long vgic_uaccess_read_v3r_typer(struct kvm_vcpu *vcpu,
		gpa_t addr, unsigned int len)
		{
		unsigned long mpidr = kvm_vcpu_get_mpidr_aff(vcpu);
		int target_vcpu_id = vcpu->vcpu_id;
		u64 value;

		value = (u64)(mpidr & GENMASK(23, 0)) << 32;
		value \|= ((target_vcpu_id & 0xffff) << 8);

		if (vgic_has_its(vcpu->kvm))
		value \|= GICR_TYPER_PLPIS;

		/* reporting of the Last bit is not supported for userspace */
		return extract_bytes(value, addr & 7, len);
		}

		static unsigned long vgic_mmio_read_v3r_iidr(struct kvm_vcpu *vcpu,
		gpa_t addr, unsigned int len)
		{
		@@ -593,8 +610,9 @@ static const struct vgic_register_region vgic_v3_rd_registers[] = {
		REGISTER_DESC_WITH_LENGTH(GICR_IIDR,
		vgic_mmio_read_v3r_iidr, vgic_mmio_write_wi, 4,
		VGIC_ACCESS_32bit),
		REGISTER_DESC_WITH_LENGTH(GICR_TYPER,
		vgic_mmio_read_v3r_typer, vgic_mmio_write_wi, 8,
		REGISTER_DESC_WITH_LENGTH_UACCESS(GICR_TYPER,
		vgic_mmio_read_v3r_typer, vgic_mmio_write_wi,
		vgic_uaccess_read_v3r_typer, vgic_mmio_uaccess_write_wi, 8,
		VGIC_ACCESS_64bit \| VGIC_ACCESS_32bit),
		REGISTER_DESC_WITH_LENGTH(GICR_WAKER,
		vgic_mmio_read_raz, vgic_mmio_write_wi, 4,