Unverified Commit 8673e744 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15027 pinmux: Use sequential access to access desc->pinmux data 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Kunbo <zhangkunbo@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/EBKOZ5SZKPLA4MBH73BDAOB6NB3PLCTD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBIFR8 
 
Link:https://gitee.com/openeuler/kernel/pulls/15027

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 41e2d9f3 ba44c172

drivers/pinctrl/core.c

+3 −0
Original line number Diff line number Diff line
@@ -220,6 +220,9 @@ static int pinctrl_register_one_pin(struct pinctrl_dev *pctldev, 


	/* Set owner */

	pindesc->pctldev = pctldev;

#ifdef CONFIG_PINMUX

	mutex_init(&pindesc->mux_lock);

#endif



	/* Copy basic pin info */

	if (pin->name) {

drivers/pinctrl/core.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ struct pin_desc { 
	const char *mux_owner;

	const struct pinctrl_setting_mux *mux_setting;

	const char *gpio_owner;

	struct mutex mux_lock;

#endif

};

drivers/pinctrl/pinmux.c

+96 −77
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define pr_fmt(fmt) "pinmux core: " fmt



#include <linux/ctype.h>

#include <linux/cleanup.h>

#include <linux/debugfs.h>

#include <linux/device.h>

#include <linux/err.h>
@@ -93,6 +94,7 @@ bool pinmux_can_be_used_for_gpio(struct pinctrl_dev *pctldev, unsigned pin) 
	if (!desc || !ops)

		return true;



	guard(mutex)(&desc->mux_lock);

	if (ops->strict && desc->mux_usecount)

		return false;
@@ -127,6 +129,7 @@ static int pin_request(struct pinctrl_dev *pctldev, 
	dev_dbg(pctldev->dev, "request pin %d (%s) for %s\n",

		pin, desc->name, owner);



	scoped_guard(mutex, &desc->mux_lock) {

		if ((!gpio_range || ops->strict) &&

		    desc->mux_usecount && strcmp(desc->mux_owner, owner)) {

			dev_err(pctldev->dev,
@@ -151,6 +154,7 @@ static int pin_request(struct pinctrl_dev *pctldev, 


			desc->mux_owner = owner;

		}

	}



	/* Let each pin increase references to this module */

	if (!try_module_get(pctldev->owner)) {
@@ -180,6 +184,7 @@ static int pin_request(struct pinctrl_dev *pctldev, 


out_free_pin:

	if (status) {

		scoped_guard(mutex, &desc->mux_lock) {

			if (gpio_range) {

				desc->gpio_owner = NULL;

			} else {
@@ -188,6 +193,7 @@ static int pin_request(struct pinctrl_dev *pctldev, 
					desc->mux_owner = NULL;

			}

		}

	}

out:

	if (status)

		dev_err(pctldev->dev, "pin-%d (%s) status %d\n",
@@ -221,6 +227,7 @@ static const char *pin_free(struct pinctrl_dev *pctldev, int pin, 
		return NULL;

	}



	scoped_guard(mutex, &desc->mux_lock) {

		if (!gpio_range) {

			/*

			 * A pin should not be freed more times than allocated.
@@ -231,6 +238,7 @@ static const char *pin_free(struct pinctrl_dev *pctldev, int pin, 
			if (desc->mux_usecount)

				return NULL;

		}

	}



	/*

	 * If there is no kind of request function for the pin we just assume
@@ -241,6 +249,7 @@ static const char *pin_free(struct pinctrl_dev *pctldev, int pin, 
	else if (ops->free)

		ops->free(pctldev, pin);



	scoped_guard(mutex, &desc->mux_lock) {

		if (gpio_range) {

			owner = desc->gpio_owner;

			desc->gpio_owner = NULL;
@@ -249,6 +258,7 @@ static const char *pin_free(struct pinctrl_dev *pctldev, int pin, 
			desc->mux_owner = NULL;

			desc->mux_setting = NULL;

		}

	}



	module_put(pctldev->owner);
@@ -461,6 +471,7 @@ int pinmux_enable_setting(const struct pinctrl_setting *setting) 
				 pins[i]);

			continue;

		}

		scoped_guard(mutex, &desc->mux_lock)

			desc->mux_setting = &(setting->data.mux);

	}
@@ -475,9 +486,11 @@ int pinmux_enable_setting(const struct pinctrl_setting *setting) 
err_set_mux:

	for (i = 0; i < num_pins; i++) {

		desc = pin_desc_get(pctldev, pins[i]);

		if (desc)

		if (desc) {

			scoped_guard(mutex, &desc->mux_lock)

				desc->mux_setting = NULL;

		}

	}

err_pin_request:

	/* On error release all taken pins */

	while (--i >= 0)
@@ -495,6 +508,7 @@ void pinmux_disable_setting(const struct pinctrl_setting *setting) 
	unsigned num_pins = 0;

	int i;

	struct pin_desc *desc;

	bool is_equal;



	if (pctlops->get_group_pins)

		ret = pctlops->get_group_pins(pctldev, setting->data.mux.group,
@@ -520,7 +534,10 @@ void pinmux_disable_setting(const struct pinctrl_setting *setting) 
				 pins[i]);

			continue;

		}

		if (desc->mux_setting == &(setting->data.mux)) {

		scoped_guard(mutex, &desc->mux_lock)

			is_equal = (desc->mux_setting == &(setting->data.mux));



		if (is_equal) {

			pin_free(pctldev, pins[i], NULL);

		} else {

			const char *gname;
@@ -612,6 +629,7 @@ static int pinmux_pins_show(struct seq_file *s, void *what) 
		if (desc == NULL)

			continue;



		scoped_guard(mutex, &desc->mux_lock) {

			if (desc->mux_owner &&

			    !strcmp(desc->mux_owner, pinctrl_dev_get_name(pctldev)))

				is_hog = true;
@@ -647,6 +665,7 @@ static int pinmux_pins_show(struct seq_file *s, void *what) 
			else

				seq_putc(s, '\n');

		}

	}



	mutex_unlock(&pctldev->mutex);