| Message ID | 20210430124224.6383-1-wsj20369@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | Revert "ACPI: power: Turn off unused power resources unconditionally" | expand |
On Fri, Apr 30, 2021 at 3:31 PM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Fri, Apr 30, 2021 at 2:43 PM Shujun Wang <wsj20369@163.com> wrote: > > > > This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. > > OK, I'll revert that commit, thanks! That said I'm assuming that this patch: https://patchwork.kernel.org/project/linux-pm/patch/3219454.74lMxhSOWB@kreacher/ is present in the kernel that you have tested.
Hi, Shujun, I'm experiencing similar problem, and it should be a BIOS problem, which can be fixed by a customized DSDT. Can you please attach the full acpidump output on this machine? I just want to make sure if it is the same problem. Thanks, rui > -----Original Message----- > From: Shujun Wang <wsj20369@163.com> > Sent: Friday, April 30, 2021 8:42 PM > To: rjw@rjwysocki.net; lenb@kernel.org; linux-acpi@vger.kernel.org; linux- > kernel@vger.kernel.org > Cc: Shujun Wang <wsj20369@163.com> > Subject: [PATCH] Revert "ACPI: power: Turn off unused power resources > unconditionally" > > This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. > It may cause some NVMe device probes to fail, and the system may get stuck > when using an NVMe device as the root filesystem. > > In the function nvme_pci_enable(struct nvme_dev *dev), as shown below, > readl(NVME_REG_CSTS) always returns -1 with the commit, which results in > the probe failed. > > if (readl(dev->bar + NVME_REG_CSTS) == -1) { > result = -ENODEV; > goto disable; > } > > dmesg: > [ 1.106280] nvme 0000:04:00.0: platform quirk: setting simple suspend > [ 1.109111] nvme nvme0: pci function 0000:04:00.0 > [ 1.113066] nvme 0000:04:00.0: enabling device (0000 -> 0002) > [ 1.121040] nvme nvme0: Removing after probe failure status: -19 > > lspci: > Non-Volatile memory controller: KIOXIA Corporation Device 0001 > > device uevent: > DRIVER=nvme > PCI_CLASS=10802 > PCI_ID=1E0F:0001 > PCI_SUBSYS_ID=1E0F:0001 > PCI_SLOT_NAME=0000:04:00.0 > MODALIAS=pci:v00001E0Fd00000001sv00001E0Fsd00000001bc01sc08i02 > > This patch was tested in Lenovo Thinkpad X1. > > Signed-off-by: Shujun Wang <wsj20369@163.com> > --- > drivers/acpi/power.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index > 56102eaaa2da..8bf10abeb2e0 100644 > --- a/drivers/acpi/power.c > +++ b/drivers/acpi/power.c > @@ -1004,9 +1004,18 @@ void > acpi_turn_off_unused_power_resources(void) > mutex_lock(&power_resource_list_lock); > > list_for_each_entry_reverse(resource, &acpi_power_resource_list, > list_node) { > + int result, state; > + > mutex_lock(&resource->resource_lock); > > - if (!resource->ref_count) { > + result = acpi_power_get_state(resource->device.handle, > &state); > + if (result) { > + mutex_unlock(&resource->resource_lock); > + continue; > + } > + > + if (state == ACPI_POWER_RESOURCE_STATE_ON > + && !resource->ref_count) { > dev_info(&resource->device.dev, "Turning OFF\n"); > __acpi_power_off(resource); > } > -- > 2.25.1
On Mon, May 10, 2021 at 8:37 AM Zhang, Rui <rui.zhang@intel.com> wrote: > > Hi, Shujun, > > I'm experiencing similar problem, and it should be a BIOS problem, Right, and I confused things. Sorry about that. If commit 7e4fdeafa61f2b653f ("ACPI: power: Turn off unused power resources unconditionally") causes problems to happen, this means that the platform firmware implementation doesn't follow the ACPI specification. > which can be fixed by a customized DSDT. > Can you please attach the full acpidump output on this machine? I just want to make sure if it is the same problem. Yes, please. Rui, can you create a BZ for this please and can you both attach dmidecode output from the affected systems? I don't want to revert this commit completely, so the default behavior is spec-compliant, but there can be a DMI-based blacklist for systems having problems with it. > > -----Original Message----- > > From: Shujun Wang <wsj20369@163.com> > > Sent: Friday, April 30, 2021 8:42 PM > > To: rjw@rjwysocki.net; lenb@kernel.org; linux-acpi@vger.kernel.org; linux- > > kernel@vger.kernel.org > > Cc: Shujun Wang <wsj20369@163.com> > > Subject: [PATCH] Revert "ACPI: power: Turn off unused power resources > > unconditionally" > > > > This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. > > It may cause some NVMe device probes to fail, and the system may get stuck > > when using an NVMe device as the root filesystem. > > > > In the function nvme_pci_enable(struct nvme_dev *dev), as shown below, > > readl(NVME_REG_CSTS) always returns -1 with the commit, which results in > > the probe failed. > > > > if (readl(dev->bar + NVME_REG_CSTS) == -1) { > > result = -ENODEV; > > goto disable; > > } > > > > dmesg: > > [ 1.106280] nvme 0000:04:00.0: platform quirk: setting simple suspend > > [ 1.109111] nvme nvme0: pci function 0000:04:00.0 > > [ 1.113066] nvme 0000:04:00.0: enabling device (0000 -> 0002) > > [ 1.121040] nvme nvme0: Removing after probe failure status: -19 > > > > lspci: > > Non-Volatile memory controller: KIOXIA Corporation Device 0001 > > > > device uevent: > > DRIVER=nvme > > PCI_CLASS=10802 > > PCI_ID=1E0F:0001 > > PCI_SUBSYS_ID=1E0F:0001 > > PCI_SLOT_NAME=0000:04:00.0 > > MODALIAS=pci:v00001E0Fd00000001sv00001E0Fsd00000001bc01sc08i02 > > > > This patch was tested in Lenovo Thinkpad X1. > > > > Signed-off-by: Shujun Wang <wsj20369@163.com> > > --- > > drivers/acpi/power.c | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index > > 56102eaaa2da..8bf10abeb2e0 100644 > > --- a/drivers/acpi/power.c > > +++ b/drivers/acpi/power.c > > @@ -1004,9 +1004,18 @@ void > > acpi_turn_off_unused_power_resources(void) > > mutex_lock(&power_resource_list_lock); > > > > list_for_each_entry_reverse(resource, &acpi_power_resource_list, > > list_node) { > > + int result, state; > > + > > mutex_lock(&resource->resource_lock); > > > > - if (!resource->ref_count) { > > + result = acpi_power_get_state(resource->device.handle, > > &state); > > + if (result) { > > + mutex_unlock(&resource->resource_lock); > > + continue; > > + } > > + > > + if (state == ACPI_POWER_RESOURCE_STATE_ON > > + && !resource->ref_count) { > > dev_info(&resource->device.dev, "Turning OFF\n"); > > __acpi_power_off(resource); > > } > > -- > > 2.25.1 >
On Mon, 2021-05-10 at 14:13 +0200, Rafael J. Wysocki wrote: > On Mon, May 10, 2021 at 8:37 AM Zhang, Rui <rui.zhang@intel.com> > wrote: > > > > Hi, Shujun, > > > > I'm experiencing similar problem, and it should be a BIOS problem, > > Right, and I confused things. Sorry about that. > > If commit 7e4fdeafa61f2b653f ("ACPI: power: Turn off unused power > resources unconditionally") causes problems to happen, this means > that > the platform firmware implementation doesn't follow the ACPI > specification. > > > which can be fixed by a customized DSDT. > > Can you please attach the full acpidump output on this machine? I > > just want to make sure if it is the same problem. > > Yes, please. > > Rui, can you create a BZ for this please and can you both attach > dmidecode output from the affected systems? > > I don't want to revert this commit completely, so the default > behavior > is spec-compliant, but there can be a DMI-based blacklist for systems > having problems with it. > Done. https://bugzilla.kernel.org/show_bug.cgi?id=213019 Shujun, can you please attach the acpidump and dmidecode output in this bug report? thanks, rui > > > -----Original Message----- > > > From: Shujun Wang <wsj20369@163.com> > > > Sent: Friday, April 30, 2021 8:42 PM > > > To: rjw@rjwysocki.net; lenb@kernel.org; > > > linux-acpi@vger.kernel.org; linux- > > > kernel@vger.kernel.org > > > Cc: Shujun Wang <wsj20369@163.com> > > > Subject: [PATCH] Revert "ACPI: power: Turn off unused power > > > resources > > > unconditionally" > > > > > > This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. > > > It may cause some NVMe device probes to fail, and the system may > > > get stuck > > > when using an NVMe device as the root filesystem. > > > > > > In the function nvme_pci_enable(struct nvme_dev *dev), as shown > > > below, > > > readl(NVME_REG_CSTS) always returns -1 with the commit, which > > > results in > > > the probe failed. > > > > > > if (readl(dev->bar + NVME_REG_CSTS) == -1) { > > > result = -ENODEV; > > > goto disable; > > > } > > > > > > dmesg: > > > [ 1.106280] nvme 0000:04:00.0: platform quirk: setting > > > simple suspend > > > [ 1.109111] nvme nvme0: pci function 0000:04:00.0 > > > [ 1.113066] nvme 0000:04:00.0: enabling device (0000 -> > > > 0002) > > > [ 1.121040] nvme nvme0: Removing after probe failure status: > > > -19 > > > > > > lspci: > > > Non-Volatile memory controller: KIOXIA Corporation Device 0001 > > > > > > device uevent: > > > DRIVER=nvme > > > PCI_CLASS=10802 > > > PCI_ID=1E0F:0001 > > > PCI_SUBSYS_ID=1E0F:0001 > > > PCI_SLOT_NAME=0000:04:00.0 > > > MODALIAS=pci:v00001E0Fd00000001sv00001E0Fsd00000001bc01sc08i02 > > > > > > This patch was tested in Lenovo Thinkpad X1. > > > > > > Signed-off-by: Shujun Wang <wsj20369@163.com> > > > --- > > > drivers/acpi/power.c | 11 ++++++++++- > > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index > > > 56102eaaa2da..8bf10abeb2e0 100644 > > > --- a/drivers/acpi/power.c > > > +++ b/drivers/acpi/power.c > > > @@ -1004,9 +1004,18 @@ void > > > acpi_turn_off_unused_power_resources(void) > > > mutex_lock(&power_resource_list_lock); > > > > > > list_for_each_entry_reverse(resource, > > > &acpi_power_resource_list, > > > list_node) { > > > + int result, state; > > > + > > > mutex_lock(&resource->resource_lock); > > > > > > - if (!resource->ref_count) { > > > + result = acpi_power_get_state(resource- > > > >device.handle, > > > &state); > > > + if (result) { > > > + mutex_unlock(&resource->resource_lock); > > > + continue; > > > + } > > > + > > > + if (state == ACPI_POWER_RESOURCE_STATE_ON > > > + && !resource->ref_count) { > > > dev_info(&resource->device.dev, "Turning > > > OFF\n"); > > > __acpi_power_off(resource); > > > } > > > -- > > > 2.25.1
On Fri, Apr 30, 2021 at 2:43 PM Shujun Wang <wsj20369@163.com> wrote: > > This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. > It may cause some NVMe device probes to fail, and the system may get > stuck when using an NVMe device as the root filesystem. > > In the function nvme_pci_enable(struct nvme_dev *dev), as shown below, > readl(NVME_REG_CSTS) always returns -1 with the commit, which results in > the probe failed. > > if (readl(dev->bar + NVME_REG_CSTS) == -1) { > result = -ENODEV; > goto disable; > } > > dmesg: > [ 1.106280] nvme 0000:04:00.0: platform quirk: setting simple suspend > [ 1.109111] nvme nvme0: pci function 0000:04:00.0 > [ 1.113066] nvme 0000:04:00.0: enabling device (0000 -> 0002) > [ 1.121040] nvme nvme0: Removing after probe failure status: -19 > > lspci: > Non-Volatile memory controller: KIOXIA Corporation Device 0001 > > device uevent: > DRIVER=nvme > PCI_CLASS=10802 > PCI_ID=1E0F:0001 > PCI_SUBSYS_ID=1E0F:0001 > PCI_SLOT_NAME=0000:04:00.0 > MODALIAS=pci:v00001E0Fd00000001sv00001E0Fsd00000001bc01sc08i02 > > This patch was tested in Lenovo Thinkpad X1. Please send me the dmidecode output from this machine or (better) attach it at https://bugzilla.kernel.org/show_bug.cgi?id=213019 Thanks!
At 2021-05-14 22:05:06, "Rafael J. Wysocki" <rafael@kernel.org> wrote: >On Fri, Apr 30, 2021 at 2:43 PM Shujun Wang <wsj20369@163.com> wrote: >> >> This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. >> It may cause some NVMe device probes to fail, and the system may get >> stuck when using an NVMe device as the root filesystem. >> >> In the function nvme_pci_enable(struct nvme_dev *dev), as shown below, >> readl(NVME_REG_CSTS) always returns -1 with the commit, which results in >> the probe failed. >> >> if (readl(dev->bar + NVME_REG_CSTS) == -1) { >> result = -ENODEV; >> goto disable; >> } >> >> dmesg: >> [ 1.106280] nvme 0000:04:00.0: platform quirk: setting simple suspend >> [ 1.109111] nvme nvme0: pci function 0000:04:00.0 >> [ 1.113066] nvme 0000:04:00.0: enabling device (0000 -> 0002) >> [ 1.121040] nvme nvme0: Removing after probe failure status: -19 >> >> lspci: >> Non-Volatile memory controller: KIOXIA Corporation Device 0001 >> >> device uevent: >> DRIVER=nvme >> PCI_CLASS=10802 >> PCI_ID=1E0F:0001 >> PCI_SUBSYS_ID=1E0F:0001 >> PCI_SLOT_NAME=0000:04:00.0 >> MODALIAS=pci:v00001E0Fd00000001sv00001E0Fsd00000001bc01sc08i02 >> >> This patch was tested in Lenovo Thinkpad X1. > >Please send me the dmidecode output from this machine or (better) >attach it at https://bugzilla.kernel.org/show_bug.cgi?id=213019 > >Thanks! Hi Rafael: Sorry for late, I have attached the acpidump and dmidecode in the https://bugzilla.kernel.org/show_bug.cgi?id=213019 BR Shujun Wang
At 2021-05-10 21:59:03, "Zhang Rui" <rui.zhang@intel.com> wrote: >On Mon, 2021-05-10 at 14:13 +0200, Rafael J. Wysocki wrote: >> On Mon, May 10, 2021 at 8:37 AM Zhang, Rui <rui.zhang@intel.com> >> wrote: >> > >> > Hi, Shujun, >> > >> > I'm experiencing similar problem, and it should be a BIOS problem, >> >> Right, and I confused things. Sorry about that. >> >> If commit 7e4fdeafa61f2b653f ("ACPI: power: Turn off unused power >> resources unconditionally") causes problems to happen, this means >> that >> the platform firmware implementation doesn't follow the ACPI >> specification. >> >> > which can be fixed by a customized DSDT. >> > Can you please attach the full acpidump output on this machine? I >> > just want to make sure if it is the same problem. >> >> Yes, please. >> >> Rui, can you create a BZ for this please and can you both attach >> dmidecode output from the affected systems? >> >> I don't want to revert this commit completely, so the default >> behavior >> is spec-compliant, but there can be a DMI-based blacklist for systems >> having problems with it. >> >Done. >https://bugzilla.kernel.org/show_bug.cgi?id=213019 > >Shujun, >can you please attach the acpidump and dmidecode output in this bug >report? > >thanks, >rui Hi Rui: Sorry for late, I have attached the acpidump and dmidecode in the https://bugzilla.kernel.org/show_bug.cgi?id=213019 BR Shujun Wang > >> > > -----Original Message----- >> > > From: Shujun Wang <wsj20369@163.com> >> > > Sent: Friday, April 30, 2021 8:42 PM >> > > To: rjw@rjwysocki.net; lenb@kernel.org; >> > > linux-acpi@vger.kernel.org; linux- >> > > kernel@vger.kernel.org >> > > Cc: Shujun Wang <wsj20369@163.com> >> > > Subject: [PATCH] Revert "ACPI: power: Turn off unused power >> > > resources >> > > unconditionally" >> > > >> > > This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. >> > > It may cause some NVMe device probes to fail, and the system may >> > > get stuck >> > > when using an NVMe device as the root filesystem. >> > > >> > > In the function nvme_pci_enable(struct nvme_dev *dev), as shown >> > > below, >> > > readl(NVME_REG_CSTS) always returns -1 with the commit, which >> > > results in >> > > the probe failed. >> > > >> > > if (readl(dev->bar + NVME_REG_CSTS) == -1) { >> > > result = -ENODEV; >> > > goto disable; >> > > } >> > > >> > > dmesg: >> > > [ 1.106280] nvme 0000:04:00.0: platform quirk: setting >> > > simple suspend >> > > [ 1.109111] nvme nvme0: pci function 0000:04:00.0 >> > > [ 1.113066] nvme 0000:04:00.0: enabling device (0000 -> >> > > 0002) >> > > [ 1.121040] nvme nvme0: Removing after probe failure status: >> > > -19 >> > > >> > > lspci: >> > > Non-Volatile memory controller: KIOXIA Corporation Device 0001 >> > > >> > > device uevent: >> > > DRIVER=nvme >> > > PCI_CLASS=10802 >> > > PCI_ID=1E0F:0001 >> > > PCI_SUBSYS_ID=1E0F:0001 >> > > PCI_SLOT_NAME=0000:04:00.0 >> > > MODALIAS=pci:v00001E0Fd00000001sv00001E0Fsd00000001bc01sc08i02 >> > > >> > > This patch was tested in Lenovo Thinkpad X1. >> > > >> > > Signed-off-by: Shujun Wang <wsj20369@163.com> >> > > --- >> > > drivers/acpi/power.c | 11 ++++++++++- >> > > 1 file changed, 10 insertions(+), 1 deletion(-) >> > > >> > > diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index >> > > 56102eaaa2da..8bf10abeb2e0 100644 >> > > --- a/drivers/acpi/power.c >> > > +++ b/drivers/acpi/power.c >> > > @@ -1004,9 +1004,18 @@ void >> > > acpi_turn_off_unused_power_resources(void) >> > > mutex_lock(&power_resource_list_lock); >> > > >> > > list_for_each_entry_reverse(resource, >> > > &acpi_power_resource_list, >> > > list_node) { >> > > + int result, state; >> > > + >> > > mutex_lock(&resource->resource_lock); >> > > >> > > - if (!resource->ref_count) { >> > > + result = acpi_power_get_state(resource- >> > > >device.handle, >> > > &state); >> > > + if (result) { >> > > + mutex_unlock(&resource->resource_lock); >> > > + continue; >> > > + } >> > > + >> > > + if (state == ACPI_POWER_RESOURCE_STATE_ON >> > > + && !resource->ref_count) { >> > > dev_info(&resource->device.dev, "Turning >> > > OFF\n"); >> > > __acpi_power_off(resource); >> > > } >> > > -- >> > > 2.25.1
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 56102eaaa2da..8bf10abeb2e0 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -1004,9 +1004,18 @@ void acpi_turn_off_unused_power_resources(void) mutex_lock(&power_resource_list_lock); list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) { + int result, state; + mutex_lock(&resource->resource_lock); - if (!resource->ref_count) { + result = acpi_power_get_state(resource->device.handle, &state); + if (result) { + mutex_unlock(&resource->resource_lock); + continue; + } + + if (state == ACPI_POWER_RESOURCE_STATE_ON + && !resource->ref_count) { dev_info(&resource->device.dev, "Turning OFF\n"); __acpi_power_off(resource); }
This reverts commit 7e4fdeafa61f2b653fcf9678f09935e55756aed2. It may cause some NVMe device probes to fail, and the system may get stuck when using an NVMe device as the root filesystem. In the function nvme_pci_enable(struct nvme_dev *dev), as shown below, readl(NVME_REG_CSTS) always returns -1 with the commit, which results in the probe failed. if (readl(dev->bar + NVME_REG_CSTS) == -1) { result = -ENODEV; goto disable; } dmesg: [ 1.106280] nvme 0000:04:00.0: platform quirk: setting simple suspend [ 1.109111] nvme nvme0: pci function 0000:04:00.0 [ 1.113066] nvme 0000:04:00.0: enabling device (0000 -> 0002) [ 1.121040] nvme nvme0: Removing after probe failure status: -19 lspci: Non-Volatile memory controller: KIOXIA Corporation Device 0001 device uevent: DRIVER=nvme PCI_CLASS=10802 PCI_ID=1E0F:0001 PCI_SUBSYS_ID=1E0F:0001 PCI_SLOT_NAME=0000:04:00.0 MODALIAS=pci:v00001E0Fd00000001sv00001E0Fsd00000001bc01sc08i02 This patch was tested in Lenovo Thinkpad X1. Signed-off-by: Shujun Wang <wsj20369@163.com> --- drivers/acpi/power.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)