16 May, 2013

4 commits

  • include/linux/brcmphy.h is currently not protected against double
    inclusion, add ifdefs guard to fix that.

    Signed-off-by: Florian Fainelli
    Signed-off-by: David S. Miller

    Florian Fainelli
     
  • commit 54309fa6 ("net: fec: fix kernel oops when plug/unplug cable many times")
    introduced the following 'if' block in the beginning of fec_start():

    if (netif_running(ndev)) {
    netif_device_detach(ndev);
    napi_disable(&fep->napi);
    netif_stop_queue(ndev);
    netif_tx_lock_bh(ndev);
    }

    Then later in the end of fec_restart() there is another block that calls the
    opposite of each one of these functions.

    The correct approach would be to also call them with in the reverse order, so
    that we have as result:

    if (netif_running(ndev)) {
    netif_tx_unlock_bh(ndev);
    netif_wake_queue(ndev);
    napi_enable(&fep->napi);
    netif_device_attach(ndev);
    }

    Suggested-by: Eric Dumazet
    Signed-off-by: Fabio Estevam
    Signed-off-by: David S. Miller

    Fabio Estevam
     
  • fec_restart() runs in softirq context and we should use the
    netif_tx_lock_bh/netif_tx_unlock_bh() variants to avoid the following warning
    that happens since commit 54309fa6 ("net: fec: fix kernel oops when plug/unplug
    cable many times"):

    [ 9.753168] =================================
    [ 9.757540] [ INFO: inconsistent lock state ]
    [ 9.761921] 3.10.0-rc1-next-20130514 #13 Not tainted
    [ 9.766897] ---------------------------------
    [ 9.771264] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
    [ 9.777288] swapper/0 [HC0[0]:SC1[3]:HE1:SE0] takes:
    [ 9.782261] (_xmit_ETHER#2){+.?...}, at: [] sch_direct_xmit+0xa0/0x2d4
    [ 9.789879] {SOFTIRQ-ON-W} state was registered at:
    [ 9.794769] [] __lock_acquire+0x528/0x1bc0
    [ 9.799953] [] lock_acquire+0xa0/0x108
    [ 9.804780] [] _raw_spin_lock+0x28/0x38
    [ 9.809702] [] fec_restart+0x5d0/0x664
    [ 9.814542] [] fec_enet_adjust_link+0xa8/0xc0
    [ 9.819978] [] phy_state_machine+0x2fc/0x370
    [ 9.825323] [] process_one_work+0x1c0/0x4a0
    [ 9.830589] [] worker_thread+0x138/0x394
    [ 9.835587] [] kthread+0xa4/0xb0
    [ 9.839890] [] ret_from_fork+0x14/0x34
    [ 9.844728] irq event stamp: 185984
    [ 9.848226] hardirqs last enabled at (185984): [] local_bh_enable_ip+0x84/0xf0
    [ 9.856450] hardirqs last disabled at (185983): [] local_bh_enable_ip+0x44/0xf0
    [ 9.864667] softirqs last enabled at (185966): [] irq_enter+0x64/0x68
    [ 9.872099] softirqs last disabled at (185967): [] irq_exit+0x9c/0xd8
    [ 9.879440]
    [ 9.879440] other info that might help us debug this:
    [ 9.885981] Possible unsafe locking scenario:
    [ 9.885981]
    [ 9.891912] CPU0
    [ 9.894364] ----
    [ 9.896814] lock(_xmit_ETHER#2);
    [ 9.900259]
    [ 9.902884] lock(_xmit_ETHER#2);
    [ 9.906500]
    [ 9.906500] *** DEADLOCK ***

    Reported-by: Shawn Guo
    Suggested-by: Eric Dumazet
    Signed-off-by: Fabio Estevam
    Signed-off-by: David S. Miller

    Fabio Estevam
     
  • The bug here is this code from ipg_nic_hard_start_xmit():

    txfd->tfc &= cpu_to_le64(~IPG_TFC_TFDDONE);

    IPG_TFC_TFDDONE is 0x0000000080000000 so it's an unsigned int. The
    negated value is 0x7fffffff but 0xffffffff7fffffff was intended.

    The other values in this file don't need to be changed but I did it for
    consistency.

    Signed-off-by: Dan Carpenter
    Signed-off-by: David S. Miller

    Dan Carpenter
     

15 May, 2013

9 commits

  • Commit 749a2b6 (net/macb: clear tx/rx completion flags in ISR)
    introduces clear-on-write on ISR register. This behavior is not always
    implemented when using Cadence MACB/GEM and is breaking other platforms.
    We are using the Design Configuration Register 1 information and a capability
    property to actually activate this clear-on-write behavior on ISR.

    Reported-by: Hein Tibosch
    Signed-off-by: Nicolas Ferre
    Tested-by: Hein Tibosch
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: David S. Miller

    Nicolas Ferre
     
  • commit fb745e9a037895 ("net/802/mrp: fix possible race condition when
    calling mrp_pdu_queue()") introduced a lockdep splat.

    [ 19.735147] =================================
    [ 19.735235] [ INFO: inconsistent lock state ]
    [ 19.735324] 3.9.2-build-0063 #4 Not tainted
    [ 19.735412] ---------------------------------
    [ 19.735500] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage.
    [ 19.735592] rmmod/1840 [HC0[0]:SC0[0]:HE1:SE1] takes:
    [ 19.735682] (&(&app->lock)->rlock#2){+.?...}, at: []
    mrp_uninit_applicant+0x69/0xba [mrp]

    app->lock is normally taken under softirq context, so disable BH to
    avoid the splat.

    Reported-by: Denys Fedoryshchenko
    Signed-off-by: Eric Dumazet
    Cc: David Ward
    Cc: Cong Wang
    Tested-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • 3.10-rc1 issues the following warning:

    netif_napi_add() called with weight 128 on device eth%d

    This patch reduce the weight to 64, using NAPI_POLL_WEIGHT.

    Signed-off-by: Andrew Lunn
    Acked-by: Eric Dumazet
    Signed-off-by: David S. Miller

    Andrew Lunn
     
  • TCP md5 communications fail [1] for some devices, because sg/crypto code
    assume page offsets are below PAGE_SIZE.

    This was discovered using mlx4 driver [2], but I suspect loopback
    might trigger the same bug now we use order-3 pages in tcp_sendmsg()

    [1] Failure is giving following messages.

    huh, entered softirq 3 NET_RX ffffffff806ad230 preempt_count 00000100,
    exited with 00000101?

    [2] mlx4 driver uses order-2 pages to allocate RX frags

    Reported-by: Matt Schnall
    Signed-off-by: Eric Dumazet
    Cc: Bernhard Beck
    Signed-off-by: David S. Miller

    Eric Dumazet
     
  • Fix to avoid double insertion of vlan tags into the packet while
    handling an asic workaroud (issue introduced by net next Commit bc0c340)

    Signed-off-by: Sarveshwar Bandi
    Signed-off-by: David S. Miller

    Sarveshwar Bandi
     
  • efx_start_datapath() asserts that we can fit 2 RX scatter buffers plus
    a software structure, each appropriately aligned, into a single page.
    Where L1_CACHE_BYTES == 256 and PAGE_SIZE == 4096, which is the case
    on s390, this assertion fails.

    The current scatter buffer size is also not a multiple of 64 or 128,
    which are more common cache line sizes. If we can make both the start
    and end of a scatter buffer cache-aligned, this will reduce the need
    for read-modify-write operations on inter- processor links.

    Fix the alignment by reducing EFX_RX_USR_BUF_SIZE to 2048 - 256 ==
    1792. (We could use 2048 - L1_CACHE_BYTES, but EFX_RX_USR_BUF_SIZE
    also affects user-level networking where a larger amount of
    housekeeping data may be needed. Although this version of the driver
    does not support user-level networking, I prefer to keep scattering
    behaviour consistent with the out-of-tree version.)

    This still doesn't fix the s390 build because like most architectures
    it has NET_IP_ALIGN == 2. When NET_IP_ALIGN != 0 we cannot achieve
    cache line alignment at either the start or end of a scatter buffer,
    so there is actually no point in padding the buffers to a multiple of
    the cache line size. All we need is 4-byte alignment of the network
    header, so do that.

    Adjust the assertions accordingly.

    Reported-by: Geert Uytterhoeven
    Reported-by: Heiko Carstens
    Signed-off-by: Ben Hutchings
    Acked-by: Geert Uytterhoeven
    Signed-off-by: David S. Miller

    Ben Hutchings
     
  • The two architectures that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
    (powerpc and x86) now both define NET_IP_ALIGN as 0, so there is no
    need for this optimisation any more.

    Signed-off-by: Ben Hutchings
    Signed-off-by: David S. Miller

    Ben Hutchings
     
  • The 5725 family of devices (asic rev 5762), corrupts TSO packets where
    the buffer is within MSS bytes of a 4G boundary (4G, 8G etc.). Detect
    this condition and trigger the workaround path.

    Cc:
    Signed-off-by: Michael Chan
    Signed-off-by: Nithin Nayak Sujir
    Signed-off-by: David S. Miller

    Michael Chan
     
  • On the 5718, 5719 and 5720 serdes devices, powering down function 0
    results in all the other ports being powered down. Add code to skip
    function 0 power down.

    v2:
    - Modify tg3_phy_power_bug() function to use a switch instead of a
    complicated if statement. Suggested by Joe Perches.

    Cc:
    Signed-off-by: Michael Chan
    Signed-off-by: Nithin Nayak Sujir
    Signed-off-by: David S. Miller

    Nithin Sujir
     

14 May, 2013

3 commits

  • Pull networking fixes from David Miller:
    "Several small bug fixes all over:

    1) be2net driver uses wrong payload length when submitting MAC list
    get requests to the chip. From Sathya Perla.

    2) Fix mwifiex memory leak on driver unload, from Amitkumar Karwar.

    3) Prevent random memory access in batman-adv, from Marek Lindner.

    4) batman-adv doesn't check for pskb_trim_rcsum() errors, also from
    Marek Lindner.

    5) Fix fec crashes on rapid link up/down, from Frank Li.

    6) Fix inner protocol grovelling in GSO, from Pravin B Shelar.

    7) Link event validation fix in qlcnic from Rajesh Borundia.

    8) Not all FEC chips can support checksum offload, fix from Shawn
    Guo.

    9) EXPORT_SYMBOL + inline doesn't make any sense, from Denis Efremov.

    10) Fix race in passthru mode during device removal in macvlan, from
    Jiri Pirko.

    11) Fix RCU hash table lookup socket state race in ipv6, leading to
    NULL pointer derefs, from Eric Dumazet.

    12) Add several missing HAS_DMA kconfig dependencies, from Geert
    Uyttterhoeven.

    13) Fix bogus PCI resource management in 3c59x driver, from Sergei
    Shtylyov.

    14) Fix info leak in ipv6 GRE tunnel driver, from Amerigo Wang.

    15) Fix device leak in ipv6 IPSEC policy layer, from Cong Wang.

    16) DMA mapping leak fix in qlge from Thadeu Lima de Souza Cascardo.

    17) Missing iounmap on probe failure in bna driver, from Wei Yongjun."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (40 commits)
    bna: add missing iounmap() on error in bnad_init()
    qlge: fix dma map leak when the last chunk is not allocated
    xfrm6: release dev before returning error
    ipv6,gre: do not leak info to user-space
    virtio_net: use default napi weight by default
    emac: Fix EMAC soft reset on 460EX/GT
    3c59x: fix PCI resource management
    caif: CAIF_VIRTIO should depend on HAS_DMA
    net/ethernet: MACB should depend on HAS_DMA
    net/ethernet: ARM_AT91_ETHER should depend on HAS_DMA
    net/wireless: ATH9K should depend on HAS_DMA
    net/ethernet: STMMAC_ETH should depend on HAS_DMA
    net/ethernet: NET_CALXEDA_XGMAC should depend on HAS_DMA
    ipv6: do not clear pinet6 field
    macvlan: fix passthru mode race between dev removal and rx path
    ipv4: ip_output: remove inline marking of EXPORT_SYMBOL functions
    net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode
    net/mlx4_core: Add missing report on VST and spoof-checking dev caps
    net: fec: enable hardware checksum only on imx6q-fec
    qlcnic: Fix validation of link event command.
    ...

    Linus Torvalds
     
  • Add the missing iounmap() before return from bnad_init()
    in the error handling case.
    Introduced by commit 01b54b1451853593739816a392485c4e2bee7dda
    (bna: tx rx cleanup fix).

    Signed-off-by: Wei Yongjun
    Signed-off-by: David S. Miller

    Wei Yongjun
     
  • qlge allocates chunks from a page that it maps and unmaps that page when
    the last chunk is released. When the driver is unloaded or the card is
    removed, all chunks are released and the page is unmapped for the last
    chunk.

    However, when the last chunk of a page is not allocated and the device
    is removed, that page is not unmapped. In fact, its last reference is
    not put and there's also a page leak. This bug prevents a device from
    being properly hotplugged.

    When the DMA API debug option is enabled, the following messages show
    the pending DMA allocation after we remove the driver.

    This patch fixes the bug by unmapping and putting the page from the ring
    if its last chunk has not been allocated.

    pci 0005:98:00.0: DMA-API: device driver has pending DMA allocations while released from device [count=1]
    One of leaked entries details: [device address=0x0000000060a80000] [size=65536 bytes] [mapped with DMA_FROM_DEVICE] [mapped as page]
    ------------[ cut here ]------------
    WARNING: at lib/dma-debug.c:746
    Modules linked in: qlge(-) rpadlpar_io rpaphp pci_hotplug fuse [last unloaded: qlge]
    NIP: c0000000003fc3ec LR: c0000000003fc3e8 CTR: c00000000054de60
    REGS: c0000003ee9c74e0 TRAP: 0700 Tainted: G O (3.7.2)
    MSR: 8000000000029032 CR: 28002424 XER: 00000001
    SOFTE: 1
    CFAR: c0000000007a39c8
    TASK = c0000003ee8d5c90[8406] 'rmmod' THREAD: c0000003ee9c4000 CPU: 31
    GPR00: c0000000003fc3e8 c0000003ee9c7760 c000000000c789f8 00000000000000ee
    GPR04: 0000000000000000 00000000000000ef 0000000000004000 0000000000010000
    GPR08: 00000000000000be c000000000b22088 c000000000c4c218 00000000007c0000
    GPR12: 0000000028002422 c00000000ff26c80 0000000000000000 000001001b0f1b40
    GPR16: 00000000100cb9d8 0000000010093088 c000000000cdf910 0000000000000001
    GPR20: 0000000000000000 c000000000dbfc00 0000000000000000 c000000000dbfb80
    GPR24: c0000003fafc9d80 0000000000000001 000000000001ff80 c0000003f38f7888
    GPR28: c000000000ddfc00 0000000000000400 c000000000bd7790 c000000000ddfb80
    NIP [c0000000003fc3ec] .dma_debug_device_change+0x22c/0x2b0
    LR [c0000000003fc3e8] .dma_debug_device_change+0x228/0x2b0
    Call Trace:
    [c0000003ee9c7760] [c0000000003fc3e8] .dma_debug_device_change+0x228/0x2b0 (unreliable)
    [c0000003ee9c7840] [c00000000079a098] .notifier_call_chain+0x78/0xf0
    [c0000003ee9c78e0] [c0000000000acc20] .__blocking_notifier_call_chain+0x70/0xb0
    [c0000003ee9c7990] [c0000000004a9580] .__device_release_driver+0x100/0x140
    [c0000003ee9c7a20] [c0000000004a9708] .driver_detach+0x148/0x150
    [c0000003ee9c7ac0] [c0000000004a8144] .bus_remove_driver+0xc4/0x150
    [c0000003ee9c7b60] [c0000000004aa58c] .driver_unregister+0x8c/0xe0
    [c0000003ee9c7bf0] [c0000000004090b4] .pci_unregister_driver+0x34/0xf0
    [c0000003ee9c7ca0] [d000000002231194] .qlge_exit+0x1c/0x34 [qlge]
    [c0000003ee9c7d20] [c0000000000e36d8] .SyS_delete_module+0x1e8/0x290
    [c0000003ee9c7e30] [c0000000000098d4] syscall_exit+0x0/0x94
    Instruction dump:
    7f26cb78 e818003a e87e81a0 e8f80028 e9180030 796b1f24 78001f24 7d6a5a14
    7d2a002a e94b0020 483a7595 60000000 2fb80000 40de0048 80120050
    ---[ end trace 4294f9abdb01031d ]---
    Mapped at:
    [] .ql_update_lbq+0x384/0x580 [qlge]
    [] .ql_clean_inbound_rx_ring+0x300/0xc60 [qlge]
    [] .ql_napi_poll_msix+0x39c/0x5a0 [qlge]
    [] .net_rx_action+0x170/0x300
    [] .__do_softirq+0x170/0x300

    Signed-off-by: Thadeu Lima de Souza Cascardo
    Acked-by: Jitendra Kalsaria
    Signed-off-by: David S. Miller

    Thadeu Lima de Souza Cascardo
     

