diff mbox series

[RESEND,v3,2/2] pinctrl: mediatek: adapt to multi-base design

Message ID 20250125025145.14405-3-ot_chhao.chang@mediatek.com (mailing list archive)
State New
Headers show
Series [RESEND,v3,1/2] pinctrl: mediatek: update EINT base retrieval method | expand

Commit Message

Chhao Chang (常浩) Jan. 25, 2025, 2:51 a.m. UTC 
The eint num will obtain the operation address through pins.
Change the traversal method of irq handle from traversing a set of
registers to traversing one by one.

Change-Id: I3962b78042d32501a73153201cddf52c6b62a695
Signed-off-by: Hao Chang <ot_chhao.chang@mediatek.com>
Signed-off-by: Qingliang Li <qingliang.li@mediatek.com>
---
 drivers/pinctrl/mediatek/mtk-eint.c | 38 +++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

Comments

AngeloGioacchino Del Regno Jan. 27, 2025, 11:48 a.m. UTC | #1 
Il 25/01/25 03:51, Hao Chang ha scritto:
> The eint num will obtain the operation address through pins.
> Change the traversal method of irq handle from traversing a set of
> registers to traversing one by one.
> 
> Change-Id: I3962b78042d32501a73153201cddf52c6b62a695
> Signed-off-by: Hao Chang <ot_chhao.chang@mediatek.com>
> Signed-off-by: Qingliang Li <qingliang.li@mediatek.com>
> ---
>   drivers/pinctrl/mediatek/mtk-eint.c | 38 +++++++++++++++++++----------
>   1 file changed, 25 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c
> index 540245c3128d..949a20196f74 100644
> --- a/drivers/pinctrl/mediatek/mtk-eint.c
> +++ b/drivers/pinctrl/mediatek/mtk-eint.c
> @@ -513,6 +513,7 @@ EXPORT_SYMBOL_GPL(mtk_eint_find_irq);
>   int mtk_eint_do_init(struct mtk_eint *eint)
>   {
>   	unsigned int size, i, port;
> +	struct mtk_pinctrl *hw = (struct mtk_pinctrl *)eint->pctl;
>   
>   	/* If clients don't assign a specific regs, let's use generic one */
>   	if (!eint->regs)
> @@ -523,11 +524,11 @@ int mtk_eint_do_init(struct mtk_eint *eint)
>   	if (!eint->base_pin_num)
>   		return -ENOMEM;
>   
> -	if (!eint->pins) {
> +	if (eint->nbase == 1) {
>   		size = eint->hw->ap_num * sizeof(struct mtk_eint_pin);
>   		eint->pins = devm_kmalloc(eint->dev, size, GFP_KERNEL);
>   		if (!eint->pins)
> -			return -ENOMEM;
> +			goto err_eint;
>   
>   		eint->base_pin_num[0] = eint->hw->ap_num;
>   		for (i = 0; i < eint->hw->ap_num; i++) {
> @@ -536,34 +537,29 @@ int mtk_eint_do_init(struct mtk_eint *eint)
>   			eint->pins[i].debounce = (i < eint->hw->db_cnt) ? 1 : 0;
>   		}
>   	} else {
> +		eint->pins = hw->soc->eint_pin;
>   		for (i = 0; i < eint->hw->ap_num; i++)
>   			eint->base_pin_num[eint->pins[i].instance]++;
>   	}
>   
>   	eint->wake_mask = devm_kmalloc(eint->dev, eint->nbase * sizeof(u32 *), GFP_KERNEL);
> -	if (!eint->wake_mask)
> -		return -ENOMEM;
> -
>   	eint->cur_mask = devm_kmalloc(eint->dev, eint->nbase * sizeof(u32 *), GFP_KERNEL);
> -	if (!eint->wake_mask)
> -		return -ENOMEM;

This error checking was fine. Please keep it correct.

if (!eint->wake_mask) {
	ret = -ENOMEM;
	goto err_wake_mask_alloc;
}

and

if (!eint->cur_mask) {
	ret = -ENOMEM;
	goto err_cur_mask_alloc;
}

> +	if (!eint->wake_mask || !eint->wake_mask)
> +		goto err_eint;
>   
>   	for (i = 0; i < eint->nbase; i++) {
>   		port = (eint->base_pin_num[i] + 31) / 32;
>   		eint->wake_mask[i] = devm_kzalloc(eint->dev, port * sizeof(u32), GFP_KERNEL);
> -		if (!eint->wake_mask[i])
> -			return -ENOMEM;
> -
>   		eint->cur_mask[i] = devm_kzalloc(eint->dev, port * sizeof(u32), GFP_KERNEL);
> -		if (!eint->cur_mask[i])
> -			return -ENOMEM;
> +		if (!eint->cur_mask[i] || !eint->wake_mask[i])
> +			goto err_eint;

same here

>   	}
>   
>   	eint->domain = irq_domain_add_linear(eint->dev->of_node,
>   					     eint->hw->ap_num,
>   					     &irq_domain_simple_ops, NULL);
>   	if (!eint->domain)
> -		return -ENOMEM;
> +		goto err_eint;
>   
>   	if (eint->hw->db_time) {
>   		for (i = 0; i < MTK_EINT_DBNC_MAX; i++)
> @@ -585,6 +581,22 @@ int mtk_eint_do_init(struct mtk_eint *eint)
>   					 eint);
>   
>   	return 0;
> +
> +err_eint:
> +	for (i = 0; i < eint->nbase; i++) {
> +		if (eint->wake_mask[i])
> +			devm_kfree(eint->dev, eint->wake_mask[i]);
> +		if (eint->cur_mask[i])
> +			devm_kfree(eint->dev, eint->cur_mask[i]);
> +	}
> +	if (eint->cur_mask)
> +		devm_kfree(eint->dev, eint->cur_mask);
> +	if (eint->wake_mask)
> +		devm_kfree(eint->dev, eint->wake_mask);
> +	if (eint->nbase == 1)
> +		devm_kfree(eint->dev, eint->pins);
> +	devm_kfree(eint->dev, eint->base_pin_num);

...and you should only kfree what was successfully allocated before.

Regards,
Angelo

> +	return -ENOMEM;
>   }
>   EXPORT_SYMBOL_GPL(mtk_eint_do_init);
>
Chhao Chang (常浩) Feb. 19, 2025, 7:28 a.m. UTC | #2 
On Mon, 2025-01-27 at 12:48 +0100, AngeloGioacchino Del Regno wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> Il 25/01/25 03:51, Hao Chang ha scritto:
> > The eint num will obtain the operation address through pins.
> > Change the traversal method of irq handle from traversing a set of
> > registers to traversing one by one.
> > 
> > Change-Id: I3962b78042d32501a73153201cddf52c6b62a695
> > Signed-off-by: Hao Chang <ot_chhao.chang@mediatek.com>
> > Signed-off-by: Qingliang Li <qingliang.li@mediatek.com>
> > ---
> >   drivers/pinctrl/mediatek/mtk-eint.c | 38 +++++++++++++++++++-----
> > -----
> >   1 file changed, 25 insertions(+), 13 deletions(-)
> > 
> > diff --git a/drivers/pinctrl/mediatek/mtk-eint.c
> > b/drivers/pinctrl/mediatek/mtk-eint.c
> > index 540245c3128d..949a20196f74 100644
> > --- a/drivers/pinctrl/mediatek/mtk-eint.c
> > +++ b/drivers/pinctrl/mediatek/mtk-eint.c
> > @@ -513,6 +513,7 @@ EXPORT_SYMBOL_GPL(mtk_eint_find_irq);
> >   int mtk_eint_do_init(struct mtk_eint *eint)
> >   {
> >       unsigned int size, i, port;
> > +     struct mtk_pinctrl *hw = (struct mtk_pinctrl *)eint->pctl;
> > 
> >       /* If clients don't assign a specific regs, let's use generic
> > one */
> >       if (!eint->regs)
> > @@ -523,11 +524,11 @@ int mtk_eint_do_init(struct mtk_eint *eint)
> >       if (!eint->base_pin_num)
> >               return -ENOMEM;
> > 
> > -     if (!eint->pins) {
> > +     if (eint->nbase == 1) {
> >               size = eint->hw->ap_num * sizeof(struct
> > mtk_eint_pin);
> >               eint->pins = devm_kmalloc(eint->dev, size,
> > GFP_KERNEL);
> >               if (!eint->pins)
> > -                     return -ENOMEM;
> > +                     goto err_eint;
> > 
> >               eint->base_pin_num[0] = eint->hw->ap_num;
> >               for (i = 0; i < eint->hw->ap_num; i++) {
> > @@ -536,34 +537,29 @@ int mtk_eint_do_init(struct mtk_eint *eint)
> >                       eint->pins[i].debounce = (i < eint->hw-
> > >db_cnt) ? 1 : 0;
> >               }
> >       } else {
> > +             eint->pins = hw->soc->eint_pin;
> >               for (i = 0; i < eint->hw->ap_num; i++)
> >                       eint->base_pin_num[eint->pins[i].instance]++;
> >       }
> > 
> >       eint->wake_mask = devm_kmalloc(eint->dev, eint->nbase *
> > sizeof(u32 *), GFP_KERNEL);
> > -     if (!eint->wake_mask)
> > -             return -ENOMEM;
> > -
> >       eint->cur_mask = devm_kmalloc(eint->dev, eint->nbase *
> > sizeof(u32 *), GFP_KERNEL);
> > -     if (!eint->wake_mask)
> > -             return -ENOMEM;
> 
> This error checking was fine. Please keep it correct.
> 
> if (!eint->wake_mask) {
>         ret = -ENOMEM;
>         goto err_wake_mask_alloc;
> }
> 
> and
> 
> if (!eint->cur_mask) {
>         ret = -ENOMEM;
>         goto err_cur_mask_alloc;
> }
> 
> > +     if (!eint->wake_mask || !eint->wake_mask)
> > +             goto err_eint;
> > 
> >       for (i = 0; i < eint->nbase; i++) {
> >               port = (eint->base_pin_num[i] + 31) / 32;
> >               eint->wake_mask[i] = devm_kzalloc(eint->dev, port *
> > sizeof(u32), GFP_KERNEL);
> > -             if (!eint->wake_mask[i])
> > -                     return -ENOMEM;
> > -
> >               eint->cur_mask[i] = devm_kzalloc(eint->dev, port *
> > sizeof(u32), GFP_KERNEL);
> > -             if (!eint->cur_mask[i])
> > -                     return -ENOMEM;
> > +             if (!eint->cur_mask[i] || !eint->wake_mask[i])
> > +                     goto err_eint;
> 
> same here
> 
> >       }
> > 
> >       eint->domain = irq_domain_add_linear(eint->dev->of_node,
> >                                            eint->hw->ap_num,
> >                                            &irq_domain_simple_ops,
> > NULL);
> >       if (!eint->domain)
> > -             return -ENOMEM;
> > +             goto err_eint;
> > 
> >       if (eint->hw->db_time) {
> >               for (i = 0; i < MTK_EINT_DBNC_MAX; i++)
> > @@ -585,6 +581,22 @@ int mtk_eint_do_init(struct mtk_eint *eint)
> >                                        eint);
> > 
> >       return 0;
> > +
> > +err_eint:
> > +     for (i = 0; i < eint->nbase; i++) {
> > +             if (eint->wake_mask[i])
> > +                     devm_kfree(eint->dev, eint->wake_mask[i]);
> > +             if (eint->cur_mask[i])
> > +                     devm_kfree(eint->dev, eint->cur_mask[i]);
> > +     }
> > +     if (eint->cur_mask)
> > +             devm_kfree(eint->dev, eint->cur_mask);
> > +     if (eint->wake_mask)
> > +             devm_kfree(eint->dev, eint->wake_mask);
> > +     if (eint->nbase == 1)
> > +             devm_kfree(eint->dev, eint->pins);
> > +     devm_kfree(eint->dev, eint->base_pin_num);
> 
> ...and you should only kfree what was successfully allocated before.
Thanks,I will fix this isssue.
> 
> Regards,
> Angelo
> 
> > +     return -ENOMEM;
> >   }
> >   EXPORT_SYMBOL_GPL(mtk_eint_do_init);
> > 
> 
>
Chen-Yu Tsai Feb. 19, 2025, 7:53 a.m. UTC | #3 
On Sat, Jan 25, 2025 at 10:55 AM Hao Chang <ot_chhao.chang@mediatek.com> wrote:
>
> The eint num will obtain the operation address through pins.
> Change the traversal method of irq handle from traversing a set of
> registers to traversing one by one.

The change only covers "eint", so please adjust the patch subject prefix
to "pinctrl: mediatek: eint: ...".

> Change-Id: I3962b78042d32501a73153201cddf52c6b62a695

Please remove the Change-Id when posting the patch.

ChenYu
Chhao Chang (常浩) Feb. 19, 2025, 8:02 a.m. UTC | #4 
On Wed, 2025-02-19 at 15:53 +0800, Chen-Yu Tsai wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> On Sat, Jan 25, 2025 at 10:55 AM Hao Chang <
> ot_chhao.chang@mediatek.com> wrote:
> > 
> > The eint num will obtain the operation address through pins.
> > Change the traversal method of irq handle from traversing a set of
> > registers to traversing one by one.
> 
> The change only covers "eint", so please adjust the patch subject
> prefix
> to "pinctrl: mediatek: eint: ...".
> 
> > Change-Id: I3962b78042d32501a73153201cddf52c6b62a695
> 
> Please remove the Change-Id when posting the patch.
Thanks for your suggestion, I will fix this.
> 
> ChenYu
diff mbox series

Patch

diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c
index 540245c3128d..949a20196f74 100644
--- a/drivers/pinctrl/mediatek/mtk-eint.c
+++ b/drivers/pinctrl/mediatek/mtk-eint.c
@@ -513,6 +513,7 @@  EXPORT_SYMBOL_GPL(mtk_eint_find_irq);
 int mtk_eint_do_init(struct mtk_eint *eint)
 {
 	unsigned int size, i, port;
+	struct mtk_pinctrl *hw = (struct mtk_pinctrl *)eint->pctl;
 
 	/* If clients don't assign a specific regs, let's use generic one */
 	if (!eint->regs)
@@ -523,11 +524,11 @@  int mtk_eint_do_init(struct mtk_eint *eint)
 	if (!eint->base_pin_num)
 		return -ENOMEM;
 
-	if (!eint->pins) {
+	if (eint->nbase == 1) {
 		size = eint->hw->ap_num * sizeof(struct mtk_eint_pin);
 		eint->pins = devm_kmalloc(eint->dev, size, GFP_KERNEL);
 		if (!eint->pins)
-			return -ENOMEM;
+			goto err_eint;
 
 		eint->base_pin_num[0] = eint->hw->ap_num;
 		for (i = 0; i < eint->hw->ap_num; i++) {
@@ -536,34 +537,29 @@  int mtk_eint_do_init(struct mtk_eint *eint)
 			eint->pins[i].debounce = (i < eint->hw->db_cnt) ? 1 : 0;
 		}
 	} else {
+		eint->pins = hw->soc->eint_pin;
 		for (i = 0; i < eint->hw->ap_num; i++)
 			eint->base_pin_num[eint->pins[i].instance]++;
 	}
 
 	eint->wake_mask = devm_kmalloc(eint->dev, eint->nbase * sizeof(u32 *), GFP_KERNEL);
-	if (!eint->wake_mask)
-		return -ENOMEM;
-
 	eint->cur_mask = devm_kmalloc(eint->dev, eint->nbase * sizeof(u32 *), GFP_KERNEL);
-	if (!eint->wake_mask)
-		return -ENOMEM;
+	if (!eint->wake_mask || !eint->wake_mask)
+		goto err_eint;
 
 	for (i = 0; i < eint->nbase; i++) {
 		port = (eint->base_pin_num[i] + 31) / 32;
 		eint->wake_mask[i] = devm_kzalloc(eint->dev, port * sizeof(u32), GFP_KERNEL);
-		if (!eint->wake_mask[i])
-			return -ENOMEM;
-
 		eint->cur_mask[i] = devm_kzalloc(eint->dev, port * sizeof(u32), GFP_KERNEL);
-		if (!eint->cur_mask[i])
-			return -ENOMEM;
+		if (!eint->cur_mask[i] || !eint->wake_mask[i])
+			goto err_eint;
 	}
 
 	eint->domain = irq_domain_add_linear(eint->dev->of_node,
 					     eint->hw->ap_num,
 					     &irq_domain_simple_ops, NULL);
 	if (!eint->domain)
-		return -ENOMEM;
+		goto err_eint;
 
 	if (eint->hw->db_time) {
 		for (i = 0; i < MTK_EINT_DBNC_MAX; i++)
@@ -585,6 +581,22 @@  int mtk_eint_do_init(struct mtk_eint *eint)
 					 eint);
 
 	return 0;
+
+err_eint:
+	for (i = 0; i < eint->nbase; i++) {
+		if (eint->wake_mask[i])
+			devm_kfree(eint->dev, eint->wake_mask[i]);
+		if (eint->cur_mask[i])
+			devm_kfree(eint->dev, eint->cur_mask[i]);
+	}
+	if (eint->cur_mask)
+		devm_kfree(eint->dev, eint->cur_mask);
+	if (eint->wake_mask)
+		devm_kfree(eint->dev, eint->wake_mask);
+	if (eint->nbase == 1)
+		devm_kfree(eint->dev, eint->pins);
+	devm_kfree(eint->dev, eint->base_pin_num);
+	return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(mtk_eint_do_init);