Commit 1988c795 authored by David S. Miller's avatar David S. Miller
Browse files

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



Andrew Lunn says:

====================
mv88e6xxx: ATU and VTU interrupts

Both the ATU and VTU of Mavell switches can generate interrupts when
violations occur.  Trap this interrupts and print what violation
occurred.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3743d88a 62eb1162

drivers/net/dsa/mv88e6xxx/chip.c

+15 −1
Original line number Diff line number Diff line
@@ -3976,11 +3976,19 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 
			if (err)

				goto out_g1_irq;

		}



		err = mv88e6xxx_g1_atu_prob_irq_setup(chip);

		if (err)

			goto out_g2_irq;



		err = mv88e6xxx_g1_vtu_prob_irq_setup(chip);

		if (err)

			goto out_g1_atu_prob_irq;

	}



	err = mv88e6xxx_mdios_register(chip, np);

	if (err)

		goto out_g2_irq;

		goto out_g1_vtu_prob_irq;



	err = mv88e6xxx_register_switch(chip);

	if (err)
@@ -3990,6 +3998,10 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 


out_mdio:

	mv88e6xxx_mdios_unregister(chip);

out_g1_vtu_prob_irq:

	mv88e6xxx_g1_vtu_prob_irq_free(chip);

out_g1_atu_prob_irq:

	mv88e6xxx_g1_atu_prob_irq_free(chip);

out_g2_irq:

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

		mv88e6xxx_g2_irq_free(chip);
