>
>The register read/writes should just be static inline instead of
>alternately defined as routines or macros depending on the status of
>debugging.
>
>Fix bnx2x_reg_read32() returning 0 during debug unaligned reads.
>
>Fixes: b5bf7719221d ("bnx2x: driver support routines")
>
>Signed-off-by: Chas Williams <3chas3 at gmail.com>
>---
> drivers/net/bnx2x/Makefile | 1 -
> drivers/net/bnx2x/bnx2x.h | 99
>+++++++++++++++++++++++++++++++++++++---------
> drivers/net/bnx2x/debug.c | 96
>--------------------------------------------
> 3 files changed, 80 insertions(+), 116 deletions(-)
> delete mode 100644 drivers/net/bnx2x/debug.c
>
>diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile
>index ab69680..e971fb6 100644
>--- a/drivers/net/bnx2x/Makefile
>+++ b/drivers/net/bnx2x/Makefile
>@@ -28,7 +28,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_ethdev.c
> SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += ecore_sp.c
> SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += elink.c
> SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_vfpf.c
>-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_DEBUG_PERIODIC) += debug.c
>
> # this lib depends upon:
> DEPDIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += lib/librte_eal lib/librte_ether
>diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
>index e4979ac..d1dd6aa 100644
>--- a/drivers/net/bnx2x/bnx2x.h
>+++ b/drivers/net/bnx2x/bnx2x.h
>@@ -1414,34 +1414,95 @@ struct bnx2x_func_init_params {
> #define BAR1 2
> #define BAR2 4
>
>+static inline void
>+bnx2x_reg_write8(struct bnx2x_softc *sc, size_t offset, uint8_t val)
>+{
>+ PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%02x",
>+ (unsigned long)offset, val);
>+ *((volatile uint8_t*)
>+ ((uintptr_t)sc->bar[BAR0].base_addr + offset)) = val;
>+}
>+
>+static inline void
>+bnx2x_reg_write16(struct bnx2x_softc *sc, size_t offset, uint16_t val)
>+{
>+#ifdef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC
>+ if ((offset % 2) != 0)
>+ PMD_DRV_LOG(NOTICE, "Unaligned 16-bit write to 0x%08lx",
>+ (unsigned long)offset);
>+#endif
>+ PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%04x",
>+ (unsigned long)offset, val);
>+ *((volatile uint16_t*)
>+ ((uintptr_t)sc->bar[BAR0].base_addr + offset)) = val;
>+}
>+
>+static inline void
>+bnx2x_reg_write32(struct bnx2x_softc *sc, size_t offset, uint32_t val)
>+{
> #ifdef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC
>-uint8_t bnx2x_reg_read8(struct bnx2x_softc *sc, size_t offset);
>-uint16_t bnx2x_reg_read16(struct bnx2x_softc *sc, size_t offset);
>-uint32_t bnx2x_reg_read32(struct bnx2x_softc *sc, size_t offset);
>+ if ((offset % 4) != 0)
>+ PMD_DRV_LOG(NOTICE, "Unaligned 32-bit write to 0x%08lx",
>+ (unsigned long)offset);
>+#endif
>
>-void bnx2x_reg_write8(struct bnx2x_softc *sc, size_t offset, uint8_t
>val);
>-void bnx2x_reg_write16(struct bnx2x_softc *sc, size_t offset, uint16_t
>val);
>-void bnx2x_reg_write32(struct bnx2x_softc *sc, size_t offset, uint32_t
>val);
>-#else
>-#define bnx2x_reg_write8(sc, offset, val)\
>- *((volatile uint8_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)) =
>val
>+ PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%08x",
>+ (unsigned long)offset, val);
>+ *((volatile uint32_t*)
>+ ((uintptr_t)sc->bar[BAR0].base_addr + offset)) = val;
>+}
>+
>+static inline uint8_t
>+bnx2x_reg_read8(struct bnx2x_softc *sc, size_t offset)
>+{
>+ uint8_t val;
>+
>+ val = (uint8_t)(*((volatile uint8_t*)
>+ ((uintptr_t) sc->bar[BAR0].base_addr + offset)));
>+ PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%02x",
>+ (unsigned long)offset, val);
>+
>+ return val;
>+}
>+
>+static inline uint16_t
>+bnx2x_reg_read16(struct bnx2x_softc *sc, size_t offset)
>+{
>+ uint16_t val;
>
>-#define bnx2x_reg_write16(sc, offset, val)\
>- *((volatile uint16_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)) =
>val
>+#ifdef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC
>+ if ((offset % 2) != 0)
>+ PMD_DRV_LOG(NOTICE, "Unaligned 16-bit read from 0x%08lx",
>+ (unsigned long)offset);
>+#endif
>
>-#define bnx2x_reg_write32(sc, offset, val)\
>- *((volatile uint32_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)) =
>val
>+ val = (uint16_t)(*((volatile uint16_t*)
>+ ((uintptr_t) sc->bar[BAR0].base_addr + offset)));
>+ PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%08x",
>+ (unsigned long)offset, val);
>
>-#define bnx2x_reg_read8(sc, offset)\
>- (*((volatile uint8_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)))
>+ return val;
>+}
>
>-#define bnx2x_reg_read16(sc, offset)\
>- (*((volatile uint16_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)))
>+static inline uint32_t
>+bnx2x_reg_read32(struct bnx2x_softc *sc, size_t offset)
>+{
>+ uint32_t val;
>
>-#define bnx2x_reg_read32(sc, offset)\
>- (*((volatile uint32_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)))
>+#ifdef RTE_LIBRTE_BNX2X_DEBUG_PERIODIC
>+ if ((offset % 4) != 0)
>+ PMD_DRV_LOG(NOTICE, "Unaligned 32-bit read from 0x%08lx",
>+ (unsigned long)offset);
> #endif
>
>+ val = (uint32_t)(*((volatile uint32_t*)
>+ ((uintptr_t) sc->bar[BAR0].base_addr + offset)));
>+ PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%08x",
>+ (unsigned long)offset, val);
>+
>+ return val;
>+}
>+
> #define REG_ADDR(sc, offset) (((uint64_t)sc->bar[BAR0].base_addr) +
>(offset))
>
> #define REG_RD8(sc, offset) bnx2x_reg_read8(sc, (offset))
>diff --git a/drivers/net/bnx2x/debug.c b/drivers/net/bnx2x/debug.c
>deleted file mode 100644
>index cc50845..0000000
>--- a/drivers/net/bnx2x/debug.c
>+++ /dev/null
>@@ -1,96 +0,0 @@
>-/*-
>- * Copyright (c) 2007-2013 QLogic Corporation. All rights reserved.
>- *
>- * Eric Davis <edavis at broadcom.com>
>- * David Christensen <davidch at broadcom.com>
>- * Gary Zambrano <zambrano at broadcom.com>
>- *
>- * Copyright (c) 2013-2015 Brocade Communications Systems, Inc.
>- * Copyright (c) 2015 QLogic Corporation.
>- * All rights reserved.
>- * www.qlogic.com
>- *
>- * See LICENSE.bnx2x_pmd for copyright and licensing details.
>- */
>-
>-#include "bnx2x.h"
>-
>-
>-/*
>- * Debug versions of the 8/16/32 bit OS register read/write functions to
>- * capture/display values read/written from/to the controller.
>- */
>-void
>-bnx2x_reg_write8(struct bnx2x_softc *sc, size_t offset, uint8_t val)
>-{
>- PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%02x", (unsigned
>long)offset, val);
>- *((volatile uint8_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)) =
>val;
>-}
>-
>-void
>-bnx2x_reg_write16(struct bnx2x_softc *sc, size_t offset, uint16_t val)
>-{
>- if ((offset % 2) != 0) {
>- PMD_DRV_LOG(NOTICE, "Unaligned 16-bit write to 0x%08lx",
>- (unsigned long)offset);
>- }
>-
>- PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%04x", (unsigned
>long)offset, val);
>- *((volatile uint16_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)) =
>val;
>-}
>-
>-void
>-bnx2x_reg_write32(struct bnx2x_softc *sc, size_t offset, uint32_t val)
>-{
>- if ((offset % 4) != 0) {
>- PMD_DRV_LOG(NOTICE, "Unaligned 32-bit write to 0x%08lx",
>- (unsigned long)offset);
>- }
>-
>- PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%08x", (unsigned
>long)offset, val);
>- *((volatile uint32_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)) =
>val;
>-}
>-
>-uint8_t
>-bnx2x_reg_read8(struct bnx2x_softc *sc, size_t offset)
>-{
>- uint8_t val;
>-
>- val = (uint8_t)(*((volatile
>uint8_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)));
>- PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%02x", (unsigned
>long)offset, val);
>-
>- return val;
>-}
>-
>-uint16_t
>-bnx2x_reg_read16(struct bnx2x_softc *sc, size_t offset)
>-{
>- uint16_t val;
>-
>- if ((offset % 2) != 0) {
>- PMD_DRV_LOG(NOTICE, "Unaligned 16-bit read from 0x%08lx",
>- (unsigned long)offset);
>- }
>-
>- val = (uint16_t)(*((volatile
>uint16_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)));
>- PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%08x", (unsigned
>long)offset, val);
>-
>- return val;
>-}
>-
>-uint32_t
>-bnx2x_reg_read32(struct bnx2x_softc *sc, size_t offset)
>-{
>- uint32_t val;
>-
>- if ((offset % 4) != 0) {
>- PMD_DRV_LOG(NOTICE, "Unaligned 32-bit read from 0x%08lx",
>- (unsigned long)offset);
>- return 0;
>- }
>-
>- val = (uint32_t)(*((volatile
>uint32_t*)((uintptr_t)sc->bar[BAR0].base_addr + offset)));
>- PMD_DEBUG_PERIODIC_LOG(DEBUG, "offset=0x%08lx val=0x%08x", (unsigned
>long)offset, val);
>-
>- return val;
>-}
>--
>2.7.4
>
>
There is no cover letter. So please treat this acking the series.
Acked-by: Harish Patil <harish.patil at qlogic.com>
