From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH] ARM: OMAP2+: Fix broken gpmc support Date: Mon, 4 Mar 2013 09:33:26 -0800 Message-ID: <20130304173326.GJ11806@atomide.com> References: <1361195859-5949-1-git-send-email-jon-hunter@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-03-ewr.mailhop.org ([204.13.248.66]:51567 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758259Ab3CDRd3 (ORCPT ); Mon, 4 Mar 2013 12:33:29 -0500 Content-Disposition: inline In-Reply-To: <1361195859-5949-1-git-send-email-jon-hunter@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Jon Hunter Cc: linux-omap , linux-arm , Ezequiel Garcia , Philip Avinash , Grazvydas Ignotas * Jon Hunter [130218 06:01]: > Commit "ARM: OMAP2+: Prevent potential crash if GPMC probe fails" added > code to ensure that GPMC chip-selects could not be requested until the > device probe was successful. The chip-selects should have been > unreserved at the end of the probe function, but the code to unreserve > them appears to have ended up in the gpmc_calc_timings() function and > hence, this is causing problems requesting chip-selects. Fix this merge > error by unreserving the chip-selects at the end of the probe, but > before we call the gpmc child probe functions (for device-tree) which > request a chip-select. > > Signed-off-by: Jon Hunter > Tested-by: Ezequiel Garcia > Tested-by: Philip Avinash > Tested-by: Grazvydas Ignotas > --- > > Tony, GPMC support is completely broken in linux-next without this fix > and a few people now are reporting this problem. Can we get this fix > merged? Thanks applying now into omap-for-v3.9-rc1/fixes. Sorry for the delay, looks like I should have applied this earlier. Regards, Tony > arch/arm/mach-omap2/gpmc.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > index 1adb2d4..1e8bcb4 100644 > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -1125,9 +1125,6 @@ int gpmc_calc_timings(struct gpmc_timings *gpmc_t, > /* TODO: remove, see function definition */ > gpmc_convert_ps_to_ns(gpmc_t); > > - /* Now the GPMC is initialised, unreserve the chip-selects */ > - gpmc_cs_map = 0; > - > return 0; > } > > @@ -1388,6 +1385,9 @@ static int gpmc_probe(struct platform_device *pdev) > if (IS_ERR_VALUE(gpmc_setup_irq())) > dev_warn(gpmc_dev, "gpmc_setup_irq failed\n"); > > + /* Now the GPMC is initialised, unreserve the chip-selects */ > + gpmc_cs_map = 0; > + > rc = gpmc_probe_dt(pdev); > if (rc < 0) { > clk_disable_unprepare(gpmc_l3_clk); > -- > 1.7.10.4 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Mon, 4 Mar 2013 09:33:26 -0800 Subject: [PATCH] ARM: OMAP2+: Fix broken gpmc support In-Reply-To: <1361195859-5949-1-git-send-email-jon-hunter@ti.com> References: <1361195859-5949-1-git-send-email-jon-hunter@ti.com> Message-ID: <20130304173326.GJ11806@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Jon Hunter [130218 06:01]: > Commit "ARM: OMAP2+: Prevent potential crash if GPMC probe fails" added > code to ensure that GPMC chip-selects could not be requested until the > device probe was successful. The chip-selects should have been > unreserved at the end of the probe function, but the code to unreserve > them appears to have ended up in the gpmc_calc_timings() function and > hence, this is causing problems requesting chip-selects. Fix this merge > error by unreserving the chip-selects at the end of the probe, but > before we call the gpmc child probe functions (for device-tree) which > request a chip-select. > > Signed-off-by: Jon Hunter > Tested-by: Ezequiel Garcia > Tested-by: Philip Avinash > Tested-by: Grazvydas Ignotas > --- > > Tony, GPMC support is completely broken in linux-next without this fix > and a few people now are reporting this problem. Can we get this fix > merged? Thanks applying now into omap-for-v3.9-rc1/fixes. Sorry for the delay, looks like I should have applied this earlier. Regards, Tony > arch/arm/mach-omap2/gpmc.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > index 1adb2d4..1e8bcb4 100644 > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -1125,9 +1125,6 @@ int gpmc_calc_timings(struct gpmc_timings *gpmc_t, > /* TODO: remove, see function definition */ > gpmc_convert_ps_to_ns(gpmc_t); > > - /* Now the GPMC is initialised, unreserve the chip-selects */ > - gpmc_cs_map = 0; > - > return 0; > } > > @@ -1388,6 +1385,9 @@ static int gpmc_probe(struct platform_device *pdev) > if (IS_ERR_VALUE(gpmc_setup_irq())) > dev_warn(gpmc_dev, "gpmc_setup_irq failed\n"); > > + /* Now the GPMC is initialised, unreserve the chip-selects */ > + gpmc_cs_map = 0; > + > rc = gpmc_probe_dt(pdev); > if (rc < 0) { > clk_disable_unprepare(gpmc_l3_clk); > -- > 1.7.10.4 >