Bug#700572: initramfs-tools: The ehci-hcd module has been split into ehci-pci + ehci-hcd in Linux v3.8
Package: initramfs-tools
Version: 0.98.8
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Linux v3.8 changes the name of the PCI ehci driver from ehci-hcd to
ehci-pci. Ref
commit adfa79d1c06a32650332930ca4c488ca570b3407
Author: Alan Stern <stern@rowland.harvard.edu>
Date: Thu Nov 1 11:13:04 2012 -0400
USB: EHCI: make ehci-pci a separate driver
This patch (as1625) splits the PCI portion of ehci-hcd out into its
own separate driver module, called ehci-pci. Consistently with the
current practice, the decision whether to build this module is not
user-configurable. If EHCI and PCI are enabled then the module will
be built, always.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
ehci-pci should be added to the hardcoded lists of modules everywhere ehci-hcd
is included. Patch is included.
Bjørn
- -- Package-specific info:
- -- initramfs sizes
- -rw-r--r-- 1 root root 8.5M Apr 9 2010 /boot/initrd.img-2.6.32-4-amd64
- -rw-r--r-- 1 root root 11M Nov 6 02:13 /boot/initrd.img-2.6.32-5-amd64
- -rw-r--r-- 1 root root 11M May 10 2012 /boot/initrd.img-2.6.32-5-amd64.bak
- -- /proc/cmdline
initrd=/initrd.img root=/dev/mapper/vg00-root ro console=tty0 console=ttyS0,9600n8 BOOT_IMAGE=/vmlinuz
- -- resume
RESUME=
- -- /proc/filesystems
ext3
ext2
fuseblk
vfat
- -- lsmod
Module Size Used by
xt_recent 5977 0
cpuid 1971 0
vfat 7884 0
fat 40038 1 vfat
loop 11799 0
ipt_LOG 4518 0
tcp_diag 880 0
inet_diag 6914 1 tcp_diag
parport_pc 18855 0
ppdev 5030 0
lp 7462 0
parport 27954 3 parport_pc,ppdev,lp
ip6t_rt 1960 2
nf_conntrack_ipv6 10451 1
ip6t_REJECT 2580 1
ip6t_LOG 4378 2
ip6table_filter 2384 1
ip6_tables 15107 3 ip6t_rt,ip6t_LOG,ip6table_filter
ipt_MASQUERADE 1554 2
xt_state 1303 5
ipt_REDIRECT 1111 2
xt_multiport 2267 9
xt_tcpudp 2319 51
ipt_REJECT 1953 1
iptable_nat 4299 1
iptable_filter 2258 1
ip_tables 13915 2 iptable_nat,iptable_filter
x_tables 12845 14 xt_recent,ipt_LOG,ip6t_rt,ip6t_REJECT,ip6t_LOG,ip6_tables,ipt_MASQUERADE,xt_state,ipt_REDIRECT,xt_multiport,xt_tcpudp,ipt_REJECT,iptable_nat,ip_tables
microcode 21611 0
nf_nat_ftp 2031 0
nf_nat 13388 4 ipt_MASQUERADE,ipt_REDIRECT,iptable_nat,nf_nat_ftp
nf_conntrack_ipv4 9833 7 iptable_nat,nf_nat
nf_defrag_ipv4 1139 1 nf_conntrack_ipv4
nf_conntrack_irc 3347 0
nf_conntrack_ftp 5537 1 nf_nat_ftp
nf_conntrack 46535 9 nf_conntrack_ipv6,ipt_MASQUERADE,xt_state,iptable_nat,nf_nat_ftp,nf_nat,nf_conntrack_ipv4,nf_conntrack_irc,nf_conntrack_ftp
fuse 50924 1
cls_u32 5466 1
sch_htb 11942 1
ppp_deflate 3410 0
zlib_deflate 17746 1 ppp_deflate
bsd_comp 4452 0
nfsd 254782 13
exportfs 3170 1 nfsd
nfs 241306 0
lockd 57619 2 nfsd,nfs
fscache 29834 1 nfs
nfs_acl 2031 2 nfsd,nfs
auth_rpcgss 33508 2 nfsd,nfs
sunrpc 161660 28 nfsd,nfs,lockd,nfs_acl,auth_rpcgss
sch_tbf 3588 1
sit 8176 0
tunnel4 1973 1 sit
ppp_async 6245 2
crc_ccitt 1323 1 ppp_async
ppp_generic 19259 11 ppp_deflate,bsd_comp,ppp_async
slhc 4003 1 ppp_generic
8021q 17158 0
garp 5050 1 8021q
bridge 39646 0
stp 1440 2 garp,bridge
ext2 52905 1
raid456 44516 1
async_raid6_recov 5170 1 raid456
async_pq 3479 2 raid456,async_raid6_recov
raid6_pq 77179 2 async_raid6_recov,async_pq
async_xor 2478 3 raid456,async_raid6_recov,async_pq
xor 4380 1 async_xor
async_memcpy 1198 2 raid456,async_raid6_recov
async_tx 1734 5 raid456,async_raid6_recov,async_pq,async_xor,async_memcpy
mptctl 20982 0
tun 10844 6
coretemp 4325 0
kvm_intel 38194 29
kvm 215391 1 kvm_intel
tda10023 5823 2
tda10021 4774 0
io_edgeport 35871 0
mantis 16776 0
snd_pcm 60487 0
snd_timer 15598 1 snd_pcm
mantis_core 23765 1 mantis
snd 46526 2 snd_pcm,snd_timer
usbserial 27676 1 io_edgeport
radeon 574908 0
ttm 40162 1 radeon
dvb_core 74634 1 mantis_core
drm_kms_helper 20369 1 radeon
soundcore 4598 1 snd
drm 142352 3 radeon,ttm,drm_kms_helper
ir_common 24271 1 mantis_core
i2c_i801 7830 0
i2c_algo_bit 4209 1 radeon
snd_page_alloc 6249 1 snd_pcm
asus_atk0110 7686 0
joydev 8459 0
i2c_core 15819 9 tda10023,tda10021,mantis,mantis_core,radeon,drm_kms_helper,drm,i2c_i801,i2c_algo_bit
serio_raw 3752 0
evdev 7352 3
pcspkr 1699 0
button 4650 0
processor 29935 0
ext3 106710 4
jbd 37317 1 ext3
mbcache 5050 2 ext2,ext3
dm_mod 53946 9
raid1 18431 2
md_mod 73920 5 raid456,raid1
usbhid 33292 0
hid 63257 1 usbhid
sd_mod 29937 14
uhci_hcd 18521 0
crc_t10dif 1276 1 sd_mod
mptsas 29188 12
mptscsih 16360 1 mptsas
mptbase 48382 3 mptctl,mptsas,mptscsih
thermal 11674 0
firewire_ohci 19676 0
firewire_core 36848 1 firewire_ohci
ata_generic 3239 0
crc_itu_t 1307 1 firewire_core
thermal_sys 11942 2 processor,thermal
scsi_transport_sas 19865 1 mptsas
ahci 32870 8
pata_jmicron 2280 0
e1000e 124836 0
libata 133776 3 ata_generic,ahci,pata_jmicron
ehci_hcd 32097 0
atl1 26034 0
mii 3210 1 atl1
scsi_mod 126725 6 mptctl,sd_mod,mptsas,mptscsih,scsi_transport_sas,libata
usbcore 123122 6 io_edgeport,usbserial,usbhid,uhci_hcd,ehci_hcd
nls_base 6377 3 vfat,fat,usbcore
- -- /etc/initramfs-tools/modules
- -- /etc/kernel-img.conf
# Kernel Image management overrides
# $Id: kernel-img.conf,v 1.6 2008-06-14 09:35:46 bjorn Exp $
#
# See kernel-img.conf(5) for details
link_in_boot = Yes
do_symlinks = Yes
warn_initrd = No
do_bootloader = No
silent_loader = Yes
- -- /etc/initramfs-tools/initramfs.conf
MODULES=most
BUSYBOX=y
KEYMAP=n
COMPRESS=gzip
BOOT=local
DEVICE=
NFSROOT=auto
- -- /etc/initramfs-tools/update-initramfs.conf
update_initramfs=yes
backup_initramfs=yes
- -- /etc/crypttab
# <target name> <source device> <key file> <options>
- -- /proc/mdstat
Personalities : [raid1] [raid6] [raid5] [raid4]
md2 : active raid6 sdg[0] sdh[5] sdi[4] sdd[3] sdf[2] sde[1]
7814057984 blocks level 6, 64k chunk, algorithm 2 [6/6] [UUUUUU]
bitmap: 4/466 pages [16KB], 2048KB chunk, file: /.md2-raid6-bitmap
md1 : active raid1 sda2[0] sdb2[1]
976497792 blocks [2/2] [UU]
md0 : active raid1 sda1[0] sdb1[1]
262080 blocks [2/2] [UU]
unused devices: <none>
- -- mkinitramfs hooks
/etc/initramfs-tools/hooks/:
/usr/share/initramfs-tools/hooks:
busybox
dmsetup
intel_microcode
keymap
klibc
lvm2
mdadm
thermal
udev
- -- System Information:
Debian Release: 6.0.6
APT prefers stable
APT policy: (700, 'stable'), (699, 'proposed-updates'), (650, 'testing'), (600, 'unstable'), (500, 'stable-updates'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages initramfs-tools depends on:
ii cpio 2.11-4 GNU cpio -- a program to manage ar
ii findutils 4.4.2-1+b1 utilities for finding files--find,
ii klibc-utils 1.5.20-1+squeeze1 small utilities built with klibc f
ii module-init-tools 3.12-2 tools for managing Linux kernel mo
ii udev 164-3 /dev/ and hotplug management daemo
Versions of packages initramfs-tools recommends:
ii busybox 1:1.17.1-8 Tiny utilities for small and embed
Versions of packages initramfs-tools suggests:
pn bash-completion <none> (no description available)
- -- Configuration Files:
/etc/initramfs-tools/update-initramfs.conf changed:
update_initramfs=yes
backup_initramfs=yes
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAlEc7VwACgkQ10rqkowbIsn3owCfbqMvE9SB+tLVcs1YlfXFShBh
rlQAnAyueT/lm3iX5tLygi/E6P8tEtE8
=LRrG
-----END PGP SIGNATURE-----
diff -urp initramfs-tools-0.109.x/hook-functions initramfs-tools-0.109/hook-functions
--- initramfs-tools-0.109.x/hook-functions 2012-09-21 11:00:57.000000000 +0200
+++ initramfs-tools-0.109/hook-functions 2013-02-14 14:48:43.000000000 +0100
@@ -422,7 +422,7 @@ auto_add_modules()
for arg in "$@" ; do
case "$arg" in
base)
- modules="$modules ehci-hcd ohci-hcd uhci-hcd usbhid"
+ modules="$modules ehci-pci ehci-hcd ohci-hcd uhci-hcd usbhid"
modules="$modules xhci xhci-hcd"
modules="$modules hid-apple hid-cherry hid-generic"
modules="$modules hid-logitech hid-logitech-dj"
Only in initramfs-tools-0.109: hook-functions~
diff -urp initramfs-tools-0.109.x/scripts/functions initramfs-tools-0.109/scripts/functions
--- initramfs-tools-0.109.x/scripts/functions 2012-06-06 15:04:52.000000000 +0200
+++ initramfs-tools-0.109/scripts/functions 2013-02-14 14:47:59.000000000 +0100
@@ -46,6 +46,7 @@ panic()
fi
modprobe -v i8042 || true
modprobe -v atkbd || true
+ modprobe -v ehci-pci || true
modprobe -v ehci-hcd || true
modprobe -v uhci-hcd || true
modprobe -v ohci-hcd || true
Only in initramfs-tools-0.109/scripts: functions~
Reply to: