From owner-svn-src-head@freebsd.org  Thu Feb 13 19:10:52 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0FDB6231B8B;
 Thu, 13 Feb 2020 19:10:52 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48JR1R4qrvz4QsJ;
 Thu, 13 Feb 2020 19:10:51 +0000 (UTC) (envelope-from kib@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A10D3F6C8;
 Thu, 13 Feb 2020 19:10:51 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01DJAplN045856;
 Thu, 13 Feb 2020 19:10:51 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01DJAp9m045855;
 Thu, 13 Feb 2020 19:10:51 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <202002131910.01DJAp9m045855@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 13 Feb 2020 19:10:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357870 - head/sys/dev/amd_ecc_inject
X-SVN-Group: head
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: head/sys/dev/amd_ecc_inject
X-SVN-Commit-Revision: 357870
X-SVN-Commit-Repository: base
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.29
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: Thu, 13 Feb 2020 19:10:52 -0000

Author: kib
Date: Thu Feb 13 19:10:51 2020
New Revision: 357870
URL: https://svnweb.freebsd.org/changeset/base/357870

Log:
  ecc_inject: Add Hygon Dhyana support.
  
  Submitted by:	Pu Wen <puwen@hygon.cn>
  MFC after:	1 week
  Differential revision:	https://reviews.freebsd.org/D23561

Modified:
  head/sys/dev/amd_ecc_inject/ecc_inject.c

Modified: head/sys/dev/amd_ecc_inject/ecc_inject.c
==============================================================================
--- head/sys/dev/amd_ecc_inject/ecc_inject.c	Thu Feb 13 19:09:24 2020	(r357869)
+++ head/sys/dev/amd_ecc_inject/ecc_inject.c	Thu Feb 13 19:10:51 2020	(r357870)
@@ -203,7 +203,8 @@ ecc_ei_load(void)
 {
 	uint32_t val;
 
-	if (cpu_vendor_id != CPU_VENDOR_AMD || CPUID_TO_FAMILY(cpu_id) < 0x10) {
+	if ((cpu_vendor_id != CPU_VENDOR_AMD || CPUID_TO_FAMILY(cpu_id) < 0x10) &&
+	    cpu_vendor_id != CPU_VENDOR_HYGON) {
 		printf("DRAM ECC error injection is not supported\n");
 		return (ENXIO);
 	}