| Message ID | 20200727172936.661567-1-vaibhavgupta40@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 15b413d93ccd0d26c29f005df82c299c8f14cbd6 |
| Headers | show |
| Series | [v3] spi: spi-topcliff-pch: drop call to wakeup-disable | expand |
On Mon, Jul 27, 2020 at 8:32 PM Vaibhav Gupta <vaibhavgupta40@gmail.com> wrote: > > Before generic upgrade, both .suspend() and .resume() were invoking > pci_enable_wake(pci_dev, PCI_D3hot, 0). Hence, disabling wakeup in both > states. (Normal trend is .suspend() enables and .resume() disables the > wakeup.) > > This was ambiguous and may be buggy. Instead of replicating the legacy > behavior, drop the wakeup-disable call. Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Thanks! > Fixes: f185bcc77980 ("spi: spi-topcliff-pch: use generic power management") > Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> > --- > drivers/spi/spi-topcliff-pch.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c > index 281a90f1b5d8..c73a03ddf5f3 100644 > --- a/drivers/spi/spi-topcliff-pch.c > +++ b/drivers/spi/spi-topcliff-pch.c > @@ -1648,8 +1648,6 @@ static int __maybe_unused pch_spi_resume(struct device *dev) > > dev_dbg(dev, "%s ENTRY\n", __func__); > > - device_wakeup_disable(dev); > - > /* set suspend status to false */ > pd_dev_save->board_dat->suspend_sts = false; > > -- > 2.27.0 >
On Mon, 27 Jul 2020 22:59:37 +0530, Vaibhav Gupta wrote: > Before generic upgrade, both .suspend() and .resume() were invoking > pci_enable_wake(pci_dev, PCI_D3hot, 0). Hence, disabling wakeup in both > states. (Normal trend is .suspend() enables and .resume() disables the > wakeup.) > > This was ambiguous and may be buggy. Instead of replicating the legacy > behavior, drop the wakeup-disable call. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: spi-topcliff-pch: drop call to wakeup-disable commit: 15b413d93ccd0d26c29f005df82c299c8f14cbd6 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index 281a90f1b5d8..c73a03ddf5f3 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1648,8 +1648,6 @@ static int __maybe_unused pch_spi_resume(struct device *dev) dev_dbg(dev, "%s ENTRY\n", __func__); - device_wakeup_disable(dev); - /* set suspend status to false */ pd_dev_save->board_dat->suspend_sts = false;
Before generic upgrade, both .suspend() and .resume() were invoking pci_enable_wake(pci_dev, PCI_D3hot, 0). Hence, disabling wakeup in both states. (Normal trend is .suspend() enables and .resume() disables the wakeup.) This was ambiguous and may be buggy. Instead of replicating the legacy behavior, drop the wakeup-disable call. Fixes: f185bcc77980 ("spi: spi-topcliff-pch: use generic power management") Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com> --- drivers/spi/spi-topcliff-pch.c | 2 -- 1 file changed, 2 deletions(-)