Merge "arm64: Log the machine name string during boot up" (68b9d793) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm64/kernel/setup.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ unsigned int cold_boot;
		EXPORT_SYMBOL(cold_boot);

		static const char *cpu_name;
		static const char *machine_name;
		phys_addr_t __fdt_pointer __initdata;

		/*
		@@ -326,7 +327,11 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
		cpu_relax();
		}

		dump_stack_set_arch_desc("%s (DT)", of_flat_dt_get_machine_name());
		machine_name = of_flat_dt_get_machine_name();
		if (machine_name) {
		dump_stack_set_arch_desc("%s (DT)", machine_name);
		pr_info("Machine: %s\n", machine_name);
		}
		}

		/*
		@@ -511,6 +516,8 @@ static int c_show(struct seq_file m, void v)
		{
		int i, j;

		seq_printf(m, "Processor\t: %s rev %d (%s)\n",
		cpu_name, read_cpuid_id() & 15, ELF_PLATFORM);
		for_each_present_cpu(i) {
		struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
		u32 midr = cpuinfo->reg_midr;
		@@ -556,6 +563,11 @@ static int c_show(struct seq_file m, void v)
		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
		}

		if (!arch_read_hardware_id)
		seq_printf(m, "Hardware\t: %s\n", machine_name);
		else
		seq_printf(m, "Hardware\t: %s\n", arch_read_hardware_id());

		return 0;
		}