Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758658AbcLBTyk (ORCPT ); Fri, 2 Dec 2016 14:54:40 -0500 Received: from mga11.intel.com ([192.55.52.93]:14706 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754987AbcLBTyV (ORCPT ); Fri, 2 Dec 2016 14:54:21 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,288,1477983600"; d="scan'208";a="1076733457" From: Andy Shevchenko To: Jean Delvare , linux-kernel@vger.kernel.org, Mika Westerberg Cc: Andy Shevchenko Subject: [PATCH v1 2/2] firmware: dmi_scan: Pass dmi_entry_point to kexec'ed kernel Date: Fri, 2 Dec 2016 21:54:16 +0200 Message-Id: <20161202195416.58953-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161202195416.58953-1-andriy.shevchenko@linux.intel.com> References: <20161202195416.58953-1-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1866 Lines: 56 Until now kexec'ed kernel has no clue where to look for DMI entry point. Pass it via kernel command line parameter in the same way as it's done for ACPI RSDP. Signed-off-by: Andy Shevchenko --- Documentation/admin-guide/kernel-parameters.txt | 5 +++++ drivers/firmware/dmi_scan.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index be2d6d0..94f219f 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -843,6 +843,11 @@ The filter can be disabled or changed to another driver later using sysfs. + dmi_entry_point= [DMI,EFI,KEXEC] + Pass the DMI entry point to the kernel, mostly used + on machines running EFI runtime service to boot the + second kernel for kdump. + drm_kms_helper.edid_firmware=[:][,[:]] Broken monitors, graphic adapters, KVMs and EDIDless panels may send no or incorrect EDID data sets. diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index b88def6..215843f 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -595,8 +595,22 @@ static int __init dmi_smbios3_present(const u8 *buf) return 1; } +#ifdef CONFIG_KEXEC +static unsigned long dmi_entry_point; +static int __init setup_dmi_entry_point(char *arg) +{ + return kstrtoul(arg, 16, &dmi_entry_point); +} +early_param("dmi_entry_point", setup_dmi_entry_point); +#endif + static resource_size_t __init dmi_get_entry_point(void) { +#ifdef CONFIG_KEXEC + if (dmi_entry_point) + return dmi_entry_point; +#endif + if (efi_enabled(EFI_CONFIG_TABLES)) { /* * According to the DMTF SMBIOS reference spec v3.0.0, it is -- 2.10.2