]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 1 Nov 2011 04:42:57 +0000 (15:42 +1100)]
Merge remote-tracking branch 'input/next'

12 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Tue, 1 Nov 2011 04:36:07 +0000 (15:36 +1100)]
Merge branch 'quilt/rr'

12 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Tue, 1 Nov 2011 04:34:45 +0000 (15:34 +1100)]
Merge remote-tracking branch 'cpufreq/next'

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 04:33:19 +0000 (15:33 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 04:31:52 +0000 (15:31 +1100)]
Merge remote-tracking branch 'sound/for-next'

12 years agoMerge commit 'refs/next/20111025/crypto'
Stephen Rothwell [Tue, 1 Nov 2011 04:22:11 +0000 (15:22 +1100)]
Merge commit 'refs/next/20111025/crypto'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Tue, 1 Nov 2011 04:11:56 +0000 (15:11 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
drivers/mtd/maps/lantiq-flash.c

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Tue, 1 Nov 2011 04:04:28 +0000 (15:04 +1100)]
Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/l2cap_sock.c

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 1 Nov 2011 04:02:54 +0000 (15:02 +1100)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Tue, 1 Nov 2011 04:01:33 +0000 (15:01 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

12 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 04:00:07 +0000 (15:00 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

12 years agoMerge remote-tracking branch 'scsi/master'
Stephen Rothwell [Tue, 1 Nov 2011 03:57:05 +0000 (14:57 +1100)]
Merge remote-tracking branch 'scsi/master'

12 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Tue, 1 Nov 2011 03:56:53 +0000 (14:56 +1100)]
Merge remote-tracking branch 'ibft/master'

12 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Tue, 1 Nov 2011 03:56:49 +0000 (14:56 +1100)]
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c

