From nobody Thu Jan 26 18:35:27 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 4P2qC33wJxz3bLvV; Thu, 26 Jan 2023 18:35:27 +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 4P2qC32QyJz43J5; Thu, 26 Jan 2023 18:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674758127; 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=Lk8+YR/SsXYnsNdAQ4eGw4XnGJCHKlpkOjOMJ7qeD9o=; b=JrxduG9S5+XZqGhc7/WTuWD3bcyyrXsYM3gjOJ35I8KCjg010vsi2HAAu/CW5Dodyd5HQU M3mZ+ouID2cxgBpaFNQRHtTb6J6qHmkXBIpgq6zNIJSzTMsmgZ4UnBAEGktcltNKe0D7Yg LLFrooAc95rMYHJidc5DjxSrcYNvv2dQ9Oy4g7Ppo97SDcwQkEAcNVl2NhTpOcVt1UPYj8 foiHWQ0r/GAdQZI3acv8PDm7DuuoBVfupBgxcmAsaL7b2rPI9kq/PuTgLXxnK63UyMuLrY Hq+REyK1S+DglgCiXkSgMp3xnKsUJVQUIX9lwM+PTYnaJwTJ1sEFRlixn9p4+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674758127; 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=Lk8+YR/SsXYnsNdAQ4eGw4XnGJCHKlpkOjOMJ7qeD9o=; b=pqG3oTS9a8kTbH0DaeOutJbQ0eTa1d0j30MotJ1URfCurZ+Ryu7IvjubiwaZe3pVbseAVg xBu0RFjDjFkc+Rr/8PlrasEoqyG2Sbzs4FNXkUKiD51xtQzafoj4535cfr49ruF8JMltCV qk6YwPyRQddWgR/69/wtUjCzlSP63MySnB2houE318T0hGYH95q+ecEVmDR3pLlsgQLH/Q t2KEmdnOfZMiUh6ffhNzWJ7pZWApVsi6e3IAqwqUvAGjPDBcYTUp/UGkQGQMftxOakvTRd fbzYfH3rb63maPuPmQDC6FELUZTwzKLJ05h8dMINFYqGMSvYBHKggd1thl4JtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674758127; a=rsa-sha256; cv=none; b=lYLWEKqHQdYeH1yT1l4/fIBC4Ey9jPBFV5/L9oXgalsdq3JZFo4XTEoN3p1vCxNwzOsIoR ql1Bqw/9+kvoA/ivjeG0UBK/31Jr47e5XTFAjpDGNEMP72XF0tz4DcGLvz67Nd1WnMHCJn 1oKo0vfxL4kchxFwQLVnQ15PzIEv9izN9EU/iIoSuoGsXZvttAKuVP5UAPTX8CQMrGz9SB vRq6U5Jd3wHf5WLPepPi1czLpRqGgSnCsiTai580PuzLOaQHSeMjI+xYqAHoxfFM8H0xzf kU4U4BOf68y/u4J2Kcrpcac0H0qwKH1PqLwwyqRQjOqBB5uxKagcH1OXltBWIQ== 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 4P2qC31PHPzg4Z; Thu, 26 Jan 2023 18:35:27 +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 30QIZRin005586; Thu, 26 Jan 2023 18:35:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QIZRmY005585; Thu, 26 Jan 2023 18:35:27 GMT (envelope-from git) Date: Thu, 26 Jan 2023 18:35:27 GMT Message-Id: <202301261835.30QIZRmY005585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0e622d39414a - stable/13 - bhyve/vioapic: remove an extra pin masked check 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e622d39414a3cad33a6e1fb254a1537b0cc91bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e622d39414a3cad33a6e1fb254a1537b0cc91bf commit 0e622d39414a3cad33a6e1fb254a1537b0cc91bf Author: Roger Pau Monné AuthorDate: 2021-01-19 11:52:44 +0000 Commit: John Baldwin CommitDate: 2023-01-26 18:32:36 +0000 bhyve/vioapic: remove an extra pin masked check vioapic_send_intr does already check whether the pin is masked before injecting the interrupt, there's no need to do it in vioapic_write also. No functional change intended. Reviewed by: grehan Differential revision: https://reviews.freebsd.org/D28236 (cherry picked from commit 49429cf9be7f43c37723175f90c56b29e29d1680) --- sys/amd64/vmm/io/vioapic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c index a8117da4b879..682e862da63e 100644 --- a/sys/amd64/vmm/io/vioapic.c +++ b/sys/amd64/vmm/io/vioapic.c @@ -363,12 +363,10 @@ vioapic_write(struct vioapic *vioapic, int vcpuid, uint32_t addr, uint32_t data) /* * Generate an interrupt if the following conditions are met: - * - pin is not masked * - previous interrupt has been EOIed * - pin level is asserted */ - if ((vioapic->rtbl[pin].reg & IOART_INTMASK) == IOART_INTMCLR && - (vioapic->rtbl[pin].reg & IOART_REM_IRR) == 0 && + if ((vioapic->rtbl[pin].reg & IOART_REM_IRR) == 0 && (vioapic->rtbl[pin].acnt > 0)) { VIOAPIC_CTR2(vioapic, "ioapic pin%d: asserted at rtbl " "write, acnt %d", pin, vioapic->rtbl[pin].acnt);