Message ID | 20210309211244.22684-2-bjorn@mork.no |
---|---|
State | Superseded |
Headers | show |
Series | realtek: SFP related fixes | expand |
Indeed, this fixes a stupid typo that prevents the IRQ to be correctly configured. Please apply. Birger On 09/03/2021 22:12, Bjørn Mork wrote: > This bug was the root cause for the failing sfp driver. > > Signed-off-by: Bjørn Mork <bjorn@mork.no> > --- > .../realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c > index 698f2892ea1e..197a96f8ad13 100644 > --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c > +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c > @@ -555,7 +555,6 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev) > int err = 0, i; > struct rtl838x_switch_priv *priv; > struct device *dev = &pdev->dev; > - u64 irq_mask; > u64 bpdu_mask; > > pr_debug("Probing RTL838X switch device\n"); > @@ -650,9 +649,9 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev) > > /* Enable link and media change interrupts. Are the SERDES masks needed? */ > sw_w32_mask(0, 3, priv->r->isr_glb_src); > - > - priv->r->set_port_reg_le(irq_mask, priv->r->isr_port_link_sts_chg); > - priv->r->set_port_reg_le(irq_mask, priv->r->imr_port_link_sts_chg); > + > + priv->r->set_port_reg_le(priv->irq_mask, priv->r->isr_port_link_sts_chg); > + priv->r->set_port_reg_le(priv->irq_mask, priv->r->imr_port_link_sts_chg); > > priv->link_state_irq = platform_get_irq(pdev, 0); > pr_info("LINK state irq: %d\n", priv->link_state_irq);
diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c index 698f2892ea1e..197a96f8ad13 100644 --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c @@ -555,7 +555,6 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev) int err = 0, i; struct rtl838x_switch_priv *priv; struct device *dev = &pdev->dev; - u64 irq_mask; u64 bpdu_mask; pr_debug("Probing RTL838X switch device\n"); @@ -650,9 +649,9 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev) /* Enable link and media change interrupts. Are the SERDES masks needed? */ sw_w32_mask(0, 3, priv->r->isr_glb_src); - - priv->r->set_port_reg_le(irq_mask, priv->r->isr_port_link_sts_chg); - priv->r->set_port_reg_le(irq_mask, priv->r->imr_port_link_sts_chg); + + priv->r->set_port_reg_le(priv->irq_mask, priv->r->isr_port_link_sts_chg); + priv->r->set_port_reg_le(priv->irq_mask, priv->r->imr_port_link_sts_chg); priv->link_state_irq = platform_get_irq(pdev, 0); pr_info("LINK state irq: %d\n", priv->link_state_irq);
This bug was the root cause for the failing sfp driver. Signed-off-by: Bjørn Mork <bjorn@mork.no> --- .../realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)