Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

realtek: separate lock of RTL8231 from phy driver

Browse source 
RTL8231 and ethernet phys are not on the same bus, so separate the lock
to each own to cut off the unnecessary dependency.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
This commit is contained in:
INAGAKI Hiroshi 2022-03-29 19:29:34 +09:00 committed by Sander Vanheule
parent 7d6032f310
commit 9b53a29a58
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
target/linux/realtek/files-5.10/drivers/gpio/gpio-rtl8231.c
View file

@ -29,9 +29,10 @@ struct rtl8231_gpios {
int ext_gpio_indrt_access; int ext_gpio_indrt_access;
}; };
extern struct mutex smi_lock;
extern struct rtl83xx_soc_info soc_info; extern struct rtl83xx_soc_info soc_info;
DEFINE_MUTEX(miim_lock);
static u32 rtl8231_read(struct rtl8231_gpios *gpios, u32 reg) static u32 rtl8231_read(struct rtl8231_gpios *gpios, u32 reg)
{ {
u32 t = 0, n = 0; u32 t = 0, n = 0;
@ -187,9 +188,9 @@ static int rtl8231_direction_input(struct gpio_chip *gc, unsigned int offset)
struct rtl8231_gpios *gpios = gpiochip_get_data(gc); struct rtl8231_gpios *gpios = gpiochip_get_data(gc);
pr_debug("%s: %d\n", __func__, offset); pr_debug("%s: %d\n", __func__, offset);
mutex_lock(&smi_lock); mutex_lock(&miim_lock);
err = rtl8231_pin_dir(gpios, offset, 1); err = rtl8231_pin_dir(gpios, offset, 1);
mutex_unlock(&smi_lock); mutex_unlock(&miim_lock);
return err; return err;
} }
@ -199,9 +200,9 @@ static int rtl8231_direction_output(struct gpio_chip *gc, unsigned int offset, i
struct rtl8231_gpios *gpios = gpiochip_get_data(gc); struct rtl8231_gpios *gpios = gpiochip_get_data(gc);
pr_debug("%s: %d\n", __func__, offset); pr_debug("%s: %d\n", __func__, offset);
mutex_lock(&smi_lock); mutex_lock(&miim_lock);
err = rtl8231_pin_dir(gpios, offset, 0); err = rtl8231_pin_dir(gpios, offset, 0);
mutex_unlock(&smi_lock); mutex_unlock(&miim_lock);
if (!err) if (!err)
err = rtl8231_pin_set(gpios, offset, value); err = rtl8231_pin_set(gpios, offset, value);
return err; return err;
@ -213,9 +214,9 @@ static int rtl8231_get_direction(struct gpio_chip *gc, unsigned int offset)
struct rtl8231_gpios *gpios = gpiochip_get_data(gc); struct rtl8231_gpios *gpios = gpiochip_get_data(gc);
pr_debug("%s: %d\n", __func__, offset); pr_debug("%s: %d\n", __func__, offset);
mutex_lock(&smi_lock); mutex_lock(&miim_lock);
rtl8231_pin_dir_get(gpios, offset, &v); rtl8231_pin_dir_get(gpios, offset, &v);
mutex_unlock(&smi_lock); mutex_unlock(&miim_lock);
return v; return v;
} }
@ -224,9 +225,9 @@ static int rtl8231_gpio_get(struct gpio_chip *gc, unsigned int offset)
u16 state = 0; u16 state = 0;
struct rtl8231_gpios *gpios = gpiochip_get_data(gc); struct rtl8231_gpios *gpios = gpiochip_get_data(gc);
mutex_lock(&smi_lock); mutex_lock(&miim_lock);
rtl8231_pin_get(gpios, offset, &state); rtl8231_pin_get(gpios, offset, &state);
mutex_unlock(&smi_lock); mutex_unlock(&miim_lock);
if (state & (1 << (offset % 16))) if (state & (1 << (offset % 16)))
return 1; return 1;
return 0; return 0;