@@ -4013,6 +4025,8 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev) 
	mv88e6xxx_mdios_unregister(chip);



	if (chip->irq > 0) {

		mv88e6xxx_g1_vtu_prob_irq_free(chip);

		mv88e6xxx_g1_atu_prob_irq_free(chip);

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

			mv88e6xxx_g2_irq_free(chip);

		mutex_lock(&chip->reg_lock);

drivers/net/dsa/mv88e6xxx/chip.h

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ struct mv88e6xxx_chip { 
	int irq;

	int device_irq;

	int watchdog_irq;

	int atu_prob_irq;

	int vtu_prob_irq;

};



struct mv88e6xxx_bus_ops {

drivers/net/dsa/mv88e6xxx/global1.h

+14 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 
#define MV88E6XXX_G1_STS_IRQ_AVB			8

#define MV88E6XXX_G1_STS_IRQ_DEVICE			7

#define MV88E6XXX_G1_STS_IRQ_STATS			6

#define MV88E6XXX_G1_STS_IRQ_VTU_PROBLEM		5

#define MV88E6XXX_G1_STS_IRQ_VTU_PROB			5

#define MV88E6XXX_G1_STS_IRQ_VTU_DONE			4

#define MV88E6XXX_G1_STS_IRQ_ATU_PROBLEM		3

#define MV88E6XXX_G1_STS_IRQ_ATU_PROB			3

#define MV88E6XXX_G1_STS_IRQ_ATU_DONE			2

#define MV88E6XXX_G1_STS_IRQ_TCAM_DONE			1

#define MV88E6XXX_G1_STS_IRQ_EEPROM_DONE		0
@@ -82,6 +82,10 @@ 
#define MV88E6XXX_G1_VTU_OP_VTU_GET_NEXT	0x4000

#define MV88E6XXX_G1_VTU_OP_STU_LOAD_PURGE	0x5000

#define MV88E6XXX_G1_VTU_OP_STU_GET_NEXT	0x6000

#define MV88E6XXX_G1_VTU_OP_GET_CLR_VIOLATION	0x7000

#define MV88E6XXX_G1_VTU_OP_MEMBER_VIOLATION	BIT(6)

#define MV88E6XXX_G1_VTU_OP_MISS_VIOLATION	BIT(5)

#define MV88E6XXX_G1_VTU_OP_SPID_MASK		0xf



/* Offset 0x06: VTU VID Register */

#define MV88E6XXX_G1_VTU_VID		0x06
@@ -122,6 +126,10 @@ 
#define MV88E6XXX_G1_ATU_OP_FLUSH_MOVE_ALL_DB		0x5000

#define MV88E6XXX_G1_ATU_OP_FLUSH_MOVE_NON_STATIC_DB	0x6000

#define MV88E6XXX_G1_ATU_OP_GET_CLR_VIOLATION		0x7000

#define MV88E6XXX_G1_ATU_OP_AGE_OUT_VIOLATION		BIT(7)

#define MV88E6XXX_G1_ATU_OP_MEMBER_VIOLATION		BIT(6)

#define MV88E6XXX_G1_ATU_OP_MISS_VIOLTATION		BIT(5)

#define MV88E6XXX_G1_ATU_OP_FULL_VIOLATION		BIT(4)



/* Offset 0x0C: ATU Data Register */

#define MV88E6XXX_G1_ATU_DATA				0x0c
@@ -255,6 +263,8 @@ int mv88e6xxx_g1_atu_loadpurge(struct mv88e6xxx_chip *chip, u16 fid, 
int mv88e6xxx_g1_atu_flush(struct mv88e6xxx_chip *chip, u16 fid, bool all);

int mv88e6xxx_g1_atu_remove(struct mv88e6xxx_chip *chip, u16 fid, int port,

			    bool all);

int mv88e6xxx_g1_atu_prob_irq_setup(struct mv88e6xxx_chip *chip);

void mv88e6xxx_g1_atu_prob_irq_free(struct mv88e6xxx_chip *chip);



int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,

			     struct mv88e6xxx_vtu_entry *entry);
@@ -269,5 +279,7 @@ int mv88e6390_g1_vtu_getnext(struct mv88e6xxx_chip *chip, 
int mv88e6390_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,

			       struct mv88e6xxx_vtu_entry *entry);

int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip);

int mv88e6xxx_g1_vtu_prob_irq_setup(struct mv88e6xxx_chip *chip);

void mv88e6xxx_g1_vtu_prob_irq_free(struct mv88e6xxx_chip *chip);



#endif /* _MV88E6XXX_GLOBAL1_H */

drivers/net/dsa/mv88e6xxx/global1_atu.c

+87 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

#include <linux/interrupt.h>

#include <linux/irqdomain.h>



#include "chip.h"

#include "global1.h"
@@ -307,3 +309,88 @@ int mv88e6xxx_g1_atu_remove(struct mv88e6xxx_chip *chip, u16 fid, int port, 


	return mv88e6xxx_g1_atu_move(chip, fid, from_port, to_port, all);

}



static irqreturn_t mv88e6xxx_g1_atu_prob_irq_thread_fn(int irq, void *dev_id)

{

	struct mv88e6xxx_chip *chip = dev_id;

	struct mv88e6xxx_atu_entry entry;

	int err;

	u16 val;



	mutex_lock(&chip->reg_lock);



	err = mv88e6xxx_g1_atu_op(chip, 0,

				  MV88E6XXX_G1_ATU_OP_GET_CLR_VIOLATION);

	if (err)

		goto out;



	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_OP, &val);

	if (err)

		goto out;



	err = mv88e6xxx_g1_atu_data_read(chip, &entry);

	if (err)

		goto out;



	err = mv88e6xxx_g1_atu_mac_read(chip, &entry);

	if (err)

		goto out;



	mutex_unlock(&chip->reg_lock);



	if (val & MV88E6XXX_G1_ATU_OP_AGE_OUT_VIOLATION) {

		dev_err_ratelimited(chip->dev,

				    "ATU age out violation for %pM\n",

				    entry.mac);

	}



	if (val & MV88E6XXX_G1_ATU_OP_MEMBER_VIOLATION) {

		dev_err_ratelimited(chip->dev,

				    "ATU member violation for %pM portvec %x\n",

				    entry.mac, entry.portvec);

	}



	if (val & MV88E6XXX_G1_ATU_OP_MEMBER_VIOLATION)

		dev_err_ratelimited(chip->dev,

				    "ATU miss violation for %pM portvec %x\n",

				    entry.mac, entry.portvec);



	if (val & MV88E6XXX_G1_ATU_OP_FULL_VIOLATION)

		dev_err_ratelimited(chip->dev,

				    "ATU full violation for %pM portvec %x\n",

				    entry.mac, entry.portvec);



	return IRQ_HANDLED;



out:

	mutex_unlock(&chip->reg_lock);



	dev_err(chip->dev, "ATU problem: error %d while handling interrupt\n",

		err);

	return IRQ_HANDLED;

}



