Commit a87eaffb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fixes from Linus Walleij:
 "Here are some Renesas and AMD driver fixes, the AMD fix affects
  important laptops in the wild so this one is pretty important. It
  seems a bit tough to get this right.

   - Fix DT parsing and related locking in the Renesas driver.

   - Fix wakeup IRQs in the AMD driver once again. Really tricky this
     one"

* tag 'pinctrl-v6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: amd: Mask wake bits on probe again
  pinctrl: renesas: rza2: Add lock around pinctrl_generic{{add,remove}_group,{add,remove}_function}
  pinctrl: renesas: rzv2m: Fix NULL pointer dereference in rzv2m_dt_subnode_to_map()
  pinctrl: renesas: rzg2l: Fix NULL pointer dereference in rzg2l_dt_subnode_to_map()
parents ced5bf24 6bc3462a

drivers/pinctrl/pinctrl-amd.c

+30 −0
Original line number Diff line number Diff line
@@ -862,6 +862,33 @@ static const struct pinconf_ops amd_pinconf_ops = { 
	.pin_config_group_set = amd_pinconf_group_set,

};



static void amd_gpio_irq_init(struct amd_gpio *gpio_dev)

{

	struct pinctrl_desc *desc = gpio_dev->pctrl->desc;

	unsigned long flags;

	u32 pin_reg, mask;

	int i;



	mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3) |

		BIT(WAKE_CNTRL_OFF_S4);



	for (i = 0; i < desc->npins; i++) {

		int pin = desc->pins[i].number;

		const struct pin_desc *pd = pin_desc_get(gpio_dev->pctrl, pin);



		if (!pd)

			continue;



		raw_spin_lock_irqsave(&gpio_dev->lock, flags);



		pin_reg = readl(gpio_dev->base + pin * 4);

		pin_reg &= ~mask;

		writel(pin_reg, gpio_dev->base + pin * 4);



		raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);

	}

}



#ifdef CONFIG_PM_SLEEP

static bool amd_gpio_should_save(struct amd_gpio *gpio_dev, unsigned int pin)

{
@@ -1099,6 +1126,9 @@ static int amd_gpio_probe(struct platform_device *pdev) 
		return PTR_ERR(gpio_dev->pctrl);

	}



	/* Disable and mask interrupts */

	amd_gpio_irq_init(gpio_dev);



	girq = &gpio_dev->gc.irq;

	gpio_irq_chip_set_chip(girq, &amd_gpio_irqchip);

	/* This will let us handle the parent IRQ in the driver */

drivers/pinctrl/renesas/pinctrl-rza2.c

+15 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/gpio/driver.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of_device.h>

#include <linux/pinctrl/pinmux.h>
@@ -46,6 +47,7 @@ struct rza2_pinctrl_priv { 
	struct pinctrl_dev *pctl;

	struct pinctrl_gpio_range gpio_range;

	int npins;

	struct mutex mutex; /* serialize adding groups and functions */

};



#define RZA2_PDR(port)		(0x0000 + (port) * 2)	/* Direction 16-bit */
@@ -358,10 +360,14 @@ static int rza2_dt_node_to_map(struct pinctrl_dev *pctldev, 
		psel_val[i] = MUX_FUNC(value);

	}



	mutex_lock(&priv->mutex);



	/* Register a single pin group listing all the pins we read from DT */

	gsel = pinctrl_generic_add_group(pctldev, np->name, pins, npins, NULL);

	if (gsel < 0)

		return gsel;

	if (gsel < 0) {

		ret = gsel;

		goto unlock;

	}



	/*

	 * Register a single group function where the 'data' is an array PSEL
@@ -390,6 +396,8 @@ static int rza2_dt_node_to_map(struct pinctrl_dev *pctldev, 
	(*map)->data.mux.function = np->name;

	*num_maps = 1;



	mutex_unlock(&priv->mutex);



	return 0;



remove_function:
@@ -398,6 +406,9 @@ static int rza2_dt_node_to_map(struct pinctrl_dev *pctldev, 
remove_group:

	pinctrl_generic_remove_group(pctldev, gsel);



unlock:

	mutex_unlock(&priv->mutex);



	dev_err(priv->dev, "Unable to parse DT node %s\n", np->name);



	return ret;
@@ -473,6 +484,8 @@ static int rza2_pinctrl_probe(struct platform_device *pdev) 
	if (IS_ERR(priv->base))

		return PTR_ERR(priv->base);



	mutex_init(&priv->mutex);



	platform_set_drvdata(pdev, priv);



	priv->npins = (int)(uintptr_t)of_device_get_match_data(&pdev->dev) *

drivers/pinctrl/renesas/pinctrl-rzg2l.c

+12 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/seq_file.h>
@@ -149,10 +150,11 @@ struct rzg2l_pinctrl { 
	struct gpio_chip		gpio_chip;

	struct pinctrl_gpio_range	gpio_range;

	DECLARE_BITMAP(tint_slot, RZG2L_TINT_MAX_INTERRUPT);

	spinlock_t			bitmap_lock;

	spinlock_t			bitmap_lock; /* protect tint_slot bitmap */

	unsigned int			hwirq[RZG2L_TINT_MAX_INTERRUPT];



	spinlock_t			lock;

	spinlock_t			lock; /* lock read/write registers */

	struct mutex			mutex; /* serialize adding groups and functions */

};



