From owner-svn-src-head@freebsd.org  Wed Jan 25 10:26:00 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 977D0CBF27D;
 Wed, 25 Jan 2017 10:26:00 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 649FB192D;
 Wed, 25 Jan 2017 10:26:00 +0000 (UTC) (envelope-from wma@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0PAPxlr047025;
 Wed, 25 Jan 2017 10:25:59 GMT (envelope-from wma@FreeBSD.org)
Received: (from wma@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0PAPxQi047024;
 Wed, 25 Jan 2017 10:25:59 GMT (envelope-from wma@FreeBSD.org)
Message-Id: <201701251025.v0PAPxQi047024@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: wma set sender to wma@FreeBSD.org
 using -f
From: Wojciech Macek <wma@FreeBSD.org>
Date: Wed, 25 Jan 2017 10:25:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r312744 - head/sys/dev/cesa
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2017 10:26:00 -0000

Author: wma
Date: Wed Jan 25 10:25:59 2017
New Revision: 312744
URL: https://svnweb.freebsd.org/changeset/base/312744

Log:
  Fix SHA256 usage on older CESA versions
  
  Adding SHA256 support to Marvell crypto driver resulted in regression
  for older SoC's, not capable of handling this mode in hardware.
  
  Submitted by:          Emeric Poupon <emeric.poupon@stormshield.eu>
  Obtained from:         Stormshield
  Sponsored by:          Stormshield
  Reviewed by:           zbb
  Differential revision: https://reviews.freebsd.org/D9215

Modified:
  head/sys/dev/cesa/cesa.c

Modified: head/sys/dev/cesa/cesa.c
==============================================================================
--- head/sys/dev/cesa/cesa.c	Wed Jan 25 10:22:07 2017	(r312743)
+++ head/sys/dev/cesa/cesa.c	Wed Jan 25 10:25:59 2017	(r312744)
@@ -1242,7 +1242,10 @@ cesa_attach(device_t dev)
 	crypto_register(sc->sc_cid, CRYPTO_MD5_HMAC, 0, 0);
 	crypto_register(sc->sc_cid, CRYPTO_SHA1, 0, 0);
 	crypto_register(sc->sc_cid, CRYPTO_SHA1_HMAC, 0, 0);
-	crypto_register(sc->sc_cid, CRYPTO_SHA2_256_HMAC, 0, 0);
+	if (sc->sc_soc_id == MV_DEV_88F6828 ||
+	    sc->sc_soc_id == MV_DEV_88F6820 ||
+	    sc->sc_soc_id == MV_DEV_88F6810)
+		crypto_register(sc->sc_cid, CRYPTO_SHA2_256_HMAC, 0, 0);
 
 	return (0);
 err8: