From owner-svn-src-head@freebsd.org Wed Apr 1 03:35:40 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 34F6E278F71; Wed, 1 Apr 2020 03:35:40 +0000 (UTC) (envelope-from mav@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 48sX0C3D73z3Krg; Wed, 1 Apr 2020 03:35:39 +0000 (UTC) (envelope-from mav@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 D86521DDA0; Wed, 1 Apr 2020 03:27:48 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0313Rmu9041181; Wed, 1 Apr 2020 03:27:48 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0313RmiH041179; Wed, 1 Apr 2020 03:27:48 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202004010327.0313RmiH041179@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Wed, 1 Apr 2020 03:27:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359500 - head/sys/dev/ahci X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/dev/ahci X-SVN-Commit-Revision: 359500 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 03:35:40 -0000 Author: mav Date: Wed Apr 1 03:27:47 2020 New Revision: 359500 URL: https://svnweb.freebsd.org/changeset/base/359500 Log: Add support for AHCI BIOS/OS Handoff. This allows clean handoff from BIOS implementing some asynchronous I/O to the OS AHCI driver. During attach driver declares OS ownership request and waits from 25ms to 2s for BIOS to complete operation and release the hardware. MFC after: 2 weeks Modified: head/sys/dev/ahci/ahci.c head/sys/dev/ahci/ahci.h Modified: head/sys/dev/ahci/ahci.c ============================================================================== --- head/sys/dev/ahci/ahci.c Wed Apr 1 03:19:42 2020 (r359499) +++ head/sys/dev/ahci/ahci.c Wed Apr 1 03:27:47 2020 (r359500) @@ -141,7 +141,27 @@ int ahci_ctlr_reset(device_t dev) { struct ahci_controller *ctlr = device_get_softc(dev); + uint32_t v; int timeout; + + /* BIOS/OS Handoff */ + if ((ATA_INL(ctlr->r_mem, AHCI_VS) >= 0x00010200) && + (ATA_INL(ctlr->r_mem, AHCI_CAP2) & AHCI_CAP2_BOH) && + ((v = ATA_INL(ctlr->r_mem, AHCI_BOHC)) & AHCI_BOHC_OOS) == 0) { + + /* Request OS ownership. */ + ATA_OUTL(ctlr->r_mem, AHCI_BOHC, v | AHCI_BOHC_OOS); + + /* Wait up to 2s for BIOS ownership release. */ + for (timeout = 0; timeout < 80; timeout++) { + DELAY(25000); + v = ATA_INL(ctlr->r_mem, AHCI_BOHC); + if ((v & AHCI_BOHC_BOS) == 0) + break; + if ((v & AHCI_BOHC_BB) == 0) + break; + } + } /* Enable AHCI mode */ ATA_OUTL(ctlr->r_mem, AHCI_GHC, AHCI_GHC_AE); Modified: head/sys/dev/ahci/ahci.h ============================================================================== --- head/sys/dev/ahci/ahci.h Wed Apr 1 03:19:42 2020 (r359499) +++ head/sys/dev/ahci/ahci.h Wed Apr 1 03:27:47 2020 (r359500) @@ -214,6 +214,13 @@ #define AHCI_CAP2_SADM 0x00000010 #define AHCI_CAP2_DESO 0x00000020 +#define AHCI_BOHC 0x28 +#define AHCI_BOHC_BOS 0x00000001 +#define AHCI_BOHC_OOS 0x00000002 +#define AHCI_BOHC_SOOE 0x00000004 +#define AHCI_BOHC_OOC 0x00000008 +#define AHCI_BOHC_BB 0x00000010 + #define AHCI_VSCAP 0xa4 #define AHCI_OFFSET 0x100 #define AHCI_STEP 0x80