Fix apparent cut-n-paste mistake in Dell reboot workaround.
This seems to have been copied from the Optiplex 990 entry above, but somoene forgot to change the ident text.
arch/x86/kernel/reboot.c +1 -1
@@ -360,7 +360,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, {/* Handle problems with rebooting on the Precision M6600. */ .callback = set_pci_reboot, - .ident = "Dell OptiPlex 990", + .ident = "Dell Precision M6600", .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
tip-bot for Dave Jones
merge bot[tip:x86/urgent] x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
Commit-ID: 7a20c2fad61aa3624e83c671d36dbd36b2661476 Gitweb: http://git.kernel.org/tip/7a20c2fad61aa3624e83c671d36dbd36b2661476 Author: Dave Jones <[email protected]> AuthorDate: Tue, 24 Sep 2013 20:13:44 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 25 Sep 2013 08:41:10 +0200
x86/reboot: Fix apparent cut-n-paste mistake in Dell reboot workaround
This seems to have been copied from the Optiplex 990 entry above, but somoene forgot to change the ident text.
--- arch/x86/kernel/reboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/reboot.c +1 -1
@@ -352,7 +352,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, {/* Handle problems with rebooting on the Precision M6600. */ .callback = set_pci_reboot, - .ident = "Dell OptiPlex 990", + .ident = "Dell Precision M6600", .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
H. Peter Anvin
reviewerQuoted 11 lines · Dave Jones
This seems to have been copied from the Optiplex 990 entry above, but somoene forgot to change the ident text.
Signed-off-by Dave Jones <[email protected]>arch/x86/kernel/reboot.c +0
-0
arch/x86/kernel/reboot.c static struct dmi_system_id __initdata reboot_dmi_table[] = { · line 366
Quoted 8 lines
arch/x86/kernel/reboot.c +1
-1@@ -360,7 +360,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, {/* Handle problems with rebooting on the Precision M6600. */ .callback = set_pci_reboot, - .ident = "Dell OptiPlex 990", + .ident = "Dell Precision M6600", .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
It really is starting to feel like *ALL* Dell machines need reboot=pci?
-hpa
Quoted 6 lines · H. Peter Anvin
Quoted 5 lines · Dave Jones
This seems to have been copied from the Optiplex 990 entry above, but somoene forgot to change the ident text.
Signed-off-by Dave Jones <[email protected]>
Quoted 16 lines
Quoted 6 lines
arch/x86/kernel/reboot.c +0
-0arch/x86/kernel/reboot.c static struct dmi_system_id __initdata reboot_dmi_table[] = { · line 366
Quoted 8 lines
arch/x86/kernel/reboot.c +1
-1@@ -360,7 +360,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, {/* Handle problems with rebooting on the Precision M6600. */ .callback = set_pci_reboot, - .ident = "Dell OptiPlex 990", + .ident = "Dell Precision M6600", .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),It really is starting to feel like *ALL* Dell machines need reboot=pci?
Either that or 'bios'. The question I have is, of those marked 'bios', does =pci work too ? If we knew that was true, I'd probably say yes.
Dave
H. Peter Anvin
reviewerQuoted 4 lines · Dave Jones
Either that or 'bios'. The question I have is, of those marked 'bios', does =pci work too ? If we knew that was true, I'd probably say yes.
Who knows. reboot=bios used to only work on 32 bits until very recently.
-hpa
Quoted 2 lines · H. Peter Anvin
It really is starting to feel like *ALL* Dell machines need reboot=pci?
Now that ACPI is default, I'd be surprised if any of them do.
Signature · 1 line
Matthew Garrett | [email protected]
H. Peter Anvin
reviewerQuoted 6 lines · Matthew Garrett
Quoted 2 lines · H. Peter Anvin
It really is starting to feel like *ALL* Dell machines need reboot=pci?
Now that ACPI is default, I'd be surprised if any of them do.
Look at the stream of Dell machines we're still getting reboot bug reports for...
-hpa
Quoted 10 lines · H. Peter Anvin
Quoted 6 lines · Matthew Garrett
Quoted 2 lines · H. Peter Anvin
It really is starting to feel like *ALL* Dell machines need reboot=pci?
Now that ACPI is default, I'd be surprised if any of them do.
Look at the stream of Dell machines we're still getting reboot bug reports for...
Likely indicates that our ACPI reboot handling still isn't bug compatible with Windows. We'd do better fixing that than adding more DMI entries.
Signature · 1 line
Matthew Garrett | [email protected]
Quoted 9 lines · Matthew Garrett
Quoted 8 lines · H. Peter Anvin
Quoted 6 lines · Matthew Garrett
Quoted 2 lines · H. Peter Anvin
It really is starting to feel like *ALL* Dell machines need reboot=pci?
Now that ACPI is default, I'd be surprised if any of them do.
Quoted 6 lines
Quoted 2 lines
Look at the stream of Dell machines we're still getting reboot bug reports for...
Likely indicates that our ACPI reboot handling still isn't bug compatible with Windows. We'd do better fixing that than adding more DMI entries.
are these only with VTd enabled? I have some Dells that won't reboot with VTd turned on, I remember you though it was an acpi bug we couldn't do much with.
Dave.
H. Peter Anvin
reviewerQuoted 9 lines · Dave Airlie
Quoted 4 lines
Likely indicates that our ACPI reboot handling still isn't bug compatible with Windows. We'd do better fixing that than adding more DMI entries.
are these only with VTd enabled? I have some Dells that won't reboot with VTd turned on, I remember you though it was an acpi bug we couldn't do much with.
It would be very interesting to know what the heck the ACPI reset port is set to in these machines.
-hpa
Quoted 8 lines · Dave Airlie
Quoted 3 lines · Matthew Garrett
Likely indicates that our ACPI reboot handling still isn't bug compatible with Windows. We'd do better fixing that than adding more DMI entries.
are these only with VTd enabled? I have some Dells that won't reboot with VTd turned on, I remember you though it was an acpi bug we couldn't do much with.
Oh, that's true - the ACPI reboot vector on the Dell tables I have to hand appears to be via the keyboard controller, so there's probably some SMM involved. I don't know if the VTd thing is still a problem (David Woodhouse was looking into that at one point), but that would be a reasonable point to start from.
Signature · 1 line
Matthew Garrett | [email protected]