Commit 5d1fbdf2 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller

net: dsa: mv88e6xxx: Prevent truncation of longer interrupt names

When adding support for unique interrupt names, after testing on a few
devices, it was assumed 32 characters would be sufficient. This
assumption turned out to be incorrect, ZII RDU2 for example uses a
device base name of mv88e6xxx-30be0000.ethernet-1:0, leaving no space
for post fixes such as -g1-atu-prob and -watchdog. The names then
become identical, defeating the point of the patch.

Increase the length of the string to 64 charactoes.
Reported-by: default avatarChris Healy <Chris.Healy@zii.aero>
Fixes: 3095383a ("net: dsa: mv88e6xxx: Unique IRQ name")
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88bf5460
...@@ -236,7 +236,7 @@ struct mv88e6xxx_port { ...@@ -236,7 +236,7 @@ struct mv88e6xxx_port {
bool mirror_ingress; bool mirror_ingress;
bool mirror_egress; bool mirror_egress;
unsigned int serdes_irq; unsigned int serdes_irq;
char serdes_irq_name[32]; char serdes_irq_name[64];
}; };
struct mv88e6xxx_chip { struct mv88e6xxx_chip {
...@@ -293,16 +293,16 @@ struct mv88e6xxx_chip { ...@@ -293,16 +293,16 @@ struct mv88e6xxx_chip {
struct mv88e6xxx_irq g1_irq; struct mv88e6xxx_irq g1_irq;
struct mv88e6xxx_irq g2_irq; struct mv88e6xxx_irq g2_irq;
int irq; int irq;
char irq_name[32]; char irq_name[64];
int device_irq; int device_irq;
char device_irq_name[32]; char device_irq_name[64];
int watchdog_irq; int watchdog_irq;
char watchdog_irq_name[32]; char watchdog_irq_name[64];
int atu_prob_irq; int atu_prob_irq;
char atu_prob_irq_name[32]; char atu_prob_irq_name[64];
int vtu_prob_irq; int vtu_prob_irq;
char vtu_prob_irq_name[32]; char vtu_prob_irq_name[64];
struct kthread_worker *kworker; struct kthread_worker *kworker;
struct kthread_delayed_work irq_poll_work; struct kthread_delayed_work irq_poll_work;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment