1. 25 4月, 2014 4 次提交
    • J
      Bluetooth: Fix triggering BR/EDR L2CAP Connect too early · 9eb1fbfa
      Johan Hedberg 提交于
      Commit 1c2e0041 introduced an event handler for the encryption key
      refresh complete event with the intent of fixing some LE/SMP cases.
      However, this event is shared with BR/EDR and there we actually want to
      act only on the auth_complete event (which comes after the key refresh).
      
      If we do not do this we may trigger an L2CAP Connect Request too early
      and cause the remote side to return a security block error.
      Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      Cc: stable@vger.kernel.org
      9eb1fbfa
    • M
      Revert "Bluetooth: Enable autosuspend for Intel Bluetooth device" · 3c49aa85
      Marcel Holtmann 提交于
      This reverts commit d2bee8fb.
      
      Enabling autosuspend for Intel Bluetooth devices has been shown to not
      work reliable. It does work for some people with certain combinations
      of USB host controllers, but for others it puts the device to sleep and
      it will not wake up for any event.
      
      These events can be important ones like HCI Inquiry Complete or HCI
      Connection Request. The events will arrive as soon as you poke the
      device with a new command, but that is not something we can do in
      these cases.
      
      Initially there were patches to the xHCI USB controller that fixed
      this for some people, but not for all. This could be well a problem
      somewhere in the USB subsystem or in the USB host controllers or
      just plain a hardware issue somewhere. At this moment we just do
      not know and the only safe action is to revert this patch.
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      Cc: Tedd Ho-Jeong An <tedd.an@intel.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: NGustavo Padovan <gustavo.padovan@collabora.co.uk>
      3c49aa85
    • H
      brcmfmac: Fix brcmf_chip_ai_coredisable not applying reset bits to BCMA_IOCTL · ffa216bb
      Hans de Goede 提交于
      brcmfmac has been broken on my cubietruck with a BCM43362:
      
      brcmfmac: brcmf_chip_recognition: found AXI chip: BCM43362, rev=1
      brcmfmac: brcmf_c_preinit_dcmds: Firmware version = wl0:
              Apr 22 2013 14:50:00 version 5.90.195.89.6 FWID 01-b30a427d
      
      since commit 53036261: "brcmfmac: update core reset and disable routines".
      
      The problem is that since this commit brcmf_chip_ai_resetcore no longer sets
      BCMA_IOCTL itself before bringing the core out of reset, instead relying on
      brcmf_chip_ai_coredisable to do so. But brcmf_chip_ai_coredisable is a nop
      of the chip is already in reset. This patch modifies brcmf_chip_ai_coredisable
      to always set BCMA_IOCTL even if the core is already in reset.
      
      This fixes brcmfmac hanging in firmware loading on my board.
      
      Cc: stable@vger.kernel.org # v3.14
      Signed-off-by: NHans de Goede <hdegoede@redhat.com>
      Acked-by: NArend van Spriel <arend@broadcom.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      ffa216bb
    • R
      ath9k: fix race in setting ATH_OP_INVALID · 8c7ae357
      Rajkumar Manoharan 提交于
      The commit "ath9k: move sc_flags to ath_common" moved setting
      ATH_OP_INVALID flag below ieee80211_register_hw. This is causing
      the flag never being cleared randomly as the drv_start is called
      prior to setting flag. Fix this by setting the flag prior to
      register_hw.
      Signed-off-by: NRajkumar Manoharan <rmanohar@qti.qualcomm.com>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      8c7ae357
  2. 23 4月, 2014 5 次提交
  3. 16 4月, 2014 2 次提交
  4. 15 4月, 2014 8 次提交
  5. 13 4月, 2014 21 次提交
    • E
      iwlwifi: mvm: BT Coex - fix Look Up Table · a6bc9280
      Emmanuel Grumbach 提交于
      A few entries were wrong and this caused throughput issues.
      
      Cc: <stable@vger.kernel.org> [3.13+]
      Fixes: dac94da8 ("iwlwifi: mvm: new BT Coex API")
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      a6bc9280
    • E
      iwlwifi: mvm: rs: clear per rate stats when aggregation changes · b804eeb6
      Eyal Shapira 提交于
      The per rate stats should be cleared when aggregation state changes
      to avoid making rate scale decisions based on throughput figures which
      were collected prior to the aggregation state change and are now stale.
      While at it make sure any clearing of the per rate stats will get logged.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      b804eeb6
    • E
      iwlwifi: mvm: avoid searching unnecessary columns · d8fff919
      Eyal Shapira 提交于
      Don't search columns which are unlikely to succeed as previous
      columns searched with less aggressive modulation failed.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      d8fff919
    • E
      iwlwifi: mvm: rs: fallback to legacy Tx columns · fd7dbee5
      Eyal Shapira 提交于
      Allow switching back to legacy Tx columns so we'll stop doing
      HT/VHT in case we're far from the AP. Stop active aggregation when
      making a deciding to stay in a legacy column.
      Despite having low legacy rates in the LQ table lower entries
      it doesn't help much in case we're doing aggregations as the
      aggregation was being transmitted in the initial rate of the table.
      
      This should help traffic stalls when far from the AP.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      fd7dbee5
    • E
      iwlwifi: mvm: rs: reinit rs if no tx for a long time · 87d5e415
      Eyal Shapira 提交于
      After being idle for a long time (>5sec) the rs statistics
      will be stale so we prefer to reset rs and start from legacy
      rates again. This gives better results when the attenuation
      increased signficantly (e.g. we got further from the AP) and
      after a while we start Tx
      Note that the first Tx after the idle period will still go out
      in the old modulation and rate but this seemed a simpler approach
      compared to adding a timer or modifying mac80211 for this.
      The negative impact is negligble as we'll recover quickly.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      87d5e415
    • E
      iwlwifi: mvm: rs: fix and cleanup rs_get_rate_action · e53839eb
      Eyal Shapira 提交于
      Change the down/upscale decision logic a bit to be based
      on different success ratio thresholds. This fixes the implementation
      compared to the rate scale algorithm which was planned to yield
      optimal results. Also fix a case where a lower rate wasn't explored
      despite being a potential for better throughput.
      While at it rewrite rs_get_rate_action to be more clear and clean.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      e53839eb
    • E
      iwlwifi: mvm: rs: use correct max expected throughput figures · 198266a3
      Eyal Shapira 提交于
      The selection of the max expected throughput for a column
      didn't take into account the maximal allowed rate for the current
      peer. This can cause unnecessary switches during the search cycle
      to columns which have no chance of beating the current throughput.
      Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      198266a3
    • E
      iwlwifi: add MODULE_FIRMWARE for 7265 · 08a732f4
      Emmanuel Grumbach 提交于
      It was missing.
      
      Cc: <stable@vger.kernel.org> [3.13+]
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      08a732f4
    • E
      iwlwifi: 7000: bump API to 9 · 43103185
      Emmanuel Grumbach 提交于
      This will allow to load the new firmware.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      43103185
    • O
      iwlwifi: add new 7265 HW IDs · 80f2679e
      Oren Givon 提交于
      Add 2 new HW IDs for the 7265 series.
      
      Cc: <stable@vger.kernel.org> [3.13+]
      Signed-off-by: NOren Givon <oren.givon@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      80f2679e
    • E
      iwlwifi: mvm: BT Coex - send the new LUT upon antenna coupling change · fff47eb0
      Emmanuel Grumbach 提交于
      I forgot to send the new Look Up Table to the firmware and
      I also forgot to free the command which is kzalloc'ed.
      This code is relevant for 7265 device only.
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      fff47eb0
    • E
      iwlwifi: mvm: rs: fix mimo delimiter in LQ cmd · d9088f60
      Eyal Shapira 提交于
      mimo_delim was always set to 0 instead of pointing to
      the first SISO entry after MIMO rates.
      This can cause keep transmitting in MIMO even when we shouldn't.
      For example when the peer is requesting static SMPS.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Signed-off-by: NEyal Shapira <eyalx.shapira@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      d9088f60
    • J
      iwlwifi: mvm: delay enabling smart FIFO until after beacon RX · 0229cdaf
      Johannes Berg 提交于
      If we have no beacon data before association, delay smart FIFO
      enablement until after we have this data.
      
      Not doing so can cause association failures in extremely silent
      environments (usually only a shielded box/room) as beacon RX is
      not sent to the host immediately, and then the association time
      event ends without the host receiving any beacon even though it
      was on the air - it's just stuck on the FIFO.
      
      Cc: <stable@vger.kernel.org> [3.14]
      Fixes: 1f3b0ff8 ("iwlwifi: mvm: Add Smart FIFO support")
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      0229cdaf
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 321d03c8
      Linus Torvalds 提交于
      Pull misc kbuild changes from Michal Marek:
       "Here is the non-critical part of kbuild:
         - One bogus coccinelle check removed, one check fixed not to suggest
           the obsolete PTR_RET macro
         - scripts/tags.sh does not index the generated *.mod.c files
         - new objdiff tool to list differences between two versions of an
           object file
         - A fix for scripts/bootgraph.pl"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        scripts/coccinelle: Use PTR_ERR_OR_ZERO
        scripts/bootgraph.pl: Add graphic header
        scripts: objdiff: detect object code changes between two commits
        Coccicheck: Remove memcpy to struct assignment test
        scripts/tags.sh: Ignore *.mod.c
      321d03c8
    • M
      sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue · fd1232b2
      Mikulas Patocka 提交于
      This patch fixes I/O errors with the sym53c8xx_2 driver when the disk
      returns QUEUE FULL status.
      
      When the controller encounters an error (including QUEUE FULL or BUSY
      status), it aborts all not yet submitted requests in the function
      sym_dequeue_from_squeue.
      
      This function aborts them with DID_SOFT_ERROR.
      
      If the disk has full tag queue, the request that caused the overflow is
      aborted with QUEUE FULL status (and the scsi midlayer properly retries
      it until it is accepted by the disk), but the sym53c8xx_2 driver aborts
      the following requests with DID_SOFT_ERROR --- for them, the midlayer
      does just a few retries and then signals the error up to sd.
      
      The result is that disk returning QUEUE FULL causes request failures.
      
      The error was reproduced on 53c895 with COMPAQ BD03685A24 disk
      (rebranded ST336607LC) with command queue 48 or 64 tags.  The disk has
      64 tags, but under some access patterns it return QUEUE FULL when there
      are less than 64 pending tags.  The SCSI specification allows returning
      QUEUE FULL anytime and it is up to the host to retry.
      Signed-off-by: NMikulas Patocka <mpatocka@redhat.com>
      Cc: Matthew Wilcox <matthew@wil.cx>
      Cc: James Bottomley <JBottomley@Parallels.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fd1232b2
    • P
      powerpc: Don't try to set LPCR unless we're in hypervisor mode · 18aa0da3
      Paul Mackerras 提交于
      Commit 8f619b54 ("powerpc/ppc64: Do not turn AIL (reloc-on
      interrupts) too early") added code to set the AIL bit in the LPCR
      without checking whether the kernel is running in hypervisor mode.  The
      result is that when the kernel is running as a guest (i.e., under
      PowerKVM or PowerVM), the processor takes a privileged instruction
      interrupt at that point, causing a panic.  The visible result is that
      the kernel hangs after printing "returning from prom_init".
      
      This fixes it by checking for hypervisor mode being available before
      setting LPCR.  If we are not in hypervisor mode, we enable relocation-on
      interrupts later in pSeries_setup_arch using the H_SET_MODE hcall.
      Signed-off-by: NPaul Mackerras <paulus@samba.org>
      Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      18aa0da3
    • D
      futex: update documentation for ordering guarantees · d7e8af1a
      Davidlohr Bueso 提交于
      Commits 11d4616b ("futex: revert back to the explicit waiter
      counting code") and 69cd9eba ("futex: avoid race between requeue and
      wake") changed some of the finer details of how we think about futexes.
      One was a late fix and the other a consequence of overlooking the whole
      requeuing logic.
      
      The first change caused our documentation to be incorrect, and the
      second made us aware that we need to explicitly add more details to it.
      Signed-off-by: NDavidlohr Bueso <davidlohr@hp.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d7e8af1a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 454fd351
      Linus Torvalds 提交于
      Pull yet more networking updates from David Miller:
      
       1) Various fixes to the new Redpine Signals wireless driver, from
          Fariya Fatima.
      
       2) L2TP PPP connect code takes PMTU from the wrong socket, fix from
          Dmitry Petukhov.
      
       3) UFO and TSO packets differ in whether they include the protocol
          header in gso_size, account for that in skb_gso_transport_seglen().
         From Florian Westphal.
      
       4) If VLAN untagging fails, we double free the SKB in the bridging
          output path.  From Toshiaki Makita.
      
       5) Several call sites of sk->sk_data_ready() were referencing an SKB
          just added to the socket receive queue in order to calculate the
          second argument via skb->len.  This is dangerous because the moment
          the skb is added to the receive queue it can be consumed in another
          context and freed up.
      
          It turns out also that none of the sk->sk_data_ready()
          implementations even care about this second argument.
      
          So just kill it off and thus fix all these use-after-free bugs as a
          side effect.
      
       6) Fix inverted test in tcp_v6_send_response(), from Lorenzo Colitti.
      
       7) pktgen needs to do locking properly for LLTX devices, from Daniel
          Borkmann.
      
       8) xen-netfront driver initializes TX array entries in RX loop :-) From
          Vincenzo Maffione.
      
       9) After refactoring, some tunnel drivers allow a tunnel to be
          configured on top itself.  Fix from Nicolas Dichtel.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
        vti: don't allow to add the same tunnel twice
        gre: don't allow to add the same tunnel twice
        drivers: net: xen-netfront: fix array initialization bug
        pktgen: be friendly to LLTX devices
        r8152: check RTL8152_UNPLUG
        net: sun4i-emac: add promiscuous support
        net/apne: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
        net: ipv6: Fix oif in TCP SYN+ACK route lookup.
        drivers: net: cpsw: enable interrupts after napi enable and clearing previous interrupts
        drivers: net: cpsw: discard all packets received when interface is down
        net: Fix use after free by removing length arg from sk_data_ready callbacks.
        Drivers: net: hyperv: Address UDP checksum issues
        Drivers: net: hyperv: Negotiate suitable ndis version for offload support
        Drivers: net: hyperv: Allocate memory for all possible per-pecket information
        bridge: Fix double free and memory leak around br_allowed_ingress
        bonding: Remove debug_fs files when module init fails
        i40evf: program RSS LUT correctly
        i40evf: remove open-coded skb_cow_head
        ixgb: remove open-coded skb_cow_head
        igbvf: remove open-coded skb_cow_head
        ...
      454fd351
    • L
      Merge tag 'blackfin-for-linus' of... · fd18f00d
      Linus Torvalds 提交于
      Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
      
      Pull blackfin updates from Steven Miao:
       "Code cleanup, some previously ignored patches, and bug fixes"
      
      * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
        blackfin: cleanup board files
        bf609: clock: drop unused clock bit set/clear functions
        Blackfin: bf537: rename "CONFIG_ADT75"
        Blackfin: bf537: rename "CONFIG_AD7314"
        Blackfin: bf537: rename ad2s120x ->ad2s1200
        blackfin: bf537: fix typo "CONFIG_SND_SOC_ADV80X_MODULE"
        blackfin: dma: current count mmr is read only
        bfin_crc: Move architecture independant crc header file out of the blackfin folder.
        bf54x: drop unuesd HOST status,control,timeout registers bit define macros
        blackfin: portmux: cleanup head file
        Blackfin: remove "config IP_CHECKSUM_L1"
        blackfin: Remove GENERIC_GPIO config option again
        blackfin:Use generic /proc/interrupts implementation
        blackfin: bf60x: fix typo "CONFIG_PM_BFIN_WAKE_PA15_POL"
      fd18f00d
    • L
      Merge tag 'remoteproc-3.15-cleanups' of... · de0c9cf9
      Linus Torvalds 提交于
      Merge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc
      
      Pull remoteproc cleanups from Ohad Ben-Cohen:
       "Several remoteproc cleanup patches coming from Jingoo Han, Julia
        Lawall and Uwe Kleine-König"
      
      * tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc/ste_modem: staticize local symbols
        remoteproc/davinci: simplify use of devm_ioremap_resource
        remoteproc/davinci: drop needless devm_clk_put
      de0c9cf9
    • L
      Merge tag 'llvmlinux-for-v3.15' of git://git.linuxfoundation.org/llvmlinux/kernel · 09c9b61d
      Linus Torvalds 提交于
      Pull llvm patches from Behan Webster:
       "These are some initial updates to support compiling the kernel with
        clang.
      
        These patches have been through the proper reviews to the best of my
        ability, and have been soaking in linux-next for a few weeks.  These
        patches by themselves still do not completely allow clang to be used
        with the kernel code, but lay the foundation for other patches which
        are still under review.
      
        Several other of the LLVMLinux patches have been already added via
        maintainer trees"
      
      * tag 'llvmlinux-for-v3.15' of git://git.linuxfoundation.org/llvmlinux/kernel:
        x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id"
        x86 kbuild: LLVMLinux: More cc-options added for clang
        x86, acpi: LLVMLinux: Remove nested functions from Thinkpad ACPI
        LLVMLinux: Add support for clang to compiler.h and new compiler-clang.h
        LLVMLinux: Remove warning about returning an uninitialized variable
        kbuild: LLVMLinux: Fix LINUX_COMPILER definition script for compilation with clang
        Documentation: LLVMLinux: Update Documentation/dontdiff
        kbuild: LLVMLinux: Adapt warnings for compilation with clang
        kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang
      09c9b61d