Message ID | 1580875713-18252-1-git-send-email-yangtiezhu@loongson.cn (mailing list archive) |
---|---|
State | Mainlined |
Commit | 3da27a4eb8c214d692e024473415fe7d2e88e7d7 |
Headers | show |
Series | [v3,1/2] firmware: dmi: Add macro SMBIOS_ENTRY_POINT_SCAN_START | expand |
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
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.
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
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.
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;