From nobody Wed Apr 06 03:43:01 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 061651A918B9; Wed, 6 Apr 2022 03:43:02 +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 4KY9MT3phbz4sMQ; Wed, 6 Apr 2022 03:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216581; 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=U4SW8rTYigi4kxc4ALMaZc16cTyWiHPbDruUkk405J4=; b=HQdU92E/UrHI+t7qNOKWrcG7VCLtZcDvMxO5MlveNNEl04+2uhviUQfUCuWZ9NzQXyQcXZ g92ZJ2eg3yQt5b1gwH8OrC1XWE94BHQj5YnuoH/oddyH2TmdiWnG6SOxhnywc+lGy8d4Yw O/PUWlTDON9Im9EhlOTgK388Vm0H+xM3ZNsBVRJasRrkvDDTfO6ujSyVQYBUFp2TnA2K4x J0xt3UTX5fpv8dT5MxIN6RFm0Nt9DT+lNu8K1m7FyZP7WH6KncEH4UnDtpFREeOsxy19Ee VfJe6Kw71+MUoJ6BwfeiiTDziCgFa36SfrVH6VNo1iLlqcMjvIrMztBLP6pabQ== 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 23575137FB; Wed, 6 Apr 2022 03:43:01 +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 2363h1Wv089264; Wed, 6 Apr 2022 03:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2363h1nM089263; Wed, 6 Apr 2022 03:43:01 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:43:01 GMT Message-Id: <202204060343.2363h1nM089263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 85ecba9b20c1 - main - mwl: Remove write only variables, but leave hardware reads in place 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85ecba9b20c1bb36a84884d2ad2341fe9b791f43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216581; 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=U4SW8rTYigi4kxc4ALMaZc16cTyWiHPbDruUkk405J4=; b=UmPBAuZMAvL/JSQPMVynlfQW5369KqLxQoN9BA1K3cOl1J5vlD6AWz95mFpaV0iQoKaF1z 5VMPHYZIAZZzGb67iwSE0hUsHEM1s0Cvtg2jqb/02/7d/2ZDT4It0YJ0vwaP1wmeNTn3l4 vMwwyym674eMuw2fbRzfuQ1vo7rUw5Ij2Vh1rqbzPd2aT0PYmmKAYRvPRCM99AYABKguER xO+dwBv8Wbfs4MsbYatSx5F9U86Zds9FkYF9f66rbs2ER2HcBctuGXghFrCbKZm4c438U9 8K2/TQ371+NHVXSyp+1leP01ZXKwdQl9Gk6p6+IR97y9QvVVWx+OGi3VjwMXkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649216581; a=rsa-sha256; cv=none; b=x3D0mmfpRVYPugT4fTpnL9Ac3TSGMa1G5MyZjpgNrdEsRHCxJFs8fZfVmTlXFJPwwB9P0w zd3dc42OBSkTVXafH7OkvVKIZjGXlMvW7F56qV9ZMBP1DBxG4xJkGCZF0TzDAeugjLqkFG uG7peTccCpZvGTeyFdgAMUdUkJSmVLoJgjtZYLcQNEfKwLS6M08hEEGJ/0NRAGz1l8481w luBpDpUr+XNy+SZybLQZrSGCywCc6eqMEhYYnJwB4aJOWuMxdxyfaaLntyIBfXdFmVPpZ0 MxBKvNxwNB/Cgt4nrwxE+UkI3INJoKkB/pxIRCl/ZWspScAH+LO1LahvAnNxnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=85ecba9b20c1bb36a84884d2ad2341fe9b791f43 commit 85ecba9b20c1bb36a84884d2ad2341fe9b791f43 Author: Warner Losh AuthorDate: 2022-04-06 02:01:33 +0000 Commit: Warner Losh CommitDate: 2022-04-06 03:42:06 +0000 mwl: Remove write only variables, but leave hardware reads in place Sponsored by: Netflix --- sys/dev/mwl/mwlhal.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/mwl/mwlhal.c b/sys/dev/mwl/mwlhal.c index 4e341f49e85e..682152ff1ae2 100644 --- a/sys/dev/mwl/mwlhal.c +++ b/sys/dev/mwl/mwlhal.c @@ -2345,13 +2345,12 @@ mwl_hal_getdiagstate(struct mwl_hal *mh0, int request, static void mwlSendCmd(struct mwl_hal_priv *mh) { - uint32_t dummy; bus_dmamap_sync(mh->mh_dmat, mh->mh_dmamap, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); WR4(mh, MACREG_REG_GEN_PTR, mh->mh_cmdaddr); - dummy = RD4(mh, MACREG_REG_INT_CODE); + RD4(mh, MACREG_REG_INT_CODE); WR4(mh, MACREG_REG_H2A_INTERRUPT_EVENTS, MACREG_H2ARIC_BIT_DOOR_BELL); } @@ -2446,18 +2445,17 @@ mwlFwReset(struct mwl_hal_priv *mh) static void mwlTriggerPciCmd(struct mwl_hal_priv *mh) { - uint32_t dummy; bus_dmamap_sync(mh->mh_dmat, mh->mh_dmamap, BUS_DMASYNC_PREWRITE); WR4(mh, MACREG_REG_GEN_PTR, mh->mh_cmdaddr); - dummy = RD4(mh, MACREG_REG_INT_CODE); + RD4(mh, MACREG_REG_INT_CODE); WR4(mh, MACREG_REG_INT_CODE, 0x00); - dummy = RD4(mh, MACREG_REG_INT_CODE); + RD4(mh, MACREG_REG_INT_CODE); WR4(mh, MACREG_REG_H2A_INTERRUPT_EVENTS, MACREG_H2ARIC_BIT_DOOR_BELL); - dummy = RD4(mh, MACREG_REG_INT_CODE); + RD4(mh, MACREG_REG_INT_CODE); } static int