linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
@ 2016-08-19  8:30 Chen Yu
  2016-08-24 14:17 ` Lukas Wunner
  2017-06-29 19:19 ` Bjorn Helgaas
  0 siblings, 2 replies; 9+ messages in thread
From: Chen Yu @ 2016-08-19  8:30 UTC (permalink / raw)
  To: linux-pci
  Cc: linux-kernel, Chen Yu, Bjorn Helgaas, Rafael J . Wysocki, Lukas Wunner

People reported that they can not do a poweroff nor a
suspend to ram on their Mac Pro 11. After some investigations
it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
mm windows to ([mem 0x7fa00000-0x7fbfffff] and
[mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
io resource 0x1804 becomes unaccessible immediately, where the
ACPI Sleep register is located, as a result neither poweroff(S5)
nor suspend to ram(S3) works.

As suggested by Bjorn, further testing shows that, there is an
unreported device may be (using) conflict with above aperture,
which brings unpredictable result such as the failure of accessing
the io port, which blocks the poweroff(S5). Besides if we reassign
the memory aperture to the other place, the poweroff works again.

As we do not find any resource declared in _CRS which contain above
memory aperture, and Mac OS does not use this pci bridge neither, we
choose a simple workaround to clear the hotplug flag(suggested by
Yinghai Lu), thus do not allocate any resource for this pci bridge,
and thereby no conflict anymore.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Chen Yu <yu.c.chen@intel.com>
---
 drivers/pci/quirks.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 37ff015..04bbdba 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2776,6 +2776,26 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
 
 /*
+ * Apple: Avoid programming the memory/io aperture of 00:1c.0
+ *
+ * BIOS does not declare any resource for 00:1c.0, but with
+ * hotplug flag set, thus the OS allocates:
+ * [mem 0x7fa00000 - 0x7fbfffff]
+ * [mem 0x7fc00000-0x7fdfffff 64bit pref]
+ * which is conflict with an unreported device, which
+ * causes unpredictable result such as accessing io port.
+ * So clear the hotplug flag to work around it.
+ */
+static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
+{
+	if (dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
+	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
+		dev->is_hotplug_bridge = 0;
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
+
+/*
  * This is a quirk for the Ricoh MMC controller found as a part of
  * some mulifunction chips.
 
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2016-08-19  8:30 [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11 Chen Yu
@ 2016-08-24 14:17 ` Lukas Wunner
  2016-09-02 16:25   ` Bjorn Helgaas
  2017-06-29 19:19 ` Bjorn Helgaas
  1 sibling, 1 reply; 9+ messages in thread
From: Lukas Wunner @ 2016-08-24 14:17 UTC (permalink / raw)
  To: Chen Yu; +Cc: linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki

On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> People reported that they can not do a poweroff nor a
> suspend to ram on their Mac Pro 11. After some investigations
> it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> io resource 0x1804 becomes unaccessible immediately, where the
> ACPI Sleep register is located, as a result neither poweroff(S5)
> nor suspend to ram(S3) works.

To provide a bit more context:

The root port in question (0000:00:1c.0) is not listed in the DSDT.
On macOS, only devices present in the ACPI namespace are incorporated
into the I/O Kit registry. Consequently macOS pretends that this root
port doesn't exist. It's not listed in the "ioreg -l" output and thus
no driver is attached to this device.

So what we're dealing with is sloppiness on the part of Apple:
Some engineer probably forgot to disable this unused root port
and they didn't notice it during testing because their OS ignores
such devices.

We could in principle achieve the same behaviour by adding a PCI
device only if it has an ACPI companion, perhaps quirk this only
to Macs. I'm not sure if that's the right thing to do though.
What if they hide devices from macOS but we want to access them
on Linux?

What's really odd is that changing *memory* windows affects
accessibility of *I/O ports*.

One theory would be that I/O ports are somehow mapped into memory.
The GPIO pins of Intel chipsets are usually accessible through
I/O ports, but I've recently looked at the DSDT of the newest
MacBook9,1 (2016) and it looks like they're now accessed through
SystemMemory instead of SystemIO. Perhaps someone at Intel knows
about these intricacies of their chipsets.

If I/O ports are indeed mapped into memory, we need to find a way
to identify and reserve that region. So while this patch seems
like a workable and sufficiently small fix, it might mask a larger
underlying issue. It's certainly a problem though that these
machines currently cannot power off or suspend.

FWIW, we have a somewhat similar issue with the Apple gmux
(a microcontroller built into dual GPU MacBook Pros). That chip
is attached to the LPC bus and accessed through I/O ports.
It turns out that once VGA IO is locked to the discrete GPU
using vgaarb, gmux' I/O ports suddenly become inaccessible.
Apparently its I/O ports are routed to the secondary PCI bus
to which the discrete GPU is connected, and no longer to the
root bus on which the LPC bridge resides. However gmux' I/O ports
are in the 0x700-0x7ff range, whereas the VGA registers are in
the 0x3b0-0x3bb and 0x3c0-0x3df range. So that's another oddity
of Intel chipsets with regards to I/O accessibility.

Best regards,

Lukas

> 
> As suggested by Bjorn, further testing shows that, there is an
> unreported device may be (using) conflict with above aperture,
> which brings unpredictable result such as the failure of accessing
> the io port, which blocks the poweroff(S5). Besides if we reassign
> the memory aperture to the other place, the poweroff works again.
> 
> As we do not find any resource declared in _CRS which contain above
> memory aperture, and Mac OS does not use this pci bridge neither, we
> choose a simple workaround to clear the hotplug flag(suggested by
> Yinghai Lu), thus do not allocate any resource for this pci bridge,
> and thereby no conflict anymore.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Rafael J. Wysocki <rafael@kernel.org>
> Cc: Lukas Wunner <lukas@wunner.de>
> Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> ---
>  drivers/pci/quirks.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 37ff015..04bbdba 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2776,6 +2776,26 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
>  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
>  
>  /*
> + * Apple: Avoid programming the memory/io aperture of 00:1c.0
> + *
> + * BIOS does not declare any resource for 00:1c.0, but with
> + * hotplug flag set, thus the OS allocates:
> + * [mem 0x7fa00000 - 0x7fbfffff]
> + * [mem 0x7fc00000-0x7fdfffff 64bit pref]
> + * which is conflict with an unreported device, which
> + * causes unpredictable result such as accessing io port.
> + * So clear the hotplug flag to work around it.
> + */
> +static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
> +{
> +	if (dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
> +	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
> +		dev->is_hotplug_bridge = 0;
> +}
> +
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
> +
> +/*
>   * This is a quirk for the Ricoh MMC controller found as a part of
>   * some mulifunction chips.
>  
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2016-08-24 14:17 ` Lukas Wunner
@ 2016-09-02 16:25   ` Bjorn Helgaas
  2016-09-05  4:01     ` Chen Yu
  0 siblings, 1 reply; 9+ messages in thread
From: Bjorn Helgaas @ 2016-09-02 16:25 UTC (permalink / raw)
  To: Lukas Wunner
  Cc: Chen Yu, linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki

On Wed, Aug 24, 2016 at 04:17:31PM +0200, Lukas Wunner wrote:
> On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> > People reported that they can not do a poweroff nor a
> > suspend to ram on their Mac Pro 11. After some investigations
> > it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> > mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> > [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> > io resource 0x1804 becomes unaccessible immediately, where the
> > ACPI Sleep register is located, as a result neither poweroff(S5)
> > nor suspend to ram(S3) works.
> 
> To provide a bit more context:
> 
> The root port in question (0000:00:1c.0) is not listed in the DSDT.
> On macOS, only devices present in the ACPI namespace are incorporated
> into the I/O Kit registry. Consequently macOS pretends that this root
> port doesn't exist. It's not listed in the "ioreg -l" output and thus
> no driver is attached to this device.
> 
> So what we're dealing with is sloppiness on the part of Apple:
> Some engineer probably forgot to disable this unused root port
> and they didn't notice it during testing because their OS ignores
> such devices.
> 
> We could in principle achieve the same behaviour by adding a PCI
> device only if it has an ACPI companion, perhaps quirk this only
> to Macs. I'm not sure if that's the right thing to do though.
> What if they hide devices from macOS but we want to access them
> on Linux?
> 
> What's really odd is that changing *memory* windows affects
> accessibility of *I/O ports*.
> 
> One theory would be that I/O ports are somehow mapped into memory.
> The GPIO pins of Intel chipsets are usually accessible through
> I/O ports, but I've recently looked at the DSDT of the newest
> MacBook9,1 (2016) and it looks like they're now accessed through
> SystemMemory instead of SystemIO. Perhaps someone at Intel knows
> about these intricacies of their chipsets.

Hey, look, Chen Yu works at Intel :)

This apparent connection between memory windows and I/O port
accessibility is indeed very concerning.

I know there are PCI host bridges with windows that translate CPU
memory accesses into PCI I/O port accesses.  If this is one of them,
and it has such a window enabled at the address we happened to choose
for the mem window, that would be a problem.

I assume this would be documented somewhere in the chipset datasheet.

> If I/O ports are indeed mapped into memory, we need to find a way
> to identify and reserve that region. So while this patch seems
> like a workable and sufficiently small fix, it might mask a larger
> underlying issue. It's certainly a problem though that these
> machines currently cannot power off or suspend.
> 
> FWIW, we have a somewhat similar issue with the Apple gmux
> (a microcontroller built into dual GPU MacBook Pros). That chip
> is attached to the LPC bus and accessed through I/O ports.
> It turns out that once VGA IO is locked to the discrete GPU
> using vgaarb, gmux' I/O ports suddenly become inaccessible.
> Apparently its I/O ports are routed to the secondary PCI bus
> to which the discrete GPU is connected, and no longer to the
> root bus on which the LPC bridge resides. However gmux' I/O ports
> are in the 0x700-0x7ff range, whereas the VGA registers are in
> the 0x3b0-0x3bb and 0x3c0-0x3df range. So that's another oddity
> of Intel chipsets with regards to I/O accessibility.
> 
> Best regards,
> 
> Lukas
> 
> > 
> > As suggested by Bjorn, further testing shows that, there is an
> > unreported device may be (using) conflict with above aperture,
> > which brings unpredictable result such as the failure of accessing
> > the io port, which blocks the poweroff(S5). Besides if we reassign
> > the memory aperture to the other place, the poweroff works again.
> > 
> > As we do not find any resource declared in _CRS which contain above
> > memory aperture, and Mac OS does not use this pci bridge neither, we
> > choose a simple workaround to clear the hotplug flag(suggested by
> > Yinghai Lu), thus do not allocate any resource for this pci bridge,
> > and thereby no conflict anymore.
> > 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Rafael J. Wysocki <rafael@kernel.org>
> > Cc: Lukas Wunner <lukas@wunner.de>
> > Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> > ---
> >  drivers/pci/quirks.c | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> > 
> > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > index 37ff015..04bbdba 100644
> > --- a/drivers/pci/quirks.c
> > +++ b/drivers/pci/quirks.c
> > @@ -2776,6 +2776,26 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
> >  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
> >  
> >  /*
> > + * Apple: Avoid programming the memory/io aperture of 00:1c.0
> > + *
> > + * BIOS does not declare any resource for 00:1c.0, but with
> > + * hotplug flag set, thus the OS allocates:
> > + * [mem 0x7fa00000 - 0x7fbfffff]
> > + * [mem 0x7fc00000-0x7fdfffff 64bit pref]
> > + * which is conflict with an unreported device, which
> > + * causes unpredictable result such as accessing io port.
> > + * So clear the hotplug flag to work around it.
> > + */
> > +static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
> > +{
> > +	if (dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
> > +	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
> > +		dev->is_hotplug_bridge = 0;
> > +}
> > +
> > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
> > +
> > +/*
> >   * This is a quirk for the Ricoh MMC controller found as a part of
> >   * some mulifunction chips.
> >  
> > -- 
> > 2.7.4
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2016-09-02 16:25   ` Bjorn Helgaas
@ 2016-09-05  4:01     ` Chen Yu
  2016-09-28 21:26       ` Bjorn Helgaas
  0 siblings, 1 reply; 9+ messages in thread
From: Chen Yu @ 2016-09-05  4:01 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: Lukas Wunner, linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki

On Fri, Sep 02, 2016 at 11:25:27AM -0500, Bjorn Helgaas wrote:
> On Wed, Aug 24, 2016 at 04:17:31PM +0200, Lukas Wunner wrote:
> > On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> > > People reported that they can not do a poweroff nor a
> > > suspend to ram on their Mac Pro 11. After some investigations
> > > it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> > > mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> > > [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> > > io resource 0x1804 becomes unaccessible immediately, where the
> > > ACPI Sleep register is located, as a result neither poweroff(S5)
> > > nor suspend to ram(S3) works.
> > 
> > To provide a bit more context:
> > 
> > The root port in question (0000:00:1c.0) is not listed in the DSDT.
> > On macOS, only devices present in the ACPI namespace are incorporated
> > into the I/O Kit registry. Consequently macOS pretends that this root
> > port doesn't exist. It's not listed in the "ioreg -l" output and thus
> > no driver is attached to this device.
> > 
> > So what we're dealing with is sloppiness on the part of Apple:
> > Some engineer probably forgot to disable this unused root port
> > and they didn't notice it during testing because their OS ignores
> > such devices.
> > 
> > We could in principle achieve the same behaviour by adding a PCI
> > device only if it has an ACPI companion, perhaps quirk this only
> > to Macs. I'm not sure if that's the right thing to do though.
> > What if they hide devices from macOS but we want to access them
> > on Linux?
> > 
> > What's really odd is that changing *memory* windows affects
> > accessibility of *I/O ports*.
> > 
> > One theory would be that I/O ports are somehow mapped into memory.
> > The GPIO pins of Intel chipsets are usually accessible through
> > I/O ports, but I've recently looked at the DSDT of the newest
> > MacBook9,1 (2016) and it looks like they're now accessed through
> > SystemMemory instead of SystemIO. Perhaps someone at Intel knows
> > about these intricacies of their chipsets.
> 
> Hey, look, Chen Yu works at Intel :)
>
Ah yes, please give me some time and I'll try to search for related info
and give feeback later.
> This apparent connection between memory windows and I/O port
> accessibility is indeed very concerning.
> 
> I know there are PCI host bridges with windows that translate CPU
> memory accesses into PCI I/O port accesses.  If this is one of them,
> and it has such a window enabled at the address we happened to choose
> for the mem window, that would be a problem.
> 
> I assume this would be documented somewhere in the chipset datasheet.
> 
> > If I/O ports are indeed mapped into memory, we need to find a way
> > to identify and reserve that region. So while this patch seems
> > like a workable and sufficiently small fix, it might mask a larger
> > underlying issue. It's certainly a problem though that these
> > machines currently cannot power off or suspend.
> > 
> > FWIW, we have a somewhat similar issue with the Apple gmux
> > (a microcontroller built into dual GPU MacBook Pros). That chip
> > is attached to the LPC bus and accessed through I/O ports.
> > It turns out that once VGA IO is locked to the discrete GPU
> > using vgaarb, gmux' I/O ports suddenly become inaccessible.
> > Apparently its I/O ports are routed to the secondary PCI bus
> > to which the discrete GPU is connected, and no longer to the
> > root bus on which the LPC bridge resides. However gmux' I/O ports
> > are in the 0x700-0x7ff range, whereas the VGA registers are in
> > the 0x3b0-0x3bb and 0x3c0-0x3df range. So that's another oddity
> > of Intel chipsets with regards to I/O accessibility.
> > 

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2016-09-05  4:01     ` Chen Yu
@ 2016-09-28 21:26       ` Bjorn Helgaas
  0 siblings, 0 replies; 9+ messages in thread
From: Bjorn Helgaas @ 2016-09-28 21:26 UTC (permalink / raw)
  To: Chen Yu
  Cc: Lukas Wunner, linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki

On Mon, Sep 05, 2016 at 12:01:21PM +0800, Chen Yu wrote:
> On Fri, Sep 02, 2016 at 11:25:27AM -0500, Bjorn Helgaas wrote:
> > On Wed, Aug 24, 2016 at 04:17:31PM +0200, Lukas Wunner wrote:
> > > On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> > > > People reported that they can not do a poweroff nor a
> > > > suspend to ram on their Mac Pro 11. After some investigations
> > > > it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> > > > mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> > > > [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> > > > io resource 0x1804 becomes unaccessible immediately, where the
> > > > ACPI Sleep register is located, as a result neither poweroff(S5)
> > > > nor suspend to ram(S3) works.
> > > 
> > > To provide a bit more context:
> > > 
> > > The root port in question (0000:00:1c.0) is not listed in the DSDT.
> > > On macOS, only devices present in the ACPI namespace are incorporated
> > > into the I/O Kit registry. Consequently macOS pretends that this root
> > > port doesn't exist. It's not listed in the "ioreg -l" output and thus
> > > no driver is attached to this device.
> > > 
> > > So what we're dealing with is sloppiness on the part of Apple:
> > > Some engineer probably forgot to disable this unused root port
> > > and they didn't notice it during testing because their OS ignores
> > > such devices.
> > > 
> > > We could in principle achieve the same behaviour by adding a PCI
> > > device only if it has an ACPI companion, perhaps quirk this only
> > > to Macs. I'm not sure if that's the right thing to do though.
> > > What if they hide devices from macOS but we want to access them
> > > on Linux?
> > > 
> > > What's really odd is that changing *memory* windows affects
> > > accessibility of *I/O ports*.
> > > 
> > > One theory would be that I/O ports are somehow mapped into memory.
> > > The GPIO pins of Intel chipsets are usually accessible through
> > > I/O ports, but I've recently looked at the DSDT of the newest
> > > MacBook9,1 (2016) and it looks like they're now accessed through
> > > SystemMemory instead of SystemIO. Perhaps someone at Intel knows
> > > about these intricacies of their chipsets.
> > 
> > Hey, look, Chen Yu works at Intel :)
> >
> Ah yes, please give me some time and I'll try to search for related info
> and give feeback later.

Any news on this?  I was really hoping to make some progress on
this for v4.9, but time is running out.

Bjorn

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2016-08-19  8:30 [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11 Chen Yu
  2016-08-24 14:17 ` Lukas Wunner
@ 2017-06-29 19:19 ` Bjorn Helgaas
  2017-06-30  2:39   ` Bjorn Helgaas
  1 sibling, 1 reply; 9+ messages in thread
From: Bjorn Helgaas @ 2017-06-29 19:19 UTC (permalink / raw)
  To: Chen Yu
  Cc: linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki, Lukas Wunner

On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> People reported that they can not do a poweroff nor a
> suspend to ram on their Mac Pro 11. After some investigations
> it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> io resource 0x1804 becomes unaccessible immediately, where the
> ACPI Sleep register is located, as a result neither poweroff(S5)
> nor suspend to ram(S3) works.
> 
> As suggested by Bjorn, further testing shows that, there is an
> unreported device may be (using) conflict with above aperture,
> which brings unpredictable result such as the failure of accessing
> the io port, which blocks the poweroff(S5). Besides if we reassign
> the memory aperture to the other place, the poweroff works again.
> 
> As we do not find any resource declared in _CRS which contain above
> memory aperture, and Mac OS does not use this pci bridge neither, we
> choose a simple workaround to clear the hotplug flag(suggested by
> Yinghai Lu), thus do not allocate any resource for this pci bridge,
> and thereby no conflict anymore.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Rafael J. Wysocki <rafael@kernel.org>
> Cc: Lukas Wunner <lukas@wunner.de>
> Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> ---
>  drivers/pci/quirks.c | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> index 37ff015..04bbdba 100644
> --- a/drivers/pci/quirks.c
> +++ b/drivers/pci/quirks.c
> @@ -2776,6 +2776,26 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
>  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
>  
>  /*
> + * Apple: Avoid programming the memory/io aperture of 00:1c.0
> + *
> + * BIOS does not declare any resource for 00:1c.0, but with
> + * hotplug flag set, thus the OS allocates:
> + * [mem 0x7fa00000 - 0x7fbfffff]
> + * [mem 0x7fc00000-0x7fdfffff 64bit pref]
> + * which is conflict with an unreported device, which
> + * causes unpredictable result such as accessing io port.
> + * So clear the hotplug flag to work around it.
> + */
> +static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
> +{
> +	if (dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
> +	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
> +		dev->is_hotplug_bridge = 0;
> +}
> +
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
> +
> +/*
>   * This is a quirk for the Ricoh MMC controller found as a part of

I give up.  We're not making any progress on this.  I propose the
following patch for v4.13.  This is slightly modified to:

  - move to arch/x86/pci/fixups.c, since I think this is specific to
    x86

  - only clear dev->is_hotplug_bridge for the 00:1c.0 bridge, since
    these systems contain other bridges where I think we *do* want to
    support hotplug, e.g., the Thunderbolt bridge at 09:00.0 (from
    https://bugzilla.kernel.org/attachment.cgi?id=210611)

  - log a note in dmesg about what we're doing

commit f7bf6baa11b84534d0b7f5ceee06e3349948c853
Author: Chen Yu <yu.c.chen@intel.com>
Date:   Fri Aug 19 16:30:25 2016 +0800

    PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
    
    Neither soft poweroff (transition to ACPI power state S5) nor
    suspend-to-RAM (transition to state S3) works on the Macbook Pro 11,4 and
    11,5.
    
    The problem is related to assigning the [mem 0x7fa00000-0x7fbfffff] space
    to the 00:1c.0 Root Port.  This port isn't connected to anything, but it
    advertises hotplug support in its PCIe Capability.  Initially it has no
    windows assigned, and if Linux leaves it that way, poweroff and
    suspend-to-RAM work fine.
    
    Since the port supports hotplug, Linux assigns windows for future hot-added
    devices.  We currently assign [mem 0x7fa00000-0x7fbfffff] for the memory
    window, and poweroff and suspend-to-RAM don't work after this assignment.
    
    Linux does a soft poweroff (transition to S5) by writing to PM1_CNT at
    [io 0x1804].  The theory about why this doesn't work is:
    
      - The write to PM1_CNT causes an SMI.
      - The BIOS SMI handler depends on something in [mem 0x7fa00000-0x7fbfffff].
      - When Linux assigns [mem 0x7fa00000-0x7fbfffff] to the 00:1c.0 Port, it
        covers up whatever the SMI handler uses, so the SMI handler no longer
        works correctly.
    
    Mark the 00:1c.0 bridge as not supporting hotplug, so we don't assign the
    [mem 0x7fa00000-0x7fbfffff] space to it.
    
    Note that we don't know what the real conflict is, so other use of this
    memory range by another device may cause similar problems.
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
    Signed-off-by: Chen Yu <yu.c.chen@intel.com>
    [bhelgaas: limit to device 00:1c.0, add printk, changelog, comment]
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Rafael J. Wysocki <rafael@kernel.org>
    Cc: Lukas Wunner <lukas@wunner.de>

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index 6d52b94f4bb9..e6b3bf9ecf81 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -571,3 +571,29 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, pci_invalid_bar);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_invalid_bar);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_invalid_bar);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_invalid_bar);
+
+/*
+ * Apple: Avoid programming the memory/io apertures of 00:1c.0
+ *
+ * The BIOS does not assign any windows to the 00:1c.0 Root Port, but the
+ * port advertises hotplug support in the PCIe Capability, so Linux assigns
+ *
+ *   [mem 0x7fa00000 - 0x7fbfffff]
+ *
+ * This assignment somehow causes a conflict with I/O port 0x1804, which is
+ * used for soft poweroff and suspend-to-RAM.  Clear the hotplug flag to
+ * keep Linux from assigning the window above.
+ *
+ * N.B. We don't know what the conflict is, so other use of this memory
+ * range by another device may cause similar problems.
+ */
+static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
+{
+	if ((dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
+	     dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5")) &&
+	    dev->bus->number == 0 && dev->devfn == PCI_DEVFN(0x1c, 0)) {
+		dev_info(&dev->dev, "treating as non-hotplug bridge to work around poweroff issue\n");
+		dev->is_hotplug_bridge = 0;
+	}
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2017-06-29 19:19 ` Bjorn Helgaas
@ 2017-06-30  2:39   ` Bjorn Helgaas
  2017-06-30  3:06     ` Chen Yu
  0 siblings, 1 reply; 9+ messages in thread
From: Bjorn Helgaas @ 2017-06-30  2:39 UTC (permalink / raw)
  To: Chen Yu
  Cc: linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki, Lukas Wunner

On Thu, Jun 29, 2017 at 02:19:26PM -0500, Bjorn Helgaas wrote:
> On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> > People reported that they can not do a poweroff nor a
> > suspend to ram on their Mac Pro 11. After some investigations
> > it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> > mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> > [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> > io resource 0x1804 becomes unaccessible immediately, where the
> > ACPI Sleep register is located, as a result neither poweroff(S5)
> > nor suspend to ram(S3) works.
> > 
> > As suggested by Bjorn, further testing shows that, there is an
> > unreported device may be (using) conflict with above aperture,
> > which brings unpredictable result such as the failure of accessing
> > the io port, which blocks the poweroff(S5). Besides if we reassign
> > the memory aperture to the other place, the poweroff works again.
> > 
> > As we do not find any resource declared in _CRS which contain above
> > memory aperture, and Mac OS does not use this pci bridge neither, we
> > choose a simple workaround to clear the hotplug flag(suggested by
> > Yinghai Lu), thus do not allocate any resource for this pci bridge,
> > and thereby no conflict anymore.
> > 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Rafael J. Wysocki <rafael@kernel.org>
> > Cc: Lukas Wunner <lukas@wunner.de>
> > Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> > ---
> >  drivers/pci/quirks.c | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> > 
> > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > index 37ff015..04bbdba 100644
> > --- a/drivers/pci/quirks.c
> > +++ b/drivers/pci/quirks.c
> > @@ -2776,6 +2776,26 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
> >  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
> >  
> >  /*
> > + * Apple: Avoid programming the memory/io aperture of 00:1c.0
> > + *
> > + * BIOS does not declare any resource for 00:1c.0, but with
> > + * hotplug flag set, thus the OS allocates:
> > + * [mem 0x7fa00000 - 0x7fbfffff]
> > + * [mem 0x7fc00000-0x7fdfffff 64bit pref]
> > + * which is conflict with an unreported device, which
> > + * causes unpredictable result such as accessing io port.
> > + * So clear the hotplug flag to work around it.
> > + */
> > +static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
> > +{
> > +	if (dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
> > +	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
> > +		dev->is_hotplug_bridge = 0;
> > +}
> > +
> > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
> > +
> > +/*
> >   * This is a quirk for the Ricoh MMC controller found as a part of
> 
> I give up.  We're not making any progress on this.  I propose the
> following patch for v4.13.  This is slightly modified to:
> 
>   - move to arch/x86/pci/fixups.c, since I think this is specific to
>     x86
> 
>   - only clear dev->is_hotplug_bridge for the 00:1c.0 bridge, since
>     these systems contain other bridges where I think we *do* want to
>     support hotplug, e.g., the Thunderbolt bridge at 09:00.0 (from
>     https://bugzilla.kernel.org/attachment.cgi?id=210611)
> 
>   - log a note in dmesg about what we're doing
> 
> commit f7bf6baa11b84534d0b7f5ceee06e3349948c853
> Author: Chen Yu <yu.c.chen@intel.com>
> Date:   Fri Aug 19 16:30:25 2016 +0800
> 
>     PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
>     
>     Neither soft poweroff (transition to ACPI power state S5) nor
>     suspend-to-RAM (transition to state S3) works on the Macbook Pro 11,4 and
>     11,5.
>     
>     The problem is related to assigning the [mem 0x7fa00000-0x7fbfffff] space
>     to the 00:1c.0 Root Port.  This port isn't connected to anything, but it
>     advertises hotplug support in its PCIe Capability.  Initially it has no
>     windows assigned, and if Linux leaves it that way, poweroff and
>     suspend-to-RAM work fine.
>     
>     Since the port supports hotplug, Linux assigns windows for future hot-added
>     devices.  We currently assign [mem 0x7fa00000-0x7fbfffff] for the memory
>     window, and poweroff and suspend-to-RAM don't work after this assignment.
>     
>     Linux does a soft poweroff (transition to S5) by writing to PM1_CNT at
>     [io 0x1804].  The theory about why this doesn't work is:
>     
>       - The write to PM1_CNT causes an SMI.
>       - The BIOS SMI handler depends on something in [mem 0x7fa00000-0x7fbfffff].
>       - When Linux assigns [mem 0x7fa00000-0x7fbfffff] to the 00:1c.0 Port, it
>         covers up whatever the SMI handler uses, so the SMI handler no longer
>         works correctly.
>     
>     Mark the 00:1c.0 bridge as not supporting hotplug, so we don't assign the
>     [mem 0x7fa00000-0x7fbfffff] space to it.
>     
>     Note that we don't know what the real conflict is, so other use of this
>     memory range by another device may cause similar problems.
>     
>     Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
>     Signed-off-by: Chen Yu <yu.c.chen@intel.com>
>     [bhelgaas: limit to device 00:1c.0, add printk, changelog, comment]
>     Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>     Cc: Rafael J. Wysocki <rafael@kernel.org>
>     Cc: Lukas Wunner <lukas@wunner.de>
> 
> diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
> index 6d52b94f4bb9..e6b3bf9ecf81 100644
> --- a/arch/x86/pci/fixup.c
> +++ b/arch/x86/pci/fixup.c
> @@ -571,3 +571,29 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, pci_invalid_bar);
>  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_invalid_bar);
>  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_invalid_bar);
>  DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_invalid_bar);
> +
> +/*
> + * Apple: Avoid programming the memory/io apertures of 00:1c.0
> + *
> + * The BIOS does not assign any windows to the 00:1c.0 Root Port, but the
> + * port advertises hotplug support in the PCIe Capability, so Linux assigns
> + *
> + *   [mem 0x7fa00000 - 0x7fbfffff]
> + *
> + * This assignment somehow causes a conflict with I/O port 0x1804, which is
> + * used for soft poweroff and suspend-to-RAM.  Clear the hotplug flag to
> + * keep Linux from assigning the window above.
> + *
> + * N.B. We don't know what the conflict is, so other use of this memory
> + * range by another device may cause similar problems.
> + */
> +static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
> +{
> +	if ((dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
> +	     dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5")) &&
> +	    dev->bus->number == 0 && dev->devfn == PCI_DEVFN(0x1c, 0)) {
> +		dev_info(&dev->dev, "treating as non-hotplug bridge to work around poweroff issue\n");
> +		dev->is_hotplug_bridge = 0;
> +	}
> +}
> +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);

This patch stinks, sorry.  I'll try again tomorrow.  The problem is
the address space, not the device, so we should be able to do better
than this.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2017-06-30  2:39   ` Bjorn Helgaas
@ 2017-06-30  3:06     ` Chen Yu
  2017-06-30 13:24       ` Bjorn Helgaas
  0 siblings, 1 reply; 9+ messages in thread
From: Chen Yu @ 2017-06-30  3:06 UTC (permalink / raw)
  To: Bjorn Helgaas
  Cc: linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki, Lukas Wunner

Hi Bjorn,
On Thu, Jun 29, 2017 at 09:39:31PM -0500, Bjorn Helgaas wrote:
> On Thu, Jun 29, 2017 at 02:19:26PM -0500, Bjorn Helgaas wrote:
> > On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> > > People reported that they can not do a poweroff nor a
> > > suspend to ram on their Mac Pro 11. After some investigations
> > > it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> > > mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> > > [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> > > io resource 0x1804 becomes unaccessible immediately, where the
> > > ACPI Sleep register is located, as a result neither poweroff(S5)
> > > nor suspend to ram(S3) works.
> > > 
> > > As suggested by Bjorn, further testing shows that, there is an
> > > unreported device may be (using) conflict with above aperture,
> > > which brings unpredictable result such as the failure of accessing
> > > the io port, which blocks the poweroff(S5). Besides if we reassign
> > > the memory aperture to the other place, the poweroff works again.
> > > 
> > > As we do not find any resource declared in _CRS which contain above
> > > memory aperture, and Mac OS does not use this pci bridge neither, we
> > > choose a simple workaround to clear the hotplug flag(suggested by
> > > Yinghai Lu), thus do not allocate any resource for this pci bridge,
> > > and thereby no conflict anymore.
> > > 
> > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> > > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > > Cc: Rafael J. Wysocki <rafael@kernel.org>
> > > Cc: Lukas Wunner <lukas@wunner.de>
> > > Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> > > ---
> > >  drivers/pci/quirks.c | 20 ++++++++++++++++++++
> > >  1 file changed, 20 insertions(+)
> > > 
> > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > > index 37ff015..04bbdba 100644
> > > --- a/drivers/pci/quirks.c
> > > +++ b/drivers/pci/quirks.c
> > > @@ -2776,6 +2776,26 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
> > >  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
> > >  
> > >  /*
> > > + * Apple: Avoid programming the memory/io aperture of 00:1c.0
> > > + *
> > > + * BIOS does not declare any resource for 00:1c.0, but with
> > > + * hotplug flag set, thus the OS allocates:
> > > + * [mem 0x7fa00000 - 0x7fbfffff]
> > > + * [mem 0x7fc00000-0x7fdfffff 64bit pref]
> > > + * which is conflict with an unreported device, which
> > > + * causes unpredictable result such as accessing io port.
> > > + * So clear the hotplug flag to work around it.
> > > + */
> > > +static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
> > > +{
> > > +	if (dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
> > > +	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
> > > +		dev->is_hotplug_bridge = 0;
> > > +}
> > > +
> > > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
> > > +
> > > +/*
> > >   * This is a quirk for the Ricoh MMC controller found as a part of
> > 
> > I give up.  We're not making any progress on this.  I propose the
> > following patch for v4.13.  This is slightly modified to:
> > 
> >   - move to arch/x86/pci/fixups.c, since I think this is specific to
> >     x86
> > 
> >   - only clear dev->is_hotplug_bridge for the 00:1c.0 bridge, since
> >     these systems contain other bridges where I think we *do* want to
> >     support hotplug, e.g., the Thunderbolt bridge at 09:00.0 (from
> >     https://bugzilla.kernel.org/attachment.cgi?id=210611)
> > 
> >   - log a note in dmesg about what we're doing
> > 
> > commit f7bf6baa11b84534d0b7f5ceee06e3349948c853
> > Author: Chen Yu <yu.c.chen@intel.com>
> > Date:   Fri Aug 19 16:30:25 2016 +0800
> > 
> >     PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
> >     
> >     Neither soft poweroff (transition to ACPI power state S5) nor
> >     suspend-to-RAM (transition to state S3) works on the Macbook Pro 11,4 and
> >     11,5.
> >     
> >     The problem is related to assigning the [mem 0x7fa00000-0x7fbfffff] space
> >     to the 00:1c.0 Root Port.  This port isn't connected to anything, but it
> >     advertises hotplug support in its PCIe Capability.  Initially it has no
> >     windows assigned, and if Linux leaves it that way, poweroff and
> >     suspend-to-RAM work fine.
> >     
> >     Since the port supports hotplug, Linux assigns windows for future hot-added
> >     devices.  We currently assign [mem 0x7fa00000-0x7fbfffff] for the memory
> >     window, and poweroff and suspend-to-RAM don't work after this assignment.
> >     
> >     Linux does a soft poweroff (transition to S5) by writing to PM1_CNT at
> >     [io 0x1804].  The theory about why this doesn't work is:
> >     
> >       - The write to PM1_CNT causes an SMI.
> >       - The BIOS SMI handler depends on something in [mem 0x7fa00000-0x7fbfffff].
> >       - When Linux assigns [mem 0x7fa00000-0x7fbfffff] to the 00:1c.0 Port, it
> >         covers up whatever the SMI handler uses, so the SMI handler no longer
> >         works correctly.
> >     
> >     Mark the 00:1c.0 bridge as not supporting hotplug, so we don't assign the
> >     [mem 0x7fa00000-0x7fbfffff] space to it.
> >     
> >     Note that we don't know what the real conflict is, so other use of this
> >     memory range by another device may cause similar problems.
> >     
> >     Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> >     Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> >     [bhelgaas: limit to device 00:1c.0, add printk, changelog, comment]
> >     Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> >     Cc: Rafael J. Wysocki <rafael@kernel.org>
> >     Cc: Lukas Wunner <lukas@wunner.de>
> > 
> 
> This patch stinks, sorry.  I'll try again tomorrow.  The problem is
> the address space, not the device, so we should be able to do better
> than this.
It is a quite old bug and thanks for taking care of this :-). Do you mean
reserve the [mem 0x7fa00000-0x7fbfffff] thus no one could allocate this region?

thanks,
Yu

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11
  2017-06-30  3:06     ` Chen Yu
@ 2017-06-30 13:24       ` Bjorn Helgaas
  0 siblings, 0 replies; 9+ messages in thread
From: Bjorn Helgaas @ 2017-06-30 13:24 UTC (permalink / raw)
  To: Chen Yu
  Cc: linux-pci, linux-kernel, Bjorn Helgaas, Rafael J . Wysocki, Lukas Wunner

On Fri, Jun 30, 2017 at 11:06:46AM +0800, Chen Yu wrote:
> Hi Bjorn,
> On Thu, Jun 29, 2017 at 09:39:31PM -0500, Bjorn Helgaas wrote:
> > On Thu, Jun 29, 2017 at 02:19:26PM -0500, Bjorn Helgaas wrote:
> > > On Fri, Aug 19, 2016 at 04:30:25PM +0800, Chen Yu wrote:
> > > > People reported that they can not do a poweroff nor a
> > > > suspend to ram on their Mac Pro 11. After some investigations
> > > > it was found that, once the PCI bridge 0000:00:1c.0 reassigns its
> > > > mm windows to ([mem 0x7fa00000-0x7fbfffff] and
> > > > [mem 0x7fc00000-0x7fdfffff 64bit pref]), the region of ACPI
> > > > io resource 0x1804 becomes unaccessible immediately, where the
> > > > ACPI Sleep register is located, as a result neither poweroff(S5)
> > > > nor suspend to ram(S3) works.
> > > > 
> > > > As suggested by Bjorn, further testing shows that, there is an
> > > > unreported device may be (using) conflict with above aperture,
> > > > which brings unpredictable result such as the failure of accessing
> > > > the io port, which blocks the poweroff(S5). Besides if we reassign
> > > > the memory aperture to the other place, the poweroff works again.
> > > > 
> > > > As we do not find any resource declared in _CRS which contain above
> > > > memory aperture, and Mac OS does not use this pci bridge neither, we
> > > > choose a simple workaround to clear the hotplug flag(suggested by
> > > > Yinghai Lu), thus do not allocate any resource for this pci bridge,
> > > > and thereby no conflict anymore.
> > > > 
> > > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> > > > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > > > Cc: Rafael J. Wysocki <rafael@kernel.org>
> > > > Cc: Lukas Wunner <lukas@wunner.de>
> > > > Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> > > > ---
> > > >  drivers/pci/quirks.c | 20 ++++++++++++++++++++
> > > >  1 file changed, 20 insertions(+)
> > > > 
> > > > diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
> > > > index 37ff015..04bbdba 100644
> > > > --- a/drivers/pci/quirks.c
> > > > +++ b/drivers/pci/quirks.c
> > > > @@ -2776,6 +2776,26 @@ static void quirk_hotplug_bridge(struct pci_dev *dev)
> > > >  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge);
> > > >  
> > > >  /*
> > > > + * Apple: Avoid programming the memory/io aperture of 00:1c.0
> > > > + *
> > > > + * BIOS does not declare any resource for 00:1c.0, but with
> > > > + * hotplug flag set, thus the OS allocates:
> > > > + * [mem 0x7fa00000 - 0x7fbfffff]
> > > > + * [mem 0x7fc00000-0x7fdfffff 64bit pref]
> > > > + * which is conflict with an unreported device, which
> > > > + * causes unpredictable result such as accessing io port.
> > > > + * So clear the hotplug flag to work around it.
> > > > + */
> > > > +static void quirk_apple_mbp_poweroff(struct pci_dev *dev)
> > > > +{
> > > > +	if (dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,4") ||
> > > > +	    dmi_match(DMI_PRODUCT_NAME, "MacBookPro11,5"))
> > > > +		dev->is_hotplug_bridge = 0;
> > > > +}
> > > > +
> > > > +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x8c10, quirk_apple_mbp_poweroff);
> > > > +
> > > > +/*
> > > >   * This is a quirk for the Ricoh MMC controller found as a part of
> > > 
> > > I give up.  We're not making any progress on this.  I propose the
> > > following patch for v4.13.  This is slightly modified to:
> > > 
> > >   - move to arch/x86/pci/fixups.c, since I think this is specific to
> > >     x86
> > > 
> > >   - only clear dev->is_hotplug_bridge for the 00:1c.0 bridge, since
> > >     these systems contain other bridges where I think we *do* want to
> > >     support hotplug, e.g., the Thunderbolt bridge at 09:00.0 (from
> > >     https://bugzilla.kernel.org/attachment.cgi?id=210611)
> > > 
> > >   - log a note in dmesg about what we're doing
> > > 
> > > commit f7bf6baa11b84534d0b7f5ceee06e3349948c853
> > > Author: Chen Yu <yu.c.chen@intel.com>
> > > Date:   Fri Aug 19 16:30:25 2016 +0800
> > > 
> > >     PCI: Work around poweroff & suspend-to-RAM issue on Macbook Pro 11
> > >     
> > >     Neither soft poweroff (transition to ACPI power state S5) nor
> > >     suspend-to-RAM (transition to state S3) works on the Macbook Pro 11,4 and
> > >     11,5.
> > >     
> > >     The problem is related to assigning the [mem 0x7fa00000-0x7fbfffff] space
> > >     to the 00:1c.0 Root Port.  This port isn't connected to anything, but it
> > >     advertises hotplug support in its PCIe Capability.  Initially it has no
> > >     windows assigned, and if Linux leaves it that way, poweroff and
> > >     suspend-to-RAM work fine.
> > >     
> > >     Since the port supports hotplug, Linux assigns windows for future hot-added
> > >     devices.  We currently assign [mem 0x7fa00000-0x7fbfffff] for the memory
> > >     window, and poweroff and suspend-to-RAM don't work after this assignment.
> > >     
> > >     Linux does a soft poweroff (transition to S5) by writing to PM1_CNT at
> > >     [io 0x1804].  The theory about why this doesn't work is:
> > >     
> > >       - The write to PM1_CNT causes an SMI.
> > >       - The BIOS SMI handler depends on something in [mem 0x7fa00000-0x7fbfffff].
> > >       - When Linux assigns [mem 0x7fa00000-0x7fbfffff] to the 00:1c.0 Port, it
> > >         covers up whatever the SMI handler uses, so the SMI handler no longer
> > >         works correctly.
> > >     
> > >     Mark the 00:1c.0 bridge as not supporting hotplug, so we don't assign the
> > >     [mem 0x7fa00000-0x7fbfffff] space to it.
> > >     
> > >     Note that we don't know what the real conflict is, so other use of this
> > >     memory range by another device may cause similar problems.
> > >     
> > >     Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=103211
> > >     Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> > >     [bhelgaas: limit to device 00:1c.0, add printk, changelog, comment]
> > >     Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> > >     Cc: Rafael J. Wysocki <rafael@kernel.org>
> > >     Cc: Lukas Wunner <lukas@wunner.de>
> > > 
> > 
> > This patch stinks, sorry.  I'll try again tomorrow.  The problem is
> > the address space, not the device, so we should be able to do better
> > than this.
> It is a quite old bug and thanks for taking care of this :-). Do you mean
> reserve the [mem 0x7fa00000-0x7fbfffff] thus no one could allocate this region?

Yes, exactly.  That seems like a more robust solution.  I can't
remember if we've tried that before or not.  Likely we could narrow
that down to a smaller region; I can't remember if we've done that,
either.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2017-06-30 13:24 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-19  8:30 [PATCH][RFC v3] PCI: Workaround to enable poweroff on Mac Pro 11 Chen Yu
2016-08-24 14:17 ` Lukas Wunner
2016-09-02 16:25   ` Bjorn Helgaas
2016-09-05  4:01     ` Chen Yu
2016-09-28 21:26       ` Bjorn Helgaas
2017-06-29 19:19 ` Bjorn Helgaas
2017-06-30  2:39   ` Bjorn Helgaas
2017-06-30  3:06     ` Chen Yu
2017-06-30 13:24       ` Bjorn Helgaas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).