net: dsa: mv88e6xxx: introduce .serdes_irq_mapping

Introduce a new .serdes_irq_mapping operation to prepare the
abstraction of IRQ mapping from the SERDES IRQ setup code.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index c648f9fbfa59d8c7758f8de1d1761431d3e23d06..0ab4ce86eda7810cf317e2e8dc5a01c4f0f270f9 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2931,6 +2931,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6341_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3178,6 +3179,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .serdes_power = mv88e6352_serdes_power,
+       .serdes_irq_mapping = mv88e6352_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6352_serdes_irq_setup,
        .serdes_irq_free = mv88e6352_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3261,6 +3263,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3308,6 +3311,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390x_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3355,6 +3359,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .avb_ops = &mv88e6390_avb_ops,
@@ -3403,6 +3408,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .serdes_power = mv88e6352_serdes_power,
+       .serdes_irq_mapping = mv88e6352_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6352_serdes_irq_setup,
        .serdes_irq_free = mv88e6352_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3492,6 +3498,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3629,6 +3636,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6341_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3760,6 +3768,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {
        .vtu_getnext = mv88e6352_g1_vtu_getnext,
        .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
        .serdes_power = mv88e6352_serdes_power,
+       .serdes_irq_mapping = mv88e6352_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6352_serdes_irq_setup,
        .serdes_irq_free = mv88e6352_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3814,6 +3823,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,
@@ -3865,6 +3875,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
        .vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
        .serdes_power = mv88e6390_serdes_power,
        .serdes_get_lane = mv88e6390x_serdes_get_lane,
+       .serdes_irq_mapping = mv88e6390_serdes_irq_mapping,
        .serdes_irq_setup = mv88e6390_serdes_irq_setup,
        .serdes_irq_free = mv88e6390_serdes_irq_free,
        .gpio_ops = &mv88e6352_gpio_ops,

diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index 2016f51c868b4ca441fb129b60cc518be1879122..b116bd7f6109a1bcf8afa7124ce8ae860b281331 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -447,6 +447,8 @@ struct mv88e6xxx_ops {
        int (*serdes_get_lane)(struct mv88e6xxx_chip *chip, int port, u8 *lane);
 
        /* 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);
 

diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
index f65652e6edecf975db3d5749add2ec4ae44b0053..4fb1dca64ef1217031ad3c9ebf6c5b92df675220 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/serdes.c
+++ b/drivers/net/dsa/mv88e6xxx/serdes.c
@@ -240,18 +240,25 @@ static int mv88e6352_serdes_irq_disable(struct mv88e6xxx_chip *chip)
        return mv88e6352_serdes_write(chip, MV88E6352_SERDES_INT_ENABLE, 0);
 }
 
+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;
        int err;
 
        if (!mv88e6352_port_has_serdes(chip, port))
                return 0;
 
-       chip->ports[port].serdes_irq = irq_find_mapping(chip->g2_irq.domain,
-                                                       MV88E6352_SERDES_IRQ);
-       if (!chip->ports[port].serdes_irq)
+       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.
         */
@@ -673,8 +680,14 @@ out:
        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;
 
@@ -685,11 +698,12 @@ int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)
                return err;
        }
 
-       chip->ports[port].serdes_irq = irq_find_mapping(chip->g2_irq.domain,
-                                                       port);
-       if (!chip->ports[port].serdes_irq)
+       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.
         */

diff --git a/drivers/net/dsa/mv88e6xxx/serdes.h b/drivers/net/dsa/mv88e6xxx/serdes.h
index c2e6fc3ddf8bc2376a94606d9808bc62de319de3..cb8d287c93887a9167f8b5abe4bc14c6f6a7b908 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/serdes.h
+++ b/drivers/net/dsa/mv88e6xxx/serdes.h
@@ -90,6 +90,10 @@ static inline int mv88e6xxx_serdes_get_lane(struct mv88e6xxx_chip *chip,
 int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane);
 int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane);
 int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port, u8 *lane);
+unsigned int mv88e6352_serdes_irq_mapping(struct mv88e6xxx_chip *chip,
+                                         int port);
+unsigned int mv88e6390_serdes_irq_mapping(struct mv88e6xxx_chip *chip,
+                                         int port);
 int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
 int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
 int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);
@@ -106,5 +110,13 @@ int mv88e6390_serdes_irq_disable(struct mv88e6xxx_chip *chip, int port,
 int mv88e6352_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);
 void mv88e6352_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);
 
+static inline unsigned int
+mv88e6xxx_serdes_irq_mapping(struct mv88e6xxx_chip *chip, int port)
+{
+       if (!chip->info->ops->serdes_irq_mapping)
+               return 0;
+
+       return chip->info->ops->serdes_irq_mapping(chip, port);
+}
 
 #endif