Module Name: src
Committed By: riastradh
Date: Wed Apr 6 22:48:09 UTC 2022
Modified Files:
src/sys/dev/marvell: mvxpsec.c
Log Message:
mvxpsec(4): Nix trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/marvell/mvxpsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/mvxpsec.c
diff -u src/sys/dev/marvell/mvxpsec.c:1.11 src/sys/dev/marvell/mvxpsec.c:1.12
--- src/sys/dev/marvell/mvxpsec.c:1.11 Sat Mar 12 15:32:32 2022
+++ src/sys/dev/marvell/mvxpsec.c Wed Apr 6 22:48:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mvxpsec.c,v 1.11 2022/03/12 15:32:32 riastradh Exp $ */
+/* $NetBSD: mvxpsec.c,v 1.12 2022/04/06 22:48:09 riastradh Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
* All rights reserved.
@@ -401,7 +401,7 @@ mvxpsec_attach(device_t parent, device_t
/* INTR */
MVXPSEC_WRITE(sc, MVXPSEC_INT_MASK, MVXPSEC_DEFAULT_INT);
MVXPSEC_WRITE(sc, MV_TDMA_ERR_MASK, MVXPSEC_DEFAULT_ERR);
- sc->sc_done_ih =
+ sc->sc_done_ih =
marvell_intr_establish(mva->mva_irq, IPL_NET, mvxpsec_intr, sc);
/* XXX: sould pass error IRQ using mva */
sc->sc_error_ih = marvell_intr_establish(MVXPSEC_ERR_INT(sc),
@@ -434,7 +434,7 @@ mvxpsec_attach(device_t parent, device_t
MVXPSEC_WRITE(sc, MV_ACC_COMMAND, MV_ACC_COMMAND_STOP);
/* Session */
- sc->sc_session_pool =
+ sc->sc_session_pool =
pool_cache_init(sizeof(struct mvxpsec_session), 0, 0, 0,
"mvxpsecpl", NULL, IPL_NET,
mvxpsec_session_ctor, mvxpsec_session_dtor, sc);
@@ -577,7 +577,7 @@ mvxpsec_timer(void *aux)
#ifdef MVXPSEC_DEBUG
mvxpsec_dump_reg(sc);
#endif
-
+
s = splnet();
/* stop security accelerator */
MVXPSEC_WRITE(sc, MV_ACC_COMMAND, MV_ACC_COMMAND_STOP);
@@ -771,7 +771,6 @@ mvxpsec_dma_setup(struct mvxpsec_descrip
#ifdef MVXPSEC_DEBUG
mvxpsec_dump_dmaq(dh);
#endif
-
}
/*
@@ -889,7 +888,7 @@ mvxpsec_dma_copy_packet(struct mvxpsec_s
* | |
* v v
* +----+--------...
- * |IV |DATA
+ * |IV |DATA
* +----+--------...
*/
pkt_off = 0;
@@ -909,7 +908,7 @@ mvxpsec_dma_copy_packet(struct mvxpsec_s
if (__predict_false(err))
return err;
- /*
+ /*
* make DMA descriptors to copy session header: DRAM -> SRAM
* we can reuse session header on SRAM if session is not changed.
*/
@@ -1268,7 +1267,7 @@ STATIC uint32_t
mvxpsec_eintr_ack(struct mvxpsec_softc *sc)
{
uint32_t reg;
-
+
reg = MVXPSEC_READ(sc, MV_TDMA_ERR_CAUSE);
reg &= MVXPSEC_DEFAULT_ERR;
MVXPSEC_WRITE(sc, MV_TDMA_ERR_CAUSE, ~reg);
@@ -1445,7 +1444,7 @@ mvxpsec_packet_ctor(void *arg, void *obj
log(LOG_ERR, "%s: cannot create DMA map\n", __func__);
goto fail;
}
- if (bus_dmamap_load(sc->sc_dmat, mv_p->pkt_header_map,
+ if (bus_dmamap_load(sc->sc_dmat, mv_p->pkt_header_map,
&mv_p->pkt_header, sizeof(mv_p->pkt_header),
NULL, BUS_DMA_NOWAIT)) {
log(LOG_ERR, "%s: cannot load header\n", __func__);
@@ -1533,7 +1532,7 @@ mvxpsec_session_ref(struct mvxpsec_sessi
refs = atomic_inc_32_nv(&mv_s->refs);
if (refs == 1) {
- /*
+ /*
* a session with refs == 0 is
* already invalidated. revert it.
* XXX: use CAS ?
@@ -1543,7 +1542,7 @@ mvxpsec_session_ref(struct mvxpsec_sessi
"%s: session is already invalidated.\n", __func__);
return -1;
}
-
+
return 0;
}
@@ -2128,7 +2127,7 @@ mvxpsec_dispatch(void *arg, struct crypt
err = mvxpsec_packet_setcrp(mv_p, crp);
if (__predict_false(err))
goto fail;
-
+
/*
* Setup DMA descriptor chains
*/
@@ -2660,7 +2659,7 @@ STATIC int
mvxpsec_packet_write_iv(struct mvxpsec_packet *mv_p, void *iv, int ivlen)
{
uint8_t ivbuf[16];
-
+
KASSERT(ivlen == 8 || ivlen == 16);
if (iv == NULL) {
@@ -2924,7 +2923,7 @@ static uint8_t AES_SBOX[256] = {
7, 18, 128, 226, 235, 39, 178, 117, 9, 131, 44, 26, 27, 110,
90, 160, 82, 59, 214, 179, 41, 227, 47, 132, 83, 209, 0, 237,
32, 252, 177, 91, 106, 203, 190, 57, 74, 76, 88, 207, 208, 239,
- 170, 251, 67, 77, 51, 133, 69, 249, 2, 127, 80, 60, 159, 168,
+ 170, 251, 67, 77, 51, 133, 69, 249, 2, 127, 80, 60, 159, 168,
81, 163, 64, 143, 146, 157, 56, 245, 188, 182, 218, 33, 16, 255,
243, 210, 205, 12, 19, 236, 95, 151, 68, 23, 196, 167, 126, 61,
100, 93, 25, 115, 96, 129, 79, 220, 34, 42, 144, 136, 70, 238,
@@ -2938,7 +2937,7 @@ static uint8_t AES_SBOX[256] = {
176, 84, 187, 22
};
-static uint32_t AES_RCON[30] = {
+static uint32_t AES_RCON[30] = {
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8,
0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4,
0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91
@@ -2946,11 +2945,11 @@ static uint32_t AES_RCON[30] = {
STATIC int
mv_aes_ksched(uint8_t k[4][MAXKC], int keyBits,
- uint8_t W[MAXROUNDS+1][4][MAXBC])
+ uint8_t W[MAXROUNDS+1][4][MAXBC])
{
int KC, BC, ROUNDS;
int i, j, t, rconpointer = 0;
- uint8_t tk[4][MAXKC];
+ uint8_t tk[4][MAXKC];
switch (keyBits) {
case 128:
@@ -2978,7 +2977,7 @@ mv_aes_ksched(uint8_t k[4][MAXKC], int k
/* copy values into round key array */
for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++)
for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j];
-
+
while (t < (ROUNDS+1)*BC) { /* while not enough round key material calculated */
/* calculate new values */
for(i = 0; i < 4; i++)
@@ -3002,11 +3001,11 @@ mv_aes_ksched(uint8_t k[4][MAXKC], int k
/* copy values into round key array */
for(j = 0; (j < KC) && (t < (ROUNDS+1)*BC); j++, t++)
for(i = 0; i < 4; i++) W[t / BC][i][t % BC] = tk[i][j];
- }
+ }
return 0;
}
-
+
STATIC int
mv_aes_deckey(uint8_t *expandedKey, uint8_t *keyMaterial, int keyLen)
{
@@ -3018,31 +3017,31 @@ mv_aes_deckey(uint8_t *expandedKey, uint
if (expandedKey == NULL)
return -1;
- if (!((keyLen == 128) || (keyLen == 192) || (keyLen == 256)))
+ if (!((keyLen == 128) || (keyLen == 192) || (keyLen == 256)))
return -1;
- if (keyMaterial == NULL)
+ if (keyMaterial == NULL)
return -1;
- /* initialize key schedule: */
+ /* initialize key schedule: */
for (i=0; i<keyLen/8; i++) {
j = keyMaterial[i];
- k[i % 4][i / 4] = j;
+ k[i % 4][i / 4] = j;
}
mv_aes_ksched(k, keyLen, W);
switch (keyLen) {
- case 128:
+ case 128:
rounds = 10;
- KC = 4;
+ KC = 4;
break;
- case 192:
+ case 192:
rounds = 12;
- KC = 6;
+ KC = 6;
break;
- case 256:
+ case 256:
rounds = 14;
- KC = 8;
+ KC = 8;
break;
default:
return -1;
@@ -3175,7 +3174,7 @@ STATIC const char *
s_winreg(uint32_t v)
{
static char buf[80];
-
+
snprintf(buf, sizeof(buf),
"%s TGT 0x%x ATTR 0x%02x size %u(0x%04x)[64KB]",
(v & MV_TDMA_ATTR_ENABLE) ? "EN" : "DIS",
@@ -3189,7 +3188,7 @@ STATIC const char *
s_ctrlreg(uint32_t reg)
{
static char buf[80];
-
+
snprintf(buf, sizeof(buf),
"%s: %sFETCH DBURST-%u SBURST-%u %sOUTS %sCHAIN %sBSWAP %sACT",
(reg & MV_TDMA_CONTROL_ENABLE) ? "ENABLE" : "DISABLE",
@@ -3271,9 +3270,8 @@ s_xpsec_op(uint32_t reg)
default:
break;
}
-
- return "Unknown";
+ return "Unknown";
}
STATIC const char *
