From a183b6ab586dce0c1cd3abe00e78b55026ef40cc Mon Sep 17 00:00:00 2001 From: Lingutla Chandrasekhar Date: Tue, 16 Feb 2021 16:30:08 +0530 Subject: [PATCH] soc: qcom: guestvm_loader: Use proper cpu masks To boot guest vm, loader hotplugs required cpus and bring them back once bootup is completed. On hotplug operations, it uses isolation mask to print offline cpus, which is not right mask. Use cpu online mask instead of isolation mask to represent guest vm's hotplugged/hotunplugged cpus. Change-Id: I2805203df068c1192349867b6dc690af6fc32797 Signed-off-by: Lingutla Chandrasekhar --- drivers/soc/qcom/guestvm_loader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/soc/qcom/guestvm_loader.c b/drivers/soc/qcom/guestvm_loader.c index e0205e34c2f2..506588fa6cf9 100644 --- a/drivers/soc/qcom/guestvm_loader.c +++ b/drivers/soc/qcom/guestvm_loader.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ #include @@ -68,9 +68,9 @@ static void guestvm_isolate_cpu(void) cpumask_set_cpu(cpu, &guestvm_isolated_cpus); } - pr_info("%s: reserved_cpus=%*pbl isolated=%*pbl\n", __func__, + pr_info("%s: reserved_cpus=%*pbl online=%*pbl\n", __func__, cpumask_pr_args(&guestvm_isolated_cpus), - cpumask_pr_args(cpu_isolated_mask)); + cpumask_pr_args(cpu_online_mask)); } static void guestvm_unisolate_cpu(void) @@ -88,8 +88,8 @@ static void guestvm_unisolate_cpu(void) cpumask_clear_cpu(i, &guestvm_isolated_cpus); } - pr_info("%s: isolated mask=%*pbl\n", __func__, - cpumask_pr_args(cpu_isolated_mask)); + pr_info("%s: cpu online mask=%*pbl\n", __func__, + cpumask_pr_args(cpu_online_mask)); del_timer(&guestvm_cpu_isolate_timer); }