net: dsa: mv88e6xxx: centralize SERDES IRQ handling
The .serdes_irq_setup are all following the same steps: get the SERDES lane, get the IRQ mapping, request the IRQ, then enable it. So do the .serdes_irq_free implementations: get the SERDES lane, disable the IRQ, then free it. This patch removes these operations in favor of generic functions. Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot
David S. Miller
Родитель
907b9b9fca
Коммит
45de77ff82
|
|
@ -2054,6 +2054,71 @@ static int mv88e6xxx_setup_egress_floods(struct mv88e6xxx_chip *chip, int port)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static irqreturn_t mv88e6xxx_serdes_irq_thread_fn(int irq, void *dev_id)
|
||||
{
|
||||
struct mv88e6xxx_port *mvp = dev_id;
|
||||
struct mv88e6xxx_chip *chip = mvp->chip;
|
||||
irqreturn_t ret = IRQ_NONE;
|
||||
int port = mvp->port;
|
||||
u8 lane;
|
||||
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
lane = mv88e6xxx_serdes_get_lane(chip, port);
|
||||
if (lane)
|
||||
ret = mv88e6xxx_serdes_irq_status(chip, port, lane);
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port,
|
||||
u8 lane)
|
||||
{
|
||||
struct mv88e6xxx_port *dev_id = &chip->ports[port];
|
||||
unsigned int irq;
|
||||
int err;
|
||||
|
||||
/* Nothing to request if this SERDES port has no IRQ */
|
||||
irq = mv88e6xxx_serdes_irq_mapping(chip, port);
|
||||
if (!irq)
|
||||
return 0;
|
||||
|
||||
/* Requesting the IRQ will trigger IRQ callbacks, so release the lock */
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
err = request_threaded_irq(irq, NULL, mv88e6xxx_serdes_irq_thread_fn,
|
||||
IRQF_ONESHOT, "mv88e6xxx-serdes", dev_id);
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
dev_id->serdes_irq = irq;
|
||||
|
||||
return mv88e6xxx_serdes_irq_enable(chip, port, lane);
|
||||
}
|
||||
|
||||
static int mv88e6xxx_serdes_irq_free(struct mv88e6xxx_chip *chip, int port,
|
||||
u8 lane)
|
||||
{
|
||||
struct mv88e6xxx_port *dev_id = &chip->ports[port];
|
||||
unsigned int irq = dev_id->serdes_irq;
|
||||
int err;
|
||||
|
||||
/* Nothing to free if no IRQ has been requested */
|
||||
if (!irq)
|
||||
return 0;
|
||||
|
||||
err = mv88e6xxx_serdes_irq_disable(chip, port, lane);
|
||||
|
||||
/* Freeing the IRQ will trigger IRQ callbacks, so release the lock */
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
free_irq(irq, dev_id);
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
|
||||
dev_id->serdes_irq = 0;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mv88e6xxx_serdes_power(struct mv88e6xxx_chip *chip, int port,
|
||||
bool on)
|
||||
{
|
||||
|
|
@ -2069,12 +2134,11 @@ static int mv88e6xxx_serdes_power(struct mv88e6xxx_chip *chip, int port,
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
if (chip->info->ops->serdes_irq_setup)
|
||||
err = chip->info->ops->serdes_irq_setup(chip, port);
|
||||
err = mv88e6xxx_serdes_irq_request(chip, port, lane);
|
||||
} else {
|
||||
if (chip->info->ops->serdes_irq_free &&
|
||||
chip->ports[port].serdes_irq)
|
||||
chip->info->ops->serdes_irq_free(chip, port);
|
||||
err = mv88e6xxx_serdes_irq_free(chip, port, lane);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = mv88e6xxx_serdes_power_down(chip, port, lane);
|
||||
}
|
||||
|
|
@ -2936,8 +3000,6 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.phylink_validate = mv88e6341_phylink_validate,
|
||||
};
|
||||
|
|
@ -3188,8 +3250,6 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
|
|||
.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6352_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6352_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6352_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6352_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.phylink_validate = mv88e6352_phylink_validate,
|
||||
};
|
||||
|
|
@ -3274,8 +3334,6 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.phylink_validate = mv88e6390_phylink_validate,
|
||||
};
|
||||
|
|
@ -3324,8 +3382,6 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.phylink_validate = mv88e6390x_phylink_validate,
|
||||
};
|
||||
|
|
@ -3374,8 +3430,6 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.avb_ops = &mv88e6390_avb_ops,
|
||||
.ptp_ops = &mv88e6352_ptp_ops,
|
||||
.phylink_validate = mv88e6390_phylink_validate,
|
||||
|
|
@ -3426,8 +3480,6 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
|
|||
.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6352_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6352_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6352_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6352_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.avb_ops = &mv88e6352_avb_ops,
|
||||
.ptp_ops = &mv88e6352_ptp_ops,
|
||||
|
|
@ -3518,8 +3570,6 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.avb_ops = &mv88e6390_avb_ops,
|
||||
.ptp_ops = &mv88e6352_ptp_ops,
|
||||
|
|
@ -3658,8 +3708,6 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.avb_ops = &mv88e6390_avb_ops,
|
||||
.ptp_ops = &mv88e6352_ptp_ops,
|
||||
|
|
@ -3793,8 +3841,6 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
|
|||
.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6352_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6352_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6352_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6352_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.avb_ops = &mv88e6352_avb_ops,
|
||||
.ptp_ops = &mv88e6352_ptp_ops,
|
||||
|
|
@ -3850,8 +3896,6 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.avb_ops = &mv88e6390_avb_ops,
|
||||
.ptp_ops = &mv88e6352_ptp_ops,
|
||||
|
|
@ -3904,8 +3948,6 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
|
|||
.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
|
||||
.serdes_irq_enable = mv88e6390_serdes_irq_enable,
|
||||
.serdes_irq_status = mv88e6390_serdes_irq_status,
|
||||
.serdes_irq_setup = mv88e6390_serdes_irq_setup,
|
||||
.serdes_irq_free = mv88e6390_serdes_irq_free,
|
||||
.gpio_ops = &mv88e6352_gpio_ops,
|
||||
.avb_ops = &mv88e6390_avb_ops,
|
||||
.ptp_ops = &mv88e6352_ptp_ops,
|
||||
|
|
|
|||
|
|
@ -450,8 +450,6 @@ struct mv88e6xxx_ops {
|
|||
/* SERDES interrupt handling */
|
||||
unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,
|
||||
int port);
|
||||
int (*serdes_irq_setup)(struct mv88e6xxx_chip *chip, int port);
|
||||
void (*serdes_irq_free)(struct mv88e6xxx_chip *chip, int port);
|
||||
int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip, int port, u8 lane,
|
||||
bool enable);
|
||||
irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip, int port,
|
||||
|
|
|
|||
|
|
@ -221,19 +221,6 @@ irqreturn_t mv88e6352_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static irqreturn_t mv88e6352_serdes_thread_fn(int irq, void *dev_id)
|
||||
{
|
||||
struct mv88e6xxx_port *port = dev_id;
|
||||
struct mv88e6xxx_chip *chip = port->chip;
|
||||
irqreturn_t ret = IRQ_NONE;
|
||||
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
ret = mv88e6xxx_serdes_irq_status(chip, port->port, 0);
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int mv88e6352_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port, u8 lane,
|
||||
bool enable)
|
||||
{
|
||||
|
|
@ -250,61 +237,6 @@ unsigned int mv88e6352_serdes_irq_mapping(struct mv88e6xxx_chip *chip, int port)
|
|||
return irq_find_mapping(chip->g2_irq.domain, MV88E6352_SERDES_IRQ);
|
||||
}
|
||||
|
||||
int mv88e6352_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)
|
||||
{
|
||||
unsigned int irq;
|
||||
u8 lane;
|
||||
int err;
|
||||
|
||||
lane = mv88e6xxx_serdes_get_lane(chip, port);
|
||||
if (!lane)
|
||||
return 0;
|
||||
|
||||
irq = mv88e6xxx_serdes_irq_mapping(chip, port);
|
||||
if (!irq)
|
||||
return 0;
|
||||
|
||||
chip->ports[port].serdes_irq = irq;
|
||||
|
||||
/* Requesting the IRQ will trigger irq callbacks. So we cannot
|
||||
* hold the reg_lock.
|
||||
*/
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
err = request_threaded_irq(chip->ports[port].serdes_irq, NULL,
|
||||
mv88e6352_serdes_thread_fn,
|
||||
IRQF_ONESHOT, "mv88e6xxx-serdes",
|
||||
&chip->ports[port]);
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
|
||||
if (err) {
|
||||
dev_err(chip->dev, "Unable to request SERDES interrupt: %d\n",
|
||||
err);
|
||||
return err;
|
||||
}
|
||||
|
||||
return mv88e6xxx_serdes_irq_enable(chip, port, lane);
|
||||
}
|
||||
|
||||
void mv88e6352_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)
|
||||
{
|
||||
u8 lane;
|
||||
|
||||
lane = mv88e6xxx_serdes_get_lane(chip, port);
|
||||
if (!lane)
|
||||
return;
|
||||
|
||||
mv88e6xxx_serdes_irq_disable(chip, port, lane);
|
||||
|
||||
/* Freeing the IRQ will trigger irq callbacks. So we cannot
|
||||
* hold the reg_lock.
|
||||
*/
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
free_irq(chip->ports[port].serdes_irq, &chip->ports[port]);
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
|
||||
chip->ports[port].serdes_irq = 0;
|
||||
}
|
||||
|
||||
u8 mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)
|
||||
{
|
||||
u8 cmode = chip->ports[port].cmode;
|
||||
|
|
@ -622,81 +554,7 @@ irqreturn_t mv88e6390_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)
|
||||
{
|
||||
struct mv88e6xxx_port *port = dev_id;
|
||||
struct mv88e6xxx_chip *chip = port->chip;
|
||||
irqreturn_t ret = IRQ_NONE;
|
||||
u8 lane;
|
||||
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
lane = mv88e6xxx_serdes_get_lane(chip, port->port);
|
||||
if (!lane)
|
||||
goto out;
|
||||
|
||||
ret = mv88e6xxx_serdes_irq_status(chip, port->port, lane);
|
||||
out:
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
unsigned int mv88e6390_serdes_irq_mapping(struct mv88e6xxx_chip *chip, int port)
|
||||
{
|
||||
return irq_find_mapping(chip->g2_irq.domain, port);
|
||||
}
|
||||
|
||||
int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)
|
||||
{
|
||||
unsigned int irq;
|
||||
int err;
|
||||
u8 lane;
|
||||
|
||||
lane = mv88e6xxx_serdes_get_lane(chip, port);
|
||||
if (!lane)
|
||||
return 0;
|
||||
|
||||
irq = mv88e6xxx_serdes_irq_mapping(chip, port);
|
||||
if (!irq)
|
||||
return 0;
|
||||
|
||||
chip->ports[port].serdes_irq = irq;
|
||||
|
||||
/* Requesting the IRQ will trigger irq callbacks. So we cannot
|
||||
* hold the reg_lock.
|
||||
*/
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
err = request_threaded_irq(chip->ports[port].serdes_irq, NULL,
|
||||
mv88e6390_serdes_thread_fn,
|
||||
IRQF_ONESHOT, "mv88e6xxx-serdes",
|
||||
&chip->ports[port]);
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
|
||||
if (err) {
|
||||
dev_err(chip->dev, "Unable to request SERDES interrupt: %d\n",
|
||||
err);
|
||||
return err;
|
||||
}
|
||||
|
||||
return mv88e6xxx_serdes_irq_enable(chip, port, lane);
|
||||
}
|
||||
|
||||
void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)
|
||||
{
|
||||
u8 lane;
|
||||
|
||||
lane = mv88e6xxx_serdes_get_lane(chip, port);
|
||||
if (!lane)
|
||||
return;
|
||||
|
||||
mv88e6xxx_serdes_irq_disable(chip, port, lane);
|
||||
|
||||
/* Freeing the IRQ will trigger irq callbacks. So we cannot
|
||||
* hold the reg_lock.
|
||||
*/
|
||||
mv88e6xxx_reg_unlock(chip);
|
||||
free_irq(chip->ports[port].serdes_irq, &chip->ports[port]);
|
||||
mv88e6xxx_reg_lock(chip);
|
||||
|
||||
chip->ports[port].serdes_irq = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,8 +86,6 @@ int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, u8 lane,
|
|||
bool on);
|
||||
int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, u8 lane,
|
||||
bool on);
|
||||
int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);
|
||||
void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);
|
||||
int mv88e6352_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port, u8 lane,
|
||||
bool enable);
|
||||
int mv88e6390_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port, u8 lane,
|
||||
|
|
@ -101,8 +99,6 @@ int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,
|
|||
int port, uint8_t *data);
|
||||
int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,
|
||||
uint64_t *data);
|
||||
int mv88e6352_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);
|
||||
void mv88e6352_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);
|
||||
|
||||
/* Return the (first) SERDES lane address a port is using, 0 otherwise. */
|
||||
static inline u8 mv88e6xxx_serdes_get_lane(struct mv88e6xxx_chip *chip,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче