From: Andy Shevchenko <andriy.shevchenko@intel.com>
To: Chris Chiu <chiu@endlessm.com>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
Daniel Drake <drake@endlessm.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Linus Walleij <linus.walleij@linaro.org>,
"open list:PIN CONTROL SUBSYSTEM" <linux-gpio@vger.kernel.org>,
Linux Kernel <linux-kernel@vger.kernel.org>,
Linux Upstreaming Team <linux@endlessm.com>
Subject: Re: [PATCH] pinctrl: intel: save HOSTSW_OWN register over suspend/resume
Date: Tue, 2 Apr 2019 14:58:36 +0300 [thread overview]
Message-ID: <20190402115836.GL9224@smile.fi.intel.com> (raw)
In-Reply-To: <CAB4CAwd6+6+Qwb2wDFkVOc_auTNdrEw07tX2ha=XLvxfwFHRXw@mail.gmail.com>
On Tue, Apr 02, 2019 at 02:16:19PM +0800, Chris Chiu wrote:
> On Mon, Apr 1, 2019 at 8:23 PM Andy Shevchenko
> <andriy.shevchenko@intel.com> wrote:
> > On Mon, Apr 01, 2019 at 06:41:57PM +0800, Chris Chiu wrote:
> Thanks for the comment. My first version did mimic the logic of the interrupt
> mask restore but it was based on the DMI quirk. It saves HOSTSW_OWN
> for each padgroup and restores them all after resume if DMI info matched.
>
> What really confused me is how to do this specifically for a requested GPIO
> pin. So here's my new proposed patch. Please suggests if there's any better
> idea. Thanks.
> struct intel_community_context {
> u32 *intmask;
> + u32 *hostown;
This is okay.
> };
> +#ifdef CONFIG_PM_SLEEP
> +static void intel_save_hostown(struct intel_pinctrl *pctrl, unsigned int pin);
> +#endif
> +
No need for this...
> /* Disable TX buffer and enable RX (this will be input) */
> __intel_gpio_set_direction(padcfg0, true);
> +#ifdef CONFIG_PM_SLEEP
> + intel_save_hostown(pctrl, pin);
> +#endif
...and for this.
Just save all of them at ->suspend()
> for (i = 0; i < pctrl->ncommunities; i++) {
> struct intel_community *community = &pctrl->communities[i];
> - u32 *intmask;
> + u32 *intmask, *hostown;
>
> intmask = devm_kcalloc(pctrl->dev, community->ngpps,
> sizeof(*intmask), GFP_KERNEL);
> @@ -1292,6 +1299,13 @@ static int intel_pinctrl_pm_init(struct
> intel_pinctrl *pctrl)
> return -ENOMEM;
>
> communities[i].intmask = intmask;
> +
> + hostown = devm_kcalloc(pctrl->dev, community->ngpps,
> + sizeof(*hostown), GFP_KERNEL);
> + if (!hostown)
> + return -ENOMEM;
> +
> + communities[i].hostown= hostown;
This is good.
> }
> +static void intel_save_hostown(struct intel_pinctrl *pctrl, unsigned int pin)
> +{
> + const struct intel_community *community;
> + const struct intel_padgroup *padgrp;
> + int i;
> +
> + community = intel_get_community(pctrl, pin);
> + if (!community)
> + return;
> + if (!community->hostown_offset)
> + return;
> +
> + padgrp = intel_community_get_padgroup(community, pin);
> + if (!padgrp)
> + return;
> +
> + for (i = 0; i < pctrl->ncommunities; i++) {
> + const struct intel_community *comm = &pctrl->communities[i];
> + int j;
> +
> + for (j = 0; j < comm->ngpps; j++) {
> + const struct intel_padgroup *pgrp = &comm->gpps[j];
> +
> + if (padgrp == pgrp) {
> + struct intel_community_context *communities;
> + void __iomem *base;
> +
> + communities = pctrl->context.communities;
> + base = community->regs +
> community->hostown_offset;
> + communities[i].hostown[j] = readl(base + j * 4);
> + break;
> + }
> + }
> + }
> + return;
Useless.
> +}
This is too complicated. Just add
base = community->regs + community->hostown_offset;
for (gpp = 0; gpp < community->ngpps; gpp++)
communities[i].hostown[gpp] = readl(base + gpp * 4);
into ->suspend() loop.
> + base = community->regs + community->hostown_offset;
> + for (gpp = 0; gpp < community->ngpps; gpp++) {
> + if (communities[i].hostown[gpp] &&
> + communities[i].hostown[gpp] != readl(base
> + gpp * 4)) {
> + writel(communities[i].hostown[gpp],
> base + gpp * 4);
> + dev_warn(dev, "hostown changed after resume\n");
> + dev_dbg(dev, "restored hostown %d/%u
> %#08x\n", i, gpp,
> + readl(base + gpp * 4));
> + }
> + }
Instead you may need to loop over each pin in the part of the group related to
one 32-bit HOSTSW_OWN register (i.e. 8, see PADOWN_*() macros in the driver),
check if it's requested and break a loop. If loop index is off-by-one a limit,
nothing to do, otherwise restore hostown register.
More pedantic approach is to collect the mask inside the loop and apply it.
The check function name is gpiochip_is_requested().
(One of Intel's drivers which is using that at ->resume() is
drivers/gpio/gpio-lynxpoint.c)
P.S. I prefer pedantic approach. The simplification one is showed in order to
give you an idea.
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2019-04-02 11:58 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 10:41 [PATCH] pinctrl: intel: save HOSTSW_OWN register over suspend/resume Chris Chiu
[not found] ` <20171115080446.GY17200@lahna.fi.intel.com>
2017-11-15 8:08 ` Chris Chiu
2017-11-15 10:13 ` Mika Westerberg
2017-11-15 10:19 ` Chris Chiu
2017-11-16 12:44 ` Mika Westerberg
2017-11-16 13:27 ` Chris Chiu
2017-11-17 6:49 ` Mika Westerberg
2017-11-17 8:11 ` Chris Chiu
2017-11-21 10:52 ` Mika Westerberg
2017-11-21 11:54 ` Chris Chiu
2017-11-21 12:04 ` Mika Westerberg
2017-11-23 12:24 ` Chris Chiu
2017-11-23 12:43 ` Mika Westerberg
2019-03-27 8:22 ` Daniel Drake
2019-03-27 17:29 ` Mika Westerberg
2019-03-28 8:28 ` Mika Westerberg
2019-03-28 9:17 ` Andy Shevchenko
2019-03-28 9:38 ` Daniel Drake
2019-03-28 12:19 ` Chris Chiu
2019-03-28 12:34 ` Mika Westerberg
2019-03-29 8:38 ` Chris Chiu
2019-04-01 7:49 ` Mika Westerberg
2019-04-01 10:41 ` Chris Chiu
2019-04-01 12:22 ` Andy Shevchenko
2019-04-02 6:16 ` Chris Chiu
2019-04-02 11:58 ` Andy Shevchenko [this message]
2019-04-03 7:06 ` Chris Chiu
2019-04-03 13:06 ` Andy Shevchenko
2019-04-04 13:06 ` Chris Chiu
2019-04-04 13:59 ` Andy Shevchenko
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=20190402115836.GL9224@smile.fi.intel.com \
--to=andriy.shevchenko@intel.com \
--cc=chiu@endlessm.com \
--cc=drake@endlessm.com \
--cc=heikki.krogerus@linux.intel.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@endlessm.com \
--cc=mika.westerberg@linux.intel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).