From nobody Mon Jul 31 14:33:36 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RF12F078wz4qB5R; Mon, 31 Jul 2023 14:33:37 +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 4RF1292Lnkz48jD; Mon, 31 Jul 2023 14:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690814017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ruNHfxHLNUm2Dm2nsPQjhVEYzDTgTDNLAwLfB/sEDI=; b=NMma0RmXnNMrINBT11dwNz4D+GXZBnjL9zo2nowJnd1hoiFNbXJJozmfAz7FIBfcu3EomR F5x5kCEGaGWZqUUJgt5zEgMe1H0g3c21nkzMzUpkVtDShCnjp4s0GyyTohH69z400k4qc3 HAPvUA3SBywOk6X8k5oQwt/CVL11bo5vENT79+lKqI0hHKnnOM0CUE3M2x1Lm/AzU9GtIT wM/bTjG39M0LkmdxvevLk8xHv0I/rkqNE1XlrU6o9wtSYHmlVI5HJxCWr6daeaYTQQYCNM KCa7Q243v2F/5J7l2nvjhmw42OBV2ExBaO+kJz5sEHivq0qXfcLlIsWhzGzWfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690814017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ruNHfxHLNUm2Dm2nsPQjhVEYzDTgTDNLAwLfB/sEDI=; b=L3GK4XSHC/uAgnZvi8qGeDMil3hBIgiE9rF5/V/eBfLEgqFeGp+/fxJPrynszjyP8gcuLp +IhRckhLy99HO07wTLDR5pfeLG3z6yPo+OE4yIZ1sbpmU7WAGpCNbt547svAw+OSdnf8y/ 2y+FVyrOKxb0epGWbFB7AYklWZJg+jmwBmEmyvD7zwl0E2HAIWO8vikSa0+iShD8EAj9C6 TwLw8ycXuuoqKzMS6EbJzjLZD0VLzlxn9TK+cAg6Jjc+EriIGBdmAvK3u8SL5UZxNp8mKT +hyEEFSGFiXLiLzXDKm5CRTTIThqqi3IKnMw1mWee726adrlV3w9GNTaynJx8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690814017; a=rsa-sha256; cv=none; b=lkmhbq5bbHf76JGSvVsqc0nyrMFifOgQXnqCdSKE2OgXwrLsBKBulk6QxLRPLd8qZqdckd Du+stXFSDBrBsobJDNXY9emW8+v32RT6kp4x3a5Qo0EEWcFln97/5wAxs1DkjGCRglNrDT 4pmZxQjmuwy3SmfUDZ79Ezg9tq4G5P9b2GJf1Ayl88EuNLJ87Z+8/3x1wRUvjpDVgUslOE DU+Mslrhfcs5UowZ60BQtr1UcMVjBaoIo31OKzbzB6LSj6J96JX7LTJc3WNMtLhbAQ7CDW anDHJmGLYvKyc05uRqh3GYyIHiGCQHhiMpM0NTekH1Fk0SL5TjpNJ0QADUMAPQ== 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 4RF1290YV2z10Km; Mon, 31 Jul 2023 14:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VEXapa058822; Mon, 31 Jul 2023 14:33:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VEXa4f058821; Mon, 31 Jul 2023 14:33:36 GMT (envelope-from git) Date: Mon, 31 Jul 2023 14:33:36 GMT Message-Id: <202307311433.36VEXa4f058821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: fc14525044b6 - main - nvme(4): detect S3X NVMe controller in 2016-2017 MacBooks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc14525044b651e9d2256c0e8aa8c74c900cc815 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=fc14525044b651e9d2256c0e8aa8c74c900cc815 commit fc14525044b651e9d2256c0e8aa8c74c900cc815 Author: Vladimir Kondratyev AuthorDate: 2023-07-31 14:33:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-07-31 14:33:14 +0000 nvme(4): detect S3X NVMe controller in 2016-2017 MacBooks Adds support for detection of the S3X NVMe controller found in the 13" MacBook Pro 2017 without Touch Bar (MacBook14,1) It is known to be used in following MacBooks: - Retina MacBook 2016 (MacBook9,1) - 13" MacBook Pro 2016 without Touch Bar (MacBook13,1) - 13" MacBook Pro 2016 with Touch Bar (MacBook13,2) --- sys/dev/nvme/nvme_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index 5e7efa7f33bc..22188ccfacea 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -95,6 +95,7 @@ static struct _pcsid { 0xa821144d, 0, 0, "Samsung PM1725", QUIRK_DELAY_B4_CHK_RDY }, { 0xa822144d, 0, 0, "Samsung PM1725a", QUIRK_DELAY_B4_CHK_RDY }, { 0x07f015ad, 0, 0, "VMware NVMe Controller" }, + { 0x2003106b, 0, 0, "Apple S3X NVMe Controller" }, { 0x00000000, 0, 0, NULL } };