From nobody Mon Oct 03 22:47:15 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 4MhGDg6vB7z4Ty7t; Mon, 3 Oct 2022 22:47:15 +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 4MhGDg6NsTz3Lxh; Mon, 3 Oct 2022 22:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664837235; 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=JKypIdAf7vpq5sorhbk3UUoSq1cfkfKCeICjHK+Ykyk=; b=fqFaG//Fgs3hWvOFnJBbzw7A3kORenPCjtMs0nfYo6tpDk5H2UsvBOsEFHefjufJ+HZW+T genYaq+Eqw2km4ZNyfImvKP4AjCAU2G7t24MxT12SS5/vWtP+olo60BYuSzGfwQspbWAnp jpeAiVN6uiaykFEa96Ca49LmpYImOgSFRpMvql4+3oPTbt5BGzsRo5ZYPwJ3MFx2Ckvb2P TE7GQqJJulGLuGKqAjrrIMnVkQ+dn1M/nX8alwX6pHh2kK9JpxbvAWoakLCC5yBlFGzJIo 4X006oLsXR97RYRybnKnd1cT3Zagedhx87R6bXB+FW4JtyrThi70ThGqtKrn7w== 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 4MhGDg5F4FzMKG; Mon, 3 Oct 2022 22:47:15 +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 293MlFfB028415; Mon, 3 Oct 2022 22:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293MlFvi028414; Mon, 3 Oct 2022 22:47:15 GMT (envelope-from git) Date: Mon, 3 Oct 2022 22:47:15 GMT Message-Id: <202210032247.293MlFvi028414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: 603bbd771f0c - stable/13 - busdma: Fix powerpc DMA alignment check 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: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 603bbd771f0cbebaf8d94ab474643112448763eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664837235; 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=JKypIdAf7vpq5sorhbk3UUoSq1cfkfKCeICjHK+Ykyk=; b=CWVYljHPqbsg9igMJsnjD52M4XZZiTZV4Vh2vGSKvZnr9RMqNnEKyCbP63+AC7tT7otzyi AFDoE3I9f0cOw7/2e4/dw6IfjjkP26/FvsPubnMa67OZyioBdskdYwfPlAqR+3ukMm3ZBv bW0MxmQT8YQ0y+wAvAO+UWjXlwTX97A9ZUp5MPHLRZIy3Bln8VnH4Je/9tqRGVKlSy3bKy NvKxnFz06GxkRf7ZBIii6cYvL5BXfS2B4wkcbnG9sZ17nNBTMRNy7qaGQ2PE6fwn1wOQC/ 5WrNj+5HexCAzdxnPf20LpYfOF7lUiv/TCx/OkM3h95JrSD8TujX/HgYYukzkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664837235; a=rsa-sha256; cv=none; b=yTb/49XZwSVHQ+zzbXR/JVHj5ui9a9TSSeGzVWuajUkCgpVL9QB5x/cwKrMF6kXRXTaaz2 FnK4qDcJw7PrdjO+3n0sSnNj8l5j5ub8ZDmGvwBI975Q+BW/3mC1hKws+WBTwW6TXaMwh9 tfCsDwmZ8nqLZoq64c3q6yPEc/vR8PEIck5YwIdqIEq7IATEGyAqPs39WsNcUd8PNsy8gH 4W7NltitckA36K6lLnhcdueoGBDHj8hlvLlGHRQCDjJHsQFnTXHREYoq2RaV6AM/mbnKXg V934A/fDkmrKWcTbOxylTIBi1NL9HFj3PCTCIaR+kBOfHOVL/vkq6gtnPnPniQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=603bbd771f0cbebaf8d94ab474643112448763eb commit 603bbd771f0cbebaf8d94ab474643112448763eb Author: Justin Hibbits AuthorDate: 2022-01-04 15:22:04 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2022-10-04 01:46:24 +0000 busdma: Fix powerpc DMA alignment check The original logic was to check if there's no filter and the address is misaligned relative to the requirements. The refactoring in c606ab59e7f9423f7027320e9a4514c7db39658d missed this, and instead caused it to return failure if the address *is* properly aligned. (cherry picked from commit 3a9688f8bc488b16bf5676057fa86263554312b0) --- sys/powerpc/powerpc/busdma_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c index f75d3e1efcf9..95eb98a5cbab 100644 --- a/sys/powerpc/powerpc/busdma_machdep.c +++ b/sys/powerpc/powerpc/busdma_machdep.c @@ -172,7 +172,7 @@ run_filter(bus_dma_tag_t dmat, bus_addr_t paddr) paddr > dmat->lowaddr && paddr <= dmat->highaddr) retval = 1; if (dmat->filter == NULL && - vm_addr_align_ok(paddr, dmat->alignment)) + !vm_addr_align_ok(paddr, dmat->alignment)) retval = 1; if (dmat->filter != NULL && (*dmat->filter)(dmat->filterarg, paddr) != 0)