xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: mv88e6xxx: introduce .serdes_irq_mapping

Browse Source 
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>
This commit is contained in:
Vivien Didelot
2019-08-31 16:18:29 -04:00
committed by David S. Miller
parent f441ed0f4c
commit 4241ef5237
4 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/dsa/mv88e6xxx/serdes.c
View File

@@ -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.
*/