On Mon, 18 Jan 2016 13:31:29 +0000 (UTC) Zbigniew Bodek <z...@freebsd.org> wrote:
> Author: zbb > Date: Mon Jan 18 13:31:29 2016 > New Revision: 294266 > URL: https://svnweb.freebsd.org/changeset/base/294266 > > Log: > Update ThunderX PCIe driver to fit new DTS layout > > In recent EFI the DTS entries changed for PCIe controller. The commit message is missing an explanation on how they changed. > This commit fixes internal PCIe, external is yet TBD. > > Submitted by: Dominik Ermel <d...@semihalf.com> > Obtained from: Semihalf > Sponsored by: The FreeBSD Foundation > Differential revision: https://reviews.freebsd.org/D4976 > > Modified: > head/sys/arm64/cavium/thunder_pcie.c > head/sys/arm64/cavium/thunder_pcie_common.c > head/sys/arm64/cavium/thunder_pcie_common.h > head/sys/arm64/cavium/thunder_pcie_pem.c > > Modified: head/sys/arm64/cavium/thunder_pcie.c > ============================================================================== > --- head/sys/arm64/cavium/thunder_pcie.c Mon Jan 18 12:02:05 > 2016 (r294265) +++ head/sys/arm64/cavium/thunder_pcie.c > Mon Jan 18 13:31:29 2016 (r294266) @@ -92,7 +92,7 @@ > __FBSDID("$FreeBSD$"); #define PCI_ADDR_CELL_SIZE 2 > > struct thunder_pcie_softc { > - struct pcie_range ranges[MAX_RANGES_TUPLES]; > + struct pcie_range ranges[RANGES_TUPLES_MAX]; > struct rman mem_rman; > struct resource *res; > int ecam; > @@ -132,7 +132,8 @@ thunder_pcie_probe(device_t dev) > if (!ofw_bus_status_okay(dev)) > return (ENXIO); > > - if (ofw_bus_is_compatible(dev, "cavium,thunder-pcie")) { > + if (ofw_bus_is_compatible(dev, "cavium,thunder-pcie") || > + ofw_bus_is_compatible(dev, > "cavium,pci-host-thunder-ecam")) { Why not ofw_bus_search_compatible? > Modified: head/sys/arm64/cavium/thunder_pcie_common.h > ============================================================================== > --- head/sys/arm64/cavium/thunder_pcie_common.h Mon Jan 18 > 12:02:05 2016 (r294265) +++ > head/sys/arm64/cavium/thunder_pcie_common.h Mon Jan 18 > 13:31:29 2016 (r294266) @@ -29,8 +29,8 @@ #ifndef > _CAVIUM_THUNDER_PCIE_COMMON_H_ #define > _CAVIUM_THUNDER_PCIE_COMMON_H_ > -#define MAX_RANGES_TUPLES 5 > -#define MIN_RANGES_TUPLES 2 > +#define RANGES_TUPLES_MAX 6 > +#define RANGES_TUPLES_INVALID (RANGES_TUPLES_MAX + 1) Why is this changed? Andrew _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
