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]>
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index f6835d8..ea2aaca 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -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"),
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.
Signed-off-by: Dave Jones <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/reboot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 5f4ad27..e643e74 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -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"),
On 09/24/2013 07:13 PM, Dave Jones wrote:
> 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]>
>
> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
> index f6835d8..ea2aaca 100644
> --- a/arch/x86/kernel/reboot.c
> +++ b/arch/x86/kernel/reboot.c
> @@ -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
On Fri, Sep 27, 2013 at 03:16:49PM -0500, H. Peter Anvin wrote:
> On 09/24/2013 07:13 PM, Dave Jones wrote:
> > 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]>
> >
> > diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
> > index f6835d8..ea2aaca 100644
> > --- a/arch/x86/kernel/reboot.c
> > +++ b/arch/x86/kernel/reboot.c
> > @@ -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
On 09/27/2013 01:19 PM, Dave Jones wrote:
>
> 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
On Fri, Sep 27, 2013 at 03:16:49PM -0500, H. Peter Anvin wrote:
>
> 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.
--
Matthew Garrett | [email protected]
On 09/29/2013 07:57 PM, Matthew Garrett wrote:
> On Fri, Sep 27, 2013 at 03:16:49PM -0500, H. Peter Anvin wrote:
>>
>> 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
On Sun, Sep 29, 2013 at 07:58:10PM -0700, H. Peter Anvin wrote:
> On 09/29/2013 07:57 PM, Matthew Garrett wrote:
> > On Fri, Sep 27, 2013 at 03:16:49PM -0500, H. Peter Anvin wrote:
> >>
> >> 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.
--
Matthew Garrett | [email protected]
On Mon, Sep 30, 2013 at 1:06 PM, Matthew Garrett <[email protected]> wrote:
> On Sun, Sep 29, 2013 at 07:58:10PM -0700, H. Peter Anvin wrote:
>> On 09/29/2013 07:57 PM, Matthew Garrett wrote:
>> > On Fri, Sep 27, 2013 at 03:16:49PM -0500, H. Peter Anvin wrote:
>> >>
>> >> 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.
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.
On 09/29/2013 08:15 PM, Dave Airlie wrote:
>>
>> 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
On Mon, Sep 30, 2013 at 01:15:02PM +1000, Dave Airlie wrote:
> On Mon, Sep 30, 2013 at 1:06 PM, Matthew Garrett <[email protected]> wrote:
> > 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.
--
Matthew Garrett | [email protected]