From nobody Thu Jan 18 17:22:05 2024 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 4TG8gd5JRmz56XDM; Thu, 18 Jan 2024 17:22:05 +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 4TG8gd4tJhz44hT; Thu, 18 Jan 2024 17:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705598525; 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=iOtJnajzQO4E9PH2V5Z1xh/ZQFbw3/aWpo9G3hJAkz8=; b=iY7/vavKHilcBoZB8HyAIpxxxAQv4LTMhli5H0NpGrCrfL8nv0tk3Lj18ftF3QhgYiOIR9 42cD4IQ6bXedSEaZQKeOZNuMtWW1ao0fiu/KwVeRdplU6wwZ3E94Aoiv6EuSXyugNEvpK6 sT4DpX6Lz2QIKUQb5DKhYCBc7g8XqCJJWoIYvjQDDFuKcF/CM1z89Ou4kGY42TO2Lwm5KP 12YBpFO9SG7cwFkehqLW68Dqu7usRRNfNV7J1v7kkjNZd1k69/WN0XucfkjxDKlLsIcuf3 0/BrHAmaqZDfYbxV59MkKI2syhC5aRqesRS1tJy/dJwobNWJkHRDzL58PH/TVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705598525; 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=iOtJnajzQO4E9PH2V5Z1xh/ZQFbw3/aWpo9G3hJAkz8=; b=foTUFM8DkdwrCPObn+MEuk20znqINmPRk0IIBexkL0hYs7V3H2Py4OXVAdnsCLQtQoO+kG NggCCxlwqrD5AOxvUppAsXKdWKEUYz61ouvNTkpebzevHy+tSvA1PNdzSBdJeSTuLQJ8al s5pX3UDoNhe5EUF0b7HEgcDz89IAzVJoQo94dRt/Rcf7H1Nj2cId4amF3HqqzurqCv5rWF aST7Z9yXV924ocn7JPJXQWUod7w/z1RVug7/yXIUflDN1WhoFJkP2OFCo0Bn13owCaeN7A SYnLU99F8Cf23ZQm5rikWfYkhK4cbrbmkQazM1gaKCOyZkf1WyusvUbc1m335A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705598525; a=rsa-sha256; cv=none; b=wC8WSdN5YqHPRpkbNhrKGxFjr2VSf3YUomJw65z3C9l25qH83yu0jn1I7nSK5Hz0cbA0I8 IVTfqLgtxj61KgIxVAUvmjR6KqnSogTiFp2cmS8d4chL0xDH+7N7fv3pBnSGgyeCKTa3mh EVgRo28wkWTaKCfzfTvTBpUouOh4uESl11zJcoY2NFEbxLN32r9geDReyafCCjM3rz3/5L VV/A34eggBNhXzQdEBZJPsF1LRg+R9+o/dnBIUEUCD8lFYJaSa1FN14arG0ni5+etyQ2qJ QTfGpJNKDGpE5YyZw0K1+k/eZyOI2/NnQEEVOfGGimUsBXqLbCFamR2u67ZoUQ== 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 4TG8gd3hnvzGSP; Thu, 18 Jan 2024 17:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40IHM5N5078735; Thu, 18 Jan 2024 17:22:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IHM52I078733; Thu, 18 Jan 2024 17:22:05 GMT (envelope-from git) Date: Thu, 18 Jan 2024 17:22:05 GMT Message-Id: <202401181722.40IHM52I078733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: a2544cc8243f - main - Revert "arm64: fix db_read_bytes() for size == 8" 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2544cc8243f4136a912e08dbe86d8590d25a53d Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a2544cc8243f4136a912e08dbe86d8590d25a53d commit a2544cc8243f4136a912e08dbe86d8590d25a53d Author: Mitchell Horne AuthorDate: 2024-01-18 17:20:03 +0000 Commit: Mitchell Horne CommitDate: 2024-01-18 17:20:03 +0000 Revert "arm64: fix db_read_bytes() for size == 8" I forgot to include the phabricator link in the commit message. This reverts commit 2e297cbb4fc057e1872114ef8a37a41a6669dd5b. --- sys/arm64/arm64/db_interface.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/arm64/arm64/db_interface.c b/sys/arm64/arm64/db_interface.c index 0b1c58ca88a0..8d97ab46a837 100644 --- a/sys/arm64/arm64/db_interface.c +++ b/sys/arm64/arm64/db_interface.c @@ -124,20 +124,14 @@ db_read_bytes(vm_offset_t addr, size_t size, char *data) if (ret == 0) { src = (const char *)addr; - - /* - * Perform a native-sized memory access, if possible. This - * enables reading from MMIO devices that don't support single - * byte access. - */ if (size == 8 && (addr & 7) == 0) { - tmp64 = *((const uint64_t *)src); + tmp64 = *((const int *)src); src = (const char *)&tmp64; } else if (size == 4 && (addr & 3) == 0) { - tmp32 = *((const uint32_t *)src); + tmp32 = *((const int *)src); src = (const char *)&tmp32; } else if (size == 2 && (addr & 1) == 0) { - tmp16 = *((const uint16_t *)src); + tmp16 = *((const short *)src); src = (const char *)&tmp16; } while (size-- > 0)