net: atlantic: add PTP support for AQC113 (Antigua)
Subsystems (4)
[email protected]
maintainerv5 cover net: atlantic: add PTP support for AQC113 (Antigua)
From: Sukhdeep Singh <[email protected]>
This series adds IEEE 1588 PTP support for the AQC113 (Antigua) network controller. AQC113 is the successor to the existing AQC107 (Atlantic) chip already supported by the atlantic driver.
AQC113 uses a substantially different hardware architecture for PTP compared to AQC107:
- Dual on-chip TSG clocks with direct register access instead of PHY-based timestamping via firmware
- TX timestamps via descriptor writeback instead of firmware mailbox
- Hardware L3/L4 RX filters for PTP multicast steering with both IPv4 and IPv6 support
- Reference-counted shared filter slots managed through an Action Resolver Table (ART), allowing multiple rules to share L3/L4 hardware filters when their match criteria are identical
The series is structured in four parts:
Patches 1-3 prepare the existing L3/L4 filter path:
Patch 1 corrects flow_type masking and IPv6 address handling in aq_set_data_fl3l4(). Patch 2 moves the active_ipv4/ipv6 bitmap updates to after the hardware write succeeds. Patch 3 decouples the function from driver-internal structures so it can be called directly by the AQC113 PTP filter setup code.
Patches 4-5 add the AQC113 hardware infrastructure:
Patch 4 adds the low-level register definitions and accessor functions. Patch 5 adds filter data structures and firmware capability query.
Patches 6-7 implement the AQC113 L2/L3/L4 RX filter management:
Patch 6 fixes the AQC113 HW init path: ART section selection, L2 filter slot assignment, and MAC address programming. Patch 7 implements the complete L3/L4 RX filter ops including reference- counted ART sharing and IPv4/IPv6 steering.
Patches 8-12 add the AQC113 PTP feature:
Patch 8 reserves the dedicated PTP traffic class buffer and configures the TX path. Patch 9 extends the hw_ops interface with PTP-specific function pointers and updates AQC107 to the new signatures. Patches 10-12 implement the full PTP subsystem:
Patch 10 adds the hw_atl2 register-level PTP clock ops, Patch 11 adds TX timestamp polling and PTP TX traffic classification, and Patch 12 integrates PTP into aq_ptp and the driver core.
The existing AQC107 PTP implementation is not functionally changed by this series; AQC113-specific code paths are gated on chip detection throughout.
Tested on AQC113 at 1G, 2.5G, 5G, and 10G link speeds using ptp4l/phc2sys with hardware timestamping in both L2 and L4 (IPv4/IPv6) modes.
Changes in v5:
Patch 5:
- Promote art_count fallback literal to HW_ATL2_ART_TOTAL_ENTRIES 128
- Remove hw_atl2_utils_get_action_resolve_table_caps(): art_base_index is now written only by hw_atl2_utils_get_filter_caps()
- Fix L3v4, L3v6, and L4 filter count clamp formulas: remove the erroneous - base_index subtraction that made the last hardware slot unreachable; re-add HW_ATL2_RPF_L3V4_FILTERS (8), HW_ATL2_RPF_L3V6_FILTERS (6), HW_ATL2_RPF_L4_FILTERS (8) as the per-type upper bounds in min_t()
- Update commit message: s/reference-counted/serialized usage counter/
- Update subject to reflect hw_atl2_utils_hw_get_regs() addition
Patch 6:
- hw_atl2_hw_multicast_list_set(): use priv->l2_filters_base_index + 1 as the base slot for multicast L2 filter entries instead of HW_ATL2_MAC_MIN, preventing multicast programming from overwriting the firmware-assigned UC MAC slot
Patch 7:
- hw_atl2_filter_tag_get(): return -ENOSPC instead of -1, consistent with sibling helpers
- Fix L4 error path: return l4_idx (propagates -ENOSPC) instead of -EINVAL
Patch 10:
- Move clk_select = -1 sentinel initialization to aq_pci_func.c so the guard in TSG clock helpers is effective on the very first hw_reset()
- Use local s8 sel in hw_atl2_enable_ptp() after WRITE_ONCE to avoid mixed WRITE_ONCE/plain reads of clk_select
- Zero *stamp on the clk_sel < 0 early-return path in aq_get_ptp_ts() to prevent uninitialized output
- Use READ_ONCE(self->clk_select) in hw_atl2_hw_rx_ptp_ring_init()
- Simplify ring init: remove redundant inner if (!res) wrappers
Patch 11:
- Add aq_ptp_tx_skb_drop_head() and call it in the per-packet ptp_ts_deadline timeout path so the skb_ring head is consumed and the ring does not stall
Patch 12:
- Call mutex_destroy(&aq_ptp->ptp_filter_lock) before kfree(aq_ptp)
- Move ptp_en_flags computation into ptp_filter_lock in aq_ptp_clock_init() to close the data race with a concurrent SIOCSHWTSTAMP updating hwtstamp_config.rx_filter
- Move AQ_NIC_PTP_DPATH_UP set/clear to after the error check so the flag is not asserted when aq_ptp_dpath_enable() fails
- Move aq_utils_obj_clear(AQ_HW_PTP_AVAILABLE) and aq_nic->aq_ptp = NULL before kfree(aq_ptp) in aq_ptp_free()
- aq_ptp_add_a2_filter(): change return type to void; remove dead if (!err) guard
Changes in v4:
Patch 6:
- Fix commit message: the selective memset replaces the unconditional memset(priv, 0) specifically to allow -1 sentinel initialization for l3l4_filters[i].l3_index/l4_index, since 0 is a valid filter index; the previous "preserve firmware layout" rationale was inaccurate as hw_atl2_utils_get_filter_caps() repopulates those fields unconditionally after reset
- Add art_mask == 0 fallback: if FW reports rslv_tbl_base_index >= 16, both clamped section values collapse to 16 and art_mask becomes 0; add guard to fall back to 0xFFFF in that case to avoid disabling the entire Action Resolver Table
- Add l2_filters_base_index bounds check in hw_atl2_utils_get_filter_caps(): clamp to HW_ATL2_MAC_UC if >= HW_ATL2_MAC_MAX, protecting all three consumer sites (hw_atl2_hw_init_new_rx_filters, hw_atl2_hw_init_rx_path, hw_atl2_hw_mac_addr_set) from out-of-range MMIO access
Patch 10:
- Declare hw_atl2_txts_s::ctrl as __le32 (was u32) and add le32_to_cpu() in hw_ring_tx_ptp_get_ts for correct big-endian portability
Patch 11:
- Fix timeout path in aq_ring_tx_clean(): add goto out after buff->skb = NULL to prevent fall-through to aq_ptp_tx_hwtstamp() with a freed skb, which would report a bogus zero timestamp
- Move aq_reapply_rxnfc_all_rules() and aq_filters_vlans_update() removal from aq_ndev_open() and addition to aq_nic_start() into this patch; previously the removal was in patch 11 and the addition in patch 12, leaving a bisect window where filters were dropped but not yet restored
Patch 12:
- Move dx_buff->skb = skb and dx_buff->xdpf = NULL before the PTP timestamp block in aq_nic_map_skb() to prevent skb leak and potential use-after-free when hw_get_clk_sel() returns negative
- Clear all existing L3L4 hardware filters at the start of the if (enable_flags) path in aq_ptp_dpath_enable() to prevent stale L4 filters remaining active when reconfiguring from L2+L4 to L2-only
- Update aq_ptp->hwtstamp_config inside ptp_filter_lock on success to prevent aq_ptp_clock_init() on a concurrent link bounce from reading a stale software filter state
Changes in v3:
Structural (suggested by Paolo Abeni):
- Split old patch 6 into two patches: patch 6 now covers the AQC113 HW init fixes (ART section selection, L2 filter slot, MAC address), and patch 7 covers the L2/L3/L4 RX filter ops
- Split old patch 9 into three patches: patch 10 covers hw_atl2 PTP register ops, patch 11 covers TX timestamp polling and PTP TX classification, and patch 12 covers aq_ptp and driver core integration
Patch 2:
- Fix commit message: remove incorrect claim that bitmap updates are removed from aq_nic_reserve_filter() and aq_nic_release_filter(); the updates are intentionally retained there to support the AQC113 PTP path which programs filters directly without going through aq_add_del_fl3l4()
Patch 5:
- Clamp mac_regs_count loop bound with min_t(ARRAY_SIZE) to prevent out-of-bounds reads if firmware reports an inflated count
- Add base_index overflow check for l3_v6_filter_count (was missing, already present for l3_v4 and l4 categories)
Patches 6-7 (old patch 6):
- Drop unused hw_get_version op from hw_atl2_ops
- Clamp art_first_sec/art_last_sec to 16 before BIT() to avoid shift-past-width UB on section indices >= 32
- Fix hw_atl2_hw_init() to call hw_atl2_hw_mac_addr_set() instead of the A1 function hw_atl_b0_hw_mac_addr_set()
- Fix hw_atl2_hw_init_rx_path() to enable the l2_filters_base_index slot rather than a hardcoded slot 0
- Fix L3 filter family-switch undo path: remove cross-family pointer aliasing; add a guard that aborts reconfiguration when the address family changes and the old slot is still in use
Patch 8 (old patch 7):
- Remove unconditional accept_all_mc enable: per-multicast L2 filter handles PTP multicast steering; accept_all caused non-PTP multicast traffic to receive false timestamps
- Fix commit message: PCIe extended tag enablement is unconditional for AQC113 when firmware has enabled the feature, not gated on PTP
Patches 10-12 (old patch 9):
- Initialize clk_select = -1 in aq_pci_probe() instead of aq_nic_hw_prepare() so that the sentinel survives resume and hw_atl2_hw_reset() can distinguish uninitialised from active
- Add clk_sel < 0 guard in all TSG clock helpers (hw_atl2_tsg_clock_ read/add/sub/increment_set) to prevent out-of-range MMIO access during the window between ptp_clock_register() and hw_atl2_enable_ptp() setting clk_select to 0 or 1
- Use WRITE_ONCE/READ_ONCE for clk_select accesses in hw_atl2_enable_ptp() and ring init to prevent compiler tearing
- Add READ_ONCE(txts->ctrl) + dma_rmb() before reading txts->ts in hw_ring_tx_ptp_get_ts to prevent speculative load reordering on weakly-ordered architectures
- Declare hw_atl2_txts_s::ts as __le64 and use le64_to_cpu() for correct big-endian portability
- Fix teardown order in aq_ptp_free(): cancel_delayed_work_sync() must precede hw_atl2_enable_ptp(..., 0) to prevent the work item from re-arming itself after cancellation
- Add ptp_filter_lock mutex in both aq_ptp_clock_init() and aq_ptp_hwtstamp_config_set() to serialise concurrent filter enable/disable from link state changes and ioctl
- Gate hw_filter_l2_set on AQ_HW_PTP_L2_ENABLE flag in aq_ptp_dpath_enable() to prevent a spurious zero-ethertype L2 filter being installed when only L4 mode is active
- Fix error path in aq_ptp_ring_alloc() to use aq_ring_hwts_rx_free() instead of aq_ring_free() (wrong DMA size)
- Propagate PTP ring init return values from hw_atl2_hw_ring_rx_init() and hw_atl2_hw_ring_tx_init()
- Move skb_tx_timestamp() from aq_ndev_start_xmit() to aq_nic_xmit() after aq_nic_map_skb(), ensuring the SW timestamp is recorded after the DMA mapping is committed
- Remove AQ_HW_FLAG_STARTED flag: it has no reader in this series
- Remove stale references to aq_ptp_tx_ts_timedout/aq_ptp_tx_ts_clear (functions that do not exist); describe the actual timeout mechanism via ptp_ts_deadline in the commit message
- Document double-unmap prevention: buff->is_mapped and buff->pa are cleared before the ts==0 break, preventing a second DMA unmap on the next aq_ring_tx_clean() pass
- Update HW_ATL2_RXBUF_MAX comment: 172 is the AQC113 hardware maximum for data TCs (not a PTP-specific reduction)
Changes in v2:
- Patch 6: Remove redundant variable initializers for art_mask, h, l and err as suggested by Vadim Fedorenko
Sukhdeep Singh (12):
net: atlantic: correct L3L4 filter flow_type masking and IPv6 handling
net: atlantic: move active_ipv4/ipv6 bitmap updates after HW write
net: atlantic: decouple aq_set_data_fl3l4() from driver internals
net: atlantic: add AQC113 hardware register definitions and accessors
net: atlantic: add AQC113 filter data structures and firmware query
net: atlantic: fix AQC113 HW init: ART, L2 filter slot, MAC address
net: atlantic: implement AQC113 L2/L3/L4 RX filter ops
net: atlantic: add AQC113 PTP traffic class and TX path setup
net: atlantic: extend hw_ops and TX descriptor for AQC113 PTP
net: atlantic: add AQC113 PTP hardware ops in hw_atl2
net: atlantic: add AQC113 TX timestamp polling and PTP TX classification
net: atlantic: add AQC113 PTP support in aq_ptp and driver core
.../net/ethernet/aquantia/atlantic/aq_filters.c | 98 ++- .../net/ethernet/aquantia/atlantic/aq_filters.h | 3 + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 35 +- drivers/net/ethernet/aquantia/atlantic/aq_main.c | 30 +- drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 53 +- .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 5 +- drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 540 ++++++++++--- drivers/net/ethernet/aquantia/atlantic/aq_ptp.h | 15 +- drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 22 +- drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 5 +- .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 15 +- .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 834 ++++++++++++++++++++- .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h | 12 + .../aquantia/atlantic/hw_atl2/hw_atl2_internal.h | 68 +- .../aquantia/atlantic/hw_atl2/hw_atl2_llh.c | 359 +++++++++ .../aquantia/atlantic/hw_atl2/hw_atl2_llh.h | 107 ++- .../atlantic/hw_atl2/hw_atl2_llh_internal.h | 204 ++++- .../aquantia/atlantic/hw_atl2/hw_atl2_utils.c | 33 + .../aquantia/atlantic/hw_atl2/hw_atl2_utils.h | 15 + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 52 ++ 20 files changed, 2287 insertions(+), 218 deletions(-)
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 1/12 net: atlantic: correct L3L4 filter flow_type masking and IPv6 handling
From: Sukhdeep Singh <[email protected]>
Correct three issues in aq_set_data_fl3l4() required for the AQC113 PTP filter path introduced later in this series:
1. Mask FLOW_EXT from flow_type before the protocol switch statement. Flow types with FLOW_EXT set (e.g. TCP_V4_FLOW | FLOW_EXT) fall through to the default case and skip protocol comparison flags.
2. Extend the L3 address comparison check to cover all four IPv6 words. The original code only checked ip_src[0]/ip_dst[0] and required !is_ipv6, so CMP_SRC_ADDR_L3/CMP_DEST_ADDR_L3 were never set for IPv6 filters.
3. Use explicit flow type checks for port extraction instead of negating IP_USER_FLOW/IPV6_USER_FLOW. The old check did not mask FLOW_EXT, so IP_USER_FLOW | FLOW_EXT would incorrectly attempt port extraction. Use the actual flow type to pick the correct union member directly.
--- .../ethernet/aquantia/atlantic/aq_filters.c | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_filters.c +17 -16
@@ -472,6 +472,7 @@ static int aq_set_data_fl3l4(struct aq_nic_s *aq_nic, {struct aq_hw_rx_fltrs_s *rx_fltrs =aq_get_hw_rx_fltrs (aq_nic);const struct ethtool_rx_flow_spec *fsp = &aq_rx_fltr->aq_fsp; +u32 flow = fsp->flow_type & ~FLOW_EXT ;memset (data,0 ,sizeof (*data));
@@ -490,7 +491,7 @@ static int aq_set_data_fl3l4(struct aq_nic_s *aq_nic, data->cmd |=HW_ATL_RX_ENABLE_FLTR_L3L4 ; -switch (fsp->flow_type) { +switch (flow) {case TCP_V4_FLOW :case TCP_V6_FLOW : data->cmd |=HW_ATL_RX_ENABLE_CMP_PROT_L4 ;
@@ -527,23 +528,23 @@ static int aq_set_data_fl3l4(struct aq_nic_s *aq_nic, } data->cmd |=HW_ATL_RX_ENABLE_L3_IPV6 ; } -if (fsp->flow_type !=IP_USER_FLOW && - fsp->flow_type !=IPV6_USER_FLOW ) { -if (!data->is_ipv6) { - data->p_dst = -ntohs (fsp->h_u.tcp_ip4_spec.pdst); - data->p_src = -ntohs (fsp->h_u.tcp_ip4_spec.psrc); - }else { - data->p_dst = -ntohs (fsp->h_u.tcp_ip6_spec.pdst); - data->p_src = -ntohs (fsp->h_u.tcp_ip6_spec.psrc); - } +if (flow ==TCP_V4_FLOW || flow ==UDP_V4_FLOW || + flow ==SCTP_V4_FLOW ) { + data->p_dst =ntohs (fsp->h_u.tcp_ip4_spec.pdst); + data->p_src =ntohs (fsp->h_u.tcp_ip4_spec.psrc); + } +if (flow ==TCP_V6_FLOW || flow ==UDP_V6_FLOW || + flow ==SCTP_V6_FLOW ) { + data->p_dst =ntohs (fsp->h_u.tcp_ip6_spec.pdst); + data->p_src =ntohs (fsp->h_u.tcp_ip6_spec.psrc); } -if (data->ip_src[0 ] && !data->is_ipv6) +if (data->ip_src[0 ] || + (data->is_ipv6 && (data->ip_src[1 ] || data->ip_src[2 ] || + data->ip_src[3 ]))) data->cmd |=HW_ATL_RX_ENABLE_CMP_SRC_ADDR_L3 ; -if (data->ip_dst[0 ] && !data->is_ipv6) +if (data->ip_dst[0 ] || + (data->is_ipv6 && (data->ip_dst[1 ] || data->ip_dst[2 ] || + data->ip_dst[3 ]))) data->cmd |=HW_ATL_RX_ENABLE_CMP_DEST_ADDR_L3 ;if (data->p_dst) data->cmd |=HW_ATL_RX_ENABLE_CMP_DEST_PORT_L4 ;
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 2/12 net: atlantic: move active_ipv4/ipv6 bitmap updates after HW write
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Move active_ipv4/active_ipv6 bitmap updates from aq_set_data_fl3l4() into aq_add_del_fl3l4() after the hardware write succeeds. The bitmaps track which filter slots are actively programmed in hardware and must only be updated once the HW write is confirmed.
The bitmap updates in aq_nic_reserve_filter() and aq_nic_release_filter() are intentionally retained: they guard the aq_check_approve_fl3l4() IPv4/IPv6 mixing validation for callers such as the AQC113 PTP path that program filters directly via hw_atl2_new_fl3l4_configure() without going through aq_add_del_fl3l4().
--- .../ethernet/aquantia/atlantic/aq_filters.c | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_filters.c +23 -13
@@ -479,15 +479,8 @@ static int aq_set_data_fl3l4(struct aq_nic_s *aq_nic, data->is_ipv6 = rx_fltrs->fl3l4.is_ipv6; data->location =HW_ATL_GET_REG_LOCATION_FL3L4 (fsp->location); -if (!add) { -if (!data->is_ipv6) - rx_fltrs->fl3l4.active_ipv4 &= ~BIT (data->location); -else - rx_fltrs->fl3l4.active_ipv6 &= - ~BIT ((data->location) /4 ); - +if (!add)return 0 ; - } data->cmd |=HW_ATL_RX_ENABLE_FLTR_L3L4 ;
@@ -515,11 +508,9 @@ static int aq_set_data_fl3l4(struct aq_nic_s *aq_nic,ntohl (fsp->h_u.tcp_ip4_spec.ip4src); data->ip_dst[0 ] =ntohl (fsp->h_u.tcp_ip4_spec.ip4dst); - rx_fltrs->fl3l4.active_ipv4 |=BIT (data->location); }else {int i; - rx_fltrs->fl3l4.active_ipv6 |=BIT ((data->location) /4 );for (i =0 ; i <HW_ATL_RX_CNT_REG_ADDR_IPV6 ; ++i) { data->ip_dst[i] =ntohl (fsp->h_u.tcp_ip6_spec.ip6dst[i]);
@@ -574,16 +565,35 @@ static int aq_set_fl3l4(struct aq_hw_s *aq_hw,static int aq_add_del_fl3l4 (struct aq_nic_s *aq_nic,struct aq_rx_filter *aq_rx_fltr,bool add) { +struct aq_hw_rx_fltrs_s *rx_fltrs =aq_get_hw_rx_fltrs (aq_nic);const struct aq_hw_ops *aq_hw_ops = aq_nic->aq_hw_ops;struct aq_hw_s *aq_hw = aq_nic->aq_hw;struct aq_rx_filter_l3l4 data; +int err;if (unlikely (aq_rx_fltr->aq_fsp.location <AQ_RX_FIRST_LOC_FL3L4 || - aq_rx_fltr->aq_fsp.location >AQ_RX_LAST_LOC_FL3L4 || -aq_set_data_fl3l4 (aq_nic, aq_rx_fltr, &data, add))) + aq_rx_fltr->aq_fsp.location >AQ_RX_LAST_LOC_FL3L4 ))return -EINVAL ; -return aq_set_fl3l4 (aq_hw, aq_hw_ops, &data); +aq_set_data_fl3l4 (aq_nic, aq_rx_fltr, &data, add); + + err =aq_set_fl3l4 (aq_hw, aq_hw_ops, &data); +if (err) +return err; + +if (add) { +if (!data.is_ipv6) + rx_fltrs->fl3l4.active_ipv4 |=BIT (data.location); +else + rx_fltrs->fl3l4.active_ipv6 |=BIT (data.location /4 ); + }else { +if (!data.is_ipv6) + rx_fltrs->fl3l4.active_ipv4 &= ~BIT (data.location); +else + rx_fltrs->fl3l4.active_ipv6 &= ~BIT (data.location /4 ); + } + +return 0 ; } static int aq_add_del_rule(struct aq_nic_s *aq_nic,
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 3/12 net: atlantic: decouple aq_set_data_fl3l4() from driver internals
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Refactor aq_set_data_fl3l4() to take an ethtool_rx_flow_spec pointer and an explicit HW register location instead of driver-internal structures (aq_nic_s, aq_rx_filter). This makes the function reusable for PTP filter setup which constructs flow specs independently.
Key changes:
- Add aq_is_ipv6_flow_type() helper to derive IPv6 status from the flow_type field, replacing the dependency on rx_fltrs->fl3l4.is_ipv6 shared state.
- Change aq_set_data_fl3l4() signature to accept (fsp, data, location, add) and export it via aq_filters.h.
- Update aq_add_del_fl3l4() to compute the HW register location and pass it explicitly.
--- .../ethernet/aquantia/atlantic/aq_filters.c | 31 ++++++++++++++----- .../ethernet/aquantia/atlantic/aq_filters.h | 3 ++ 2 files changed, 26 insertions(+), 8 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_filters.c +23 -8
@@ -181,6 +181,20 @@ aq_check_approve_fvlan(struct aq_nic_s *aq_nic,return 0 ; } +static bool aq_is_ipv6_flow_type (const struct ethtool_rx_flow_spec *fsp) +{ +switch (fsp->flow_type & ~FLOW_EXT ) { +case TCP_V6_FLOW : +case UDP_V6_FLOW : +case SCTP_V6_FLOW : +case IPV6_FLOW : +case IPV6_USER_FLOW : +return true; +default : +return false; + } +} +static int __must_check aq_check_filter (struct aq_nic_s *aq_nic,struct ethtool_rx_flow_spec *fsp)
@@ -466,18 +480,16 @@ static int aq_add_del_fvlan(struct aq_nic_s *aq_nic,return aq_filters_vlans_update (aq_nic); } -static int aq_set_data_fl3l4 (struct aq_nic_s *aq_nic, -struct aq_rx_filter *aq_rx_fltr, -struct aq_rx_filter_l3l4 *data,bool add) +int aq_set_data_fl3l4 (const struct ethtool_rx_flow_spec *fsp, +struct aq_rx_filter_l3l4 *data, +int location,bool add) { -struct aq_hw_rx_fltrs_s *rx_fltrs =aq_get_hw_rx_fltrs (aq_nic); -const struct ethtool_rx_flow_spec *fsp = &aq_rx_fltr->aq_fsp;u32 flow = fsp->flow_type & ~FLOW_EXT ;memset (data,0 ,sizeof (*data)); - data->is_ipv6 = rx_fltrs->fl3l4.is_ipv6; - data->location =HW_ATL_GET_REG_LOCATION_FL3L4 (fsp->location); + data->is_ipv6 =aq_is_ipv6_flow_type (fsp); + data->location = location;if (!add)return 0 ;
@@ -569,13 +581,16 @@ static int aq_add_del_fl3l4(struct aq_nic_s *aq_nic,const struct aq_hw_ops *aq_hw_ops = aq_nic->aq_hw_ops;struct aq_hw_s *aq_hw = aq_nic->aq_hw;struct aq_rx_filter_l3l4 data; +int location;int err;if (unlikely (aq_rx_fltr->aq_fsp.location <AQ_RX_FIRST_LOC_FL3L4 || aq_rx_fltr->aq_fsp.location >AQ_RX_LAST_LOC_FL3L4 ))return -EINVAL ; -aq_set_data_fl3l4 (aq_nic, aq_rx_fltr, &data, add); + location =HW_ATL_GET_REG_LOCATION_FL3L4 (aq_rx_fltr->aq_fsp.location); + +aq_set_data_fl3l4 (&aq_rx_fltr->aq_fsp, &data, location, add); err =aq_set_fl3l4 (aq_hw, aq_hw_ops, &data);if (err)
drivers/net/ethernet/aquantia/atlantic/aq_filters.h +3 -0
@@ -32,5 +32,8 @@ int aq_clear_rxnfc_all_rules(struct aq_nic_s *aq_nic);int aq_reapply_rxnfc_all_rules (struct aq_nic_s *aq_nic);int aq_filters_vlans_update (struct aq_nic_s *aq_nic);int aq_filters_vlan_offload_off (struct aq_nic_s *aq_nic); +int aq_set_data_fl3l4 (const struct ethtool_rx_flow_spec *fsp, +struct aq_rx_filter_l3l4 *data, +int location,bool add);#endif /* AQ_FILTERS_H */
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 4/12 net: atlantic: add AQC113 hardware register definitions and accessors
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Add low-level hardware register definitions and accessor functions for AQC113 (Antigua) chip features:
- L3/L4 filter command, tag, and address registers for IPv4/IPv6
- Ethertype filter tag registers
- TSG (Time Stamp Generator) clock control, modification, and GPIO event generation/input timestamp registers
- TX descriptor timestamp writeback, timestamp enable, and AVB enable registers
- TX data/descriptor read request limit registers
- TPB highest priority TC registers
- PCIe extended tag enable register
- RX descriptor timestamp request register
- Action resolver section enable getter
- GPIO special mode and TSG external GPIO TS input select
--- .../aquantia/atlantic/hw_atl2/hw_atl2_llh.c | 322 ++++++++++++++++++ .../aquantia/atlantic/hw_atl2/hw_atl2_llh.h | 97 +++++- .../atlantic/hw_atl2/hw_atl2_llh_internal.h | 204 ++++++++++- 3 files changed, 617 insertions(+), 6 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c +322 -0
@@ -7,6 +7,13 @@#include "hw_atl2_llh_internal.h" #include "aq_hw_utils.h" +u32 hw_atl2_phi_ext_tag_get (struct aq_hw_s *aq_hw) +{ +return aq_hw_read_reg_bit (aq_hw,HW_ATL2_PHI_EXT_TAG_EN_ADR , +HW_ATL2_PHI_EXT_TAG_EN_MSK , +HW_ATL2_PHI_EXT_TAG_EN_SHIFT ); +} +void hw_atl2_rpf_redirection_table2_select_set (struct aq_hw_s *aq_hw,u32 select) {
@@ -66,6 +73,266 @@ void hw_atl2_rpf_vlan_flr_tag_set(struct aq_hw_s *aq_hw, u32 tag, u32 filter) tag); } +void hw_atl2_rpf_etht_flr_tag_set (struct aq_hw_s *aq_hw,u32 tag,u32 filter) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_ET_TAG_ADR (filter), +HW_ATL2_RPF_ET_TAG_MSK , +HW_ATL2_RPF_ET_TAG_SHIFT , tag); +} + +u32 hw_atl2_rpf_etht_flr_tag_get (struct aq_hw_s *aq_hw,u32 filter) +{ +return aq_hw_read_reg_bit (aq_hw,HW_ATL2_RPF_ET_TAG_ADR (filter), +HW_ATL2_RPF_ET_TAG_MSK , +HW_ATL2_RPF_ET_TAG_SHIFT ); +} + +void hw_atl2_rpf_l3_v4_dest_addr_set (struct aq_hw_s *aq_hw,u32 filter,u32 val) +{ +u32 addr_set =6 + ((filter <4 ) ?0 :1 ); +u32 dword = filter %4 ; + +aq_hw_write_reg (aq_hw,HW_ATL2_RPF_L3_DA_DW_ADR (addr_set, dword), val); +} + +void hw_atl2_rpf_l3_v4_src_addr_set (struct aq_hw_s *aq_hw,u32 filter,u32 val) +{ +u32 addr_set =6 + ((filter <4 ) ?0 :1 ); +u32 dword = filter %4 ; + +aq_hw_write_reg (aq_hw,HW_ATL2_RPF_L3_SA_DW_ADR (addr_set, dword), val); +} + +void hw_atl2_rpf_l3_v6_dest_addr_set (struct aq_hw_s *aq_hw,u8 location, +u32 *ipv6_dst) +{ +int i; + +for (i =0 ; i <4 ; ++i) +aq_hw_write_reg (aq_hw, +HW_ATL2_RPF_L3_DA_DW_ADR (location,3 - i), + ipv6_dst[i]); +} + +void hw_atl2_rpf_l3_v6_src_addr_set (struct aq_hw_s *aq_hw,u8 location, +u32 *ipv6_src) +{ +int i; + +for (i =0 ; i <4 ; ++i) +aq_hw_write_reg (aq_hw, +HW_ATL2_RPF_L3_SA_DW_ADR (location,3 - i), + ipv6_src[i]); +} + +void hw_atl2_rpf_l3_v4_cmd_set (struct aq_hw_s *aq_hw,u32 val,u32 filter) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_L3_V4_CMD_ADR (filter), +HW_ATL2_RPF_L3_V4_CMD_MSK , +HW_ATL2_RPF_L3_V4_CMD_SHIFT , val); +} + +void hw_atl2_rpf_l3_v6_cmd_set (struct aq_hw_s *aq_hw,u32 val,u32 filter) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_L3_V6_CMD_ADR (filter), +HW_ATL2_RPF_L3_V6_CMD_MSK , +HW_ATL2_RPF_L3_V6_CMD_SHIFT , val); +} + +void hw_atl2_rpf_l3_v6_v4_select_set (struct aq_hw_s *aq_hw,u32 val) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_L3_V6_V4_SELECT_ADR , +HW_ATL2_RPF_L3_V6_V4_SELECT_MSK , +HW_ATL2_RPF_L3_V6_V4_SELECT_SHIFT , val); +} + +void hw_atl2_rpf_l3_v4_tag_set (struct aq_hw_s *aq_hw,u32 val,u32 filter) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_L3_V4_TAG_ADR (filter), +HW_ATL2_RPF_L3_V4_TAG_MSK , +HW_ATL2_RPF_L3_V4_TAG_SHIFT , val); +} + +void hw_atl2_rpf_l3_v6_tag_set (struct aq_hw_s *aq_hw,u32 val,u32 filter) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_L3_V6_TAG_ADR (filter), +HW_ATL2_RPF_L3_V6_TAG_MSK , +HW_ATL2_RPF_L3_V6_TAG_SHIFT , val); +} + +void hw_atl2_rpf_l4_tag_set (struct aq_hw_s *aq_hw,u32 val,u32 filter) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_L4_TAG_ADR (filter), +HW_ATL2_RPF_L4_TAG_MSK , +HW_ATL2_RPF_L4_TAG_SHIFT , val); +} + +void hw_atl2_rpf_l4_cmd_set (struct aq_hw_s *aq_hw,u32 val,u32 filter) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_RPF_L4_CMD_ADR (filter), +HW_ATL2_RPF_L4_CMD_MSK , +HW_ATL2_RPF_L4_CMD_SHIFT , val); +} + +/* tsg */ +static void hw_atl2_clock_modif_value_set (struct aq_hw_s *aq_hw, +u32 clock_sel,u64 ns) +{ +aq_hw_write_reg64 (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_MODIF_VAL_LSW ), + ns); +} + +void hw_atl2_tsg_clock_en (struct aq_hw_s *aq_hw, +u32 clock_sel,u32 clock_enable) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_CFG ), +HW_ATL2_TSG_CLOCK_EN_MSK , +HW_ATL2_TSG_CLOCK_EN_SHIFT , + clock_enable); +} + +void hw_atl2_tsg_clock_reset (struct aq_hw_s *aq_hw,u32 clock_sel) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_CFG ), +HW_ATL2_TSG_SYNC_RESET_MSK , +HW_ATL2_TSG_SYNC_RESET_SHIFT ,1 ); +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_CFG ), +HW_ATL2_TSG_SYNC_RESET_MSK , +HW_ATL2_TSG_SYNC_RESET_SHIFT ,0 ); +} + +u64 hw_atl2_tsg_clock_read (struct aq_hw_s *aq_hw,u32 clock_sel) +{ +return aq_hw_read_reg64 (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel, +READ_CUR_NS_LSW )); +} + +void hw_atl2_tsg_clock_add (struct aq_hw_s *aq_hw,u32 clock_sel,u64 ns) +{ +hw_atl2_clock_modif_value_set (aq_hw, clock_sel, ns); +aq_hw_write_reg (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_MODIF_CTRL ), +HW_ATL2_TSG_ADD_COUNTER_MSK ); +} + +void hw_atl2_tsg_clock_sub (struct aq_hw_s *aq_hw,u32 clock_sel,u64 ns) +{ +hw_atl2_clock_modif_value_set (aq_hw, clock_sel, ns); +aq_hw_write_reg (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_MODIF_CTRL ), +HW_ATL2_TSG_SUBTRACT_COUNTER_MSK ); +} + +void hw_atl2_tsg_clock_increment_set (struct aq_hw_s *aq_hw, +u32 clock_sel,u32 ns,u32 fns) +{ +u32 nsfns = (ns &0xff ) | (fns &0xffffff00 ); + +aq_hw_write_reg (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_INC_CFG ), + nsfns); +aq_hw_write_reg (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel,CLOCK_MODIF_CTRL ), +HW_ATL2_TSG_LOAD_INC_CFG_MSK ); +} + +void hw_atl2_tpb_tps_highest_priority_tc_enable_set (struct aq_hw_s *aq_hw, +u32 tps_highest_prio_tc_en) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TPB_HIGHEST_PRIO_TC_EN_ADR , +HW_ATL2_TPB_HIGHEST_PRIO_TC_EN_MSK , +HW_ATL2_TPB_HIGHEST_PRIO_TC_EN_SHIFT , + tps_highest_prio_tc_en); +} + +void hw_atl2_tpb_tps_highest_priority_tc_set (struct aq_hw_s *aq_hw, +u32 tps_highest_prio_tc) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TPB_HIGHEST_PRIO_TC_ADR , +HW_ATL2_TPB_HIGHEST_PRIO_TC_MSK , +HW_ATL2_TPB_HIGHEST_PRIO_TC_SHIFT , + tps_highest_prio_tc); +} + +void hw_atl2_tsg_gpio_isr_to_host_set (struct aq_hw_s *aq_hw, +int on,u32 clock_sel) +{ +aq_hw_write_reg_bit (aq_hw, +HW_ATL2_GLOBAL_HIGH_PRIO_INTERRUPT_1_MASK_ADR , + clock_sel ==1 ?HW_ATL2_TSG_TSG1_GPIO_INTERRUPT_MSK : +HW_ATL2_TSG_TSG0_GPIO_INTERRUPT_MSK , + clock_sel ==1 ?HW_ATL2_TSG_TSG1_GPIO_INTERRUPT_SHIFT : +HW_ATL2_TSG_TSG0_GPIO_INTERRUPT_SHIFT , + !!on); +} + +void hw_atl2_tsg_gpio_clear_status (struct aq_hw_s *aq_hw) +{ +aq_hw_read_reg (aq_hw,HW_ATL2_GLOBAL_INTERNAL_ALARMS_1_ADR ); +} + +void hw_atl2_tsg_gpio_input_event_info_get (struct aq_hw_s *aq_hw, +u32 clock_sel, +u32 *event_count, +u64 *event_ts) +{ +if (event_count) + *event_count =aq_hw_read_reg (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel, +EXT_CLK_COUNT )); + +if (event_ts) + *event_ts =aq_hw_read_reg64 (aq_hw, +HW_ATL2_TSG_REG_ADR (clock_sel, +GPIO_EVENT_TS_LSW )); +} + +void hw_atl2_tsg_ptp_gpio_gen_pulse (struct aq_hw_s *aq_hw,u32 clk_sel, +u64 ts,u32 period,u32 hightime) +{ +u32 val = (HW_ATL2_TSG_GPIO_EVENT_MODE_SET_ON_TIME << + (HW_ATL2_TSG_GPIO_EVENT_MODE_SHIFT - +HW_ATL2_TSG_GPIO_OUTPUT_EN_SHIFT )) | + (HW_ATL2_TSG_GPIO_GEN_OUTPUT_EN_MSK ) | + (HW_ATL2_TSG_GPIO_OUTPUT_EN_MSK ); + +if (ts !=0 ) { +aq_hw_write_reg64 (aq_hw, +HW_ATL2_TSG_REG_ADR (clk_sel, +GPIO_EVENT_GEN_TS_LSW ), + ts); + +aq_hw_write_reg64 (aq_hw, +HW_ATL2_TSG_REG_ADR (clk_sel, +GPIO_EVENT_HIGH_TIME_LSW ), + hightime); + +aq_hw_write_reg64 (aq_hw, +HW_ATL2_TSG_REG_ADR (clk_sel, +GPIO_EVENT_LOW_TIME_LSW ), + (period - hightime)); + } + +aq_hw_write_reg_bit (aq_hw, +HW_ATL2_TSG_REG_ADR (clk_sel,GPIO_EVENT_GEN_CFG ), +HW_ATL2_TSG_GPIO_EVENT_MODE_MSK | +HW_ATL2_TSG_GPIO_OUTPUT_EN_MSK | +HW_ATL2_TSG_GPIO_GEN_OUTPUT_EN_MSK , +HW_ATL2_TSG_GPIO_OUTPUT_EN_SHIFT , + (!ts ?0 : val)); +} + +void hw_atl2_rpf_rx_desc_timestamp_req_set (struct aq_hw_s *aq_hw,u32 request, +u32 descriptor) +{ +aq_hw_write_reg_bit (aq_hw, +HW_ATL2_RPF_TIMESTAMP_REQ_DESCD_ADR (descriptor), +HW_ATL2_RPF_TIMESTAMP_REQ_DESCD_MSK , +HW_ATL2_RPF_TIMESTAMP_REQ_DESCD_SHIFT , request); +} +/* TX */ void hw_atl2_tpb_tx_tc_q_rand_map_en_set(struct aq_hw_s *aq_hw,
@@ -93,6 +360,30 @@ void hw_atl2_reg_tx_intr_moder_ctrl_set(struct aq_hw_s *aq_hw, tx_intr_moderation_ctl); } +void hw_atl2_tdm_tx_desc_timestamp_writeback_en_set (struct aq_hw_s *aq_hw, +u32 enable,u32 descriptor) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TDM_DESCD_TS_WRB_EN_ADR (descriptor), +HW_ATL2_TDM_DESCD_TS_WRB_EN_MSK , +HW_ATL2_TDM_DESCD_TS_WRB_EN_SHIFT , enable); +} + +void hw_atl2_tdm_tx_desc_timestamp_en_set (struct aq_hw_s *aq_hw,u32 enable, +u32 descriptor) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TDM_DESCD_TS_EN_ADR (descriptor), +HW_ATL2_TDM_DESCD_TS_EN_MSK , +HW_ATL2_TDM_DESCD_TS_EN_SHIFT , enable); +} + +void hw_atl2_tdm_tx_desc_avb_en_set (struct aq_hw_s *aq_hw,u32 enable, +u32 descriptor) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TDM_DESCD_AVB_EN_ADR (descriptor), +HW_ATL2_TDM_DESCD_AVB_EN_MSK , +HW_ATL2_TDM_DESCD_AVB_EN_SHIFT , enable); +} +void hw_atl2_tps_tx_pkt_shed_data_arb_mode_set (struct aq_hw_s *aq_hw,const u32 data_arb_mode) {
@@ -122,6 +413,20 @@ void hw_atl2_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw, weight); } +void hw_atl2_tdm_tx_data_read_req_limit_set (struct aq_hw_s *aq_hw,u32 limit) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TDM_TX_DATA_RD_REQ_LIMIT_ADR , +HW_ATL2_TDM_TX_DATA_RD_REQ_LIMIT_MSK , +HW_ATL2_TDM_TX_DATA_RD_REQ_LIMIT_SHIFT , limit); +} + +void hw_atl2_tdm_tx_desc_read_req_limit_set (struct aq_hw_s *aq_hw,u32 limit) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_TDM_TX_DESC_RD_REQ_LIMIT_ADR , +HW_ATL2_TDM_TX_DESC_RD_REQ_LIMIT_MSK , +HW_ATL2_TDM_TX_DESC_RD_REQ_LIMIT_SHIFT , limit); +} +u32 hw_atl2_get_hw_version (struct aq_hw_s *aq_hw) {return aq_hw_read_reg (aq_hw,HW_ATL2_FPGA_VER_ADR );
@@ -164,6 +469,13 @@ void hw_atl2_rpf_act_rslvr_section_en_set(struct aq_hw_s *aq_hw, u32 sections) sections); } +u32 hw_atl2_rpf_act_rslvr_section_en_get (struct aq_hw_s *aq_hw) +{ +return aq_hw_read_reg_bit (aq_hw,HW_ATL2_RPF_REC_TAB_EN_ADR , +HW_ATL2_RPF_REC_TAB_EN_MSK , +HW_ATL2_RPF_REC_TAB_EN_SHIFT ); +} +void hw_atl2_mif_shared_buf_get (struct aq_hw_s *aq_hw,int offset,u32 *data,int len) {
@@ -232,3 +544,13 @@ void hw_atl2_mif_host_req_int_clr(struct aq_hw_s *aq_hw, u32 val)return aq_hw_write_reg (aq_hw,HW_ATL2_MCP_HOST_REQ_INT_CLR_ADR , val); } + +void hw_atl2_gpio_special_mode_set (struct aq_hw_s *aq_hw, +u32 gpio_special_mode, +u32 pin) +{ +aq_hw_write_reg_bit (aq_hw,HW_ATL2_GPIO_PIN_SPEC_MODE_ADR (pin), +HW_ATL2_GPIO_PIN_SPEC_MODE_MSK , +HW_ATL2_GPIO_PIN_SPEC_MODE_SHIFT , + gpio_special_mode); +}
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h +96 -1
139 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h +199 -5
238 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 5/12 net: atlantic: add AQC113 filter data structures, firmware query and register dump
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Add filter infrastructure for AQC113 hardware:
- Define L3 (IPv4/IPv6), L4 (TCP/UDP/SCTP), and combined L3L4 filter structures with serialized usage counter for filter sharing.
- Define tag policy structure for ethertype filter management.
- Add RPF L3/L4 command bit definitions for filter programming.
- Add filter count constants for L3L4, L3V4, L4, VLAN, and ethertype.
- Extend hw_atl2_priv with filter arrays, base indices, and counts discovered from firmware.
Query filter capabilities from firmware shared memory at init time to discover available L2/L3/L4/VLAN/ethertype filter resources and ART (Action Resolver Table) configuration.
Add hardware register dump utility for AQC113 debug support.
--- .../aquantia/atlantic/hw_atl2/hw_atl2.c | 9 --- .../atlantic/hw_atl2/hw_atl2_internal.h | 65 +++++++++++++++++ .../aquantia/atlantic/hw_atl2/hw_atl2_utils.c | 34 +++++++++ .../aquantia/atlantic/hw_atl2/hw_atl2_utils.h | 7 +- .../atlantic/hw_atl2/hw_atl2_utils_fw.c | 69 +++++++++++++++++-- 5 files changed, 169 insertions(+), 15 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c +0 -9
@@ -540,17 +540,8 @@ static int hw_atl2_hw_init(struct aq_hw_s *self, const u8 *mac_addr) };struct aq_nic_cfg_s *aq_nic_cfg = self->aq_nic_cfg; -struct hw_atl2_priv *priv = self->priv; -u8 base_index, count;int err; - err =hw_atl2_utils_get_action_resolve_table_caps (self, &base_index, - &count); -if (err) -return err; - - priv->art_base_index =8 * base_index; -hw_atl2_init_launchtime (self);hw_atl2_hw_init_tx_path (self);
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h +65 -0
86 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c +34 -0
@@ -128,3 +128,37 @@ int hw_atl2_utils_soft_reset(struct aq_hw_s *self) err_exit:return err; } + +static const u32 hw_atl2_utils_hw_mac_regs[] = { +0x00005580U ,0x00005590U ,0x000055B0U ,0x000055B4U , +0x000055C0U ,0x00005B00U ,0x00005B04U ,0x00005B08U , +0x00005B0CU ,0x00005B10U ,0x00005B14U ,0x00005B18U , +0x00005B1CU ,0x00005B20U ,0x00005B24U ,0x00005B28U , +0x00005B2CU ,0x00005B30U ,0x00005B34U ,0x00005B38U , +0x00005B3CU ,0x00005B40U ,0x00005B44U ,0x00005B48U , +0x00005B4CU ,0x00005B50U ,0x00005B54U ,0x00005B58U , +0x00005B5CU ,0x00005B60U ,0x00005B64U ,0x00005B68U , +0x00005B6CU ,0x00005B70U ,0x00005B74U ,0x00005B78U , +0x00005B7CU ,0x00007C00U ,0x00007C04U ,0x00007C08U , +0x00007C0CU ,0x00007C10U ,0x00007C14U ,0x00007C18U , +0x00007C1CU ,0x00007C20U ,0x00007C40U ,0x00007C44U , +0x00007C48U ,0x00007C4CU ,0x00007C50U ,0x00007C54U , +0x00007C58U ,0x00007C5CU ,0x00007C60U ,0x00007C80U , +0x00007C84U ,0x00007C88U ,0x00007C8CU ,0x00007C90U , +0x00007C94U ,0x00007C98U ,0x00007C9CU ,0x00007CA0U , +0x00007CC0U ,0x00007CC4U ,0x00007CC8U ,0x00007CCCU , +0x00007CD0U ,0x00007CD4U ,0x00007CD8U ,0x00007CDCU , +}; + +int hw_atl2_utils_hw_get_regs (struct aq_hw_s *self, +const struct aq_hw_caps_s *aq_hw_caps, +u32 *regs_buff) +{ +unsigned int i; + +for (i =0 ; i <min_t (u32, aq_hw_caps->mac_regs_count, +ARRAY_SIZE (hw_atl2_utils_hw_mac_regs)); i++) + regs_buff[i] =aq_hw_read_reg (self, + hw_atl2_utils_hw_mac_regs[i]); +return 0 ; +}
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h +5 -2
@@ -626,10 +626,13 @@ int hw_atl2_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops);int hw_atl2_utils_soft_reset (struct aq_hw_s *self); +int hw_atl2_utils_hw_get_regs (struct aq_hw_s *self, +const struct aq_hw_caps_s *aq_hw_caps, +u32 *regs_buff); +u32 hw_atl2_utils_get_fw_version (struct aq_hw_s *self); -int hw_atl2_utils_get_action_resolve_table_caps (struct aq_hw_s *self, -u8 *base_index,u8 *count); +int hw_atl2_utils_get_filter_caps (struct aq_hw_s *self);extern const struct aq_fw_ops aq_a2_fw_ops;
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c +65 -4
89 lines not on this page · raw message
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 6/12 net: atlantic: fix AQC113 HW init: ART, L2 filter slot, MAC address
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Fix initialization issues in hw_atl2 to correctly support AQC113:
- hw_atl2_hw_reset: replace unconditional priv memset with selective field clears so that l3l4_filters[].l3_index and l4_index can be initialized to -1 (not allocated) rather than 0; 0 is a valid filter index and would incorrectly appear as an occupied slot after a reset.
- hw_atl2_hw_init_new_rx_filters: use firmware-reported ART section base and count (clamped to 16) instead of hardcoded 0xFFFF mask; enable simultaneous IPv4/IPv6 L3 filter mode (rpf_l3_v6_v4_select); tag the UC MAC slot using firmware-supplied l2_filters_base_index instead of hardcoded HW_ATL2_MAC_UC.
- hw_atl2_hw_init_rx_path: enable only the firmware-assigned MAC slot (priv->l2_filters_base_index) instead of always slot 0.
- Add hw_atl2_hw_mac_addr_set() that programs the MAC address into the firmware-assigned L2 filter slot. Wire into hw_atl2_ops replacing the A1 hw_atl_b0_hw_mac_addr_set; call it from hw_init.
- Wire .hw_get_regs into hw_atl2_ops.
--- .../aquantia/atlantic/hw_atl2/hw_atl2.c | 81 ++++++++++++++++--- .../atlantic/hw_atl2/hw_atl2_utils_fw.c | 2 + 2 files changed, 72 insertions(+), 11 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c +70 -11
@@ -11,6 +11,7 @@#include "hw_atl/hw_atl_utils.h" #include "hw_atl/hw_atl_llh.h" #include "hw_atl/hw_atl_llh_internal.h" +#include "hw_atl2.h" #include "hw_atl2_utils.h" #include "hw_atl2_llh.h" #include "hw_atl2_internal.h"
@@ -95,12 +96,21 @@ static int hw_atl2_hw_reset(struct aq_hw_s *self) {struct hw_atl2_priv *priv = self->priv;int err; +int i; err =hw_atl2_utils_soft_reset (self);if (err)return err; -memset (priv,0 ,sizeof (*priv)); +memset (&priv->last_stats,0 ,sizeof (priv->last_stats)); +memset (priv->l3_v4_filters,0 ,sizeof (priv->l3_v4_filters)); +memset (priv->l3_v6_filters,0 ,sizeof (priv->l3_v6_filters)); +memset (priv->l4_filters,0 ,sizeof (priv->l4_filters)); +memset (priv->etype_policy,0 ,sizeof (priv->etype_policy)); +for (i =0 ; i <HW_ATL2_RPF_L3L4_FILTERS ; i++) { + priv->l3l4_filters[i].l3_index =-1 ; + priv->l3l4_filters[i].l4_index =-1 ; + } self->aq_fw_ops->set_state (self,MPI_RESET );
@@ -380,6 +390,9 @@ static void hw_atl2_hw_init_new_rx_filters(struct aq_hw_s *self) {u8 *prio_tc_map = self->aq_nic_cfg->prio_tc_map;struct hw_atl2_priv *priv = self->priv; +u32 art_first_sec, art_last_sec; +u32 art_sections; +u32 art_mask;u16 action;u8 index;int i;
@@ -394,9 +407,20 @@ static void hw_atl2_hw_init_new_rx_filters(struct aq_hw_s *self)* REC entry is used for further processing. If multiple entries match, * the lowest REC entry, Action field will be selected. */ -hw_atl2_rpf_act_rslvr_section_en_set (self,0xFFFF ); + art_last_sec =min_t (u32, + priv->art_base_index /8 + priv->art_count /8 , +16U ); + art_first_sec =min_t (u32, priv->art_base_index /8 ,16U ); + art_mask = (BIT (art_last_sec) -1 ) - (BIT (art_first_sec) -1 ); +if (!art_mask) { +/* ART base index is out of range, enabling all sections */ + art_mask =0xFFFF ; + } + art_sections =hw_atl2_rpf_act_rslvr_section_en_get (self) | art_mask; +hw_atl2_rpf_act_rslvr_section_en_set (self, art_sections); +hw_atl2_rpf_l3_v6_v4_select_set (self,1 );hw_atl2_rpfl2_uc_flr_tag_set (self,HW_ATL2_RPF_TAG_BASE_UC , -HW_ATL2_MAC_UC ); + priv->l2_filters_base_index);hw_atl2_rpfl2_bc_flr_tag_set (self,HW_ATL2_RPF_TAG_BASE_UC );/* FW reserves the beginning of ART, thus all driver entries must
@@ -484,6 +508,7 @@ static int hw_atl2_act_rslvr_table_set(struct aq_hw_s *self, u8 location,static int hw_atl2_hw_init_rx_path (struct aq_hw_s *self) {struct aq_nic_cfg_s *cfg = self->aq_nic_cfg; +struct hw_atl2_priv *priv = self->priv;int i;/* Rx TC/RSS number config */
@@ -499,7 +524,9 @@ static int hw_atl2_hw_init_rx_path(struct aq_hw_s *self)/* Multicast filters */ for (i =HW_ATL2_MAC_MAX ; i--;) { -hw_atl_rpfl2_uc_flr_en_set (self, (i ==0U ) ?1U :0U , i); +hw_atl_rpfl2_uc_flr_en_set (self, + (i == priv->l2_filters_base_index) ? +1U :0U , i);hw_atl_rpfl2unicast_flr_act_set (self,1U , i); }
@@ -530,6 +557,35 @@ static int hw_atl2_hw_init_rx_path(struct aq_hw_s *self)return aq_hw_err_from_flags (self); } +static int hw_atl2_hw_mac_addr_set (struct aq_hw_s *self,const u8 *mac_addr) +{ +struct hw_atl2_priv *priv = self->priv; +u32 location = priv->l2_filters_base_index; +unsigned int h; +unsigned int l; +int err; + +if (!mac_addr) { + err = -EINVAL ; + goto err_exit; + } + h = (mac_addr[0 ] <<8 ) | (mac_addr[1 ]); + l = (mac_addr[2 ] <<24 ) | (mac_addr[3 ] <<16 ) | + (mac_addr[4 ] <<8 ) | mac_addr[5 ]; + +hw_atl_rpfl2_uc_flr_en_set (self,0U , location); +hw_atl_rpfl2unicast_dest_addresslsw_set (self, l, location); +hw_atl_rpfl2unicast_dest_addressmsw_set (self, h, location); +hw_atl_rpfl2unicast_flr_act_set (self,1U , location); +hw_atl2_rpfl2_uc_flr_tag_set (self,HW_ATL2_RPF_TAG_BASE_UC , location); +hw_atl_rpfl2_uc_flr_en_set (self,1U , location); + + err =aq_hw_err_from_flags (self); + +err_exit: +return err; +} +static int hw_atl2_hw_init (struct aq_hw_s *self,const u8 *mac_addr) {static u32 aq_hw_atl2_igcr_table_[4 ][2 ] = {
@@ -547,7 +603,7 @@ static int hw_atl2_hw_init(struct aq_hw_s *self, const u8 *mac_addr)hw_atl2_hw_init_tx_path (self);hw_atl2_hw_init_rx_path (self); -hw_atl_b0_hw_mac_addr_set (self, mac_addr); +hw_atl2_hw_mac_addr_set (self, mac_addr); self->aq_fw_ops->set_link_speed (self, aq_nic_cfg->link_speed_msk); self->aq_fw_ops->set_state (self,MPI_INIT );
@@ -619,6 +675,8 @@ static int hw_atl2_hw_multicast_list_set(struct aq_hw_s *self, [ETH_ALEN], u32 count) { +struct hw_atl2_priv *priv = self->priv; +u32 base_location = priv->l2_filters_base_index +1 ;struct aq_nic_cfg_s *cfg = self->aq_nic_cfg;int err =0 ;
@@ -634,18 +692,18 @@ static int hw_atl2_hw_multicast_list_set(struct aq_hw_s *self,u32 l = (ar_mac[i][2 ] <<24 ) | (ar_mac[i][3 ] <<16 ) | (ar_mac[i][4 ] <<8 ) | ar_mac[i][5 ]; -hw_atl_rpfl2_uc_flr_en_set (self,0U ,HW_ATL2_MAC_MIN + i); +hw_atl_rpfl2_uc_flr_en_set (self,0U , base_location + i);hw_atl_rpfl2unicast_dest_addresslsw_set (self, l, -HW_ATL2_MAC_MIN + i); + base_location + i);hw_atl_rpfl2unicast_dest_addressmsw_set (self, h, -HW_ATL2_MAC_MIN + i); + base_location + i); -hw_atl2_rpfl2_uc_flr_tag_set (self,1 ,HW_ATL2_MAC_MIN + i); +hw_atl2_rpfl2_uc_flr_tag_set (self,1 , base_location + i);hw_atl_rpfl2_uc_flr_en_set (self, (cfg->is_mc_list_enabled), -HW_ATL2_MAC_MIN + i); + base_location + i); } err =aq_hw_err_from_flags (self);
@@ -816,7 +874,7 @@ static int hw_atl2_hw_vlan_ctrl(struct aq_hw_s *self, bool enable)const struct aq_hw_ops hw_atl2_ops = { .hw_soft_reset = hw_atl2_utils_soft_reset, .hw_prepare = hw_atl2_utils_initfw, - .hw_set_mac_address = hw_atl_b0_hw_mac_addr_set, + .hw_set_mac_address = hw_atl2_hw_mac_addr_set, .hw_init = hw_atl2_hw_init, .hw_reset = hw_atl2_hw_reset, .hw_start = hw_atl_b0_hw_start,
@@ -846,6 +904,7 @@ const struct aq_hw_ops hw_atl2_ops = { .hw_rss_set = hw_atl2_hw_rss_set, .hw_rss_hash_set = hw_atl_b0_hw_rss_hash_set, .hw_tc_rate_limit_set = hw_atl2_hw_init_tx_tc_rate_limit, + .hw_get_regs = hw_atl2_utils_hw_get_regs, .hw_get_hw_stats = hw_atl2_utils_get_hw_stats, .hw_get_fw_version = hw_atl2_utils_get_fw_version, .hw_set_offload = hw_atl_b0_hw_offload_set,
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c +2 -0
@@ -626,6 +626,8 @@ int hw_atl2_utils_get_filter_caps(struct aq_hw_s *self)if (priv->art_count ==0 ) priv->art_count =HW_ATL2_ART_TOTAL_ENTRIES ; priv->l2_filters_base_index = filter_caps.l2_filters_base_index; +if (priv->l2_filters_base_index >=HW_ATL2_MAC_MAX ) + priv->l2_filters_base_index =HW_ATL2_MAC_UC ; priv->l2_filter_count = filter_caps.l2_filter_count; priv->etype_filter_base_index = filter_caps.ethertype_filter_base_index; priv->etype_filter_count = filter_caps.ethertype_filter_count;
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 7/12 net: atlantic: implement AQC113 L2/L3/L4 RX filter ops
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Implement complete RX filter management for AQC113 hardware:
- Add tag-based ethertype filter policy (hw_atl2_filter_tag_get/put) that allocates and releases ART tags for L2 ethertype filters.
- Add L3/L4 filter sharing via serialized usage counters in hw_atl2_l3_filter/hw_atl2_l4_filter, managed through hw_atl2_rxf_l3_get/put and hw_atl2_rxf_l4_get/put.
- Implement L3 (IPv4/IPv6 source/destination address and protocol) filter find, get (program HW and increment refcount), and put (decrement refcount and clear HW when last user releases).
- Implement L4 (TCP/UDP/SCTP source/destination port) filter management with the same find/get/put pattern.
- Add combined L3L4 filter configuration (hw_atl2_new_fl3l4_configure) that translates legacy aq_rx_filter_l3l4 commands into AQC113 separate L3+L4 filter programming with Action Resolver Table (ART) entries.
- Add L2 ethertype filter set/clear (hw_atl2_hw_fl2_set/clear) with tag-based ART integration.
- Wire .hw_filter_l2_set, .hw_filter_l2_clear, .hw_filter_l3l4_set into hw_atl2_ops.
--- .../aquantia/atlantic/hw_atl2/hw_atl2.c | 518 ++++++++++++++++++ 1 file changed, 518 insertions(+)
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c +518 -0
@@ -87,6 +87,38 @@ const struct aq_hw_caps_s hw_atl2_caps_aqc116c = { AQ_NIC_RATE_10M, }; +/* Find tag with the same action or new free tag +* top - top inclusive tag value +* action - action for ActionResolverTable +*/ +static int hw_atl2_filter_tag_get (struct hw_atl2_tag_policy *tags, +int top,u16 action) +{ +int i; + +for (i =1 ; i <= top; i++) +if (tags[i].usage >0 && tags[i].action == action) { + tags[i].usage++; +return i; + } + +for (i =1 ; i <= top; i++) +if (tags[i].usage ==0 ) { + tags[i].usage =1 ; + tags[i].action = action; +return i; + } + +return -ENOSPC ; +} + +static void hw_atl2_filter_tag_put (struct hw_atl2_tag_policy *tags, +int tag) +{ +if (tags[tag].usage >0 ) + tags[tag].usage--; +} +static u32 hw_atl2_sem_act_rslvr_get (struct aq_hw_s *self) {return hw_atl_reg_glb_cpu_sem_get (self,HW_ATL2_FW_SM_ACT_RSLVR );
@@ -816,6 +848,489 @@ static struct aq_stats_s *hw_atl2_utils_get_hw_stats(struct aq_hw_s *self)return &self->curr_stats; } +static bool hw_atl2_rxf_l3_is_equal (struct hw_atl2_l3_filter *f1, +struct hw_atl2_l3_filter *f2) +{ +if (f1->cmd != f2->cmd) +return false; + +if (f1->cmd &HW_ATL2_RPF_L3_CMD_SA_EN ) +if (f1->srcip[0 ] != f2->srcip[0 ]) +return false; + +if (f1->cmd &HW_ATL2_RPF_L3_CMD_DA_EN ) +if (f1->dstip[0 ] != f2->dstip[0 ]) +return false; + +if (f1->cmd & (HW_ATL2_RPF_L3_CMD_PROTO_EN | +HW_ATL2_RPF_L3_V6_CMD_PROTO_EN )) +if (f1->proto != f2->proto) +return false; + +if (f1->cmd &HW_ATL2_RPF_L3_V6_CMD_SA_EN ) +if (memcmp (f1->srcip, f2->srcip,16 )) +return false; + +if (f1->cmd &HW_ATL2_RPF_L3_V6_CMD_DA_EN ) +if (memcmp (f1->dstip, f2->dstip,16 )) +return false; + +return true; +} + +static int hw_atl2_new_fl3l4_find_l3 (struct aq_hw_s *self, +struct hw_atl2_l3_filter *l3) +{ +struct hw_atl2_priv *priv = self->priv; +struct hw_atl2_l3_filter *l3_filters; +int i, first, last; + +if (l3->cmd &HW_ATL2_RPF_L3_V6_CMD_EN ) { + l3_filters = priv->l3_v6_filters; + first = priv->l3_v6_filter_base_index; + last = priv->l3_v6_filter_base_index + + priv->l3_v6_filter_count; + }else { + l3_filters = priv->l3_v4_filters; + first = priv->l3_v4_filter_base_index; + last = priv->l3_v4_filter_base_index + + priv->l3_v4_filter_count; + } +for (i = first; i < last; i++) { +if (hw_atl2_rxf_l3_is_equal (&l3_filters[i], l3)) +return i; + } + +for (i = first; i < last; i++) { +u32 l3_enable_mask =HW_ATL2_RPF_L3_CMD_EN | +HW_ATL2_RPF_L3_V6_CMD_EN ; + +if (!(l3_filters[i].cmd & l3_enable_mask)) +return i; + } + +return -ENOSPC ; +} + +static void hw_atl2_rxf_l3_get (struct aq_hw_s *self, +struct hw_atl2_l3_filter *l3,int idx, +const struct hw_atl2_l3_filter *_l3) +{ +int i; + + l3->usage++; +if (l3->usage ==1 ) { + l3->cmd = _l3->cmd; +for (i =0 ; i <4 ; i++) { + l3->srcip[i] = _l3->srcip[i]; + l3->dstip[i] = _l3->dstip[i]; + } + l3->proto = _l3->proto; + +if (l3->cmd &HW_ATL2_RPF_L3_CMD_EN ) { +hw_atl2_rpf_l3_v4_cmd_set (self, l3->cmd, idx); +hw_atl2_rpf_l3_v4_tag_set (self, idx +1 , idx); +hw_atl2_rpf_l3_v4_dest_addr_set (self, + idx, + l3->dstip[0 ]); +hw_atl2_rpf_l3_v4_src_addr_set (self, + idx, + l3->srcip[0 ]); + }else { +hw_atl2_rpf_l3_v6_cmd_set (self, l3->cmd, idx); +hw_atl2_rpf_l3_v6_tag_set (self, idx +1 , idx); +hw_atl2_rpf_l3_v6_dest_addr_set (self, + idx, + l3->dstip); +hw_atl2_rpf_l3_v6_src_addr_set (self, + idx, + l3->srcip); + } + } +} + +static void hw_atl2_rxf_l3_put (struct aq_hw_s *self, +struct hw_atl2_l3_filter *l3,int idx) +{ +if (l3->usage) + l3->usage--; + +if (!l3->usage) { +if (l3->cmd &HW_ATL2_RPF_L3_V6_CMD_EN ) +hw_atl2_rpf_l3_v6_cmd_set (self,0 , idx); +else +hw_atl2_rpf_l3_v4_cmd_set (self,0 , idx); + l3->cmd =0 ; + } +} + +static bool hw_atl2_rxf_l4_is_equal (struct hw_atl2_l4_filter *f1, +struct hw_atl2_l4_filter *f2) +{ +if (f1->cmd != f2->cmd) +return false; + +if (f1->cmd &HW_ATL2_RPF_L4_CMD_SP_EN ) +if (f1->sport != f2->sport) +return false; + +if (f1->cmd &HW_ATL2_RPF_L4_CMD_DP_EN ) +if (f1->dport != f2->dport) +return false; + +return true; +} + +static int hw_atl2_new_fl3l4_find_l4 (struct aq_hw_s *self, +struct hw_atl2_l4_filter *l4) +{ +struct hw_atl2_priv *priv = self->priv; +int i, first, last; + + first = priv->l4_filter_base_index; + last = priv->l4_filter_base_index + priv->l4_filter_count; + +for (i = first; i < last; i++) +if (hw_atl2_rxf_l4_is_equal (&priv->l4_filters[i], l4)) +return i; + +for (i = first; i < last; i++) +if ((priv->l4_filters[i].cmd &HW_ATL2_RPF_L4_CMD_EN ) ==0 ) +return i; + +return -ENOSPC ; +} + +static void hw_atl2_rxf_l4_put (struct aq_hw_s *self, +struct hw_atl2_l4_filter *l4,int idx) +{ +if (l4->usage) + l4->usage--; + +if (!l4->usage) { + l4->cmd =0 ; +hw_atl2_rpf_l4_cmd_set (self, l4->cmd, idx); + } +} + +static void hw_atl2_rxf_l4_get (struct aq_hw_s *self, +struct hw_atl2_l4_filter *l4,int idx, +const struct hw_atl2_l4_filter *_l4) +{ + l4->usage++; +if (l4->usage ==1 ) { + l4->cmd = _l4->cmd; + l4->sport = _l4->sport; + l4->dport = _l4->dport; + +hw_atl2_rpf_l4_cmd_set (self, l4->cmd, idx); +hw_atl2_rpf_l4_tag_set (self, idx +1 , idx); +hw_atl_rpf_l4_spd_set (self, l4->sport, idx); +hw_atl_rpf_l4_dpd_set (self, l4->dport, idx); + } +} + +static int hw_atl2_new_fl3l4_configure (struct aq_hw_s *self, +struct aq_rx_filter_l3l4 *data) +{ +struct hw_atl2_priv *priv = self->priv; +s8 old_l3_index = priv->l3l4_filters[data->location].l3_index; +s8 old_l4_index = priv->l3l4_filters[data->location].l4_index; +u8 old_ipv6 = priv->l3l4_filters[data->location].ipv6; +struct hw_atl2_l3_filter *l3_filters; +struct hw_atl2_l3_filter l3; +struct hw_atl2_l4_filter l4; +s8 l3_idx =-1 ; +s8 l4_idx =-1 ; + +if (!(data->cmd &HW_ATL_RX_ENABLE_FLTR_L3L4 )) +return 0 ; + +memset (&l3,0 ,sizeof (l3)); +memset (&l4,0 ,sizeof (l4)); + +/* convert legacy filter to new */ +if (data->cmd &HW_ATL_RX_ENABLE_CMP_PROT_L4 ) { + l3.cmd |= data->is_ipv6 ?HW_ATL2_RPF_L3_V6_CMD_PROTO_EN : +HW_ATL2_RPF_L3_CMD_PROTO_EN ; + l3.cmd |= data->is_ipv6 ?HW_ATL2_RPF_L3_V6_CMD_EN : +HW_ATL2_RPF_L3_CMD_EN ; +switch (data->cmd &0x7 ) { +case HW_ATL_RX_TCP : + l3.cmd |=IPPROTO_TCP << (data->is_ipv6 ?0x18 :8 ); +break ; +case HW_ATL_RX_UDP : + l3.cmd |=IPPROTO_UDP << (data->is_ipv6 ?0x18 :8 ); +break ; +case HW_ATL_RX_SCTP : + l3.cmd |=IPPROTO_SCTP << (data->is_ipv6 ?0x18 :8 ); +break ; +case HW_ATL_RX_ICMP : + l3.cmd |=IPPROTO_ICMP << (data->is_ipv6 ?0x18 :8 ); +break ; + } + } + +if (data->cmd &HW_ATL_RX_ENABLE_CMP_SRC_ADDR_L3 ) { +if (data->is_ipv6) { + l3.cmd |=HW_ATL2_RPF_L3_V6_CMD_SA_EN | +HW_ATL2_RPF_L3_V6_CMD_EN ; +memcpy (l3.srcip, data->ip_src,sizeof (l3.srcip)); + }else { + l3.cmd |=HW_ATL2_RPF_L3_CMD_SA_EN | +HW_ATL2_RPF_L3_CMD_EN ; + l3.srcip[0 ] = data->ip_src[0 ]; + } + } +if (data->cmd &HW_ATL_RX_ENABLE_CMP_DEST_ADDR_L3 ) { +if (data->is_ipv6) { + l3.cmd |=HW_ATL2_RPF_L3_V6_CMD_DA_EN | +HW_ATL2_RPF_L3_V6_CMD_EN ; +memcpy (l3.dstip, data->ip_dst,sizeof (l3.dstip)); + }else { + l3.cmd |=HW_ATL2_RPF_L3_CMD_DA_EN | +HW_ATL2_RPF_L3_CMD_EN ; + l3.dstip[0 ] = data->ip_dst[0 ]; + } + } + +if (data->cmd &HW_ATL_RX_ENABLE_CMP_DEST_PORT_L4 ) { + l4.cmd |=HW_ATL2_RPF_L4_CMD_DP_EN |HW_ATL2_RPF_L4_CMD_EN ; + l4.dport = data->p_dst; + } +if (data->cmd &HW_ATL_RX_ENABLE_CMP_SRC_PORT_L4 ) { + l4.cmd |=HW_ATL2_RPF_L4_CMD_SP_EN |HW_ATL2_RPF_L4_CMD_EN ; + l4.sport = data->p_src; + } + +/* find L3 and L4 filters */ +if (l3.cmd & (HW_ATL2_RPF_L3_CMD_EN |HW_ATL2_RPF_L3_V6_CMD_EN )) { + l3_idx =hw_atl2_new_fl3l4_find_l3 (self, &l3); +if (l3_idx <0 ) +return l3_idx; + +if (l3.cmd &HW_ATL2_RPF_L3_V6_CMD_EN ) + l3_filters = priv->l3_v6_filters; +else + l3_filters = priv->l3_v4_filters; + +if (priv->l3l4_filters[data->location].l3_index != l3_idx || + old_ipv6 != !!(l3.cmd &HW_ATL2_RPF_L3_V6_CMD_EN )) +hw_atl2_rxf_l3_get (self, &l3_filters[l3_idx], + l3_idx, &l3); + } + +if (old_l3_index !=-1 ) { +if (old_ipv6) + l3_filters = priv->l3_v6_filters; +else + l3_filters = priv->l3_v4_filters; + +if (!(hw_atl2_rxf_l3_is_equal (&l3, + &l3_filters[old_l3_index]))) { +hw_atl2_rxf_l3_put (self, + &l3_filters[old_l3_index], + old_l3_index); + } + } +if (l3.cmd &HW_ATL2_RPF_L3_V6_CMD_EN ) + priv->l3l4_filters[data->location].ipv6 =1 ; +else + priv->l3l4_filters[data->location].ipv6 =0 ; + priv->l3l4_filters[data->location].l3_index = l3_idx; + +if (l4.cmd &HW_ATL2_RPF_L4_CMD_EN ) { + l4_idx =hw_atl2_new_fl3l4_find_l4 (self, &l4); +if (l4_idx <0 ) +return l4_idx; + +if (priv->l3l4_filters[data->location].l4_index != l4_idx) +hw_atl2_rxf_l4_get (self, &priv->l4_filters[l4_idx], + l4_idx, &l4); + } + +if (old_l4_index !=-1 ) { +if (!(hw_atl2_rxf_l4_is_equal (&priv->l4_filters[old_l4_index], + &l4))) { +hw_atl2_rxf_l4_put (self, + &priv->l4_filters[old_l4_index], + old_l4_index); + } + } + priv->l3l4_filters[data->location].l4_index = l4_idx; + +return 0 ; +} + +static int hw_atl2_hw_fl3l4_set (struct aq_hw_s *self, +struct aq_rx_filter_l3l4 *data) +{ +struct hw_atl2_priv *priv = self->priv; +struct hw_atl2_l3_filter *l3_filters; +struct hw_atl2_l3_filter *l3 =NULL ; +struct hw_atl2_l4_filter *l4 =NULL ; +u8 location = data->location; +u32 req_tag =0 ; +u16 action =0 ; +int l3_index; +int l4_index; +u32 mask =0 ; +u8 index; +u8 ipv6; +int res; + + res =hw_atl2_new_fl3l4_configure (self, data); +if (res) +return res; + + l3_index = priv->l3l4_filters[location].l3_index; + l4_index = priv->l3l4_filters[location].l4_index; + ipv6 = priv->l3l4_filters[location].ipv6; +if (ipv6) + l3_filters = priv->l3_v6_filters; +else + l3_filters = priv->l3_v4_filters; + +if (!(data->cmd &HW_ATL_RX_ENABLE_FLTR_L3L4 )) { +if (l3_index >-1 ) +hw_atl2_rxf_l3_put (self, &l3_filters[l3_index], + l3_index); + +if (l4_index >-1 ) +hw_atl2_rxf_l4_put (self, &priv->l4_filters[l4_index], + l4_index); + + priv->l3l4_filters[location].l3_index =-1 ; + priv->l3l4_filters[location].l4_index =-1 ; + index = priv->art_base_index +HW_ATL2_RPF_L3L4_USER_INDEX + + location; +hw_atl2_act_rslvr_table_set (self, index,0 ,0 , +HW_ATL2_ACTION_DISABLE ); + +return 0 ; + } + +if (l3_index !=-1 ) + l3 = &l3_filters[l3_index]; +if (l4_index !=-1 ) + l4 = &priv->l4_filters[l4_index]; + +if (l4 && (l4->cmd &HW_ATL2_RPF_L4_CMD_EN )) { + req_tag |= (l4_index +1 ) <<HW_ATL2_RPF_TAG_L4_OFFSET ; + mask |=HW_ATL2_RPF_TAG_L4_MASK ; + } + +if (l3) { +if (l3->cmd &HW_ATL2_RPF_L3_V6_CMD_EN ) { + req_tag |= (l3_index +1 ) << +HW_ATL2_RPF_TAG_L3_V6_OFFSET ; + mask |=HW_ATL2_RPF_TAG_L3_V6_MASK ; + }else { + req_tag |= (l3_index +1 ) << +HW_ATL2_RPF_TAG_L3_V4_OFFSET ; + mask |=HW_ATL2_RPF_TAG_L3_V4_MASK ; + } + } + +if (data->cmd & (HW_ATL_RX_HOST <<HW_ATL2_RPF_L3_L4_ACTF_SHIFT )) + action =HW_ATL2_ACTION_ASSIGN_QUEUE ((data->cmd & +HW_ATL2_RPF_L3_L4_RXQF_MSK ) >> +HW_ATL2_RPF_L3_L4_RXQF_SHIFT ); +else + action =HW_ATL2_ACTION_DROP ; + + index = priv->art_base_index +HW_ATL2_RPF_L3L4_USER_INDEX + location; +hw_atl2_act_rslvr_table_set (self, index, req_tag, mask, action); +return 0 ; +} + +static int hw_atl2_hw_fl2_set (struct aq_hw_s *self, +struct aq_rx_filter_l2 *data) +{ +struct hw_atl2_priv *priv = self->priv; +u32 mask =HW_ATL2_RPF_TAG_ET_MASK ; +u32 req_tag =0 ; +u16 action =0 ; +u32 location; +u8 index; +int tag; + + location = priv->etype_filter_base_index + data->location; + +hw_atl_rpf_etht_flr_set (self, data->ethertype, location); +hw_atl_rpf_etht_user_priority_en_set (self, + !!data->user_priority_en, + location); +if (data->user_priority_en) { +hw_atl_rpf_etht_user_priority_set (self, + data->user_priority, + location); + req_tag |= data->user_priority <<HW_ATL2_RPF_TAG_PCP_OFFSET ; + mask |=HW_ATL2_RPF_TAG_PCP_MASK ; + } + +if (data->queue <0 ) { +hw_atl_rpf_etht_flr_act_set (self,0U , location); +hw_atl_rpf_etht_rx_queue_en_set (self,0U , location); + action =HW_ATL2_ACTION_DROP ; + }else { +hw_atl_rpf_etht_flr_act_set (self,1U , location); +hw_atl_rpf_etht_rx_queue_en_set (self,1U , location); +hw_atl_rpf_etht_rx_queue_set (self, data->queue, location); + action =HW_ATL2_ACTION_ASSIGN_QUEUE (data->queue); + } + + tag =hw_atl2_filter_tag_get (priv->etype_policy, + priv->etype_filter_tag_top, + action); + +if (tag <0 ) +return -ENOSPC ; + + req_tag |= tag <<HW_ATL2_RPF_TAG_ET_OFFSET ; +hw_atl2_rpf_etht_flr_tag_set (self, tag, location); + index = priv->art_base_index +HW_ATL2_RPF_ET_PCP_USER_INDEX + + data->location; +hw_atl2_act_rslvr_table_set (self, index, req_tag, mask, action); + +hw_atl_rpf_etht_flr_en_set (self,1U , location); + +return aq_hw_err_from_flags (self); +} + +static int hw_atl2_hw_fl2_clear (struct aq_hw_s *self, +struct aq_rx_filter_l2 *data) +{ +struct hw_atl2_priv *priv = self->priv; +u32 location; +u8 index; +u32 tag; + + location = priv->etype_filter_base_index + data->location; +hw_atl_rpf_etht_flr_en_set (self,0U , location); +hw_atl_rpf_etht_flr_set (self,0U , location); +hw_atl_rpf_etht_user_priority_en_set (self,0U , location); + + index = priv->art_base_index +HW_ATL2_RPF_ET_PCP_USER_INDEX + + data->location; +hw_atl2_act_rslvr_table_set (self, index,0 ,0 , +HW_ATL2_ACTION_DISABLE ); + tag =hw_atl2_rpf_etht_flr_tag_get (self, location); +hw_atl2_filter_tag_put (priv->etype_policy, tag); + +return aq_hw_err_from_flags (self); +} + +/* +* Set VLAN filter table +* Configure VLAN filter table to accept (and assign the queue) traffic +* for the particular vlan ids. +* Note: use this function under vlan promisc mode not to lost the traffic +* +* param - aq_hw_s +* param - aq_rx_filter_vlan VLAN filter configuration +* return 0 - OK, <0 - error +*/ static int hw_atl2_hw_vlan_set (struct aq_hw_s *self,struct aq_rx_filter_vlan *aq_vlans) {
@@ -897,6 +1412,9 @@ const struct aq_hw_ops hw_atl2_ops = { .hw_ring_rx_init = hw_atl2_hw_ring_rx_init, .hw_ring_tx_init = hw_atl2_hw_ring_tx_init, .hw_packet_filter_set = hw_atl2_hw_packet_filter_set, + .hw_filter_l2_set = hw_atl2_hw_fl2_set, + .hw_filter_l2_clear = hw_atl2_hw_fl2_clear, + .hw_filter_l3l4_set = hw_atl2_hw_fl3l4_set, .hw_filter_vlan_set = hw_atl2_hw_vlan_set, .hw_filter_vlan_ctrl = hw_atl2_hw_vlan_ctrl, .hw_multicast_list_set = hw_atl2_hw_multicast_list_set,
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 8/12 net: atlantic: add AQC113 PTP traffic class and TX path setup
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Add PTP traffic class (TC) buffer reservation and TX path improvements for AQC113:
- Reserve dedicated TX and RX buffer space for PTP TC when PTP is enabled, reducing user TC buffers accordingly (TX: 8KB, RX: 16KB).
- Configure PTP TC with no flow control and highest priority scheduling to ensure timely PTP packet transmission.
TX path improvements:
- Increase TX data and descriptor read-request limits when firmware has already enabled extended PCIe tag mode.
Also simplify RSS queue calculation in hw_atl2_hw_rss_set() by extracting to a local variable and use unsigned types for loop variables to match their usage.
--- .../aquantia/atlantic/hw_atl2/hw_atl2.c | 49 ++++++++++++++++--- .../atlantic/hw_atl2/hw_atl2_internal.h | 4 +- 2 files changed, 46 insertions(+), 7 deletions(-)
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c +43 -6
@@ -151,6 +151,24 @@ static int hw_atl2_hw_reset(struct aq_hw_s *self)return err; } +static int hw_atl2_tc_ptp_set (struct aq_hw_s *self) +{ +/* Init TC2 for PTP_TX */ +hw_atl_tpb_tx_pkt_buff_size_per_tc_set (self,HW_ATL2_PTP_TXBUF_SIZE , +AQ_HW_PTP_TC ); + +/* Init TC2 for PTP_RX */ +hw_atl_rpb_rx_pkt_buff_size_per_tc_set (self,HW_ATL2_PTP_RXBUF_SIZE , +AQ_HW_PTP_TC ); + +/* No flow control for PTP */ +hw_atl_rpb_rx_xoff_en_per_tc_set (self,0U ,AQ_HW_PTP_TC ); + +hw_atl2_tpb_tps_highest_priority_tc_set (self,AQ_HW_PTP_TC ); + +return aq_hw_err_from_flags (self); +} +static int hw_atl2_hw_queue_to_tc_map_set (struct aq_hw_s *self) {struct aq_nic_cfg_s *cfg = self->aq_nic_cfg;
@@ -209,6 +227,11 @@ static int hw_atl2_hw_qos_set(struct aq_hw_s *self)unsigned int prio =0U ;u32 tc =0U ; +if (cfg->is_ptp) { + tx_buff_size -=HW_ATL2_PTP_TXBUF_SIZE ; + rx_buff_size -=HW_ATL2_PTP_RXBUF_SIZE ; + } +/* TPS Descriptor rate init */ hw_atl_tps_tx_pkt_shed_desc_rate_curr_time_res_set (self,0x0U );hw_atl_tps_tx_pkt_shed_desc_rate_lim_set (self,0xA );
@@ -242,6 +265,9 @@ static int hw_atl2_hw_qos_set(struct aq_hw_s *self)hw_atl_b0_set_fc (self, self->aq_nic_cfg->fc.req, tc); } +if (cfg->is_ptp) +hw_atl2_tc_ptp_set (self); +/* QoS 802.1p priority -> TC mapping */ for (prio =0 ; prio <8 ; ++prio) hw_atl_rpf_rpb_user_priority_tc_map_set(self, prio,
@@ -259,8 +285,9 @@ static int hw_atl2_hw_rss_set(struct aq_hw_s *self,u8 *indirection_table = rss_params->indirection_table;const u32 num_tcs =aq_hw_num_tcs (self);u32 rpf_redir2_enable; -int tc; -int i; +u32 queue; +u32 tc; +u32 i; rpf_redir2_enable = num_tcs >4 ?1 :0 ;
@@ -268,10 +295,9 @@ static int hw_atl2_hw_rss_set(struct aq_hw_s *self,for (i =HW_ATL2_RSS_REDIRECTION_MAX ; i--;) {for (tc =0 ; tc != num_tcs; tc++) { -hw_atl2_new_rpf_rss_redir_set (self, tc, i, - tc * -aq_hw_q_per_tc (self) + - indirection_table[i]); + queue = tc *aq_hw_q_per_tc (self) + + indirection_table[i]; +hw_atl2_new_rpf_rss_redir_set (self, tc, i, queue); } }
@@ -415,9 +441,20 @@ static int hw_atl2_hw_init_tx_path(struct aq_hw_s *self)hw_atl2_tpb_tx_buf_clk_gate_en_set (self,0U ); +if (hw_atl2_phi_ext_tag_get (self)) { +hw_atl2_tdm_tx_data_read_req_limit_set (self,0x7F ); +hw_atl2_tdm_tx_desc_read_req_limit_set (self,0x0F ); + } +return aq_hw_err_from_flags (self); } +/* Initialise new rx filters +* L2 promisc OFF +* VLAN promisc OFF +* +* User priority to TC +*/ static void hw_atl2_hw_init_new_rx_filters (struct aq_hw_s *self) {u8 *prio_tc_map = self->aq_nic_cfg->prio_tc_map;
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h +3 -1
@@ -27,8 +27,10 @@#define HW_ATL2_INT_MASK (0xFFFFFFFFU)#define HW_ATL2_TXBUF_MAX 128U -#define HW_ATL2_RXBUF_MAX 192U +#define HW_ATL2_PTP_TXBUF_SIZE 8U +#define HW_ATL2_RXBUF_MAX 192U +#define HW_ATL2_PTP_RXBUF_SIZE 16U#define HW_ATL2_RSS_REDIRECTION_MAX 64U#define HW_ATL2_TC_MAX 8U
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 9/12 net: atlantic: extend hw_ops and TX descriptor for AQC113 PTP
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Extend the aq_hw_ops interface with new function pointers required for PTP support on AQC113:
- enable_ptp: enable/disable PTP counter with clock selection
- hw_ring_tx_ptp_get_ts: read TX timestamp from descriptor writeback
- hw_tx_ptp_ring_init/hw_rx_ptp_ring_init: per-ring PTP initialization
- hw_get_clk_sel: query active TSG clock selection
Update existing hw_ops signatures to support AQC113 dual-clock architecture:
- hw_gpio_pulse: add clk_sel and hightime parameters
- hw_extts_gpio_enable: add channel parameter
Add PTP-related hardware defines:
- AQ_HW_TXD_CTL_TS_EN/TS_TSG0 for TX descriptor timestamp control
- AQ2_HW_PTP_COUNTER_HZ for AQC113 TSG clock frequency
- AQ_HW_PTP_IRQS for PTP interrupt vector accounting
- PTP enable flags (L2/L4) and TSG clock selection constants
Add request_ts and clk_sel bitfields to aq_ring_buff_s for per-packet TX timestamp request tracking.
Update hw_atl_b0.c (AQC107) implementations:
- Adapt gpio_pulse and extts_gpio_enable to new signatures
- Add TX descriptor timestamp bits for AQC113 when ANTIGUA chip feature is detected
--- .../net/ethernet/aquantia/atlantic/aq_hw.h | 34 +++++++++++++++++-- .../net/ethernet/aquantia/atlantic/aq_ptp.c | 4 +-- .../net/ethernet/aquantia/atlantic/aq_ring.h | 4 ++- .../aquantia/atlantic/hw_atl/hw_atl_b0.c | 15 ++++++-- 4 files changed, 48 insertions(+), 9 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +31 -3
@@ -19,6 +19,9 @@#define AQ_HW_MAC_COUNTER_HZ 312500000ll#define AQ_HW_PHY_COUNTER_HZ 160000000ll +#define AQ_HW_TXD_CTL_TS_EN 0x40000000U +#define AQ_HW_TXD_CTL_TS_TSG0 0x80000000U +enum aq_tc_mode {AQ_TC_MODE_INVALID =-1 ,AQ_TC_MODE_8TCS ,
@@ -38,6 +41,8 @@ enum aq_tc_mode {#define AQ_FRAC_PER_NS 0x100000000LL +#define AQ2_HW_PTP_COUNTER_HZ 156250000ll +/* Used for rate to Mbps conversion */ #define AQ_MBPS_DIVISOR 125000/* 1000000 / 8 */
@@ -109,6 +114,7 @@ struct aq_stats_s {#define AQ_HW_IRQ_MSIX 3U#define AQ_HW_SERVICE_IRQS 1U +#define AQ_HW_PTP_IRQS 1U#define AQ_HW_POWER_STATE_D0 0U#define AQ_HW_POWER_STATE_D3 3U
@@ -157,6 +163,15 @@ enum aq_priv_flags { AQ_HW_LOOPBACK_PHYEXT_SYS, }; +enum { +AQ_HW_PTP_DISABLE =0 , +AQ_HW_PTP_L2_ENABLE =BIT (1 ), +AQ_HW_PTP_L4_ENABLE =BIT (2 ), +}; + +#define ATL_TSG_CLOCK_SEL_0 0 +#define ATL_TSG_CLOCK_SEL_1 1 +#define AQ_HW_LOOPBACK_MASK (BIT(AQ_HW_LOOPBACK_DMA_SYS) |\ BIT(AQ_HW_LOOPBACK_PKT_SYS) |\ BIT(AQ_HW_LOOPBACK_DMA_NET) |\
@@ -198,6 +213,7 @@ struct aq_hw_s {u32 rpc_tid;struct hw_atl_utils_fw_rpc rpc;s64 ptp_clk_offset; +s8 clk_select;u16 phy_id;void *priv; };
@@ -323,11 +339,15 @@ struct aq_hw_ops {int (*hw_ts_to_sys_clock)(struct aq_hw_s *self,u64 ts,u64 *time); -int (*hw_gpio_pulse)(struct aq_hw_s *self,u32 index,u64 start, -u32 period); +int (*hw_gpio_pulse)(struct aq_hw_s *self,u32 index, +u32 clk_sel,u64 start, +u32 period,u32 hightime);int (*hw_extts_gpio_enable)(struct aq_hw_s *self,u32 index, -u32 enable); +u32 channel,int enable); + +void (*enable_ptp)(struct aq_hw_s *self,unsigned int param, +int enable);int (*hw_get_sync_ts)(struct aq_hw_s *self,u64 *ts);
@@ -337,6 +357,14 @@ struct aq_hw_ops {int (*extract_hwts)(struct aq_hw_s *self,u8 *p,unsigned int len,u64 *timestamp); +u64 (*hw_ring_tx_ptp_get_ts)(struct aq_ring_s *ring); + +int (*hw_tx_ptp_ring_init)(struct aq_hw_s *self, +struct aq_ring_s *aq_ring); +int (*hw_rx_ptp_ring_init)(struct aq_hw_s *self, +struct aq_ring_s *aq_ring); +u32 (*hw_get_clk_sel)(struct aq_hw_s *self); +int (*hw_set_fc)(struct aq_hw_s *self,u32 fc,u32 tc);int (*hw_set_loopback)(struct aq_hw_s *self,u32 mode,bool enable);
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c +2 -2
@@ -380,7 +380,7 @@ static int aq_ptp_hw_pin_conf(struct aq_nic_s *aq_nic, u32 pin_index, u64 start,*/ mutex_lock (&aq_nic->fwreq_mutex); aq_nic->aq_hw_ops->hw_gpio_pulse (aq_nic->aq_hw, pin_index, - start, (u32 )period); +0 , start, (u32 )period,0 );mutex_unlock (&aq_nic->fwreq_mutex);return 0 ;
@@ -454,7 +454,7 @@ static void aq_ptp_extts_pin_ctrl(struct aq_ptp_s *aq_ptp)if (aq_nic->aq_hw_ops->hw_extts_gpio_enable) aq_nic->aq_hw_ops->hw_extts_gpio_enable (aq_nic->aq_hw,0 , - enable); +0 , enable); } static int aq_ptp_extts_pin_configure(struct ptp_clock_info *ptp,
drivers/net/ethernet/aquantia/atlantic/aq_ring.h +3 -1
@@ -85,7 +85,9 @@ struct __packed aq_ring_buff_s { u32 is_error:1; u32 is_vlan:1; u32 is_lro:1; - u32 rsvd3:3; + u32 request_ts:1; + u32 clk_sel:1; + u32 rsvd3:1;u16 eop_index;u16 rsvd4; };
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +12 -3
@@ -736,6 +736,15 @@ int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, struct aq_ring_s *ring, txd->ctl |=HW_ATL_B0_TXD_CTL_CMD_WB ; is_gso = false; is_vlan = false; + +if (ATL_HW_IS_CHIP_FEATURE (self,ANTIGUA ) && +unlikely (buff->request_ts)) { + txd->ctl |=AQ_HW_TXD_CTL_TS_EN ; +if (buff->clk_sel !=ATL_TSG_CLOCK_SEL_1 ) + txd->ctl |=AQ_HW_TXD_CTL_TS_TSG0 ; +/* The only DD+TS is required */ + txd->ctl &= ~HW_ATL_B0_TXD_CTL_CMD_WB ; + } } } ring->sw_tail =aq_ring_next_dx (ring, ring->sw_tail);
@@ -1323,8 +1332,8 @@ static int hw_atl_b0_adj_clock_freq(struct aq_hw_s *self, s32 ppb)return self->aq_fw_ops->send_fw_request (self, &fwreq, size); } -static int hw_atl_b0_gpio_pulse (struct aq_hw_s *self,u32 index, -u64 start,u32 period) +static int hw_atl_b0_gpio_pulse (struct aq_hw_s *self,u32 index,u32 clk_sel, +u64 start,u32 period,u32 hightime) {struct hw_fw_request_iface fwreq;size_t size;
@@ -1342,7 +1351,7 @@ static int hw_atl_b0_gpio_pulse(struct aq_hw_s *self, u32 index, }static int hw_atl_b0_extts_gpio_enable (struct aq_hw_s *self,u32 index, -u32 enable) +u32 channel,int enable) {/* Enable/disable Sync1588 GPIO Timestamping */ aq_phy_write_reg (self,MDIO_MMD_PCS ,0xc611 , enable ?0x71 :0 );
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 10/12 net: atlantic: add AQC113 PTP hardware ops in hw_atl2
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
Add the hardware-layer PTP implementation for AQC113 (Antigua):
- hw_atl2.h/hw_atl2_utils.h/hw_atl2_internal.h: add PTP offset constants, RX timestamp size (HW_ATL2_RX_TS_SIZE=8), and reduced HW_ATL2_RXBUF_MAX=172 (AQC113 on-chip RX packet buffer hardware limit for data TCs).
- hw_atl2.c: implement hw_atl2_enable_ptp() to reset and enable TSG clocks and set PTP TC scheduling priority after hardware reset.
- hw_atl2.c: implement hw_atl2_adj_sys_clock(), hw_atl2_adj_clock_freq(), and aq_get_ptp_ts() for TSG clock read/adjust/increment operations.
- hw_atl2.c: implement hw_atl2_gpio_pulse() for PPS output generation via TSG pulse generator.
- hw_atl2.c: implement hw_atl2_hw_tx_ptp_ring_init() and hw_atl2_hw_rx_ptp_ring_init() for PTP ring setup.
- hw_atl2.c: implement hw_atl2_hw_ring_tx_ptp_get_ts() to read TX timestamp from descriptor writeback, and hw_atl2_hw_rx_extract_ts() to extract RX timestamp from the 8-byte packet trailer.
- hw_atl2.c: add hw_atl2_hw_get_clk_sel() helper.
- Wire all new ops into hw_atl2_ops.
--- .../ethernet/aquantia/atlantic/aq_pci_func.c | 1 + .../aquantia/atlantic/hw_atl2/hw_atl2.c | 200 +++++++++++++++++- .../aquantia/atlantic/hw_atl2/hw_atl2.h | 12 ++ .../atlantic/hw_atl2/hw_atl2_internal.h | 3 +- .../aquantia/atlantic/hw_atl2/hw_atl2_utils.h | 10 + 5 files changed, 223 insertions(+), 3 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +1 -0
@@ -250,6 +250,7 @@ static int aq_pci_probe(struct pci_dev *pdev, goto err_ioremap; } self->aq_hw->aq_nic_cfg =aq_nic_get_cfg (self); + self->aq_hw->clk_select =-1 ;if (self->aq_hw->aq_nic_cfg->aq_hw_caps->priv_data_len) {int len = self->aq_hw->aq_nic_cfg->aq_hw_caps->priv_data_len;
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c +198 -2
246 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h +12 -0
@@ -7,6 +7,18 @@#define HW_ATL2_H #include "aq_common.h" +#define HW_ATL2_RX_TS_SIZE 8 + +#define HW_ATL2_PTP_OFFSET_INGRESS_100 768 +#define HW_ATL2_PTP_OFFSET_EGRESS_100 336 +#define HW_ATL2_PTP_OFFSET_INGRESS_1000 510 +#define HW_ATL2_PTP_OFFSET_EGRESS_1000 105 +#define HW_ATL2_PTP_OFFSET_INGRESS_2500 2447 +#define HW_ATL2_PTP_OFFSET_EGRESS_2500 634 +#define HW_ATL2_PTP_OFFSET_INGRESS_5000 1426 +#define HW_ATL2_PTP_OFFSET_EGRESS_5000 361 +#define HW_ATL2_PTP_OFFSET_INGRESS_10000 997 +#define HW_ATL2_PTP_OFFSET_EGRESS_10000 203extern const struct aq_hw_caps_s hw_atl2_caps_aqc113;extern const struct aq_hw_caps_s hw_atl2_caps_aqc115c;
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h +2 -1
@@ -29,7 +29,8 @@#define HW_ATL2_TXBUF_MAX 128U#define HW_ATL2_PTP_TXBUF_SIZE 8U -#define HW_ATL2_RXBUF_MAX 192U +/* hw_atl2 on-chip RX packet buffer available for data TCs */ +#define HW_ATL2_RXBUF_MAX 172U#define HW_ATL2_PTP_RXBUF_SIZE 16U#define HW_ATL2_RSS_REDIRECTION_MAX 64U
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h +10 -0
@@ -8,6 +8,16 @@#include "aq_hw.h" +/* Hardware tx launch time descriptor */ +struct hw_atl2_txts_s { +__le64 ts; +__le32 ctrl; +u32 reserved; +}; + +#define HW_ATL2_TXTS_DD BIT(3) +#define HW_ATL2_TXTS_TS_VALID BIT(20) +/* F W A P I */ struct link_options_s {
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 11/12 net: atlantic: add AQC113 TX timestamp polling and PTP TX classification
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
aq_ring.h / aq_ring.c:
- Add ptp_ts_deadline field to aq_ring_s to track TX timestamp timeout.
- In aq_ring_tx_clean(): when hw_ring_tx_ptp_get_ts() returns 0 (HW not yet written back the timestamp), clear buff->is_mapped and buff->pa before breaking to prevent double dma_unmap on retry. When ptp_ts_deadline expires, dequeue and drop the head of skb_ring to keep it in lockstep with buff_ring, then clear request_ts and free the skb via dev_kfree_skb_any() to unblock the ring.
aq_main.c:
- Add IPv6 PTP packet detection in aq_ndev_start_xmit() using ipv6_hdr()->nexthdr for ETH_P_IPV6 frames, steering them through aq_ptp_xmit() alongside the existing IPv4 path.
- Use PTP_EV_PORT/PTP_GEN_PORT constants instead of magic numbers 319/320.
- Remove duplicate aq_reapply_rxnfc_all_rules() and aq_filters_vlans_update()
calls from aq_ndev_open() - now covered by aq_nic_start(), which also ensures filters are restored correctly after PM resume.
aq_nic.c:
- Move aq_reapply_rxnfc_all_rules() and aq_filters_vlans_update() into aq_nic_start() after hardware init, replacing the duplicate calls that were removed from aq_ndev_open().
--- .../net/ethernet/aquantia/atlantic/aq_main.c | 30 ++++++++++--------- .../net/ethernet/aquantia/atlantic/aq_nic.c | 8 +++++ .../net/ethernet/aquantia/atlantic/aq_ptp.c | 12 ++++++++ .../net/ethernet/aquantia/atlantic/aq_ptp.h | 2 ++ .../net/ethernet/aquantia/atlantic/aq_ring.c | 26 +++++++++++++++- .../net/ethernet/aquantia/atlantic/aq_ring.h | 1 + 6 files changed, 64 insertions(+), 15 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_main.c +16 -14
@@ -19,8 +19,10 @@#include <linux/netdevice.h> #include <linux/module.h> #include <linux/ip.h> +#include <linux/ipv6.h> #include <linux/udp.h> #include <net/pkt_cls.h> +#include <linux/ptp_classify.h> #include <net/pkt_sched.h> #include <linux/filter.h>
@@ -68,14 +70,6 @@ int aq_ndev_open(struct net_device *ndev)if (err <0 ) goto err_exit; - err =aq_reapply_rxnfc_all_rules (aq_nic); -if (err <0 ) - goto err_exit; - - err =aq_filters_vlans_update (aq_nic); -if (err <0 ) - goto err_exit; - err =aq_nic_start (aq_nic);if (err <0 ) {aq_nic_stop (aq_nic);
@@ -113,12 +107,20 @@ static netdev_tx_t aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *nd* and hardware PTP design of the chip. Otherwise ptp stream * will fail to sync */ -if (unlikely (skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP ) || -unlikely ((ip_hdr (skb)->version ==4 ) && - (ip_hdr (skb)->protocol ==IPPROTO_UDP ) && - ((udp_hdr (skb)->dest ==htons (319 )) || - (udp_hdr (skb)->dest ==htons (320 )))) || -unlikely (eth_hdr (skb)->h_proto ==htons (ETH_P_1588 ))) +if (unlikely (skb->protocol ==htons (ETH_P_IP ) && +ip_hdr (skb)->protocol ==IPPROTO_UDP && + (udp_hdr (skb)->dest ==htons (PTP_EV_PORT ) || +udp_hdr (skb)->dest ==htons (PTP_GEN_PORT )))) +return aq_ptp_xmit (aq_nic, skb); + +/* PTP over IPv6 does not use extension headers */ +if (unlikely (skb->protocol ==htons (ETH_P_IPV6 ) && +ipv6_hdr (skb)->nexthdr ==IPPROTO_UDP && + (udp_hdr (skb)->dest ==htons (PTP_EV_PORT ) || +udp_hdr (skb)->dest ==htons (PTP_GEN_PORT )))) +return aq_ptp_xmit (aq_nic, skb); + +if (unlikely (eth_hdr (skb)->h_proto ==htons (ETH_P_1588 ))) return aq_ptp_xmit(aq_nic, skb); }#endif
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +8 -0
@@ -496,6 +496,14 @@ int aq_nic_start(struct aq_nic_s *self) goto err_exit; } + err =aq_reapply_rxnfc_all_rules (self); +if (err <0 ) + goto err_exit; + + err =aq_filters_vlans_update (self); +if (err <0 ) + goto err_exit; + err =aq_ptp_ring_start (self);if (err <0 ) goto err_exit;
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c +12 -0
@@ -268,6 +268,18 @@ static void aq_ptp_tx_timeout_check(struct aq_ptp_s *aq_ptp) } } +void aq_ptp_tx_skb_drop_head (struct aq_nic_s *aq_nic) +{ +struct aq_ptp_s *aq_ptp = aq_nic->aq_ptp; +struct sk_buff *skb; + +if (!aq_ptp) +return ; + skb =aq_ptp_skb_get (&aq_ptp->skb_ring); +if (skb) +dev_kfree_skb_any (skb); +} +/* aq_ptp_adjfine * @ptp: the ptp clock structure * @ppb: parts per billion adjustment from base
drivers/net/ethernet/aquantia/atlantic/aq_ptp.h +2 -0
@@ -53,6 +53,7 @@ void aq_ptp_service_task(struct aq_nic_s *aq_nic);void aq_ptp_tm_offset_set (struct aq_nic_s *aq_nic,unsigned int mbps);void aq_ptp_clock_init (struct aq_nic_s *aq_nic); +void aq_ptp_tx_skb_drop_head (struct aq_nic_s *aq_nic);/* Traffic processing functions */ int aq_ptp_xmit (struct aq_nic_s *aq_nic,struct sk_buff *skb);
@@ -123,6 +124,7 @@ static inline void aq_ptp_service_task(struct aq_nic_s *aq_nic) {}static inline void aq_ptp_tm_offset_set (struct aq_nic_s *aq_nic,unsigned int mbps) {}static inline void aq_ptp_clock_init (struct aq_nic_s *aq_nic) {} +static inline void aq_ptp_tx_skb_drop_head (struct aq_nic_s *aq_nic) {}static inline int aq_ptp_xmit (struct aq_nic_s *aq_nic,struct sk_buff *skb) {return -EOPNOTSUPP ;
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +25 -1
@@ -311,6 +311,30 @@ bool aq_ring_tx_clean(struct aq_ring_s *self)if (likely (!buff->is_eop)) goto out; +if (unlikely (buff->request_ts) && + self->aq_nic->aq_hw_ops->hw_ring_tx_ptp_get_ts) { +u64 ts = self->aq_nic->aq_hw_ops->hw_ring_tx_ptp_get_ts (self); + +if (!ts) { +if (time_after (jiffies, + self->ptp_ts_deadline)) { +/* Timeout: drain skb_ring head to +* keep in sync with buff_ring +*/ +aq_ptp_tx_skb_drop_head (self->aq_nic); + buff->request_ts =0 ; +dev_kfree_skb_any (buff->skb); + buff->skb =NULL ; + goto out; + }else { + buff->is_mapped =0 ; + buff->pa =0U ; +break ; + } + } + +aq_ptp_tx_hwtstamp (self->aq_nic, ts); + }if (buff->skb) {u64_stats_update_begin (&self->stats.tx.syncp); ++self->stats.tx.packets;
@@ -570,7 +594,7 @@ static int __aq_ring_rx_clean(struct aq_ring_s *self, struct napi_struct *napi, self->hw_head);if (unlikely (!is_rsc_completed) || - frag_cnt >MAX_SKB_FRAGS ) { + frag_cnt >MAX_SKB_FRAGS ) { err =0 ; goto err_exit; }
drivers/net/ethernet/aquantia/atlantic/aq_ring.h +1 -0
@@ -154,6 +154,7 @@ struct aq_ring_s {struct bpf_prog *xdp_prog;enum atl_ring_type ring_type;struct xdp_rxq_info xdp_rxq; +unsigned long ptp_ts_deadline; };struct aq_ring_param_s {
Signature · 1 line
2.43.0
[email protected]
maintainerPATCH v5 12/12 net: atlantic: add AQC113 PTP support in aq_ptp and driver core
In reply to [email protected]From: Sukhdeep Singh <[email protected]>
aq_ptp.c / aq_ptp.h:
- Add aq_ptp_state enum (AQ_PTP_FIRST_INIT, AQ_PTP_LINK_UP, AQ_PTP_NO_LINK) to distinguish first init from link-change events; on AQC113 only reset the TSG clock on first init to avoid disrupting ongoing synchronization.
- Add aq_ptp_dpath_enable() for comprehensive L3/L4 PTP filter setup/teardown, replacing the previous single-filter approach with an array of 4 slots for IPv4 and IPv6 PTP multicast addresses (224.0.1.129, 224.0.0.107, ff0e::181, ff02::6b).
- Add aq_ptp_parse_rx_filters() to map hwtstamp_rx_filters to L2/L4 enable flags and call aq_ptp_dpath_enable().
- Re-apply RX filters on link change (hardware state lost after reset).
- Extend PTP ring alloc/init/start/stop to handle AQC113 PTP ring ops.
- Add per-instance PTP offset table for AQC113 with empirically measured values at 100M/1G/2.5G/5G/10G link speeds.
- Export aq_ptp_dpath_enable() and updated ring helpers in aq_ptp.h.
aq_hw.h:
- Include hw_atl2/hw_atl2.h for AQC113 PTP type definitions.
aq_nic.c:
- Account for PTP IRQ vector (AQ_HW_PTP_IRQS) in vector count math.
- Call hw_atl2 PTP re-enable hook after hardware reset in aq_nic_update_link_status().
aq_pci_func.c:
- Pass PTP IRQ index to aq_ptp_irq_alloc() in probe path.
--- .../net/ethernet/aquantia/atlantic/aq_hw.h | 1 + .../net/ethernet/aquantia/atlantic/aq_nic.c | 45 +- .../ethernet/aquantia/atlantic/aq_pci_func.c | 4 +- .../net/ethernet/aquantia/atlantic/aq_ptp.c | 547 ++++++++++++++---- .../net/ethernet/aquantia/atlantic/aq_ptp.h | 15 +- 5 files changed, 473 insertions(+), 139 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_hw.h +1 -0
@@ -15,6 +15,7 @@#include "aq_common.h" #include "aq_rss.h" #include "hw_atl/hw_atl_utils.h" +#include "hw_atl2/hw_atl2.h" #define AQ_HW_MAC_COUNTER_HZ 312500000ll#define AQ_HW_PHY_COUNTER_HZ 160000000ll
drivers/net/ethernet/aquantia/atlantic/aq_nic.c +40 -5
87 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +2 -2
@@ -294,8 +294,8 @@ static int aq_pci_probe(struct pci_dev *pdev, numvecs =min ((u8 )AQ_CFG_VECS_DEF ,aq_nic_get_cfg (self)->aq_hw_caps->msix_irqs); numvecs =min (numvecs,num_online_cpus ()); -/* Request IRQ vector for PTP */ - numvecs +=1 ; +/* Request IRQ lines for PTP */ + numvecs +=AQ_HW_PTP_IRQS ; numvecs +=AQ_HW_SERVICE_IRQS ;/*enable interrupts */
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c +419 -128
826 lines not on this page · raw message
drivers/net/ethernet/aquantia/atlantic/aq_ptp.h +11 -4
@@ -14,6 +14,12 @@#include "aq_ring.h" +enum aq_ptp_state { +AQ_PTP_NO_LINK =0 , +AQ_PTP_FIRST_INIT =1 , +AQ_PTP_LINK_UP =2 , +}; +#define PTP_8TC_RING_IDX 8#define PTP_4TC_RING_IDX 16#define PTP_HWST_RING_IDX 31
@@ -32,7 +38,7 @@ static inline unsigned int aq_ptp_ring_idx(const enum aq_tc_mode tc_mode)#if IS_REACHABLE (CONFIG_PTP_1588_CLOCK )/* Common functions */ -int aq_ptp_init (struct aq_nic_s *aq_nic,unsigned int idx_vec); +int aq_ptp_init (struct aq_nic_s *aq_nic,unsigned int idx_ptp_vec);void aq_ptp_unregister (struct aq_nic_s *aq_nic);void aq_ptp_free (struct aq_nic_s *aq_nic);
@@ -52,7 +58,7 @@ void aq_ptp_service_task(struct aq_nic_s *aq_nic);void aq_ptp_tm_offset_set (struct aq_nic_s *aq_nic,unsigned int mbps); -void aq_ptp_clock_init (struct aq_nic_s *aq_nic); +void aq_ptp_clock_init (struct aq_nic_s *aq_nic,enum aq_ptp_state state);void aq_ptp_tx_skb_drop_head (struct aq_nic_s *aq_nic);/* Traffic processing functions */
@@ -81,7 +87,7 @@ u64 *aq_ptp_get_stats(struct aq_nic_s *aq_nic, u64 *data);#else -static inline int aq_ptp_init (struct aq_nic_s *aq_nic,unsigned int idx_vec) +static inline int aq_ptp_init (struct aq_nic_s *aq_nic,unsigned int idx_ptp_vec) {return 0 ; }
@@ -123,7 +129,8 @@ static inline void aq_ptp_ring_deinit(struct aq_nic_s *aq_nic) {}static inline void aq_ptp_service_task (struct aq_nic_s *aq_nic) {}static inline void aq_ptp_tm_offset_set (struct aq_nic_s *aq_nic,unsigned int mbps) {} -static inline void aq_ptp_clock_init (struct aq_nic_s *aq_nic) {} +static inline void aq_ptp_clock_init (struct aq_nic_s *aq_nic, +enum aq_ptp_state state) {}static inline void aq_ptp_tx_skb_drop_head (struct aq_nic_s *aq_nic) {}static inline int aq_ptp_xmit (struct aq_nic_s *aq_nic,struct sk_buff *skb) {
Signature · 1 line
2.43.0
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Wed, 10 Jun 2026 17:24:36 +0530 you wrote:
From: Sukhdeep Singh <[email protected]>
This series adds IEEE 1588 PTP support for the AQC113 (Antigua) network controller. AQC113 is the successor to the existing AQC107 (Atlantic) chip already supported by the atlantic driver.
AQC113 uses a substantially different hardware architecture for PTP compared to AQC107:
[...]
Here is the summary with links:
- [net-next,v5,1/12] net: atlantic: correct L3L4 filter flow_type masking and IPv6 handling
https://git.kernel.org/netdev/net-next/c/9ed479cd9fd3 - [net-next,v5,2/12] net: atlantic: move active_ipv4/ipv6 bitmap updates after HW write https://git.kernel.org/netdev/net-next/c/dfb7a7468b94 - [net-next,v5,3/12] net: atlantic: decouple aq_set_data_fl3l4() from driver internals https://git.kernel.org/netdev/net-next/c/7bd18209741f - [net-next,v5,4/12] net: atlantic: add AQC113 hardware register definitions and accessors https://git.kernel.org/netdev/net-next/c/228c40913220 - [net-next,v5,5/12] net: atlantic: add AQC113 filter data structures, firmware query and register dump https://git.kernel.org/netdev/net-next/c/4428d3b99414 - [net-next,v5,6/12] net: atlantic: fix AQC113 HW init: ART, L2 filter slot, MAC address https://git.kernel.org/netdev/net-next/c/6c1ca112a6e4 - [net-next,v5,7/12] net: atlantic: implement AQC113 L2/L3/L4 RX filter ops https://git.kernel.org/netdev/net-next/c/ddce0b1bc002 - [net-next,v5,8/12] net: atlantic: add AQC113 PTP traffic class and TX path setup https://git.kernel.org/netdev/net-next/c/5e7c8f8e96b4 - [net-next,v5,9/12] net: atlantic: extend hw_ops and TX descriptor for AQC113 PTP https://git.kernel.org/netdev/net-next/c/f4f2bfe2b2ea - [net-next,v5,10/12] net: atlantic: add AQC113 PTP hardware ops in hw_atl2 https://git.kernel.org/netdev/net-next/c/f6a7a4bcc5d3 - [net-next,v5,11/12] net: atlantic: add AQC113 TX timestamp polling and PTP TX classification https://git.kernel.org/netdev/net-next/c/da8222888659 - [net-next,v5,12/12] net: atlantic: add AQC113 PTP support in aq_ptp and driver core https://git.kernel.org/netdev/net-next/c/0384ba231868
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html