12 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 03:45:39 +0000 (14:45 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'

12 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 03:43:57 +0000 (14:43 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 03:43:50 +0000 (14:43 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 03:42:25 +0000 (14:42 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

Conflicts:
drivers/net/ethernet/stmicro/stmmac/Kconfig

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 1 Nov 2011 03:20:53 +0000 (14:20 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

12 years agoMerge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Tue, 1 Nov 2011 03:19:31 +0000 (14:19 +1100)]
Merge remote-tracking branch 'docs/docs-move'

12 years agoMerge branch 'quilt/kernel-doc'
Stephen Rothwell [Tue, 1 Nov 2011 03:18:16 +0000 (14:18 +1100)]
Merge branch 'quilt/kernel-doc'

Conflicts:
Documentation/PCI/pci.txt

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 1 Nov 2011 03:16:55 +0000 (14:16 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 1 Nov 2011 03:15:36 +0000 (14:15 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

12 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 1 Nov 2011 03:15:24 +0000 (14:15 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

12 years agoMerge remote-tracking branch 'squashfs/master'
Stephen Rothwell [Tue, 1 Nov 2011 03:14:04 +0000 (14:14 +1100)]
Merge remote-tracking branch 'squashfs/master'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 1 Nov 2011 03:12:44 +0000 (14:12 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

Conflicts:
fs/ocfs2/xattr.c

12 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 1 Nov 2011 03:11:04 +0000 (14:11 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 1 Nov 2011 03:09:47 +0000 (14:09 +1100)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 1 Nov 2011 03:01:15 +0000 (14:01 +1100)]
Merge remote-tracking branch 'gfs2/master'

Conflicts:
fs/gfs2/file.c

12 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 1 Nov 2011 02:53:55 +0000 (13:53 +1100)]
Merge remote-tracking branch 'ext4/dev'

12 years agoMerge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 1 Nov 2011 02:52:34 +0000 (13:52 +1100)]
Merge remote-tracking branch 'ext3/for_next'

12 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Tue, 1 Nov 2011 02:51:12 +0000 (13:51 +1100)]
Merge remote-tracking branch 'cifs/master'

12 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 1 Nov 2011 02:49:48 +0000 (13:49 +1100)]
Merge remote-tracking branch 'xtensa/master'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 1 Nov 2011 02:48:27 +0000 (13:48 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 1 Nov 2011 02:47:11 +0000 (13:47 +1100)]
Merge remote-tracking branch 'tile/master'

Conflicts:
arch/tile/kernel/intvec_32.S
arch/tile/lib/atomic_asm_32.S

12 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Tue, 1 Nov 2011 02:22:37 +0000 (13:22 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

12 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Tue, 1 Nov 2011 02:21:19 +0000 (13:21 +1100)]
Merge remote-tracking branch 'sh/sh-latest'

12 years agoMerge remote-tracking branch 'galak/next'
Stephen Rothwell [Tue, 1 Nov 2011 02:19:50 +0000 (13:19 +1100)]
Merge remote-tracking branch 'galak/next'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 1 Nov 2011 02:18:11 +0000 (13:18 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Tue, 1 Nov 2011 02:11:44 +0000 (13:11 +1100)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 02:08:52 +0000 (13:08 +1100)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 1 Nov 2011 02:07:35 +0000 (13:07 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
arch/mips/alchemy/devboards/db1x00/platform.c
drivers/ide/Kconfig
drivers/mmc/host/au1xmmc.c
drivers/video/Kconfig
sound/mips/Kconfig

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 02:07:28 +0000 (13:07 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.bus
arch/m68k/Kconfig.devices
arch/m68k/kernel/Makefile

12 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 1 Nov 2011 01:29:08 +0000 (12:29 +1100)]
Merge remote-tracking branch 'ia64/next'

12 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 1 Nov 2011 01:27:48 +0000 (12:27 +1100)]
Merge branch 'quilt/hexagon'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:26:09 +0000 (12:26 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:19:35 +0000 (12:19 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Tue, 1 Nov 2011 01:18:21 +0000 (12:18 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:17:02 +0000 (12:17 +1100)]
Merge remote-tracking branch 'tegra/for-next'

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:17:01 +0000 (12:17 +1100)]
Merge remote-tracking branch 's5p/for-next'

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:15:42 +0000 (12:15 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h

12 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:14:16 +0000 (12:14 +1100)]
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9g45.c
drivers/ata/pata_at91.c

12 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:01:41 +0000 (12:01 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:00:25 +0000 (12:00 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 1 Nov 2011 01:00:08 +0000 (12:00 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Tue, 1 Nov 2011 00:58:45 +0000 (11:58 +1100)]
Merge remote-tracking branch 'ide/master'

12 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 1 Nov 2011 00:24:29 +0000 (11:24 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

12 years agoMerge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Tue, 1 Nov 2011 00:24:24 +0000 (11:24 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'

12 years agovirtio: Add platform bus driver for memory mapped virtio device
Pawel Moll [Mon, 24 Oct 2011 13:07:03 +0000 (14:07 +0100)]
virtio: Add platform bus driver for memory mapped virtio device

This patch, based on virtio PCI driver, adds support for memory
mapped (platform) virtio device. This should allow environments
like qemu to use virtio-based block & network devices even on
platforms without PCI support.

One can define and register a platform device which resources
will describe memory mapped control registers and "mailbox"
interrupt. Such device can be also instantiated using the Device
Tree node with compatible property equal "virtio,mmio".

Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Michael S.Tsirkin <mst@redhat.com>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio-pci: Use PCI MMIO instead of PIO when available
Alexey Kardashevskiy [Wed, 12 Oct 2011 03:39:06 +0000 (14:39 +1100)]
virtio-pci: Use PCI MMIO instead of PIO when available

Currently virtio-pci is specced so that configuration of the device is
done through a PCI IO space (via BAR 0 of the virtual PCI device).
However, use of PCI IO space (aka PIO) is long deprecated, and can be
awkward to use on some systems (for example IBM pSeries machines
typically have many PCI domains, and not all firmware/hypervisor
versions necessarily support PCI PIO access on all domains).

Therefore, it would be preferable for the virtio virtual PCI device to
advertise a PCI memory space (aka MMIO) BAR and have configuration
done through this interface instead.  This can be done backwards
compatibly by advertising the MMIO BAR in addition to the existing PIO
BAR so that the guest driver can choose whichever interface.

In anticipation of adding such an MMIO BAR to virtio host-side
implementations (e.g. qemu), this patch updates the Linux virtio-pci
driver to attempt to use BAR 2 (which will be MMIO) in preference to
the existing PIO BAR 0.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: Dont add "config" to list for !per_vq_vector
Krishna Kumar [Wed, 5 Oct 2011 05:38:59 +0000 (11:08 +0530)]
virtio: Dont add "config" to list for !per_vq_vector

For the MSI but non-per_vq_vector case, the config/change vq
also gets added to the list of vqs that need to process the
MSI interrupt. This is not needed as config has it's own
handler (vp_config_changed). In any case, vring_interrupt()
finds nothing needs to be done on this vq.

I tested this patch by testing the "Fallback:" and "Finally
fall back" cases in vp_find_vqs(). Please review.

Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: wait for first console port for early console output
Christian Borntraeger [Thu, 22 Sep 2011 18:14:23 +0000 (23:44 +0530)]
virtio: console: wait for first console port for early console output

On s390 I have seen some random

"Warning: unable to open an initial console"

boot failure. Turns out that tty_open fails, because the
hvc_alloc was not yet done. In former times this could not happen,
since the probe function automatically called hvc_alloc. With newer
versions (multiport) some host<->guest interaction is required
before hvc_alloc is called. This might be too late, especially if
an initramfs is involved. Lets use a completion if we have
multiport and an early console.

[Amit:
  * Use NULL instead of 0 for pointer comparison
  * Rename 'port_added' to 'early_console_added'
  * Re-format, re-word commit message
  * Rebase patch on top of current queue]

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Chrstian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: add port stats for bytes received, sent and discarded
Amit Shah [Wed, 14 Sep 2011 07:36:46 +0000 (13:06 +0530)]
virtio: console: add port stats for bytes received, sent and discarded

This commit adds port-specific stats for the number of bytes received,
sent and discarded.  They're exposed via the debugfs interface.  This
data can be used to check for data loss bugs (or disprove such claims).
It can also be used for accounting, if there's such a need.

The stats remain valid throughout the lifetime of the port.  Unplugging
a port will reset the stats.  The numbers are not reset across port
opens/closes.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: make discard_port_data() use get_inbuf()
Amit Shah [Wed, 14 Sep 2011 07:36:45 +0000 (13:06 +0530)]
virtio: console: make discard_port_data() use get_inbuf()

discard_port_data() used virtqueue_get_buf() directly instead of using
get_inbuf().  Fix this, so that we get accounting for all received
bytes.  This also simplifies the code a lot.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: rename variable
Amit Shah [Wed, 14 Sep 2011 07:36:44 +0000 (13:06 +0530)]
virtio: console: rename variable

'ret' is a misnomer in discard_port_data() since we don't return the
value.  Rename it to 'err'.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: make get_inbuf() return port->inbuf if present
Amit Shah [Wed, 14 Sep 2011 07:36:43 +0000 (13:06 +0530)]
virtio: console: make get_inbuf() return port->inbuf if present

Instead of pulling in a buffer from the vq each time it's called,
get_inbuf() now checks if the current active buffer, in port->inbuf is
valid.  If it is, just returns a pointer to it.  This ends up
simplifying a lot of code calling get_inbuf() since the check for
port->inbuf being valid was done by all the callers.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: Fix return type for get_inbuf()
Amit Shah [Wed, 14 Sep 2011 07:36:42 +0000 (13:06 +0530)]
virtio: console: Fix return type for get_inbuf()

get_inbuf() returns void *.  There's no reason to return void pointers
instead of the correct struct port_buffer *.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: Use wait_event_freezable instead of _interruptible
Amit Shah [Wed, 14 Sep 2011 07:36:41 +0000 (13:06 +0530)]
virtio: console: Use wait_event_freezable instead of _interruptible

Get ready to support suspend/resume by using the freezable calls so that
blocking read/write syscalls are handled properly across suspend/resume.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: Ignore port name update request if name already set
Amit Shah [Wed, 14 Sep 2011 07:36:40 +0000 (13:06 +0530)]
virtio: console: Ignore port name update request if name already set

We don't allow port name changes dynamically for a port.  So any
requests by the host to change the name are ignored.

Before this patch, if the hypervisor sent a port name while we had one
set already, we would leak memory equivalent to the size of the old
name.

This scenario wasn't expected so far, but with the suspend-resume
support, we'll send the VIRTIO_CONSOLE_PORT_READY message after restore,
which can get us into this situation.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: console: Fix indentation
Amit Shah [Wed, 14 Sep 2011 07:36:39 +0000 (13:06 +0530)]
virtio: console: Fix indentation

Convert spaces to tabs and fix indentation for an if statement split
into multiple lines.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio: modify vring_init and vring_size to take account of the layout containing...
Wang Sheng-Hui [Mon, 29 Aug 2011 07:55:59 +0000 (15:55 +0800)]
virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx

Based on the layout description in the comments, take account of
the *_event_idx in functions vring_init and vring_size.

Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio.h: correct comment for struct virtio_driver
Wang Sheng-Hui [Thu, 25 Aug 2011 13:04:05 +0000 (21:04 +0800)]
virtio.h: correct comment for struct virtio_driver

The patch is against 3.0.

Signed-off-by: Wang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio-net: Use virtio_config_val() for retrieving config
Sasha Levin [Sun, 14 Aug 2011 14:52:33 +0000 (17:52 +0300)]
virtio-net: Use virtio_config_val() for retrieving config

This patch modifies virtio-net to use virtio_config_val() instead
of a 'if(virtio_has_feature()) vdev->config->get()' construct to retrieve
optional values from the config space.

Cc: Amit Shah <amit.shah@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio_config: Add virtio_config_val_len()
Sasha Levin [Sun, 14 Aug 2011 14:52:32 +0000 (17:52 +0300)]
virtio_config: Add virtio_config_val_len()

This patch adds virtio_config_val_len() which allows retrieving variable
length data from the virtio config space only if a specific feature is on.

Cc: Amit Shah <amit.shah@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agovirtio-console: Use virtio_config_val() for retrieving config
Sasha Levin [Sun, 14 Aug 2011 14:52:31 +0000 (17:52 +0300)]
virtio-console: Use virtio_config_val() for retrieving config

This patch modifies virtio-console to use virtio_config_val() instead
of a 'if(virtio_has_feature()) vdev->config->get()' construct to retrieve
optional values from the config space.

Cc: Amit Shah <amit.shah@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agolguest: move process freezing before pending signals check
Michal Hocko [Tue, 27 Sep 2011 06:56:03 +0000 (08:56 +0200)]
lguest: move process freezing before pending signals check

run_guest tries to freeze the current process after it has handled
pending interrupts and before it calls lguest_arch_run_guest.
This doesn't work nicely if the task has been killed while being frozen
and when we want to handle that signal as soon as possible.
Let's move try_to_freeze before we check for pending signal so that we
can get out of the loop as soon as possible.

Signed-off-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agolguest: don't allow KVM-detection cpuid.
Rusty Russell [Tue, 1 Nov 2011 00:15:21 +0000 (11:15 +1100)]
lguest: don't allow KVM-detection cpuid.

Host might be running under KVM, but we shouldn't allow Guest to think it
can use KVM hypercalls (it can't, and it will embarrass itself if it tries).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
12 years agolguest: Allow running under paravirt-enabled KVM.
Rusty Russell [Tue, 1 Nov 2011 00:15:20 +0000 (11:15 +1100)]
lguest: Allow running under paravirt-enabled KVM.

We actually can run under KVM, as it doesn't paravirtualize anything we
need to use; reduce the check to checking we are the normal ringlevel.

Reported-by: Stefanos Geraggelos <sgerag@cslab.ece.ntua.gr>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au># HG changeset patch
12 years agomodule,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
Ben Hutchings [Mon, 24 Oct 2011 13:12:28 +0000 (15:12 +0200)]
module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree

Use of the GPL or a compatible licence doesn't necessarily make the code
any good.  We already consider staging modules to be suspect, and this
should also be true for out-of-tree modules which may receive very
little review.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Reviewed-by: Dave Jones <davej@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (patched oops-tracing.txt)
12 years agoparams: make dashes and underscores in parameter names truly equal
Michal Schmidt [Sun, 9 Oct 2011 22:03:37 +0000 (00:03 +0200)]
params: make dashes and underscores in parameter names truly equal

The user may use "foo-bar" for a kernel parameter defined as "foo_bar".
Make sure it works the other way around too.

Apply the equality of dashes and underscores on early_params and __setup
params as well.

The example given in Documentation/kernel-parameters.txt indicates that
this is the intended behaviour.

With the patch the kernel accepts "log-buf-len=1M" as expected.
https://bugzilla.redhat.com/show_bug.cgi?id=744545

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (neatened implementations)
12 years agokmod: prevent kmod_loop_msg overflow in __request_module()
Jiri Kosina [Tue, 1 Nov 2011 00:15:19 +0000 (11:15 +1100)]
kmod: prevent kmod_loop_msg overflow in __request_module()

Due to post-increment in condition of kmod_loop_msg in __request_module(),
the system log can be spammed by much more than 5 instances of the 'runaway
loop' message if the number of events triggering it makes the kmod_loop_msg
to overflow.

Fix that by making sure we never increment it past the threshold.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
CC: stable@kernel.org
12 years agohwmon: Use i2c_smbus_{read,write}_word_swapped
Jean Delvare [Tue, 1 Nov 2011 00:15:13 +0000 (11:15 +1100)]
hwmon: Use i2c_smbus_{read,write}_word_swapped

Make use of the new i2c_smbus_{read,write}_word_swapped functions.
This makes the driver code more compact and readable. It also ensures
proper error handling.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Guillaume Ligneul <guillaume.ligneul@gmail.com>
12 years agohwmon: (smsc47b397) Fix checkpatch errors
Jean Delvare [Tue, 1 Nov 2011 00:15:12 +0000 (11:15 +1100)]
hwmon: (smsc47b397) Fix checkpatch errors

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
12 years agohwmon: (lm90) Make code more readable
Jean Delvare [Tue, 1 Nov 2011 00:15:12 +0000 (11:15 +1100)]
hwmon: (lm90) Make code more readable

Clean up the code to make it more readable:
* Remove reg_ and new_ prefixes from variable names, they made the
  names longer, causing extra line breaks, while not adding much
  value.
* Introduce struct device dev* = &client->dev in two functions, to
  avoid repeating client->dev everywhere in these functions.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
12 years agohwmon: (lm90) Fix warnings
Jean Delvare [Tue, 1 Nov 2011 00:15:12 +0000 (11:15 +1100)]
hwmon: (lm90) Fix warnings

With some configuration option combinations, we get the following
warnings:

drivers/hwmon/lm90.c: In function 'lm90_detect':
drivers/hwmon/lm90.c:1114: warning: 'chip_id' may be used uninitialized
in this function
drivers/hwmon/lm90.c:1114: warning: 'reg_config1' may be used
uninitialized in this function
drivers/hwmon/lm90.c:1114: warning: 'reg_convrate' may be used
uninitialized in this function
drivers/hwmon/lm90.c:1187: warning: 'reg_emerg2' may be used
uninitialized in this function
drivers/hwmon/lm90.c:1187: warning: 'reg_status2' may be used
uninitialized in this function

We can solve these easily by reading the register values first and
checking for errors later. These errors should be very rare, even in
the case of failed detection, so this change has no impact on
performance. And this makes checkpatch.pl happier.

Reported-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
12 years agohwmon: (ibmaem) Avoid repeated memory allocations
Jean Delvare [Tue, 1 Nov 2011 00:15:11 +0000 (11:15 +1100)]
hwmon: (ibmaem) Avoid repeated memory allocations

Preallocate a buffer for the response to sensor reads, and reuse it
for each read instead of allocating a new one each time. This should
be faster and should also avoid memory fragmentation.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
12 years agohwmon: (ibmaem) Make instance initializations independent
Jean Delvare [Tue, 1 Nov 2011 00:15:11 +0000 (11:15 +1100)]
hwmon: (ibmaem) Make instance initializations independent

There is no good reason that I can see why the failure to initialize
one instance should prevent other instances from being initialized.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
12 years agohwmon: (ibmaem) Fix error paths
Jean Delvare [Tue, 1 Nov 2011 00:15:10 +0000 (11:15 +1100)]
hwmon: (ibmaem) Fix error paths

I am under the impression that error paths in functions
aem_init_aem1_inst() and aem_init_aem2_inst() are incorrect. In
several cases, the function returns 0 on error, which I suspect is
not intended. Fix this by properly tracking error codes.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
12 years agohwmon: (lm73) Make detection less problematic
Jean Delvare [Tue, 1 Nov 2011 00:15:06 +0000 (11:15 +1100)]
hwmon: (lm73) Make detection less problematic

Word reads can cause trouble with some I2C devices, so do as much
detection as we can using only byte reads, and only use a word read in
the end to confirm the positive match. Also properly handle read
errors.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Robert Casanova <robertcasanova@nanometrics.ca>
12 years agohwmon: Avoid building drivers for powerpc that read/write ISA addresses
Dean Nelson [Tue, 1 Nov 2011 00:15:05 +0000 (11:15 +1100)]
hwmon: Avoid building drivers for powerpc that read/write ISA addresses

A modprobe of hwmon drivers that read/write ISA addresses on a powerpc results
in a kernel Oops. These reads/writes are being done via the inb()/in_8() and
outb()/out_8() macros.

Prevent these drivers from being built for powerpc.

Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoMerge branch 'next/soc' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:41:13 +0000 (00:41 +0100)]
Merge branch 'next/soc' into for-next

Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/gpio.h

12 years agoMerge branch 'next/dt' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:40:51 +0000 (00:40 +0100)]
Merge branch 'next/dt' into for-next

Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h

12 years agoMerge branch 'next/devel2' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:40:25 +0000 (00:40 +0100)]
Merge branch 'next/devel2' into for-next

12 years agoMerge branch 'next/cleanup2' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:40:18 +0000 (00:40 +0100)]
Merge branch 'next/cleanup2' into for-next

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/io.c
drivers/gpio/Makefile

12 years agoMerge branch 'next/cross-platform' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:39:24 +0000 (00:39 +0100)]
Merge branch 'next/cross-platform' into for-next

Conflicts:
arch/arm/Kconfig.debug

12 years agoMerge branch 'next/board' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:39:05 +0000 (00:39 +0100)]
Merge branch 'next/board' into for-next

12 years agoMerge branch 'next/devel' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:38:52 +0000 (00:38 +0100)]
Merge branch 'next/devel' into for-next

Conflicts:
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/plat-mxc/include/mach/memory.h

12 years agoMerge branch 'next/deletion' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:38:14 +0000 (00:38 +0100)]
Merge branch 'next/deletion' into for-next

Conflicts:
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-nuc93x/mach-nuc932evb.c
arch/arm/mach-nuc93x/time.c

12 years agoMerge branch 'next/pm' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:37:45 +0000 (00:37 +0100)]
Merge branch 'next/pm' into for-next

Conflicts:
arch/arm/mach-prima2/l2x0.c

12 years agoMerge branch 'next/timer' into for-next
Arnd Bergmann [Mon, 31 Oct 2011 23:37:28 +0000 (00:37 +0100)]
Merge branch 'next/timer' into for-next