From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Josh Elsasser <jelsasser@appneta.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 4.14 49/69] ixgbe: recognize 1000BaseLX SFP modules as 1Gbps
Date: Wed, 5 Dec 2018 04:42:27 -0500 [thread overview]
Message-ID: <20181205094247.6556-49-sashal@kernel.org> (raw)
In-Reply-To: <20181205094247.6556-1-sashal@kernel.org>
From: Josh Elsasser <jelsasser@appneta.com>
[ Upstream commit a8bf879af7b1999eba36303ce9cc60e0e7dd816c ]
Add the two 1000BaseLX enum values to the X550's check for 1Gbps modules,
allowing the core driver code to establish a link over this SFP type.
This is done by the out-of-tree driver but the fix wasn't in mainline.
Fixes: e23f33367882 ("ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+”)
Fixes: 6a14ee0cfb19 ("ixgbe: Add X550 support function pointers")
Signed-off-by: Josh Elsasser <jelsasser@appneta.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index cf6a245db6d5..a37c951b0753 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -2257,7 +2257,9 @@ static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
*autoneg = false;
if (hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||
- hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {
+ hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 ||
+ hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||
+ hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1) {
*speed = IXGBE_LINK_SPEED_1GB_FULL;
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2018-12-05 9:48 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-05 9:41 [PATCH AUTOSEL 4.14 01/69] ARM: OMAP2+: prm44xx: Fix section annotation on omap44xx_prm_enable_io_wakeup Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 02/69] ASoC: rsnd: fixup clock start checker Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 03/69] iio:st_magn: Fix enable device after trigger Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 04/69] staging: rtl8723bs: Fix the return value in case of error in 'rtw_wx_read32()' Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 05/69] ARM: dts: logicpd-somlv: Fix interrupt on mmc3_dat1 Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 06/69] ARM: OMAP1: ams-delta: Fix possible use of uninitialized field Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 07/69] sysv: return 'err' instead of 0 in __sysv_write_inode Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 08/69] selftests: add script to stress-test nft packet path vs. control plane sashal
2018-12-05 9:41 ` Sasha Levin
2018-12-05 9:41 ` Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 09/69] netfilter: nf_tables: fix use-after-free when deleting compat expressions Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 10/69] hwmon (ina2xx) Fix NULL id pointer in probe() Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 11/69] ASoC: wm_adsp: Fix dma-unsafe read of scratch registers Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 12/69] s390/cpum_cf: Reject request for sampling in event initialization Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 13/69] hwmon: (ina2xx) Fix current value calculation Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 14/69] ASoC: omap-abe-twl6040: Fix missing audio card caused by deferred probing Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 15/69] ASoC: dapm: Recalculate audio map forcely when card instantiated Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 16/69] iio/hid-sensors: Fix IIO_CHAN_INFO_RAW returning wrong values for signed numbers Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 17/69] netfilter: xt_hashlimit: fix a possible memory leak in htable_create() Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 18/69] hwmon: (w83795) temp4_type has writable permission Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 19/69] perf tools: Restore proper cwd on return from mnt namespace Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 20/69] PCI: imx6: Fix link training status detection in link up check Sasha Levin
2018-12-05 9:41 ` [PATCH AUTOSEL 4.14 21/69] objtool: Fix double-free in .cold detection error path Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 22/69] objtool: Fix segfault in .cold detection with -ffunction-sections Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 23/69] ARM: dts: at91: sama5d2: use the divided clock for SMC Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 24/69] Btrfs: send, fix infinite loop due to directory rename dependencies Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 25/69] RDMA/mlx5: Fix fence type for IB_WR_LOCAL_INV WR Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 26/69] RDMA/rdmavt: Fix rvt_create_ah function signature Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 27/69] uprobes: Fix handle_swbp() vs. unregister() + register() race once more Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 28/69] ASoC: omap-mcbsp: Fix latency value calculation for pm_qos Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 29/69] ASoC: omap-mcpdm: Add pm_qos handling to avoid under/overruns with CPU_IDLE Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 30/69] ASoC: omap-dmic: Add pm_qos handling to avoid overruns " Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 31/69] exportfs: do not read dentry after free Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 32/69] bpf: fix check of allowed specifiers in bpf_trace_printk Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 33/69] ipvs: call ip_vs_dst_notifier earlier than ipv6_dev_notf Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 39/69] drm/meson: add support for 1080p25 mode Sasha Levin
2018-12-05 9:42 ` Sasha Levin
2018-12-05 9:42 ` Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 40/69] netfilter: ipv6: Preserve link scope traffic original oif Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 41/69] IB/mlx5: Fix page fault handling for MW Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 42/69] KVM: x86: fix empty-body warnings Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 43/69] x86/kvm/vmx: fix old-style function declaration Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 44/69] net: thunderx: fix NULL pointer dereference in nic_remove Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 46/69] netfilter: nf_tables: deactivate expressions in rule replecement routine Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 47/69] cachefiles: Fix page leak in cachefiles_read_backing_file while vmscan is active Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 48/69] igb: fix uninitialized variables Sasha Levin
2018-12-05 9:42 ` Sasha Levin [this message]
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 50/69] rapidio/rionet: do not free skb before reading its length Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 51/69] net: hisilicon: remove unexpected free_netdev Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 52/69] s390/qeth: fix length check in SNMP processing Sasha Levin
[not found] ` <20181205094247.6556-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 53/69] drm/amdgpu: Add delay after enable RLC ucode Sasha Levin
2018-12-05 9:42 ` Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 54/69] drm/ast: fixed reading monitor EDID not stable issue Sasha Levin
2018-12-05 9:42 ` Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 55/69] xen: xlate_mmu: add missing header to fix 'W=1' warning Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 56/69] Revert "xen/balloon: Mark unallocated host memory as UNUSABLE" Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 57/69] pstore/ram: Correctly calculate usable PRZ bytes Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 58/69] fscache: fix race between enablement and dropping of object Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 59/69] fscache, cachefiles: remove redundant variable 'cache' Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 60/69] nvme: flush namespace scanning work just before removing namespaces Sasha Levin
2018-12-05 9:42 ` Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 61/69] ACPI/IORT: Fix iort_get_platform_device_domain() uninitialized pointer value Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 62/69] test_hexdump: use memcpy instead of strncpy Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 63/69] unifdef: " Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 64/69] ocfs2: fix deadlock caused by ocfs2_defrag_extent() Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 65/69] mm/page_alloc.c: fix calculation of pgdat->nr_zones Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 66/69] hfs: do not free node before using Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 67/69] hfsplus: " Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 68/69] debugobjects: avoid recursive calls with kmemleak Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 69/69] ocfs2: fix potential use after free Sasha Levin
-- strict thread matches above, loose matches on Subject: below --
2018-12-05 9:42 [AUTOSEL,4.14,34/69] USB: omap_udc: use devm_request_irq() Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 34/69] " Sasha Levin
2018-12-05 9:42 [AUTOSEL,4.14,35/69] USB: omap_udc: fix crashes on probe error and module removal Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 35/69] " Sasha Levin
2018-12-05 9:42 [AUTOSEL,4.14,36/69] USB: omap_udc: fix omap_udc_start() on 15xx machines Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 36/69] " Sasha Levin
2018-12-05 9:42 [AUTOSEL,4.14,37/69] USB: omap_udc: fix USB gadget functionality on Palm Tungsten E Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 37/69] " Sasha Levin
2018-12-05 9:42 [AUTOSEL,4.14,38/69] USB: omap_udc: fix rejection of out transfers when DMA is used Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 38/69] " Sasha Levin
2018-12-05 9:42 [AUTOSEL,4.14,45/69] usb: gadget: u_ether: fix unsafe list iteration Sasha Levin
2018-12-05 9:42 ` [PATCH AUTOSEL 4.14 45/69] " Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181205094247.6556-49-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jelsasser@appneta.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.