git: 215db69fbcb0 - stable/13 - pci_dw: Trim ATU windows bigger than 4GB

Jessica Clarke jrtc27 at FreeBSD.org
Tue Sep 7 12:09:40 UTC 2021


The branch stable/13 has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=215db69fbcb0b5acc04fbd9cb858e91d36252a46

commit 215db69fbcb0b5acc04fbd9cb858e91d36252a46
Author:     Wojciech Macek <wma at FreeBSD.org>
AuthorDate: 2021-04-09 07:28:44 +0000
Commit:     Jessica Clarke <jrtc27 at FreeBSD.org>
CommitDate: 2021-09-07 12:06:47 +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 at 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 161a68d2929d..f0aae5bf8418 100644
--- a/sys/dev/pci/pci_dw.c
+++ b/sys/dev/pci/pci_dw.c
@@ -342,6 +342,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);
 }
 


More information about the dev-commits-src-all mailing list