1. 23 11月, 2011 1 次提交
    • L
      Revert "of/irq: of_irq_find_parent: check for parent equal to child" · b4bbb029
      Linus Torvalds 提交于
      This reverts commit dc937280.
      
      As requested by Ben Herrenschmidt:
        "This breaks some powerpc platforms at least.  The practice of having
         a node provide an explicit "interrupt-parent" property pointing to
         itself is an old trick that we've used in the past to allow a
         device-node to have interrupts routed to different controllers.
      
         In that case, the node also contains an interrupt-map, so the node is
         its own parent, the interrupt resolution hits the map, which then can
         route each individual interrupt to a different parent."
      
      Grant says:
        "Ah, nuts, yes that is broken then.  Yes, please revert the commit and
         Rob & I will come up with a better solution.
      
         Rob, I think it can be done by explicitly checking for np ==
         desc->interrupt_parent in of_irq_init() instead of relying on
         of_irq_find_parent() returning NULL."
      Requested-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Acked-by: NGrant Likely <grant.likely@secretlab.ca>
      Cc: Rob Herring <rob.herring@calxeda.com>
      Cc: devicetree-discuss@lists.ozlabs.org
      Cc: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
      Cc: Tanmay Inamdar <tinamdar@apm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b4bbb029
  2. 22 11月, 2011 1 次提交
  3. 19 11月, 2011 11 次提交
    • R
      staging: fix more ET131X build errors · c9fb041f
      Randy Dunlap 提交于
      ET131X is a network device, so it should depend on
      NETDEVICES.  (This part won't be needed when the driver
      moves to drivers/net/.)  It also uses PHYLIB interfaces,
      so it should select PHYLIB.  Fixes these build errors:
      
      ERROR: "phy_connect" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_find_first" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_register" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_alloc" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_stop" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_start" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_free" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_unregister" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_print_status" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_ethtool_gset" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_ethtool_sset" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_mii_ioctl" [drivers/staging/et131x/et131x.ko] undefined!
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Acked-by: N: Mark Einon <mark.einon@gmail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      c9fb041f
    • R
      staging: et131x depends on NET · 0337510f
      Randy Dunlap 提交于
      ET131X uses netdev interfaces so it should depend on NET.
      
      Fixes these build errors:
      ERROR: "ethtool_op_get_link" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "eth_validate_addr" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "register_netdev" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_connect" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_find_first" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_register" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_alloc" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "alloc_etherdev_mqs" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "netif_device_detach" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_stop" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "netif_device_attach" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_start" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "free_netdev" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_free" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "mdiobus_unregister" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "unregister_netdev" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "__netif_schedule" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_print_status" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "dev_kfree_skb_any" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "dev_alloc_skb" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "netif_rx" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "eth_type_trans" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "skb_put" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_ethtool_gset" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_ethtool_sset" [drivers/staging/et131x/et131x.ko] undefined!
      ERROR: "phy_mii_ioctl" [drivers/staging/et131x/et131x.ko] undefined!
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      0337510f
    • R
      staging: slicoss depends on NET · 07de7a5e
      Randy Dunlap 提交于
      The slicoss driver uses network interfaces so it should depend
      on NET.  Fixes the following build errors:
      
      ERROR: "eth_change_mtu" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "eth_validate_addr" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "register_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "alloc_etherdev_mqs" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "__netif_schedule" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "netif_rx" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "eth_type_trans" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "skb_put" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "skb_pull" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "__alloc_skb" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "free_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "unregister_netdev" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "consume_skb" [drivers/staging/slicoss/slicoss.ko] undefined!
      ERROR: "dev_kfree_skb_irq" [drivers/staging/slicoss/slicoss.ko] undefined!
      Signed-off-by: NRandy Dunlap <rdunlap@xenotime.net>
      Cc: Lior Dotan <liodot@gmail.com>
      Cc: Christopher Harrer <charrer@alacritech.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      07de7a5e
    • M
      linux-next: et131x: Fix build error when CONFIG_PM_SLEEP not enabled · 2e9ff8d9
      Mark Einon 提交于
      Randy Dunlap reports that the ex131x driver doesn't build when CONFIG_PM_SLEEP is not enabled.
      This bug was introduced when moving code around to remove some forward declarations earlier, the #endif part of #ifdef CONFIG_PM_SLEEP was not moved at the same time. Now fixed by moving it to its proper place.
      Reported-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NMark Einon <mark.einon@gmail.com>
      Acked-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      2e9ff8d9
    • A
      USB: Fix Corruption issue in USB ftdi driver ftdi_sio.c · b1ffb4c8
      Andrew Worsley 提交于
      Fix for ftdi_set_termios() glitching output
      
      ftdi_set_termios() is constantly setting the baud rate, data bits and parity
      unnecessarily on every call, . When called while characters are being
      transmitted can cause the FTDI chip to corrupt the serial port bit stream
      output by stalling the output half a bit during the output of a character.
      Simple fix by skipping this setting if the baud rate/data bits/parity are
      unchanged.
      Signed-off-by: NAndrew Worsley <amworsley@gmail.com>
      Cc: stable <stable@vger.kernel.org>
      ----
      
        I had a brief run with strace on the getty and it was doing ioctl()s on
        each call but it didn't look relavant to the problem. I think the issue is
        that XON/XOFF flow control was being implmented via hardware - for the ixoff
        to allow the user to use XON/XOFF to control output. Unfortunately it would
        send 3 Control URBs updating all of the settings after each piece of input
      
        I am trying to work around the issue of gmail messing with the tab/spacing
        by submitting via SMTP via gmail which I believe should fix the issue.
      
        The patch is against v3.2-rc2 and compiles - but no additional testing in
        this kernel has been done.
      
        Thanks
      
         Andrew
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      b1ffb4c8
    • F
      USB: option: add PID of Huawei E173s 3G modem · 4aa3648c
      Ferenc Wagner 提交于
      Signed-off-by: NFerenc Wagner <wferi@niif.hu>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      4aa3648c
    • A
      OHCI: final fix for NVIDIA problems (I hope) · c6187597
      Alan Stern 提交于
      Problems with NVIDIA's OHCI host controllers persist.  After looking
      carefully through the spec, I finally realized that when a controller
      is reset it then automatically goes into a SUSPEND state in which it
      is completely quiescent (no DMA and no IRQs) and from which it will
      not awaken until the system puts it into the OPERATIONAL state.
      
      Therefore there's no need to worry about controllers being in the
      RESET state for extended periods, or remaining in the OPERATIONAL
      state during system shutdown.  The proper action for device
      initialization is to put the controller into the RESET state (if it's
      not there already) and then to issue a software reset.  Similarly, the
      proper action for device shutdown is simply to do a software reset.
      
      This patch (as1499) implements such an approach.  It simplifies
      initialization and shutdown, and allows the NVIDIA shutdown-quirk code
      to be removed.
      Signed-off-by: NAlan Stern <stern@rowland.harvard.edu>
      Tested-by: NAndre "Osku" Schmidt <andre.osku.schmidt@googlemail.com>
      Tested-by: NArno Augustin <Arno.Augustin@web.de>
      Cc: stable <stable@vger.kernel.org> [after tested in 3.2 for a while]
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      c6187597
    • Z
      USB: option: release new PID for ZTE 3G modem · 46b5a277
      zheng.zhijian@zte.com.cn 提交于
      This patch adds new PIDs for ZTE 3G modem, after we confirm it and tested.
      Thanks for Dan's work at kernel option devier.
      Signed-off-by: NAlvin.Zheng <zheng.zhijian@zte.com.cn>
      Signed-off-by: Nwsalvin <wsalvin@yahoo.com.cn>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      46b5a277
    • J
      usb: Netlogic: Fix HC_LENGTH call in ehci-xls.c · e253dec3
      Jayachandran C 提交于
      Fix compile error, HC_LENGTH now takes two parameters and ehci
      needs to be passed as the first parameter.
      Signed-off-by: NJayachandran C <jayachandranc@netlogicmicro.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      e253dec3
    • M
      misc: ad525x_dpot: Fix AD8400 spi transfer size. · 6ac2afb3
      Michael Hennerich 提交于
      AD8400 type devices require 16-bit command transfers.
      Signed-off-by: NMichael Hennerich <michael.hennerich@analog.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      6ac2afb3
    • C
      drivers/base/node.c: fix compilation error with older versions of gcc · 91a13c28
      Claudio Scordino 提交于
      Patch to fix the error message "directives may not be used inside a macro
      argument" which appears when the kernel is compiled for the cris architecture.
      Signed-off-by: NClaudio Scordino <claudio@evidence.eu.com>
      Acked-by: NDavid Rientjes <rientjes@google.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      91a13c28
  4. 18 11月, 2011 8 次提交
    • S
      sky2: fix hang in napi_disable · 282edcec
      stephen hemminger 提交于
      If IRQ was never initialized, then calling napi_disable() would hang.
      Add more bookkeeping to track whether IRQ was ever initialized.
      Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      282edcec
    • S
      sky2: enforce minimum ring size · 738a849c
      stephen hemminger 提交于
      The hardware has a restriction that the minimum ring size possible
      is 128. The number of elements used is controlled by tx_pending and
      the overall number of elements in the ring tx_ring_size, therefore it
      is okay to limit the number of elements in use to a small value (63)
      but still provide a bigger ring.
      Signed-off-by: NStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      738a849c
    • V
      bonding: Don't allow mode change via sysfs with slaves present · 4a8bb7e2
      Veaceslav Falico 提交于
      When changing mode via bonding's sysfs, the slaves are not initialized
      correctly. Forbid to change modes with slaves present to ensure that every
      slave is initialized correctly via bond_enslave().
      Signed-off-by: NVeaceslav Falico <vfalico@redhat.com>
      Signed-off-by: NAndy Gospodarek <andy@greyhouse.net>
      Acked-by: NNicolas de Pesloüan <nicolas.2p.debian@free.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4a8bb7e2
    • R
      f_phonet: fix page offset of first received fragment · 38ff1edb
      Rémi Denis-Courmont 提交于
      We pull one byte (the MAC header) from the first fragment before the
      fragment is actually appended. So the socket buffer length is 1, not 0.
      Signed-off-by: NRémi Denis-Courmont <remi.denis-courmont@nokia.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      38ff1edb
    • R
      PM Sleep: Do not extend wakeup paths to devices with ignore_children set · 8b258cc8
      Rafael J. Wysocki 提交于
      Commit 4ca46ff3 (PM / Sleep: Mark
      devices involved in wakeup signaling during suspend) introduced
      the power.wakeup_path field in struct dev_pm_info to mark devices
      whose children are enabled to wake up the system from sleep states,
      so that power domains containing the parents that provide their
      children with wakeup power and/or relay their wakeup signals are not
      turned off.  Unfortunately, that introduced a PM regression on SH7372
      whose power consumption in the system "memory sleep" state increased
      as a result of it, because it prevented the power domain containing
      the I2C controller from being turned off when some children of that
      controller were enabled to wake up the system, although the
      controller was not necessary for them to signal wakeup.
      
      To fix this issue use the observation that devices whose
      power.ignore_children flag is set for runtime PM should be treated
      analogously during system suspend.  Namely, they shouldn't be
      included in wakeup paths going through their children.  Since the
      SH7372 I2C controller's power.ignore_children flag is set, doing so
      will restore the previous behavior of that SOC.
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Acked-by: NGreg Kroah-Hartman <gregkh@suse.de>
      8b258cc8
    • J
      TTY: ldisc, wait for ldisc infinitely in hangup · 0c73c08e
      Jiri Slaby 提交于
      For /dev/console case, we do not kill all ldisc users. It's due to
      redirected_tty_write test in __tty_hangup. In that case there still
      might be a process waiting e.g. in n_tty_read for input.
      
      We wait for such processes to disappear. The problem is that we use a
      timeout. After this timeout, we continue closing the ldisc and start
      freeing tty resources. It obviously leads to crashes when the other
      process is woken.
      
      So to fix this, we wait infinitely before reiniting the ldisc. (The
      tiocsetd remains untouched -- times out after 5s.)
      
      This is nicely reproducible with this run from shell:
        exec 0<>/dev/console 1<>/dev/console 2<>/dev/console
      and stopping a getty like:
        systemctl stop serial-getty@ttyS0.service
      
      The crash proper may be produced only under load or with constified
      timing the same as for 92f6fa09.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Cc: Dave Young <hidave.darkstar@gmail.com>
      Cc: Dave Jones <davej@redhat.com>
      Cc: Ben Hutchings <ben@decadent.org.uk>
      Cc: Dmitriy Matrosov <sgf.dma@gmail.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      0c73c08e
    • J
      TTY: ldisc, move wait idle to caller · 30042072
      Jiri Slaby 提交于
      It is the only place where reinit is called from. And we really need
      to wait for the old ldisc to go once. Actually this is the place where
      the waiting originally was (before removed and re-added later).
      
      This will make the fix in the following patch easier to implement.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Cc: Dave Young <hidave.darkstar@gmail.com>
      Cc: Dave Jones <davej@redhat.com>
      Cc: Ben Hutchings <ben@decadent.org.uk>
      Cc: Dmitriy Matrosov <sgf.dma@gmail.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      30042072
    • J
      TTY: ldisc, allow waiting for ldisc arbitrarily long · df92d056
      Jiri Slaby 提交于
      To fix a nasty bug in ldisc hup vs. reinit we need to wait infinitely
      long for ldisc to be gone. So here we add a parameter to
      tty_ldisc_wait_idle to allow that.
      
      This is only a preparation for the real fix which is done in the
      following patches.
      Signed-off-by: NJiri Slaby <jslaby@suse.cz>
      Cc: Dave Young <hidave.darkstar@gmail.com>
      Cc: Dave Jones <davej@redhat.com>
      Cc: Ben Hutchings <ben@decadent.org.uk>
      Cc: Dmitriy Matrosov <sgf.dma@gmail.com>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      df92d056
  5. 17 11月, 2011 19 次提交