1. 25 Nov, 2012 3 commits
    • David Woodhouse's avatar
      8139cp: set ring address after enabling C+ mode · a9dbe40f
      David Woodhouse authored
      This fixes (for me) a regression introduced by commit b01af457 ("8139cp:
      set ring address before enabling receiver"). That commit configured the
      descriptor ring addresses earlier in the initialisation sequence, in
      order to avoid the possibility of triggering stray DMA before the
      correct address had been set up.
      
      Unfortunately, it seems that the hardware will scribble garbage into the
      TxRingAddr registers when we enable "plus mode" Tx in the CpCmd
      register. Observed on a Traverse Geos router board.
      
      To deal with this, while not reintroducing the problem which led to the
      original commit, we augment cp_start_hw() to write to the CpCmd register
      *first*, then set the descriptor ring addresses, and then finally to
      enable Rx and Tx in the original 8139 Cmd register. The datasheet
      actually indicates that we should enable Tx/Rx in the Cmd register
      *before* configuring the descriptor addresses, but that would appear to
      re-introduce the problem that the offending commit b01af457 was trying
      to solve. And this variant appears to work fine on real hardware.
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Cc: stable@kernel.org [3.5+]
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a9dbe40f
    • David S. Miller's avatar
      Revert "8139cp: revert "set ring address before enabling receiver"" · 071e3ef4
      David S. Miller authored
      This reverts commit b26623da.
      
      This reverts the revert, in net-next we'll try another scheme
      to fix this bug using patches from David Woodhouse.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      071e3ef4
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 24bc518a
      David S. Miller authored
      Conflicts:
      	drivers/net/wireless/iwlwifi/pcie/tx.c
      
      Minor iwlwifi conflict in TX queue disabling between 'net', which
      removed a bogus warning, and 'net-next' which added some status
      register poking code.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      24bc518a
  2. 24 Nov, 2012 4 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 194d9831
      Linus Torvalds authored
      Pull sound build error fix from Takashi Iwai:
       "Only a single commit for fixing the build error without CONFIG_PM in
        hda driver."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix build without CONFIG_PM
      194d9831
    • Takashi Iwai's avatar
      ALSA: hda - Fix build without CONFIG_PM · d846b174
      Takashi Iwai authored
      I forgot this again...  codec->in_pm is in #ifdef CONFIG_PM
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      d846b174
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2654ad44
      Linus Torvalds authored
      Pull x86 arch fixes from Peter Anvin:
       "Here is a collection of fixes for 3.7-rc7.  This is a superset of
        tglx' earlier pull request."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix ordering of CFI directives and recent ASM_CLAC additions
        x86, microcode, AMD: Add support for family 16h processors
        x86-32: Export kernel_stack_pointer() for modules
        x86-32: Fix invalid stack address while in softirq
        x86, efi: Fix processor-specific memcpy() build error
        x86: remove dummy long from EFI stub
        x86, mm: Correct vmflag test for checking VM_HUGETLB
        x86, amd: Disable way access filter on Piledriver CPUs
        x86/mce: Do not change worker's running cpu in cmci_rediscover().
        x86/ce4100: Fix PCI configuration register access for devices without interrupts
        x86/ce4100: Fix reboot by forcing the reboot method to be KBD
        x86/ce4100: Fix pm_poweroff
        MAINTAINERS: Update email address for Robert Richter
        x86, microcode_amd: Change email addresses, MAINTAINERS entry
        MAINTAINERS: Change Boris' email address
        EDAC: Change Boris' email address
        x86, AMD: Change Boris' email address
      2654ad44
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 · 35f95d22
      Linus Torvalds authored
      Pull MTD fixes from David Woodhouse:
       "The most important part of this is that it fixes a regression in
        Samsung NAND chip detection, introduced by some rework which went into
        3.7.  The initial fix wasn't quite complete, so it's in two parts.  In
        fact the first part is committed twice (Artem committed his own copy
        of the same patch) and I've merged Artem's tree into mine which
        already had that fix.
      
        I'd have recommitted that to make it somewhat cleaner, but figured by
        this point in the release cycle it was better to merge *exactly* the
        commits which have been in linux-next.
      
        If I'd recommitted, I'd also omit the sparse warning fix.  But it's
        there, and it's harmless — just marking one function as 'static' in
        onenand code.
      
        This also includes a couple more fixes for stable: an AB-BA deadlock
        in JFFS2, and an invalid range check in slram."
      
      * tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6:
        mtd: nand: fix Samsung SLC detection regression
        mtd: nand: fix Samsung SLC NAND identification regression
        jffs2: Fix lock acquisition order bug in jffs2_write_begin
        mtd: onenand: Make flexonenand_set_boundary static
        mtd: slram: invalid checking of absolute end address
        mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
        mtd: nand: fix Samsung SLC NAND identification regression
      35f95d22
  3. 23 Nov, 2012 33 commits