From owner-svn-src-head@freebsd.org Thu Apr 25 18:56:47 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ED098159FBB4; Thu, 25 Apr 2019 18:56:46 +0000 (UTC) (envelope-from tychon@freebsd.org) Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE47895710; Thu, 25 Apr 2019 18:56:44 +0000 (UTC) (envelope-from tychon@freebsd.org) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id C3B8564480; Thu, 25 Apr 2019 14:56:42 -0400 (EDT) (envelope-from tychon@freebsd.org) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=content-type :mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=sasl; bh= 1L0O1CY96RVWKbQ8Cx4TsuuVaNI=; b=xKPT7gw+RH6aOd8co5OJCmK30NSwg7xs a6vwgaZkdAz78fCVpARuvafsIo5boZFkMEIWgMlBfSCiudzbH5m4CyPUEh9nVCOl w/JpcdNVTXmF57c+c66lASKXTBZtiivXxtWLAqAuAVUaJaLtJq7px3aQ1TlRrdVj TiblzrovU+A= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id BBA3A6447F; Thu, 25 Apr 2019 14:56:42 -0400 (EDT) (envelope-from tychon@freebsd.org) Received: from [10.0.1.195] (unknown [146.115.68.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id D9AB56447D; Thu, 25 Apr 2019 14:56:39 -0400 (EDT) (envelope-from tychon@freebsd.org) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r346687 - head/sys/compat/linuxkpi/common/src From: Tycho Nightingale In-Reply-To: <78fc1980-3436-6155-a3bd-a3e85c6a5001@FreeBSD.org> Date: Thu, 25 Apr 2019 14:56:36 -0400 Cc: Konstantin Belousov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <57248B07-6950-4AA0-8A92-B1D0C613E3DA@freebsd.org> References: <201904251813.x3PIDut8078016@repo.freebsd.org> <20190425184300.GM12936@kib.kiev.ua> <78fc1980-3436-6155-a3bd-a3e85c6a5001@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3445.9.1) X-Pobox-Relay-ID: DC251A38-678B-11E9-B169-D01F9763A999-09779102!pb-smtp20.pobox.com X-Rspamd-Queue-Id: BE47895710 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2019 18:56:47 -0000 > On Apr 25, 2019, at 2:50 PM, John Baldwin wrote: >=20 > On 4/25/19 11:43 AM, Konstantin Belousov wrote: >> On Thu, Apr 25, 2019 at 06:13:56PM +0000, Tycho Nightingale wrote: >>> Author: tychon >>> Date: Thu Apr 25 18:13:55 2019 >>> New Revision: 346687 >>> URL: https://svnweb.freebsd.org/changeset/base/346687 >>>=20 >>> Log: >>> LinuxKPI buildfix for ppc64 after r346645. >>>=20 >>> Proposed by: hselasky >>> Sponsored by: Dell EMC Isilon >>>=20 >>> Modified: >>> head/sys/compat/linuxkpi/common/src/linux_pci.c >>>=20 >>> Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c >>> = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >>> --- head/sys/compat/linuxkpi/common/src/linux_pci.c Thu Apr 25 = 17:28:36 2019 (r346686) >>> +++ head/sys/compat/linuxkpi/common/src/linux_pci.c Thu Apr 25 = 18:13:55 2019 (r346687) >>> @@ -137,9 +137,9 @@ linux_dma_tag_init(struct device *dev, u64 = dma_mask) >>> dma_mask, /* lowaddr */ >>> BUS_SPACE_MAXADDR, /* highaddr */ >>> NULL, NULL, /* filtfunc, filtfuncarg */ >>> - BUS_SPACE_MAXADDR, /* maxsize */ >>> + BUS_SPACE_MAXSIZE, /* maxsize */ >>> 1, /* nsegments */ >>> - BUS_SPACE_MAXADDR, /* maxsegsz */ >>> + BUS_SPACE_MAXSIZE, /* maxsegsz */ >>> 0, /* flags */ >>> NULL, NULL, /* lockfunc, lockfuncarg */ >>> &priv->dmat); >>=20 >> It seems that amd64 BUS_SPACE_MAXSIZE is 4G, I do not know why. >> Either we should fix that, or the following fix is more appropriate. >> i386 and ppc both have PAE-like configs where maxaddr is 64bit but >> maxsize is 32bit. >=20 > I think we should fix amd64's maxsize. That sounds reasonable. Perhaps this was a conservative choice along = with the 4GB DMA boundary which I removed recently. After some testing I can make this change. Tycho=