From nobody Wed Oct 05 23:48:30 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 4MjWVQ4LTDz4TyB3; Wed, 5 Oct 2022 23:48:30 +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 4MjWVQ3r0nz3RMh; Wed, 5 Oct 2022 23:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665013710; 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=9yMPNQltulI399UlKTlknRjaHCrkkK7orhx/HwL+Li4=; b=aY9PEZC9cNETaLXlvcDsuILlarkD38b2xZSeUSVxqx3Y0Ievm6QfEaayqsqolgsI4QJbhf HPF50H2nswwlvR0u6fJxBN3W4XdAGxoTpJ6+epYZ42CnisSsbWIBPXE0LuqJ462+X6Z8XL DhOUnNjC91Q6cyZCCE0eu4LpJj0oyIeI4/5TTSycLMyHqqvT9XQ0ZcTrpvsjjXDZXZ1N+x W+GV1l/XRmmmGzIkoyazXYB8PqU3VGpqv+H8A49XteZgFWmL2F/rsIGMJeYl3fsg8ybzTX 1ooLpb60J57yFL2I+Jbl8GrfRm6gAWoxZUgRwfb/qxOxbpm3+qXUmzeGwp+KGQ== 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 4MjWVQ2CYPz13r3; Wed, 5 Oct 2022 23:48:30 +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 295NmUGN087230; Wed, 5 Oct 2022 23:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295NmUmU087229; Wed, 5 Oct 2022 23:48:30 GMT (envelope-from git) Date: Wed, 5 Oct 2022 23:48:30 GMT Message-Id: <202210052348.295NmUmU087229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ae70e8838c66 - main - msk: Use a void cast to mark values of dummy reads as unused. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae70e8838c6673850098530f23ce1521328f983c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665013710; 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=9yMPNQltulI399UlKTlknRjaHCrkkK7orhx/HwL+Li4=; b=THm4w0AFbagQPd0bJt/+CmM6LIpfcRzkwUBMIasyOXRmcirkgY+eoMvS8T2smWgM1QnnQV zfIAGeT3xd7+t+N1tYbfBmnG/UT8Esn+EViYXtVO9eX1qwSKFDyHeAzj2TAP0qCTAbqviH Dkf/gyYdBXeKtFUjpFoPX4jON5IfDZmdh4SQxOLx38IUtwAuBsunacrJAKOno7tVCTs4Ew QmL/f96QzxmbS57LFTb3MjCSPxcT/b3M96l2HHF4X43sQn209pqlq3iDsJYoDVDr2Mx9vv Sfyyoalj5VZa9Kff2ialaX4G1uoDOnaLZwwoQk2RzIfUTv3n4O3FFeXpSlejXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665013710; a=rsa-sha256; cv=none; b=fp1wisqJ47J2MUajxkfyhUoM6YM6/7OJCBV10jnCr9MqRDNCP4KLABSAeCZuW/IfXwbsZ9 IjrSe7nhfzsM46AZyxWkhpQ8E8ROmqq2euOH+QWIIYE14UgFagElWDFijt91YAcyrU3zpy cpCWIYFdejywZ0DiAZFhyf3tgFQFQakwWvjiOUkoFsHuXJ9JIoNwARAEnYNGyr4yJppW3n X8DPbKLjZDa1hEsqufz88RkrY7FlUFQZmYCBc6VNPFNBFCI6kBW1qahov31PC3X1f9X3M9 pddi5P+rmrUYWTbbuGUW6Tbhx9XOxQeu1rkeV2cebCA2w9wnX7T3Q35C2m52Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ae70e8838c6673850098530f23ce1521328f983c commit ae70e8838c6673850098530f23ce1521328f983c Author: John Baldwin AuthorDate: 2022-10-05 23:46:01 +0000 Commit: John Baldwin CommitDate: 2022-10-05 23:46:01 +0000 msk: Use a void cast to mark values of dummy reads as unused. Note that this required adding missing ()'s around the outermost level of MSK_READ_MIB*. Otherwise, the void cast was only applied to the first register read. This also meant that MSK_READ_MIB64 was pretty broken as the uint64_t cast only applied to the first 16-bit register read in each MSK_READ_MIB32 invocation and the 32-bit shift was only applied to the second register read of the pair. Reviewed by: imp, emaste Reported by: GCC -Wunused-value Differential Revision: https://reviews.freebsd.org/D36777 --- sys/dev/msk/if_msk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index 15b9131a2c79..7277a8407fcc 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -4297,11 +4297,11 @@ msk_stop(struct msk_if_softc *sc_if) * lower 16 bits should be the last operation. */ #define MSK_READ_MIB32(x, y) \ - (((uint32_t)GMAC_READ_2(sc, x, (y) + 4)) << 16) + \ - (uint32_t)GMAC_READ_2(sc, x, y) + ((((uint32_t)GMAC_READ_2(sc, x, (y) + 4)) << 16) + \ + (uint32_t)GMAC_READ_2(sc, x, y)) #define MSK_READ_MIB64(x, y) \ - (((uint64_t)MSK_READ_MIB32(x, (y) + 8)) << 32) + \ - (uint64_t)MSK_READ_MIB32(x, y) + ((((uint64_t)MSK_READ_MIB32(x, (y) + 8)) << 32) + \ + (uint64_t)MSK_READ_MIB32(x, y)) static void msk_stats_clear(struct msk_if_softc *sc_if) @@ -4318,7 +4318,7 @@ msk_stats_clear(struct msk_if_softc *sc_if) GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac | GM_PAR_MIB_CLR); /* Read all MIB Counters with Clear Mode set. */ for (i = GM_RXF_UC_OK; i <= GM_TXE_FIFO_UR; i += sizeof(uint32_t)) - MSK_READ_MIB32(sc_if->msk_port, i); + (void)MSK_READ_MIB32(sc_if->msk_port, i); /* Clear MIB Clear Counter Mode. */ gmac &= ~GM_PAR_MIB_CLR; GMAC_WRITE_2(sc, sc_if->msk_port, GM_PHY_ADDR, gmac);