tg3: Poll cpmu link state on APE + ASF enabled devices

On ASF enabled devices where the mgmt firmware runs on the application
processing engine, there is a race between the tg3 driver processing a
link change event and the ASF firmware clearing the link changed bit in
the EMAC status register. This leads to link notifications to the driver
sometimes getting lost.

Poll the CPMU link state as a backup for the normal interrupt path
update if ASF is enabled.

Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 7bc8449af262c0d1a28f2259e041d76a7c8fa97e..8f43c67559114bebbee1ed09c54d5c7b6818e6c2 100644 (file)
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -10960,6 +10960,13 @@ static void tg3_timer(unsigned long __opaque)
                } else if ((tp->phy_flags & TG3_PHYFLG_MII_SERDES) &&
                           tg3_flag(tp, 5780_CLASS)) {
                        tg3_serdes_parallel_detect(tp);
+               } else if (tg3_flag(tp, POLL_CPMU_LINK)) {
+                       u32 cpmu = tr32(TG3_CPMU_STATUS);
+                       bool link_up = !((cpmu & TG3_CPMU_STATUS_LINK_MASK) ==
+                                        TG3_CPMU_STATUS_LINK_MASK);
+
+                       if (link_up != tp->link_up)
+                               tg3_setup_phy(tp, false);
                }
 
                tp->timer_counter = tp->timer_multiplier;
@@ -16766,6 +16773,9 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
        else
                tg3_flag_clear(tp, POLL_SERDES);
 
+       if (tg3_flag(tp, ENABLE_APE) && tg3_flag(tp, ENABLE_ASF))
+               tg3_flag_set(tp, POLL_CPMU_LINK);
+
        tp->rx_offset = NET_SKB_PAD + NET_IP_ALIGN;
        tp->rx_copy_thresh = TG3_RX_COPY_THRESHOLD;
        if (tg3_asic_rev(tp) == ASIC_REV_5701 &&

diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
index 9e31eccc250bf70946b32a2225906b2b6f53aca1..ef472385bce47dcea87f43e48f202ffabbddf16d 100644 (file)
--- a/drivers/net/ethernet/broadcom/tg3.h
+++ b/drivers/net/ethernet/broadcom/tg3.h
@@ -1153,6 +1153,7 @@
 #define  TG3_CPMU_STATUS_FMSK_5717      0x20000000
 #define  TG3_CPMU_STATUS_FMSK_5719      0xc0000000
 #define  TG3_CPMU_STATUS_FSHFT_5719     30
+#define  TG3_CPMU_STATUS_LINK_MASK      0x180000
 
 #define TG3_CPMU_CLCK_STAT             0x00003630
 #define  CPMU_CLCK_STAT_MAC_CLCK_MASK   0x001f0000
@@ -3020,6 +3021,7 @@ enum TG3_FLAGS {
        TG3_FLAG_ENABLE_ASF,
        TG3_FLAG_ASPM_WORKAROUND,
        TG3_FLAG_POLL_SERDES,
+       TG3_FLAG_POLL_CPMU_LINK,
        TG3_FLAG_MBOX_WRITE_REORDER,
        TG3_FLAG_PCIX_TARGET_HWBUG,
        TG3_FLAG_WOL_SPEED_100MB,