Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / drivers / crypto / virtio / virtio_crypto_core.c

diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c
index 7c71985..3c9e120 100644 (file)
--- a/drivers/crypto/virtio/virtio_crypto_core.c
+++ b/drivers/crypto/virtio/virtio_crypto_core.c
@@ -303,6 +303,13 @@ static int virtcrypto_probe(struct virtio_device *vdev)
        u32 max_data_queues = 0, max_cipher_key_len = 0;
        u32 max_auth_key_len = 0;
        u64 max_size = 0;
+       u32 cipher_algo_l = 0;
+       u32 cipher_algo_h = 0;
+       u32 hash_algo = 0;
+       u32 mac_algo_l = 0;
+       u32 mac_algo_h = 0;
+       u32 aead_algo = 0;
+       u32 crypto_services = 0;
 
        if (!virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
                return -ENODEV;
@@ -339,6 +346,20 @@ static int virtcrypto_probe(struct virtio_device *vdev)
                max_auth_key_len, &max_auth_key_len);
        virtio_cread(vdev, struct virtio_crypto_config,
                max_size, &max_size);
+       virtio_cread(vdev, struct virtio_crypto_config,
+               crypto_services, &crypto_services);
+       virtio_cread(vdev, struct virtio_crypto_config,
+               cipher_algo_l, &cipher_algo_l);
+       virtio_cread(vdev, struct virtio_crypto_config,
+               cipher_algo_h, &cipher_algo_h);
+       virtio_cread(vdev, struct virtio_crypto_config,
+               hash_algo, &hash_algo);
+       virtio_cread(vdev, struct virtio_crypto_config,
+               mac_algo_l, &mac_algo_l);
+       virtio_cread(vdev, struct virtio_crypto_config,
+               mac_algo_h, &mac_algo_h);
+       virtio_cread(vdev, struct virtio_crypto_config,
+               aead_algo, &aead_algo);
 
        /* Add virtio crypto device to global table */
        err = virtcrypto_devmgr_add_dev(vcrypto);
@@ -358,6 +379,14 @@ static int virtcrypto_probe(struct virtio_device *vdev)
        vcrypto->max_cipher_key_len = max_cipher_key_len;
        vcrypto->max_auth_key_len = max_auth_key_len;
        vcrypto->max_size = max_size;
+       vcrypto->crypto_services = crypto_services;
+       vcrypto->cipher_algo_l = cipher_algo_l;
+       vcrypto->cipher_algo_h = cipher_algo_h;
+       vcrypto->mac_algo_l = mac_algo_l;
+       vcrypto->mac_algo_h = mac_algo_h;
+       vcrypto->hash_algo = hash_algo;
+       vcrypto->aead_algo = aead_algo;
+
 
        dev_info(&vdev->dev,
                "max_queues: %u, max_cipher_key_len: %u, max_auth_key_len: %u, max_size 0x%llx\n",