Initiate error recovery stats fail to update after 3 retries.

Change bxe_panic() ECORE_DBG_BREAK_IF() ECORE_BUG() ECORE_BUG_ON() to
panic only if ECORE_STOP_ON_ERROR is defined.

MFC after:5 days
This commit is contained in:
David C Somayajulu 2014-07-18 20:04:11 +00:00
parent eee92ad073
commit e3a36fb018
5 changed files with 35 additions and 1 deletions

@ -11471,6 +11471,10 @@ bxe_process_kill(struct bxe_softc *sc,
bxe_process_kill_chip_reset(sc, global);
mb();
/* clear errors in PGB */
if (!CHIP_IS_E1(sc))
REG_WR(sc, PGLUE_B_REG_LATCHED_ERRORS_CLR, 0x7f);
/* Recover after reset: */
/* MCP */
if (global && bxe_reset_mcp_comp(sc, val)) {

@ -2301,11 +2301,20 @@ void ecore_storm_memset_struct(struct bxe_softc *sc, uint32_t addr,
} \
} while(0)
#ifdef ECORE_STOP_ON_ERROR
#define bxe_panic(sc, msg) \
do { \
panic msg; \
} while (0)
#else
#define bxe_panic(sc, msg) \
device_printf((sc)->dev, "%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
#endif
#define CATC_TRIGGER(sc, data) REG_WR((sc), 0x2000, (data));
#define CATC_TRIGGER_START(sc) CATC_TRIGGER((sc), 0xcafecafe)

@ -1302,7 +1302,10 @@ bxe_stats_update(struct bxe_softc *sc)
if (bxe_storm_stats_update(sc)) {
if (sc->stats_pending++ == 3) {
bxe_panic(sc, ("storm stats not updated for 3 times\n"));
if (sc->ifnet->if_drv_flags & IFF_DRV_RUNNING) {
atomic_store_rel_long(&sc->chip_tq_flags, CHIP_TQ_REINIT);
taskqueue_enqueue(sc->chip_tq, &sc->chip_tq_task);
}
}
return;
}

@ -1039,6 +1039,8 @@ __FBSDID("$FreeBSD$");
0x942cUL
#define PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ \
0x9430UL
#define PGLUE_B_REG_LATCHED_ERRORS_CLR \
0x943CUL
#define PGLUE_B_REG_PGLUE_B_INT_STS \
0x9298UL
#define PGLUE_B_REG_PGLUE_B_INT_STS_CLR \

@ -223,6 +223,8 @@ ECORE_CRC32_LE(uint32_t seed, uint8_t *mac, uint32_t len)
#define ecore_sp_post(_sc, _a, _b, _c, _d) \
bxe_sp_post(_sc, _a, _b, U64_HI(_c), U64_LO(_c), _d)
#ifdef ECORE_STOP_ON_ERROR
#define ECORE_DBG_BREAK_IF(exp) \
do { \
if (__predict_false(exp)) { \
@ -242,6 +244,20 @@ ECORE_CRC32_LE(uint32_t seed, uint8_t *mac, uint32_t len)
} \
} while (0)
#else
#define ECORE_DBG_BREAK_IF(exp) \
printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
#define ECORE_BUG(exp) \
printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
#define ECORE_BUG_ON(exp) \
printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
#endif /* #ifdef ECORE_STOP_ON_ERROR */
#define ECORE_ERR(str, ...) \
BLOGE(sc, "ECORE: " str, ##__VA_ARGS__)