int mv88e6xxx_g1_atu_prob_irq_setup(struct mv88e6xxx_chip *chip)

{

	int err;



	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;



	err = request_threaded_irq(chip->atu_prob_irq, NULL,

				   mv88e6xxx_g1_atu_prob_irq_thread_fn,

				   IRQF_ONESHOT, "mv88e6xxx-g1-atu-prob",

				   chip);

	if (err)

		irq_dispose_mapping(chip->atu_prob_irq);



	return err;

}



void mv88e6xxx_g1_atu_prob_irq_free(struct mv88e6xxx_chip *chip)

{

	free_irq(chip->atu_prob_irq, chip);

	irq_dispose_mapping(chip->atu_prob_irq);

}

drivers/net/dsa/mv88e6xxx/global1_vtu.c

+74 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
 * (at your option) any later version.

 */



#include <linux/interrupt.h>

#include <linux/irqdomain.h>



#include "chip.h"

#include "global1.h"
@@ -513,3 +516,74 @@ int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip) 


	return mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_FLUSH_ALL);

}



static irqreturn_t mv88e6xxx_g1_vtu_prob_irq_thread_fn(int irq, void *dev_id)

{

	struct mv88e6xxx_chip *chip = dev_id;

	struct mv88e6xxx_vtu_entry entry;

	int spid;

	int err;

	u16 val;



	mutex_lock(&chip->reg_lock);



	err = mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_GET_CLR_VIOLATION);

	if (err)

		goto out;



	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP, &val);

	if (err)

		goto out;



	err = mv88e6xxx_g1_vtu_vid_read(chip, &entry);

	if (err)

		goto out;



	mutex_unlock(&chip->reg_lock);



	spid = val & MV88E6XXX_G1_VTU_OP_SPID_MASK;



	if (val & MV88E6XXX_G1_VTU_OP_MEMBER_VIOLATION) {

		dev_err_ratelimited(chip->dev, "VTU member violation for vid %d, source port %d\n",

				    entry.vid, spid);

	}



	if (val & MV88E6XXX_G1_VTU_OP_MISS_VIOLATION)

		dev_err_ratelimited(chip->dev, "VTU miss violation for vid %d, source port %d\n",

				    entry.vid, spid);



	return IRQ_HANDLED;



out:

	mutex_unlock(&chip->reg_lock);



	dev_err(chip->dev, "VTU problem: error %d while handling interrupt\n",

		err);



	return IRQ_HANDLED;

}



int mv88e6xxx_g1_vtu_prob_irq_setup(struct mv88e6xxx_chip *chip)

{

	int err;



	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;



	err = request_threaded_irq(chip->vtu_prob_irq, NULL,

				   mv88e6xxx_g1_vtu_prob_irq_thread_fn,

				   IRQF_ONESHOT, "mv88e6xxx-g1-vtu-prob",

				   chip);

	if (err)

		irq_dispose_mapping(chip->vtu_prob_irq);



	return err;

}



void mv88e6xxx_g1_vtu_prob_irq_free(struct mv88e6xxx_chip *chip)

{

	free_irq(chip->vtu_prob_irq, chip);

	irq_dispose_mapping(chip->vtu_prob_irq);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE