Date: Tue, 31 Mar 2020 21:28:50 -0700 From: Ravi Pokala <rpokala@freebsd.org> To: Alexander Motin <mav@FreeBSD.org>, <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org> Subject: Re: svn commit: r359499 - head/sys/dev/ahci Message-ID: <5598FCD0-22B8-4F18-87C1-C1506E32A757@panasas.com> In-Reply-To: <202004010319.0313JhlU034881@repo.freebsd.org> References: <202004010319.0313JhlU034881@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-----Original Message-----
From: <owner-src-committers@freebsd.org> on behalf of Alexander Motin <mav@FreeBSD.org>
Date: 2020-03-31, Tuesday at 20:19
To: <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org>
Subject: svn commit: r359499 - head/sys/dev/ahci
Author: mav
Date: Wed Apr 1 03:19:42 2020
New Revision: 359499
URL: https://svnweb.freebsd.org/changeset/base/359499
Log:
Add ID for JMicron JMB582/JMB585 AHCI controller.
JMB582 has 2 6Gbps SATA ports and PCIe 3.0 x1.
JMB585 has 5 6Gbps SATA ports and PCIe 3.0 x2.
Both chips support AHCI v1.31, Port Multiplier with FBS and 8 MSI vectors.
Hi Alexander,
The second line of diff seems unrelated...?
Thanks,
Ravi (rpokala@)
MFC after: 2 weeks
Modified:
head/sys/dev/ahci/ahci_pci.c
Modified: head/sys/dev/ahci/ahci_pci.c
==============================================================================
--- head/sys/dev/ahci/ahci_pci.c Wed Apr 1 02:13:01 2020 (r359498)
+++ head/sys/dev/ahci/ahci_pci.c Wed Apr 1 03:19:42 2020 (r359499)
@@ -247,6 +247,7 @@ static const struct {
{0x2365197b, 0x00, "JMicron JMB365", AHCI_Q_NOFORCE},
{0x2366197b, 0x00, "JMicron JMB366", AHCI_Q_NOFORCE},
{0x2368197b, 0x00, "JMicron JMB368", AHCI_Q_NOFORCE},
+ {0x0585197b, 0x00, "JMicron JMB58x", 0},
{0x611111ab, 0x00, "Marvell 88SE6111", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
AHCI_Q_1CH | AHCI_Q_EDGEIS},
{0x612111ab, 0x00, "Marvell 88SE6121", AHCI_Q_NOFORCE | AHCI_Q_NOPMP |
@@ -399,6 +400,7 @@ ahci_probe(device_t dev)
!(ahci_ids[i].quirks & AHCI_Q_NOFORCE)))) {
/* Do not attach JMicrons with single PCI function. */
if (pci_get_vendor(dev) == 0x197b &&
+ (ahci_ids[i].quirks & AHCI_Q_NOFORCE) &&
(pci_read_config(dev, 0xdf, 1) & 0x40) == 0)
return (ENXIO);
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5598FCD0-22B8-4F18-87C1-C1506E32A757>