From owner-dev-commits-src-all@freebsd.org Tue Sep 14 19:11:54 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA0C866F1A1; Tue, 14 Sep 2021 19:11:54 +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 4H8CdQ32vqz4bRh; Tue, 14 Sep 2021 19:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3D2ED20412; Tue, 14 Sep 2021 19:11:54 +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 18EJBsvF022641; Tue, 14 Sep 2021 19:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18EJBsMj022640; Tue, 14 Sep 2021 19:11:54 GMT (envelope-from git) Date: Tue, 14 Sep 2021 19:11:54 GMT Message-Id: <202109141911.18EJBsMj022640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 90f33f34bace - main - Remove a bogus assertion from the gic drivers MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90f33f34baceab33046ee8401153aaafd164bb48 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2021 19:11:54 -0000 The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=90f33f34baceab33046ee8401153aaafd164bb48 commit 90f33f34baceab33046ee8401153aaafd164bb48 Author: Andrew Turner AuthorDate: 2021-09-14 19:03:30 +0000 Commit: Andrew Turner CommitDate: 2021-09-14 19:06:25 +0000 Remove a bogus assertion from the gic drivers When setting a message based interrupt range we set the base and count. In an earlier the count was implemented as an end value, however the asserts used to check this value was correct were incorrectly left in. Reported by: emaste Sponsored by: The FreeBSD Foundation --- sys/arm/arm/gic.c | 2 -- sys/arm64/arm64/gic_v3.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c index bd34e92b9e28..d7edd7885404 100644 --- a/sys/arm/arm/gic.c +++ b/sys/arm/arm/gic.c @@ -538,8 +538,6 @@ arm_gic_write_ivar(device_t dev, device_t child, int which, uintptr_t value) case GIC_IVAR_MBI_COUNT: MPASS(sc->sc_spi_start != 0); MPASS(sc->sc_spi_count == 0); - MPASS(value >= sc->sc_spi_start); - MPASS(value >= GIC_FIRST_SPI); sc->sc_spi_count = value; sc->sc_spi_end = sc->sc_spi_start + sc->sc_spi_count; diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index a53d0b272723..23e1b3632fb8 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -506,8 +506,6 @@ gic_v3_write_ivar(device_t dev, device_t child, int which, uintptr_t value) case GIC_IVAR_MBI_COUNT: MPASS(sc->gic_mbi_start != 0); MPASS(sc->gic_mbi_end == 0); - MPASS(value >= sc->gic_mbi_start); - MPASS(value >= GIC_FIRST_SPI); sc->gic_mbi_end = value - sc->gic_mbi_start;