From owner-dev-commits-src-branches@freebsd.org Wed Apr 14 01:03:17 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 4048A5F4916; Wed, 14 Apr 2021 01:03:17 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FKkjx1Pjgz3sBl; Wed, 14 Apr 2021 01:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2324014D3C; Wed, 14 Apr 2021 01:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13E13H1t064980; Wed, 14 Apr 2021 01:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13E13HCW064979; Wed, 14 Apr 2021 01:03:17 GMT (envelope-from git) Date: Wed, 14 Apr 2021 01:03:17 GMT Message-Id: <202104140103.13E13HCW064979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 6c4ea5bb59ac - stable/12 - Add IDs for ASMedia ASM116x PCIe 3.0 AHCI controllers. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6c4ea5bb59ac83aed1bb9ea75ef230d34cba2c24 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 01:03:17 -0000 The branch stable/12 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=6c4ea5bb59ac83aed1bb9ea75ef230d34cba2c24 commit 6c4ea5bb59ac83aed1bb9ea75ef230d34cba2c24 Author: Alexander Motin AuthorDate: 2021-04-07 19:03:36 +0000 Commit: Alexander Motin CommitDate: 2021-04-14 01:03:12 +0000 Add IDs for ASMedia ASM116x PCIe 3.0 AHCI controllers. MFC after: 1 week (cherry picked from commit 5a8d32b53b919d82d6a3aa9f155bd2a00fb51dc2) --- sys/dev/ahci/ahci_pci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index ab440e0c8522..590da7b50050 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -90,6 +90,11 @@ static const struct { {0x06221b21, 0x00, "ASMedia ASM106x", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06241b21, 0x00, "ASMedia ASM106x", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06251b21, 0x00, "ASMedia ASM106x", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, + {0x10621b21, 0x00, "ASMedia ASM116x", 0}, + {0x10641b21, 0x00, "ASMedia ASM116x", 0}, + {0x11641b21, 0x00, "ASMedia ASM116x", 0}, + {0x11651b21, 0x00, "ASMedia ASM116x", 0}, + {0x11661b21, 0x00, "ASMedia ASM116x", 0}, {0x79011d94, 0x00, "Hygon KERNCZ", 0}, {0x26528086, 0x00, "Intel ICH6", AHCI_Q_NOFORCE}, {0x26538086, 0x00, "Intel ICH6M", AHCI_Q_NOFORCE},