* [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START @ 2020-02-05 4:08 Tiezhu Yang 2020-02-05 4:08 ` [PATCH v3 2/2] MIPS: Add support for Desktop Management Interface (DMI) Tiezhu Yang 2020-02-20 2:43 ` [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START Tiezhu Yang 0 siblings, 2 replies; 7+ messages in thread From: Tiezhu Yang @ 2020-02-05 4:08 UTC (permalink / raw) To: Paul Burton, Ralf Baechle, Jean Delvare, Jean Delvare Cc: Huacai Chen, Xuefeng Li, linux-mips, linux-kernel Use SMBIOS_ENTRY_POINT_SCAN_START instead of 0xF0000, because other archtecture maybe use a special start address such as 0xFFFE000 for Loongson platform. Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Reviewed-by: Jean Delvare <jdelvare@suse.de> --- v3: - split the v2 patch into two patches - make MIPS DMI config depend on MACH_LOONGSON64 v2: - add SMBIOS_ENTRY_POINT_SCAN_START suggested by Jean - refine definitions and Kconfig by Jiaxun drivers/firmware/dmi_scan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 2045566..f59163c 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -11,6 +11,10 @@ #include <asm/dmi.h> #include <asm/unaligned.h> +#ifndef SMBIOS_ENTRY_POINT_SCAN_START +#define SMBIOS_ENTRY_POINT_SCAN_START 0xF0000 +#endif + struct kobject *dmi_kobj; EXPORT_SYMBOL_GPL(dmi_kobj); @@ -663,7 +667,7 @@ static void __init dmi_scan_machine(void) return; } } else if (IS_ENABLED(CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK)) { - p = dmi_early_remap(0xF0000, 0x10000); + p = dmi_early_remap(SMBIOS_ENTRY_POINT_SCAN_START, 0x10000); if (p == NULL) goto error; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] MIPS: Add support for Desktop Management Interface (DMI) 2020-02-05 4:08 [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START Tiezhu Yang @ 2020-02-05 4:08 ` Tiezhu Yang 2020-02-20 2:53 ` Tiezhu Yang 2020-02-20 2:43 ` [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START Tiezhu Yang 1 sibling, 1 reply; 7+ messages in thread From: Tiezhu Yang @ 2020-02-05 4:08 UTC (permalink / raw) To: Paul Burton, Ralf Baechle, Jean Delvare, Jean Delvare Cc: Huacai Chen, Xuefeng Li, linux-mips, linux-kernel, Yinglu Yang, Jiaxun Yang Enable DMI scanning on the MIPS architecture, this setups DMI identifiers (dmi_system_id) for printing it out on task dumps and prepares DIMM entry information (dmi_memdev_info) from the SMBIOS table. With this patch, the driver can easily match various of mainboards. In the SMBIOS reference specification, the table anchor string "_SM_" is present in the address range 0xF0000 to 0xFFFFF on a 16-byte boundary, but there exists a special case for Loongson platform, when call function dmi_early_remap, it should specify the start address to 0xFFFE000 due to it is reserved for SMBIOS and can be normally access in the BIOS. This patch works fine on the Loongson 3A3000 platform which belongs to MIPS architecture and has no influence on the other architectures such as x86 and ARM. Additionally, in order to avoid the unknown risks on the mips platform which is not MACH_LOONGSON64, the DMI config is better to depend on MACH_LOONGSON64. If other mips platform also needs this DMI feature in the future, the "depends on" condition can be modified. Co-developed-by: Yinglu Yang <yangyinglu@loongson.cn> Signed-off-by: Yinglu Yang <yangyinglu@loongson.cn> [jiaxun.yang@flygoat.com: Refine definitions and Kconfig] Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Reviewed-by: Huacai Chen <chenhc@lemote.com> --- v3: - split the v2 patch into two patches - make MIPS DMI config depend on MACH_LOONGSON64 v2: - add SMBIOS_ENTRY_POINT_SCAN_START suggested by Jean - refine definitions and Kconfig by Jiaxun arch/mips/Kconfig | 11 +++++++++++ arch/mips/include/asm/dmi.h | 20 ++++++++++++++++++++ arch/mips/kernel/setup.c | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 arch/mips/include/asm/dmi.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 08b6f34..d84cb32 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -2758,6 +2758,17 @@ config HW_PERF_EVENTS Enable hardware performance counter support for perf events. If disabled, perf events will use software events only. +config DMI + bool "Enable DMI scanning" + depends on MACH_LOONGSON64 + select DMI_SCAN_MACHINE_NON_EFI_FALLBACK + default y + help + Enabled scanning of DMI to identify machine quirks. Say Y + here unless you have verified that your setup is not + affected by entries in the DMI blacklist. Required by PNP + BIOS code. + config SMP bool "Multi-Processing support" depends on SYS_SUPPORTS_SMP diff --git a/arch/mips/include/asm/dmi.h b/arch/mips/include/asm/dmi.h new file mode 100644 index 0000000..27415a2 --- /dev/null +++ b/arch/mips/include/asm/dmi.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_DMI_H +#define _ASM_DMI_H + +#include <linux/io.h> +#include <linux/memblock.h> + +#define dmi_early_remap(x, l) ioremap_cache(x, l) +#define dmi_early_unmap(x, l) iounmap(x) +#define dmi_remap(x, l) ioremap_cache(x, l) +#define dmi_unmap(x) iounmap(x) + +/* MIPS initialize DMI scan before SLAB is ready, so we use memblock here */ +#define dmi_alloc(l) memblock_alloc_low(l, PAGE_SIZE) + +#if defined(CONFIG_MACH_LOONGSON64) +#define SMBIOS_ENTRY_POINT_SCAN_START 0xFFFE000 +#endif + +#endif /* _ASM_DMI_H */ diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 701f4bc..d9bd841 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -28,6 +28,7 @@ #include <linux/decompress/generic.h> #include <linux/of_fdt.h> #include <linux/of_reserved_mem.h> +#include <linux/dmi.h> #include <asm/addrspace.h> #include <asm/bootinfo.h> @@ -800,6 +801,7 @@ void __init setup_arch(char **cmdline_p) #endif arch_mem_init(cmdline_p); + dmi_setup(); resource_init(); plat_smp_setup(); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] MIPS: Add support for Desktop Management Interface (DMI) 2020-02-05 4:08 ` [PATCH v3 2/2] MIPS: Add support for Desktop Management Interface (DMI) Tiezhu Yang @ 2020-02-20 2:53 ` Tiezhu Yang 0 siblings, 0 replies; 7+ messages in thread From: Tiezhu Yang @ 2020-02-20 2:53 UTC (permalink / raw) To: paulburton Cc: chenhc, jdelvare, jdelvare, jiaxun.yang, linux-kernel, linux-mips, lixuefeng, ralf, yangyinglu Hi Paul, Any questions or suggestions? Could you apply this patch to the MIPS tree? Thanks, Tiezhu Yang ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START 2020-02-05 4:08 [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START Tiezhu Yang 2020-02-05 4:08 ` [PATCH v3 2/2] MIPS: Add support for Desktop Management Interface (DMI) Tiezhu Yang @ 2020-02-20 2:43 ` Tiezhu Yang 2020-03-26 14:07 ` Jean Delvare 1 sibling, 1 reply; 7+ messages in thread From: Tiezhu Yang @ 2020-02-20 2:43 UTC (permalink / raw) To: jdelvare, jdelvare Cc: jiaxun.yang, chenhc, linux-kernel, linux-mips, lixuefeng, paulburton, ralf Hi Jean, Since this patch is independent and it has no any negative influence, could you apply it to your DMI tree first? Thanks, Tiezhu Yang ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START 2020-02-20 2:43 ` [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START Tiezhu Yang @ 2020-03-26 14:07 ` Jean Delvare 2020-03-27 1:21 ` Tiezhu Yang 0 siblings, 1 reply; 7+ messages in thread From: Jean Delvare @ 2020-03-26 14:07 UTC (permalink / raw) To: Tiezhu Yang Cc: jiaxun.yang, chenhc, linux-kernel, linux-mips, lixuefeng, paulburton, ralf Hi Tiezhu, On Thu, 20 Feb 2020 10:43:56 +0800, Tiezhu Yang wrote: > Since this patch is independent and it has no any negative influence, > could you apply it to your DMI tree first? I've just queued your patch for kernel 5.6. Thanks for your contribution and sorry for the delay. -- Jean Delvare SUSE L3 Support ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START 2020-03-26 14:07 ` Jean Delvare @ 2020-03-27 1:21 ` Tiezhu Yang 2020-03-27 9:21 ` Jean Delvare 0 siblings, 1 reply; 7+ messages in thread From: Tiezhu Yang @ 2020-03-27 1:21 UTC (permalink / raw) To: Jean Delvare Cc: jiaxun.yang, chenhc, linux-kernel, linux-mips, lixuefeng, paulburton, ralf, Thomas Bogendoerfer On 03/26/2020 10:07 PM, Jean Delvare wrote: > Hi Tiezhu, > > On Thu, 20 Feb 2020 10:43:56 +0800, Tiezhu Yang wrote: >> Since this patch is independent and it has no any negative influence, >> could you apply it to your DMI tree first? > I've just queued your patch for kernel 5.6. Thanks for your > contribution and sorry for the delay. > Hi Jean, Thank you very much, it has been merged into mips-next and linux-next tree by Thomas about three days ago, so you can drop it in your tree. https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/commit/?id=3da27a4eb8c214d692e024473415fe7d2e88e7d7 https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=3da27a4eb8c214d692e024473415fe7d2e88e7d7 Thanks, Tiezhu Yang ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START 2020-03-27 1:21 ` Tiezhu Yang @ 2020-03-27 9:21 ` Jean Delvare 0 siblings, 0 replies; 7+ messages in thread From: Jean Delvare @ 2020-03-27 9:21 UTC (permalink / raw) To: Tiezhu Yang Cc: jiaxun.yang, chenhc, linux-kernel, linux-mips, lixuefeng, paulburton, ralf, Thomas Bogendoerfer On Fri, 27 Mar 2020 09:21:17 +0800, Tiezhu Yang wrote: > On 03/26/2020 10:07 PM, Jean Delvare wrote: > > Hi Tiezhu, > > > > On Thu, 20 Feb 2020 10:43:56 +0800, Tiezhu Yang wrote: > >> Since this patch is independent and it has no any negative influence, > >> could you apply it to your DMI tree first? > > I've just queued your patch for kernel 5.6. Thanks for your > > contribution and sorry for the delay. > > > > Hi Jean, > > Thank you very much, it has been merged into > mips-next and linux-next tree by Thomas about > three days ago, so you can drop it in your tree. > > https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git/commit/?id=3da27a4eb8c214d692e024473415fe7d2e88e7d7 > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=3da27a4eb8c214d692e024473415fe7d2e88e7d7 OK, I removed it from my dmi tree to avoid conflicts. -- Jean Delvare SUSE L3 Support ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-03-27 9:21 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-02-05 4:08 [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START Tiezhu Yang 2020-02-05 4:08 ` [PATCH v3 2/2] MIPS: Add support for Desktop Management Interface (DMI) Tiezhu Yang 2020-02-20 2:53 ` Tiezhu Yang 2020-02-20 2:43 ` [PATCH v3 1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START Tiezhu Yang 2020-03-26 14:07 ` Jean Delvare 2020-03-27 1:21 ` Tiezhu Yang 2020-03-27 9:21 ` Jean Delvare
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).