pinctrl:intel: Retain HOSTSW_OWN for requested gpio pin
Subsystems (3)
PATCH v3 1/1 pinctrl:intel: Retain HOSTSW_OWN for requested gpio pin
The touchpad of the ASUS laptops E403NA, X540NA, X541NA are not responsive after suspend/resume. The following error message shows after resume.
i2c_hid i2c-ELAN1200:00: failed to reset device.
On these laptops, the touchpad interrupt is connected via a GPIO pin which is controlled by Intel pinctrl. After system resumes, the GPIO is in ACPI mode and no longer works as an IRQ.
This commit saves the HOSTSW_OWN value during suspend, make sure the HOSTSW_OWN mode remains the same after resume.
---
Note:
v2: update hostown and show pr_info only when the host mode
change on requsted GPIO is not expected.
v3: change return type of intel_gpio_update_pad_mode() from
void to u32 and use dev_warn instead of pr_info.
drivers/pinctrl/intel/pinctrl-intel.c | 56 ++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-)
drivers/pinctrl/intel/pinctrl-intel.c +55 -1
@@ -81,6 +81,7 @@ struct intel_pad_context {struct intel_community_context {u32 *intmask; +u32 *hostown; };struct intel_pinctrl_context {
@@ -1284,7 +1285,7 @@ static int intel_pinctrl_pm_init(struct intel_pinctrl *pctrl)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 +1293,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; } pctrl->context.pads = pads;
@@ -1503,6 +1511,10 @@ int intel_pinctrl_suspend(struct device *dev) base = community->regs + community->ie_offset;for (gpp =0 ; gpp < community->ngpps; gpp++) communities[i].intmask[gpp] =readl (base + gpp *4 ); + + base = community->regs + community->hostown_offset; +for (gpp =0 ; gpp < community->ngpps; gpp++) + communities[i].hostown[gpp] =readl (base + gpp *4 ); }return 0 ;
@@ -1529,6 +1541,29 @@ static void intel_gpio_irq_init(struct intel_pinctrl *pctrl) } } +static u32 +intel_gpio_is_requested (struct gpio_chip *chip,int base,unsigned int size) +{ +u32 requested =0 ; +unsigned int i; + +for (i =0 ; i < size; i++) +if (gpiochip_is_requested (chip, base + i)) + requested |=BIT (i); + +return requested; +} + +static u32 +intel_gpio_update_pad_mode (void __iomem *hostown,u32 mask,u32 value) +{ +u32 curr =readl (hostown); +u32 updated = (curr & ~mask) | (value & mask); + +writel (updated, hostown); +return curr; +} +int intel_pinctrl_resume (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);
@@ -1588,6 +1623,25 @@ int intel_pinctrl_resume(struct device *dev)dev_dbg (dev,"restored mask %d/%u %#08x\n" , i, gpp,readl (base + gpp *4 )); } + + base = community->regs + community->hostown_offset; +for (gpp =0 ; gpp < community->ngpps; gpp++) { +const struct intel_padgroup *padgrp = &community->gpps[gpp]; +u32 requested =0 , value =0 ; +u32 saved = communities[i].hostown[gpp]; + +if (padgrp->gpio_base <0 ) +continue ; + + requested =intel_gpio_is_requested (&pctrl->chip, + padgrp->gpio_base, padgrp->size); + value =intel_gpio_update_pad_mode (base + gpp *4 , + requested, saved); +if ((value ^ saved) & requested) { +dev_warn (dev,"restore hostown %d/%u %#8x->%#8x\n" , + i, gpp, value, saved); + } + } }return 0 ;
Signature · 1 line
2.21.0
Quoted 5 lines · Chris Chiu
The touchpad of the ASUS laptops E403NA, X540NA, X541NA are not responsive after suspend/resume. The following error message shows after resume.
i2c_hidi2c-ELAN1200:00: failed to reset device.
Quoted 8 lines
On these laptops, the touchpad interrupt is connected via a GPIO pin which is controlled by Intel pinctrl. After system resumes, the GPIO is in ACPI mode and no longer works as an IRQ.
This commit saves the
HOSTSW_OWNvalue during suspend, make sure theHOSTSW_OWNmode remains the same after resume.Signed-off-by Chris Chiu <[email protected]>
Quoted 5 lines · Chris Chiu
The touchpad of the ASUS laptops E403NA, X540NA, X541NA are not responsive after suspend/resume. The following error message shows after resume.
i2c_hidi2c-ELAN1200:00: failed to reset device.
Quoted 8 lines
On these laptops, the touchpad interrupt is connected via a GPIO pin which is controlled by Intel pinctrl. After system resumes, the GPIO is in ACPI mode and no longer works as an IRQ.
This commit saves the
HOSTSW_OWNvalue during suspend, make sure theHOSTSW_OWNmode remains the same after resume.Signed-off-by Chris Chiu <[email protected]>
This v3 patch applied with Mika's ACK.
Yours,
Linus Walleij
Quoted 11 lines · Linus Walleij
Quoted 9 lines · Chris Chiu
The touchpad of the ASUS laptops E403NA, X540NA, X541NA are not responsive after suspend/resume. The following error message shows after resume.
i2c_hidi2c-ELAN1200:00: failed to reset device.On these laptops, the touchpad interrupt is connected via a GPIO pin which is controlled by Intel pinctrl. After system resumes, the GPIO is in ACPI mode and no longer works as an IRQ.
Quoted 6 lines
Quoted 4 lines
This commit saves the
HOSTSW_OWNvalue during suspend, make sure theHOSTSW_OWNmode remains the same after resume.Signed-off-by Chris Chiu <[email protected]>This v3 patch applied with Mika's ACK.
Hmm... It's supposed to go along with our PR.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 13 lines · Andriy Shevchenko
Quoted 11 lines · Linus Walleij
Quoted 9 lines · Chris Chiu
The touchpad of the ASUS laptops E403NA, X540NA, X541NA are not responsive after suspend/resume. The following error message shows after resume.
i2c_hidi2c-ELAN1200:00: failed to reset device.On these laptops, the touchpad interrupt is connected via a GPIO pin which is controlled by Intel pinctrl. After system resumes, the GPIO is in ACPI mode and no longer works as an IRQ.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
This commit saves the
HOSTSW_OWNvalue during suspend, make sure theHOSTSW_OWNmode remains the same after resume.Signed-off-by Chris Chiu <[email protected]>This v3 patch applied with Mika's ACK.
Hmm... It's supposed to go along with our PR.
Anything I can help with?
Chris
Quoted 6 lines
--
With Best Regards,
Andy Shevchenko
Quoted 10 lines · Chris Chiu
Quoted 6 lines · Andriy Shevchenko
Quoted 3 lines · Linus Walleij
On Mon, Apr 15, 2019 at 7:54 AM Chris Chiu <[email protected]> wrote:
This v3 patch applied with Mika's ACK.
Hmm... It's supposed to go along with our PR.
Anything I can help with?
Not sure.
I sent PR to Linus and asked at the same time to drop Intel specifics from devel queue. Fortunately, for-next doesn't have such issue. Linus?
Signature · 2 lines
With Best Regards, Andy Shevchenko