Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c544501 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris 

Pull CRIS changes from Jesper Nilsson.

... mainly the UAPI disintegration.

* tag 'cris-for-linus-3.8' of git://jni.nu/cris:
  UAPI: Fix up empty files in arch/cris/
  CRIS: locking: fix the return value of arch_read_trylock()
  CRIS: use kbuild.h instead of defining macros in asm-offset.c
  UAPI: (Scripted) Disintegrate arch/cris/include/asm
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
parents 1ffab3d4 77c8006d

arch/cris/include/arch-v10/arch/Kbuild

+1 −4
Original line number Diff line number Diff line 
header-y += user.h

header-y += svinto.h

header-y += sv_addr_ag.h

header-y += sv_addr.agh
 
# CRISv10 arch

arch/cris/include/arch-v32/arch/Kbuild

+1 −2
Original line number Diff line number Diff line 
header-y += user.h

header-y += cryptocop.h
 
# CRISv32 arch

arch/cris/include/arch-v32/arch/cryptocop.h

+1 −115
Original line number Diff line number Diff line
@@ -2,124 +2,12 @@ 
 * The device /dev/cryptocop is accessible using this driver using

 * CRYPTOCOP_MAJOR (254) and minor number 0.

 */



#ifndef CRYPTOCOP_H

#define CRYPTOCOP_H



#include <linux/uio.h>





#define CRYPTOCOP_SESSION_ID_NONE (0)



typedef unsigned long long int cryptocop_session_id;



/* cryptocop ioctls */

#define ETRAXCRYPTOCOP_IOCTYPE         (250)



#define CRYPTOCOP_IO_CREATE_SESSION    _IOWR(ETRAXCRYPTOCOP_IOCTYPE, 1, struct strcop_session_op)

#define CRYPTOCOP_IO_CLOSE_SESSION     _IOW(ETRAXCRYPTOCOP_IOCTYPE, 2, struct strcop_session_op)

#define CRYPTOCOP_IO_PROCESS_OP        _IOWR(ETRAXCRYPTOCOP_IOCTYPE, 3, struct strcop_crypto_op)

#define CRYPTOCOP_IO_MAXNR             (3)



typedef enum {

	cryptocop_cipher_des = 0,

	cryptocop_cipher_3des = 1,

	cryptocop_cipher_aes = 2,

	cryptocop_cipher_m2m = 3, /* mem2mem is essentially a NULL cipher with blocklength=1 */

	cryptocop_cipher_none

} cryptocop_cipher_type;



typedef enum {

	cryptocop_digest_sha1 = 0,

	cryptocop_digest_md5 = 1,

	cryptocop_digest_none

} cryptocop_digest_type;



typedef enum {

	cryptocop_csum_le = 0,

	cryptocop_csum_be = 1,

	cryptocop_csum_none

} cryptocop_csum_type;



typedef enum {

	cryptocop_cipher_mode_ecb = 0,

	cryptocop_cipher_mode_cbc,

	cryptocop_cipher_mode_none

} cryptocop_cipher_mode;



typedef enum {

	cryptocop_3des_eee = 0,

	cryptocop_3des_eed = 1,

	cryptocop_3des_ede = 2,

	cryptocop_3des_edd = 3,

	cryptocop_3des_dee = 4,

	cryptocop_3des_ded = 5,

	cryptocop_3des_dde = 6,

	cryptocop_3des_ddd = 7

} cryptocop_3des_mode;



/* Usermode accessible (ioctl) operations. */

struct strcop_session_op{

	cryptocop_session_id    ses_id;



	cryptocop_cipher_type   cipher; /* AES, DES, 3DES, m2m, none */



	cryptocop_cipher_mode   cmode; /* ECB, CBC, none */

	cryptocop_3des_mode     des3_mode;



	cryptocop_digest_type   digest; /* MD5, SHA1, none */



	cryptocop_csum_type     csum;   /* BE, LE, none */



	unsigned char           *key;

	size_t                  keylen;

};



#define CRYPTOCOP_CSUM_LENGTH         (2)

#define CRYPTOCOP_MAX_DIGEST_LENGTH   (20)  /* SHA-1 20, MD5 16 */

#define CRYPTOCOP_MAX_IV_LENGTH       (16)  /* (3)DES==8, AES == 16 */

#define CRYPTOCOP_MAX_KEY_LENGTH      (32)



struct strcop_crypto_op{

	cryptocop_session_id ses_id;



	/* Indata. */

	unsigned char            *indata;

	size_t                   inlen; /* Total indata length. */



	/* Cipher configuration. */

	unsigned char            do_cipher:1;

	unsigned char            decrypt:1; /* 1 == decrypt, 0 == encrypt */

	unsigned char            cipher_explicit:1;

	size_t                   cipher_start;

	size_t                   cipher_len;

	/* cipher_iv is used if do_cipher and cipher_explicit and the cipher

	   mode is CBC.  The length is controlled by the type of cipher,

	   e.g. DES/3DES 8 octets and AES 16 octets. */

	unsigned char            cipher_iv[CRYPTOCOP_MAX_IV_LENGTH];

	/* Outdata. */

	unsigned char            *cipher_outdata;

	size_t                   cipher_outlen;



	/* digest configuration. */

	unsigned char            do_digest:1;

	size_t                   digest_start;

	size_t                   digest_len;

	/* Outdata.  The actual length is determined by the type of the digest. */

	unsigned char            digest[CRYPTOCOP_MAX_DIGEST_LENGTH];



	/* Checksum configuration. */

	unsigned char            do_csum:1;

	size_t                   csum_start;

	size_t                   csum_len;

	/* Outdata. */

	unsigned char            csum[CRYPTOCOP_CSUM_LENGTH];

};

#include <uapi/arch-v32/arch/cryptocop.h>







#ifdef __KERNEL__



/********** The API to use from inside the kernel. ************/



#include <arch/hwregs/dma.h>
@@ -267,6 +155,4 @@ int cryptocop_job_queue_insert_crypto(struct cryptocop_operation *operation); 


int cryptocop_job_queue_insert_user_job(struct cryptocop_operation *operation);



#endif /* __KERNEL__ */



#endif /* CRYPTOCOP_H */

arch/cris/include/arch-v32/arch/spinlock.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) 
		ret = 1;

	}

	arch_spin_unlock(&rw->slock);

	return 1;

	return ret;

}



#define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)

arch/cris/include/asm/Kbuild

+0 −5
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += arch-v10/

header-y += arch-v32/



header-y += ethernet.h

header-y += etraxgpio.h

header-y += rs485.h

header-y += sync_serial.h



generic-y += clkdev.h

generic-y += exec.h