d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce better locking for mtk_gpio_v[12] drivers

Browse Source 
Approved by:	adrian (mentor)
Sponsored by:	Smartcom - Bulgaria AD
Differential Revision:	https://reviews.freebsd.org/D5887
This commit is contained in:
sgalabov 2016-04-08 15:28:12 +00:00
parent b7ef0383b8
commit 0b9eafa294
2 changed files with 79 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sys/mips/mediatek/mtk_gpio_v1.c
View File

@ -431,19 +431,29 @@ mtk_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
static int
mtk_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
{
struct mtk_gpio_softc *sc = device_get_softc(dev);
struct mtk_gpio_softc *sc;
int ret;
if (pin >= sc->num_pins || !(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT))
sc = device_get_softc(dev);
ret = 0;
if (pin >= sc->num_pins)
return (EINVAL);
MTK_GPIO_LOCK(sc);
if(!(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT)) {
ret = EINVAL;
goto out;
}
if (value)
MTK_WRITE_4(sc, GPIO_PIOSET(sc), (1u << pin));
else
MTK_WRITE_4(sc, GPIO_PIORESET(sc), (1u << pin));
MTK_GPIO_UNLOCK(sc);
return (0);
out:
MTK_GPIO_UNLOCK(sc);
return (ret);
}
static int
@ -451,33 +461,50 @@ mtk_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val)
{
struct mtk_gpio_softc *sc;
uint32_t data;
int ret;
sc = device_get_softc(dev);
ret = 0;
if (pin >= sc->num_pins || !(sc->pins[pin].pin_flags & GPIO_PIN_INPUT))
if (pin >= sc->num_pins)
return (EINVAL);
MTK_GPIO_LOCK(sc);
if(!(sc->pins[pin].pin_flags & GPIO_PIN_INPUT)) {
ret = EINVAL;
goto out;
}
data = MTK_READ_4(sc, GPIO_PIODATA(sc));
MTK_GPIO_UNLOCK(sc);
*val = (data & (1u << pin)) ? 1 : 0;
return (0);
out:
MTK_GPIO_UNLOCK(sc);
return (ret);
}
static int
mtk_gpio_pin_toggle(device_t dev, uint32_t pin)
{
struct mtk_gpio_softc *sc = device_get_softc(dev);
struct mtk_gpio_softc *sc;
int ret;
if (pin >= sc->num_pins || !(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT))
if (pin >= sc->num_pins)
return (EINVAL);
sc = device_get_softc(dev);
ret = 0;
MTK_GPIO_LOCK(sc);
if (!(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT)) {
ret = EINVAL;
goto out;
}
MTK_WRITE_4(sc, GPIO_PIOTOG(sc), (1u << pin));
out:
MTK_GPIO_UNLOCK(sc);
return (0);
return (ret);
}
static int
@ -571,7 +598,9 @@ mtk_gpio_pic_post_filter(device_t dev, struct intr_irqsrc *isrc)
pisrc = (struct mtk_gpio_pin_irqsrc *)isrc;
sc = device_get_softc(dev);
MTK_GPIO_LOCK(sc);
MTK_WRITE_4(sc, GPIO_PIOINT(sc), 1u << pisrc->irq);
MTK_GPIO_UNLOCK(sc);
}
static int

51
sys/mips/mediatek/mtk_gpio_v2.c
View File

@ -425,19 +425,29 @@ mtk_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
static int
mtk_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
{
struct mtk_gpio_softc *sc = device_get_softc(dev);
struct mtk_gpio_softc *sc;
int ret;
if (pin >= sc->num_pins || !(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT))
if (pin >= sc->num_pins)
return (EINVAL);
sc = device_get_softc(dev);
ret = 0;
MTK_GPIO_LOCK(sc);
if (!(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT)) {
ret = EINVAL;
goto out;
}
if (value)
MTK_WRITE_4(sc, GPIO_PIOSET(sc), (1u << pin));
else
MTK_WRITE_4(sc, GPIO_PIORESET(sc), (1u << pin));
out:
MTK_GPIO_UNLOCK(sc);
return (0);
return (ret);
}
static int
@ -445,39 +455,56 @@ mtk_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val)
{
struct mtk_gpio_softc *sc;
uint32_t data;
int ret;
sc = device_get_softc(dev);
if (pin >= sc->num_pins || !(sc->pins[pin].pin_flags & GPIO_PIN_INPUT))
if (pin >= sc->num_pins)
return (EINVAL);
sc = device_get_softc(dev);
ret = 0;
MTK_GPIO_LOCK(sc);
if (!(sc->pins[pin].pin_flags & GPIO_PIN_INPUT)) {
ret = EINVAL;
goto out;
}
data = MTK_READ_4(sc, GPIO_PIODATA(sc));
MTK_GPIO_UNLOCK(sc);
*val = (data & (1u << pin)) ? 1 : 0;
return (0);
out:
MTK_GPIO_UNLOCK(sc);
return (ret);
}
static int
mtk_gpio_pin_toggle(device_t dev, uint32_t pin)
{
struct mtk_gpio_softc *sc = device_get_softc(dev);
struct mtk_gpio_softc *sc;
uint32_t val;
int ret;
if (pin >= sc->num_pins || !(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT))
if (pin >= sc->num_pins)
return (EINVAL);
sc = device_get_softc(dev);
ret = 0;
MTK_GPIO_LOCK(sc);
if(!(sc->pins[pin].pin_flags & GPIO_PIN_OUTPUT)) {
ret = EINVAL;
goto out;
}
val = MTK_READ_4(sc, GPIO_PIODATA(sc));
val &= (1u << pin);
if (val)
MTK_WRITE_4(sc, GPIO_PIORESET(sc), (1u << pin));
else
MTK_WRITE_4(sc, GPIO_PIOSET(sc), (1u << pin));
out:
MTK_GPIO_UNLOCK(sc);
return (0);
return (ret);
}
static int
@ -571,7 +598,9 @@ mtk_gpio_pic_post_filter(device_t dev, struct intr_irqsrc *isrc)
pisrc = (struct mtk_gpio_pin_irqsrc *)isrc;
sc = device_get_softc(dev);
MTK_GPIO_LOCK(sc);
MTK_WRITE_4(sc, GPIO_PIOINT(sc), 1u << pisrc->irq);
MTK_GPIO_UNLOCK(sc);
}
static int