From nobody Tue Jun 07 14:23:36 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 A67367CB1D0; Tue, 7 Jun 2022 14:23:37 +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 4LHXf10p5Wz3r8d; Tue, 7 Jun 2022 14:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654611817; 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=Oah+pxHicE83Eq7TxKk6Zkl8iq+gae7t3E7wJt2Pux0=; b=uXtp2Hgungpfa4PM1r7WZLof1gsuvTMJV6FjI/bVmaTGa8tfPbS3tUw5CbaviNq3Bj3gzx Gm3iFVmTrjTbNNKAMl+7uCdx2rBCMD1BATxLKQ9NqaI2EX/7f1+pK6PM5B8SP8JXHLV2L6 bTelhnUkGxEExt2Wy3Noux7jpIfrAjFgFEMhMTn/ytlZT2IFoB1FwkGXFSzV21jXmRuM3e +5Rr6qrDqGIinTFq4UWaNr7vOsg6hSdMsQ96Zn27sXkXsjaPOEme6/dtCfTHW+lEqWfAVI gFfJXbAcGjZ4e6nA5p8XOXVXMa8dZoBoSnblfRR/7jS+woK0tVMnSCX6jl9rMQ== 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 D8F991C8B9; Tue, 7 Jun 2022 14:23:36 +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 257ENaZs020458; Tue, 7 Jun 2022 14:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 257ENaF2020457; Tue, 7 Jun 2022 14:23:36 GMT (envelope-from git) Date: Tue, 7 Jun 2022 14:23:36 GMT Message-Id: <202206071423.257ENaF2020457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 35da4b4f2c5e - stable/13 - Use the error given in the bcm PCI driver 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 35da4b4f2c5e1572067bcb85206b808ec2700cdd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654611817; 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=Oah+pxHicE83Eq7TxKk6Zkl8iq+gae7t3E7wJt2Pux0=; b=qVZEGuGTrw3IfEvD64TrIilFWC+p4HqrgXHXukWAbJqKkrNchAvj6YHOhVGpbaTIdUILf3 7mCmfx4MY1QUrZW1rwaJGJJrn78UpeKG1g8l+m4MLWaKrTApc8xacvihFKxM9Yv8TulLoM /26jistCwbJ5cj165QfMxK309W3UZHcK7+SVSEfXfOEhHSZn7G2l+X4N4on0SbDDMllzIh zSwV9gi81BNXuBTaHGJy7Y1QlK+fhi7YggRgv1NByQ5VvUga+A29hz4FS774kSUv7EwYaX UQB+Wb3wkA4Q84h95A7KEC1vzpMVSr7mEDXlIJgs5JvVkGEr32vGQEl0slWdGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654611817; a=rsa-sha256; cv=none; b=LqXjvX2Bwj15uhf0DG5PmLZNfXebqfioLHr78PfmPHdm/05qQDKCkOUABHR0fF/RibE7fr GUZDiM+4Ib35WYpczHyEP0vYzMDiGzu6TvjeFNHUj/PigxejvZVN5mOEEHpkytVZFHTEij L1t12I6y64BSiXf8AHkmW9rhBD4cwJ+JTsLbkYU69BxTw2jiQ+bBK+SxXFEAxp3HNVyEvU QQ4NFe1GzKtld6XpXHScCLe/h6qmboV/8hXPsyANv062UHTlXoBF0WmwzSnhj4R4n1jD6G lBTxp85RSlFKBTnijajotKHn/IO7DY/IefmbhHCoR0zr1wRzCr2HqP9IEH37Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=35da4b4f2c5e1572067bcb85206b808ec2700cdd commit 35da4b4f2c5e1572067bcb85206b808ec2700cdd Author: Andrew Turner AuthorDate: 2022-05-23 17:21:40 +0000 Commit: Andrew Turner CommitDate: 2022-06-07 14:20:18 +0000 Use the error given in the bcm PCI driver When given an error return it and not just ENXIO as it may contain information usefule to debug an error. Sponsored by: The FreeBSD Foundation (cherry picked from commit 5749fdc53517179d9922235c9a1b5e99c6ac3abc) --- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c index 0347a61b3c62..69c8a3e7f147 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c @@ -536,7 +536,7 @@ bcm_pcib_msi_attach(device_t dev) INTR_MPSAFE, bcm_pcib_msi_intr, NULL, sc, &sc->msi_intr_cookie); if (error != 0) { device_printf(dev, "error: failed to setup MSI handler.\n"); - return (ENXIO); + return (error); } bcm_name = device_get_nameunit(dev); @@ -547,7 +547,7 @@ bcm_pcib_msi_attach(device_t dev) if (error != 0) { device_printf(dev, "error: failed to register interrupt %d.\n", i); - return (ENXIO); + return (error); } } @@ -557,7 +557,7 @@ bcm_pcib_msi_attach(device_t dev) error = intr_msi_register(dev, xref); if (error != 0) - return (ENXIO); + return (error); mtx_init(&sc->msi_mtx, "bcm_pcib: msi_mtx", NULL, MTX_DEF);