From owner-svn-src-all@freebsd.org Mon Jan 18 14:19:56 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1AAFDA87D40; Mon, 18 Jan 2016 14:19:56 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from kif.fubar.geek.nz (kif.fubar.geek.nz [178.62.119.249]) by mx1.freebsd.org (Postfix) with ESMTP id DFE071F5F; Mon, 18 Jan 2016 14:19:55 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from zapp (global-5-143.nat-2.net.cam.ac.uk [131.111.5.143]) by kif.fubar.geek.nz (Postfix) with ESMTPSA id DE991D7A17; Mon, 18 Jan 2016 14:19:53 +0000 (UTC) Date: Mon, 18 Jan 2016 14:19:52 +0000 From: Andrew Turner To: Zbigniew Bodek Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r294266 - head/sys/arm64/cavium Message-ID: <20160118141952.0c987b26@zapp> In-Reply-To: <201601181331.u0IDVToj065340@repo.freebsd.org> References: <201601181331.u0IDVToj065340@repo.freebsd.org> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2016 14:19:56 -0000 On Mon, 18 Jan 2016 13:31:29 +0000 (UTC) Zbigniew Bodek 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 > 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