Date: Sun, 19 Jul 2026 16:49:16 +0000 From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Nick Price <nick@spun.io> Subject: git: f1796e8781ca - main - aq(4): remove dead code and tidy macros, diagnostics, and naming Message-ID: <6a5d000c.31997.136b30dc@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=f1796e8781ca8a632ffa0861b2e09944d225c479 commit f1796e8781ca8a632ffa0861b2e09944d225c479 Author: Nick Price <nick@spun.io> AuthorDate: 2026-07-19 16:47:38 +0000 Commit: Adrian Chadd <adrian@FreeBSD.org> CommitDate: 2026-07-19 16:47:38 +0000 aq(4): remove dead code and tidy macros, diagnostics, and naming Non-functional cleanup, with two diagnostic corrections. Dead code: delete leftover commented-out AQ_DBG_ENTER/EXIT/PRINT calls (aq_hw.c, aq_fw2x.c, aq_irq.c, aq_main.c), a commented-out aq_nic_cfg local, the stale old-signature parameter blocks between the ring-init declarations and their bodies (aq_ring.c), a trailing note on a live statement, and the unused DumpHex() vendor debug helper (no callers; its body only compiled under AQ_CFG_DEBUG_LVL > 3). Register-write macros: parenthesize AQ_WRITE_REG_BIT's msk/shift/value arguments so a compound argument cannot mis-bind, give AQ_HW_FLUSH() an explicit hw parameter instead of capturing it from caller scope, and drop the duplicate lowercase aq_hw_write_reg[_bit] aliases (converting the 43 call sites to the uppercase spelling) so there is a single form. Diagnostics: the aq_log* family expanded through the base log macro, which ignored its level and printed unconditionally, while the error traces gated on a debug level that defaulted below LOG_ERR and so were suppressed -- backwards. Gate the base log macro the way the trace one does and default the level to lvl_error, so the once-per-event firmware reset / capability errors are visible by default while the verbose info/dump output stays opt-in. Naming: rename identifiers carried verbatim from the vendor import that do not match style -- names mixing an ALL-CAPS macro-style prefix with a lowercase tail, and a trailing underscore the vendor used as a "file-local" marker in place of static. - dbg_level_ / dbg_categories_ -> aq_dbg_level / aq_dbg_categories: these are real globals (the log/trace macros reference them from every translation unit), so the trailing underscore was never a stand-in for static; give them the aq_ namespace so the driver stops exporting generically-named global symbols. - log_base_ / trace_base_ -> aq_log_base / aq_trace_base: the internal macros behind the aq_log*/trace* families. - bootExitCode / flbStatus -> boot_exit_code / flb_status (aq_fw.c); flb_status now matches the identically-purposed variable already spelled that way in the sibling FLB-reset path. Cosmetic: terminate the ring/HW-init, MSI-X admin-handler, and media-change error messages with a newline so they are not garbled into adjacent dmesg output, and label the per-queue rx_bytes sysctl "RX Octets" (it was copy-pasted "TX Octets"). Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58140 --- sys/dev/aq/aq_dbg.c | 50 ++--------------------------- sys/dev/aq/aq_dbg.h | 23 +++++++------- sys/dev/aq/aq_fw.c | 10 +++--- sys/dev/aq/aq_fw1x.c | 46 +++++++++++++-------------- sys/dev/aq/aq_fw2x.c | 70 ++++++++++++++++++++-------------------- sys/dev/aq/aq_hw.c | 7 ---- sys/dev/aq/aq_hw.h | 14 +++----- sys/dev/aq/aq_hw_llh.c | 86 +++++++++++++++++++++++++------------------------- sys/dev/aq/aq_irq.c | 7 ++-- sys/dev/aq/aq_main.c | 20 ++++++------ sys/dev/aq/aq_media.c | 2 +- sys/dev/aq/aq_ring.c | 12 +------ 12 files changed, 136 insertions(+), 211 deletions(-) diff --git a/sys/dev/aq/aq_dbg.c b/sys/dev/aq/aq_dbg.c index 86e8fb9cc82a..fb1408b993e7 100644 --- a/sys/dev/aq/aq_dbg.c +++ b/sys/dev/aq/aq_dbg.c @@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$"); #include "aq_dbg.h" -int dbg_level_ = 0; -uint32_t dbg_categories_ = dbg_init | dbg_config | dbg_tx | dbg_rx | dbg_intr | dbg_fw; +int aq_dbg_level = lvl_error; +uint32_t aq_dbg_categories = dbg_init | dbg_config | dbg_tx | dbg_rx | dbg_intr | dbg_fw; @@ -196,49 +196,3 @@ trace_aq_tx_context_descr(int ring_idx, unsigned int pointer, __entry->des_typ); #endif } - -void -DumpHex(const void* data, size_t size) { -#if AQ_CFG_DEBUG_LVL > 3 - char ascii[17]; - size_t i, j; - char line[256]; - char buf[256]; - - ascii[16] = '\0'; - line[0] = '\0'; - printf("packet at %p\n", data); - - for (i = 0; i < size; ++i) { - sprintf(buf, "%02X ", ((const unsigned char*)data)[i]); - strcat(line, buf); - if (((const unsigned char*)data)[i] >= ' ' && - ((const unsigned char*)data)[i] <= '~') { - ascii[i % 16] = ((const unsigned char*)data)[i]; - } else { - ascii[i % 16] = '.'; - } - if ((i+1) % 8 == 0 || i+1 == size) { - strcat(line, " "); - if ((i+1) % 16 == 0) { - sprintf(buf, "| %s \n", ascii); - strcat(line, buf); - printf("%s", line); - line[0] = '\0'; - } else if (i+1 == size) { - ascii[(i+1) % 16] = '\0'; - if ((i+1) % 16 <= 8) { - strcat(line, " "); - } - for (j = (i+1) % 16; j < 16; ++j) { - strcat(line, " "); - } - sprintf(buf, "| %s \n", ascii); - strcat(line, buf); - printf("%s", line); - line[0] = '\0'; - } - } - } -#endif -} diff --git a/sys/dev/aq/aq_dbg.h b/sys/dev/aq/aq_dbg.h index 7b546d4f3d78..2e5e79ced195 100644 --- a/sys/dev/aq/aq_dbg.h +++ b/sys/dev/aq/aq_dbg.h @@ -109,25 +109,24 @@ enum aq_debug_category #define __FILENAME__ (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__) -extern int dbg_level_; -extern uint32_t dbg_categories_; +extern int aq_dbg_level; +extern uint32_t aq_dbg_categories; -#define log_base_(_lvl, _fmt, args...) printf( "atlantic: " _fmt "\n", ##args) +#define aq_log_base(_lvl, _fmt, args...) do { if (aq_dbg_level >= (_lvl)) printf( "atlantic: " _fmt "\n", ##args); } while (0) -#define trace_base_(_lvl, _cat, _fmt, args...) do { if (dbg_level_ >= (_lvl) && ((_cat) & dbg_categories_)) { printf( "atlantic: " _fmt " @%s,%d\n", ##args, __FILENAME__, __LINE__); }} while (0) +#define aq_trace_base(_lvl, _cat, _fmt, args...) do { if (aq_dbg_level >= (_lvl) && ((_cat) & aq_dbg_categories)) { printf( "atlantic: " _fmt " @%s,%d\n", ##args, __FILENAME__, __LINE__); }} while (0) -#define aq_log_warn(_fmt, args...) log_base_(lvl_warn, "/!\\ " _fmt, ##args) -#define aq_log(_fmt, args...) log_base_(lvl_trace, _fmt, ##args) -#define aq_log_detail(_fmt, args...) log_base_(lvl_detail, _fmt, ##args) +#define aq_log_warn(_fmt, args...) aq_log_base(lvl_warn, "/!\\ " _fmt, ##args) +#define aq_log(_fmt, args...) aq_log_base(lvl_trace, _fmt, ##args) +#define aq_log_detail(_fmt, args...) aq_log_base(lvl_detail, _fmt, ##args) -#define trace_error(_cat,_fmt, args...) trace_base_(lvl_error, _cat, "[!] " _fmt, ##args) -#define trace_warn(_cat, _fmt, args...) trace_base_(lvl_warn, _cat, "/!\\ " _fmt, ##args) -#define trace(_cat, _fmt, args...) trace_base_(lvl_trace, _cat, _fmt, ##args) -#define trace_detail(_cat, _fmt, args...) trace_base_(lvl_detail, _cat, _fmt, ##args) +#define trace_error(_cat,_fmt, args...) aq_trace_base(lvl_error, _cat, "[!] " _fmt, ##args) +#define trace_warn(_cat, _fmt, args...) aq_trace_base(lvl_warn, _cat, "/!\\ " _fmt, ##args) +#define trace(_cat, _fmt, args...) aq_trace_base(lvl_trace, _cat, _fmt, ##args) +#define trace_detail(_cat, _fmt, args...) aq_trace_base(lvl_detail, _cat, _fmt, ##args) void trace_aq_tx_descr(int ring_idx, unsigned int pointer, volatile uint64_t descr[2]); void trace_aq_rx_descr(int ring_idx, unsigned int pointer, volatile uint64_t descr[2]); void trace_aq_tx_context_descr(int ring_idx, unsigned int pointer, volatile uint64_t descr[2]); -void DumpHex(const void* data, size_t size); #endif // AQ_DBG_H diff --git a/sys/dev/aq/aq_fw.c b/sys/dev/aq/aq_fw.c index f2f75dd7d3de..a7dda9bedff0 100644 --- a/sys/dev/aq/aq_fw.c +++ b/sys/dev/aq/aq_fw.c @@ -95,13 +95,13 @@ int aq_fw_reset(struct aq_hw* hw) { int ver = AQ_READ_REG(hw, 0x18); - uint32_t bootExitCode = 0; + uint32_t boot_exit_code = 0; int k; for (k = 0; k < 1000; ++k) { - uint32_t flbStatus = reg_glb_daisy_chain_status1_get(hw); - bootExitCode = AQ_READ_REG(hw, 0x388); - if (flbStatus != 0x06000000 || bootExitCode != 0) + uint32_t flb_status = reg_glb_daisy_chain_status1_get(hw); + boot_exit_code = AQ_READ_REG(hw, 0x388); + if (flb_status != 0x06000000 || boot_exit_code != 0) break; } @@ -110,7 +110,7 @@ aq_fw_reset(struct aq_hw* hw) return (EBUSY); } - hw->rbl_enabled = bootExitCode != 0; + hw->rbl_enabled = boot_exit_code != 0; trace(dbg_init, "RBL enabled = %d", hw->rbl_enabled); diff --git a/sys/dev/aq/aq_fw1x.c b/sys/dev/aq/aq_fw1x.c index 3149e979825f..bac79497262c 100644 --- a/sys/dev/aq/aq_fw1x.c +++ b/sys/dev/aq/aq_fw1x.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); -enum fw1x_mode { +enum aq_fw1x_mode { FW1X_MPI_DEINIT = 0, FW1X_MPI_RESERVED = 1, FW1X_MPI_INIT = 2, @@ -64,7 +64,7 @@ enum aq_fw1x_rate { FW1X_RATE_INVALID = 1 << 6, }; -union fw1x_state_reg { +union aq_fw1x_state_reg { uint32_t val; struct { uint8_t mode; @@ -77,17 +77,17 @@ union fw1x_state_reg { }; }; -static int fw1x_reset(struct aq_hw* hw); +static int aq_fw1x_reset(struct aq_hw* hw); -static int fw1x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, +static int aq_fw1x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, enum aq_fw_link_speed speed); -static int fw1x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, +static int aq_fw1x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, enum aq_fw_link_speed* speed, enum aq_fw_link_fc* fc); -static int fw1x_get_mac_addr(struct aq_hw* hw, uint8_t* mac_addr); -static int fw1x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats); +static int aq_fw1x_get_mac_addr(struct aq_hw* hw, uint8_t* mac_addr); +static int aq_fw1x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats); -static enum fw1x_mode +static enum aq_fw1x_mode mpi_mode_to_fw1x(enum aq_hw_fw_mpi_state mode) { switch (mode) { @@ -136,7 +136,7 @@ link_speed_mask_to_fw1x(uint32_t /*aq_fw_link_speed*/ speed) } static enum aq_fw_link_speed -fw1x_rate_to_link_speed(enum aq_fw1x_rate rate) +aq_fw1x_rate_to_link_speed(enum aq_fw1x_rate rate) { switch (rate) { case FW1X_RATE_10G: @@ -162,7 +162,7 @@ fw1x_rate_to_link_speed(enum aq_fw1x_rate rate) } static int -fw1x_reset(struct aq_hw* hw) +aq_fw1x_reset(struct aq_hw* hw) { uint32_t tid0 = ~0u; /*< Initial value of MBOX transactionId. */ struct aq_hw_fw_mbox mbox; @@ -199,10 +199,10 @@ fw1x_reset(struct aq_hw* hw) } static int -fw1x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, +aq_fw1x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, enum aq_fw_link_speed speed) { - union fw1x_state_reg state = {0}; + union aq_fw1x_state_reg state = {0}; state.mode = mpi_mode_to_fw1x(mode); state.speed = link_speed_mask_to_fw1x(speed); @@ -215,10 +215,10 @@ fw1x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, } static int -fw1x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, +aq_fw1x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, enum aq_fw_link_speed* speed, enum aq_fw_link_fc* fc) { - union fw1x_state_reg state = { .val = AQ_READ_REG(hw, AQ_HW_MPI_STATE_ADR) }; + union aq_fw1x_state_reg state = { .val = AQ_READ_REG(hw, AQ_HW_MPI_STATE_ADR) }; trace(dbg_init, "fw1x> get_mode(): 0x36c -> %x, 0x368 -> %x", state.val, AQ_READ_REG(hw, AQ_HW_MPI_CONTROL_ADR)); @@ -244,7 +244,7 @@ fw1x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, *mode = md; if (speed) - *speed = fw1x_rate_to_link_speed(state.speed); + *speed = aq_fw1x_rate_to_link_speed(state.speed); *fc = aq_fw_fc_none; @@ -254,7 +254,7 @@ fw1x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, static int -fw1x_get_mac_addr(struct aq_hw* hw, uint8_t* mac) +aq_fw1x_get_mac_addr(struct aq_hw* hw, uint8_t* mac) { int err = EFAULT; uint32_t mac_addr[2]; @@ -289,13 +289,13 @@ fw1x_get_mac_addr(struct aq_hw* hw, uint8_t* mac) return (0); } -/* fw1x_get_stats() memcpy's this raw block onto aq_hw_stats' prefix. */ +/* aq_fw1x_get_stats() memcpy's this raw block onto aq_hw_stats' prefix. */ _Static_assert(sizeof(struct aq_fw1x_mbox_stats) == __offsetof(struct aq_hw_stats, brc), "fw1x mailbox stats must match the aq_hw_stats prefix"); static int -fw1x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats) +aq_fw1x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats) { int err = 0; @@ -312,11 +312,11 @@ fw1x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats) const struct aq_firmware_ops aq_fw1x_ops = { - .reset = fw1x_reset, + .reset = aq_fw1x_reset, - .set_mode = fw1x_set_mode, - .get_mode = fw1x_get_mode, + .set_mode = aq_fw1x_set_mode, + .get_mode = aq_fw1x_get_mode, - .get_mac_addr = fw1x_get_mac_addr, - .get_stats = fw1x_get_stats, + .get_mac_addr = aq_fw1x_get_mac_addr, + .get_stats = aq_fw1x_get_stats, }; diff --git a/sys/dev/aq/aq_fw2x.c b/sys/dev/aq/aq_fw2x.c index bf18f43fd548..b757d23b9e1e 100644 --- a/sys/dev/aq/aq_fw2x.c +++ b/sys/dev/aq/aq_fw2x.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include "aq_dbg.h" -enum fw2x_caps_lo { +enum aq_fw2x_caps_lo { CAPS_LO_10BASET_HD = 0x00, CAPS_LO_10BASET_FD, CAPS_LO_100BASETX_HD, @@ -66,7 +66,7 @@ enum fw2x_caps_lo { CAPS_LO_10GBASET_FD, }; -enum fw2x_caps_hi { +enum aq_fw2x_caps_hi { CAPS_HI_RESERVED1 = 0x00, CAPS_HI_10BASET_EEE, CAPS_HI_RESERVED2, @@ -111,7 +111,7 @@ enum aq_fw2x_rate }; -struct fw2x_msm_statistics +struct aq_fw2x_msm_statistics { uint32_t uprc; uint32_t mprc; @@ -131,31 +131,31 @@ struct fw2x_msm_statistics uint32_t prc; }; -struct fw2x_phy_cable_diag_data +struct aq_fw2x_phy_cable_diag_data { uint32_t lane_data[4]; }; -struct fw2x_capabilities { +struct aq_fw2x_capabilities { uint32_t caps_lo; uint32_t caps_hi; }; -struct fw2x_mailbox // struct fwHostInterface +struct aq_fw2x_mailbox // struct fwHostInterface { uint32_t version; uint32_t transaction_id; int32_t error; - struct fw2x_msm_statistics msm; // msmStatistics_t msm; + struct aq_fw2x_msm_statistics msm; // msmStatistics_t msm; uint16_t phy_h_bit; uint16_t phy_fault_code; int16_t phy_temperature; uint8_t cable_len; uint8_t reserved1; - struct fw2x_phy_cable_diag_data diag_data; + struct aq_fw2x_phy_cable_diag_data diag_data; uint32_t reserved[8]; - struct fw2x_capabilities caps; + struct aq_fw2x_capabilities caps; /* ... */ }; @@ -193,15 +193,15 @@ struct fw2x_mailbox // struct fwHostInterface #define FW2X_LED_DEFAULT 0x0U // Firmware v2-3.x specific functions. -static int fw2x_reset(struct aq_hw* hw); +static int aq_fw2x_reset(struct aq_hw* hw); -static int fw2x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, +static int aq_fw2x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, enum aq_fw_link_speed speed); -static int fw2x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, +static int aq_fw2x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, enum aq_fw_link_speed* speed, enum aq_fw_link_fc* fc); -static int fw2x_get_mac_addr(struct aq_hw* hw, uint8_t* mac); -static int fw2x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats); +static int aq_fw2x_get_mac_addr(struct aq_hw* hw, uint8_t* mac); +static int aq_fw2x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats); static uint64_t @@ -240,12 +240,12 @@ set_mpi_ctrl(struct aq_hw* hw, uint64_t value) static int -fw2x_reset(struct aq_hw* hw) +aq_fw2x_reset(struct aq_hw* hw) { - struct fw2x_capabilities caps = {0}; + struct aq_fw2x_capabilities caps = {0}; AQ_DBG_ENTER(); int err = aq_hw_fw_downld_dwords(hw, - hw->mbox_addr + offsetof(struct fw2x_mailbox, caps), + hw->mbox_addr + offsetof(struct aq_fw2x_mailbox, caps), (uint32_t*)&caps, sizeof caps/sizeof(uint32_t)); if (err == 0) { hw->fw_caps = caps.caps_lo | ((uint64_t)caps.caps_hi << 32); @@ -289,7 +289,7 @@ link_speed_mask_to_fw2x(uint32_t speed) static int -fw2x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, +aq_fw2x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, enum aq_fw_link_speed speed) { uint64_t mpi_ctrl = get_mpi_ctrl(hw); @@ -326,13 +326,12 @@ fw2x_set_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state mode, } static int -fw2x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, +aq_fw2x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, enum aq_fw_link_speed* link_speed, enum aq_fw_link_fc* fc) { uint64_t mpi_state = get_mpi_state(hw); uint32_t rates = mpi_state & FW2X_RATE_MASK; - // AQ_DBG_ENTER(); if (mode) { uint64_t mpi_ctrl = get_mpi_ctrl(hw); @@ -361,13 +360,12 @@ fw2x_get_mode(struct aq_hw* hw, enum aq_hw_fw_mpi_state* mode, *fc = (mpi_state & (FW2X_FW_CAP_PAUSE | FW2X_FW_CAP_ASYM_PAUSE)) >> (32 + CAPS_HI_PAUSE); -// AQ_DBG_EXIT(0); return (0); } static int -fw2x_get_mac_addr(struct aq_hw* hw, uint8_t* mac) +aq_fw2x_get_mac_addr(struct aq_hw* hw, uint8_t* mac) { int err = EFAULT; uint32_t mac_addr[2]; @@ -400,8 +398,8 @@ fw2x_get_mac_addr(struct aq_hw* hw, uint8_t* mac) } static inline void -fw2x_stats_to_fw_stats(struct aq_hw_stats* dst, - const struct fw2x_msm_statistics* src) +aq_fw2x_stats_to_fw_stats(struct aq_hw_stats* dst, + const struct aq_fw2x_msm_statistics* src) { dst->uprc = src->uprc; dst->mprc = src->mprc; @@ -423,9 +421,9 @@ fw2x_stats_to_fw_stats(struct aq_hw_stats* dst, static int -fw2x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats) +aq_fw2x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats) { - struct fw2x_msm_statistics fw2x_stats = {0}; + struct aq_fw2x_msm_statistics aq_fw2x_stats = {0}; uint64_t mpi_ctrl; int err; @@ -436,10 +434,10 @@ fw2x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats) /* Kick-and-read: take the F/W's previous snapshot, request the next. */ err = aq_hw_fw_downld_dwords(hw, - hw->mbox_addr + offsetof(struct fw2x_mailbox, msm), - (uint32_t*)&fw2x_stats, sizeof fw2x_stats/sizeof(uint32_t)); + hw->mbox_addr + offsetof(struct aq_fw2x_mailbox, msm), + (uint32_t*)&aq_fw2x_stats, sizeof aq_fw2x_stats/sizeof(uint32_t)); - fw2x_stats_to_fw_stats(stats, &fw2x_stats); + aq_fw2x_stats_to_fw_stats(stats, &aq_fw2x_stats); if (err != 0) trace_error(dbg_fw, @@ -453,7 +451,7 @@ fw2x_get_stats(struct aq_hw* hw, struct aq_hw_stats* stats) } static int -fw2x_led_control(struct aq_hw* hw, uint32_t onoff) +aq_fw2x_led_control(struct aq_hw* hw, uint32_t onoff) { int err = 0; @@ -471,13 +469,13 @@ fw2x_led_control(struct aq_hw* hw, uint32_t onoff) const struct aq_firmware_ops aq_fw2x_ops = { - .reset = fw2x_reset, + .reset = aq_fw2x_reset, - .set_mode = fw2x_set_mode, - .get_mode = fw2x_get_mode, + .set_mode = aq_fw2x_set_mode, + .get_mode = aq_fw2x_get_mode, - .get_mac_addr = fw2x_get_mac_addr, - .get_stats = fw2x_get_stats, + .get_mac_addr = aq_fw2x_get_mac_addr, + .get_stats = aq_fw2x_get_stats, - .led_control = fw2x_led_control, + .led_control = aq_fw2x_led_control, }; diff --git a/sys/dev/aq/aq_hw.c b/sys/dev/aq/aq_hw.c index 74c003d6e099..2c147ee61a4e 100644 --- a/sys/dev/aq/aq_hw.c +++ b/sys/dev/aq/aq_hw.c @@ -95,7 +95,6 @@ aq_hw_fw_downld_dwords(struct aq_hw *hw, uint32_t a, uint32_t *p, uint32_t cnt) { int err = 0; -// AQ_DBG_ENTER(); err = AQ_HW_WAIT_FOR(reg_glb_cpu_sem_get(hw, AQ_HW_FW_SM_RAM) == 1U, 1U, 10000U); @@ -128,7 +127,6 @@ aq_hw_fw_downld_dwords(struct aq_hw *hw, uint32_t a, uint32_t *p, uint32_t cnt) reg_glb_cpu_sem_set(hw, 1U, AQ_HW_FW_SM_RAM); err_exit: -// AQ_DBG_EXIT(err); return (err); } @@ -211,7 +209,6 @@ int aq_hw_mpi_read_stats(struct aq_hw *hw, struct aq_hw_stats *stats) { int err; -// AQ_DBG_ENTER(); err = hw->fw_ops->get_stats(hw, stats); @@ -220,7 +217,6 @@ aq_hw_mpi_read_stats(struct aq_hw *hw, struct aq_hw_stats *stats) stats->cprc = stats_rx_lro_coalesced_pkt_count0_get(hw); } -// AQ_DBG_EXIT(err); return (err); } @@ -247,7 +243,6 @@ aq_hw_get_link_state(struct aq_hw *hw, uint32_t *link_speed, struct aq_hw_fc_inf { int err = 0; - // AQ_DBG_ENTER(); enum aq_hw_fw_mpi_state mode; enum aq_fw_link_speed speed = aq_fw_none; @@ -293,7 +288,6 @@ aq_hw_get_link_state(struct aq_hw *hw, uint32_t *link_speed, struct aq_hw_fc_inf fc_neg->fc_rx = !!(fc & aq_fw_fc_ENABLE_RX); fc_neg->fc_tx = !!(fc & aq_fw_fc_ENABLE_TX); - // AQ_DBG_EXIT(0); return (0); } @@ -549,7 +543,6 @@ aq_hw_init_tx_path(struct aq_hw *hw) static int aq_hw_init_rx_path(struct aq_hw *hw) { - //struct aq_nic_cfg *cfg = hw->aq_nic_cfg; unsigned int control_reg_val = 0U; int i; int err; diff --git a/sys/dev/aq/aq_hw.h b/sys/dev/aq/aq_hw.h index 33c4873292d7..22e10ba72c54 100644 --- a/sys/dev/aq/aq_hw.h +++ b/sys/dev/aq/aq_hw.h @@ -56,12 +56,12 @@ extern uint32_t aq_hw_read_reg(struct aq_hw *hw, uint32_t reg); #define AQ_WRITE_REG_BIT(hw, reg, msk, shift, value) do { \ - if (msk ^ ~0) { \ + if ((msk) ^ ~0) { \ uint32_t reg_old, reg_new = 0U; \ reg_old = AQ_READ_REG(hw, reg); \ - reg_new = (reg_old & (~msk)) | (value << shift); \ - if (reg_old != reg_new) \ - AQ_WRITE_REG(hw, reg, reg_new); \ + reg_new = (reg_old & (~(msk))) | ((value) << (shift)); \ + if (reg_old != reg_new) \ + AQ_WRITE_REG(hw, reg, reg_new); \ } else { \ AQ_WRITE_REG(hw, reg, value); \ } \ @@ -71,11 +71,7 @@ extern uint32_t aq_hw_read_reg(struct aq_hw *hw, uint32_t reg); #define AQ_READ_REG_BIT(a, reg, msk, shift) ( \ ((AQ_READ_REG(a, reg) & msk) >> shift)) -#define AQ_HW_FLUSH() { (void)AQ_READ_REG(hw, 0x10); } - -#define aq_hw_write_reg_bit AQ_WRITE_REG_BIT - -#define aq_hw_write_reg AQ_WRITE_REG +#define AQ_HW_FLUSH(hw) { (void)AQ_READ_REG((hw), 0x10); } /* Driver-side per-backend statistics snapshot. */ struct aq_hw_stats { diff --git a/sys/dev/aq/aq_hw_llh.c b/sys/dev/aq/aq_hw_llh.c index dba02c467e55..2369418a3681 100644 --- a/sys/dev/aq/aq_hw_llh.c +++ b/sys/dev/aq/aq_hw_llh.c @@ -1002,7 +1002,7 @@ rpf_tpo_to_rpf_sys_lbk_set(struct aq_hw *aq_hw, uint32_t tpo_to_rpf_sys_lbk) void hw_atl_rpf_vlan_inner_etht_set(struct aq_hw *aq_hw, uint32_t vlan_inner_etht) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_INNER_TPID_ADR, + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_INNER_TPID_ADR, HW_ATL_RPF_VL_INNER_TPID_MSK, HW_ATL_RPF_VL_INNER_TPID_SHIFT, vlan_inner_etht); @@ -1011,7 +1011,7 @@ hw_atl_rpf_vlan_inner_etht_set(struct aq_hw *aq_hw, uint32_t vlan_inner_etht) void hw_atl_rpf_vlan_outer_etht_set(struct aq_hw *aq_hw, uint32_t vlan_outer_etht) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_OUTER_TPID_ADR, + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_OUTER_TPID_ADR, HW_ATL_RPF_VL_OUTER_TPID_MSK, HW_ATL_RPF_VL_OUTER_TPID_SHIFT, vlan_outer_etht); @@ -1021,7 +1021,7 @@ void hw_atl_rpf_vlan_prom_mode_en_set(struct aq_hw *aq_hw, uint32_t vlan_prom_mode_en) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_PROMIS_MODE_ADR, + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_PROMIS_MODE_ADR, HW_ATL_RPF_VL_PROMIS_MODE_MSK, HW_ATL_RPF_VL_PROMIS_MODE_SHIFT, vlan_prom_mode_en); @@ -1031,7 +1031,7 @@ void hw_atl_rpf_vlan_accept_untagged_packets_set(struct aq_hw *aq_hw, uint32_t vlan_acc_untagged_packets) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_ACCEPT_UNTAGGED_MODE_ADR, + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_ACCEPT_UNTAGGED_MODE_ADR, HW_ATL_RPF_VL_ACCEPT_UNTAGGED_MODE_MSK, HW_ATL_RPF_VL_ACCEPT_UNTAGGED_MODE_SHIFT, vlan_acc_untagged_packets); @@ -1041,7 +1041,7 @@ void hw_atl_rpf_vlan_untagged_act_set(struct aq_hw *aq_hw, uint32_t vlan_untagged_act) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_UNTAGGED_ACT_ADR, + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_UNTAGGED_ACT_ADR, HW_ATL_RPF_VL_UNTAGGED_ACT_MSK, HW_ATL_RPF_VL_UNTAGGED_ACT_SHIFT, vlan_untagged_act); @@ -1051,7 +1051,7 @@ void hw_atl_rpf_vlan_flr_en_set(struct aq_hw *aq_hw, uint32_t vlan_flr_en, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_EN_F_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_EN_F_ADR(filter), HW_ATL_RPF_VL_EN_F_MSK, HW_ATL_RPF_VL_EN_F_SHIFT, vlan_flr_en); @@ -1061,7 +1061,7 @@ void hw_atl_rpf_vlan_flr_act_set(struct aq_hw *aq_hw, uint32_t vlan_flr_act, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_ACT_F_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_ACT_F_ADR(filter), HW_ATL_RPF_VL_ACT_F_MSK, HW_ATL_RPF_VL_ACT_F_SHIFT, vlan_flr_act); @@ -1071,7 +1071,7 @@ void hw_atl_rpf_vlan_id_flr_set(struct aq_hw *aq_hw, uint32_t vlan_id_flr, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_ID_F_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_ID_F_ADR(filter), HW_ATL_RPF_VL_ID_F_MSK, HW_ATL_RPF_VL_ID_F_SHIFT, vlan_id_flr); @@ -1081,7 +1081,7 @@ void hw_atl_rpf_vlan_rxq_en_flr_set(struct aq_hw *aq_hw, uint32_t vlan_rxq_en, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_RXQ_EN_F_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_RXQ_EN_F_ADR(filter), HW_ATL_RPF_VL_RXQ_EN_F_MSK, HW_ATL_RPF_VL_RXQ_EN_F_SHIFT, vlan_rxq_en); @@ -1091,7 +1091,7 @@ void hw_atl_rpf_vlan_rxq_flr_set(struct aq_hw *aq_hw, uint32_t vlan_rxq, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_VL_RXQ_F_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_VL_RXQ_F_ADR(filter), HW_ATL_RPF_VL_RXQ_F_MSK, HW_ATL_RPF_VL_RXQ_F_SHIFT, vlan_rxq); @@ -1101,7 +1101,7 @@ void hw_atl_rpf_etht_flr_en_set(struct aq_hw *aq_hw, uint32_t etht_flr_en, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_ENF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_ENF_ADR(filter), HW_ATL_RPF_ET_ENF_MSK, HW_ATL_RPF_ET_ENF_SHIFT, etht_flr_en); } @@ -1110,7 +1110,7 @@ void hw_atl_rpf_etht_user_priority_en_set(struct aq_hw *aq_hw, uint32_t etht_user_priority_en, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_UPFEN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_UPFEN_ADR(filter), HW_ATL_RPF_ET_UPFEN_MSK, HW_ATL_RPF_ET_UPFEN_SHIFT, etht_user_priority_en); } @@ -1119,7 +1119,7 @@ void hw_atl_rpf_etht_rx_queue_en_set(struct aq_hw *aq_hw, uint32_t etht_rx_queue_en, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_RXQFEN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_RXQFEN_ADR(filter), HW_ATL_RPF_ET_RXQFEN_MSK, HW_ATL_RPF_ET_RXQFEN_SHIFT, etht_rx_queue_en); @@ -1129,7 +1129,7 @@ void hw_atl_rpf_etht_user_priority_set(struct aq_hw *aq_hw, uint32_t etht_user_priority, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_UPF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_UPF_ADR(filter), HW_ATL_RPF_ET_UPF_MSK, HW_ATL_RPF_ET_UPF_SHIFT, etht_user_priority); } @@ -1138,7 +1138,7 @@ void hw_atl_rpf_etht_rx_queue_set(struct aq_hw *aq_hw, uint32_t etht_rx_queue, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_RXQF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_RXQF_ADR(filter), HW_ATL_RPF_ET_RXQF_MSK, HW_ATL_RPF_ET_RXQF_SHIFT, etht_rx_queue); } @@ -1147,7 +1147,7 @@ void hw_atl_rpf_etht_mgt_queue_set(struct aq_hw *aq_hw, uint32_t etht_mgt_queue, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_MNG_RXQF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_MNG_RXQF_ADR(filter), HW_ATL_RPF_ET_MNG_RXQF_MSK, HW_ATL_RPF_ET_MNG_RXQF_SHIFT, etht_mgt_queue); @@ -1157,7 +1157,7 @@ void hw_atl_rpf_etht_flr_act_set(struct aq_hw *aq_hw, uint32_t etht_flr_act, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_ACTF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_ACTF_ADR(filter), HW_ATL_RPF_ET_ACTF_MSK, HW_ATL_RPF_ET_ACTF_SHIFT, etht_flr_act); } @@ -1166,7 +1166,7 @@ void hw_atl_rpf_etht_flr_set(struct aq_hw *aq_hw, uint32_t etht_flr, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_ET_VALF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_ET_VALF_ADR(filter), HW_ATL_RPF_ET_VALF_MSK, HW_ATL_RPF_ET_VALF_SHIFT, etht_flr); } @@ -1174,7 +1174,7 @@ hw_atl_rpf_etht_flr_set(struct aq_hw *aq_hw, uint32_t etht_flr, void hw_atl_rpf_l3_l4_enf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_L4_ENF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_L4_ENF_ADR(filter), HW_ATL_RPF_L3_L4_ENF_MSK, HW_ATL_RPF_L3_L4_ENF_SHIFT, val); } @@ -1182,7 +1182,7 @@ hw_atl_rpf_l3_l4_enf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l3_v6_enf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_V6_ENF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_V6_ENF_ADR(filter), HW_ATL_RPF_L3_V6_ENF_MSK, HW_ATL_RPF_L3_V6_ENF_SHIFT, val); } @@ -1190,7 +1190,7 @@ hw_atl_rpf_l3_v6_enf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l3_saf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_SAF_EN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_SAF_EN_ADR(filter), HW_ATL_RPF_L3_SAF_EN_MSK, HW_ATL_RPF_L3_SAF_EN_SHIFT, val); } @@ -1198,7 +1198,7 @@ hw_atl_rpf_l3_saf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l3_daf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_DAF_EN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_DAF_EN_ADR(filter), HW_ATL_RPF_L3_DAF_EN_MSK, HW_ATL_RPF_L3_DAF_EN_SHIFT, val); } @@ -1206,7 +1206,7 @@ hw_atl_rpf_l3_daf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l4_spf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L4_SPF_EN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L4_SPF_EN_ADR(filter), HW_ATL_RPF_L4_SPF_EN_MSK, HW_ATL_RPF_L4_SPF_EN_SHIFT, val); } @@ -1214,7 +1214,7 @@ hw_atl_rpf_l4_spf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l4_dpf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L4_DPF_EN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L4_DPF_EN_ADR(filter), HW_ATL_RPF_L4_DPF_EN_MSK, HW_ATL_RPF_L4_DPF_EN_SHIFT, val); } @@ -1222,7 +1222,7 @@ hw_atl_rpf_l4_dpf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l4_protf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L4_PROTF_EN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L4_PROTF_EN_ADR(filter), HW_ATL_RPF_L4_PROTF_EN_MSK, HW_ATL_RPF_L4_PROTF_EN_SHIFT, val); } @@ -1230,7 +1230,7 @@ hw_atl_rpf_l4_protf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l3_arpf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_ARPF_EN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_ARPF_EN_ADR(filter), HW_ATL_RPF_L3_ARPF_EN_MSK, HW_ATL_RPF_L3_ARPF_EN_SHIFT, val); } @@ -1239,7 +1239,7 @@ void hw_atl_rpf_l3_l4_rxqf_en_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_L4_RXQF_EN_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_L4_RXQF_EN_ADR(filter), HW_ATL_RPF_L3_L4_RXQF_EN_MSK, HW_ATL_RPF_L3_L4_RXQF_EN_SHIFT, val); } @@ -1248,7 +1248,7 @@ void hw_atl_rpf_l3_l4_mng_rxqf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_L4_MNG_RXQF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_L4_MNG_RXQF_ADR(filter), HW_ATL_RPF_L3_L4_MNG_RXQF_MSK, HW_ATL_RPF_L3_L4_MNG_RXQF_SHIFT, val); } @@ -1256,7 +1256,7 @@ hw_atl_rpf_l3_l4_mng_rxqf_set(struct aq_hw *aq_hw, uint32_t val, void hw_atl_rpf_l3_l4_actf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_L4_ACTF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_L4_ACTF_ADR(filter), HW_ATL_RPF_L3_L4_ACTF_MSK, HW_ATL_RPF_L3_L4_ACTF_SHIFT, val); } @@ -1264,7 +1264,7 @@ hw_atl_rpf_l3_l4_actf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l3_l4_rxqf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L3_L4_RXQF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L3_L4_RXQF_ADR(filter), HW_ATL_RPF_L3_L4_RXQF_MSK, HW_ATL_RPF_L3_L4_RXQF_SHIFT, val); } @@ -1272,7 +1272,7 @@ hw_atl_rpf_l3_l4_rxqf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l4_protf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L4_PROTF_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L4_PROTF_ADR(filter), HW_ATL_RPF_L4_PROTF_MSK, HW_ATL_RPF_L4_PROTF_SHIFT, val); } @@ -1280,7 +1280,7 @@ hw_atl_rpf_l4_protf_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l4_spd_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L4_SPD_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L4_SPD_ADR(filter), HW_ATL_RPF_L4_SPD_MSK, HW_ATL_RPF_L4_SPD_SHIFT, val); } @@ -1288,7 +1288,7 @@ hw_atl_rpf_l4_spd_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) void hw_atl_rpf_l4_dpd_set(struct aq_hw *aq_hw, uint32_t val, uint32_t filter) { - aq_hw_write_reg_bit(aq_hw, HW_ATL_RPF_L4_DPD_ADR(filter), + AQ_WRITE_REG_BIT(aq_hw, HW_ATL_RPF_L4_DPD_ADR(filter), HW_ATL_RPF_L4_DPD_MSK, HW_ATL_RPF_L4_DPD_SHIFT, val); } @@ -2018,19 +2018,19 @@ mif_mcp_up_mailbox_data_get(struct aq_hw *hw) void hw_atl_rpfl3l4_ipv4_dest_addr_clear(struct aq_hw *aq_hw, uint8_t location) { - aq_hw_write_reg(aq_hw, HW_ATL_RX_GET_ADDR_DESTA_FL3L4(location), 0U); + AQ_WRITE_REG(aq_hw, HW_ATL_RX_GET_ADDR_DESTA_FL3L4(location), 0U); } void hw_atl_rpfl3l4_ipv4_src_addr_clear(struct aq_hw *aq_hw, uint8_t location) { - aq_hw_write_reg(aq_hw, HW_ATL_RX_GET_ADDR_SRCA_FL3L4(location), 0U); + AQ_WRITE_REG(aq_hw, HW_ATL_RX_GET_ADDR_SRCA_FL3L4(location), 0U); } void hw_atl_rpfl3l4_cmd_clear(struct aq_hw *aq_hw, uint8_t location) { - aq_hw_write_reg(aq_hw, HW_ATL_RX_GET_ADDR_CTRL_FL3L4(location), 0U); + AQ_WRITE_REG(aq_hw, HW_ATL_RX_GET_ADDR_CTRL_FL3L4(location), 0U); } void @@ -2039,7 +2039,7 @@ hw_atl_rpfl3l4_ipv6_dest_addr_clear(struct aq_hw *aq_hw, uint8_t location) int i; for (i = 0; i < 4; ++i) - aq_hw_write_reg(aq_hw, + AQ_WRITE_REG(aq_hw, *** 237 LINES SKIPPED ***home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a5d000c.31997.136b30dc>