Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (06a81c1c) · Commits · 戴 / test

arch/arm64/include/asm/fixmap.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -28,10 +28,9 @@
		* compile time, but to set the physical address only
		* in the boot process.
		*
		* These 'compile-time allocated' memory buffers are
		* page-sized. Use set_fixmap(idx,phys) to associate
		* physical memory with fixmap indices.
		*
		* Each enum increment in these 'compile-time allocated'
		* memory buffers is page-sized. Use set_fixmap(idx,phys)
		* to associate physical memory with a fixmap index.
		*/
		enum fixed_addresses {
		FIX_HOLE,

+6 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,12 @@ DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
		* Logical CPU mapping.
		*/
		extern u64 __cpu_logical_map[NR_CPUS];
		#define cpu_logical_map(cpu) __cpu_logical_map[cpu]
		extern u64 cpu_logical_map(int cpu);

		static inline void set_cpu_logical_map(int cpu, u64 hwid)
		{
		__cpu_logical_map[cpu] = hwid;
		}

		struct seq_file;

+7 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ u64 __cacheline_aligned boot_args[4];
		void __init smp_setup_processor_id(void)
		{
		u64 mpidr = read_cpuid_mpidr() & MPIDR_HWID_BITMASK;
		cpu_logical_map(0) = mpidr;
		set_cpu_logical_map(0, mpidr);

		/*
		* clear __my_cpu_offset on boot CPU to avoid hang caused by
		@@ -276,6 +276,12 @@ arch_initcall(reserve_memblock_reserved_regions);

		u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };

		u64 cpu_logical_map(int cpu)
		{
		return __cpu_logical_map[cpu];
		}
		EXPORT_SYMBOL_GPL(cpu_logical_map);

		void __init __no_sanitize_address setup_arch(char **cmdline_p)
		{
		init_mm.start_code = (unsigned long) _text;

+3 −3

Original line number	Diff line number	Diff line
		@@ -566,7 +566,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
		return;

		/* map the logical cpu id to cpu MPIDR */
		cpu_logical_map(cpu_count) = hwid;
		set_cpu_logical_map(cpu_count, hwid);

		cpu_madt_gicc[cpu_count] = *processor;

		@@ -680,7 +680,7 @@ static void __init of_parse_and_init_cpus(void)
		goto next;

		pr_debug("cpu logical map 0x%llx\n", hwid);
		cpu_logical_map(cpu_count) = hwid;
		set_cpu_logical_map(cpu_count, hwid);

		early_map_cpu_to_node(cpu_count, of_node_to_nid(dn));
		next:
		@@ -721,7 +721,7 @@ void __init smp_init_cpus(void)
		for (i = 1; i < nr_cpu_ids; i++) {
		if (cpu_logical_map(i) != INVALID_HWID) {
		if (smp_cpu_setup(i))
		cpu_logical_map(i) = INVALID_HWID;
		set_cpu_logical_map(i, INVALID_HWID);
		}
		}
		}