| Message ID | 1470878016-6098-1-git-send-email-vinceh@nvidia.com |
|---|---|
| State | Accepted |
| Delegated to: | Thierry Reding |
| Headers | show |
On 11/08/16 02:13, Vince Hsu wrote: > Reading the DPD_REQ & DPD2_REQ registers returns the previous requests. > If we sets the current request bit with the returned value, then other > pads will be turned on or off unexpectedly. > > Signed-off-by: Vince Hsu <vinceh@nvidia.com> > --- > Hi, > > I did not notice Laxman had a series[1] which also touched pmc code, > and it seems the series isn't merged yet. Should I rebase this patch > on it? > > Thanks, > Vince > > > drivers/soc/tegra/pmc.c | 28 ++++++++-------------------- > 1 file changed, 8 insertions(+), 20 deletions(-) > > diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c > index 71c834f3847e..7792ed88d80b 100644 > --- a/drivers/soc/tegra/pmc.c > +++ b/drivers/soc/tegra/pmc.c > @@ -967,8 +967,8 @@ static void tegra_io_rail_unprepare(void) > > int tegra_io_rail_power_on(unsigned int id) > { > - unsigned long request, status, value; > - unsigned int bit, mask; > + unsigned long request, status; > + unsigned int bit; > int err; > > mutex_lock(&pmc->powergates_lock); > @@ -977,15 +977,9 @@ int tegra_io_rail_power_on(unsigned int id) > if (err) > goto error; > > - mask = 1 << bit; > + tegra_pmc_writel(IO_DPD_REQ_CODE_OFF | BIT(bit), request); > > - value = tegra_pmc_readl(request); > - value |= mask; > - value &= ~IO_DPD_REQ_CODE_MASK; > - value |= IO_DPD_REQ_CODE_OFF; > - tegra_pmc_writel(value, request); > - > - err = tegra_io_rail_poll(status, mask, 0, 250); > + err = tegra_io_rail_poll(status, BIT(bit), 0, 250); > if (err) { > pr_info("tegra_io_rail_poll() failed: %d\n", err); > goto error; > @@ -1002,8 +996,8 @@ EXPORT_SYMBOL(tegra_io_rail_power_on); > > int tegra_io_rail_power_off(unsigned int id) > { > - unsigned long request, status, value; > - unsigned int bit, mask; > + unsigned long request, status; > + unsigned int bit; > int err; > > mutex_lock(&pmc->powergates_lock); > @@ -1014,15 +1008,9 @@ int tegra_io_rail_power_off(unsigned int id) > goto error; > } > > - mask = 1 << bit; > - > - value = tegra_pmc_readl(request); > - value |= mask; > - value &= ~IO_DPD_REQ_CODE_MASK; > - value |= IO_DPD_REQ_CODE_ON; > - tegra_pmc_writel(value, request); > + tegra_pmc_writel(IO_DPD_REQ_CODE_ON | BIT(bit), request); > > - err = tegra_io_rail_poll(status, mask, mask, 250); > + err = tegra_io_rail_poll(status, BIT(bit), BIT(bit), 250); > if (err) > goto error; Thanks for updating. Reviewed-by: Jon Hunter <jonathanh@nvidia.com> Cheers Jon
Hi Thierry, Do you have objection to this patch? Thanks, Vince On 08/11/2016 04:27 PM, Jon Hunter wrote: > On 11/08/16 02:13, Vince Hsu wrote: >> Reading the DPD_REQ & DPD2_REQ registers returns the previous requests. >> If we sets the current request bit with the returned value, then other >> pads will be turned on or off unexpectedly. >> >> Signed-off-by: Vince Hsu <vinceh@nvidia.com> >> --- >> Hi, >> >> I did not notice Laxman had a series[1] which also touched pmc code, >> and it seems the series isn't merged yet. Should I rebase this patch >> on it? >> >> Thanks, >> Vince >> >> >> drivers/soc/tegra/pmc.c | 28 ++++++++-------------------- >> 1 file changed, 8 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c >> index 71c834f3847e..7792ed88d80b 100644 >> --- a/drivers/soc/tegra/pmc.c >> +++ b/drivers/soc/tegra/pmc.c >> @@ -967,8 +967,8 @@ static void tegra_io_rail_unprepare(void) >> >> int tegra_io_rail_power_on(unsigned int id) >> { >> - unsigned long request, status, value; >> - unsigned int bit, mask; >> + unsigned long request, status; >> + unsigned int bit; >> int err; >> >> mutex_lock(&pmc->powergates_lock); >> @@ -977,15 +977,9 @@ int tegra_io_rail_power_on(unsigned int id) >> if (err) >> goto error; >> >> - mask = 1 << bit; >> + tegra_pmc_writel(IO_DPD_REQ_CODE_OFF | BIT(bit), request); >> >> - value = tegra_pmc_readl(request); >> - value |= mask; >> - value &= ~IO_DPD_REQ_CODE_MASK; >> - value |= IO_DPD_REQ_CODE_OFF; >> - tegra_pmc_writel(value, request); >> - >> - err = tegra_io_rail_poll(status, mask, 0, 250); >> + err = tegra_io_rail_poll(status, BIT(bit), 0, 250); >> if (err) { >> pr_info("tegra_io_rail_poll() failed: %d\n", err); >> goto error; >> @@ -1002,8 +996,8 @@ EXPORT_SYMBOL(tegra_io_rail_power_on); >> >> int tegra_io_rail_power_off(unsigned int id) >> { >> - unsigned long request, status, value; >> - unsigned int bit, mask; >> + unsigned long request, status; >> + unsigned int bit; >> int err; >> >> mutex_lock(&pmc->powergates_lock); >> @@ -1014,15 +1008,9 @@ int tegra_io_rail_power_off(unsigned int id) >> goto error; >> } >> >> - mask = 1 << bit; >> - >> - value = tegra_pmc_readl(request); >> - value |= mask; >> - value &= ~IO_DPD_REQ_CODE_MASK; >> - value |= IO_DPD_REQ_CODE_ON; >> - tegra_pmc_writel(value, request); >> + tegra_pmc_writel(IO_DPD_REQ_CODE_ON | BIT(bit), request); >> >> - err = tegra_io_rail_poll(status, mask, mask, 250); >> + err = tegra_io_rail_poll(status, BIT(bit), BIT(bit), 250); >> if (err) >> goto error; > Thanks for updating. > > Reviewed-by: Jon Hunter <jonathanh@nvidia.com> > > Cheers > Jon > -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Vince, On 23/08/16 06:42, Vince Hsu wrote: > Hi Thierry, > > Do you have objection to this patch? Thierry has queued it here: http://git.kernel.org/cgit/linux/kernel/git/tegra/linux.git/log/?h=for-4.9/soc Jon
Sorry that I did not notice that. Thanks Jon & Thierry! Vince On 08/23/2016 04:18 PM, Jon Hunter wrote: > Hi Vince, > > On 23/08/16 06:42, Vince Hsu wrote: >> Hi Thierry, >> >> Do you have objection to this patch? > Thierry has queued it here: > > http://git.kernel.org/cgit/linux/kernel/git/tegra/linux.git/log/?h=for-4.9/soc > > Jon > -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index 71c834f3847e..7792ed88d80b 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -967,8 +967,8 @@ static void tegra_io_rail_unprepare(void) int tegra_io_rail_power_on(unsigned int id) { - unsigned long request, status, value; - unsigned int bit, mask; + unsigned long request, status; + unsigned int bit; int err; mutex_lock(&pmc->powergates_lock); @@ -977,15 +977,9 @@ int tegra_io_rail_power_on(unsigned int id) if (err) goto error; - mask = 1 << bit; + tegra_pmc_writel(IO_DPD_REQ_CODE_OFF | BIT(bit), request); - value = tegra_pmc_readl(request); - value |= mask; - value &= ~IO_DPD_REQ_CODE_MASK; - value |= IO_DPD_REQ_CODE_OFF; - tegra_pmc_writel(value, request); - - err = tegra_io_rail_poll(status, mask, 0, 250); + err = tegra_io_rail_poll(status, BIT(bit), 0, 250); if (err) { pr_info("tegra_io_rail_poll() failed: %d\n", err); goto error; @@ -1002,8 +996,8 @@ EXPORT_SYMBOL(tegra_io_rail_power_on); int tegra_io_rail_power_off(unsigned int id) { - unsigned long request, status, value; - unsigned int bit, mask; + unsigned long request, status; + unsigned int bit; int err; mutex_lock(&pmc->powergates_lock); @@ -1014,15 +1008,9 @@ int tegra_io_rail_power_off(unsigned int id) goto error; } - mask = 1 << bit; - - value = tegra_pmc_readl(request); - value |= mask; - value &= ~IO_DPD_REQ_CODE_MASK; - value |= IO_DPD_REQ_CODE_ON; - tegra_pmc_writel(value, request); + tegra_pmc_writel(IO_DPD_REQ_CODE_ON | BIT(bit), request); - err = tegra_io_rail_poll(status, mask, mask, 250); + err = tegra_io_rail_poll(status, BIT(bit), BIT(bit), 250); if (err) goto error;
Reading the DPD_REQ & DPD2_REQ registers returns the previous requests. If we sets the current request bit with the returned value, then other pads will be turned on or off unexpectedly. Signed-off-by: Vince Hsu <vinceh@nvidia.com> --- Hi, I did not notice Laxman had a series[1] which also touched pmc code, and it seems the series isn't merged yet. Should I rebase this patch on it? Thanks, Vince drivers/soc/tegra/pmc.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)