Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752419AbaKDJUj (ORCPT ); Tue, 4 Nov 2014 04:20:39 -0500 Received: from mail-ig0-f177.google.com ([209.85.213.177]:34848 "EHLO mail-ig0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221AbaKDJUg (ORCPT ); Tue, 4 Nov 2014 04:20:36 -0500 Date: Tue, 4 Nov 2014 09:20:31 +0000 From: Lee Jones To: Dmitry Eremin-Solenikov Cc: kernel list , Samuel Ortiz , stable@vger.kernel.org Subject: Re: [PATCH] mfd: tc6393xb fail ohci suspend if full state restore is required Message-ID: <20141104092031.GL17577@x1> References: <1414171197-18620-1-git-send-email-dbaryshkov@gmail.com> <20141103145623.GH4538@x1> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 04 Nov 2014, Dmitry Eremin-Solenikov wrote: > Hello. > > 2014-11-03 17:56 GMT+03:00 Lee Jones : > > On Fri, 24 Oct 2014, Dmitry Eremin-Solenikov wrote: > > > >> Some boards with TC6393XB chip require full state restore during system > >> resume thanks to chip's VCC being cut off during suspend (Sharp SL-6000 > >> tosa is one of them). Failing to do so would result in ohci Oops on > >> resume due to internal memory contentes being changed. Fail ohci suspend > >> on tc6393xb is full state restore is required. > >> > >> Recommended workaround is to unbind tmio-ohci driver before suspend and > >> rebind it after resume. > >> > >> Signed-off-by: Dmitry Eremin-Solenikov > >> Cc: stable@vger.kernel.org > >> --- > >> drivers/mfd/tc6393xb.c | 13 ++++++++++++- > >> 1 file changed, 12 insertions(+), 1 deletion(-) > >> > >> diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c > >> index 11c19e5..48579e5 100644 > >> --- a/drivers/mfd/tc6393xb.c > >> +++ b/drivers/mfd/tc6393xb.c > >> @@ -263,6 +263,17 @@ static int tc6393xb_ohci_disable(struct platform_device *dev) > >> return 0; > >> } > >> > >> +static int tc6393xb_ohci_suspend(struct platform_device *dev) > >> +{ > >> + struct tc6393xb_platform_data *tcpd = dev_get_platdata(dev->dev.parent); > >> + > >> + /* We can't properly store/restore OHCI state, so fail here */ > >> + if (tcpd->resume_restore) > >> + return -EBUSY; > > > > Wouldn't it be easier to just put these three lines into > > tc6393xb_ohci_disable() instead off adding 7 superfluous lines and > > making the Ops names inconsistent? > > No. The problem only exists on suspend/resume path. tc6393xb_ohci_disable > is also used on driver removal and can (should?) be used on device shutdown. > Using the tc6393xb_ohci_disable() function in that paths is not a problem. > > Also with this patch the Oops name will not be inconsistent - returning -EBUSY > from this disable callback will cancel the device suspension with > clearly stating > that OHCI is busy in dmesg. Understood. Thanks for the explanation. > >> + return tc6393xb_ohci_disable(dev); > >> +} > >> + > >> static int tc6393xb_fb_enable(struct platform_device *dev) > >> { > >> struct tc6393xb *tc6393xb = dev_get_drvdata(dev->dev.parent); > >> @@ -403,7 +414,7 @@ static struct mfd_cell tc6393xb_cells[] = { > >> .num_resources = ARRAY_SIZE(tc6393xb_ohci_resources), > >> .resources = tc6393xb_ohci_resources, > >> .enable = tc6393xb_ohci_enable, > >> - .suspend = tc6393xb_ohci_disable, > >> + .suspend = tc6393xb_ohci_suspend, > >> .resume = tc6393xb_ohci_enable, > >> .disable = tc6393xb_ohci_disable, > >> }, > > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/