static const unsigned int iolh_groupa_mA[] = { 2, 4, 8, 12 };
@@ -362,11 +364,13 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
		name = np->name;

	}



	mutex_lock(&pctrl->mutex);



	/* Register a single pin group listing all the pins we read from DT */

	gsel = pinctrl_generic_add_group(pctldev, name, pins, num_pinmux, NULL);

	if (gsel < 0) {

		ret = gsel;

		goto done;

		goto unlock;

	}



	/*
@@ -380,6 +384,8 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
		goto remove_group;

	}



	mutex_unlock(&pctrl->mutex);



	maps[idx].type = PIN_MAP_TYPE_MUX_GROUP;

	maps[idx].data.mux.group = name;

	maps[idx].data.mux.function = name;
@@ -391,6 +397,8 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev, 


remove_group:

	pinctrl_generic_remove_group(pctldev, gsel);

unlock:

	mutex_unlock(&pctrl->mutex);

done:

	*index = idx;

	kfree(configs);
@@ -1509,6 +1517,7 @@ static int rzg2l_pinctrl_probe(struct platform_device *pdev) 


	spin_lock_init(&pctrl->lock);

	spin_lock_init(&pctrl->bitmap_lock);

	mutex_init(&pctrl->mutex);



	platform_set_drvdata(pdev, pctrl);

drivers/pinctrl/renesas/pinctrl-rzv2m.c

+11 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/gpio/driver.h>

#include <linux/io.h>

#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/of_device.h>

#include <linux/spinlock.h>
@@ -123,7 +124,8 @@ struct rzv2m_pinctrl { 
	struct gpio_chip		gpio_chip;

	struct pinctrl_gpio_range	gpio_range;



	spinlock_t			lock;

	spinlock_t			lock; /* lock read/write registers */

	struct mutex			mutex; /* serialize adding groups and functions */

};



static const unsigned int drv_1_8V_group2_uA[] = { 1800, 3800, 7800, 11000 };
@@ -322,11 +324,13 @@ static int rzv2m_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
		name = np->name;

	}



	mutex_lock(&pctrl->mutex);



	/* Register a single pin group listing all the pins we read from DT */

	gsel = pinctrl_generic_add_group(pctldev, name, pins, num_pinmux, NULL);

	if (gsel < 0) {

		ret = gsel;

		goto done;

		goto unlock;

	}



	/*
@@ -340,6 +344,8 @@ static int rzv2m_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
		goto remove_group;

	}



	mutex_unlock(&pctrl->mutex);



	maps[idx].type = PIN_MAP_TYPE_MUX_GROUP;

	maps[idx].data.mux.group = name;

	maps[idx].data.mux.function = name;
@@ -351,6 +357,8 @@ static int rzv2m_dt_subnode_to_map(struct pinctrl_dev *pctldev, 


remove_group:

	pinctrl_generic_remove_group(pctldev, gsel);

unlock:

	mutex_unlock(&pctrl->mutex);

done:

	*index = idx;

	kfree(configs);
@@ -1071,6 +1079,7 @@ static int rzv2m_pinctrl_probe(struct platform_device *pdev) 
	}



	spin_lock_init(&pctrl->lock);

	mutex_init(&pctrl->mutex);



	platform_set_drvdata(pdev, pctrl);