Skip to contentSkip to conversation

add default mode CONFIG_EDD_OFF=n, override with edd={on,off}

PATCH In review Matt Domsch 3 participants 3 messages Feb 22, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 add default mode CONFIG_EDD_OFF=n, override with edd={on,off}

Andrew, please add to -mm and forward during the the 2.6.27 merge window.

Thanks,
Matt

Signature · 3 lines
Matt Domsch
Linux Technology Strategist, Dell Office of the CTO
linux.dell.com & www.dell.com/linux
Quoted 1 line

From 5c8fa0705c7f55ec5ae1b7da874029fe2000c595 Mon Sep 17 00:00:00 2001

From: Tim Gardner <[email protected]>
Date: Fri, 22 Feb 2008 06:59:39 -0700
Subject: [PATCH] add default mode CONFIG_EDD_OFF=n, override with edd={on,off}

UBUNTU: Implemented default EDD control
OriginalAuthor: Tim Gardner <[email protected]>

Add a kernel parameter option to 'edd' to enable/disable BIOS Enhanced Disk Drive Services. CONFIG_EDD_OFF disables EDD while still compiling EDD into the kernel. Default behavior can be forced using 'edd=on' or 'edd=off' as a kernel parameter.

---
 Documentation/kernel-parameters.txt |    3 +--
 arch/x86/boot/edd.c                 |   10 +++++++++-
 drivers/firmware/Kconfig            |    9 +++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
Documentation/kernel-parameters.txt +1 -2
index 9a5b665..3e6f0f5 100644
@@ -625,8 +625,7 @@ and is between 256 and 4096 characters. It is defined in the file
 	eata=		[HW,SCSI]
 
 	edd=		[EDD]
-			Format: {"of[f]" | "sk[ipmbr]"}
-			See comment in arch/i386/boot/edd.S
+			Format: {"off" | "on" | "sk[ipmbr]"}
 
 	eisa_irq_edge=	[PARISC,HW]
 			See header of drivers/parisc/eisa.c.
arch/x86/boot/edd.c +9 -1
index 8721dc4..4191805 100644
@@ -128,17 +128,25 @@ void query_edd(void)
 {
 	char eddarg[8];
 	int do_mbr = 1;
+#ifdef CONFIG_EDD_OFF
+	int do_edd = 0;
+#else
 	int do_edd = 1;
+#endif
 	int be_quiet;
 	int devno;
 	struct edd_info ei, *edp;
 	u32 *mbrptr;
 
 	if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {
-		if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip"))
+		if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) {
+			do_edd = 1;
 			do_mbr = 0;
+		}
 		else if (!strcmp(eddarg, "off"))
 			do_edd = 0;
+		else if (!strcmp(eddarg, "on"))
+			do_edd = 1;
 	}
 
 	be_quiet = cmdline_find_option_bool("quiet");
drivers/firmware/Kconfig +9 -0
index 05f02a3..c28e33f 100644
@@ -17,6 +17,15 @@ config EDD
           obscure configurations. Most disk controller BIOS vendors do
           not yet implement this feature.
 
+config EDD_OFF
+	bool "Sets default behavior for EDD detection to off"
+	depends on EDD
+	default n
+	help
+	  Say Y if you want EDD disabled by default, even though it is compiled into the
+	  kernel. Say N if you want EDD enabled by default. EDD can be dynamically set
+	  using the kernel parameter 'edd={on|skipmbr|off}'.
+
 config EFI_VARS
 	tristate "EFI Variable Support via sysfs"
 	depends on EFI
Signature · 1 line
1.5.4.1
#1 lore raw
Quoted 10 lines · On Fri, 22 Feb 2008 10:22:52 -0600 Matt Domsch wrote:
 Documentation/kernel-parameters.txt |    3 +--
 arch/x86/boot/edd.c                 |   10 +++++++++-
 drivers/firmware/Kconfig            |    9 +++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
Documentation/kernel-parameters.txt +0 -0
index 9a5b665..3e6f0f5 100644

Documentation/kernel-parameters.txt and is between 256 and 4096 characters. It is defined in the file · line 628

Quoted 6 lines
Documentation/kernel-parameters.txt +1 -2
@@ -625,8 +625,7 @@ and is between 256 and 4096 characters. It is defined in the file
 	eata=		[HW,SCSI]
 
 	edd=		[EDD]
-			Format: {"of[f]" | "sk[ipmbr]"}
-			See comment in arch/i386/boot/edd.S
+			Format: {"off" | "on" | "sk[ipmbr]"}

Where is "sk" valid (parsed) as a value for "edd="? I see "skip" or "skipmbr"....
or is that just a typo, should be "skip[mbr]"?

Quoted 43 lines
Documentation/kernel-parameters.txt +0 -0
 	eisa_irq_edge=	[PARISC,HW]
 			See header of drivers/parisc/eisa.c.
arch/x86/boot/edd.c +9 -1
index 8721dc4..4191805 100644
@@ -128,17 +128,25 @@ void query_edd(void)
 {
 	char eddarg[8];
 	int do_mbr = 1;
+#ifdef CONFIG_EDD_OFF
+	int do_edd = 0;
+#else
 	int do_edd = 1;
+#endif
 	int be_quiet;
 	int devno;
 	struct edd_info ei, *edp;
 	u32 *mbrptr;
 
 	if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {
-		if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip"))
+		if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) {
+			do_edd = 1;
 			do_mbr = 0;
+		}
 		else if (!strcmp(eddarg, "off"))
 			do_edd = 0;
+		else if (!strcmp(eddarg, "on"))
+			do_edd = 1;
 	}
 
 	be_quiet = cmdline_find_option_bool("quiet");
drivers/firmware/Kconfig +2 -0
index 05f02a3..c28e33f 100644
@@ -17,6 +17,15 @@ config EDD
           obscure configurations. Most disk controller BIOS vendors do
           not yet implement this feature.
 
+config EDD_OFF
+	bool "Sets default behavior for EDD detection to off"

drivers/firmware/Kconfig config EDD · line 31

Quoted 10 lines
drivers/firmware/Kconfig +7 -0
+	depends on EDD
+	default n
+	help
+	  Say Y if you want EDD disabled by default, even though it is compiled into the
+	  kernel. Say N if you want EDD enabled by default. EDD can be dynamically set
+	  using the kernel parameter 'edd={on|skipmbr|off}'.
+
 config EFI_VARS
 	tristate "EFI Variable Support via sysfs"
 	depends on EFI

---
~Randy

#2 lore raw
Quoted 5 lines · Randy Dunlap

Where is "sk" valid (parsed) as a value for "edd="? I see "skip" or "skipmbr"....
or is that just a typo, should be "skip[mbr]"?

It used to only parse the first two letters; we now have a proper command-line parser.

-hpa