Skip to contentSkip to conversation

Fix embedded nic order on Dell PowerEdge systems

PATCH Superseded Phil Oester 3 participants 6 messages Jun 8, 2011 – Jul 22, 2011

Subsystems (2)
x86 PCI
lore
Share & tools
lore

Phil Oester

author
#0 lore raw

PATCH 1/1 Fix embedded nic order on Dell PowerEdge systems

In commit 6e8af08dfa40b747002207d3ce8e8b43a050d99f ("PCI: enable pci=bfsort by default on future Dell systems"), the callback added was placed at the top of the list, before the specific PowerEdge models. This ends up breaking the more specific models listed, since the new callback handles all Dell systems but the older systems don't have the new 0xB1 smbios entry.

Fix this by placing the new check _after_ the more specific PowerEdge sytems.

Phil Oester

Signed-off-by Phil Oester <[email protected]>
arch/x86/pci/common.c +7 -7
index 5fe7502..92df322 100644
@@ -247,13 +247,6 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
 	},
 #endif		/* __i386__ */
 	{
-		.callback = find_sort_method,
-		.ident = "Dell System",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
-		},
-	},
-	{
 		.callback = set_bf_sort,
 		.ident = "Dell PowerEdge 1950",
 		.matches = {

@@ -294,6 +287,13 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = {
 		},
 	},
 	{
+		.callback = find_sort_method,
+		.ident = "Dell System",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+		},
+	},
+	{
 		.callback = set_bf_sort,
 		.ident = "HP ProLiant BL20p G3",
 		.matches = {
#1 lore raw
Quoted 55 lines

-----Original Message-----
From: Phil Oester [mailto:[email protected]]
Sent: Thursday, June 09, 2011 1:44 AM
To: [email protected]
Cc: K, Narendra; Hargrave, Jordan; [email protected]
Subject: [PATCH] Fix embedded nic order on Dell PowerEdge systems

    In commit 6e8af08dfa40b747002207d3ce8e8b43a050d99f ("PCI: enable

pci=bfsort
by default on future Dell systems"), the callback added was placed at the top of the list, before the specific PowerEdge models. This ends up breaking the more specific models listed, since the new callback handles all Dell systems but the older systems don't have the new 0xB1 smbios entry.

Fix this by placing the new check _after_ the more specific PowerEdge sytems.

Phil Oester

Signed-off-by Phil Oester <[email protected]>
arch/x86/pci/common.c index renamed from arch/x86/pci/common.c +0 -0

5fe7502..92df322 100644

arch/x86/pci/common.c +0 -7
@@ -247,13 +247,6 @@ static const struct dmi_system_id __devinitconst
 pciprobe_dmi_table[] = {
 	},
 #endif		/* __i386__ */
 	{
-		.callback = find_sort_method,
-		.ident = "Dell System",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
-		},
-	},
-	{
 		.callback = set_bf_sort,
 		.ident = "Dell PowerEdge 1950",
arch/x86/pci/common.c +7 -0
 		.matches = {

@@ -294,6 +287,13 @@ static const struct dmi_system_id __devinitconst
 pciprobe_dmi_table[] = {
 		},
 	},
 	{
+		.callback = find_sort_method,
+		.ident = "Dell System",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+		},
+	},
+	{
 		.callback = set_bf_sort,
 		.ident = "HP ProLiant BL20p G3",
Quoted 1 line

.matches = {

[>]

Hi, this issue is fixed and the fix is in Jesse's linux-next tree.

http://marc.info/?l=linux-pci&m=130108034729082 (x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems)

With regards,
Narendra K

author
#2 lore raw
Quoted 1 line · On Thu, Jun 09, 2011 at 01:03:00AM -0700, [email protected] wrote:

Hi, this issue is fixed and the fix is in Jesse's linux-next tree.

It would be great to get that in -stable.

Phil

author
#3 lore raw
In reply to [email protected]
Quoted 58 lines · On Thu, Jun 09, 2011 at 01:03:00AM -0700, [email protected] wrote:
Quoted 55 lines

-----Original Message-----
From: Phil Oester [mailto:[email protected]]
Sent: Thursday, June 09, 2011 1:44 AM
To: [email protected]
Cc: K, Narendra; Hargrave, Jordan; [email protected]
Subject: [PATCH] Fix embedded nic order on Dell PowerEdge systems

    In commit 6e8af08dfa40b747002207d3ce8e8b43a050d99f ("PCI: enable

pci=bfsort
by default on future Dell systems"), the callback added was placed at the top of the list, before the specific PowerEdge models. This ends up breaking the more specific models listed, since the new callback handles all Dell systems but the older systems don't have the new 0xB1 smbios entry.

Fix this by placing the new check _after_ the more specific PowerEdge sytems.

Phil Oester

Signed-off-by Phil Oester <[email protected]>
arch/x86/pci/common.c index renamed from arch/x86/pci/common.c +0 -0

5fe7502..92df322 100644

arch/x86/pci/common.c +0 -7
@@ -247,13 +247,6 @@ static const struct dmi_system_id __devinitconst
 pciprobe_dmi_table[] = {
 	},
 #endif		/* __i386__ */
 	{
-		.callback = find_sort_method,
-		.ident = "Dell System",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
-		},
-	},
-	{
 		.callback = set_bf_sort,
 		.ident = "Dell PowerEdge 1950",
arch/x86/pci/common.c +7 -0
 		.matches = {

@@ -294,6 +287,13 @@ static const struct dmi_system_id __devinitconst
 pciprobe_dmi_table[] = {
 		},
 	},
 	{
+		.callback = find_sort_method,
+		.ident = "Dell System",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+		},
+	},
+	{
 		.callback = set_bf_sort,
 		.ident = "HP ProLiant BL20p G3",
Quoted 1 line

.matches = {

[>]

Quoted 6 lines

Hi, this issue is fixed and the fix is in Jesse's linux-next tree.

http://marc.info/?l=linux-pci&m=130108034729082 (x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems)

With regards,
Narendra K

This patch is still not included in 3.0.0-rc6, nor in any stable series. Some reason for this? And did Dell do any testing at all on existing hardware before submitting 6e8af08dfa4? Seems even a minor amount of testing should have shown this regression.

Given 3.0.0 is expected soon, perhaps this can be included? Jesse?

Phil

#4 lore raw
Quoted 77 lines

-----Original Message-----
From: Phil Oester [mailto:[email protected]]
Sent: Sunday, July 10, 2011 9:03 AM
To: K, Narendra
Cc: [email protected]; Hargrave, Jordan; [email protected]
Subject: Re: [PATCH] Fix embedded nic order on Dell PowerEdge systems

Quoted 10 lines · On Thu, Jun 09, 2011 at 01:03:00AM -0700, [email protected] wrote:
Quoted 10 lines

-----Original Message-----
From: Phil Oester [mailto:[email protected]]
Sent: Thursday, June 09, 2011 1:44 AM
To: [email protected]
Cc: K, Narendra; Hargrave, Jordan; [email protected]
Subject: [PATCH] Fix embedded nic order on Dell PowerEdge systems

    In commit 6e8af08dfa40b747002207d3ce8e8b43a050d99f ("PCI: enable

pci=bfsort
by default on future Dell systems"), the callback added was placed at

the

Quoted 2 lines
Quoted 2 lines

top of the list, before the specific PowerEdge models. This ends up breaking the more specific models listed, since the new callback

handles

Quoted 46 lines
Quoted 43 lines

all Dell systems but the older systems don't have the new 0xB1 smbios entry.

Fix this by placing the new check _after_ the more specific PowerEdge sytems.

Phil Oester

Signed-off-by Phil Oester <[email protected]>
arch/x86/pci/common.c index renamed from arch/x86/pci/common.c +0 -0

5fe7502..92df322 100644

arch/x86/pci/common.c +0 -7
@@ -247,13 +247,6 @@ static const struct dmi_system_id
 __devinitconst pciprobe_dmi_table[] = {
 	},
 #endif		/* __i386__ */
 	{
-		.callback = find_sort_method,
-		.ident = "Dell System",
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
-		},
-	},
-	{
 		.callback = set_bf_sort,
 		.ident = "Dell PowerEdge 1950",
arch/x86/pci/common.c +7 -0
 		.matches = {

@@ -294,6 +287,13 @@ static const struct dmi_system_id
 __devinitconst pciprobe_dmi_table[] = {
 		},
 	},
 	{
+		.callback = find_sort_method,
+		.ident = "Dell System",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
+		},
+	},
+	{
 		.callback = set_bf_sort,
 		.ident = "HP ProLiant BL20p G3",
Quoted 1 line

.matches = {

[>]

Quoted 7 lines

Hi, this issue is fixed and the fix is in Jesse's linux-next tree.

http://marc.info/?l=linux-pci&m=130108034729082 (x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems)

With regards,
Narendra K

Quoted 7 lines

This patch is still not included in 3.0.0-rc6, nor in any stable series. Some reason for this? And did Dell do any testing at all on existing hardware before submitting 6e8af08dfa4? Seems even a minor amount of testing should have shown this regression.

Given 3.0.0 is expected soon, perhaps this can be included? Jesse?

Hi, I think for the patch to be included into stable, it needs to be in the mainline. Hi Jesse, please consider queuing this patch for mainline.

With regards,
Narendra K

#5 lore raw
Quoted 10 lines · On Mon, 11 Jul 2011 17:52:01 +0530 <[email protected]> wrote:
Quoted 7 lines

This patch is still not included in 3.0.0-rc6, nor in any stable series. Some reason for this? And did Dell do any testing at all on existing hardware before submitting 6e8af08dfa4? Seems even a minor amount of testing should have shown this regression.

Given 3.0.0 is expected soon, perhaps this can be included? Jesse?

Hi, I think for the patch to be included into stable, it needs to be in the mainline. Hi Jesse, please consider queuing this patch for mainline.

Ouch, I was sure I had this queued a long time ago but somehow it got dropped. Anyway it's queued now and will appear in 3.1.

Thanks,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center