From: Felipe Balbi <balbi@ti.com> To: Tony Lindgren <tony@atomide.com> Cc: Kevin Hilman <khilman@linaro.org>, balbi@ti.com, Rajendra Nayak <rnayak@ti.com>, "Bedia, Vaibhav" <vaibhav.bedia@ti.com>, "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, Mark Jackson <mpfj-list@newflow.co.uk>, Sourav Poddar <sourav.poddar@ti.com>, Paul Walmsley <paul@pwsan.com> Subject: Re: Boot hang regression 3.10.0-rc4 -> 3.10.0 Date: Wed, 10 Jul 2013 19:07:04 +0300 [thread overview] Message-ID: <20130710160704.GH18966@arwen.pp.htv.fi> (raw) In-Reply-To: <20130710142633.GV5523@atomide.com> [-- Attachment #1: Type: text/plain, Size: 4934 bytes --] Hi, On Wed, Jul 10, 2013 at 07:26:34AM -0700, Tony Lindgren wrote: > * Kevin Hilman <khilman@linaro.org> [130710 01:29]: > > Felipe Balbi <balbi@ti.com> writes: > > >> > > >> Right, but calling serial_omap_restore_context() even when the context > > >> is not lost, should not ideally cause an issue. > > > > > > it does in one condition. If context hasn't been saved before. And that > > > can happen in the case of wrong pm runtime status for that device. > > > > > > Imagine the device is marked as suspended even though it's fully enabled > > > (it hasn't been suspended by hwmod due to NO_IDLE flag). In that case > > > your context structure is all zeroes (context has never been saved > > > before) then when you call pm_runtime_get_sync() on probe() your > > > ->runtime_resume() will get called, which will restore context, > > > essentially undoing anything which was configured by u-boot. > > > > > > Am I missing something ? > > > > You're right, the _set_active() is crucial in the case when we prevent > > the console UART from idling during boot (though that shouldn't be > > happening in mainline unless the fix for "Issue 1" is done.) > > Felipe is right, looks like all we need is to check if context is > initialized or not. So no need for mach-omap2/serial.c or hwmod tinkering. > > After that having DEBUG_LL and cmdline with earlyprintk console=ttyO.. > works for me. We could also check for some combination of the context > save registers being NULL if somebody has a good idea which ones > should never be 0. > > Regards, > > Tony > > > --- a/drivers/tty/serial/omap-serial.c > +++ b/drivers/tty/serial/omap-serial.c > @@ -161,6 +161,7 @@ struct uart_omap_port { > u32 calc_latency; > struct work_struct qos_work; > struct pinctrl *pins; > + bool initialized; > bool is_suspending; > }; > > @@ -1523,6 +1524,8 @@ static int serial_omap_probe(struct platform_device *pdev) > > pm_runtime_mark_last_busy(up->dev); > pm_runtime_put_autosuspend(up->dev); > + up->initialized = true; > + > return 0; > > err_add_port: > @@ -1584,6 +1587,9 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1) > #ifdef CONFIG_PM_RUNTIME > static void serial_omap_restore_context(struct uart_omap_port *up) > { > + if (!up->initialized) > + return; > + > if (up->errata & UART_ERRATA_i202_MDR1_ACCESS) > serial_omap_mdr1_errataset(up, UART_OMAP_MDR1_DISABLE); > else how about something like below ? It makes omap_device/hwmod and pm_runtime agree on the initial state of the device and will prevent ->runtime_resume() from being called on first pm_runtime_get*() done during probe. This is similar to what PCI bus does (if you look at pci_pm_init()). commit 59108a500b4ab4b1a5102648a3360276dbf7df6f Author: Felipe Balbi <balbi@ti.com> Date: Wed Jul 10 18:50:16 2013 +0300 arm: omap2plus: unidle devices which are about to probe in order to make HWMOD and pm_runtime agree on the initial state of the device, we will unidle the device and call pm_runtime_set_active() to tell pm_runtime that the device is really active. By the time driver's probe() is reached, a call to pm_runtime_get_sync() will not cause driver's ->runtime_resume() method to be called at first, only after a successful ->runtime_suspend(). Signed-off-by: Felipe Balbi <balbi@ti.com> diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index e6d2307..1cedf3a 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -181,6 +181,26 @@ odbfd_exit: return ret; } +static void omap_device_pm_init(struct platform_device *pdev); +{ + /* + * if we reach this function, it's because the device is about to be + * probed. In such cases, we will enable the device, and call + * pm_runtime_set_active() so that the device driver and runtime PM + * framework agree on initial state of the device. + */ + omap_device_enable(pdev); + pm_runtime_set_active(&pdev->dev); + device_enable_async_suspend(&pdev->dev); +} + +static void omap_device_pm_exit(struct platform_device *pdev); +{ + device_disable_async_suspend(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + omap_device_idle(pdev); +} + static int _omap_device_notifier_call(struct notifier_block *nb, unsigned long event, void *dev) { @@ -192,6 +212,12 @@ static int _omap_device_notifier_call(struct notifier_block *nb, if (pdev->archdata.od) omap_device_delete(pdev->archdata.od); break; + case BUS_NOTIFY_BIND_DRIVER: + omap_device_pm_init(pdev); + break; + case BUS_NOTIFY_UNBOUND_DRIVER: + omap_device_pm_exit(pdev); + break; case BUS_NOTIFY_ADD_DEVICE: if (pdev->dev.of_node) omap_device_build_from_dt(pdev); -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: balbi@ti.com (Felipe Balbi) To: linux-arm-kernel@lists.infradead.org Subject: Boot hang regression 3.10.0-rc4 -> 3.10.0 Date: Wed, 10 Jul 2013 19:07:04 +0300 [thread overview] Message-ID: <20130710160704.GH18966@arwen.pp.htv.fi> (raw) In-Reply-To: <20130710142633.GV5523@atomide.com> Hi, On Wed, Jul 10, 2013 at 07:26:34AM -0700, Tony Lindgren wrote: > * Kevin Hilman <khilman@linaro.org> [130710 01:29]: > > Felipe Balbi <balbi@ti.com> writes: > > >> > > >> Right, but calling serial_omap_restore_context() even when the context > > >> is not lost, should not ideally cause an issue. > > > > > > it does in one condition. If context hasn't been saved before. And that > > > can happen in the case of wrong pm runtime status for that device. > > > > > > Imagine the device is marked as suspended even though it's fully enabled > > > (it hasn't been suspended by hwmod due to NO_IDLE flag). In that case > > > your context structure is all zeroes (context has never been saved > > > before) then when you call pm_runtime_get_sync() on probe() your > > > ->runtime_resume() will get called, which will restore context, > > > essentially undoing anything which was configured by u-boot. > > > > > > Am I missing something ? > > > > You're right, the _set_active() is crucial in the case when we prevent > > the console UART from idling during boot (though that shouldn't be > > happening in mainline unless the fix for "Issue 1" is done.) > > Felipe is right, looks like all we need is to check if context is > initialized or not. So no need for mach-omap2/serial.c or hwmod tinkering. > > After that having DEBUG_LL and cmdline with earlyprintk console=ttyO.. > works for me. We could also check for some combination of the context > save registers being NULL if somebody has a good idea which ones > should never be 0. > > Regards, > > Tony > > > --- a/drivers/tty/serial/omap-serial.c > +++ b/drivers/tty/serial/omap-serial.c > @@ -161,6 +161,7 @@ struct uart_omap_port { > u32 calc_latency; > struct work_struct qos_work; > struct pinctrl *pins; > + bool initialized; > bool is_suspending; > }; > > @@ -1523,6 +1524,8 @@ static int serial_omap_probe(struct platform_device *pdev) > > pm_runtime_mark_last_busy(up->dev); > pm_runtime_put_autosuspend(up->dev); > + up->initialized = true; > + > return 0; > > err_add_port: > @@ -1584,6 +1587,9 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1) > #ifdef CONFIG_PM_RUNTIME > static void serial_omap_restore_context(struct uart_omap_port *up) > { > + if (!up->initialized) > + return; > + > if (up->errata & UART_ERRATA_i202_MDR1_ACCESS) > serial_omap_mdr1_errataset(up, UART_OMAP_MDR1_DISABLE); > else how about something like below ? It makes omap_device/hwmod and pm_runtime agree on the initial state of the device and will prevent ->runtime_resume() from being called on first pm_runtime_get*() done during probe. This is similar to what PCI bus does (if you look at pci_pm_init()). commit 59108a500b4ab4b1a5102648a3360276dbf7df6f Author: Felipe Balbi <balbi@ti.com> Date: Wed Jul 10 18:50:16 2013 +0300 arm: omap2plus: unidle devices which are about to probe in order to make HWMOD and pm_runtime agree on the initial state of the device, we will unidle the device and call pm_runtime_set_active() to tell pm_runtime that the device is really active. By the time driver's probe() is reached, a call to pm_runtime_get_sync() will not cause driver's ->runtime_resume() method to be called at first, only after a successful ->runtime_suspend(). Signed-off-by: Felipe Balbi <balbi@ti.com> diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c index e6d2307..1cedf3a 100644 --- a/arch/arm/mach-omap2/omap_device.c +++ b/arch/arm/mach-omap2/omap_device.c @@ -181,6 +181,26 @@ odbfd_exit: return ret; } +static void omap_device_pm_init(struct platform_device *pdev); +{ + /* + * if we reach this function, it's because the device is about to be + * probed. In such cases, we will enable the device, and call + * pm_runtime_set_active() so that the device driver and runtime PM + * framework agree on initial state of the device. + */ + omap_device_enable(pdev); + pm_runtime_set_active(&pdev->dev); + device_enable_async_suspend(&pdev->dev); +} + +static void omap_device_pm_exit(struct platform_device *pdev); +{ + device_disable_async_suspend(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + omap_device_idle(pdev); +} + static int _omap_device_notifier_call(struct notifier_block *nb, unsigned long event, void *dev) { @@ -192,6 +212,12 @@ static int _omap_device_notifier_call(struct notifier_block *nb, if (pdev->archdata.od) omap_device_delete(pdev->archdata.od); break; + case BUS_NOTIFY_BIND_DRIVER: + omap_device_pm_init(pdev); + break; + case BUS_NOTIFY_UNBOUND_DRIVER: + omap_device_pm_exit(pdev); + break; case BUS_NOTIFY_ADD_DEVICE: if (pdev->dev.of_node) omap_device_build_from_dt(pdev); -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130710/5f849a70/attachment.sig>
next prev parent reply other threads:[~2013-07-10 16:07 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-04 13:25 Boot hang regression 3.10.0-rc4 -> 3.10.0 Mark Jackson 2013-07-04 13:25 ` Mark Jackson 2013-07-04 15:14 ` Mark Jackson 2013-07-04 15:14 ` Mark Jackson 2013-07-04 16:00 ` Mark Jackson 2013-07-04 16:00 ` Mark Jackson 2013-07-05 8:11 ` Bedia, Vaibhav 2013-07-05 8:11 ` Bedia, Vaibhav 2013-07-05 11:59 ` Tony Lindgren 2013-07-05 11:59 ` Tony Lindgren 2013-07-05 13:20 ` Bedia, Vaibhav 2013-07-05 13:20 ` Bedia, Vaibhav 2013-07-05 13:31 ` Bedia, Vaibhav 2013-07-05 13:31 ` Bedia, Vaibhav 2013-07-08 11:25 ` Tony Lindgren 2013-07-08 11:25 ` Tony Lindgren 2013-07-08 12:16 ` Tony Lindgren 2013-07-08 12:16 ` Tony Lindgren 2013-07-08 12:41 ` Rajendra Nayak 2013-07-08 12:41 ` Rajendra Nayak 2013-07-08 13:10 ` Tony Lindgren 2013-07-08 13:10 ` Tony Lindgren 2013-07-08 13:20 ` Rajendra Nayak 2013-07-08 13:20 ` Rajendra Nayak 2013-07-08 13:25 ` Rajendra Nayak 2013-07-08 13:25 ` Rajendra Nayak 2013-07-08 13:35 ` Felipe Balbi 2013-07-08 13:35 ` Felipe Balbi 2013-07-09 5:33 ` Rajendra Nayak 2013-07-09 5:33 ` Rajendra Nayak 2013-07-09 6:42 ` Felipe Balbi 2013-07-09 6:42 ` Felipe Balbi 2013-07-09 7:19 ` Rajendra Nayak 2013-07-09 7:19 ` Rajendra Nayak 2013-07-09 7:40 ` Felipe Balbi 2013-07-09 7:40 ` Felipe Balbi 2013-07-09 18:59 ` Grygorii Strashko 2013-07-09 18:59 ` Grygorii Strashko 2013-07-09 19:41 ` Felipe Balbi 2013-07-09 19:41 ` Felipe Balbi 2013-07-10 12:16 ` Grygorii Strashko 2013-07-10 12:16 ` Grygorii Strashko 2013-07-10 12:25 ` Felipe Balbi 2013-07-10 12:25 ` Felipe Balbi 2013-07-10 8:22 ` Kevin Hilman 2013-07-10 8:22 ` Kevin Hilman 2013-07-10 12:10 ` Tony Lindgren 2013-07-10 12:10 ` Tony Lindgren 2013-07-10 12:27 ` Tony Lindgren 2013-07-10 12:27 ` Tony Lindgren 2013-07-10 14:26 ` Tony Lindgren 2013-07-10 14:26 ` Tony Lindgren 2013-07-10 16:07 ` Felipe Balbi [this message] 2013-07-10 16:07 ` Felipe Balbi 2013-07-10 16:11 ` Felipe Balbi 2013-07-10 16:11 ` Felipe Balbi 2013-07-11 6:32 ` Tony Lindgren 2013-07-11 6:32 ` Tony Lindgren 2013-07-11 9:59 ` Grygorii Strashko 2013-07-11 9:59 ` Grygorii Strashko 2013-07-12 0:40 ` Suman Anna 2013-07-12 0:40 ` Suman Anna 2013-07-15 6:44 ` Rajendra Nayak 2013-07-15 6:44 ` Rajendra Nayak 2013-07-15 10:01 ` Rajendra Nayak 2013-07-15 10:01 ` Rajendra Nayak 2013-07-15 19:23 ` Suman Anna 2013-07-15 19:23 ` Suman Anna 2013-07-16 6:30 ` Rajendra Nayak 2013-07-16 6:30 ` Rajendra Nayak 2013-07-11 9:17 ` Rajendra Nayak 2013-07-11 9:17 ` Rajendra Nayak 2013-07-11 9:26 ` Felipe Balbi 2013-07-11 9:26 ` Felipe Balbi 2013-07-11 10:16 ` [PATCH] arm: omap2plus: unidle devices which are about to probe Felipe Balbi 2013-07-11 10:16 ` Felipe Balbi 2013-07-12 11:58 ` Grygorii Strashko 2013-07-12 11:58 ` Grygorii Strashko 2013-07-12 12:10 ` Felipe Balbi 2013-07-12 12:10 ` Felipe Balbi 2013-07-12 12:27 ` Rajendra Nayak 2013-07-12 12:27 ` Rajendra Nayak 2013-07-13 22:21 ` Kevin Hilman 2013-07-13 22:21 ` Kevin Hilman 2013-07-11 9:59 ` Boot hang regression 3.10.0-rc4 -> 3.10.0 Grygorii Strashko 2013-07-11 9:59 ` Grygorii Strashko 2013-07-16 10:27 ` Grygorii Strashko 2013-07-16 10:27 ` Grygorii Strashko 2013-07-17 7:10 ` Rajendra Nayak 2013-07-17 7:10 ` Rajendra Nayak 2013-07-11 6:18 ` Rajendra Nayak 2013-07-11 6:18 ` Rajendra Nayak 2013-07-11 6:24 ` Tony Lindgren 2013-07-11 6:24 ` Tony Lindgren 2013-07-11 9:11 ` Rajendra Nayak 2013-07-11 9:11 ` Rajendra Nayak
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130710160704.GH18966@arwen.pp.htv.fi \ --to=balbi@ti.com \ --cc=khilman@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=mpfj-list@newflow.co.uk \ --cc=paul@pwsan.com \ --cc=rnayak@ti.com \ --cc=sourav.poddar@ti.com \ --cc=tony@atomide.com \ --cc=vaibhav.bedia@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.