From nobody Mon Jan 03 17:10:33 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 53C101934E5A; Mon, 3 Jan 2022 17:10:34 +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 4JSMh95jzzz4knp; Mon, 3 Jan 2022 17:10:33 +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 90AEADC6; Mon, 3 Jan 2022 17:10:33 +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 203HAXZx028512; Mon, 3 Jan 2022 17:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203HAXQs028511; Mon, 3 Jan 2022 17:10:33 GMT (envelope-from git) Date: Mon, 3 Jan 2022 17:10:33 GMT Message-Id: <202201031710.203HAXQs028511@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3582b9e372c2 - main - arm64: Check for intrng-reported errors in gicv3_its 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3582b9e372c2556adc0fcc42466ead8b2bda7850 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641229834; 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=8M+b55z6XSXYTWkSuREfwBcDVvSKTf90KgG3GDJYTUc=; b=T32HDw386eN7aEoIGFevdXzqGM5sKP+28PZzBoOhEPHoAp3j0mfL2d4XYTuCmhutXZ55zn MnwB9utX7qc4KlipCDV3PH8vNkF5tNIFYUwbxJud5zxadMLdWvo74aGCB7BL7oqO0T/v6e OyTis/z1ioiRW1/LPTltj7dNAVQqpUrBUlNOGmPf9O8k43SZeyjROri7jOtwzBNkU8h3Wc gfR31xs5pH1m5NXPNADoMe0MHUTrbIGmjYczbKZI/MPvPod81dicU1NHL9K0NO+JX+dR9l 1iHRJ4yRWy8xAwstNwm6FP7TF9RjKFEgrbmyoha9EKaUb/M5l/uhVMPilF6/Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641229834; a=rsa-sha256; cv=none; b=WFNAEPswQ9aJDfXgNvOnwvpeCP5Lqm12u4Rxj/t5GJGgkVD9tNCcIO9mpG951OH9cnr0UG J/BRrJf23450E/WCOlZYF83hLsWFDSFU+gpRGa7A/ditWfW2YRI+cYHEQb/aY/Nv+tZpi0 jbnMtfdRXXTdWQv1sRmGVBWJd5qgI5UjN4ZcYK/f1KHPuonM4fdtejCbzCArP2H8zxS+N7 z/Gc+5UG3iSanhA+60uJROVyGvG7wYeuTi0Tjhm0ONycprTADP4gPeFItgBQxzVM2P5KcL Y6Hm1Q3DYNGOeewFkmBj8lx2aHU+b5cGf0oIppGMNI77BjPDY7gHnNs2pUPldw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3582b9e372c2556adc0fcc42466ead8b2bda7850 commit 3582b9e372c2556adc0fcc42466ead8b2bda7850 Author: Jessica Clarke AuthorDate: 2022-01-03 17:09:42 +0000 Commit: Jessica Clarke CommitDate: 2022-01-03 17:09:42 +0000 arm64: Check for intrng-reported errors in gicv3_its Currently, any errors when adding a PIC child handler are ignored, instead just continuing on to registering that PIC as an MSI, and ignoring any errors that occur for that too. Reviewed by: andrew MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D33342 --- sys/arm64/arm64/gicv3_its.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 516cfbd9e358..2388aeb55f8c 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -1956,11 +1956,19 @@ gicv3_its_fdt_attach(device_t dev) /* Register this device as a interrupt controller */ xref = OF_xref_from_node(ofw_bus_get_node(dev)); sc->sc_pic = intr_pic_register(dev, xref); - intr_pic_add_handler(device_get_parent(dev), sc->sc_pic, + err = intr_pic_add_handler(device_get_parent(dev), sc->sc_pic, gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length); + if (err != 0) { + device_printf(dev, "Failed to add PIC handler: %d\n", err); + return (err); + } /* Register this device to handle MSI interrupts */ - intr_msi_register(dev, xref); + err = intr_msi_register(dev, xref); + if (err != 0) { + device_printf(dev, "Failed to register for MSIs: %d\n", err); + return (err); + } return (0); } @@ -2017,11 +2025,19 @@ gicv3_its_acpi_attach(device_t dev) di = device_get_ivars(dev); sc->sc_pic = intr_pic_register(dev, di->msi_xref); - intr_pic_add_handler(device_get_parent(dev), sc->sc_pic, + err = intr_pic_add_handler(device_get_parent(dev), sc->sc_pic, gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length); + if (err != 0) { + device_printf(dev, "Failed to add PIC handler: %d\n", err); + return (err); + } /* Register this device to handle MSI interrupts */ - intr_msi_register(dev, di->msi_xref); + err = intr_msi_register(dev, di->msi_xref); + if (err != 0) { + device_printf(dev, "Failed to register for MSIs: %d\n", err); + return (err); + } return (0); }