From nobody Tue May 02 12:22:06 2023 X-Original-To: dev-commits-src-branches@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 4Q9fMy3gCtz48wkh; Tue, 2 May 2023 12:22:06 +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 4Q9fMy3Fs9z3vZD; Tue, 2 May 2023 12:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683030126; 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=oJpv64Xrstpr5hBfu4kP5YuRnzEU8+78QMI5L2tUiVo=; b=Wh2Te2NGHZX/cHrtrzrZQHf+kldyVK8TGUszp9Fir8FgdVQIpChFG04+aTBtAp/IIavGfY K7Nchs1O2d+mXfsTr2kCtzU8Xs9elwa0XsGebmRWwnxBszgKUF1yiNbPDZRodtZ687OSSq qij00OBPr+yKE1aALNB+84PoplwMAVW14gZTAMoQCzi40Fcc68lQUN6nBZ2mEevGWtL2NR 1iF+rBDngT2ZjTyOIgKyqyhwGx3G80b472n89TDLX5cfqHqxwQYdhjjeFvz+5jRHy3A8HD IGj+/RNWslGo6Vi/VfHnK/TYicpJRcHyd8FV7PhN2WnVW8jczLfTi3DBndyauQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683030126; 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=oJpv64Xrstpr5hBfu4kP5YuRnzEU8+78QMI5L2tUiVo=; b=Rbg2AE3joJ2FPsi32hRSSpT6GNwQ2fXYOhDlQjZ1ww3M6CDv5RVkAly6y6nckFa9gn8Wtw zBrKsgYDhe0Swfe9LSxO5T+HxMha3RiCF3ffb/XJNreY1I9djm4x9hMME93KJ0zisDBA0A Txr0gDAotmhGwxmq4QXbi95jR+fG7UEAI4L+hjkcChzrQ1XNm5gRNbo83PSFs1IBjEOBn5 RS2RBn4urAvDGvjYeafrle1zp5YFIwZUPouYhDRHw/KJL3nzTkBwPP/hs2THLONQ6O/7OH UBZcACNsrqTK4xK5Wl9cC9x1VwVxDw8z074wKvkKwFjB/anbuRlU2x4YAOPl+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683030126; a=rsa-sha256; cv=none; b=cee95fEaGZZ7n9rtB0jsxn5yqH5VOGvrbOAoLDpmx5rub4A9xl6uGaeK8TGl+Nqocltwfv rio2sS8JA/hP7atSxHRF4tHCCu48PHT8kHFmB9nMHesAJvBeCQIK6hKJ9MBhG3/Sjucc52 Hjll6KRQ9z98cwjavNVEulhmbdewCM0kIdA43aQd8mgRco0NhRd1R7hB4/c5zjRMJOTJEf fdPAI9r3w/k04NXTb+X0hmj4kDom9HtWzSqDiMZ1epU+K8dXuj1V5s7bts4vOWR7K9Mxnn XJoNnSeYyQUKA2MI44ELW4q8uuLLj+Fiz+5OIZF4Tjd+CtvtXqdqZsX3vsH59w== 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 4Q9fMy2JxyznJH; Tue, 2 May 2023 12:22:06 +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 342CM6jb073118; Tue, 2 May 2023 12:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342CM68D073117; Tue, 2 May 2023 12:22:06 GMT (envelope-from git) Date: Tue, 2 May 2023 12:22:06 GMT Message-Id: <202305021222.342CM68D073117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: e7a3a08febd0 - stable/13 - mpr: fix copying of event_mask List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e7a3a08febd01c95b74185bb971ec29cca64b8e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=e7a3a08febd01c95b74185bb971ec29cca64b8e1 commit e7a3a08febd01c95b74185bb971ec29cca64b8e1 Author: Mariusz Zaborski AuthorDate: 2023-04-21 07:50:16 +0000 Commit: Mariusz Zaborski CommitDate: 2023-05-02 12:21:35 +0000 mpr: fix copying of event_mask Before the commit 6cc44223cb6717795afdac4348bbe7e2a968a07d the field event_mask was fully copied to the EventMasks field. After this commit the event_mask (uint8_t) is 4 times casted to EventMask (uint32_t). Because of that 24 bits of each event_mask array is lost. This commits brings back simple copying of field, and after words converting 32 bits field to the requested endian. I don't think we need more sophisticated method, as the array is of size 4 (for 32 bits version). Reviewed by: imp MFC after: 1 week Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D39562 (cherry picked from commit ea6597c38c77c7bfaae71259d8636cbb89add6a3) --- sys/dev/mpr/mpr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index 6f54b1f57950..c105174b0e21 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -2764,8 +2764,9 @@ mpr_update_events(struct mpr_softc *sc, struct mpr_event_handle *handle, bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16); } #else + bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask)); for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++) - evtreq->EventMasks[i] = htole32(sc->event_mask[i]); + evtreq->EventMasks[i] = htole32(evtreq->EventMasks[i]); #endif cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; cm->cm_data = NULL; @@ -2819,8 +2820,9 @@ mpr_reregister_events(struct mpr_softc *sc) bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16); } #else + bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, sizeof(sc->event_mask)); for (i = 0; i < MPI2_EVENT_NOTIFY_EVENTMASK_WORDS; i++) - evtreq->EventMasks[i] = htole32(sc->event_mask[i]); + evtreq->EventMasks[i] = htole32(evtreq->EventMasks[i]); #endif cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; cm->cm_data = NULL;