13 May, 2013

11 commits

  • Pull spi updates from Mark Brown:
    "A few driver specific fixes plus improved error handling in the
    generic DT GPIO chipselect handling - not exciting but useful."

    * tag 'spi-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
    spi/spi-atmel: BUG: fix doesn' support 16 bits transfers using PIO
    spi/davinci: fix module build error
    spi: Return error from of_spi_register_master on bad "cs-gpios" property
    spi: Initialize cs_gpio and cs_gpios with -ENOENT
    spi/atmel: fix speed_hz check in atmel_spi_transfer()

    Linus Torvalds
     
  • Pull drm fixes from Dave Airlie:
    "Just a few straggling fixes I hoovered up, and an intel fixes pull
    from Daniel which fixes some regressions, and some mgag200 fixes from
    Matrox."

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux:
    drm/mgag200: Fix framebuffer base address programming
    drm/mgag200: Convert counter delays to jiffies
    drm/mgag200: Fix writes into MGA1064_PIX_CLK_CTL register
    drm/mgag200: Don't change unrelated registers during modeset
    drm: Only print a debug message when the polled connector has changed
    drm: Make the HPD status updates debug logs more readable
    drm: Use names of ioctls in debug traces
    drm: Remove pointless '-' characters from drm_fb_helper documentation
    drm: Add kernel-doc for drm_fb_helper_funcs->initial_config
    drm: refactor call to request_module
    drm: Don't prune modes loudly when a connector is disconnected
    drm: Add missing break in the command line mode parsing code
    drm/i915: clear the stolen fb before resuming
    Revert "drm/i915: Calculate correct stolen size for GEN7+"
    drm/i915: hsw: fix link training for eDP on port-A
    Revert "drm/i915: revert eDP bpp clamping code changes"
    drm: don't check modeset locks in panic handler
    drm/i915: Fix pipe enabled mask for pipe C in WM calculations
    drm/mm: fix dump table BUG
    drm/i915: Always normalize return timeout for wait_timeout_ioctl

    Linus Torvalds
     
  • Pull virtio/lguest fixes from Rusty Russell:
    "Missing license tag and some fallout from the lguest pagetable rework"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
    lguest: clear cached last cpu when guest_set_pgd() called.
    Add missing module license tag to vring helpers.

    Linus Torvalds
     
  • Mark Brown
     
  • Mark Brown
     
  • Higher bits of the base address of framebuffers weren't being
    programmed properly. This caused framebuffers that didn't happen to be
    allocated at a low enough address to not be displayed properly.

    Signed-off-by: Christopher Harvey
    Signed-off-by: Mathieu Larouche
    Acked-by: Julia Lemire
    Tested-by: Julia Lemire
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie

    Christopher Harvey
     
  • Signed-off-by: Christopher Harvey
    Acked-by: Julia Lemire
    Tested-by: Julia Lemire
    Acked-by: Mathieu Larouche
    Signed-off-by: Dave Airlie

    Christopher Harvey
     
  • The original line,
    WREG_DAC(MGA1064_PIX_CLK_CTL_CLK_DIS, tmp);
    wrote tmp into MGA1064_PIX_CLK_CTL_CLK_DIS, where
    MGA1064_PIX_CLK_CTL_CLK_DIS is an offset into
    MGA1064_PIX_CLK_CTL. Change the line to write properly into
    MGA1064_PIX_CLK_CTL. There were other chunks of code nearby that use
    the same pattern (but work correctly), so this patch updates them all
    to use this new (slightly more efficient) write pattern. The WREG_DAC
    macro was causing the DAC_INDEX register to be set to the same value
    twice. WREG8(DAC_DATA, foo) takes advantage of the fact that DAC_INDEX
    is already at the value we want.

    Signed-off-by: Christopher Harvey
    Acked-by: Julia Lemire
    Tested-by: Julia Lemire
    Acked-by: Mathieu Larouche
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie

    Christopher Harvey
     
  • Registers in indices below 0x18 are totally unrelated to modesetting,
    so don't write 0's, or anything else into them on modeset. Most of
    these registers are hardware cursor related, so this existing code
    interferes with hardware cursor development.

    Signed-off-by: Christopher Harvey
    Tested-by: Julia Lemire
    Acked-by: Julia Lemire
    Acked-by: Mathieu Larouche
    Signed-off-by: Dave Airlie

    Christopher Harvey
     
  • Suggested-by: Chris Wilson
    Signed-off-by: Damien Lespiau
    Signed-off-by: Dave Airlie

    Lespiau, Damien
     
  • Instead of just printing "status updated from 1 to 2", make those enum
    numbers immediately readable.

    v2: Also patch output_poll_execute() (Daniel Vetter)
    v3: Use drm_get_connector_status_name (Ville Syrjälä)

    Signed-off-by: Damien Lespiau
    Reviewed-by: Jesse Barnes (for v1)
    Signed-off-by: Dave Airlie

    Lespiau, Damien
     

