Commit graph

506942 commits

Author SHA1 Message Date
Hannes Frederic Sowa
6e9e16e614 ipv6: replacing a rt6_info needs to purge possible propagated rt6_infos too
Lubomir Rintel reported that during replacing a route the interface
reference counter isn't correctly decremented.

To quote bug <https://bugzilla.kernel.org/show_bug.cgi?id=91941>:
| [root@rhel7-5 lkundrak]# sh -x lal
| + ip link add dev0 type dummy
| + ip link set dev0 up
| + ip link add dev1 type dummy
| + ip link set dev1 up
| + ip addr add 2001:db8:8086::2/64 dev dev0
| + ip route add 2001:db8:8086::/48 dev dev0 proto static metric 20
| + ip route add 2001:db8:8088::/48 dev dev1 proto static metric 10
| + ip route replace 2001:db8:8086::/48 dev dev1 proto static metric 20
| + ip link del dev0 type dummy
| Message from syslogd@rhel7-5 at Jan 23 10:54:41 ...
|  kernel:unregister_netdevice: waiting for dev0 to become free. Usage count = 2
|
| Message from syslogd@rhel7-5 at Jan 23 10:54:51 ...
|  kernel:unregister_netdevice: waiting for dev0 to become free. Usage count = 2

During replacement of a rt6_info we must walk all parent nodes and check
if the to be replaced rt6_info got propagated. If so, replace it with
an alive one.

Fixes: 4a287eba2d ("IPv6 routing, NLM_F_* flag support: REPLACE and EXCL flags support, warn about missing CREATE flag")
Reported-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Tested-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:22:14 -08:00
David S. Miller
225776098b Merge branch 'sh_eth'
Ben Hutchings says:

====================
Fixes for sh_eth #3

I'm continuing review and testing of Ethernet support on the R-Car H2
chip.  This series fixes the last of the more serious issues I've found.

These are not tested on any of the other supported chips.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:18:57 -08:00
Ben Hutchings
52b9fa3696 sh_eth: Fix DMA-API usage for RX buffers
- Use the return value of dma_map_single(), rather than calling
  virt_to_page() separately
- Check for mapping failue
- Call dma_unmap_single() rather than dma_sync_single_for_cpu()

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:18:54 -08:00
Ben Hutchings
aa3933b873 sh_eth: Check for DMA mapping errors on transmit
dma_map_single() may fail if an IOMMU or swiotlb is in use, so
we need to check for this.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:18:53 -08:00
Ben Hutchings
740c7f31c0 sh_eth: Ensure DMA engines are stopped before freeing buffers
Currently we try to clear EDRRR and EDTRR and immediately continue to
free buffers.  This is unsafe because:

- In general, register writes are not serialised with DMA, so we still
  have to wait for DMA to complete somehow
- The R8A7790 (R-Car H2) manual states that the TX running flag cannot
  be cleared by writing to EDTRR
- The same manual states that clearing the RX running flag only stops
  RX DMA at the next packet boundary

I applied this patch to the driver to detect DMA writes to freed
buffers:

> --- a/drivers/net/ethernet/renesas/sh_eth.c
> +++ b/drivers/net/ethernet/renesas/sh_eth.c
> @@ -1098,7 +1098,14 @@ static void sh_eth_ring_free(struct net_device *ndev)
>  	/* Free Rx skb ringbuffer */
>  	if (mdp->rx_skbuff) {
>  		for (i = 0; i < mdp->num_rx_ring; i++)
> +			memcpy(mdp->rx_skbuff[i]->data,
> +			       "Hello, world", 12);
> +		msleep(100);
> +		for (i = 0; i < mdp->num_rx_ring; i++) {
> +			WARN_ON(memcmp(mdp->rx_skbuff[i]->data,
> +				       "Hello, world", 12));
>  			dev_kfree_skb(mdp->rx_skbuff[i]);
> +		}
>  	}
>  	kfree(mdp->rx_skbuff);
>  	mdp->rx_skbuff = NULL;

then ran the loop:

    while ethtool -G eth0 rx 128 ; ethtool -G eth0 rx 64; do echo -n .; done

and 'ping -f' toward the sh_eth port from another machine.  The
warning fired several times a minute.

To fix these issues:

- Deactivate all TX descriptors rather than writing to EDTRR
- As there seems to be no way of telling when RX DMA is stopped,
  perform a soft reset to ensure that both DMA enginess are stopped
- To reduce the possibility of the reset truncating a transmitted
  frame, disable egress and wait a reasonable time to reach a
  packet boundary before resetting
- Update statistics before resetting

(The 'reasonable time' does not allow for CS/CD in half-duplex
mode, but half-duplex no longer seems reasonable!)

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:18:53 -08:00
Ben Hutchings
dc1d0e6d55 sh_eth: Remove RX overflow log messages
If RX traffic is overflowing the FIFO or DMA ring, logging every time
this happens just makes things worse.  These errors are visible in the
statistics anyway.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:18:53 -08:00
David S. Miller
971f49dee2 Merge branch 'phy-next'
Florian Fainelli says:

====================
net: phy: prevent double suspend

This patch series addresses a problem that Fugang and I observed on different
platforms where a given PHY device might end-up being suspended twice.

Once as part of the call from ndo_open() all the way down to phy_detach() and
phy_suspend() and a second time when the generic platform device/driver
suspend/resume callbacks are called in drivers/net/phy/mdio_bus.c.

Thanks to Fugang for giving this a quick try on i.MX6/FEC and reporting
positive test results!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:16:56 -08:00
Florian Fainelli
803dd9c77a net: phy: avoid suspending twice a PHY
As part of a call to ndo_close() a netdevice driver may call
phy_disconnect() -> phy_detach() -> phy_suspend(), such that the PHY is
suspsended at this point and a netdevice driver may clock gate the
backing peripheral providing MDIO bus accessses as well.

Update mdio_bus_phy_may_suspend() to return whether a PHY is allowed to
be suspended and conversely resumed if and only if it was not previously
suspended before while it is currently in detached (netdev pointer is
NULL) state.

This fixes bus errors seen during S2/S3 suspend/resume cycles for
netdevice drivers such as GENET which clock gates the entire Ethernet
MAC, including the MDIO bus block.

Acked-by: Fugang Duan <B38611@freescale.com>
Tested-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:16:51 -08:00
Florian Fainelli
8a477a6fb6 net: phy: keep track of the PHY suspend state
In order to avoid double calls to phydev->drv->suspend and resume, keep
track of whether the PHY has already been suspended as a consequence of
a successful call to phy_suspend(). We will use this in our MDIO bus
suspend/resume hooks to avoid a double suspend call.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:16:51 -08:00
Florian Fainelli
aae88261ab net: phy: document has_fixups field
has_fixups was introduced to help keeping track of fixups/quirks running
on a PHY device, but we did not update the comment above struct
phy_device accordingly.

