Commit 832fe9c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio: Add transport feature handling stub for virtio_ring.
  virtio: Rename set_features to finalize_features
  virtio: Formally reserve bits 28-31 to be 'transport' features.
  s390: use virtio_console for KVM on s390
  virtio: console as a config option
  virtio_console: use virtqueue notification for hvc_console
  hvc_console: rework setup to replace irq functions with callbacks
  virtio_blk: check for hardsector size from host
  virtio: Use bus_type probe and remove methods
  virtio: don't always force a notification when ring is full
  virtio: clarify that ABI is usable by any implementations
  virtio: Recycle unused recv buffer pages for large skbs in net driver
  virtio net: Allow receiving SG packets
  virtio net: Add ethtool ops for SG/GSO
  virtio: fix virtio_net xmit of freed skb bug
parents ed9559d3 e34f8725

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -565,6 +565,7 @@ bool "s390 guest support (EXPERIMENTAL)" 
	depends on 64BIT && EXPERIMENTAL

	select VIRTIO

	select VIRTIO_RING

	select VIRTIO_CONSOLE

	help

	  Select this option if you want to run the kernel under s390 linux

endmenu

arch/s390/kernel/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <asm/sections.h>

#include <asm/ebcdic.h>

#include <asm/compat.h>

#include <asm/kvm_virtio.h>



long psw_kernel_bits	= (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY |

			   PSW_MASK_MCHECK | PSW_DEFAULT_KEY);
@@ -766,7 +767,8 @@ setup_arch(char **cmdline_p) 
		printk("We are running under VM (64 bit mode)\n");

	else if (MACHINE_IS_KVM) {

		printk("We are running under KVM (64 bit mode)\n");

		add_preferred_console("ttyS", 1, NULL);

		add_preferred_console("hvc", 0, NULL);

		s390_virtio_console_init();

	} else

		printk("We are running native (64 bit mode)\n");

#endif /* CONFIG_64BIT */

drivers/block/virtio_blk.c

+9 −1
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ static int virtblk_probe(struct virtio_device *vdev) 
	int err;

	u64 cap;

	u32 v;

	u32 blk_size;



	if (index_to_minor(index) >= 1 << MINORBITS)

		return -ENOSPC;
@@ -290,6 +291,13 @@ static int virtblk_probe(struct virtio_device *vdev) 
	if (!err)

		blk_queue_max_hw_segments(vblk->disk->queue, v);



	/* Host can optionally specify the block size of the device */

	err = virtio_config_val(vdev, VIRTIO_BLK_F_BLK_SIZE,

				offsetof(struct virtio_blk_config, blk_size),

				&blk_size);

	if (!err)

		blk_queue_hardsect_size(vblk->disk->queue, blk_size);



	add_disk(vblk->disk);

	return 0;
@@ -330,7 +338,7 @@ static struct virtio_device_id id_table[] = { 


static unsigned int features[] = {

	VIRTIO_BLK_F_BARRIER, VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX,

	VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO,

	VIRTIO_BLK_F_GEOMETRY, VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE,

};



static struct virtio_driver virtio_blk = {

drivers/char/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -578,11 +578,14 @@ config HVC_DRIVER 
	  It will automatically be selected if one of the back-end console drivers

	  is selected.



config HVC_IRQ

	bool



config HVC_CONSOLE

	bool "pSeries Hypervisor Virtual Console support"

	depends on PPC_PSERIES

	select HVC_DRIVER

	select HVC_IRQ

	help

	  pSeries machines when partitioned support a hypervisor virtual

	  console. This driver allows each pSeries partition to have a console
@@ -593,6 +596,7 @@ config HVC_ISERIES 
	depends on PPC_ISERIES

	default y

	select HVC_DRIVER

	select HVC_IRQ

	help

	  iSeries machines support a hypervisor virtual console.
@@ -614,13 +618,18 @@ config HVC_XEN 
	bool "Xen Hypervisor Console support"

	depends on XEN

	select HVC_DRIVER

	select HVC_IRQ

	default y

	help

	  Xen virtual console device driver



config VIRTIO_CONSOLE

	bool

	tristate "Virtio console"

	depends on VIRTIO

	select HVC_DRIVER

	help

	  Virtio console for use with lguest and other hypervisors.





config HVCS

	tristate "IBM Hypervisor Virtual Console Server support"

drivers/char/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ obj-$(CONFIG_HVC_ISERIES) += hvc_iseries.o 
obj-$(CONFIG_HVC_RTAS)		+= hvc_rtas.o

obj-$(CONFIG_HVC_BEAT)		+= hvc_beat.o

obj-$(CONFIG_HVC_DRIVER)	+= hvc_console.o

obj-$(CONFIG_HVC_IRQ)		+= hvc_irq.o

obj-$(CONFIG_HVC_XEN)		+= hvc_xen.o

obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o

obj-$(CONFIG_RAW_DRIVER)	+= raw.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE