From nobody Tue Jul 12 17:35:39 2022 X-Original-To: dev-commits-src-all@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 306661CFB4D0; Tue, 12 Jul 2022 17:35:40 +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 4Lj7FS0wDnz3dgv; Tue, 12 Jul 2022 17:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657647340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=le+lzKr5CRA09NMOXu+lmrTn9TCkqztMq3dafTGGfr0=; b=gz9ZNliy1xoAnjPcXXwXUpWOCsf5fljx3f1HBlNbrSFwgOxHgwtUAvyYGBAeuexFh+L5R1 mDZxY/XvdkV94U45hjXuMVs3bZpAm1jWTI82IXGqyWlGsQuN6e1isaUwRfdtWoi+9IyezL 8s8lJ34Ki/M1gyh1dI9o9gOuzDlWAjDajn9zqc8pL7lAgPI0MkhRTnWwHuUqDYnGH6uQVs gYWxZ+C9CMhRTXufPh7HhHNR1Iw+l3LbY5zzT9C07JLJQ+G2ov6rSiYAiE4GNENWdZQE+n zBjZP+VvAy6Op6RjXTlDW/+K7YUv8ohHHd8OKxPsF9CPBm2u3xVjUcfHXiE0ZA== 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 4Lj7FR74nMzsQL; Tue, 12 Jul 2022 17:35:39 +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 26CHZdVD066021; Tue, 12 Jul 2022 17:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CHZdGZ066020; Tue, 12 Jul 2022 17:35:39 GMT (envelope-from git) Date: Tue, 12 Jul 2022 17:35:39 GMT Message-Id: <202207121735.26CHZdGZ066020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 094bcfa4e15b - stable/13 - mips_busdma: fix mips errors after merge List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 094bcfa4e15bf2c21e6bd8e9c0bbdb0389beddef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657647340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=le+lzKr5CRA09NMOXu+lmrTn9TCkqztMq3dafTGGfr0=; b=XPqEOhcpGLWenyWOy5UWKgd00I8J2h3Km0nSuawqyyUP0ImdNCAvVuHnQr/PgkEwQXc9ke StdTCMltlCM73iDaobbGz/zEDQI6UzkrPn2hb8E10dRGIqEXQCfdn/5hfrrX4jU0+ZbpGD 3JareickW8rPXGnZOjGIhmu4rUf4+lBinkLTVdHyzzPdQqz0miHPOgmnO2QDLwp70zJH2b 1ZaKsGDs0phMhKS6wnW5BH10jD+eeXaYsy2iiwglxnke4C385i/yKVp+gVefAzWOGv3ZTJ FpT9Ev71mC9Xe1YGDCmAF+j69qc5GvHjvFvBdSN36oCco5MBRzjmpbfg5Ru7eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657647340; a=rsa-sha256; cv=none; b=DiqtYWPlIMUWHHt6Y6LDM3RcL9a2T0NLokiKYn1wPtp3cUu/jlA7VFwR6HtzfLfHMYi6uo P/wUI5MAZeXXz2zdv0WP1Xb6qVj5qENuI226O6aeBRG4NQP/xE+iCbPWVWOHhRgsCPaxne 0NPVKcxEobdcVNzdKppzniFBTbWMbl/xFPOWioQcLUquZaY616Am3Yt/mPH/SyKAW1iu5M FQrgW/fwDlP/ypEzRp5MNSX6KOEVMaUSm1K7YXQperBn02V6U1PoDA58ww77GH3lPyQNLQ 8Kiw0Y1G4PUU9ZYj4m40cazZsik6TQQzoqZh6o1UKnKLhF40l0HdylBe7Gzm0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=094bcfa4e15bf2c21e6bd8e9c0bbdb0389beddef commit 094bcfa4e15bf2c21e6bd8e9c0bbdb0389beddef Author: Doug Moore AuthorDate: 2022-07-12 17:33:20 +0000 Commit: Doug Moore CommitDate: 2022-07-12 17:33:20 +0000 mips_busdma: fix mips errors after merge The change "vm_extern: use standard address checkers everywhere" introduced bugs, as well as features, into head. After it was introduced, but before those bugs were addressed, mips support was dropped from head, so those mips bugs were never fixed in head. Now, that change and those fixes have been merged into stable/13. This change fixes two of those bugs that were fixed everywhere else but never in mips. Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D35793 --- sys/mips/mips/busdma_machdep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/mips/mips/busdma_machdep.c b/sys/mips/mips/busdma_machdep.c index 348c1d98c328..f38142e6eecd 100644 --- a/sys/mips/mips/busdma_machdep.c +++ b/sys/mips/mips/busdma_machdep.c @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -888,8 +889,8 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr, if (seg >= 0 && curaddr == segs[seg].ds_addr + segs[seg].ds_len && (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && - vm_addr_bound_ok(segs[seg].ds_addr, segs[seg].ds_len, - dmat->boundary)) + vm_addr_bound_ok(segs[seg].ds_addr, + segs[seg].ds_len + sgsize, dmat->boundary)) segs[seg].ds_len += sgsize; } else { if (++seg >= dmat->nsegments)