commit:     8ca97b52ead308d6738f5819255a1102872a7fa0
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 20:07:54 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 20:07:54 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8ca97b52

modules_load: fix crc32 & crc32c for old kernels & fine-tune per arch

This restores the crc32 & crc32c support on kernels before these were
renamed to crc32 (in 2016) and crc32c (in 2014) respectively.

This also removes crc32c-intel support from non-x86 arches, and adds a
few other arch-specfic crc32 & crc32c drivers where they're available.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 arch/alpha/modules_load    | 2 +-
 arch/arm/modules_load      | 2 +-
 arch/ia64/modules_load     | 2 +-
 arch/mips/modules_load     | 2 +-
 arch/parisc/modules_load   | 2 +-
 arch/parisc64/modules_load | 2 +-
 arch/ppc/modules_load      | 2 +-
 arch/ppc64/modules_load    | 2 +-
 arch/ppc64le/modules_load  | 2 +-
 arch/s390/modules_load     | 2 +-
 arch/sparc/modules_load    | 2 +-
 arch/sparc64/modules_load  | 2 +-
 arch/um/modules_load       | 2 +-
 arch/x86/modules_load      | 2 +-
 arch/x86_64/modules_load   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index f451001..4725f3f 100644
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index f451001..4725f3f 100644
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index 8c782f0..d77eeeb 100644
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index f451001..77f4623 100644
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
crc32-mips aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index f451001..4725f3f 100644
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index c7b4a62..8d40c96 100644
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -29,7 +29,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index f451001..4725f3f 100644
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index f451001..0d369f6 100644
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-vpmsum crc32 
crc32_generic aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/ppc64le/modules_load b/arch/ppc64le/modules_load
index f451001..0d369f6 100644
--- a/arch/ppc64le/modules_load
+++ b/arch/ppc64le/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-vpmsum crc32 
crc32_generic aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/s390/modules_load b/arch/s390/modules_load
index f451001..4725f3f 100644
--- a/arch/s390/modules_load
+++ b/arch/s390/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index f451001..4725f3f 100644
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index f451001..381fa9f 100644
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-sparc64 crc32 
crc32_generic aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/um/modules_load b/arch/um/modules_load
index 640a10f..140b0a9 100644
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic 
aes_generic xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index 8e96808..21afe19 100644
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -31,7 +31,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic aes_586 aesni-intel xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-intel crc32 
crc32_generic crc32-pclmul aes_generic aes_586 aesni-intel xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index d6c283c..5783fd0 100644
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -30,7 +30,7 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uas uhci-hcd ohci-h
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop 
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
 
 # Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic 
aes_generic aes-x86_64 aesni-intel xts"
+MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-intel crc32 
crc32_generic crc32-pclmul aes_generic aes-x86_64 aesni-intel xts"
 
 # Virtio
 MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio 
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto 
virtio_net"

Reply via email to