Commit e6f2f6b8 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Unique SERDES interrupt names 



Dynamically generate a unique SERDES interrupt name, based on the
device name and the port the SERDES is for. For example:

 95:          3  mv88e6xxx-g2   9 Edge      mv88e6xxx-0.2:00-serdes-9
 96:          0  mv88e6xxx-g2  10 Edge      mv88e6xxx-0.2:00-serdes-10

The 0.2:00 indicates the switch and -9 indicates port 9.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3095383a

drivers/net/dsa/mv88e6xxx/chip.c

+5 −1
Original line number Diff line number Diff line
@@ -2306,10 +2306,14 @@ static int mv88e6xxx_serdes_irq_request(struct mv88e6xxx_chip *chip, int port, 
	if (!irq)

		return 0;



	snprintf(dev_id->serdes_irq_name, sizeof(dev_id->serdes_irq_name),

		 "mv88e6xxx-%s-serdes-%d", dev_name(chip->dev), port);



	/* 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);

				   IRQF_ONESHOT, dev_id->serdes_irq_name,

				   dev_id);

	mv88e6xxx_reg_lock(chip);

	if (err)

		return err;

drivers/net/dsa/mv88e6xxx/chip.h

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ struct mv88e6xxx_port { 
	bool mirror_ingress;

	bool mirror_egress;

	unsigned int serdes_irq;

	char serdes_irq_name[32];

};



struct mv88e6xxx_chip {