From patchwork Sat Jan 13 09:55:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Pei X-Patchwork-Id: 13518930 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2916512E7B for ; Sat, 13 Jan 2024 09:55:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=loongson.cn Received: from loongson.cn (unknown [111.9.175.10]) by gateway (Coremail) with SMTP id _____8AxSeooXqJlI8cEAA--.5313S3; Sat, 13 Jan 2024 17:55:52 +0800 (CST) Received: from localhost.localdomain (unknown [111.9.175.10]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Dx+4YOXqJlpoQYAA--.930S5; Sat, 13 Jan 2024 17:55:51 +0800 (CST) From: Huang Pei To: Thomas Bogendoerfer Cc: Bibo Mao , linux-mips@vger.kernel.org, Jiaxun Yang , Paul Burton , Li Xuefeng , Yang Tiezhu , Gao Juxin , Huacai Chen Subject: [PATCH 3/3] Revert "MIPS: Loongson64: Handle more memory types passed from firmware" Date: Sat, 13 Jan 2024 17:55:09 +0800 Message-Id: <20240113095509.178697-4-huangpei@loongson.cn> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240113095509.178697-1-huangpei@loongson.cn> References: <20240113095509.178697-1-huangpei@loongson.cn> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Dx+4YOXqJlpoQYAA--.930S5 X-CM-SenderInfo: xkxd0whshlqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoWxZr15WryDWFyDWw1kKw43CFX_yoWrtr13pr 1fAFyxKr4Yqr1xC3yxtry5WrWkZ3Z5C39rArWqvrnYqF1DCw1Iqr15tr40q34DAFWkX3ZF qrZ8ta18K3Z3K3gCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9jb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ Gr0_Gr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07AIYI kI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUtVWr XwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI4 8JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v26r1Y 6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7 AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE 2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcV C2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2Kfnx nUUI43ZEXa7IU8EeHDUUUUU== This reverts commit 264927e3538169fe2973a5732f03ea01b0f9f9e8. The SMBIOS memory reserved region(0xfffe000-0xfffe7ff) is not OWNED by kenel, here OWNED means the region is within the physical memory given to kernel by firmware as SYSTEM_RAM_{LOW,HIGH}. Since commit 61167ad5fecd("mm: pass nid to reserve_bootmem_region()), loongson64 booting failed with CONFIG_DEFERRED_STRUCT_PAGE_INIT like this: ---------------------------------------------------------------------- Call Trace: [] reserve_bootmem_region+0xa8/0x184 [] memblock_free_all+0x104/0x2a8 [] mem_init+0x84/0x94 [] mm_core_init+0xf8/0x308 [] start_kernel+0x43c/0x86c Code: 10400028 2402fff0 de420000 0203182b 14600022 64420070 00003025 24040003 ---[ end trace 0000000000000000 ]--- Kernel panic - not syncing: Attempted to kill the idle task! ---[ end Kernel panic - not syncing: Attempted to kill the idle task! ]--- ---------------------------------------------------------------------- This is another case of inappropriate usage of memblock_reserve --- .../include/asm/mach-loongson64/boot_param.h | 6 +-- arch/mips/loongson64/init.c | 42 +++++++------------ 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/arch/mips/include/asm/mach-loongson64/boot_param.h b/arch/mips/include/asm/mach-loongson64/boot_param.h index e007edd6b60a..c454ef734c45 100644 --- a/arch/mips/include/asm/mach-loongson64/boot_param.h +++ b/arch/mips/include/asm/mach-loongson64/boot_param.h @@ -14,11 +14,7 @@ #define ADAPTER_ROM 8 #define ACPI_TABLE 9 #define SMBIOS_TABLE 10 -#define UMA_VIDEO_RAM 11 -#define VUMA_VIDEO_RAM 12 -#define MAX_MEMORY_TYPE 13 - -#define MEM_SIZE_IS_IN_BYTES (1 << 31) +#define MAX_MEMORY_TYPE 11 #define LOONGSON3_BOOT_MEM_MAP_MAX 128 struct efi_memory_map_loongson { diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c index f25caa6aa9d3..d62262f93069 100644 --- a/arch/mips/loongson64/init.c +++ b/arch/mips/loongson64/init.c @@ -49,7 +49,8 @@ void virtual_early_config(void) void __init szmem(unsigned int node) { u32 i, mem_type; - phys_addr_t node_id, mem_start, mem_size; + static unsigned long num_physpages; + u64 node_id, node_psize, start_pfn, end_pfn, mem_start, mem_size; /* Otherwise come from DTB */ if (loongson_sysconf.fw_interface != LOONGSON_LEFI) @@ -63,38 +64,27 @@ void __init szmem(unsigned int node) mem_type = loongson_memmap->map[i].mem_type; mem_size = loongson_memmap->map[i].mem_size; - - /* 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; + mem_start = loongson_memmap->map[i].mem_start; switch (mem_type) { case SYSTEM_RAM_LOW: case SYSTEM_RAM_HIGH: - 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, + 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, MEMBLOCK_NONE); break; case SYSTEM_RAM_RESERVED: - 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); + 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); break; } }