1. 13 Dec, 2015 15 commits
    • Raanan Avargil's avatar
      e1000e: Increase timeout of polling bit RSPCIPHY · d17c7868
      Raanan Avargil authored
      Due to timing changes to the ME firmware in Skylake, this timer
      needs to be increased to 300ms.
      Signed-off-by: default avatarRaanan Avargil <raanan.avargil@intel.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      d17c7868
    • Dmitry Fleytman's avatar
      e1000e: fix division by zero on jumbo MTUs · b77ac46b
      Dmitry Fleytman authored
      This patch fixes possible division by zero in receive
      interrupt handler when working without adaptive interrupt
      moderation.
      
      The adaptive interrupt moderation mechanism is typically
      disabled on jumbo MTUs.
      Signed-off-by: default avatarDmitry Fleytman <dmitry@daynix.com>
      Signed-off-by: default avatarLeonid Bloch <leonid@daynix.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      b77ac46b
    • Janusz Wolak's avatar
    • Jean Sacren's avatar
      e1000: get rid of duplicate exit path · c619581a
      Jean Sacren authored
      By using goto statement, we can achieve sharing the same exit path so
      that code duplication could be minimized.
      Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      c619581a
    • Jean Sacren's avatar
      e1000: fix kernel-doc argument being missing · f03fed66
      Jean Sacren authored
      Due to historical reason, 'phy_data' has never been included in the
      kernel doc. Fix it so that the requirement could be fulfilled.
      Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      f03fed66
    • Jean Sacren's avatar
      e1000e: clean up the local variable · 5a5e889c
      Jean Sacren authored
      The local variable 'ret' doesn't serve much purpose so we might as well
      clean it up.
      Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      5a5e889c
    • Jean Sacren's avatar
      e1000: fix a typo in the comment · b6fad9f9
      Jean Sacren authored
      Use 'That' to replace 'The' so that the comment would make sense.
      Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      b6fad9f9
    • Jean Sacren's avatar
      e1000: clean up the checking logic · 4e01f3a8
      Jean Sacren authored
      The checking logic needed some clean-up work, so we rewrite it by
      checking for break first. With that change in place, we can even move
      the second check for goto statement outside of the loop.
      
      As this is merely a cleanup, no functional change is involved. The
      questionable 'tmp != 0xFF' is intentionally left alone.
      
      Mark Rustad and Alexander Duyck contributed to this patch.
      
      CC: Mark Rustad <mark.d.rustad@intel.com>
      CC: Alex Duyck <aduyck@mirantis.com>
      Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      4e01f3a8
    • Todd Fujinaka's avatar
      igb: use the correct i210 register for EEMNGCTL · 08c99129
      Todd Fujinaka authored
      The i210 has two EEPROM access registers that are located in
      non-standard offsets: EEARBC and EEMNGCTL. EEARBC was fixed previously
      and EEMNGCTL should also be corrected.
      Reported-by: default avatarRoman Hodek <roman.aud@siemens.com>
      Signed-off-by: default avatarTodd Fujinaka <todd.fujinaka@intel.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      08c99129
    • Janusz Wolak's avatar
    • Jarod Wilson's avatar
      igb: don't unmap NULL hw_addr · 73bf8048
      Jarod Wilson authored
      I've got a startech thunderbolt dock someone loaned me, which among other
      things, has the following device in it:
      
      08:00.0 Ethernet controller: Intel Corporation I210 Gigabit Network Connection (rev 03)
      
      This hotplugs just fine (kernel 4.2.0 plus a patch or two here):
      
      [  863.020315] igb: Intel(R) Gigabit Ethernet Network Driver - version 5.2.18-k
      [  863.020316] igb: Copyright (c) 2007-2014 Intel Corporation.
      [  863.028657] igb 0000:08:00.0: enabling device (0000 -> 0002)
      [  863.062089] igb 0000:08:00.0: added PHC on eth0
      [  863.062090] igb 0000:08:00.0: Intel(R) Gigabit Ethernet Network Connection
      [  863.062091] igb 0000:08:00.0: eth0: (PCIe:2.5Gb/s:Width x1) e8:ea:6a:00:1b:2a
      [  863.062194] igb 0000:08:00.0: eth0: PBA No: 000200-000
      [  863.062196] igb 0000:08:00.0: Using MSI-X interrupts. 4 rx queue(s), 4 tx queue(s)
      [  863.064889] igb 0000:08:00.0 enp8s0: renamed from eth0
      
      But disconnecting it is another story:
      
      [ 1002.807932] igb 0000:08:00.0: removed PHC on enp8s0
      [ 1002.807944] igb 0000:08:00.0 enp8s0: PCIe link lost, device now detached
      [ 1003.341141] ------------[ cut here ]------------
      [ 1003.341148] WARNING: CPU: 0 PID: 199 at lib/iomap.c:43 bad_io_access+0x38/0x40()
      [ 1003.341149] Bad IO access at port 0x0 ()
      [ 1003.342767] Modules linked in: snd_usb_audio snd_usbmidi_lib snd_rawmidi igb dca firewire_ohci firewire_core crc_itu_t rfcomm ctr ccm arc4 iwlmvm mac80211 fuse xt_CHECKSUM ipt_MASQUERADE
      nf_nat_masquerade_ipv4 tun ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 ipt_REJECT nf_reject_ipv4 xt_conntrack ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_nat
      nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_security ip6table_raw ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat
      nf_conntrack iptable_mangle iptable_security iptable_raw iptable_filter bnep dm_mirror dm_region_hash dm_log dm_mod coretemp x86_pkg_temp_thermal intel_powerclamp kvm_intel snd_hda_codec_hdmi kvm
      crct10dif_pclmul crc32_pclmul ghash_clmulni_intel drbg
      [ 1003.342793]  ansi_cprng aesni_intel hp_wmi aes_x86_64 iTCO_wdt lrw iTCO_vendor_support ppdev gf128mul sparse_keymap glue_helper ablk_helper cryptd snd_hda_codec_realtek snd_hda_codec_generic
      microcode snd_hda_intel uvcvideo iwlwifi snd_hda_codec videobuf2_vmalloc videobuf2_memops snd_hda_core videobuf2_core snd_hwdep btusb v4l2_common btrtl snd_seq btbcm btintel videodev cfg80211
      snd_seq_device rtsx_pci_ms bluetooth pcspkr input_leds i2c_i801 media parport_pc memstick rfkill sg lpc_ich snd_pcm 8250_fintek parport joydev snd_timer snd soundcore hp_accel ie31200_edac
      mei_me lis3lv02d edac_core input_polldev mei hp_wireless shpchp tpm_infineon sch_fq_codel nfsd auth_rpcgss nfs_acl lockd grace sunrpc ip_tables autofs4 xfs libcrc32c sd_mod sr_mod cdrom
      rtsx_pci_sdmmc mmc_core crc32c_intel serio_raw rtsx_pci
      [ 1003.342822]  nouveau ahci libahci mxm_wmi e1000e xhci_pci hwmon ptp drm_kms_helper pps_core xhci_hcd ttm wmi video ipv6
      [ 1003.342839] CPU: 0 PID: 199 Comm: kworker/0:2 Not tainted 4.2.0-2.el7_UNSUPPORTED.x86_64 #1
      [ 1003.342840] Hardware name: Hewlett-Packard HP ZBook 15 G2/2253, BIOS M70 Ver. 01.07 02/26/2015
      [ 1003.342843] Workqueue: pciehp-3 pciehp_power_thread
      [ 1003.342844]  ffffffff81a90655 ffff8804866d3b48 ffffffff8164763a 0000000000000000
      [ 1003.342846]  ffff8804866d3b98 ffff8804866d3b88 ffffffff8107134a ffff8804866d3b88
      [ 1003.342847]  ffff880486f46000 ffff88046c8a8000 ffff880486f46840 ffff88046c8a8098
      [ 1003.342848] Call Trace:
      [ 1003.342852]  [<ffffffff8164763a>] dump_stack+0x45/0x57
      [ 1003.342855]  [<ffffffff8107134a>] warn_slowpath_common+0x8a/0xc0
      [ 1003.342857]  [<ffffffff810713c6>] warn_slowpath_fmt+0x46/0x50
      [ 1003.342859]  [<ffffffff8133719e>] ? pci_disable_msix+0x3e/0x50
      [ 1003.342860]  [<ffffffff812f6328>] bad_io_access+0x38/0x40
      [ 1003.342861]  [<ffffffff812f6567>] pci_iounmap+0x27/0x40
      [ 1003.342865]  [<ffffffffa0b728d7>] igb_remove+0xc7/0x160 [igb]
      [ 1003.342867]  [<ffffffff8132189f>] pci_device_remove+0x3f/0xc0
      [ 1003.342869]  [<ffffffff81433426>] __device_release_driver+0x96/0x130
      [ 1003.342870]  [<ffffffff814334e3>] device_release_driver+0x23/0x30
      [ 1003.342871]  [<ffffffff8131b404>] pci_stop_bus_device+0x94/0xa0
      [ 1003.342872]  [<ffffffff8131b3ad>] pci_stop_bus_device+0x3d/0xa0
      [ 1003.342873]  [<ffffffff8131b3ad>] pci_stop_bus_device+0x3d/0xa0
      [ 1003.342874]  [<ffffffff8131b516>] pci_stop_and_remove_bus_device+0x16/0x30
      [ 1003.342876]  [<ffffffff81333f5b>] pciehp_unconfigure_device+0x9b/0x180
      [ 1003.342877]  [<ffffffff81333a73>] pciehp_disable_slot+0x43/0xb0
      [ 1003.342878]  [<ffffffff81333b6d>] pciehp_power_thread+0x8d/0xb0
      [ 1003.342885]  [<ffffffff810881b2>] process_one_work+0x152/0x3d0
      [ 1003.342886]  [<ffffffff8108854a>] worker_thread+0x11a/0x460
      [ 1003.342887]  [<ffffffff81088430>] ? process_one_work+0x3d0/0x3d0
      [ 1003.342890]  [<ffffffff8108ddd9>] kthread+0xc9/0xe0
      [ 1003.342891]  [<ffffffff8108dd10>] ? kthread_create_on_node+0x180/0x180
      [ 1003.342893]  [<ffffffff8164e29f>] ret_from_fork+0x3f/0x70
      [ 1003.342894]  [<ffffffff8108dd10>] ? kthread_create_on_node+0x180/0x180
      [ 1003.342895] ---[ end trace 65a77e06d5aa9358 ]---
      
      Upon looking at the igb driver, I see that igb_rd32() attempted to read from
      hw_addr and failed, so it set hw->hw_addr to NULL and spit out the message
      in the log output above, "PCIe link lost, device now detached".
      
      Well, now that hw_addr is NULL, the attempt to call pci_iounmap is obviously
      not going to go well. As suggested by Mark Rustad, do something similar to
      what ixgbe does, and save a copy of hw_addr as adapter->io_addr, so we can
      still call pci_iounmap on it on teardown. Additionally, for consistency,
      make the pci_iomap call assignment directly to io_addr, so map and unmap
      match.
      Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      73bf8048
    • Dmitriy Vyukov's avatar
      e1000: fix data race between tx_ring->next_to_clean · 9eab46b7
      Dmitriy Vyukov authored
      e1000_clean_tx_irq cleans buffers and sets tx_ring->next_to_clean,
      then e1000_xmit_frame reuses the cleaned buffers. But there are no
      memory barriers when buffers gets recycled, so the recycled buffers
      can be corrupted.
      
      Use smp_store_release to update tx_ring->next_to_clean and
      smp_load_acquire to read tx_ring->next_to_clean to properly
      hand off buffers from e1000_clean_tx_irq to e1000_xmit_frame.
      
      The data race was found with KernelThreadSanitizer (KTSAN).
      Signed-off-by: default avatarDmitry Vyukov <dvyukov@google.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      9eab46b7
    • Todd Fujinaka's avatar
      igb: add 88E1543 initialization code · 18f7ce54
      Todd Fujinaka authored
      Initialize the 88E1543 PHY.
      Signed-off-by: default avatarTodd Fujinaka <todd.fujinaka@intel.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      18f7ce54
    • Joern Engel's avatar
      e1000: make eeprom read/write scheduler friendly · e09b8906
      Joern Engel authored
      Code was responsible for ~150ms scheduler latencies.
      Signed-off-by: default avatarJoern Engel <joern@logfs.org>
      Signed-off-by: default avatarSpencer Baugh <sbaugh@catern.com>
      Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      e09b8906
    • David S. Miller's avatar
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 1d72135d
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      10GbE Intel Wired LAN Driver Updates 2015-12-12
      
      This series contains updates to ixgbe only.
      
      Alex Duyck provides almost off of the changes in this series.  First, add a
      check to make sure mac_table was actually allocated and is not NULL to
      ensure we do not get a NULL pointer dereference further down the line.
      Fixed SR-IOV VLAN pool configuration since the code for checking the PF bit
      in ixgbe_set_vf_vlan_msg() was using the wrong offset.  Cleanup/simplify
      the logic for setting the VFTA register by removing the number of
      conditional checks needed.  Fixed a number of issues within the VLVF and
      VLFB configuration by simplifying the code.  Added support for bypassing
      the VLVF entry creation when the PF is adding a new VLAN.  Reduced the
      complexity of the search function used for finding a VLVF entry associated
      with a given VLAN ID.  Added support for VLAN promiscuous with SR-IOV
      enabled by setting all the bits in the VFTA and all of the VLVF bits
      associated with teh pool belonging to the PF, in addition to cleaning up
      those same bits in the event of promiscuous mode being disabled.  Fixed
      and issue where we ran the risk of leaking an address into pool 0 which
      really belongs to VF 0 when SR-IOV is enabled.
      
      Emil fixes an issue with some X550 devices which can connect at 2.5Gbps,
      but only with certain link partners during fail-over, so to avoid
      confusion, we do not report it as supported.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1d72135d
  2. 12 Dec, 2015 25 commits