CVS commit: src/doc
Module Name:src Committed By: skrll Date: Thu Jul 26 06:36:56 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Note RaspberryPi support. To generate a diff of this commit: cvs rdiff -u -r1.1721 -r1.1722 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1721 src/doc/CHANGES:1.1722 --- src/doc/CHANGES:1.1721 Mon Jul 23 04:23:06 2012 +++ src/doc/CHANGES Thu Jul 26 06:36:55 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1721 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1722 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -88,3 +88,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kernel: Change mii_statchg to take struct ifnet * instead of device_t. [matt 20120722] powerpc: Add support for FPU emulation on BookE. [matt 20120722] + evbarm: Add initial support for the RaspberryPi. [skrll 20120726]
CVS commit: src/sys/dev/putter
Module Name:src
Committed By: yamt
Date: Thu Jul 26 10:13:33 UTC 2012
Modified Files:
src/sys/dev/putter: putter.c
Log Message:
fix request leak.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/putter/putter.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/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.32 src/sys/dev/putter/putter.c:1.33
--- src/sys/dev/putter/putter.c:1.32 Sat Jul 23 14:28:28 2011
+++ src/sys/dev/putter/putter.c Thu Jul 26 10:13:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.32 2011/07/23 14:28:28 hannken Exp $ */
+/* $NetBSD: putter.c,v 1.33 2012/07/26 10:13:33 yamt Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: putter.c,v 1.32 2011/07/23 14:28:28 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: putter.c,v 1.33 2012/07/26 10:13:33 yamt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -392,6 +392,11 @@ putter_fop_close(file_t *fp)
mutex_exit(pi_mtx);
/* hmm? suspicious locking? */
+ if (pi-pi_curput != NULL) {
+ pi-pi_pop-pop_releaseout(pi-pi_private, pi-pi_curopaq,
+ ENXIO);
+ pi-pi_curput = NULL;
+ }
while ((rv = pi-pi_pop-pop_close(pi-pi_private)) == ERESTART)
goto restart;
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Thu Jul 26 12:39:27 UTC 2012 Modified Files: src/sys/arch/evbarm/rpi: rpi_start.S Log Message: Remove #if 0 code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/rpi/rpi_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/rpi/rpi_start.S diff -u src/sys/arch/evbarm/rpi/rpi_start.S:1.1 src/sys/arch/evbarm/rpi/rpi_start.S:1.2 --- src/sys/arch/evbarm/rpi/rpi_start.S:1.1 Thu Jul 26 06:21:57 2012 +++ src/sys/arch/evbarm/rpi/rpi_start.S Thu Jul 26 12:39:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_start.S,v 1.1 2012/07/26 06:21:57 skrll Exp $ */ +/* $NetBSD: rpi_start.S,v 1.2 2012/07/26 12:39:27 skrll Exp $ */ /* * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. @@ -88,7 +88,7 @@ #include arm/armreg.h #include assym.h -RCSID($NetBSD: rpi_start.S,v 1.1 2012/07/26 06:21:57 skrll Exp $) +RCSID($NetBSD: rpi_start.S,v 1.2 2012/07/26 12:39:27 skrll Exp $) /* * Workaround Erratum 411920 @@ -211,18 +211,10 @@ _C_LABEL(rpi_start): mov r0, #0 mcr p15, 0, r0, c8, c7, 0 /* Invalidate TLBs */ -#if 0 - /* copied from arm11x6_setttb */ - mcr p15, 0, r0, c7, c10, 4 /* Drain the write buffers. */ -#endif - /* Set the Domain Access register. Very important! */ mov r0, #((DOMAIN_CLIENT (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT) mcr p15, 0, r0, c3, c0, 0 -#if 0 - mrc p15, 0, r0, c2, c0, 0 /* Read the Translation Table Base */ -#endif /* * Enable the MMU, etc. */
CVS commit: src/sys/arch/hp300/stand/common
Module Name:src
Committed By: tsutsui
Date: Thu Jul 26 17:15:22 UTC 2012
Modified Files:
src/sys/arch/hp300/stand/common: if_lereg.h
Log Message:
Remove '__attribute__((__packed__))' from structure definisions
for Am7990 LANCE registers where no implicit padding is expected.
gcc 4.5.3 seems to generate strange and wrong instructions
(four moveb insns against u_short members) if packed attribute
is specified in this case, then netboot fails immediately.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp300/stand/common/if_lereg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp300/stand/common/if_lereg.h
diff -u src/sys/arch/hp300/stand/common/if_lereg.h:1.5 src/sys/arch/hp300/stand/common/if_lereg.h:1.6
--- src/sys/arch/hp300/stand/common/if_lereg.h:1.5 Sun Dec 11 12:17:19 2005
+++ src/sys/arch/hp300/stand/common/if_lereg.h Thu Jul 26 17:15:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lereg.h,v 1.5 2005/12/11 12:17:19 christos Exp $ */
+/* $NetBSD: if_lereg.h,v 1.6 2012/07/26 17:15:22 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -50,7 +50,7 @@ struct lereg0 {
vu_char ler0_id; /* ID */
u_char ler0_pad1;
vu_char ler0_status; /* interrupt enable/status */
-} __attribute__((__packed__));
+};
/*
* Control and status bits -- lereg0
@@ -65,7 +65,7 @@ struct lereg0 {
struct lereg1 {
vu_short ler1_rdp; /* data port */
vu_short ler1_rap; /* register select port */
-} __attribute__((__packed__));
+};
/*
* Control and status bits -- lereg1
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: tsutsui Date: Thu Jul 26 17:26:59 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Log Message: Note RPI for Raspberry Pi. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/README.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.1 src/sys/arch/evbarm/conf/README.evbarm:1.2 --- src/sys/arch/evbarm/conf/README.evbarm:1.1 Sat Apr 7 01:44:08 2012 +++ src/sys/arch/evbarm/conf/README.evbarm Thu Jul 26 17:26:59 2012 @@ -1,4 +1,4 @@ -$NetBSD: README.evbarm,v 1.1 2012/04/07 01:44:08 tsutsui Exp $ +$NetBSD: README.evbarm,v 1.2 2012/07/26 17:26:59 tsutsui Exp $ config date boards --- @@ -36,6 +36,7 @@ OVERO 2010/07/10 Gumstix Inc. OMAP3530 SHEEVAPLUG 2010/10/02 Marvell SheevaPlug SMDK2410 2003/07/31 Samsung SMDK2410 S3C2410 eval board SMDK2800 2002/11/20 Samsung SMDK2800 S3C2800 eval board +RPI 2012/07/26 Raspberry Pi TEAMASA_NPWR 2002/02/07 Team ASA Npwr IOP310 based server appliance TEAMASA_NPWR_FC 2003/12/24 Team ASA NPWR-FC i80321 server appliance TISDP2420 2008/04/27 TI OMAP 2420 eval board
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: matt
Date: Thu Jul 26 18:36:09 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
MULTI_SEG does not for ESDHC. (Don't know how it works at all on any SDHC
but ...)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.25 src/sys/dev/sdmmc/sdhc.c:1.26
--- src/sys/dev/sdmmc/sdhc.c:1.25 Mon Jul 23 13:32:19 2012
+++ src/sys/dev/sdmmc/sdhc.c Thu Jul 26 18:36:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.25 2012/07/23 13:32:19 matt Exp $ */
+/* $NetBSD: sdhc.c,v 1.26 2012/07/26 18:36:09 matt Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.25 2012/07/23 13:32:19 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.26 2012/07/26 18:36:09 matt Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -403,8 +403,12 @@ sdhc_host_found(struct sdhc_softc *sc, b
saa.saa_caps |= SMC_CAPS_8BIT_MODE;
if (ISSET(caps, SDHC_HIGH_SPEED_SUPP))
saa.saa_caps |= SMC_CAPS_SD_HIGHSPEED;
- if (ISSET(hp-flags, SHF_USE_DMA))
- saa.saa_caps |= SMC_CAPS_DMA | SMC_CAPS_MULTI_SEG_DMA;
+ if (ISSET(hp-flags, SHF_USE_DMA)) {
+ saa.saa_caps |= SMC_CAPS_DMA;
+ if (!ISSET(sc-sc_flags, SDHC_FLAG_ENHANCED)) {
+ saa.saa_caps |= SMC_CAPS_MULTI_SEG_DMA;
+ }
+ }
hp-sdmmc = config_found(sc-sc_dev, saa, sdhc_cfprint);
return 0;
@@ -782,8 +786,8 @@ sdhc_bus_clock(sdmmc_chipset_handle_t sc
/* Must not stop the clock if commands are in progress. */
if (present sdhc_card_detect(hp)) {
- printf(%s: sdhc_sdclk_frequency_select: command in progress\n,
- device_xname(hp-sc-sc_dev));
+ aprint_normal_dev(hp-sc-sc_dev,
+ %s: command in progress\n, __func__);
}
#endif
@@ -978,8 +982,7 @@ sdhc_exec_command(sdmmc_chipset_handle_t
struct sdhc_host *hp = (struct sdhc_host *)sch;
int error;
-#if 0
- if (cmd-c_data) {
+ if (cmd-c_data ISSET(hp-sc-sc_flags, SDHC_FLAG_ENHANCED)) {
const uint16_t ready = SDHC_BUFFER_READ_READY | SDHC_BUFFER_WRITE_READY;
if (ISSET(hp-flags, SHF_USE_DMA)) {
HCLR2(hp, SDHC_NINTR_SIGNAL_EN, ready);
@@ -989,7 +992,6 @@ sdhc_exec_command(sdmmc_chipset_handle_t
HSET2(hp, SDHC_NINTR_STATUS_EN, ready);
}
}
-#endif
/*
* Start the MMC command, or mark `cmd' as failed and return.
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: matt Date: Thu Jul 26 18:36:57 UTC 2012 Modified Files: src/sys/dev/sdmmc: sdmmc_mem.c Log Message: Fix a delay to a correct value. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/sdmmc/sdmmc_mem.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/sdmmc/sdmmc_mem.c diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.22 src/sys/dev/sdmmc/sdmmc_mem.c:1.23 --- src/sys/dev/sdmmc/sdmmc_mem.c:1.22 Mon Jul 23 13:32:19 2012 +++ src/sys/dev/sdmmc/sdmmc_mem.c Thu Jul 26 18:36:55 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmc_mem.c,v 1.22 2012/07/23 13:32:19 matt Exp $ */ +/* $NetBSD: sdmmc_mem.c,v 1.23 2012/07/26 18:36:55 matt Exp $ */ /* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */ /* @@ -45,7 +45,7 @@ /* Routines for SD/MMC memory cards. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sdmmc_mem.c,v 1.22 2012/07/23 13:32:19 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: sdmmc_mem.c,v 1.23 2012/07/26 18:36:55 matt Exp $); #ifdef _KERNEL_OPT #include opt_sdmmc.h @@ -658,8 +658,8 @@ sdmmc_mem_sd_init(struct sdmmc_softc *sc sf-csd.tran_speed = switch_group0_functions[best_func].freq; - /* Wait 400KHz x 8 clock */ - delay(1); + /* Wait 400KHz x 8 clock (2.5us * 8 + slop) */ + delay(25); } }
CVS commit: src/sys/arch/powerpc/booke/dev
Module Name:src
Committed By: matt
Date: Thu Jul 26 18:38:11 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke/dev: pq3sdhc.c
Log Message:
When using DMA, make sure to initialize SNOOPing.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/pq3sdhc.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/arch/powerpc/booke/dev/pq3sdhc.c
diff -u src/sys/arch/powerpc/booke/dev/pq3sdhc.c:1.4 src/sys/arch/powerpc/booke/dev/pq3sdhc.c:1.5
--- src/sys/arch/powerpc/booke/dev/pq3sdhc.c:1.4 Thu Feb 23 21:07:35 2012
+++ src/sys/arch/powerpc/booke/dev/pq3sdhc.c Thu Jul 26 18:38:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3sdhc.c,v 1.4 2012/02/23 21:07:35 matt Exp $ */
+/* $NetBSD: pq3sdhc.c,v 1.5 2012/07/26 18:38:10 matt Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,8 +28,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#define ESDHC_PRIVATE
+
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pq3sdhc.c,v 1.4 2012/02/23 21:07:35 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3sdhc.c,v 1.5 2012/07/26 18:38:10 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -85,7 +87,7 @@ pq3sdhc_attach(device_t parent, device_t
psc-sc_children |= cna-cna_childmask;
sc-sc.sc_dmat = cna-cna_dmat;
sc-sc.sc_dev = self;
- sc-sc.sc_flags |= SDHC_FLAG_USE_DMA;
+ //sc-sc.sc_flags |= SDHC_FLAG_USE_DMA;
sc-sc.sc_flags |=
SDHC_FLAG_HAVE_DVS | SDHC_FLAG_32BIT_ACCESS | SDHC_FLAG_ENHANCED;
sc-sc.sc_host = sc-sc_hosts;
@@ -100,8 +102,18 @@ pq3sdhc_attach(device_t parent, device_t
return;
}
+ /*
+ * If using DMA, enable SNOOPing.
+ */
+ if (sc-sc.sc_flags SDHC_FLAG_USE_DMA) {
+ uint32_t dcr = bus_space_read_4(sc-sc_bst, sc-sc_bsh, DCR);
+ dcr |= DCR_SNOOP | DCR_RD_SAFE | DCR_RD_PFE;
+ bus_space_write_4(sc-sc_bst, sc-sc_bsh, DCR, dcr);
+ }
+
aprint_naive(: SDHC controller\n);
- aprint_normal(: SDHC controller\n);
+ aprint_normal(: SDHC controller%s\n,
+ (sc-sc.sc_flags SDHC_FLAG_USE_DMA) ? (DMA enabled) : );
sc-sc_ih = intr_establish(cnl-cnl_intrs[0], IPL_VM, IST_ONCHIP,
sdhc_intr, sc-sc);
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src Committed By: matt Date: Thu Jul 26 18:41:33 UTC 2012 Modified Files: src/sys/arch/powerpc/include/booke: e500reg.h Log Message: Add ESDHC DCR definitions To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/booke/e500reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/booke/e500reg.h diff -u src/sys/arch/powerpc/include/booke/e500reg.h:1.13 src/sys/arch/powerpc/include/booke/e500reg.h:1.14 --- src/sys/arch/powerpc/include/booke/e500reg.h:1.13 Wed Jul 18 19:38:26 2012 +++ src/sys/arch/powerpc/include/booke/e500reg.h Thu Jul 26 18:41:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: e500reg.h,v 1.13 2012/07/18 19:38:26 matt Exp $ */ +/* $NetBSD: e500reg.h,v 1.14 2012/07/26 18:41:32 matt Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -344,6 +344,17 @@ #define ESDHC_BASE 0x2e000 #define ESDHC_SIZE 0x01000 +#ifdef ESDHC_PRIVATE + +#define DCR 0x40c /* DMA Control Register */ + +#define DCR_SNOOP __PPCBIT(25) /* DMA transactions are snooped */ +#define DCR_RD_SAFE __PPCBIT(29) /* memory is read safe */ +#define DCR_RD_PFE __PPCBIT(30) /* memory is prefetch safe */ +#define DCR_RD_PF_SIZE __PPCBIT(31) /* prefetch size is 32-bytes */ + +#endif + #define GLOBAL_BASE 0xe #define GLOBAL_SIZE 0x01000
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Jul 26 20:05:40 UTC 2012 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi Log Message: new openssl To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.162 -r1.163 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.633 -r1.634 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/comp/ad.mips64eb cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.171 -r1.172 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1769 -r1.1770 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.229 -r1.230 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.97 src/distrib/sets/lists/base/ad.mips64eb:1.98 --- src/distrib/sets/lists/base/ad.mips64eb:1.97 Sat Jul 14 18:37:41 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Thu Jul 26 16:05:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.97 2012/07/14 22:37:41 mlelstv Exp $ +# $NetBSD: ad.mips64eb,v 1.98 2012/07/26 20:05:37 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -77,8 +77,8 @@ ./usr/lib/64/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/64/libcrypt.so.1.0 base-compat-shlib compat,pic -./usr/lib/64/libcrypto.so.7 base-compat-shlib compat,pic,crypto -./usr/lib/64/libcrypto.so.7.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libcrypto.so.8 base-compat-shlib compat,pic,crypto +./usr/lib/64/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libcrypto_idea.so.7 base-obsolete obsolete ./usr/lib/64/libcrypto_idea.so.7.0 base-obsolete obsolete ./usr/lib/64/libcrypto_mdc2.so.7 base-obsolete obsolete @@ -257,8 +257,8 @@ ./usr/lib/64/libss.so.6.0 base-compat-shlib obsolete ./usr/lib/64/libssh.so.19 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssh.so.19.0 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssl.so.9 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssl.so.9.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssl.so.10 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssl.so.10.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx ./usr/lib/64/libstdc++.so.7.0 base-compat-shlib gcc=4,compat,pic,cxx ./usr/lib/64/libstdc++.so.7.1 base-compat-shlib gcc=45,compat,pic,cxx @@ -385,8 +385,8 @@ ./usr/lib/o32/libcom_err.so.7.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libcrypt.so.1.0 base-compat-shlib compat,pic -./usr/lib/o32/libcrypto.so.7 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libcrypto.so.7.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libcrypto.so.8 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libcurses.so.7 base-compat-shlib compat,pic ./usr/lib/o32/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/o32/libdes.so.8 base-compat-shlib compat,pic,crypto @@ -559,8 +559,8 @@ ./usr/lib/o32/libss.so.6.0 base-compat-shlib obsolete ./usr/lib/o32/libssh.so.19 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssh.so.19.0 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssl.so.9 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssl.so.9.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssl.so.10 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssl.so.10.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx ./usr/lib/o32/libstdc++.so.7.0 base-compat-shlib gcc=4,compat,pic,cxx ./usr/lib/o32/libstdc++.so.7.1 base-compat-shlib gcc=45,compat,pic,cxx Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.96 src/distrib/sets/lists/base/ad.mips64el:1.97 --- src/distrib/sets/lists/base/ad.mips64el:1.96 Sat Jul 14 18:37:41 2012 +++ src/distrib/sets/lists/base/ad.mips64el Thu Jul 26 16:05:37 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.96 2012/07/14 22:37:41 mlelstv Exp $ +# $NetBSD: ad.mips64el,v 1.97 2012/07/26 20:05:37 christos Exp $ ./libexec/ld.elf_so-64
CVS commit: src/crypto/external/bsd/openssl
Module Name:src
Committed By: christos
Date: Thu Jul 26 20:21:20 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: cryptlib.h
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_all.c engine.h
src/crypto/external/bsd/openssl/lib/libcrypto: engine.inc
Added Files:
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_aesni.c
src/crypto/external/bsd/openssl/dist/test: test_aesni
Log Message:
put back support for AES-NI.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/cryptlib.h
cvs rdiff -u -r0 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/engine/eng_aesni.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c \
src/crypto/external/bsd/openssl/dist/crypto/engine/engine.h
cvs rdiff -u -r0 -r1.3 src/crypto/external/bsd/openssl/dist/test/test_aesni
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/cryptlib.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/cryptlib.h:1.1.1.3 src/crypto/external/bsd/openssl/dist/crypto/cryptlib.h:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/cryptlib.h:1.1.1.3 Thu Jul 26 10:59:07 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/cryptlib.h Thu Jul 26 16:21:20 2012
@@ -99,7 +99,7 @@ extern C {
#define HEX_SIZE(type) (sizeof(type)*2)
void OPENSSL_cpuid_setup(void);
-extern unsigned int OPENSSL_ia32cap_P[];
+extern unsigned int OPENSSL_ia32cap_P[2];
void OPENSSL_showfatal(const char *,...);
void *OPENSSL_stderr(void);
extern int OPENSSL_NONPIC_relocated;
Index: src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c:1.4 src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c:1.5
--- src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c:1.4 Thu Jul 26 15:58:38 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c Thu Jul 26 16:21:20 2012
@@ -73,6 +73,9 @@ void ENGINE_load_builtin_engines(void)
#if !defined(OPENSSL_NO_HW) (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
ENGINE_load_cryptodev();
#endif
+#if !defined(OPENSSL_NO_HW) !defined(OPENSSL_NO_HW_AESNI)
+ENGINE_load_aesni();
+#endif
#ifndef OPENSSL_NO_RSAX
ENGINE_load_rsax();
#endif
Index: src/crypto/external/bsd/openssl/dist/crypto/engine/engine.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/engine/engine.h:1.4 src/crypto/external/bsd/openssl/dist/crypto/engine/engine.h:1.5
--- src/crypto/external/bsd/openssl/dist/crypto/engine/engine.h:1.4 Thu Jul 26 15:58:38 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/engine/engine.h Thu Jul 26 16:21:20 2012
@@ -354,6 +354,7 @@ void ENGINE_load_cryptodev(void);
void ENGINE_load_rsax(void);
void ENGINE_load_rdrand(void);
void ENGINE_load_builtin_engines(void);
+void ENGINE_load_aesni(void);
/* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
* registry handling. */
Index: src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc:1.4 Thu Jul 26 15:58:40 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/engine.inc Thu Jul 26 16:21:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: engine.inc,v 1.4 2012/07/26 19:58:40 christos Exp $
+# $NetBSD: engine.inc,v 1.5 2012/07/26 20:21:20 christos Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -12,6 +12,7 @@
ENGINE_SRCS = eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
eng_table.c eng_pkey.c eng_fat.c eng_all.c tb_asnmth.c \
tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c tb_cipher.c tb_digest.c \
+ eng_aesni.c \
eng_openssl.c eng_dyn.c eng_cnf.c eng_rdrand.c eng_rsax.c \
eng_cryptodev.c tb_store.c tb_ecdsa.c tb_ecdh.c tb_pkmeth.c \
e_4758cca.c e_4758cca_err.c \
Added files:
Index: src/crypto/external/bsd/openssl/dist/crypto/engine/eng_aesni.c
diff -u /dev/null src/crypto/external/bsd/openssl/dist/crypto/engine/eng_aesni.c:1.6
--- /dev/null Thu Jul 26 16:21:20 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_aesni.c Thu Jul 26 16:21:20 2012
@@ -0,0 +1,414 @@
+/*
+ * Support for Intel AES-NI intruction set
+ * Author: Huang Ying ying.hu...@intel.com
+ *
+ * Intel AES-NI is a new set of Single Instruction Multiple Data
+ * (SIMD) instructions that are going to be introduced in the next
+ * generation of Intel processor, as of 2009. These instructions
+ * enable fast and secure data encryption and decryption, using the
+ * Advanced Encryption Standard (AES), defined by FIPS Publication
+ * number 197. The
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Jul 26 20:26:01 UTC 2012 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new openssl To generate a diff of this commit: cvs rdiff -u -r1.951 -r1.952 src/doc/3RDPARTY cvs rdiff -u -r1.1722 -r1.1723 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.951 src/doc/3RDPARTY:1.952 --- src/doc/3RDPARTY:1.951 Sun Jul 22 07:27:51 2012 +++ src/doc/3RDPARTY Thu Jul 26 16:26:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.951 2012/07/22 11:27:51 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.952 2012/07/26 20:26:01 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -872,8 +872,8 @@ markus is very cooperative about it): - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes. Package: OpenSSL -Version: 1.0.1-stable-SNAP-20110605 -Current Vers: 1.0.1 [snapshot-20110605] with AES-NI patch +Version: 1.0.1c +Current Vers: 1.0.1c with AES-NI patch Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1722 src/doc/CHANGES:1.1723 --- src/doc/CHANGES:1.1722 Thu Jul 26 02:36:55 2012 +++ src/doc/CHANGES Thu Jul 26 16:26:01 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1722 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1723 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -89,3 +89,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: device_t. [matt 20120722] powerpc: Add support for FPU emulation on BookE. [matt 20120722] evbarm: Add initial support for the RaspberryPi. [skrll 20120726] + OpenSSH: Imported 1.0.1c [christos 20120726]
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: skrll
Date: Thu Jul 26 20:50:44 UTC 2012
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Add RPI to KERNEL_SETS
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.27 src/etc/etc.evbarm/Makefile.inc:1.28
--- src/etc/etc.evbarm/Makefile.inc:1.27 Tue Feb 14 15:09:02 2012
+++ src/etc/etc.evbarm/Makefile.inc Thu Jul 26 20:50:44 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.27 2012/02/14 15:09:02 jakllsch Exp $
+# $NetBSD: Makefile.inc,v 1.28 2012/07/26 20:50:44 skrll Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -23,7 +23,7 @@ BUILD_KERNELS+= ${board}_INSTALL
.if ${MACHINE_ARCH} == arm
# Little endian platforms.
-KERNEL_SETS+= IXM1200 HDL_G
+KERNEL_SETS+= IXM1200 HDL_G RPI
.else
# Big endian platforms.
KERNEL_SETS+= IXM1200 NSLU2
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64
Module Name:src
Committed By: christos
Date: Thu Jul 26 21:22:47 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: Makefile
aes-x86_64.S aesni-sha1-x86_64.S aesni-x86_64.S bsaes-x86_64.S
cmll-x86_64.S ghash-x86_64.S rc4-x86_64.S sha1-x86_64.S
sha512-x86_64.S vpaes-x86_64.S wp-x86_64.S
Log Message:
Don't do the PLTGOT for local labels, limit it to OPENSSL_ global symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.3 Tue Jul 5 06:42:54 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile Thu Jul 26 17:22:47 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/05 10:42:54 spz Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/26 21:22:47 christos Exp $
.include bsd.own.mk
@@ -8,6 +8,6 @@ CRYPTODIST=${NETBSDSRCDIR}/crypto
regen:
for i in $$(find ${OPENSSLSRC} -name \*${MACHINE_ARCH}.pl) \
${OPENSSLSRC}/crypto/${MACHINE_ARCH}cpuid.pl ; do \
-perl $$i elf | sed -e 's/(%rip)/@GOTPCREL(%rip)/' \
+perl $$i elf | sed -e 's/\(OPENSSL[A-Za-z0-9_+]*\)(%rip)/\1@GOTPCREL(%rip)/' \
$$(basename $$i .pl).S; \
done
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.3 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S Thu Jul 26 17:22:47 2012
@@ -29,7 +29,7 @@ Camellia_EncryptBlock_Rounds:
movq %rdx,%r14
shll $6,%edi
- leaq .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+ leaq .LCamellia_SBOX(%rip),%rbp
leaq (%r14,%rdi,1),%r15
movl 0(%rsi),%r8d
@@ -298,7 +298,7 @@ Camellia_DecryptBlock_Rounds:
movq %rdx,%r15
shll $6,%edi
- leaq .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+ leaq .LCamellia_SBOX(%rip),%rbp
leaq (%r15,%rdi,1),%r14
movl 0(%rsi),%r8d
@@ -595,8 +595,8 @@ Camellia_Ekeygen:
xorl 12(%r13),%r10d
.L1st128:
- leaq .LCamellia_SIGMA@GOTPCREL(%rip),%r14
- leaq .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+ leaq .LCamellia_SIGMA(%rip),%r14
+ leaq .LCamellia_SBOX(%rip),%rbp
movl 0(%r14),%ebx
movl 4(%r14),%eax
@@ -1638,7 +1638,7 @@ Camellia_cbc_encrypt:
movq %rbp,48(%rsp)
.Lcbc_body:
- leaq .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+ leaq .LCamellia_SBOX(%rip),%rbp
movl $32,%ecx
.align 4
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.3 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S Thu Jul 26 17:22:47 2012
@@ -1302,7 +1302,7 @@ _ssse3_shortcut:
shlq $6,%r10
addq %r9,%r10
- leaq K_XX_XX@GOTPCREL(%rip),%r11
+ leaq K_XX_XX(%rip),%r11
movl 0(%r8),%eax
movl 4(%r8),%ebx
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.4 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S Thu Jul 26 17:22:47 2012
@@ -369,7
CVS commit: src/crypto/external/bsd/openssl/dist/crypto/rc4
Module Name:src
Committed By: christos
Date: Thu Jul 26 21:23:13 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/rc4: rc4.h
Log Message:
make this compile.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/rc4/rc4.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/rc4/rc4.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/rc4/rc4.h:1.1.1.2 src/crypto/external/bsd/openssl/dist/crypto/rc4/rc4.h:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/rc4/rc4.h:1.1.1.2 Thu Jul 26 11:02:45 2012
+++ src/crypto/external/bsd/openssl/dist/crypto/rc4/rc4.h Thu Jul 26 17:23:13 2012
@@ -65,6 +65,7 @@
#endif
#include stddef.h
+#include sys/types.h
#ifdef __cplusplus
extern C {
CVS commit: src/sys/dev/marvell
Module Name:src
Committed By: kiyohara
Date: Fri Jul 27 03:00:01 UTC 2012
Modified Files:
src/sys/dev/marvell: files.discovery
Added Files:
src/sys/dev/marvell: mvcesa.c mvcesareg.h
Log Message:
Add Marvell CESA(Cryptographic Engines and Security Accelerator) module driver.
But support only PIO-mode now. Also AES-CBC not supported.
Don't know how to process to AES CBC in PIO-mode. I haven't found IV registers.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/marvell/files.discovery
cvs rdiff -u -r0 -r1.1 src/sys/dev/marvell/mvcesa.c \
src/sys/dev/marvell/mvcesareg.h
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/files.discovery
diff -u src/sys/dev/marvell/files.discovery:1.18 src/sys/dev/marvell/files.discovery:1.19
--- src/sys/dev/marvell/files.discovery:1.18 Sat Oct 2 05:53:37 2010
+++ src/sys/dev/marvell/files.discovery Fri Jul 27 03:00:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.discovery,v 1.18 2010/10/02 05:53:37 kiyohara Exp $
+# $NetBSD: files.discovery,v 1.19 2012/07/27 03:00:01 kiyohara Exp $
#
# Config file and device description for machine-independent support for
# the Marvell (formerly Galileo Technology) Discovery system controllers.
@@ -72,9 +72,9 @@ attach ehci at gt with mvusb_gt
file dev/marvell/ehci_mv.c mvusb_gt | mvusb_mbus
# Cryptographic Engines and Security Accelerator
-#device mvcesa: opencrypto
-#file dev/marvell/mvcesa.c mvcesa
-#attach mvcesa at gt with mvcesa_gt
+device mvcesa: opencrypto
+file dev/marvell/mvcesa.c mvcesa
+attach mvcesa at gt with mvcesa_gt
# Two-Wire Serial Interface
device gttwsi: i2cbus
Added files:
Index: src/sys/dev/marvell/mvcesa.c
diff -u /dev/null src/sys/dev/marvell/mvcesa.c:1.1
--- /dev/null Fri Jul 27 03:00:02 2012
+++ src/sys/dev/marvell/mvcesa.c Fri Jul 27 03:00:01 2012
@@ -0,0 +1,767 @@
+/* $NetBSD: mvcesa.c,v 1.1 2012/07/27 03:00:01 kiyohara Exp $ */
+/*
+ * Copyright (c) 2008 KIYOHARA Takashi
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: mvcesa.c,v 1.1 2012/07/27 03:00:01 kiyohara Exp $);
+
+#include sys/param.h
+#include sys/bus.h
+#include sys/cprng.h
+#include sys/device.h
+#include sys/endian.h
+#include sys/errno.h
+#include sys/mbuf.h
+#include sys/md5.h
+#include sys/uio.h
+#include sys/sha1.h
+
+#include opencrypto/cryptodev.h
+#include opencrypto/xform.h
+
+#include dev/marvell/marvellreg.h
+#include dev/marvell/marvellvar.h
+#include dev/marvell/mvcesareg.h
+
+#include locators.h
+
+#define MVCESA_SESSION(sid) ((sid) 0x0fff)
+#define MVCESA_SID(crd, sesn) (((crd) 28) | ((sesn) 0x0fff))
+
+
+struct mvcesa_session {
+ int ses_used;
+
+ int ses_klen;
+ uint32_t ses_iv[4];
+ uint32_t ses_key[8];
+
+ uint32_t ses_hminner[5]; /* HMAC inner state */
+ uint32_t ses_hmouter[5]; /* HMAC outer state */
+};
+
+struct mvcesa_softc {
+ device_t sc_dev;
+
+ bus_space_tag_t sc_iot;
+ bus_space_handle_t sc_ioh;
+ bus_dma_tag_t sc_dmat;
+
+ int sc_cid;
+ int sc_nsessions;
+ struct mvcesa_session *sc_sessions;
+};
+
+static int mvcesa_match(device_t, cfdata_t, void *);
+static void mvcesa_attach(device_t, device_t, void *);
+
+static int mvcesa_intr(void *);
+
+static int mvcesa_newsession(void *, u_int32_t *, struct cryptoini *);
+static int mvcesa_freesession(void *, u_int64_t);
+static int mvcesa_process(void *, struct cryptop *, int);
+
+static int mvcesa_authentication(struct mvcesa_softc *, struct mvcesa_session *,
+ uint32_t, uint32_t *, uint32_t *, uint64_t,
+ int, int, char *, struct mbuf *, struct uio *);
+static int mvcesa_des_encdec(struct
CVS commit: src/sys/arch/arm/marvell
Module Name:src Committed By: kiyohara Date: Fri Jul 27 03:03:34 UTC 2012 Modified Files: src/sys/arch/arm/marvell: files.marvell Log Message: Add mvcesa. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/marvell/files.marvell Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/marvell/files.marvell diff -u src/sys/arch/arm/marvell/files.marvell:1.5 src/sys/arch/arm/marvell/files.marvell:1.6 --- src/sys/arch/arm/marvell/files.marvell:1.5 Tue Jun 19 16:50:44 2012 +++ src/sys/arch/arm/marvell/files.marvell Fri Jul 27 03:03:34 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files.marvell,v 1.5 2012/06/19 16:50:44 hans Exp $ +# $NetBSD: files.marvell,v 1.6 2012/07/27 03:03:34 kiyohara Exp $ # # Configuration info for Marvell System on Chip support # @@ -56,7 +56,7 @@ attach mvgbec at mvsoc with mvgbec_mbus attach ehci at mvsoc with mvusb_mbus # Cryptographic Engines and Security Accelerator -#attach mvcesa at mvsoc with mvcesa_mbus +attach mvcesa at mvsoc with mvcesa_mbus # TWSI Two-Wire Serial Interface attach gttwsi at mvsoc with gttwsi_mbus
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Fri Jul 27 03:10:23 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: MARVELL_NAS SHEEVAPLUG Log Message: Enable mvcesa. Also enable idmac in SHEEVAPLUG. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/MARVELL_NAS cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/SHEEVAPLUG Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/MARVELL_NAS diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.7 src/sys/arch/evbarm/conf/MARVELL_NAS:1.8 --- src/sys/arch/evbarm/conf/MARVELL_NAS:1.7 Sat Mar 31 02:45:37 2012 +++ src/sys/arch/evbarm/conf/MARVELL_NAS Fri Jul 27 03:10:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MARVELL_NAS,v 1.7 2012/03/31 02:45:37 tsutsui Exp $ +# $NetBSD: MARVELL_NAS,v 1.8 2012/07/27 03:10:23 kiyohara Exp $ # # This configuration supports for generically Marvell NAS. @@ -176,7 +176,7 @@ mvgbe* at mvgbec? port ? irq ? ehci* at mvsoc? offset ? irq ? # On-chip Cryptographic Engines and Security Accelerator -#mvcesa* at mvsoc? offset ? irq ? +mvcesa* at mvsoc? offset ? irq ? # On-chip Two-Wire Serial Interface (TWSI) gttwsi* at mvsoc? offset ? irq ? Index: src/sys/arch/evbarm/conf/SHEEVAPLUG diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.14 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.15 --- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.14 Sat Mar 31 02:45:37 2012 +++ src/sys/arch/evbarm/conf/SHEEVAPLUG Fri Jul 27 03:10:23 2012 @@ -1,4 +1,4 @@ -# $NetBSD: SHEEVAPLUG,v 1.14 2012/03/31 02:45:37 tsutsui Exp $ +# $NetBSD: SHEEVAPLUG,v 1.15 2012/07/27 03:10:23 kiyohara Exp $ # # This configuration supports for generically Marvell SheevaPlug # @@ -194,7 +194,7 @@ makphy* at mii? phy ? ehci* at mvsoc? offset ? irq ? # On-chip Cryptographic Engines and Security Accelerator -#mvcesa* at mvsoc? offset ? irq ? +mvcesa* at mvsoc? offset ? irq ? # On-chip Two-Wire Serial Interface (TWSI) gttwsi* at mvsoc? offset ? irq ? @@ -204,7 +204,7 @@ iic* at gttwsi? com* at mvsoc? offset ? irq ? # On-chip IDMA Controller -#gtidmac* at mvsoc? offset ? irq ? +gtidmac* at mvsoc? offset ? irq ? # On-chip General Purpose I/O Port Interface #mvsocgpp* at mvsoc? offset ? irq ?
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: matt Date: Fri Jul 27 04:17:07 UTC 2012 Modified Files: src/sys/arch/powerpc/powerpc: trap_subr.S Log Message: Use %r6 for setting PSL_RI, not %r30 since r30 needs to be preserved. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/arch/powerpc/powerpc/trap_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/powerpc/trap_subr.S diff -u src/sys/arch/powerpc/powerpc/trap_subr.S:1.74 src/sys/arch/powerpc/powerpc/trap_subr.S:1.75 --- src/sys/arch/powerpc/powerpc/trap_subr.S:1.74 Wed Jul 18 16:56:51 2012 +++ src/sys/arch/powerpc/powerpc/trap_subr.S Fri Jul 27 04:17:07 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: trap_subr.S,v 1.74 2012/07/18 16:56:51 matt Exp $ */ +/* $NetBSD: trap_subr.S,v 1.75 2012/07/27 04:17:07 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -1124,9 +1124,9 @@ _C_LABEL(sctrapexit): streg %r4,FRAME_CTR(%r1); \ streg %r11,FRAME_SRR0(%r1); \ streg %r12,FRAME_SRR1(%r1); \ - mfmsr %r30; \ - ori %r30,%r30,PSL_RI; /* turn on recovery interrupt */\ - mtmsr %r30; \ + mfmsr %r6; \ + ori %r6,%r6,PSL_RI; /* turn on recovery interrupt */\ + mtmsr %r6; \ SAVE_VRSAVE(%r1,%r6); \ SAVE_MQ(%r1,%r7)
CVS commit: src/sys
Module Name:src Committed By: matt Date: Fri Jul 27 05:36:13 UTC 2012 Modified Files: src/sys/arch/amiga/amiga: machdep.c src/sys/arch/arm/arm32: intr.c src/sys/arch/arm/include/arm32: psl.h src/sys/arch/atari/atari: machdep.c src/sys/arch/cesfic/cesfic: machdep.c src/sys/arch/hp300/hp300: machdep.c src/sys/arch/hpcarm/hpcarm: intr.c src/sys/arch/hpcarm/include: intr.h src/sys/arch/luna68k/luna68k: machdep.c src/sys/arch/m68k/include: psl.h src/sys/arch/mac68k/mac68k: machdep.c src/sys/arch/mvme68k/mvme68k: machdep.c src/sys/arch/news68k/news68k: machdep.c src/sys/arch/next68k/next68k: machdep.c src/sys/arch/sparc/include: intr.h src/sys/arch/sparc/sparc: machdep.c src/sys/arch/sparc64/include: intr.h src/sys/arch/sparc64/sparc64: machdep.c src/sys/arch/sun2/sun2: machdep.c src/sys/arch/sun3/sun3: machdep.c src/sys/arch/sun3/sun3x: machdep.c src/sys/arch/x68k/x68k: machdep.c src/sys/kern: kern_sleepq.c kern_synch.c Log Message: Remove safepri and use IPL_SAFEPRI instead. This may be defined in a MD header file (if not, a value of 0 is assmued). To generate a diff of this commit: cvs rdiff -u -r1.237 -r1.238 src/sys/arch/amiga/amiga/machdep.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/arm32/intr.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/arm32/psl.h cvs rdiff -u -r1.173 -r1.174 src/sys/arch/atari/atari/machdep.c cvs rdiff -u -r1.62 -r1.63 src/sys/arch/cesfic/cesfic/machdep.c cvs rdiff -u -r1.224 -r1.225 src/sys/arch/hp300/hp300/machdep.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/hpcarm/intr.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcarm/include/intr.h cvs rdiff -u -r1.89 -r1.90 src/sys/arch/luna68k/luna68k/machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/include/psl.h cvs rdiff -u -r1.343 -r1.344 src/sys/arch/mac68k/mac68k/machdep.c cvs rdiff -u -r1.150 -r1.151 src/sys/arch/mvme68k/mvme68k/machdep.c cvs rdiff -u -r1.98 -r1.99 src/sys/arch/news68k/news68k/machdep.c cvs rdiff -u -r1.106 -r1.107 src/sys/arch/next68k/next68k/machdep.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/include/intr.h cvs rdiff -u -r1.319 -r1.320 src/sys/arch/sparc/sparc/machdep.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/include/intr.h cvs rdiff -u -r1.267 -r1.268 src/sys/arch/sparc64/sparc64/machdep.c cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sun2/sun2/machdep.c cvs rdiff -u -r1.204 -r1.205 src/sys/arch/sun3/sun3/machdep.c cvs rdiff -u -r1.131 -r1.132 src/sys/arch/sun3/sun3x/machdep.c cvs rdiff -u -r1.183 -r1.184 src/sys/arch/x68k/x68k/machdep.c cvs rdiff -u -r1.46 -r1.47 src/sys/kern/kern_sleepq.c cvs rdiff -u -r1.301 -r1.302 src/sys/kern/kern_synch.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/arch/amiga/amiga/machdep.c diff -u src/sys/arch/amiga/amiga/machdep.c:1.237 src/sys/arch/amiga/amiga/machdep.c:1.238 --- src/sys/arch/amiga/amiga/machdep.c:1.237 Thu Dec 15 14:25:12 2011 +++ src/sys/arch/amiga/amiga/machdep.c Fri Jul 27 05:36:09 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.237 2011/12/15 14:25:12 phx Exp $ */ +/* $NetBSD: machdep.c,v 1.238 2012/07/27 05:36:09 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -48,7 +48,7 @@ #include opt_m68k_arch.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.237 2011/12/15 14:25:12 phx Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.238 2012/07/27 05:36:09 matt Exp $); #include sys/param.h #include sys/systm.h @@ -138,11 +138,6 @@ int machineid; int maxmem; /* max memory per process */ int physmem = MAXMEM; /* max supported memory, changes to actual */ -/* - * safepri is a safe priority for sleep to set for a spin-wait - * during autoconfiguration or after a panic. - */ -int safepri = PSL_LOWIPL; extern int freebufspace; extern u_int lowram; Index: src/sys/arch/arm/arm32/intr.c diff -u src/sys/arch/arm/arm32/intr.c:1.32 src/sys/arch/arm/arm32/intr.c:1.33 --- src/sys/arch/arm/arm32/intr.c:1.32 Mon Dec 20 00:25:27 2010 +++ src/sys/arch/arm/arm32/intr.c Fri Jul 27 05:36:09 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.32 2010/12/20 00:25:27 matt Exp $ */ +/* $NetBSD: intr.c,v 1.33 2012/07/27 05:36:09 matt Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.32 2010/12/20 00:25:27 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.33 2012/07/27 05:36:09 matt Exp $); #include sys/param.h #include sys/systm.h @@ -50,7 +50,6 @@ __KERNEL_RCSID(0, $NetBSD: intr.c,v 1.3 #include arm/arm32/machdep.h u_int spl_masks[NIPL]; -int safepri = IPL_NONE; extern u_int irqmasks[]; Index: src/sys/arch/arm/include/arm32/psl.h diff -u src/sys/arch/arm/include/arm32/psl.h:1.18 src/sys/arch/arm/include/arm32/psl.h:1.19
CVS commit: src/doc
Module Name:src Committed By: matt Date: Fri Jul 27 05:38:21 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Note removal of safepri To generate a diff of this commit: cvs rdiff -u -r1.1723 -r1.1724 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1723 src/doc/CHANGES:1.1724 --- src/doc/CHANGES:1.1723 Thu Jul 26 20:26:01 2012 +++ src/doc/CHANGES Fri Jul 27 05:38:21 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1723 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1724 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -87,6 +87,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [rkujawa 20120720] kernel: Change mii_statchg to take struct ifnet * instead of device_t. [matt 20120722] - powerpc: Add support for FPU emulation on BookE. [matt 20120722] + powerpc: Add support for FPU emulation on BookE. [matt 20120722] evbarm: Add initial support for the RaspberryPi. [skrll 20120726] OpenSSH: Imported 1.0.1c [christos 20120726] + kernel: safepri is dead; replaced by macro IPL_SAFEPRI. [matt 20120727]
CVS commit: src/sys/conf
Module Name:src
Committed By: matt
Date: Fri Jul 27 05:40:52 UTC 2012
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Enable -fno-common for GCC compiled kernels
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.156 src/sys/conf/Makefile.kern.inc:1.157
--- src/sys/conf/Makefile.kern.inc:1.156 Sun Mar 25 09:15:20 2012
+++ src/sys/conf/Makefile.kern.inc Fri Jul 27 05:40:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.156 2012/03/25 09:15:20 martin Exp $
+# $NetBSD: Makefile.kern.inc,v 1.157 2012/07/27 05:40:51 matt Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -98,6 +98,7 @@ AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
# XXX
.if defined(HAVE_GCC)
CFLAGS+= -fno-strict-aliasing
+CFLAGS+= -fno-common
.endif
.if ${USE_SSP:Uno} == yes
