From nobody Fri Feb 10 16:09:37 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 4PCzFs3FTKz3pCV7; Fri, 10 Feb 2023 16:09: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 4PCzFs2Zl0z4VB8; Fri, 10 Feb 2023 16:09:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676045377; 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=CrI/K4YCsE0TgKbe2tESsc/FY/HUCmNHqNwiI2PBJjE=; b=CUyPueW10pxSgFsra+kgewygX79q4sTV1Hrl4BEBjlxz/sVxnDe+9MHCZ79annsbv6atsu ttX5e3nm1y/Pe0g23A73/YWbnjRemfkTLtORFIvDKKqBOqRbENcttRgY+2Wd35NjvBOhs2 23VGFYwezAGNNKvOcjvWMNNn/hXdN2Rc7Mx7X8FQ//+l4pV715a2ZUm8SSsDD88f6NRynk utU+lIiPbbunJmi8hp/pm8alnbJqFHZyQURSmpB6F92xITkqTy5UebAy4vEf/LqfITzoNB nfk26ay9W397y2+1esmuaUwZ9hPEWNBs204iXuI5VLyF9hMNzgJSLfFxWGwnFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676045377; 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=CrI/K4YCsE0TgKbe2tESsc/FY/HUCmNHqNwiI2PBJjE=; b=VbtIdubXSi5d4NOkHpMkG8zcki3IkYTRi6j4UevjDABJKQ3m0pzV9qG1qdxHSGsdiGIs9Z 1QwySysHCWQ3OqQEGArp+TA+lfh/LB0QJydAVfMbKFXJbAvI3iYbuFkmHeFF+VX7vAgJGu gRDhNNglVfAsxHJEXhTBzBoeyqOZaTPKz3Bm97GhkJq/LO3PFa8t44BE9hgttigHeGEhst vsNWDnnQRroRvP+y3WckBvkVmCGyiVw9Kv9SmFgaIeLvG0HIBnablAW6eYoV4ECki7sOAC vPn20d1DMC40TUTSjv21BjE4Tr5DHazMmAfU1WjGsWeu83OA+EDnIrDY58n8dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676045377; a=rsa-sha256; cv=none; b=G2xeaVUEuw/4aYcJbomkbTvKaahKSYz6UCo2tS9HvVqMkcKHgNuXEZadSUC+5044N0ekhH FnmR4EJDjEaNxN6c6AaxWPfyzD+UHntql1cKIv4uNejVct4AqwhgjwPzUDYW056Eb6b9/u MnFUsOqYeXjk4k9iI6gXLm4gzj3oVG4YV+OMk0cA4ZDk9chAOfQMoqshAuhPFP/jpjLeHm I/WssPmQzsVdK0Di0xC6COwR/n8EAUlAHSYus5R4x+IDzI32GLsLpJAxbqP7Iz2uUrAncT NnBnOkUsYTHT+v6KS8ZVNhphEXedv2TIQsRn1Laee/CvvmX3Q1zltv1EO5mpHw== 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 4PCzFs1TPhzPCs; Fri, 10 Feb 2023 16:09:37 +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 31AG9bH9058851; Fri, 10 Feb 2023 16:09:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31AG9b5V058850; Fri, 10 Feb 2023 16:09:37 GMT (envelope-from git) Date: Fri, 10 Feb 2023 16:09:37 GMT Message-Id: <202302101609.31AG9b5V058850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 346483b1f104 - main - ahci: increase timout 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: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 346483b1f10454c5617a25d5e136829f60fb1184 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=346483b1f10454c5617a25d5e136829f60fb1184 commit 346483b1f10454c5617a25d5e136829f60fb1184 Author: Mariusz Zaborski AuthorDate: 2023-02-10 15:56:04 +0000 Commit: Mariusz Zaborski CommitDate: 2023-02-10 16:10:04 +0000 ahci: increase timout For some devices, like Marvell 88SE9230, it takes more time to connect to the device. This patch introduces a special flag that extends the timeout from around 100ms to around 500ms. This change is based on the work of: Peter Eriksson PR: 243401 Reviewed by: imp Tested by: dch MFC after: 3 days Sponsored by: Equinix Sponsored by: SkunkWerks, GmbH Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38413 --- sys/dev/ahci/ahci.c | 12 ++++++++---- sys/dev/ahci/ahci.h | 4 +++- sys/dev/ahci/ahci_pci.c | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index 821ef756c9ba..9a07636b01f1 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -2605,10 +2605,14 @@ static int ahci_sata_connect(struct ahci_channel *ch) { u_int32_t status; - int timeout, found = 0; + int timeout, timeoutslot, found = 0; - /* Wait up to 100ms for "connect well" */ - for (timeout = 0; timeout < 1000 ; timeout++) { + /* + * Wait for "connect well", up to 100ms by default and + * up to 500ms for devices with the SLOWDEV quirk. + */ + timeoutslot = ((ch->quirks & AHCI_Q_SLOWDEV) ? 5000 : 1000); + for (timeout = 0; timeout < timeoutslot; timeout++) { status = ATA_INL(ch->r_mem, AHCI_P_SSTS); if ((status & ATA_SS_DET_MASK) != ATA_SS_DET_NO_DEVICE) found = 1; @@ -2627,7 +2631,7 @@ ahci_sata_connect(struct ahci_channel *ch) break; DELAY(100); } - if (timeout >= 1000 || !found) { + if (timeout >= timeoutslot || !found) { if (bootverbose) { device_printf(ch->dev, "SATA connect timeout time=%dus status=%08x\n", diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h index ae068d11ce4b..7f006ea031ca 100644 --- a/sys/dev/ahci/ahci.h +++ b/sys/dev/ahci/ahci.h @@ -621,6 +621,7 @@ enum ahci_err_type { #define AHCI_Q_NOCCS 0x00400000 #define AHCI_Q_NOAUX 0x00800000 #define AHCI_Q_IOMMU_BUSWIDE 0x01000000 +#define AHCI_Q_SLOWDEV 0x02000000 #define AHCI_Q_BIT_STRING \ "\020" \ @@ -648,7 +649,8 @@ enum ahci_err_type { "\026MRVL_SR_DEL" \ "\027NOCCS" \ "\030NOAUX" \ - "\031IOMMU_BUSWIDE" + "\031IOMMU_BUSWIDE" \ + "\032SLOWDEV" int ahci_attach(device_t dev); int ahci_detach(device_t dev); diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 5bccb0dd914d..51bbe6e5cbe3 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -293,7 +293,7 @@ static const struct { {0x92201b4b, 0x00, "Marvell 88SE9220", AHCI_Q_ALTSIG | AHCI_Q_IOMMU_BUSWIDE}, {0x92301b4b, 0x00, "Marvell 88SE9230", AHCI_Q_ALTSIG | - AHCI_Q_IOMMU_BUSWIDE}, + AHCI_Q_IOMMU_BUSWIDE | AHCI_Q_SLOWDEV}, {0x92351b4b, 0x00, "Marvell 88SE9235", 0}, {0x06201103, 0x00, "HighPoint RocketRAID 620", 0}, {0x06201b4b, 0x00, "HighPoint RocketRAID 620", 0},