Fixes: b0ae009f3d (net: phy: add "has_fixups" boolean property")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:16:51 -08:00
Florian Fainelli
9272efa203 net: phy: utilize phy_suspend and phy_resume
phy_suspend and phy_resume are an abstraction on top of the PHY device
driver suspend and resume callbacks, utilize those since they are the
proper interface to suspending and resuming a PHY device.

Acked-by: Fugang Duan <B38611@freescale.com>
Tested-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:16:51 -08:00
David S. Miller
d2fa7cc4e3 Merge branch 'cxgb4-next'
Hariprasad Shenai says:

====================
Add support to dump cim ibq, obq and qinfo, etc

This patch series adds support to dump cim_ibq, cim_obq, sge_qinfo, pm_stats
and clk debugfs entries.

The patches series is created against 'net-next' tree.
And includes patches on cxgb4 driver.

We have included all the maintainers of respective drivers. Kindly review the
change and let us know in case of any review comments.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:15:06 -08:00
Hariprasad Shenai
b58b667687 cxgb4: Added support in debugfs to dump different timer and clock values of the adapter
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:15:02 -08:00
Hariprasad Shenai
b3bbe36a26 cxgb4: Added support in debugfs to dump PM module stats
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:15:02 -08:00
Hariprasad Shenai
c778af7d18 cxgb4: Addded support in debugfs to dump CIM outbound queue content
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:15:01 -08:00
Hariprasad Shenai
e5f0e43bee cxgb4: Added support in debugfs to dump cim ingress bound queue contents
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:15:01 -08:00
Hariprasad Shenai
dc9daab226 cxgb4: Added support in debugfs to dump sge_qinfo
Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:15:01 -08:00
David S. Miller
8d8d67f140 linux-can-fixes-for-3.19-20150127
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJUx0SsAAoJECte4hHFiupUy9wP/3YkYTtcFcyZ4xbv3v8q+AZX
 GklmuK8aSmyy6Rwq/ZWtE8g9FCnedBy5D5ws76BgJjwmuAinsfjA893IYfPD0oTV
 sR6QKkA9QP3CgAwLfkH4+Zkd/dV4ltwZwTenwTPUXLZ/6qxfWjwvGwgXPoaZtChO
 R3Sqf0l4h7hmVu2/xuUNAycSysQYqCkbHVD3q1bEyd6H3jvFze/YixRqOaiCXwNh
 nI0H7lrdAAnYKfmWfKI6SaWtfxfyejExdMfDGwbe6FWPX6YNWI/4RB+vJwVLELuy
 kjJBZEFEVJWNsrwXOU/EqIyajXrSIt6asLy0wNaME99QzSAyV857PY8ZLuhEwcWP
 bmYrIPRvFKnG+STcIhZC+xOGEPVTe2Mh4y+JLgTQ0JWFR8+8GWdBRI1Oj1BYblGh
 CUMIeSs1KeQ0HHBAD/frCg2FxPzE/cZvqgznr8neC6o7fkrw0HOq9zn8ovC1vsYk
 lky0tNDO3ZTdagghGzr1Wfcs+TAyI4qrMWTI7cbuyZ+o/icPhR3WIkA3RFR0imBb
 yEB32HUN06YZnvQs8DsRIh4EhJe2f/ZjSETl5uxhI/bgaBYGzplSP0S95Q8tblWR
 6zpJyBTEkoaFZXLD0MPmAi7rp3EcpK3orjI5g9CgOoYK09AvIPcH3wRffvkht1/E
 WgmUt4gecjxWfukFU408
 =S/gP
 -----END PGP SIGNATURE-----

Merge tag 'linux-can-fixes-for-3.19-20150127' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
pull-request: can 2015-01-27

this is another pull request for net/master which consists of 4 patches.

All 4 patches are contributed by Ahmed S. Darwish, he fixes more problems in
the kvaser_usb driver.

David, please merge net/master to net-next/master, as we have more kvaser_usb
patches in the queue, that target net-next.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:13:05 -08:00
Vivien Didelot
b8665c6c16 net: dsa/mv88e6352: make mv88e6352_wait generic
Some busy bits are available in the global register 1, such as the ATU
Busy bit. We may want to use this function to wait for them to change,
so add a new parameter to mv88e6352_wait() instead of hard-coding
REG_GLOBAL2.

In the meantime, since the REG_READ() macro already checks for error,
remove the redundant check for ret < 0.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:05:56 -08:00
subashab@codeaurora.org
fc752f1f43 ping: Fix race in free in receive path
An exception is seen in ICMP ping receive path where the skb
destructor sock_rfree() tries to access a freed socket. This happens
because ping_rcv() releases socket reference with sock_put() and this
internally frees up the socket. Later icmp_rcv() will try to free the
skb and as part of this, skb destructor is called and which leads
to a kernel panic as the socket is freed already in ping_rcv().

-->|exception
-007|sk_mem_uncharge
-007|sock_rfree
-008|skb_release_head_state
-009|skb_release_all
-009|__kfree_skb
-010|kfree_skb
-011|icmp_rcv
-012|ip_local_deliver_finish

Fix this incorrect free by cloning this skb and processing this cloned
skb instead.

This patch was suggested by Eric Dumazet

Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:04:53 -08:00
Vivien Didelot
bb92ea5e35 net: dsa/mv88e6xxx: add reg read and write debug
This commit adds debug messages for the generic mv88e6xxx read and write
routines. The output is similar to this:

    mdio-gpio mdio-gpio.0: <- addr: 0x1b reg: 0x05 val: 0x4000
    mdio-gpio mdio-gpio.0: -> addr: 0x1b reg: 0x07 val: 0x3113
    mdio-gpio mdio-gpio.0: -> addr: 0x1b reg: 0x08 val: 0x0330
    mdio-gpio mdio-gpio.0: -> addr: 0x1b reg: 0x09 val: 0x0000

This is convenient to dynamically debug operations through debugfs with:

    echo file mv88e6xxx.c +p > <debugfs>/dynamic_debug/control

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:04:02 -08:00
Herbert Xu
86f3cddbc3 udp_diag: Fix socket skipping within chain
While working on rhashtable walking I noticed that the UDP diag
dumping code is buggy.  In particular, the socket skipping within
a chain never happens, even though we record the number of sockets
that should be skipped.

As this code was supposedly copied from TCP, this patch does what
TCP does and resets num before we walk a chain.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Pavel Emelyanov <xemul@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 00:02:41 -08:00
Chen-Yu Tsai
43c0e22340 Input: sun4i-ts - add support for touchpanel controller on A31
The Allwinner A31 SoC (sun6i) has the same resistive touchpanel controller
as on other sunxi platforms. The only difference between the variants is
the control bits for enabling operations are left-shifted by 1 on the A31.

Also update the comment for the original temperature sensor with
information from Allwinner.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2015-01-26 23:58:56 -08:00
Ahmed S. Darwish
e638642b08 can: kvaser_usb: Fix state handling upon BUS_ERROR events
While being in an ERROR_WARNING state, and receiving further
bus error events with error counters still in the ERROR_WARNING
range of 97-127 inclusive, the state handling code erroneously
reverts back to ERROR_ACTIVE.

Per the CAN standard, only revert to ERROR_ACTIVE when the
error counters are less than 96.

Moreover, in certain Kvaser models, the BUS_ERROR flag is
always set along with undefined bits in the M16C status
register. Thus use bitwise operators instead of full equality
for checking that register against bus errors.

Signed-off-by: Ahmed S. Darwish <ahmed.darwish@valeo.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2015-01-27 08:55:09 +01:00
Ahmed S. Darwish
14c10c2a1d can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT
On some x86 laptops, plugging a Kvaser device again after an
unplug makes the firmware always ignore the very first command.
For such a case, provide some room for retries instead of
completely exiting the driver init code.

Signed-off-by: Ahmed S. Darwish <ahmed.darwish@valeo.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2015-01-27 08:55:09 +01:00
Ahmed S. Darwish
3803fa6977 can: kvaser_usb: Send correct context to URB completion
Send expected argument to the URB completion hander: a CAN
netdevice instead of the network interface private context
`kvaser_usb_net_priv'.

This was discovered by having some garbage in the kernel
log in place of the netdevice names: can0 and can1.

Signed-off-by: Ahmed S. Darwish <ahmed.darwish@valeo.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2015-01-27 08:55:08 +01:00
Ahmed S. Darwish
ded5006667 can: kvaser_usb: Do not sleep in atomic context
Upon receiving a hardware event with the BUS_RESET flag set,
the driver kills all of its anchored URBs and resets all of
its transmit URB contexts.

Unfortunately it does so under the context of URB completion
handler `kvaser_usb_read_bulk_callback()', which is often
called in an atomic context.

While the device is flooded with many received error packets,
usb_kill_urb() typically sleeps/reschedules till the transfer
request of each killed URB in question completes, leading to
the sleep in atomic bug. [3]

In v2 submission of the original driver patch [1], it was
stated that the URBs kill and tx contexts reset was needed
since we don't receive any tx acknowledgments later and thus
such resources will be locked down forever. Fortunately this
is no longer needed since an earlier bugfix in this patch
series is now applied: all tx URB contexts are reset upon CAN
channel close. [2]

Moreover, a BUS_RESET is now treated _exactly_ like a BUS_OFF
event, which is the recommended handling method advised by
the device manufacturer.

[1] http://article.gmane.org/gmane.linux.network/239442
    http://www.webcitation.org/6Vr2yagAQ

[2] can: kvaser_usb: Reset all URB tx contexts upon channel close
    889b77f7fd

[3] Stacktrace:

 <IRQ>  [<ffffffff8158de87>] dump_stack+0x45/0x57
 [<ffffffff8158b60c>] __schedule_bug+0x41/0x4f
 [<ffffffff815904b1>] __schedule+0x5f1/0x700
 [<ffffffff8159360a>] ? _raw_spin_unlock_irqrestore+0xa/0x10
 [<ffffffff81590684>] schedule+0x24/0x70
 [<ffffffff8147d0a5>] usb_kill_urb+0x65/0xa0
 [<ffffffff81077970>] ? prepare_to_wait_event+0x110/0x110
 [<ffffffff8147d7d8>] usb_kill_anchored_urbs+0x48/0x80
 [<ffffffffa01f4028>] kvaser_usb_unlink_tx_urbs+0x18/0x50 [kvaser_usb]
 [<ffffffffa01f45d0>] kvaser_usb_rx_error+0xc0/0x400 [kvaser_usb]
 [<ffffffff8108b14a>] ? vprintk_default+0x1a/0x20
 [<ffffffffa01f5241>] kvaser_usb_read_bulk_callback+0x4c1/0x5f0 [kvaser_usb]
 [<ffffffff8147a73e>] __usb_hcd_giveback_urb+0x5e/0xc0
 [<ffffffff8147a8a1>] usb_hcd_giveback_urb+0x41/0x110
 [<ffffffffa0008748>] finish_urb+0x98/0x180 [ohci_hcd]
 [<ffffffff810cd1a7>] ? acct_account_cputime+0x17/0x20
 [<ffffffff81069f65>] ? local_clock+0x15/0x30
 [<ffffffffa000a36b>] ohci_work+0x1fb/0x5a0 [ohci_hcd]
 [<ffffffff814fbb31>] ? process_backlog+0xb1/0x130
 [<ffffffffa000cd5b>] ohci_irq+0xeb/0x270 [ohci_hcd]
 [<ffffffff81479fc1>] usb_hcd_irq+0x21/0x30
 [<ffffffff8108bfd3>] handle_irq_event_percpu+0x43/0x120
 [<ffffffff8108c0ed>] handle_irq_event+0x3d/0x60
 [<ffffffff8108ec84>] handle_fasteoi_irq+0x74/0x110
 [<ffffffff81004dfd>] handle_irq+0x1d/0x30
 [<ffffffff81004727>] do_IRQ+0x57/0x100
 [<ffffffff8159482a>] common_interrupt+0x6a/0x6a

Signed-off-by: Ahmed S. Darwish <ahmed.darwish@valeo.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2015-01-27 08:55:08 +01:00
Niklas Söderlund
1e7d5d849c sh-pfc: Add emev2 pinmux support
Add PFC support for the EMMA Mobile EV2 SoC including pin groups for
on-chip devices.

Signed-off-by: Niklas Söderlund <niso@kth.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-01-27 08:50:22 +01:00
Niklas Söderlund
4c9e473541 sh-pfc: add macro to define pinmux without function
Used to define pinmux configurations where the pinmux function have no
representation in the configuration registers but instead solely depends
on a group selection.

Signed-off-by: Niklas Söderlund <niso@kth.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-01-27 08:47:53 +01:00
Vishnu Patekar
e443631d20 Input: serio - add support for Alwinner A10/A20 PS/2 controller
This driver implements support for PS2 controller found on Allwinner A10,
A20 SOCs. It has been tested on A20 Olimex-Lime2 board and also on A10.

Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2015-01-26 23:10:13 -08:00
Martin Kepplinger
8d21282036 Input: gtco - use sign_extend32() for sign extension
Signed-off-by: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
2015-01-26 23:07:45 -08:00
Olof Johansson
ed1bd46bee Patches to add necessary SoC related clockdomain and interconnect
data  to make dm816x boot with basic devices. This finally gets
 dm816x into a usable shape for further work to happen after a few
 years of stalled effort of making this SoC to work with the mainline
 kernel.
 
 As most of the devices are similar to the other omap variants, we
 get at least serial, MMC, Ethernet, I2C, EDMA, pinctrl, SPI and GPMC
 working for these SoCs with the related device tree changes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUxn4KAAoJEBvUPslcq6VzV9sP/2MHuTxTTVKyApk6jSNjJIqE
 02I08N7eMc/b46Ct3X4zzIne+k0k1p/gBUx1o4oWyq/L3O21QpMHMEV4wDknF9PO
 oUsyFB5psv6SScH6zA20CjWHJ3DSmbUEHeccy5TFeUFIjpfnSnzOfipE/x+A2q8F
 nccZ+oEDh2BA7EXE1WYu5+rxJJo6YB8WNKy8XTDxoeBaOapblDMGqPL2AlBdwaoH
 2P6gd0V2HWHb99ajp5edyvXJeMQ1jF3ztygoePuYyCNm5EgeZukeAECuh5i3vqL+
 a2P4snRJwJAp2y45DWKJaUW89H25mQ9ZF9N4ZmgUOrkv6IoWmC+qtL9iQxlBgiZa
 3pA31jkQCUbwxTYSbthqnuoJynGw9joxiR0FSJyIzYrqQPQC6byrvNr6Moue4GFy
 8D5gjwYBrd9J7h6fetjnRlTcnxBdtXablut1RiglS7SorNfHh4Ty/BGNH/QLvQkS
 /Z1krJ5zVlSt4KRFF4Fx3nIEu4/t3N3fiLRY3IDoelKNc8ghYGmZHT7LnQ5OKyAW
 2leBIhjzgJUkukXYgQiQfgM8LlOnLDjcUa3u++C5dJvu2tw7dUeie+kjkwNg4k79
 +cxdQpP6y3n6O5hWryoC3Odj4EvbTSX9izNNnaGKtFTl3drOe91ZX1gksFUh0ueJ
 RBTfzA6MqAscqk7CQ9ch
 =tGOy
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.20/dm816x-data' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Merge "omap changes to make dm816x usable" from Tony Lindgren:

Patches to add necessary SoC related clockdomain and interconnect
data  to make dm816x boot with basic devices. This finally gets
dm816x into a usable shape for further work to happen after a few
years of stalled effort of making this SoC to work with the mainline
kernel.

As most of the devices are similar to the other omap variants, we
get at least serial, MMC, Ethernet, I2C, EDMA, pinctrl, SPI and GPMC
working for these SoCs with the related device tree changes.

* tag 'omap-for-v3.20/dm816x-data' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Add dm816x hwmod support
  ARM: OMAP2+: Add clock domain support for dm816x
  ARM: OMAP2+: Add board-generic.c entry for ti81xx
  ARM: OMAP2+: Disable omap3 PM init for ti81xx
  ARM: OMAP2+: Fix reboot for 81xx
  ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
  ARM: OMAP2+: Fix ti81xx class type
  ARM: OMAP2+: Fix ti81xx devtype
  ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 20:29:58 -08:00
Olof Johansson
d846c1a63f Non-critical fixes for omap hwmod code via Paul Walmsley <paul@pwsan.com>:
First set of OMAP2+ hwmod patches for Linux v3.20.  These are mostly
 fixes for warnings, although there's one DRA7xx patch that fixes
 CONFIG_DEBUG_LL for AM572x/DRA7xx SoCs that use UART3 for console,
 such as the BeagleBoard-X15.
 
 These patches entered Linux-next starting with the next-20150121 tag.
 
 Basic build, boot, and PM test results can be found here:
 
 http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v3.20/20150121142621/
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUxqwlAAoJEBvUPslcq6VzNyUP+gP/MbuwUsVAQjEWqITzuXQU
 KMBMU5M5fJcUs8IQiSCkhohCk2PiPlvUFr0ghN6ELKACFkdZwM3MEU2HU/joCM0t
 RdoQrlU35IyiAlsPt4EjMepHus+nN7u5vOBHrSmatF2GFVi0yrQfG+XxLmvqXQof
 DxrzbRm2T4R8MQ6rWOUmawe8lzTphEKv5EfEmUEqVamMIZysEq65tUFRoPZHZ7sf
 rQt8UlSNUVER7OtwEX5H0fhhYl1Gstc8aNX0qIIylP8V09TOZcr3DAn3nbx+31MD
 96XjADbLGS6b7Ke9UiQz6cLQIMSVuEg9BoUnDT+JEmrcuj4XwQT0+59Vtk7L2Wxl
 j0a3mkuwtIkShvNV3I1rMwKY5BriZrFMTrworvtnLEUUI57MamAX6gH+bme0I5CX
 DnEL5Ung/Klp83/r/ye8o/Hy+zcyKD3QboONSr6KDvNnmFuxcS8enOGwUfZdfNCT
 /8+TdPHt39BMp5VwpzBooPvgncFG29L6plwQjYQ2NB4MnggSPE6r4/gSXJmsZegA
 MStZwpvVLK34lNWjx9td5ouR8+A9gXuPeGx0xHvfOpDGdaDkycpT3i6YozBmET80
 mEC2z+8r0bG64jiYlZz8gQoSzTdK9dzdze+Zo4c4qWzXfRG+bRicyr1FEn9DGH75
 eyVzTYLJoIgz7btW+3mS
 =2Zfx
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.20/fixes-not-urgent-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Merge "omap non-urgent fixes for v3.20, part 2" from Tony Lindgren:

Non-critical fixes for omap hwmod code via Paul Walmsley <paul@pwsan.com>:

First set of OMAP2+ hwmod patches for Linux v3.20.  These are mostly
fixes for warnings, although there's one DRA7xx patch that fixes
CONFIG_DEBUG_LL for AM572x/DRA7xx SoCs that use UART3 for console,
such as the BeagleBoard-X15.

These patches entered Linux-next starting with the next-20150121 tag.

Basic build, boot, and PM test results can be found here:

http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v3.20/20150121142621/

* tag 'omap-for-v3.20/fixes-not-urgent-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3
  ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
  ARM: AM43xx: hwmod: set DSS submodule parent hwmods
  ARM: OMAP2+: hwmod: print error if wait_target_ready() failed
  MAINTAINERS: add maintainer for OMAP hwmod data

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 20:28:20 -08:00
Olof Johansson
9a5074ff59 Second DT batch for 3.20:
- correct some pin configuration for at91sam9x5ek
 - add pioD on sama5d4 following a modification of pinctrl driver
 - add more precise nand compatibility string for sama5d4
 - audio modifications for wm8904 or ac97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUxmgWAAoJEAf03oE53VmQtCoIAJtnUtvW5DqRWWsAzKxv6tPF
 FLXihD9MRPyywgN5hDvNInKibqcBNxnLfk0xiFbCbfZXU4u6SK1E5iJN72mkTxhP
 6rC/rdMDqMqGK7W43h4xFFpQdPrrq00t36gGvnQ+IUaOYcGAByJPYB3YwKMv/n0x
 xHTPhydb2RPphEd9ZaXsbUKcaOJPG/6uChQSTp+8L0MAlh4cQADya1SapDhRefDa
 PFz49N8QIjxgjWyJiWorcD8KH8hkGzLtvuvDl3UWkNZz9i3h7Vl3QaraC3HCHqwm
 kJrOJ/EVw1uJKAKtYoo9xfoA8Z5HHno3vcQ4gKq4ylYDHIB3P4UhQLaGlcqkZfk=
 =yOLr
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Merge "at91: dt for 3.20 #2" from Nicolas Ferre:

Second DT batch for 3.20:
- correct some pin configuration for at91sam9x5ek
- add pioD on sama5d4 following a modification of pinctrl driver
- add more precise nand compatibility string for sama5d4
- audio modifications for wm8904 or ac97

* tag 'at91-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sam9263: Add ac97 device node
  dt: atmel_ac97c: Add device tree documentation
  ARM: at91: at91sam9n12ek/dt: use dt ids for wm8904
  ARM: at91: sama5d3xek/dt: use dt ids for wm8904
  ARM: at91: sama5d4: dts: change the nand compatible string
  ARM: at91/dt: sama5d4: add pioD controller
  ARM: at91/dt: disable pull-up on vbus-gpio (PB16) to reduce power consumption

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 20:26:34 -08:00
Olof Johansson
8749f9f3cf Allwinner device tree changes for 3.20
A lot of changes to the device tree for the 3.20 merge window, mostly with:
   - More DT license convertions, only two DTS and two DTSI are still uncertain
     and have not been converted yet
   - Use the C-preprocessor includes in the device trees.
   - Add support for the A31s SoC and improve the A80 support
   - Add IR receiver, lradc, PS/2 support
   - Add cpufreq support for all SoCs but the A23 and A80.
   - And a lot of new boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUxSjgAAoJEBx+YmzsjxAgfNcQAJdm22JbZ8T8elBXA5bU/V7e
 35eM9r+osTM25w/kZaQKQ3RMhQNuBmM6BBTXX5BRYBRKBx+YL791repfa6LEH15W
 ZVQ4+Iqsa3FrDiVnMGqOb+idjMuWKtluu6SBkZFeeCB7qN56zMFuEKgQaT/ICrmD
 E5fG/Z91nGCVaHnvDEUCeWb+snDxlMD8E54QpUwLqnkQHvylujnY8DMSopZJuqzK
 OABiBkHr9TZYFfsr9JIuKSMI3lFHtEf6RbcvLcyTbqXSvm6t/qR02ip1SIunVD/K
 2MUyVuewh3VGZZgZTVPITHTWDfMIYU3BZc8lWSPDTXo55vMB5Q7UfdeyAWUEaWkI
 cIVyHeOJ2442XDhqvkWHEFNZlfQl8i3nU+xmINVjp0KqcemoD2cjn9ZmKCnaoLkV
 kB7VxF1e2GKOm7qnAB1qo5xRmyi2wLZsRecXdeSHYiiO2DZtSCa4E1vMqo5U01mX
 0+8sKFEY+w+G/2dgoEXTsp08Yqsgd0fjCD6F8sxZdlskRsgBuBYS4s54xyrGr72b
 Lo6WxUrc1GKEh7N3RvVqidXdYL6nUr/Pfg4n0LMwQPwWPUzXlpBeFQiHkVDl9/Mh
 Bqb/GqYB5brw8KELb5blKuwzNQy6yP3K4glf2Rz3JfuPLr2y54/BaXGg66fS0ijP
 Y1NkkG2AVh9lamtyHYBI
 =pWBS
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt

Merge "Allwinner device tree changes for 3.20" from Maxime Ripard:

A lot of changes to the device tree for the 3.20 merge window, mostly with:
  - More DT license convertions, only two DTS and two DTSI are still uncertain
    and have not been converted yet
  - Use the C-preprocessor includes in the device trees.
  - Add support for the A31s SoC and improve the A80 support
  - Add IR receiver, lradc, PS/2 support
  - Add cpufreq support for all SoCs but the A23 and A80.
  - And a lot of new boards

* tag 'sunxi-dt-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (64 commits)
  ARM: dts: sun5i: Enable axp209 support on A13-OLinuxIno
  ARM: sunxi: dts: Add A10/A20 PS2 pin muxing options
  ARM: sunxi: dts: Add PS2 nodes to dtsi for A10,A20
  ARM: dts: sun6i: Add resistive touchscreen controller node to dtsi
  ARM: dts: sun4i: Add Hyundau A7HD board
  ARM: dts: sun4i: Add Marsboard A10 board
  ARM: dts: sun9i: Enable mmc2 on A80 Optimus Board
  ARM: dts: sun9i: Add 8 bit mmc pinmux setting for mmc2
  ARM: dts: sun9i: Enable mmc0 on A80 Optimus Board
  ARM: dts: sun9i: Convert a80 optimus board dts to label referencing
  ARM: dts: sun9i: Add mmc controller nodes to the A80 dtsi
  ARM: dts: sun9i: Add mmc config clock nodes
  ARM: dts: sunxi: Add missing mdio label
  ARM: dts: sun5i: Add mk802_a10s board
  ARM: dts: sun4i: Add mk802ii board
  ARM: dts: sun4i: Add mk802 board
  ARM: dts: sun4i: Add dts file for Chuwi V7 CW0825 tablet
  ARM: dts: sun7i: Add dts file for Bananapro board
  ARM: sun6i: Enable ARM arch timers
  ARM: dts: sun6i: Convert hummingbird a31 dts to label references
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 20:24:47 -08:00
Olof Johansson
688a4994cc Allwinner core changes for 3.20
- Support for the A31s
   - Adding support for cpufreq using cpufreq-dt
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUxSahAAoJEBx+YmzsjxAgw7cP/iukSTTuTxagl9HLmet3pSY/
 v4WunNKUm/cTWQkcK9xEOy2TV2nFQ00mdji1Jf1EI/cacBKvByTsmPlEOkfj0dnG
 mfxkWiF3bwcpG1L0ABIFnU1A1/PjDGTl0jMp2q7S8BE09jJfb8TcY3wwfoWRwAeD
 LFPICHbsGRIb5WU/3pq14/GaYYSTt/BRe6+wCuB/zoU4b8HaGzw6ztZ2Gz2ztUtw
 m2xYcWUEj0kmeX/wg52eRxJrjcznwDoabxxPM+q7ttL3J3NG/A81Uf0lkLlwl2fD
 QSueSzsE68RsG0q/SkvQ5jkVDyOX/4o6bSdy6O8pS/qW1rwgqVDnPzrYXuj8duU4
 /Y+B6lAXdGierXSWhmuGBSPBNO/zblPNrJbJRqNlGscU1qfaWzZXSW8hRFlyMx4P
 17TARZLmZtruGsLWSwMpsjXFtJOnF7kdwdKqx2aoV1ZmTmNVhOKopUohNRFKSU+F
 e9a/U+yN5LggQG34s+YoPggwUg3qjBengA6yO8t5aOz9upjhEzqML1uulYrvPrRS
 8qsjkbgSdXZruG26l4pJYUIZ6QMgma3shxDGXvvenAI45pRniG1YfKPlh9Z0c3Dh
 VZRvR+mM6v82z3+mtOf9VSrJkUnOUTONRA3Qt2dSFU4LZaPlDtG0dxbxEA0E+KgQ
 0XRz7Bu0LRVkzn6un+4d
 =JU1v
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-core-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/soc

Merge "Allwinner core changes for 3.20" from Maxime Ripard:

  - Support for the A31s
  - Adding support for cpufreq using cpufreq-dt

* tag 'sunxi-core-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Register cpufreq-dt for sun[45678]i
  ARM: sunxi: Add "allwinner,sun6i-a31s" to mach-sunxi

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 20:23:45 -08:00
Olof Johansson
1d8cedf9b2 Allwinner defconfig changes for 3.20
Defconfig changes for both sunxi and multi_v7 defconfig in order to add the
 cpufreq-related drivers and the PMIC drivers.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUxSbuAAoJEBx+YmzsjxAgZo8P/01rghOXiWL41d0Eq/kPxLAw
 /spLtsklOVIvgYezVjYjingasPQM1wfncrpFEy/zv7EVn4ZDVnPhnB7VpCAX0/S6
 /pihF0BMGW3trER/NZYhhGCFhNorrE2Q4aeHXZnJzvXRYHSpBHqTAm/i4szswNz6
 huwmEisOhTw5CTxwK0WntRp+wm1zD/D+9eLYrxAaMkl3NKsVqBWWH7G7yyJQyfvh
 WmE//JVRbAa5bjNczB8f2zt89LZ+Ki87Ui6z3+jrjsAfscr2M3Rk8Qq6ZSj1m6Ex
 vLzIwuH5ZgwTzCU/Btr4IiWQDWR8XKufeFc46gOexUwuQ5zZZz9GU40bRlHsYHbF
 LCZ2hsJn6S271GbSRAPNaq2XRCxEocbdRZL25/7XXWaUwydvejMZWzNn1z4p50Ml
 rjiLDYU6t0psH2lwlXr20Z5P4fP6Yy7Yd8pXnJuwYFJQrGicN6Awan67520tfvuQ
 SvnVtF7vbZJ1QmJMyWrC4YuQk9NDgnyEoeEQRDIHbFPVvyR92B3LPxC6Qi+rA6nm
 XtMkCj9sx5J3OYhEBR3WgzSpQhxgXIe26r9APEO51ojD9oO2Wpq3+DRStMTyrwAx
 6eVHldAzmXFEkWTL8gYxIIUr/ai+HEnm3kiU0QOpMkAwpA8iauLaD+E1+OSBSETQ
 dv81VZT+ckVqHRu2GZkF
 =9l0R
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes for 3.20" from Maxime Ripard:

Defconfig changes for both sunxi and multi_v7 defconfig in order to add the
cpufreq-related drivers and the PMIC drivers.

* tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Add AXP20x support multi_v7_defconfig
  ARM: sunxi: Add AXP20x support in defconfig
  ARM: multi_v7_defconfig: Enable TOUCHSCREEN_SUN4I, CPU_THERMAL
  ARM: sunxi_defconfig: Enable TOUCHSCREEN_SUN4I, CPUFREQ_DT, CPU_THERMAL

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 20:23:02 -08:00
Olof Johansson
c6e3324e3b Allwinner fixes for 3.19
A few minor fixes for the 3.19 kernel:
   - The 8250 uart driver now respects the aliases, which pointed out that we
     were using them wrong. Fixed them.
   - The simplefb pipeline that was used on the A10 caused flickering and
     tearing, and rendered it pretty much useless. Added a new simplefb node
     with another pipeline that removes this issue. Note that we need to keep
     the old node because u-boot 2015.01 uses it.
   - Added a fix for the USB phy node on sun4i/sun5i
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUxSO6AAoJEBx+YmzsjxAgXE0P/0ThQfyiIrgBnGKhqi+/mvS9
 IVebkyic34wsSud30b7jizfFHDkGMd0T2LVvLgXyx6BIPyD4vJ0ivhwC1rS+TCPv
 ZK+lQJgd63I35GiTdJNpEe6QJWd25lWfNSsfhprXl2tJ+UvkkRlTN3OaLSVUzb4r
 RsKQJV2ZlCnF1r8K4WDfvEa+vUgH9tChfdid3bUacRh2s+vZoxgJY50OO+g5RQuN
 BVu3zhV1C4Lmgr642EWwITvtLX+la56wMgvYfqWrK5eei356Y2BwTZuFAlj5w+3X
 HyssS4t5/kM0yubUS82bXv5caQefVpaVXKVitUDJygsyOYnQ9sXeTkfVTIaU0LGL
 GS9lKGbaAM04L69yRnwNhBztpHbAllOsOGVauIBEFweMMvclJwdmRvkd8suSwB5E
 AP54v2stJrnyNmp8AYSehQmRYOubKucZMqz8oOv15J207na7wFMpcvqPO5u3DqGM
 Hi/cHS6kejlLPoz5dff732KhRKQs6ZNK9q3gagZEKQHnJ75cKDLmZB/Zkj8fChXL
 RsSEphU3XV092CxUrdmzbcR2NPnvN8gVIXWY4BPxGsbdi/heY+MyxAO5zBHMdUIt
 v/CoJRDtsWug8zUqylFHY8xJuzK0uNgXiocnCpuEgwbooOFAEcUBetEiUgOJ7XtT
 j3HSY2p1tridaGigU/Hp
 =JLlc
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes

Merge "Allwinner fixes for 3.19" from Maxime Ripard:

Allwinner fixes for 3.19

A few minor fixes for the 3.19 kernel:
  - The 8250 uart driver now respects the aliases, which pointed out that we
    were using them wrong. Fixed them.
  - The simplefb pipeline that was used on the A10 caused flickering and
    tearing, and rendered it pretty much useless. Added a new simplefb node
    with another pipeline that removes this issue. Note that we need to keep
    the old node because u-boot 2015.01 uses it.
  - Added a fix for the USB phy node on sun4i/sun5i

* tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: dt: Fix aliases
  ARM: dts: sun4i: Add simplefb node with de_fe0-de_be0-lcd0-hdmi pipeline
  ARM: dts: sun6i: ippo-q8h-v5: Fix serial0 alias
  ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 20:19:27 -08:00
Greg Kroah-Hartman
786f949631 Update extcon for v3.20
This patchset fix minor issue of extcon driver.
 
 Detailed description for patchset:
 - Remove duplicate header file in extcon-class.c and add 'const' keyword for
   array in extcon-max77693.c.
 - Release iio channel when executing *_remove() function in extcon-adc-jack.c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUxcgwAAoJEJzN3yze689TS6MP/0Eefg/WZay1Xuea1JUgrSF2
 J5H274gnFE6fILgZegH8eEY29lSKFnTiE0flN/XaMn/3BpCT332smAO5a+POWpW5
 sCvBp+GmvfY2dFWQ3FnV93Sk9Ext7Q6chNwvKdTCNTgXUunpXNbsqzuMy6HVQ3W4
 FfHwwg5mQ6zIhiLOFZpuIox5DwLD1SOova1MUSdP9WYZ1zr44Q1CPBw+dao0qwsb
 bdeWXwj7i1Np1Ux7HGq+A3CojquNbxn/UZWxxaAakJWLpRRpSLOyvK9UOzxu2e1N
 o4n0+LLjeZtJAHH0S8s+Cr8zJREEcc24D7DNxuc/mtPF957bwKbREEFApWb0smtD
 soNIffKKno7e8dFb00HrppGHNs0SvjXjPK37Z5q1ApaVi/W1XehMcSQLP2iYq7vW
 WL1bliBZmuzsA/K4N5WTZaxmfNgzmFpUJB2Nn6859Bs4OECBaCOG6gidCrLsXJxw
 53iDGXM/p7x1nD8L1EvWf/KAIT+VRlp7Mcmk3/LRdgXjnpqldXcf08ZnfT65yE8J
 QAOovtOo7wrqXZwDeXeWOKiQ+f3UtyYnMYxmklqQJPHcxb/aYrLrTEEwTD+tuVfF
 K9G/E3Xl1SOFK8l4/PF3tl8DevaoiKq74BK3KKYDn2lyfK8A81IFUup6oBmtCDbJ
 MG1a4t6yOf7rQFqTnp8F
 =LUo3
 -----END PGP SIGNATURE-----

Merge tag 'extcon-next-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for v3.20

This patchset fix minor issue of extcon driver.

Detailed description for patchset:
- Remove duplicate header file in extcon-class.c and add 'const' keyword for
  array in extcon-max77693.c.
- Release iio channel when executing *_remove() function in extcon-adc-jack.c
2015-01-26 19:23:43 -08:00
Greg Kroah-Hartman
54eb4cd465 usb: fixes for v3.19-rc6
Just two fixes pending. A fix USB PHY for non-OF case and
 a fix for dwc2 running on samsung SoC.
 
 Signed-off-by: Felipe Balbi <balbi@ti.com>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUwVBYAAoJEIaOsuA1yqREZwwP/0/uE+dullOFcv5Yg4624INb
 2GnQznXmp6NLa+y7262akEAaIYprnVMU3Dpo66+rrl01S71cAtYYC2VBct8f2fvk
 o6ufSOWgsvj7D+6HUFivw9DYFx/Kk5RHG+pz69/TiLmbZBGU2R0+6QZdrcz7hD15
 5oykD793DkLP5rRC71vQiGhMIKOEWvGlD4sHtJd9SazE96Txi5f9a09mFA1ORLbi
 9eEcPEjEc52rHeQToKYU+xi5Sf3ifql1gITNeQiWTu7+CIMFpx9mymo2S6yaSp+d
 GhzUtiX5w9IlPZ4fS235KcsILdiycOIFfO0Z7IHRYUq9Vms+Dwu6TO2aHG7ap1xF
 st3jA0svlZwEHIoGcp7LYaNIadSsrluYeXsY6jOfpzfwwaa51XIJbGFdGkVcMTf2
 pZd/+Q+3UxAhPxk1/Btyd+2KMhhYGd8b8ol1BZDos+MzBCO3JZcakGA0wH2UuNcU
 IXM6TbUI9waoZD9Jp5fMYC64xdWvluPis8ag/ay1u+tsAPumdQXb1fiNeJvjDvN+
 x7qSv/QQfq3VEn0K3TROZM+7qEu9/LU7PNS+Q+aE5FxNE7IZ/WtJHUyOVsxybI4P
 ChSr+Jqh9Q10x+s+ChwjLOQSNrQxnX8Dq4GnglUesf8xhZF84jtghlCLaAla+3yf
 LzMKhudkzP1xjDDnfl/R
 =QdcU
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v3.19-rc6

Just two fixes pending. A fix USB PHY for non-OF case and
a fix for dwc2 running on samsung SoC.

Signed-off-by: Felipe Balbi <balbi@ti.com>
2015-01-26 19:13:41 -08:00
Pranith Kumar
6501ab5e38 powerpc/powernv: Skip registering log region when CONFIG_PRINTK=n
When CONFIG_PRINTK=n, log_buf_addr_get() returns NULL and log_buf_len_get()
return 0. Check for these return values and skip registering the dump buffer.

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reviewed-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2015-01-27 14:04:00 +11:00
Cyril Bur
3df76a9dcc powerpc/pseries: Fix endian problems with LE migration
RTAS events require arguments be passed in big endian while hypercalls
have their arguments passed in registers and the values should therefore
be in CPU endian.

The "ibm,suspend_me" 'RTAS' call makes a sequence of hypercalls to setup
one true RTAS call. This means that "ibm,suspend_me" is handled
specially in the ppc_rtas() syscall.

The ppc_rtas() syscall has its arguments in big endian and can therefore
pass these arguments directly to the RTAS call. "ibm,suspend_me" is
handled specially from within ppc_rtas() (by calling rtas_ibm_suspend_me())
which has left an endian bug on little endian systems due to the
requirement of hypercalls. The return value from rtas_ibm_suspend_me()
gets returned in cpu endian, and is left unconverted, also a bug on
little endian systems.

rtas_ibm_suspend_me() does not actually make use of the rtas_args that
it is passed. This patch removes the convoluted use of the rtas_args
struct to pass params to rtas_ibm_suspend_me() in favour of passing what
it needs as actual arguments. This patch also ensures the two callers of
rtas_ibm_suspend_me() pass function parameters in cpu endian and in the
case of ppc_rtas(), converts the return value.

migrate_store() (the other caller of rtas_ibm_suspend_me()) is from a
sysfs file which deals with everything in cpu endian so this function
only underwent cleanup.

This patch has been tested with KVM both LE and BE and on PowerVM both
LE and BE. Under QEMU/KVM the migration happens without touching these
code pathes.

For PowerVM there is no obvious regression on BE and the LE code path
now provides the correct parameters to the hypervisor.

Signed-off-by: Cyril Bur <cyrilbur@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2015-01-27 14:03:53 +11:00
Olof Johansson
7c83955a62 Samsung DT updates for v3.20
- exynos3250
   : add exynos_usbphy node and hsotg nodes
 
 - exynos3250-rinato
   : enable usb
   : cleanup and use macro for gpio-keys
   : add fimd and Panel devices support
 
 - exynos3250-monk
   : enable usb
   : cleanup and use macro for gpio-keys
 
 - exynos5250-snow
   : add power and lid gpio-keys pinctrl
 
 - exynos5420-peach-pit and exynos5800-peach-pi
   : configure regulators for suspend
   : set always on for USB webCam regulators
   : add lid GPIO key device
 
 - exynos5422
   : add support new board Odroid XU3
 
 - dt-bindings
   : add exynos-chipid
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUwxeqAAoJEA0Cl+kVi2xq4zEP/0K1GVsA6aHUYAqvr4JeJD+Q
 zL+N8TTypbGhvJbHidrkNtWt7jWLSj2KBmv/EloyI5U0WL9z3lAn5hyG366O6plM
 SP2gb+giYLWScV8RM1KYfgpKy4d4EkJc+SfbsZhBF1aWEcxixSLc5iNWoyeUoKV6
 XBVJT4sTJ5E5wsJ2aHYOYbWSF+dFUIEkGGnWW0KbXMnKqxvZeDWjIsJjYeu+Wh8v
 1X03WXK+NFZu+hbQArCRVE27ZOBJJZSJ83T6rCBDi1oCDVbjIbGQ631YU9MlfslE
 9qNJXUVcB/0jVwYxBIZrjIsjQjgJrhA2Zu78Pdb3P5wP+iQipfC+zhqix3o5tJis
 EBF3bWQspdYeGXPV8WNkg3mDJjU3Saf7UwiGEQdvblC1tC72aTcOOOf6fDreNLAg
 8Zcjrsbe5v67Y7yFNvH9dAdeOOocXyp3PPsRwb2lOoXx4DwIU0Rf5f+OnshkgtQf
 SAQgEeB6nuXlfqgqUMLZV4TlKyL4lP1nq3t33hYMBuGtsO1B9KMR3AC8RmVG9hzO
 fKfYhJefzOWkb56k5yu2/40KkdEVZvwik2E2l1DMysjyOlYZ7tHp66XJN+5dtNj0
 u9YYrQF+sCvIOnBL3O2KoPJkZzRSfh5ESQvY+tCPQTlCuDrN4WZJMehmYok6ev06
 qljMpLInQakOA4vo+g3O
 =Yc7r
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Merge "Samsung DT updates for v3.20" from Kukjin Kim:

- exynos3250
  : add exynos_usbphy node and hsotg nodes
- exynos3250-rinato
  : enable usb
  : cleanup and use macro for gpio-keys
  : add fimd and Panel devices support
- exynos3250-monk
  : enable usb
  : cleanup and use macro for gpio-keys
- exynos5250-snow
  : add power and lid gpio-keys pinctrl
- exynos5420-peach-pit and exynos5800-peach-pi
  : configure regulators for suspend
  : set always on for USB webCam regulators
  : add lid GPIO key device
- exynos5422
  : add support new board Odroid XU3
- dt-bindings
  : add exynos-chipid

* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Configure regulators for suspend on exynos Peach boards
  ARM: dts: Set Peach boards USB WebCam regulators to always on
  ARM: dts: Add lid GPIO key device node for Peach boards
  ARM: dts: Add power and lid GPIO keys pinctrl for exynos5250-snow
  Documentation: dt-bindings: add exynos-chipid binding information
  ARM: dts: add Panel device support for exynos3250-rinato
  ARM: dts: add fimd device support for exynos3250-rinato
  ARM: dts: use macro in gpio keys for exynos3250 boards
  ARM: dts: remove unnecessary gpio-key nodes for exynos3250 boards
  ARM: dts: Enable USB node for exynos3250-monk
  ARM: dts: Enable USB node for exynos3250-rinato
  ARM: dts: Add hsotg node for exynos3250
  ARM: dts: Add exynos_usbphy node for exynos3250
  ARM: dts: Add dts file for Odroid XU3 board

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 18:41:45 -08:00
Olof Johansson
02685cd20a Third batch of cleanup/soc for 3.20:
- several fixes and adjustments following the last cleanup batch
 - removal of some unused Kconfig options
 - slight PM and pm_idle rework to ease future rework
 - removal of unneeded mach/system_rev.h
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJUxjj9AAoJEAf03oE53VmQGEAH/3nLneCOQeyuq60adx+Lxcdn
 Q9sMMzrw4B6bQnJee7+PQD3/QU7fmF8qNKlMKYAlILFHGNQplASi4uAfRTykUA0j
 RQHpS9n20ODVfX+yePJ/o8h2r1BkT2wUIDXxaZCj2RoPmEz1aiFDNa2pPsUfprRd
 gpbh+ZU43LRowYwH9UHPV55PQ0ZwMq3ry2DOYY5Al1+bKQ8TFvAdDMUu3rGZU7A4
 dMYiQCQ6Fv0EI1NY0IHSf/u/jujlPE2H0TSR38w8lYfIPzBx2tHkLSupuxKh7R1N
 QYibgZXWR0PqHOXMpOHYBqJFj5c3f/aOZ/dO4RJha+S7YHNQnIFzLsm122njgKQ=
 =KgUm
 -----END PGP SIGNATURE-----

Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/soc

Merge "at91: cleanup/soc for 3.20 #3 (bis) from Nicolas Ferre:

Third batch of cleanup/soc for 3.20:
- several fixes and adjustments following the last cleanup batch
- removal of some unused Kconfig options
- slight PM and pm_idle rework to ease future rework
- removal of unneeded mach/system_rev.h

* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: pm: remove warning to remove SOC_AT91SAM9263 usage
  ARM: at91: remove unused mach/system_rev.h
  ARM: at91: stop using HAVE_AT91_DBGUx
  ARM: at91: fix ordering of SRAM and PM initialization
  ARM: at91: sam9: set arm_pm_idle from sam9_dt_device_init
  ARM: at91: fix sam9n12 and sam9x5 arm_pm_idle
  ARM: at91: mark const init data with __initconst instead of __initdata
  ARM: at91: fix PM initialization for newer SoCs
  ARM: at91: fix Kconfig.debug by adding DEBUG_AT91_UART option

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 18:40:58 -08:00
Nicolas Ferre
02453b9c68 ARM: dts: re-fromat AT91 part to match other entries
The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
options may be removed in the near future.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-01-26 18:13:00 -08:00
Niklas Cassel
7a1ceba071 cifs: fix MUST SecurityFlags filtering
If CONFIG_CIFS_WEAK_PW_HASH is not set, CIFSSEC_MUST_LANMAN
and CIFSSEC_MUST_PLNTXT is defined as 0.

When setting new SecurityFlags without any MUST flags,
your flags would be overwritten with CIFSSEC_MUST_LANMAN (0).

Signed-off-by: Niklas Cassel <niklass@axis.com>
Signed-off-by: Steve French <steve.french@primarydata.com>
2015-01-26 19:38:26 -06:00
David S. Miller
7d63585bf0 Another set of last-minute fixes:
* fix station double-removal when suspending while associating
  * fix the HT (802.11n) header length calculation
  * fix the CCK radiotap flag used for monitoring, a pretty
    old regression but a simple one-liner
  * fix per-station group-key handling
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJUwmkTAAoJEDBSmw7B7bqr3X0P/3Y/2UnQSBSi2LnqmsuV8igR
 noAwaPuCf2ASs25v9nQv64JM1qC0kiemYesi3fFWHiqPhoxx9WrMSvjXdarynrQN
 LwBG74tcQVEeW70w+36yeKCS+wMU35eTzDDxdnYOfJeNOhW2rQE7WVT2drkc6lVL
 hvGRhqlBx0mVLQ3VCW5c1kmMN/VAttZKx5WWWurmA8OSQzcHJGZW6ZTuqwpDx4RT
 iqwi5uBtMkqTQV+22Zb4xI+YxLGwcGiYjy15KksPsrSZZeS5pJzeyovrDhACBVpE
 aVj3K+OAGVmXCN7HVpQ3tTqCaQea5o+EDqtnT/IQrjnmw6p4mC3co6ShiVn+DkTX
 6nv/ka92k9q1LMGIzl+lje2cNmaerVrDa84gUqnHXbTr80+ugKu4NpZowQgdW4yG
 Qu4kQALkTRhUoNf+RUzXKcFqAW2qLKf83qLcrhbQWkSrY0hzLVWKI/1/FAkCyo6I
 zKhsB44mHMMaKGVq5qsHTD0E89PtiJuizDLiU04uJExYJCi1FCh9NDlc+HaVlTnt
 5LHFbrsPDuAUKoKSiJmJUIyueL+Of5N34+epuLRZb55aE2AQhApg6Nxd+FMuro1m
 0aeHEREEO04QZ7IUrYgBA4G7L1dsZJDD8auU6Y4V3chAg6ArbswbtzAv8ON1tAk+
 pr0kThACKqkfg2tN5fny
 =DhIp
 -----END PGP SIGNATURE-----

Merge tag 'mac80211-for-davem-2015-01-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Another set of last-minute fixes:
 * fix station double-removal when suspending while associating
 * fix the HT (802.11n) header length calculation
 * fix the CCK radiotap flag used for monitoring, a pretty
   old regression but a simple one-liner
 * fix per-station group-key handling

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-26 17:32:24 -08:00
Hannes Frederic Sowa
df4d92549f ipv4: try to cache dst_entries which would cause a redirect
Not caching dst_entries which cause redirects could be exploited by hosts
on the same subnet, causing a severe DoS attack. This effect aggravated
since commit f886497212 ("ipv4: fix dst race in sk_dst_get()").

Lookups causing redirects will be allocated with DST_NOCACHE set which
will force dst_release to free them via RCU.  Unfortunately waiting for
RCU grace period just takes too long, we can end up with >1M dst_entries
waiting to be released and the system will run OOM. rcuos threads cannot
catch up under high softirq load.

Attaching the flag to emit a redirect later on to the specific skb allows
us to cache those dst_entries thus reducing the pressure on allocation
and deallocation.

This issue was discovered by Marcelo Leitner.

Cc: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Marcelo Leitner <mleitner@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-26 17:28:27 -08:00
Gregory CLEMENT
3c21b5fa89 ARM: mvebu: armada-xp-synology-ds414: Relicense the device tree under GPLv2+/X11
The current GPL only licensing on the device tree makes it very
impractical for other software components licensed under another
license.

In order to make it easier for them to reuse our device trees,
relicense our device trees under a GPL/X11 dual-license.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Arnaud Ebalard <arno@natisbad.org>
2015-01-26 19:28:13 -06:00
Gregory CLEMENT
faeb8e2087 ARM: mvebu: armada-xp-openblocks-ax3-4: Relicense the device tree under GPLv2+/X11
The current GPL only licensing on the device tree makes it very
impractical for other software components licensed under another
license.

In order to make it easier for them to reuse our device trees,
relicense our device trees under a GPL/X11 dual-license.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-26 19:28:13 -06:00