Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85831e56 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-mv88e6xxx-ATU-VTU-irq-fixes' 



Andrew Lunn says:

====================
ATU and VTU irq fixes

Further testing and code review found two sets of bugs.

Core review found a cut/paste error in the irq setup code.

A board which does not have an interrupt line from the switch to the
SoC, and experiancing an EPROBE_DEFER throw a splat when the ATU irq
was freed but never registered.

v2: Fix typ0 chip->chip->vtu_prob_irq to chip->vtu_prob_irq
    0-day compile testing.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7677fd01 ae14cafc

drivers/net/dsa/mv88e6xxx/chip.c

+4 −2
Original line number Diff line number Diff line
@@ -3999,8 +3999,10 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 
out_mdio:

	mv88e6xxx_mdios_unregister(chip);

out_g1_vtu_prob_irq:

	if (chip->irq > 0)

		mv88e6xxx_g1_vtu_prob_irq_free(chip);

out_g1_atu_prob_irq:

	if (chip->irq > 0)

		mv88e6xxx_g1_atu_prob_irq_free(chip);

out_g2_irq:

	if (chip->info->g2_irqs > 0 && chip->irq > 0)

drivers/net/dsa/mv88e6xxx/global1_atu.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ int mv88e6xxx_g1_atu_prob_irq_setup(struct mv88e6xxx_chip *chip) 
	chip->atu_prob_irq = irq_find_mapping(chip->g1_irq.domain,

					      MV88E6XXX_G1_STS_IRQ_ATU_PROB);

	if (chip->atu_prob_irq < 0)

		return chip->device_irq;

		return chip->atu_prob_irq;



	err = request_threaded_irq(chip->atu_prob_irq, NULL,

				   mv88e6xxx_g1_atu_prob_irq_thread_fn,

drivers/net/dsa/mv88e6xxx/global1_vtu.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ int mv88e6xxx_g1_vtu_prob_irq_setup(struct mv88e6xxx_chip *chip) 
	chip->vtu_prob_irq = irq_find_mapping(chip->g1_irq.domain,

					      MV88E6XXX_G1_STS_IRQ_VTU_PROB);

	if (chip->vtu_prob_irq < 0)

		return chip->device_irq;

		return chip->vtu_prob_irq;



	err = request_threaded_irq(chip->vtu_prob_irq, NULL,

				   mv88e6xxx_g1_vtu_prob_irq_thread_fn,