From nobody Mon Mar 07 16:46:15 2022 X-Original-To: dev-commits-src-main@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 7DE781A06595; Mon, 7 Mar 2022 16:46:17 +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 4KC4943pXrz4k2G; Mon, 7 Mar 2022 16:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646671577; 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=IfGsXzc4u4zxp9WNaLQu/+2vNxLdp1jMuaFCjAuaxFE=; b=VJpiv+WT+0mXobQTMp7jboksLkFUUBGaUX8jXIgqXjjMWuDVLQNvPiJ7iG54Ls1WUWMfV3 AuoYcUM8ylSumCzICm/u3hRAPCu2ZbZFHY5YHG/o+fnYaAhxAgc1wNSRGOpqQWXpE8G+vt Aw3jRCpPWOZ8h7qnj6A+DAr81o3IVbwHrn5A14c8RY4inzn8gaxRUs83FAaZib39Pz9wAo Jx2icZRxDq3uZh5ls+if5oOyrAXQuEKZqKfQLmPXL1VLYtuhFoSoXS18OgdYbirdf7vPiZ YV7DRKPGW61t/C0HEBNmPXTPw4rqKKpGsfNA5QrK+N1lDeXO4yz7KcgK3BzheQ== 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 D84903B2D; Mon, 7 Mar 2022 16:46: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 227GkFML030829; Mon, 7 Mar 2022 16:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227GkF9G030828; Mon, 7 Mar 2022 16:46:15 GMT (envelope-from git) Date: Mon, 7 Mar 2022 16:46:15 GMT Message-Id: <202203071646.227GkF9G030828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: 016f965722c6 - main - Revert "sdhci: extend bus_dma_tag boundary to 64-bit space" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 016f965722c67551af444dd7fd6207568d85c076 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646671577; 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=IfGsXzc4u4zxp9WNaLQu/+2vNxLdp1jMuaFCjAuaxFE=; b=Wt188mIXGqAx9yPD7P+tb9q4FI0lE3dVgZe4shq/LeAhDbHw9MnHn93/b0E+paGFyAQzyD o10a590rFwCPICcyiujiBXGVeaCWWr1Wh33LeI7xOp6Uj52kjEg7scrJqflZoGjyjOhhFp 0+0p2FyY9JtHmc4NrM6DyPwBtHNw9A1YRCOaTRu9QDqIUgH4eaWPIIxH0ZNbxWDWawdLQz uzkVXnrDqzAjyePvaDEdCo+6UG7II2SZggjQ7RfW0mVNYs9kFLaEmhDw+mqPPD6wbXyDmk 7aIQ7R98VLD6V9fosws7jkLKjNkLXQdn3l4kEHPKNLE/VR2fEINfg4moKawnLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646671577; a=rsa-sha256; cv=none; b=ISlP3qbswILeQPz6Nxe20ie76XDRpoB1hs/qXnoTbWu88Z1Ve/FVbHwET7MVp6ManxQGEr jb/Jz9x8BFRHHAph9NUIeh49LMyDlBUuTF93cVmdA0kPXrZwzdQzP22/lmoCA2eG+DjTCq MXZ0MX/Qlq2K1jEl+fAJVllfOCiQdbgNTp2hahD1GG5n18qfT4QbmVkvtIeHo/NUDCu8M6 yF3aYJBjuXMiqw02Lgj0fMUsAvZIHBa7elX+EDwYzT95CcswZA+QhvDRdMOBvFHDr0CqYK 6UKoR6iWmO4Qxmc1zsvjyDRRo8lvutHlbOxAsgpsYsyLtIrlXp25qYPVw5solQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=016f965722c67551af444dd7fd6207568d85c076 commit 016f965722c67551af444dd7fd6207568d85c076 Author: Marcin Wojtas AuthorDate: 2022-03-07 16:40:51 +0000 Commit: Marcin Wojtas CommitDate: 2022-03-07 16:45:59 +0000 Revert "sdhci: extend bus_dma_tag boundary to 64-bit space" This reverts commit 7d8700bc291b4b3be1a592cae539f9e682592d9d. Reason for revert: the patch is incomplete. 64-bit operation is supported fully in SDHCI v4.0, v3.0 does it only for ADMA mode. This differentiation is missing and should be taken into consideration in case the reverted code is re-introduced. Reported by: mmel --- sys/dev/sdhci/sdhci.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 541310ba421c..0438e6afc8d9 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -132,7 +132,7 @@ static int sdhci_cam_update_ios(struct sdhci_slot *slot); #endif /* helper routines */ -static int sdhci_dma_alloc(struct sdhci_slot *slot, uint32_t caps); +static int sdhci_dma_alloc(struct sdhci_slot *slot); static void sdhci_dma_free(struct sdhci_slot *slot); static void sdhci_dumpcaps(struct sdhci_slot *slot); static void sdhci_dumpcaps_buf(struct sdhci_slot *slot, struct sbuf *s); @@ -788,7 +788,7 @@ sdhci_card_poll(void *arg) } static int -sdhci_dma_alloc(struct sdhci_slot *slot, uint32_t caps) +sdhci_dma_alloc(struct sdhci_slot *slot) { int err; @@ -821,8 +821,7 @@ sdhci_dma_alloc(struct sdhci_slot *slot, uint32_t caps) * be aligned to the SDMA boundary. */ err = bus_dma_tag_create(bus_get_dma_tag(slot->bus), slot->sdma_bbufsz, - 0, (caps & SDHCI_CAN_DO_64BIT) ? BUS_SPACE_MAXADDR : - BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, + 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, slot->sdma_bbufsz, 1, slot->sdma_bbufsz, BUS_DMA_ALLOCNOW, NULL, NULL, &slot->dmatag); if (err != 0) { @@ -1107,7 +1106,7 @@ no_tuning: slot->opt &= ~SDHCI_HAVE_DMA; if (slot->opt & SDHCI_HAVE_DMA) { - err = sdhci_dma_alloc(slot, caps); + err = sdhci_dma_alloc(slot); if (err != 0) { if (slot->opt & SDHCI_TUNING_SUPPORTED) { free(slot->tune_req, M_DEVBUF);