1. 04 Jan, 2012 8 commits
  2. 03 Jan, 2012 1 commit
    • Sarah Sharp's avatar
      xhci: Better debugging for critical host errors. · 9258c0b2
      Sarah Sharp authored
      When a host controller gives a bad event TRB, we should print out the
      contents of the TRB as a warning so that users don't have to recompile
      their kernel to get information about what went wrong.  Also, print out
      the event ring if they have xHCI debugging turned on, since previous
      events can often explain what happened before the bad TRB occurred.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      9258c0b2
  3. 23 Dec, 2011 1 commit
    • Sarah Sharp's avatar
      xhci: Be less verbose during URB cancellation. · 79688acf
      Sarah Sharp authored
      With devices that can need up to 128 segments (with 64 TRBs per
      segment), we can't afford to print out the entire endpoint ring every
      time an URB is canceled.  Instead, print the offset of the TRB, along
      with device pathname and endpoint number.
      
      Only print DMA addresses, since virtual addresses of internal structures
      are not useful.  Change the cancellation code to be more clear about
      what steps of the cancellation it is in the process of doing (queueing
      the request, handling the stop endpoint command, turning the TDs into
      no-ops, or moving the dequeue pointers).
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      79688acf
  4. 22 Dec, 2011 12 commits
    • Sarah Sharp's avatar
      xhci: Remove debugging about ring structure allocation. · 1ba6108f
      Sarah Sharp authored
      Debuggers only really care what the xHCI driver sets the ring dequeue
      pointer to, so make the driver stop babbling about the memory addresses
      of internal ring structures.  This makes wading through the output of
      allocating and freeing 256 stream rings much easier by reducing the
      number of output lines per ring from 9 to 1.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      1ba6108f
    • Sarah Sharp's avatar
      xhci: Remove debugging about toggling cycle bits. · b0a465d8
      Sarah Sharp authored
      The code for toggling the cycle bits when the ring wraps around has
      worked for years.  The print statement alone is not enough to indicate
      there's something wrong with that code.  Now that full transfer tracing
      has been ripped out, the print statement or lack thereof won't help
      without context of where the enqueue pointer is.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      b0a465d8
    • Sarah Sharp's avatar
      xhci: Remove debugging for individual transfers. · 3d616f5a
      Sarah Sharp authored
      Users can trace the submission of URBs through USBmon, so it makes no
      sense to have duplicate debugging in the xHCI driver.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      3d616f5a
    • Sarah Sharp's avatar
      xhci: Remove useless sg-list debugging. · c4255f67
      Sarah Sharp authored
      Remove verbose debugging about scatter-gather lists, as we haven't had
      an issue with scatter gather list math for about a year now.  The
      debugging didn't help before, and just clutters up the log file when
      trying to debug other issues.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      c4255f67
    • Sarah Sharp's avatar
      xhci: Remove warnings about MSI and MSI-X capabilities. · 3b9783b2
      Sarah Sharp authored
      xHCI host controllers may not be capable of MSI, but they should be able
      to be used in legacy PCI interrupt mode.  Similarly, some xHCI host
      controllers will have MSI support but not MSI-X support.  Lower the
      dmesg log level from an error to debug.  The message won't appear unless
      CONFIG_USB_XHCI_HCD_DEBUGGING is turned on.
      
      If we need to find out whether the device can support MSI or MSI-X and
      it's not being enabled by the driver, it's easy to ask the user to run
      lspci.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      3b9783b2
    • Sarah Sharp's avatar
      xhci: Remove scary warnings about transfer issues. · 2a9227a5
      Sarah Sharp authored
      Getting a short packet or a babble error is usually a recoverable error,
      so stop scaring users with warnings in dmesg when xHCI debugging is turned
      off.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      2a9227a5
    • Sarah Sharp's avatar
      Trivial: xhci: Fix copy-paste error. · 05103114
      Sarah Sharp authored
      The xHCI driver will create an xhci_hcd structure, not an ehci_hci
      structure.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      05103114
    • Sarah Sharp's avatar
      usbfs: Fix oops related to user namespace conversion. · 1b41c832
      Sarah Sharp authored
      When running the Point Grey "flycap" program for their USB 3.0 camera
      (which was running as a USB 2.0 device for some reason), I trigger this
      oops whenever I try to open a video stream:
      
      Dec 15 16:48:34 puck kernel: [ 1798.715559] BUG: unable to handle kernel NULL pointer dereference at           (null)
      Dec 15 16:48:34 puck kernel: [ 1798.719153] IP: [<ffffffff8147841e>] free_async+0x1e/0x70
      Dec 15 16:48:34 puck kernel: [ 1798.720991] PGD 6f833067 PUD 6fc56067 PMD 0
      Dec 15 16:48:34 puck kernel: [ 1798.722815] Oops: 0002 [#1] SMP
      Dec 15 16:48:34 puck kernel: [ 1798.724627] CPU 0
      Dec 15 16:48:34 puck kernel: [ 1798.724636] Modules linked in: ecryptfs encrypted_keys sha1_generic trusted binfmt_misc sha256_generic aesni_intel cryptd aes_x86_64 aes_generic parport_pc dm_crypt ppdev joydev snd_hda_codec_hdmi snd_hda_codec_conexant arc4 iwlwifi snd_hda_intel snd_hda_codec snd_hwdep snd_pcm thinkpad_acpi mac80211 snd_seq_midi snd_rawmidi snd_seq_midi_event snd_seq snd_timer btusb uvcvideo snd_seq_device bluetooth videodev psmouse snd v4l2_compat_ioctl32 serio_raw tpm_tis cfg80211 tpm tpm_bios nvram soundcore snd_page_alloc lp parport i915 xhci_hcd ahci libahci drm_kms_helper drm sdhci_pci sdhci e1000e i2c_algo_bit video
      Dec 15 16:48:34 puck kernel: [ 1798.734212]
      Dec 15 16:48:34 puck kernel: [ 1798.736162] Pid: 2713, comm: FlyCap2 Not tainted 3.2.0-rc5+ #28 LENOVO 4286CTO/4286CTO
      Dec 15 16:48:34 puck kernel: [ 1798.738148] RIP: 0010:[<ffffffff8147841e>]  [<ffffffff8147841e>] free_async+0x1e/0x70
      Dec 15 16:48:34 puck kernel: [ 1798.740134] RSP: 0018:ffff88005715fd78  EFLAGS: 00010296
      Dec 15 16:48:34 puck kernel: [ 1798.742118] RAX: 00000000fffffff4 RBX: ffff88006fe8f900 RCX: 0000000000004118
      Dec 15 16:48:34 puck kernel: [ 1798.744116] RDX: 0000000001000000 RSI: 0000000000016390 RDI: 0000000000000000
      Dec 15 16:48:34 puck kernel: [ 1798.746087] RBP: ffff88005715fd88 R08: 0000000000000000 R09: ffffffff8146f22e
      Dec 15 16:48:34 puck kernel: [ 1798.748018] R10: ffff88006e520ac0 R11: 0000000000000001 R12: ffff88005715fe28
      Dec 15 16:48:34 puck kernel: [ 1798.749916] R13: ffff88005d31df00 R14: ffff88006fe8f900 R15: 00007f688c995cb8
      Dec 15 16:48:34 puck kernel: [ 1798.751785] FS:  00007f68a366da40(0000) GS:ffff880100200000(0000) knlGS:0000000000000000
      Dec 15 16:48:34 puck kernel: [ 1798.753659] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      Dec 15 16:48:34 puck kernel: [ 1798.755509] CR2: 0000000000000000 CR3: 00000000706bb000 CR4: 00000000000406f0
      Dec 15 16:48:34 puck kernel: [ 1798.757334] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      Dec 15 16:48:34 puck kernel: [ 1798.759124] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      Dec 15 16:48:34 puck kernel: [ 1798.760871] Process FlyCap2 (pid: 2713, threadinfo ffff88005715e000, task ffff88006c675b80)
      Dec 15 16:48:34 puck kernel: [ 1798.762605] Stack:
      Dec 15 16:48:34 puck kernel: [ 1798.764297]  ffff88005715fe28 0000000000000000 ffff88005715fe08 ffffffff81479058
      Dec 15 16:48:34 puck kernel: [ 1798.766020]  0000000000000000 ffffea0000004000 ffff880000004118 0000000000000000
      Dec 15 16:48:34 puck kernel: [ 1798.767750]  ffff880000000001 ffff88006e520ac0 fffffff46fd81180 0000000000000000
      Dec 15 16:48:34 puck kernel: [ 1798.769472] Call Trace:
      Dec 15 16:48:34 puck kernel: [ 1798.771147]  [<ffffffff81479058>] proc_do_submiturb+0x778/0xa00
      Dec 15 16:48:34 puck kernel: [ 1798.772798]  [<ffffffff8147a5fd>] usbdev_do_ioctl+0x24d/0x1200
      Dec 15 16:48:34 puck kernel: [ 1798.774410]  [<ffffffff8147b5de>] usbdev_ioctl+0xe/0x20
      Dec 15 16:48:34 puck kernel: [ 1798.775975]  [<ffffffff81189259>] do_vfs_ioctl+0x99/0x600
      Dec 15 16:48:34 puck kernel: [ 1798.777534]  [<ffffffff81189851>] sys_ioctl+0x91/0xa0
      Dec 15 16:48:34 puck kernel: [ 1798.779088]  [<ffffffff816247c2>] system_call_fastpath+0x16/0x1b
      ec 15 16:48:34 puck kernel: [ 1798.780634] Code: 51 ff ff ff e9 29 ff ff ff 0f 1f 40 00 55 48 89 e5 53 48 83 ec 08 66 66 66 66 90 48 89 fb 48 8b 7f 18 e8 a6 ea c0 ff 4
      8 8b 7b 20 <f0> ff 0f 0f 94 c0 84 c0 74 05 e8 d3 99 c1 ff 48 8b 43 40 48 8b
      Dec 15 16:48:34 puck kernel: [ 1798.783970] RIP  [<ffffffff8147841e>] free_async+0x1e/0x70
      Dec 15 16:48:34 puck kernel: [ 1798.785630]  RSP <ffff88005715fd78>
      Dec 15 16:48:34 puck kernel: [ 1798.787274] CR2: 0000000000000000
      Dec 15 16:48:34 puck kernel: [ 1798.794728] ---[ end trace 52894d3355f88d19 ]---
      
      markup_oops.pl says the oops is in put_cred:
      
       ffffffff81478401:      48 89 e5                mov    %rsp,%rbp
       ffffffff81478404:      53                      push   %rbx
       ffffffff81478405:      48 83 ec 08             sub    $0x8,%rsp
       ffffffff81478409:      e8 f2 c0 1a 00          callq  ffffffff81624500 <mcount>
       ffffffff8147840e:      48 89 fb                mov    %rdi,%rbx   |  %ebx => ffff88006fe8f900
              put_pid(as->pid);
       ffffffff81478411:      48 8b 7f 18             mov    0x18(%rdi),%rdi
       ffffffff81478415:      e8 a6 ea c0 ff          callq  ffffffff81086ec0 <put_pid>
              put_cred(as->cred);
       ffffffff8147841a:      48 8b 7b 20             mov    0x20(%rbx),%rdi |  %edi => 0  %ebx = ffff88006fe8f900
        */
       static inline int atomic_dec_and_test(atomic_t *v)
       {
              unsigned char c;
      
              asm volatile(LOCK_PREFIX "decl %0; sete %1"
      *ffffffff8147841e:      f0 ff 0f                lock decl (%rdi)   |  %edi = 0 <--- faulting instruction
       ffffffff81478421:      0f 94 c0                sete   %al
       static inline void put_cred(const struct cred *_cred)
       {
              struct cred *cred = (struct cred *) _cred;
      
              validate_creds(cred);
              if (atomic_dec_and_test(&(cred)->usage))
       ffffffff81478424:      84 c0                   test   %al,%al
       ffffffff81478426:      74 05                   je     ffffffff8147842d <free_async+0x2d>
                      __put_cred(cred);
       ffffffff81478428:      e8 d3 99 c1 ff          callq  ffffffff81091e00 <__put_cred>
              kfree(as->urb->transfer_buffer);
       ffffffff8147842d:      48 8b 43 40             mov    0x40(%rbx),%rax
       ffffffff81478431:      48 8b 78 68             mov    0x68(%rax),%rdi
       ffffffff81478435:      e8 a6 e1 ce ff          callq  ffffffff811665e0 <kfree>
              kfree(as->urb->setup_packet);
       ffffffff8147843a:      48 8b 43 40             mov    0x40(%rbx),%rax
       ffffffff8147843e:      48 8b b8 90 00 00 00    mov    0x90(%rax),%rdi
       ffffffff81478445:      e8 96 e1 ce ff          callq  ffffffff811665e0 <kfree>
              usb_free_urb(as->urb);
       ffffffff8147844a:      48 8b 7b 40             mov    0x40(%rbx),%rdi
       ffffffff8147844e:      e8 0d 6b ff ff          callq  ffffffff8146ef60 <usb_free_urb>
      
      This bug seems to have been introduced by commit
      d178bc3a "user namespace: usb: make usb
      urbs user namespace aware (v2)"
      
      I'm not sure if this is right fix, but it does stop the oops.
      
      Unfortunately, the Point Grey software still refuses to work, but it's a
      closed source app, so I can't fix it.
      Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
      Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      1b41c832
    • Greg Kroah-Hartman's avatar
      Merge branch 'for-gadget/next' of... · ee0db58a
      Greg Kroah-Hartman authored
      Merge branch 'for-gadget/next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
      
      * 'for-gadget/next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (24 commits)
        usb: dwc3: gadget: add support for SG lists
        usb: dwc3: gadget: don't force 'LST' always
        usb: dwc3: gadget: don't return anything on prepare trbs
        usb: dwc3: gadget: re-factor dwc3_prepare_trbs()
        usb: gadget: introduce support for sg lists
        usb: renesas: pipe: convert a long if into a XOR operation
        usb: gadget: remove useless depends on Kconfig
        usb: gadget: s3c-hsudc: remove the_controller global
        usb: gadget: s3c-hsudc: use release_mem_region instead of release_resource
        usb: gadget: s3c-hsudc: Add regulator handling
        usb: gadget: s3c-hsudc: use udc_start and udc_stop functions
        usb: gadget: s3c-hsudc: move device registration to probe
        usb: gadget: s3c-hsudc: add missing otg_put_transceiver in probe
        usb: gadget: s3c-hsudc: add __devinit to probe function
        usb: gadget: s3c-hsudc: move platform_data struct to global header
        USB: EHCI: Add Marvell Host Controller driver
        USB: OTG: add Marvell usb OTG driver support
        usb: gadget: mv_udc: drop ARCH dependency
        usb: gadget: mv_udc: fix bug in ep_dequeue
        usb: gadget: enlarge maxburst bit width.
        ...
      ee0db58a
    • Greg Kroah-Hartman's avatar
      Merge branch 'for-next/dwc3' of... · eea9fc7d
      Greg Kroah-Hartman authored
      Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
      
      * 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
        usb: dwc3: gadget: move us to Default State after reset
      eea9fc7d
    • Greg Kroah-Hartman's avatar
      Merge branch 'for-next/musb' of... · 6db174ea
      Greg Kroah-Hartman authored
      Merge branch 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
      
      * 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
        usb: musb: remove extern qualifier from musb_debug.h header
        usb: musb: cleanup kconfig
        usb: musb: trivial Kconfig cleanups
        musb: omap2430: avoid pm_runtime_disable()
        usb: musb: remove a bit of indentation
        usb: musb: trivial cleanup
        usb: musb: fix pm_runtime mismatch
      6db174ea
    • Greg Kroah-Hartman's avatar
      Merge branch 'for-next/xceiv' of... · 06e298b4
      Greg Kroah-Hartman authored
      Merge branch 'for-next/xceiv' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
      
      * 'for-next/xceiv' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
        usb: otg: trivial cleanups
      06e298b4
  5. 21 Dec, 2011 16 commits
  6. 20 Dec, 2011 2 commits