Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3580f45 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: psci: drop info prints seen during cpu hotplug to pr_debug"

parents 94c657fd 6ac57b18

arch/arm/kernel/psci_smp.c

+2 −2
Original line number Diff line number Diff line
@@ -84,12 +84,12 @@ int __ref psci_cpu_kill(unsigned int cpu) 
	for (i = 0; i < 10; i++) {

		err = psci_ops.affinity_info(cpu_logical_map(cpu), 0);

		if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) {

			pr_info("CPU%d killed.\n", cpu);

			pr_debug("CPU%d killed.\n", cpu);

			return 1;

		}



		msleep(10);

		pr_info("Retrying again to check for CPU kill\n");

		pr_debug("Retrying again to check for CPU kill\n");

	}



	pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n",

arch/arm64/kernel/cpuinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info) 
	if (l1ip == ICACHE_POLICY_AIVIVT)

		set_bit(ICACHEF_AIVIVT, &__icache_flags);



	pr_info("Detected %s I-cache on CPU%d\n", icache_policy_str[l1ip], cpu);

	pr_debug("Detected %s I-cache on CPU%d\n", icache_policy_str[l1ip], cpu);

}



static int check_reg_mask(char *name, u64 mask, u64 boot, u64 cur, int cpu)

arch/arm64/kernel/psci.c

+2 −2
Original line number Diff line number Diff line
@@ -548,12 +548,12 @@ static int cpu_psci_cpu_kill(unsigned int cpu) 
	for (i = 0; i < 10; i++) {

		err = psci_ops.affinity_info(cpu_logical_map(cpu), 0);

		if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) {

			pr_info("CPU%d killed.\n", cpu);

			pr_debug("CPU%d killed.\n", cpu);

			return 1;

		}



		msleep(10);

		pr_info("Retrying again to check for CPU kill\n");

		pr_debug("Retrying again to check for CPU kill\n");

	}



	pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n",

drivers/irqchip/irq-gic-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static int gic_populate_rdist(void) 
			typer = readq_relaxed(ptr + GICR_TYPER);

			if ((typer >> 32) == aff) {

				gic_data_rdist_rd_base() = ptr;

				pr_info("CPU%d: found redistributor %llx @%p\n",

				pr_debug("CPU%d: found redistributor %llx @%p\n",

					smp_processor_id(),

					(unsigned long long)mpidr, ptr);

				return 0;