diff options
| author | Xiaoyun Li <xiaoyun.li@intel.com> | 2018-09-17 09:28:11 +0000 |
|---|---|---|
| committer | Kevin Bowling <kbowling@FreeBSD.org> | 2021-09-14 00:37:19 +0000 |
| commit | 1fe6bec929a10995186d15da460767703fba5b98 (patch) | |
| tree | bc2ca55bb79c774c723b7a10d2731e01cf1e852a | |
| parent | 163e29cec62291619f5f02d36e0160b660178a04 (diff) | |
| download | src-1fe6bec929a10995186d15da460767703fba5b98.tar.gz src-1fe6bec929a10995186d15da460767703fba5b98.zip | |
ixgbe: replace an operation in X550 setup
Replace "=" operation with "|=" operation to only set the intended
register bits.
Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Approved by: imp
Obtained from: DPDK (1b665ccd9cd73499e934b807bec2fd77193912ef)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D31621
(cherry picked from commit c85b6f2901e7804105ca1d6d41cc5eb9a60474b8)
| -rw-r--r-- | sys/dev/ixgbe/ixgbe_x550.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ixgbe/ixgbe_x550.c b/sys/dev/ixgbe/ixgbe_x550.c index bcfbe14b30d2..b5f1bc4f6ef8 100644 --- a/sys/dev/ixgbe/ixgbe_x550.c +++ b/sys/dev/ixgbe/ixgbe_x550.c @@ -2802,9 +2802,9 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw, (IXGBE_CS4227_EDC_MODE_SR << 1)); if (setup_linear) - reg_phy_ext = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1; + reg_phy_ext |= (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1; else - reg_phy_ext = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1; + reg_phy_ext |= (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1; ret_val = hw->phy.ops.write_reg(hw, reg_slice, IXGBE_MDIO_ZERO_DEV_TYPE, reg_phy_ext); |