Commit 69ced6d7 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Zheng Zengkai
Browse files

MIPS: Loongson64: Handle more memory types passed from firmware 

stable inclusion
from stable-v6.6.7
commit 264927e3538169fe2973a5732f03ea01b0f9f9e8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8SSQ4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=264927e3538169fe2973a5732f03ea01b0f9f9e8



--------------------------------

commit c7206e7bd214ebb3ca6fa474a4423662327d9beb upstream.

There are many types of revsered memory passed from firmware
that should be reserved in memblock, and UMA memory passed
from firmware that should be added to system memory for system
to use.

Also for memblock there is no need to align those space into page,
which actually cause problems.

Handle them properly to prevent memory corruption on some systems.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 0170f469

arch/mips/include/asm/mach-loongson64/boot_param.h

+5 −1
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ 
#define ADAPTER_ROM		8

#define ACPI_TABLE		9

#define SMBIOS_TABLE		10

#define MAX_MEMORY_TYPE		11

#define UMA_VIDEO_RAM		11

#define VUMA_VIDEO_RAM		12

#define MAX_MEMORY_TYPE		13



#define MEM_SIZE_IS_IN_BYTES	(1 << 31)



#define LOONGSON3_BOOT_MEM_MAP_MAX 128

struct efi_memory_map_loongson {

arch/mips/loongson64/init.c

+26 −16
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ void virtual_early_config(void) 
void __init szmem(unsigned int node)

{

	u32 i, mem_type;

	static unsigned long num_physpages;

	u64 node_id, node_psize, start_pfn, end_pfn, mem_start, mem_size;

	phys_addr_t node_id, mem_start, mem_size;



	/* Otherwise come from DTB */

	if (loongson_sysconf.fw_interface != LOONGSON_LEFI)
@@ -64,27 +63,38 @@ void __init szmem(unsigned int node) 


		mem_type = loongson_memmap->map[i].mem_type;

		mem_size = loongson_memmap->map[i].mem_size;

		mem_start = loongson_memmap->map[i].mem_start;



		/* Memory size comes in MB if MEM_SIZE_IS_IN_BYTES not set */

		if (mem_size & MEM_SIZE_IS_IN_BYTES)

			mem_size &= ~MEM_SIZE_IS_IN_BYTES;

		else

			mem_size = mem_size << 20;



		mem_start = (node_id << 44) | loongson_memmap->map[i].mem_start;



		switch (mem_type) {

		case SYSTEM_RAM_LOW:

		case SYSTEM_RAM_HIGH:

			start_pfn = ((node_id << 44) + mem_start) >> PAGE_SHIFT;

			node_psize = (mem_size << 20) >> PAGE_SHIFT;

			end_pfn  = start_pfn + node_psize;

			num_physpages += node_psize;

			pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",

				(u32)node_id, mem_type, mem_start, mem_size);

			pr_info("       start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n",

				start_pfn, end_pfn, num_physpages);

			memblock_add_node(PFN_PHYS(start_pfn),

					  PFN_PHYS(node_psize), node,

		case UMA_VIDEO_RAM:

			pr_info("Node %d, mem_type:%d\t[%pa], %pa bytes usable\n",

				(u32)node_id, mem_type, &mem_start, &mem_size);

			memblock_add_node(mem_start, mem_size, node,

					  MEMBLOCK_NONE);

			break;

		case SYSTEM_RAM_RESERVED:

			pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",

				(u32)node_id, mem_type, mem_start, mem_size);

			memblock_reserve(((node_id << 44) + mem_start), mem_size << 20);

		case VIDEO_ROM:

		case ADAPTER_ROM:

		case ACPI_TABLE:

		case SMBIOS_TABLE:

			pr_info("Node %d, mem_type:%d\t[%pa], %pa bytes reserved\n",

				(u32)node_id, mem_type, &mem_start, &mem_size);

			memblock_reserve(mem_start, mem_size);

			break;

		/* We should not reserve VUMA_VIDEO_RAM as it overlaps with MMIO */

		case VUMA_VIDEO_RAM:

		default:

			pr_info("Node %d, mem_type:%d\t[%pa], %pa bytes unhandled\n",

				(u32)node_id, mem_type, &mem_start, &mem_size);

			break;

		}

	}