moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "FROMGIT: KVM: arm64: vgic: Demote userspace-triggered console prints to kvm_debug()"

Browse Source 
This reverts commit 60bd62a27a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I18d82a911f6ab65b806eeb9894e72ba302ec779a
This commit is contained in:
Will Deacon
2022-07-07 15:51:52 +01:00
parent 1dc91f04a4
commit 056550b1ed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kvm/vgic/vgic-v2.c
View File

@@ -293,12 +293,12 @@ int vgic_v2_map_resources(struct kvm *kvm)
if (IS_VGIC_ADDR_UNDEF(dist->vgic_dist_base) || if (IS_VGIC_ADDR_UNDEF(dist->vgic_dist_base) ||
IS_VGIC_ADDR_UNDEF(dist->vgic_cpu_base)) { IS_VGIC_ADDR_UNDEF(dist->vgic_cpu_base)) {
kvm_debug("Need to set vgic cpu and dist addresses first\n"); kvm_err("Need to set vgic cpu and dist addresses first\n");
return -ENXIO; return -ENXIO;
} }
if (!vgic_v2_check_base(dist->vgic_dist_base, dist->vgic_cpu_base)) { if (!vgic_v2_check_base(dist->vgic_dist_base, dist->vgic_cpu_base)) {
kvm_debug("VGIC CPU and dist frames overlap\n"); kvm_err("VGIC CPU and dist frames overlap\n");
return -EINVAL; return -EINVAL;
} }

4
arch/arm64/kvm/vgic/vgic-v3.c
View File

@@ -554,12 +554,12 @@ int vgic_v3_map_resources(struct kvm *kvm)
} }
if (IS_VGIC_ADDR_UNDEF(dist->vgic_dist_base)) { if (IS_VGIC_ADDR_UNDEF(dist->vgic_dist_base)) {
kvm_debug("Need to set vgic distributor addresses first\n"); kvm_err("Need to set vgic distributor addresses first\n");
return -ENXIO; return -ENXIO;
} }
if (!vgic_v3_check_base(kvm)) { if (!vgic_v3_check_base(kvm)) {
kvm_debug("VGIC redist and dist frames overlap\n"); kvm_err("VGIC redist and dist frames overlap\n");
return -EINVAL; return -EINVAL;
} }