From nobody Sun Jun 02 20:43:48 2024 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 4Vspjc6Hwxz5JwM0; Sun, 02 Jun 2024 20:43:48 +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 4Vspjc3MB7z4kPy; Sun, 2 Jun 2024 20:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717361028; 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=cG13m6o6nN7JpoEZCLfJ4Rg0z5qkxrVXxiuepgYKMWo=; b=CdW1uCovDehuDrxMSMtQjydiMgcBkA4J/RN9iyQJ3K3kmZixDvySgTgmY/GKzOaFzFJn/a qiNkRZku9NyCPLfoIDstwsYsntu7ZmJ6nuKFWi9NHZKrOE6nWzWbvuZ7rqg6XjfMCNf0gm 0mi4k0p4i1q+ryZ8BPJgu7Ds/iy6+RBSzWg1IX1KGKCQzLIqJ7WR4M+NQX4FbA/CrQb8bB 3ajtJ/E7kQP88iIqVXgK9sUOOcTDCSQA1jUSlAFVNWojApWgW2KW5I/vGZ6uF9R+Bq1kH2 1NtL3z33KL89IdUgFxf73xza+i9YBxi51Y5rT2GkCWdBvhxr+XYCwId5yPuCjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717361028; a=rsa-sha256; cv=none; b=qMyiFIKAD+uHh+pVejNDwJeKWPPcaGwQN7y+XyfBBCja2Gj1E82mz93Ibtwtsm5Ets00g2 Qs+O9+r64vHBzSw7pSzMJ6InXApoMri1OVg7RGJlG1nQqpoVQyHlmRkgSV3t0SCPGuUeGN Fg1AG5SIOTap/qtp/sRC0D8igpjYkX5fKotMXDxssvpMUjUCfy5TvDjY4eHfJV2e4+vQmW u5/kW2sqjB5hGv+Gn3nJkrd9hkd4OGFaLuBVJmeBX0tLc4Q4el63NHOamNrQ+E+KIY0IyS J1sQfarlWyj2wB+R1FfMfgtN5/l8+K2SZp+Q1eb2P9VPtSCwew8Kc5Xe8LIKtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717361028; 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=cG13m6o6nN7JpoEZCLfJ4Rg0z5qkxrVXxiuepgYKMWo=; b=ZXs8yGPVm31AcTj4F1x4tgugSeMLaU6n5j6vFDkRgKIBERTt89ezchxEakiN+iY29fIfCK S89vTjIYFvObjIlaV8Fi4iZRiRFla43yO2xItmG8cWdyH7QJjyeIXX7NjLD9893VSq6/6i j7gDnbyW06rBx8n+sqH5ooEXiDqSpD29Ga9s9Du9MKtB13eaGoDW+SCqr8sqUJ3ERQcfYj 4zbbAOV/hRI8ei54rwTSRCWmc9p5bQwcU5PzJyYgTXRzMZHEqlwJh5tS3Mp4mznf2YzPfJ cJVLpmIZlCyXm/iza20Fi48grtmgl+YdxGGZfv7owLujA/1mZ/T6HqmxerzGaw== 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 4Vspjc2vjNz15dm; Sun, 2 Jun 2024 20:43:48 +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 452KhmIf050142; Sun, 2 Jun 2024 20:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452Khmjb050139; Sun, 2 Jun 2024 20:43:48 GMT (envelope-from git) Date: Sun, 2 Jun 2024 20:43:48 GMT Message-Id: <202406022043.452Khmjb050139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 28aaa58fa64e - main - fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28aaa58fa64ecb89d47f0a8396954ad8ca82d8ef Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=28aaa58fa64ecb89d47f0a8396954ad8ca82d8ef commit 28aaa58fa64ecb89d47f0a8396954ad8ca82d8ef Author: Jessica Clarke AuthorDate: 2024-06-02 20:42:18 +0000 Commit: Jessica Clarke CommitDate: 2024-06-02 20:42:18 +0000 fu740_pci_dw: Fix PERST delay and keep asserted for rest of reset sequence DELAY takes microseconds not milliseconds, so 100 was too low. Moreover, when enabling hw.pci.clear_pcib, PCI emeration would still stop at one of the first bridges, but by asserting PERST for the rest of the reset sequence that appears to be reliably addressed. Fixes: 896e217a0eae ("fu740_pci_dw: Add SiFive FU740 PCIe controller driver") --- sys/riscv/sifive/fu740_pci_dw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/riscv/sifive/fu740_pci_dw.c b/sys/riscv/sifive/fu740_pci_dw.c index 13937e283042..d0490d6548f2 100644 --- a/sys/riscv/sifive/fu740_pci_dw.c +++ b/sys/riscv/sifive/fu740_pci_dw.c @@ -215,12 +215,6 @@ fupci_phy_init(struct fupci_softc *sc) return (error); } - /* Hold PERST for 100ms as per the PCIe spec */ - DELAY(100); - - /* Deassert PERST_N */ - FUDW_MGMT_WRITE(sc, FUDW_MGMT_PERST_N, 1); - /* Deassert core power-on reset (active low) */ error = gpio_pin_set_active(sc->porst_pin, true); if (error != 0) { @@ -280,6 +274,12 @@ fupci_phy_init(struct fupci_softc *sc) /* Put the controller in Root Complex mode */ FUDW_MGMT_WRITE(sc, FUDW_MGMT_DEVICE_TYPE, FUDW_MGMT_DEVICE_TYPE_RC); + /* Hold PERST for 100ms as per the PCIe spec */ + DELAY(100000); + + /* Deassert PERST_N */ + FUDW_MGMT_WRITE(sc, FUDW_MGMT_PERST_N, 1); + return (0); }