From owner-svn-src-head@freebsd.org Wed Apr 1 14:44:36 2020 Return-Path: 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 DC4462BDB58; Wed, 1 Apr 2020 14:44:36 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48spqx5cm7z3QkG; Wed, 1 Apr 2020 14:44:29 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: by mail-ot1-x335.google.com with SMTP id m2so11411290otr.1; Wed, 01 Apr 2020 07:44:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=o8WDk9/svReysUKaweg2qbk7iAg2fnMAitz8kjKTP2A=; b=R0sYGnXqlCzmZRgpYhSqxnk8U3Kv7zdX2qExjjpLOwNa1GDvC007czk8GUnDEUHRtI Sqze2eT6N++5K48eQ3UWBXNi16G7BDc1VIWM0mb80WntiYRJ+ohoiBNH4TZHLEN+7E6+ 2yYvtjuhgPL8OQETBCLgJgp0NlDvwhGhPQPp7z/syFssIqMYPSD9Dqrel42gobDa+udl YtqTheLNOpt+JozbqyX3unreamwPpC7rkApXrroxhrx5+M27/AlVIWnPHw9EK1tkSy3/ qgOs3TQEcB3/RCCKg77LQkfY9VDsl7NTEGQcHqfnT2vfPxb0CYKQWfNjxAIn1GfCZRdY pE/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=o8WDk9/svReysUKaweg2qbk7iAg2fnMAitz8kjKTP2A=; b=AsiGS3ZmN6WIWQUr2USMNhFZslmLvVIJ14iEFCNLfw6sKphskLPCfXnYWXqT134mn1 FQ4o12voYpOVSpDggNpxVZb5GTsfg2Q63bc6iW0C4mIKjd4lclpqkdAMHavqnLdluG2u 7/JNu+7kQ42L3iq+wOznn9mLpK68XHB8kNnsE/zxRhIt7L5cDUhXdc5gF6oefRLiJGZN tq0b4EppvekkPfaUarmlG5QYw7Xlv84L3f92SEULwienp3bSi/E87R75xjYGnMGnQJY5 t7yldB0utEuVtYwqg0txvDIyZ9DpJpd4lx+UbK21mxJFhfZXDzgeM4c7u9UC/qupvM4G R+Og== X-Gm-Message-State: ANhLgQ3d0Y2WEiF42mEVJQvu+gAc6B6Tnm88rHacZGCUHzn4Era8mCDx 1eRzC2EnlCX1KX466qj+1BiDr/zQ X-Google-Smtp-Source: ADFU+vt1Y/BhKTDg/wVamnDSvUnT/Vcq7QgVi2we147hAhurtE9bL4fGTzS5cne/kNDNh0TGDYYsXA== X-Received: by 2002:a9d:837:: with SMTP id 52mr16089865oty.354.1585750699871; Wed, 01 Apr 2020 07:18:19 -0700 (PDT) Received: from spectre.mavhome.dp.ua ([2600:1700:3580:3560:228:f8ff:fe04:d12]) by smtp.gmail.com with ESMTPSA id d25sm480663ooh.34.2020.04.01.07.18.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Apr 2020 07:18:18 -0700 (PDT) Sender: Alexander Motin Subject: Re: svn commit: r359499 - head/sys/dev/ahci To: Ravi Pokala , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <202004010319.0313JhlU034881@repo.freebsd.org> <5598FCD0-22B8-4F18-87C1-C1506E32A757@panasas.com> From: Alexander Motin Autocrypt: addr=mav@FreeBSD.org; prefer-encrypt=mutual; keydata= mQENBFOzxAwBCADkPrax0pI2W/ig0CK9nRJJwsHitAGEZ2HZiFEuti+6/4UVxj81yr4ak/4g 9bKUyC7rMEAp/ZHNhd+MFCPAAcHPvtovnfykqE/vuosCS3wlSLloix2iKVLks0CwbLHGAyne 46lTQW74Xl/33c3W1Z6d8jD9gVFT/xaVzZ0U9xdzOmsYAZaAj4ki0tuxO9F7L+ct9grRe7iP g8t9hai7BL4ee3VRwk2JXnKb7UvBiVITKYWKz1jRvZIrjPokgEcCLOSlv7x/1kjuFnj3xWZU 7HSFFT8J93epBbrSSCsYsppIk2fZH41kaaFXsMQfTPH8wkeM6qwrvOh4HiQM08R+9tThABEB AAG0IUFsZXhhbmRlciBNb3RpbiA8bWF2QEZyZWVCU0Qub3JnPokBVwQTAQoAQQIbAwULCQgH AwUVCgkICwUWAwIBAAIeAQIXgAIZARYhBOmM88TmnMPNDledVYMYw5VbqyJ/BQJZYMKuBQkN McyiAAoJEIMYw5VbqyJ/tuUIAOG3ONOSNYqjK4eTZ1TVh9jdUBAhWk5nhDFnODN49Wj0AbYm 7aIqy8O1hnCDSZG5LttjSAo3UfXJZDKQM0BLb0gpRMBnAYqO6tdolLNqAbPGJBnGoPjsh24y 6KcbDaNnis+lD4GwPXwQM+92wZGhCUFElPV9NciZGVS65TNIgk7X+yEjjhD1MSWKKijZ1r9Z zIt4OzUTxxNOvzdlABZS88nNRdJkatOQJPmFdd1mpP6UzTNCiLUo1pIqOEtJgvVVDYq5WHY6 tciWWYdmZG/tIBexJmv2mV2OLVjXR6ZeKmntVH14H72/wRHJuYHQC+r5SVRcWWayrThsY6jZ Yr4+raS5AQ0EU7PEDAEIAOZgWf2cJIu+58IzP2dkXE/urj3tr4OqrB/yHGWUf71Lz6D0Fi6Z AXgDtmcFLGPfMyWuLAvSM+xmoguk7zC4hRBYvQycmIhuqBq1jO1Wp/Z+lpoPM/1cDYLn8Flv mI/c40MhUZh345DA4jYWWaZNjQHUWVQ1fPf595vdVVMPT/abE8E5DaF6fSkRmqFTmfYRkfbt 3ytU8NdUapDcJVY7cEP2nJBVNZPnOIObR/ZIgSxjjrG5o34yXoqeup8JvwEv+/NylzzuyXEZ R1EdEIzQ/a1nh/0j4NXtzZEqKW4aTWlmSqb6wN8jh1OSOOqkYsfnE3nfxcZbxi4IRoNQYlm5 9R8AEQEAAYkBPAQYAQoAJgIbDBYhBOmM88TmnMPNDledVYMYw5VbqyJ/BQJZYMLYBQkNMczM AAoJEIMYw5VbqyJ/TqgH/RQHClkvecE0262lwKoP/m0Mh4I5TLRgoJJn8S7G1BnqohYJkiLq A6xe6urGD7OqdNAl12UbrjWbdJV+zvea3vJoM4MZuYiYrGaXWxzFXqWJcPwMU9sAh8MRghHu uC5vgPb45Tnftw9/+n0i8GfVhQhOqepUGdQg4NPcXviSkoAvig6pp9Lcxisn0groUQKt15Gc sS9YcQWg3j9Hnipc6Mu416HX98Fb113NHJqc2geTHLkRyuBFOoyIqB6N9GKjzOAIzxxsVdl9 TevwGsrp4M4/RFzWbSgsbOnbE7454lmuVZGfReEjnUm8RHp9Q2UWKXlp3exlZjvOp/uVEpCg lz65AQ0EU7PEDAEIAOZgWf2cJIu+58IzP2dkXE/urj3tr4OqrB/yHGWUf71Lz6D0Fi6ZAXgD tmcFLGPfMyWuLAvSM+xmoguk7zC4hRBYvQycmIhuqBq1jO1Wp/Z+lpoPM/1cDYLn8FlvmI/c 40MhUZh345DA4jYWWaZNjQHUWVQ1fPf595vdVVMPT/abE8E5DaF6fSkRmqFTmfYRkfbt3ytU 8NdUapDcJVY7cEP2nJBVNZPnOIObR/ZIgSxjjrG5o34yXoqeup8JvwEv+/NylzzuyXEZR1Ed EIzQ/a1nh/0j4NXtzZEqKW4aTWlmSqb6wN8jh1OSOOqkYsfnE3nfxcZbxi4IRoNQYlm59R8A EQEAAYkBPAQYAQoAJgIbDBYhBOmM88TmnMPNDledVYMYw5VbqyJ/BQJZYMLYBQkNMczMAAoJ EIMYw5VbqyJ/TqgH/RQHClkvecE0262lwKoP/m0Mh4I5TLRgoJJn8S7G1BnqohYJkiLqA6xe 6urGD7OqdNAl12UbrjWbdJV+zvea3vJoM4MZuYiYrGaXWxzFXqWJcPwMU9sAh8MRghHuuC5v gPb45Tnftw9/+n0i8GfVhQhOqepUGdQg4NPcXviSkoAvig6pp9Lcxisn0groUQKt15GcsS9Y cQWg3j9Hnipc6Mu416HX98Fb113NHJqc2geTHLkRyuBFOoyIqB6N9GKjzOAIzxxsVdl9Tevw Gsrp4M4/RFzWbSgsbOnbE7454lmuVZGfReEjnUm8RHp9Q2UWKXlp3exlZjvOp/uVEpCglz4= Message-ID: <45e89302-9325-a3cd-484f-b9019c0a809c@FreeBSD.org> Date: Wed, 1 Apr 2020 10:18:17 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:68.0) Gecko/20100101 Thunderbird/68.0 MIME-Version: 1.0 In-Reply-To: <5598FCD0-22B8-4F18-87C1-C1506E32A757@panasas.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 48spqx5cm7z3QkG X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=R0sYGnXq; dmarc=none; spf=pass (mx1.freebsd.org: domain of mavbsd@gmail.com designates 2607:f8b0:4864:20::335 as permitted sender) smtp.mailfrom=mavbsd@gmail.com X-Spamd-Result: default: False [-3.84 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-1.64)[ip: (-7.34), ipnet: 2607:f8b0::/32(-0.35), asn: 15169(-0.45), country: US(-0.05)]; DKIM_TRACE(0.00)[gmail.com:+]; RCVD_IN_DNSWL_NONE(0.00)[5.3.3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FORGED_SENDER(0.30)[mav@FreeBSD.org,mavbsd@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[mav@FreeBSD.org,mavbsd@gmail.com]; MID_RHS_MATCH_FROM(0.00)[] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 14:44:37 -0000 Hi. On 01.04.2020 00:28, Ravi Pokala wrote: > -----Original Message----- > From: on behalf of Alexander Motin > Date: 2020-03-31, Tuesday at 20:19 > To: , , > 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...? It is related, because the check for shared PCI function for SATA and PATA is no longer applicable to the new generation of HBAs, implementing only AHCI. And without adding more strict check the driver does not attach when it should. > > 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", > > > -- Alexander Motin