12 May, 2013

13 commits

  • We forget to call dev_put() on error path in xfrm6_fill_dst(),
    its caller doesn't handle this.

    Cc: Herbert Xu
    Cc: Steffen Klassert
    Cc: David S. Miller
    Signed-off-by: Cong Wang
    Signed-off-by: David S. Miller

    Cong Wang
     
  • There is a hole in struct ip6_tnl_parm2, so we have to
    zero the struct on stack before copying it to user-space.

    Cc: David S. Miller
    Signed-off-by: Cong Wang
    Signed-off-by: David S. Miller

    Amerigo Wang
     
  • Since commit 82dc3c63c692b1e1d5937 ("net: introduce NAPI_POLL_WEIGHT")
    we warn drivers when they use napi weight higher than NAPI_POLL_WEIGHT,
    but virtio_net still uses 128 by default. This patch makes its default
    value to NAPI_POLL_WEIGHT.

    Cc: "Michael S. Tsirkin"
    Cc: Eric Dumazet
    Cc: David S. Miller
    Signed-off-by: Cong Wang
    Signed-off-by: David S. Miller

    Amerigo Wang
     
  • Fix EMAC soft reset on 460EX/GT to select the right PHY clock source
    before and after the soft reset.

    EMAC with PHY should use the clock from PHY during soft reset.
    EMAC without PHY should use the internal clock during soft reset.

    PPC460EX/GT Embedded Processor Advanced User's Manual
    section 28.10.1 Mode Register 0 (EMACx_MR0) states:
    Note: The PHY must provide a TX Clk in order to perform a soft reset
    of the EMAC. If none is present, select the internal clock
    (SDR0_ETH_CFG[EMACx_PHY_CLK] = 1).
    After a soft reset, select the external clock.

    Without the fix, 460EX/GT-based boards with RGMII PHYs attached to
    EMACs experience EMAC interrupt storm and system watchdog reset when
    issuing "ifconfig eth0 down" + "ifconfig eth0 up" a few times.
    The system enters endless loop of serving emac_irq() with EMACx_ISR
    register stuck at value 0x10000000 (Rx parity error).

    With the fix, the above issue is no longer observed.

    Signed-off-by: Petri Gynther
    Signed-off-by: David S. Miller

    Petri Gynther
     
  • The driver wrongly claimed I/O ports at an address returned by pci_iomap() --
    even if it was passed an MMIO address. Fix this by claiming/releasing all PCI
    resources in the PCI driver's probe()/remove() methods instead and get rid of
    'must_free_region' flag weirdness (why would Cardbus claim anything for us?).

    Signed-off-by: Sergei Shtylyov
    Signed-off-by: David S. Miller

    Sergei Shtylyov
     
  • Linus Torvalds
     
  • Pull tracing/kprobes update from Steven Rostedt:
    "The majority of these changes are from Masami Hiramatsu bringing
    kprobes up to par with the latest changes to ftrace (multi buffering
    and the new function probes).

    He also discovered and fixed some bugs in doing so. When pulling in
    his patches, I also found a few minor bugs as well and fixed them.

    This also includes a compile fix for some archs that select the ring
    buffer but not tracing.

    I based this off of the last patch you took from me that fixed the
    merge conflict error, as that was the commit that had all the changes
    I needed for this set of changes."

    * tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
    tracing/kprobes: Support soft-mode disabling
    tracing/kprobes: Support ftrace_event_file base multibuffer
    tracing/kprobes: Pass trace_probe directly from dispatcher
    tracing/kprobes: Increment probe hit-count even if it is used by perf
    tracing/kprobes: Use bool for retprobe checker
    ftrace: Fix function probe when more than one probe is added
    ftrace: Fix the output of enabled_functions debug file
    ftrace: Fix locking in register_ftrace_function_probe()
    tracing: Add helper function trace_create_new_event() to remove duplicate code
    tracing: Modify soft-mode only if there's no other referrer
    tracing: Indicate enabled soft-mode in enable file
    tracing/kprobes: Fix to increment return event probe hit-count
    ftrace: Cleanup regex_lock and ftrace_lock around hash updating
    ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
    ftrace: Have ftrace_regex_write() return either read or error
    tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()
    tracing: Don't succeed if event_enable_func did not register anything
    ring-buffer: Select IRQ_WORK

    Linus Torvalds
     
  • If NO_DMA=y:

    drivers/built-in.o: In function `cfv_destroy_genpool':
    drivers/net/caif/caif_virtio.c:364: undefined reference to `dma_free_coherent'
    drivers/built-in.o: In function `cfv_create_genpool':
    drivers/net/caif/caif_virtio.c:397: undefined reference to `dma_alloc_coherent'

    Signed-off-by: Geert Uytterhoeven
    Cc: Dmitry Tarnyagin
    Cc: David S. Miller
    Cc: netdev@vger.kernel.org
    Signed-off-by: David S. Miller

    Geert Uytterhoeven
     
  • If NO_DMA=y:

    drivers/built-in.o: In function `macb_free_consistent':
    drivers/net/ethernet/cadence/macb.c:878: undefined reference to `dma_free_coherent'
    drivers/net/ethernet/cadence/macb.c:883: undefined reference to `dma_free_coherent'
    drivers/net/ethernet/cadence/macb.c:888: undefined reference to `dma_free_coherent'
    drivers/built-in.o: In function `macb_alloc_consistent':
    drivers/net/ethernet/cadence/macb.c:905: undefined reference to `dma_alloc_coherent'
    drivers/built-in.o: In function `macb_tx_interrupt':
    drivers/net/ethernet/cadence/macb.c:515: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `macb_tx_error_task':
    drivers/net/ethernet/cadence/macb.c:457: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `macb_start_xmit':
    drivers/net/ethernet/cadence/macb.c:838: undefined reference to `dma_map_single'

    Signed-off-by: Geert Uytterhoeven
    Cc: Nicolas Ferre
    Cc: David S. Miller
    Cc: netdev@vger.kernel.org
    Acked-by: Nicolas Ferre
    Signed-off-by: David S. Miller

    Geert Uytterhoeven
     
  • If NO_DMA=y:

    drivers/built-in.o: In function `at91ether_start':
    drivers/net/ethernet/cadence/at91_ether.c:49: undefined reference to `dma_alloc_coherent'
    drivers/net/ethernet/cadence/at91_ether.c:60: undefined reference to `dma_free_coherent'
    drivers/built-in.o: In function `at91ether_interrupt':
    drivers/net/ethernet/cadence/at91_ether.c:250: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `at91ether_start_xmit':
    drivers/net/ethernet/cadence/at91_ether.c:169: undefined reference to `dma_map_single'
    drivers/built-in.o: In function `at91ether_close':
    drivers/net/ethernet/cadence/at91_ether.c:145: undefined reference to `dma_free_coherent'

    Signed-off-by: Geert Uytterhoeven
    Cc: Nicolas Ferre
    Cc: David S. Miller
    Cc: netdev@vger.kernel.org
    Acked-by: Nicolas Ferre
    Signed-off-by: David S. Miller

    Geert Uytterhoeven
     
  • If NO_DMA=y:

    drivers/built-in.o: In function `ath9k_beacon_generate':
    drivers/net/wireless/ath/ath9k/beacon.c:146: undefined reference to `dma_unmap_single'
    drivers/net/wireless/ath/ath9k/beacon.c:174: undefined reference to `dma_map_single'
    drivers/net/wireless/ath/ath9k/beacon.c:176: undefined reference to `dma_mapping_error'
    drivers/built-in.o: In function `ath9k_beacon_remove_slot':
    drivers/net/wireless/ath/ath9k/beacon.c:252: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `ath_descdma_setup':
    drivers/net/wireless/ath/ath9k/init.c:382: undefined reference to `dmam_alloc_coherent'
    drivers/built-in.o: In function `ath_edma_get_buffers':
    drivers/net/wireless/ath/ath9k/recv.c:616: undefined reference to `dma_sync_single_for_cpu'
    drivers/built-in.o: In function `ath_get_next_rx_buf':
    drivers/net/wireless/ath/ath9k/recv.c:740: undefined reference to `dma_sync_single_for_cpu'
    drivers/built-in.o: In function `ath_rx_edma_cleanup':
    drivers/net/wireless/ath/ath9k/recv.c:176: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `ath_rx_cleanup':
    drivers/net/wireless/ath/ath9k/recv.c:340: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `ath_rx_edma_buf_link':
    drivers/net/wireless/ath/ath9k/recv.c:122: undefined reference to `dma_sync_single_for_cpu'
    drivers/built-in.o: In function `ath_rx_tasklet':
    drivers/net/wireless/ath/ath9k/recv.c:1275: undefined reference to `dma_map_single'
    drivers/net/wireless/ath/ath9k/recv.c:1277: undefined reference to `dma_mapping_error'
    drivers/net/wireless/ath/ath9k/recv.c:1283: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `ath_rx_edma_init':
    drivers/net/wireless/ath/ath9k/recv.c:226: undefined reference to `dma_map_single'
    drivers/net/wireless/ath/ath9k/recv.c:229: undefined reference to `dma_mapping_error'
    drivers/built-in.o: In function `ath_rx_init':
    drivers/net/wireless/ath/ath9k/recv.c:303: undefined reference to `dma_map_single'
    drivers/net/wireless/ath/ath9k/recv.c:306: undefined reference to `dma_mapping_error'
    drivers/built-in.o: In function `ath_tx_complete_buf':
    drivers/net/wireless/ath/ath9k/xmit.c:2088: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `ath_txstatus_setup':
    drivers/net/wireless/ath/ath9k/xmit.c:2344: undefined reference to `dmam_alloc_coherent'
    drivers/built-in.o: In function `ath_tx_set_retry':
    drivers/net/wireless/ath/ath9k/xmit.c:307: undefined reference to `dma_sync_single_for_cpu'
    drivers/built-in.o: In function `ath_tx_setup_buffer':
    drivers/net/wireless/ath/ath9k/xmit.c:1887: undefined reference to `dma_map_single'
    drivers/net/wireless/ath/ath9k/xmit.c:1889: undefined reference to `dma_mapping_error'

    Signed-off-by: Geert Uytterhoeven
    Cc: Luis R. Rodriguez
    Cc: John W. Linville
    Cc: linux-wireless@vger.kernel.org
    Cc: netdev@vger.kernel.org
    Signed-off-by: David S. Miller

    Geert Uytterhoeven
     
  • If NO_DMA=y:

    drivers/built-in.o: In function `dma_free_tx_skbufs':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1141: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `dma_free_rx_skbufs':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1120: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `free_dma_desc_resources':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1159: undefined reference to `dma_free_coherent'
    drivers/built-in.o: In function `stmmac_init_rx_buffers':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:980: undefined reference to `dma_map_single'
    drivers/built-in.o: In function `init_dma_desc_rings':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1015: undefined reference to `dma_alloc_coherent'
    drivers/built-in.o: In function `stmmac_tx_clean':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1250: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `stmmac_rx':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2044: undefined reference to `dma_unmap_single'
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:2082: undefined reference to `dma_unmap_single'
    drivers/built-in.o: In function `stmmac_rx_refill':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1967: undefined reference to `dma_map_single'
    drivers/built-in.o: In function `stmmac_xmit':
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:1845: undefined reference to `dma_map_single'
    drivers/built-in.o: In function `skb_frag_dma_map':
    include/linux/skbuff.h:2184: undefined reference to `dma_map_page'
    drivers/built-in.o: In function `stmmac_jumbo_frm':
    drivers/net/ethernet/stmicro/stmmac/ring_mode.c:40: undefined reference to `dma_map_single'
    drivers/built-in.o: In function `stmmac_jumbo_frm':
    drivers/net/ethernet/stmicro/stmmac/chain_mode.c:48: undefined reference to `dma_map_single'
    drivers/net/ethernet/stmicro/stmmac/chain_mode.c:55: undefined reference to `dma_map_single'

    Signed-off-by: Geert Uytterhoeven
    Cc: Giuseppe Cavallaro
    Cc: David S. Miller
    Cc: netdev@vger.kernel.org
    Signed-off-by: David S. Miller

    Geert Uytterhoeven
     
  • If NO_DMA=y:

    drivers/built-in.o: In function `xgmac_xmit':
    drivers/net/ethernet/calxeda/xgmac.c:1102: undefined reference to `dma_mapping_error'

    Signed-off-by: Geert Uytterhoeven
    Cc: Rob Herring
    Cc: David S. Miller
    Cc: netdev@vger.kernel.org
    Signed-off-by: David S. Miller

    Geert Uytterhoeven