1. 25 Feb, 2013 10 commits
    • Pravin B Shelar's avatar
      Revert "ip_gre: propogate target device GSO capability to the tunnel device" · 7992ae6d
      Pravin B Shelar authored
      This reverts commit eb6b9a8c.
      
      Above commit limits GSO capability of gre device to just TSO, but
      software GRE-GSO is capable of handling all GSO capabilities.
      
      This patch also fixes following panic which reverted commit introduced:-
      
      BUG: unable to handle kernel NULL pointer dereference at 00000000000000a2
      IP: [<ffffffffa0680fd1>] ipgre_tunnel_bind_dev+0x161/0x1f0 [ip_gre]
      PGD 42bc19067 PUD 42bca9067 PMD 0
      Oops: 0000 [#1] SMP
      Pid: 2636, comm: ip Tainted: GF            3.8.0+ #83 Dell Inc. PowerEdge R620/0KCKR5
      RIP: 0010:[<ffffffffa0680fd1>]  [<ffffffffa0680fd1>] ipgre_tunnel_bind_dev+0x161/0x1f0 [ip_gre]
      RSP: 0018:ffff88042bfcb708  EFLAGS: 00010246
      RAX: 00000000000005b6 RBX: ffff88042d2fa000 RCX: 0000000000000044
      RDX: 0000000000000018 RSI: 0000000000000078 RDI: 0000000000000060
      RBP: ffff88042bfcb748 R08: 0000000000000018 R09: 000000000000000c
      R10: 0000000000000020 R11: 000000000101010a R12: ffff88042d2fa800
      R13: 0000000000000000 R14: ffff88042d2fa800 R15: ffff88042cd7f650
      FS:  00007fa784f55700(0000) GS:ffff88043fd20000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      CR2: 00000000000000a2 CR3: 000000042d8b9000 CR4: 00000000000407e0
      DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      Process ip (pid: 2636, threadinfo ffff88042bfca000, task ffff88042d142a80)
      Stack:
       0000000100000000 002f000000000000 0a01010100000000 000000000b010101
       ffff88042d2fa800 ffff88042d2fa000 ffff88042bfcb858 ffff88042f418c00
       ffff88042bfcb798 ffffffffa068199a ffff88042bfcb798 ffff88042d2fa830
      Call Trace:
       [<ffffffffa068199a>] ipgre_newlink+0xca/0x160 [ip_gre]
       [<ffffffff8143b692>] rtnl_newlink+0x532/0x5f0
       [<ffffffff8143b2fc>] ? rtnl_newlink+0x19c/0x5f0
       [<ffffffff81438978>] rtnetlink_rcv_msg+0x2c8/0x340
       [<ffffffff814386b0>] ? rtnetlink_rcv+0x40/0x40
       [<ffffffff814560f9>] netlink_rcv_skb+0xa9/0xd0
       [<ffffffff81438695>] rtnetlink_rcv+0x25/0x40
       [<ffffffff81455ddc>] netlink_unicast+0x1ac/0x230
       [<ffffffff81456a45>] netlink_sendmsg+0x265/0x380
       [<ffffffff814138c0>] sock_sendmsg+0xb0/0xe0
       [<ffffffff8141141e>] ? move_addr_to_kernel+0x4e/0x90
       [<ffffffff81420445>] ? verify_iovec+0x85/0xf0
       [<ffffffff81414ffd>] __sys_sendmsg+0x3fd/0x420
       [<ffffffff8114b701>] ? handle_mm_fault+0x251/0x3b0
       [<ffffffff8114f39f>] ? vma_link+0xcf/0xe0
       [<ffffffff81415239>] sys_sendmsg+0x49/0x90
       [<ffffffff814ffd19>] system_call_fastpath+0x16/0x1b
      
      CC: Dmitry Kravkov <dmitry@broadcom.com>
      Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Acked-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7992ae6d
    • Pravin B Shelar's avatar
      IP_GRE: Fix GRE_CSUM case. · 8f10098f
      Pravin B Shelar authored
      commit "ip_gre: allow CSUM capable devices to handle packets"
      aa0e51cd, broke GRE_CSUM case.
      GRE_CSUM needs checksum computed for inner packet. Therefore
      csum-calculation can not be offloaded if tunnel device requires
      GRE_CSUM.  Following patch fixes it by computing inner packet checksum
      for GRE_CSUM type, for all other type of GRE devices csum is offloaded.
      
      CC: Dmitry Kravkov <dmitry@broadcom.com>
      Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Acked-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8f10098f
    • Pravin B Shelar's avatar
      VXLAN: Use tunnel_ip_select_ident() for tunnel IP-Identification. · 8dc98eb2
      Pravin B Shelar authored
      tunnel_ip_select_ident() is more efficient when generating ip-header
      id given inner packet is of ipv4 type.
      Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8dc98eb2
    • Pravin B Shelar's avatar
      IP_GRE: Fix IP-Identification. · 490ab081
      Pravin B Shelar authored
      GRE-GSO generates ip fragments with id 0,2,3,4... for every
      GSO packet, which is not correct. Following patch fixes it
      by setting ip-header id unique id of fragments are allowed.
      As Eric Dumazet suggested it is optimized by using inner ip-header
      whenever inner packet is ipv4.
      Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      490ab081
    • David S. Miller's avatar
      Merge branch 'wireless' · 2bedc2e6
      David S. Miller authored
      John W. Linville says:
      
      ====================
      This is a batch of fixes intended for the 3.9 stream...
      
      Avinash Patil gives us a mwifiex fix to prevent a system freeze when
      that driver is unloaded.
      
      Daniel Drake brings a patch to avoid dropping the carrier flag across a
      suspend.  This prevents improper packet drops.
      
      Wei Yongjun delivers a brcmfmac for a lock leak on an error path.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2bedc2e6
    • John W. Linville's avatar
      Merge branch 'master' of... · 6d6436fb
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      6d6436fb
    • Syam Sidhardhan's avatar
      net/pasemi: Fix missing coding style · ea5cdccc
      Syam Sidhardhan authored
      Fix missing () & { }
      Signed-off-by: default avatarSyam Sidhardhan <s.syam@samsung.com>
      Acked-by: default avatarOlof Johansson <olof@lixom.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ea5cdccc
    • Neil Horman's avatar
      vmxnet3: fix ethtool ring buffer size setting · 48412a7e
      Neil Horman authored
      Noticed that vmxnet3's get_ringparam function was returning the summation of all
      ring buffers on a NIC, rather than just the size of any one ring.  This causes
      problems when a vmxnet3 instance has multiple queues, as ethtool, when setting
      ring parameters, first gets the current ring parameters to set the existing
      values in the set_ringparm commannd.  The result is, that unless both rx and tx
      ring sizes are set in a single operation, which ever ring is not set will
      silently have its ring count multiplied by the number of queues on the NIC until
      it reaches a driver defined maxiumum value.
      
      Fix it by not multiplying the rx and tx ring sizes by the number of queues in
      the system, like every other driver.  Tested by myself successfully.
      Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      CC: Shreyas Bhatewara <sbhatewara@vmware.com>
      CC: "VMware, Inc." <pv-drivers@vmware.com>
      CC: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      48412a7e
    • stephen hemminger's avatar
    • stephen hemminger's avatar
      bnx2x: remove dead code and make local funcs static · 732ac8ca
      stephen hemminger authored
      Sparse warned about several functions that were unnecessarily global.
      After making them static, discovered that several functions were actually never used.
      
      Compile tested only.
      Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
      Acked-by: default avatarEilon Greenstein <eilong@broadcomo.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      732ac8ca
  2. 24 Feb, 2013 2 commits
    • Paul Gortmaker's avatar
      gianfar: fix compile fail for NET_POLL=y due to struct packing · 62ed839d
      Paul Gortmaker authored
      Commit ee873fda ("gianfar: Pack struct
      gfar_priv_grp into three cachelines") moved the irq number and names
      off into a separate struct and created accessors for them.  However
      it was never tested with NET_POLL enabled, and so some conversions
      that were simply overlooked went undetected until now.
      
      Make the netpoll ones also use the gfar_irq() accessors.
      Reported-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Claudiu Manoil <claudiu.manoil@freescale.com>
      Cc: Jianhua Xie <jianhua.xie@freescale.com>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      62ed839d
    • Cong Wang's avatar
      vlan: adjust vlan_set_encap_proto() for its callers · da8c8724
      Cong Wang authored
      There are two places to call vlan_set_encap_proto():
      vlan_untag() and __pop_vlan_tci().
      
      vlan_untag() assumes skb->data points after mac addr, otherwise
      the following code
      
              vhdr = (struct vlan_hdr *) skb->data;
              vlan_tci = ntohs(vhdr->h_vlan_TCI);
              __vlan_hwaccel_put_tag(skb, vlan_tci);
      
              skb_pull_rcsum(skb, VLAN_HLEN);
      
      won't be correct. But __pop_vlan_tci() assumes points _before_
      mac addr.
      
      In vlan_set_encap_proto(), it looks for some magic L2 value
      after mac addr:
      
              rawp = skb->data;
              if (*(unsigned short *) rawp == 0xFFFF)
      	...
      
      Therefore __pop_vlan_tci() is obviously wrong.
      
      A quick fix is avoiding using skb->data in vlan_set_encap_proto(),
      use 'vhdr+1' is always correct in both cases.
      
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Jesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Acked-by: default avatarJesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      da8c8724
  3. 23 Feb, 2013 5 commits
  4. 22 Feb, 2013 9 commits
  5. 21 Feb, 2013 7 commits
    • Eric Dumazet's avatar
      ipv6: use a stronger hash for tcp · 08dcdbf6
      Eric Dumazet authored
      It looks like its possible to open thousands of TCP IPv6
      sessions on a server, all landing in a single slot of TCP hash
      table. Incoming packets have to lookup sockets in a very
      long list.
      
      We should hash all bits from foreign IPv6 addresses, using
      a salt and hash mix, not a simple XOR.
      
      inet6_ehashfn() can also separately use the ports, instead
      of xoring them.
      Reported-by: default avatarNeal Cardwell <ncardwell@google.com>
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Yuchung Cheng <ycheng@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      08dcdbf6
    • Jitendra Kalsaria's avatar
    • Manish Chopra's avatar
    • Shahed Shaikh's avatar
      qlcnic: Fix internal loopback test for 82xx adapter · d09529e6
      Shahed Shaikh authored
      o Use correct function to clear loopback mode.
      Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
      Signed-off-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d09529e6
    • Fabio Estevam's avatar
      net: fec: Ensure that initialization is done prior to request_irq() · 7f7d6c28
      Fabio Estevam authored
      Currently request_irq() is called prior to fec_enet_init() and fec_ptp_init(),
      which causes the following crash on a mx53qsb:
      
      Unable to handle kernel NULL pointer dereference at virtual address 00000002
      pgd = 80004000
      [00000002] *pgd=00000000
      Internal error: Oops: 5 [#1] SMP ARM
      Modules linked in:
      CPU: 0    Not tainted  (3.8.0-rc7-next-20130215+ #346)
      PC is at fec_enet_interrupt+0xd0/0x348
      LR is at fec_enet_interrupt+0xb8/0x348
      pc : [<80372b7c>]    lr : [<80372b64>]    psr: 60000193
      sp : df855c20  ip : df855c20  fp : df855c74
      r10: 00000516  r9 : 1c000000  r8 : 00000000
      r7 : 00000000  r6 : 00000000  r5 : 00000000  r4 : df9b7800
      r3 : df9b7df4  r2 : 00000000  r1 : 00000000  r0 : df9b7d34
      
      Ensure that such initialization functions are called prior to requesting the
      interrupts, so that all necessary the data structures are in place when the
      irqs occur.
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7f7d6c28
    • Li Wei's avatar
      ipv4: fix a bug in ping_err(). · b531ed61
      Li Wei authored
      We should get 'type' and 'code' from the outer ICMP header.
      Signed-off-by: default avatarLi Wei <lw@cn.fujitsu.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b531ed61
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · a0b1c429
      Linus Torvalds authored
      Pull networking update from David Miller:
      
       1) Checkpoint/restarted TCP sockets now can properly propagate the TCP
          timestamp offset.  From Andrey Vagin.
      
       2) VMWARE VM VSOCK layer, from Andy King.
      
       3) Much improved support for virtual functions and SR-IOV in bnx2x,
          from Ariel ELior.
      
       4) All protocols on ipv4 and ipv6 are now network namespace aware, and
          all the compatability checks for initial-namespace-only protocols is
          removed.  Thanks to Tom Parkin for helping deal with the last major
          holdout, L2TP.
      
       5) IPV6 support in netpoll and network namespace support in pktgen,
          from Cong Wang.
      
       6) Multiple Registration Protocol (MRP) and Multiple VLAN Registration
          Protocol (MVRP) support, from David Ward.
      
       7) Compute packet lengths more accurately in the packet scheduler, from
          Eric Dumazet.
      
       8) Use per-task page fragment allocator in skb_append_datato_frags(),
          also from Eric Dumazet.
      
       9) Add support for connection tracking labels in netfilter, from
          Florian Westphal.
      
      10) Fix default multicast group joining on ipv6, and add anti-spoofing
          checks to 6to4 and 6rd.  From Hannes Frederic Sowa.
      
      11) Make ipv4/ipv6 fragmentation memory limits more reasonable in modern
          times, rearrange inet frag datastructures for better cacheline
          locality, and move more operations outside of locking.  From Jesper
          Dangaard Brouer.
      
      12) Instead of strict master <--> slave relationships, allow arbitrary
          scenerios with "upper device lists".  From Jiri Pirko.
      
      13) Improve rate limiting accuracy in TBF and act_police, also from Jiri
          Pirko.
      
      14) Add a BPF filter netfilter match target, from Willem de Bruijn.
      
      15) Orphan and delete a bunch of pre-historic networking drivers from
          Paul Gortmaker.
      
      16) Add TSO support for GRE tunnels, from Pravin B SHelar.  Although
          this still needs some minor bug fixing before it's %100 correct in
          all cases.
      
      17) Handle unresolved IPSEC states like ARP, with a resolution packet
          queue.  From Steffen Klassert.
      
      18) Remove TCP Appropriate Byte Count support (ABC), from Stephen
          Hemminger.  This was long overdue.
      
      19) Support SO_REUSEPORT, from Tom Herbert.
      
      20) Allow locking a socket BPF filter, so that it cannot change after a
          process drops capabilities.
      
      21) Add VLAN filtering to bridge, from Vlad Yasevich.
      
      22) Bring ipv6 on-par with ipv4 and do not cache neighbour entries in
          the ipv6 routes, from YOSHIFUJI Hideaki.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1538 commits)
        ipv6: fix race condition regarding dst->expires and dst->from.
        net: fix a wrong assignment in skb_split()
        ip_gre: remove an extra dst_release()
        ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
        atl1c: restore buffer state
        net: fix a build failure when !CONFIG_PROC_FS
        net: ipv4: fix waring -Wunused-variable
        net: proc: fix build failed when procfs is not configured
        Revert "xen: netback: remove redundant xenvif_put"
        net: move procfs code to net/core/net-procfs.c
        qmi_wwan, cdc-ether: add ADU960S
        bonding: set sysfs device_type to 'bond'
        bonding: fix bond_release_all inconsistencies
        b44: use netdev_alloc_skb_ip_align()
        xen: netback: remove redundant xenvif_put
        net: fec: Do a sanity check on the gpio number
        ip_gre: propogate target device GSO capability to the tunnel device
        ip_gre: allow CSUM capable devices to handle packets
        bonding: Fix initialize after use for 3ad machine state spinlock
        bonding: Fix race condition between bond_enslave() and bond_3ad_update_lacp_rate()
        ...
      a0b1c429
  6. 20 Feb, 2013 7 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 8ec49422
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Mostly more sparc64 THP bug fixes, and a refactoring of SMP bootup on
        sparc32 from Sam Ravnborg."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc32: refactor smp boot
        sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
        sparc64: Fix tsb_grow() in atomic context.
        sparc64: Handle hugepage TSB being NULL.
        sparc64: Fix gfp_flags setting in tsb_grow().
      8ec49422
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 79a69d34
      Linus Torvalds authored
      Pull arm64 patches from Catalin Marinas:
      
       - SMP support for the PSCI booting protocol (power state coordination
         interface).
      
       - Simple earlyprintk support.
      
       - Platform devices populated by default from the DT (SoC-agnostic).
      
       - CONTEXTIDR support (used by external trace tools).
      
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: update CONTEXTIDR register to contain PID of current process
        arm64: atomics: fix grossly inconsistent asm constraints for exclusives
        arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link
        arm64: Select ARCH_WANT_FRAME_POINTERS
        arm64: Add kvm_para.h and xor.h generic headers
        arm64: SMP: enable PSCI boot method
        arm64: psci: add support for PSCI invocations from the kernel
        arm64: SMP: rework the SMP code to be enabling method agnostic
        arm64: perf: add guest vs host discrimination
        arm64: add COMPAT_PSR_*_BIT flags
        arm64: Add simple earlyprintk support
        arm64: Populate the platform devices
      79a69d34
    • Linus Torvalds's avatar
      Merge branch 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm · 6db167df
      Linus Torvalds authored
      Pull ARM updates (part two) from Russell King:
      
       - breakpoint and perf updates from Will Deacon.
      
       - hypervisor boot mode updates from Will.
      
       - support for Power State Coordination Interface via the Hypervisor
      
       - core ARM support for KVM
      
      * 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
        KVM: ARM: Add maintainer entry for KVM/ARM
        KVM: ARM: Power State Coordination Interface implementation
        KVM: ARM: Handle I/O aborts
        KVM: ARM: Handle guest faults in KVM
        KVM: ARM: VFP userspace interface
        KVM: ARM: Demux CCSIDR in the userspace API
        KVM: ARM: User space API for getting/setting co-proc registers
        KVM: ARM: Emulation framework and CP15 emulation
        KVM: ARM: World-switch implementation
        KVM: ARM: Inject IRQs and FIQs from userspace
        KVM: ARM: Memory virtualization setup
        KVM: ARM: Hypervisor initialization
        KVM: ARM: Initial skeleton to compile KVM support
        ARM: Section based HYP idmap
        ARM: Add page table and page defines needed by KVM
        ARM: perf: simplify __hw_perf_event_init err handling
        ARM: perf: remove unnecessary checks for idx < 0
        ARM: perf: handle armpmu_register failing
        ARM: perf: don't pretend to support counting of L1I writes
        ARM: perf: remove redundant NULL check on cpu_pmu
        ...
      6db167df
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 32f9aab8
      Linus Torvalds authored
      Pull ARM updates (part one) from Russell King:
      
       - MMC patches from Ulf Hansson and Pawel Moll.  These add support for
         DDR mode and the latest variant found on ARM Versatile Express, as
         well as a number of cleanups.
      
       - A fix for to improve the behaviour of ARMs sched_clock()
      
       - Changes to the ARM ioremap() code.  I'm not convinced with the
         primary arguments for this, but it's been around for a while, and
         people seem happy with it - and the "other" justification for this is
         at
      
            http://lkml.org/lkml/2012/12/6/184
      
       - Add SCHED_HRTICK to ARMs Kconfig
      
       - Making the ARM SHA/AES code Thumb-2 compatible
      
       - A collection of other small updates.
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (26 commits)
        ARM: add SCHED_HRTICK config option
        ARM: 7650/1: mm: replace direct access to mm->context.id with new macro
        ARM: 7649/1: mm: mm->context.id fix for big-endian
        ARM: 7648/1: pci: Allow passing per-controller private data
        ARM: 7647/1: pci: Keep pci_common_init() around after init
        ARM: fix warnings introduced by previous patch
        ARM: 7646/1: mm: use static_vm for managing static mapped areas
        ARM: 7645/1: ioremap: introduce an infrastructure for static mapped area
        ARM: 7644/1: vmregion: remove vmregion code entirely
        MAINTAINERS: Re-assert MMCI driver maintainer status
        MAINTAINERS: add additional file for MMCI driver
        MAINTAINERS: add maintainer entry for AMBA serial drivers
        ARM: 7637/1: memory: use SZ_ constants for defining the virtual memory layout
        ARM: 7643/1: sched: correct update_sched_clock()
        ARM: 7635/1: versatile: fix the PCI IRQ regression
        ARM: 7639/1: cache-l2x0: add missed dummy outer_resume entry
        ARM: 7630/1: mmc: mmci: Fixup and cleanup code for DMA handling
        ARM: 7632/1: spinlock: avoid exclusive accesses on unlock() path
        ARM: 7631/1: mmc: mmci: Add new VE MMCI variant
        ARM: 7623/1: mmc: mmci: Fixup clock gating when freq is 0 for ST-variants
        ...
      32f9aab8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · e177bb58
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
        swim: Add missing spinlock init
      e177bb58
    • Sam Ravnborg's avatar
      sparc32: refactor smp boot · f9fd3488
      Sam Ravnborg authored
      Introduce a common smp_callin() function to call
      from trampoline_32.S.
      Add platform specific functions to handle the
      platform details.
      
      This is in preparation for a patch that will
      unify the smp boot stuff for all architectures.
      sparc32 was significantly different to warrant
      this patch in preparation.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f9fd3488
    • David S. Miller's avatar
      sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler. · 76968ad2
      David S. Miller authored
      When we set the sun4u version of the PTE execute bit, it's:
      
      	or	REG, _PAGE_EXEC_4U, REG
      
      _PAGE_EXEC_4U is 0x1000, unfortunately the immedate field of the
      'or' instruction is a signed 13-bit value.  So the above actually
      assembles into:
      
      	or	REG, -4096, REG
      
      completely corrupting the final PTE value.
      
      Set it with a:
      
      	sethi	%hi(_PAGE_EXEC_4U), TMP
      	or	REG, TMP, REG
      
      sequence instead.
      
      This fixes "git gc" crashes on sun4u machines.
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      76968ad2