Bug#751143: initramfs-tools: please add support for virtio-mmio

[Aurelien Jarno <aurel32@debian.org>]

Package: initramfs-tools
Version: 0.115
Severity: normal
Tags: patch

Hi,

On most virtual machines it is possible to use the virtio interface
through the PCI bus to export for example block or net devices. On some
architectures the emulated machine does not have a PCI bus, and thus the
transport goes through an MMIO interface.

Currently initramfs-tools correctly handle the PCI case, but not the
MMIO on. In case of a virtio based root device, the virtio_mmio module
is not available in the initramfs causing the boot to fail. The patch
below adds the virtio_mmio module if virtio is used (in dep mode), or by
default (in most mode). Could you please apply it in the next upload?

Thanks,
Aurelien


--- a/hook-functions
+++ b/hook-functions
@@ -399,7 +399,7 @@
 	fi
 
 	if [ -e /sys/bus/virtio ] ; then
-		modules="$modules virtio_pci"
+		modules="$modules virtio_pci virtio_mmio"
 	fi
 
 	if [ -e /sys/bus/i2o/devices/ ]; then
@@ -437,7 +437,8 @@
 			modules="$modules btrfs ext2 ext3 ext4 ext4dev "
 			modules="$modules isofs jfs reiserfs udf xfs"
 			modules="$modules nfs nfsv2 nfsv3 nfsv4"
-			modules="$modules af_packet atkbd i8042 virtio_pci"
+			modules="$modules af_packet atkbd i8042"
+			modules="$modules virtio_pci virtio_mmio"
 
 			# Include all HID drivers unless we're sure they
 			# don't support keyboards.  hid-*ff covers various


-- Package-specific info:
-- initramfs sizes
-rw-r--r-- 1 root root 5.3M Jun 10 20:14 /boot/initrd.img-3.14-1-arm64
-- /proc/cmdline
root=/dev/vda1 console=ttyAMA0

-- /proc/filesystems
	ext3
	ext2
	ext4

-- lsmod
Module                  Size  Used by
virtio_rng              2400  0 
rtc_pl031               4112  0 
ext4                  454832  1 
crc16                   1314  1 ext4
mbcache                 5984  1 ext4
jbd2                   79674  1 ext4
virtio_net             19090  0 
virtio_blk              7329  3 
virtio_mmio             4334  0 
virtio_ring             7645  4 virtio_blk,virtio_net,virtio_rng,virtio_mmio
virtio                  4224  4 virtio_blk,virtio_net,virtio_rng,virtio_mmio

-- /etc/initramfs-tools/modules
pl031

-- /etc/kernel-img.conf
# Kernel Image management overrides
# See kernel-img.conf(5) for details
do_symlinks = Yes

-- /etc/initramfs-tools/initramfs.conf
MODULES=most
BUSYBOX=y
KEYMAP=n
COMPRESS=gzip
DEVICE=
NFSROOT=auto

-- /etc/initramfs-tools/update-initramfs.conf
update_initramfs=yes
backup_initramfs=no

-- mkinitramfs hooks
/etc/initramfs-tools/hooks/:

/usr/share/initramfs-tools/hooks:
busybox
keymap
klibc
kmod
resume
thermal
udev


-- System Information:
Debian Release: jessie/sid
  APT prefers unreleased
  APT policy: (500, 'unreleased'), (500, 'unstable')
Architecture: arm64 (aarch64)

Kernel: Linux 3.14-1-arm64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages initramfs-tools depends on:
ii  cpio               2.11+dfsg-2
ii  klibc-utils        2.0.3-1
ii  kmod               17-2
ii  module-init-tools  17-2
ii  udev               204-10

Versions of packages initramfs-tools recommends:
pn  busybox | busybox-initramfs | busybox-static  <none>

Versions of packages initramfs-tools suggests:
pn  bash-completion  <none>

-- no debconf information