diff options
| author | Mark Brown <broonie@kernel.org> | 2025-05-07 09:47:05 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-05-07 09:47:05 +0900 |
| commit | 9fbae052f6f68056fd84e8ba096a7e9ab3464f3d (patch) | |
| tree | 9761fe612792d8c4e67c5da66fa5258e7c0c13fe /drivers/net/ethernet/intel/ice/ice_ddp.c | |
| parent | 222a87f6b94f6f177e896d6fcdc7881480344e34 (diff) | |
| parent | 9f7cd1bcb6363368abc954ff4e727b579813c697 (diff) | |
This patch set did some clean up and add runtime pm
Merge series from Haibo Chen <haibo.chen@nxp.com>:
PATCH1/3/4 to clean up the code, make the code more readable
PATCH2 add the runtime pm support
PATCH5 use devm_add_action_or_reset() to replace remove() callback, this can avoid
oops when do bind/unbind test
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ddp.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_ddp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_ddp.c b/drivers/net/ethernet/intel/ice/ice_ddp.c index 69d5b1a28491..59323c019544 100644 --- a/drivers/net/ethernet/intel/ice/ice_ddp.c +++ b/drivers/net/ethernet/intel/ice/ice_ddp.c @@ -2345,15 +2345,15 @@ ice_get_set_tx_topo(struct ice_hw *hw, u8 *buf, u16 buf_size, cmd->set_flags |= ICE_AQC_TX_TOPO_FLAGS_SRC_RAM | ICE_AQC_TX_TOPO_FLAGS_LOAD_NEW; - if (hw->mac_type == ICE_MAC_GENERIC_3K_E825) - desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD); + desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD); } else { ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_get_tx_topo); cmd->get_flags = ICE_AQC_TX_TOPO_GET_RAM; - } - if (hw->mac_type != ICE_MAC_GENERIC_3K_E825) - desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD); + if (hw->mac_type == ICE_MAC_E810 || + hw->mac_type == ICE_MAC_GENERIC) + desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD); + } status = ice_aq_send_cmd(hw, &desc, buf, buf_size, cd); if (status) |