[PATCH] pinctrl: mediatek: Implement wake handler and suspend resume
Daniel Kurtz
djkurtz at chromium.org
Thu Aug 13 09:16:16 PDT 2015
Hi Maoguang,
This patch looks pretty good now. Just some small nitpicks below...
On Thu, Aug 13, 2015 at 4:18 PM, <maoguang.meng at mediatek.com> wrote:
> From: Maoguang Meng <maoguang.meng at mediatek.com>
>
> This patch implement irq_set_wake to get who is wakeup source and
> setup on suspend resume.
>
> Signed-off-by: Maoguang Meng <maoguang.meng at mediatek.com>
>
> ---
> changes since v2:
> -modify irq_wake to handle irq wakeup source.
> -allocate two buffers separately.
> -fix some codestyle.
>
> Changes since v1:
> -implement irq_wake handler.
> ---
> drivers/pinctrl/mediatek/pinctrl-mt8173.c | 1 +
> drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 94 ++++++++++++++++++++++++++-
> drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 4 ++
> 3 files changed, 97 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8173.c b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
> index d0c811d..ad27184 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mt8173.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
> @@ -385,6 +385,7 @@ static struct platform_driver mtk_pinctrl_driver = {
> .driver = {
> .name = "mediatek-mt8173-pinctrl",
> .of_match_table = mt8173_pctrl_match,
> + .pm = &mtk_eint_pm_ops,
> },
> };
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index ad1ea16..7d4ba926 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -33,6 +33,7 @@
> #include <linux/mfd/syscon.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> +#include <linux/pm.h>
> #include <dt-bindings/pinctrl/mt65xx.h>
>
> #include "../core.h"
> @@ -1062,11 +1063,82 @@ static int mtk_eint_set_type(struct irq_data *d,
> return 0;
> }
>
> +static int mtk_eint_irq_set_wake(struct irq_data *d, unsigned int on)
> +{
> + struct mtk_pinctrl *pctl = irq_data_get_irq_chip_data(d);
> + int shift = d->hwirq & 0x1f;
> + int reg = d->hwirq >> 5;
> +
> + if (on)
> + pctl->wake_mask[reg] |= BIT(shift);
> + else
> + pctl->wake_mask[reg] &= ~BIT(shift);
> +
> + return 0;
> +}
> +
> +static void mtk_eint_chip_write_mask(const struct mtk_eint_offsets *chip,
> + void __iomem *eint_reg_base, u32 *buf)
> +{
> + int port;
> + void __iomem *reg;
> +
> + for (port = 0; port < chip->ports; port++) {
> + reg = eint_reg_base + (port << 2);
> + writel_relaxed(~buf[port], reg + chip->mask_set);
> + writel_relaxed(buf[port], reg + chip->mask_clr);
> + }
> +}
> +
> +static void mtk_eint_chip_read_mask(const struct mtk_eint_offsets *chip,
> + void __iomem *eint_reg_base, u32 *buf)
> +{
> + int port;
> + void __iomem *reg;
> +
> + for (port = 0; port < chip->ports; port++) {
> + reg = eint_reg_base + chip->mask + (port << 2);
> + buf[port] = ~readl_relaxed(reg);
You are storing the registers inverted.
This is a bit counter-intuititve, so please add a comment....
Better yet, perhaps just do the inversion when modifying wake_mask[]
in mtk_eint_irq_set_wake() (and add the comment there):
/* Mask is 0 when irq is enabled, and 1 when disabled. */
> + }
> +}
> +
> +static int mtk_eint_suspend(struct device *device)
> +{
> + void __iomem *reg;
> + struct mtk_pinctrl *pctl = dev_get_drvdata(device);
> + const struct mtk_eint_offsets *eint_offsets =
> + &pctl->devdata->eint_offsets;
> +
> + reg = pctl->eint_reg_base;
> + mtk_eint_chip_read_mask(eint_offsets, reg, pctl->cur_mask);
> + mtk_eint_chip_write_mask(eint_offsets, reg, pctl->wake_mask);
> +
> + return 0;
> +}
> +
> +static int mtk_eint_resume(struct device *device)
> +{
> + struct platform_device *pdev = to_platform_device(device);
> + struct mtk_pinctrl *pctl = platform_get_drvdata(pdev);
Aren't these two lines just:
struct mtk_pinctrl *pctl = dev_get_drvdata(device);
> + const struct mtk_eint_offsets *eint_offsets =
> + &pctl->devdata->eint_offsets;
> +
> + mtk_eint_chip_write_mask(eint_offsets,
> + pctl->eint_reg_base, pctl->cur_mask);
> +
> + return 0;
> +}
> +
> +const struct dev_pm_ops mtk_eint_pm_ops = {
> + .suspend = mtk_eint_suspend,
> + .resume = mtk_eint_resume,
> +};
> +
> static void mtk_eint_ack(struct irq_data *d)
> {
> struct mtk_pinctrl *pctl = irq_data_get_irq_chip_data(d);
> const struct mtk_eint_offsets *eint_offsets =
> - &pctl->devdata->eint_offsets;
> + &pctl->devdata->eint_offsets;
Unrelated change; it is often preferred to fix something like this in
a separate patch.
> u32 mask = BIT(d->hwirq & 0x1f);
> void __iomem *reg = mtk_eint_get_offset(pctl, d->hwirq,
> eint_offsets->ack);
> @@ -1076,10 +1148,12 @@ static void mtk_eint_ack(struct irq_data *d)
>
> static struct irq_chip mtk_pinctrl_irq_chip = {
> .name = "mt-eint",
> + .irq_disable = mtk_eint_mask,
> .irq_mask = mtk_eint_mask,
> .irq_unmask = mtk_eint_unmask,
> .irq_ack = mtk_eint_ack,
> .irq_set_type = mtk_eint_set_type,
> + .irq_set_wake = mtk_eint_irq_set_wake,
> .irq_request_resources = mtk_pinctrl_irq_request_resources,
> .irq_release_resources = mtk_pinctrl_irq_release_resources,
> };
> @@ -1217,7 +1291,7 @@ int mtk_pctrl_init(struct platform_device *pdev,
> struct device_node *np = pdev->dev.of_node, *node;
> struct property *prop;
> struct resource *res;
> - int i, ret, irq;
> + int i, ret, irq, ports_buf;
>
> pctl = devm_kzalloc(&pdev->dev, sizeof(*pctl), GFP_KERNEL);
> if (!pctl)
> @@ -1319,6 +1393,22 @@ int mtk_pctrl_init(struct platform_device *pdev,
> goto chip_error;
> }
>
> + ports_buf = ALIGN(pctl->devdata->eint_offsets.ports,
> + sizeof(long)/sizeof(u32));
Why this ALIGN?
Shouldn't we allocate eint_offsets.ports * sizeof(u32), like this:
pctl->wake_mask = devm_kcalloc(&pdev->dev, pctl->devdata->eint_offsets.ports,
sizeof(*pctl->wake_mask), GFP_KERNEL);
Thanks,
-Dan
> + pctl->wake_mask = devm_kcalloc(&pdev->dev, ports_buf,
> + sizeof(*pctl->wake_mask), GFP_KERNEL);
> + if (!pctl->wake_mask) {
> + ret = -ENOMEM;
> + goto chip_error;
> + }
> +
> + pctl->cur_mask = devm_kcalloc(&pdev->dev, ports_buf,
> + sizeof(*pctl->cur_mask), GFP_KERNEL);
> + if (!pctl->cur_mask) {
> + ret = -ENOMEM;
> + goto chip_error;
> + }
> +
> pctl->eint_dual_edges = devm_kcalloc(&pdev->dev, pctl->devdata->ap_num,
> sizeof(int), GFP_KERNEL);
> if (!pctl->eint_dual_edges) {
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
> index 30213e5..f1be8e8 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
> @@ -266,6 +266,8 @@ struct mtk_pinctrl {
> void __iomem *eint_reg_base;
> struct irq_domain *domain;
> int *eint_dual_edges;
> + u32 *wake_mask;
> + u32 *cur_mask;
> };
>
> int mtk_pctrl_init(struct platform_device *pdev,
> @@ -281,4 +283,6 @@ int mtk_pconf_spec_set_ies_smt_range(struct regmap *regmap,
> const struct mtk_pin_ies_smt_set *ies_smt_infos, unsigned int info_num,
> unsigned int pin, unsigned char align, int value);
>
> +extern const struct dev_pm_ops mtk_eint_pm_ops;
> +
> #endif /* __PINCTRL_MTK_COMMON_H */
> --
> 1.8.1.1.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
More information about the Linux-mediatek
mailing list