From nobody Thu Oct 14 16:20:15 2021
X-Original-To: dev-commits-src-branches@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 A08AD17F19F0;
Thu, 14 Oct 2021 16:20:15 +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 4HVZPW47sPz3FYv;
Thu, 14 Oct 2021 16:20:15 +0000 (UTC)
(envelope-from git@FreeBSD.org)
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 6FD8A165B6;
Thu, 14 Oct 2021 16:20:15 +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 19EGKFVn053332;
Thu, 14 Oct 2021 16:20:15 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19EGKFaR053325;
Thu, 14 Oct 2021 16:20:15 GMT
(envelope-from git)
Date: Thu, 14 Oct 2021 16:20:15 GMT
Message-Id: <202110141620.19EGKFaR053325@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Marcin Wojtas <mw@FreeBSD.org>
Subject: git: 8f2e39b9d3ec - stable/12 - pci_dw: Trim ATU windows bigger than 4GB
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-branches@freebsd.org
X-BeenThere: dev-commits-src-branches@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mw
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 8f2e39b9d3ecbd9653f859d9261745059f2b9071
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mw:
URL: https://cgit.FreeBSD.org/src/commit/?id=8f2e39b9d3ecbd9653f859d9261745059f2b9071
commit 8f2e39b9d3ecbd9653f859d9261745059f2b9071
Author: Wojciech Macek <wma@FreeBSD.org>
AuthorDate: 2021-04-09 07:28:44 +0000
Commit: Marcin Wojtas <mw@FreeBSD.org>
CommitDate: 2021-10-14 16:09:44 +0000
pci_dw: Trim ATU windows bigger than 4GB
The size of the ATU MEM/IO windows is implicitly casted to uint32_t.
Because of that some window sizes were silently demoted to 0 and ignored.
Check the size if its too large, trim it to 4GB and print a warning message.
Submitted by: Kornel Duleba <mindal@semihalf.com>
Reviewed by: mw
Obtained from: Semihalf
Sponsored by: Marvell
Differential revision: https://reviews.freebsd.org/D29625
(cherry picked from commit 243000b19f8b4ab104b584b2d16bc6aa9131c9b5)
---
sys/dev/pci/pci_dw.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sys/dev/pci/pci_dw.c b/sys/dev/pci/pci_dw.c
index 904e36caff20..973a56239473 100644
--- a/sys/dev/pci/pci_dw.c
+++ b/sys/dev/pci/pci_dw.c
@@ -350,6 +350,18 @@ pci_dw_decode_ranges(struct pci_dw_softc *sc, struct ofw_pci_range *ranges,
" Not all required ranges are found in DT\n");
return (ENXIO);
}
+ if (sc->io_range.size > UINT32_MAX) {
+ device_printf(sc->dev,
+ "ATU IO window size is too large. Up to 4GB windows "
+ "are supported, trimming window size to 4GB\n");
+ sc->io_range.size = UINT32_MAX;
+ }
+ if (sc->mem_range.size > UINT32_MAX) {
+ device_printf(sc->dev,
+ "ATU MEM window size is too large. Up to 4GB windows "
+ "are supported, trimming window size to 4GB\n");
+ sc->mem_range.size = UINT32_MAX;
+ }
return (0);
}