From nobody Wed Apr 06 23:46:13 2022 X-Original-To: dev-commits-src-main@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 42E261A839B8; Wed, 6 Apr 2022 23:46:14 +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 4KYh3n2yb4z4Qr1; Wed, 6 Apr 2022 23:46:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288773; 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=yhG5iHWqOHZDEz65gmehxLiMfzujzQgschInGqA7s8Y=; b=usrYXDfwJ3VxIfQ1nhlp0VOCJx/EKVUF3NbN5pF06yl5dqvIEnlRoLwJh3+GCUE/ag3egN cbMVnZgQ7vy7WdLvyyqO2/ERpA0mkGlDv0v6qMwAFLjBSygmGHtTSxVrVtCNz7RgDuFXB7 fl++quW76YAGAmaO4ZcuHYJHmHillUKlbpBzo4Ugar+Hr2DpcQue6Y3BCsRKHheO+a7Dfh DMo4u+F0NJLRYnK3CQWvF3HNk3evla1c1S1lchouH5YcBnBipha9zm2aOrsztdxXLY0MDd F+CjP5hJ+pYozA9V1S6/F6ETXbqF/jHjKFIvMWR3DIR4T4Tooxr2vy9f58qgYg== 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 3419024979; Wed, 6 Apr 2022 23:46:13 +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 236NkD8H008943; Wed, 6 Apr 2022 23:46:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236NkDSb008942; Wed, 6 Apr 2022 23:46:13 GMT (envelope-from git) Date: Wed, 6 Apr 2022 23:46:13 GMT Message-Id: <202204062346.236NkDSb008942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: bbfec32d156c - main - isci: Propagate error from bus_dma_tag_create. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bbfec32d156cec4c004f6f5148a074ba5f0a294d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649288773; 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=yhG5iHWqOHZDEz65gmehxLiMfzujzQgschInGqA7s8Y=; b=PpDziagF6CrOVPBLnEFIg5Jdc5v3QgkVG4dMDek5s74XBC/NZtbu04T6ZG8xUMl80Z5L8L 793n99muxODdSGh54dRY8/ZzcFhAqXeimm1FIx97T2DSy6kQ0KDqvfkuvU+u5DGlSk1dMu 3gDr2GWUGr5XVdsrYhSulk2ny8jHNBfRo27/M40Ty9U7K7u8ByVKQqpz1nQa2HB6FJD8Vh o/tLI196GCnDrIsQ+4fQHRfJMHxF5F2izNcCYd+DVosMhFmh0m56kGPXEe5k3HNhwiZDrJ ttJVCCPgLjpQhXhbW3Jqj6I00Ivsd0dNuNG5riJBmvnvuctWRr/D3uKuAHLHAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649288773; a=rsa-sha256; cv=none; b=UnOusQ2LuxvMkL8fBpYqkDs/wRKJoE3TmGj393mIoX3Vm3xqywkPP9v2yyNf+ymdMrKlJJ y+DjnNLs7f1u1dj8R/vUhmx/nMMkMGkxxgH2afp3+d7cS/1fuy3DPpXtGe124LRarX68rw ww1hiKVozbanDy02sWD/ja/KMPeBK9FPaMtYvdgm6IewaTxq24g7wupr8q7ntTYI0RC8+j fWEAbK4kXAo1FC2kwoYcQuomOUMCjQZ0Exq3wkAtEHfaJzph49OkOFpGpc1yn8Gribp0D6 Ls8wtlieY8cYBy6M/npOQ1QpSeSIb9woIe4sGbbv1mGIBaZoUNqjzCNynAEHrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bbfec32d156cec4c004f6f5148a074ba5f0a294d commit bbfec32d156cec4c004f6f5148a074ba5f0a294d Author: John Baldwin AuthorDate: 2022-04-06 23:45:28 +0000 Commit: John Baldwin CommitDate: 2022-04-06 23:45:28 +0000 isci: Propagate error from bus_dma_tag_create. Return error from isci_controller_allocate_memory if bus_dma_tag_create fails instead of ignoring the error. --- sys/dev/isci/isci_controller.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/isci/isci_controller.c b/sys/dev/isci/isci_controller.c index 9848f1bc8302..0c4773193e45 100644 --- a/sys/dev/isci/isci_controller.c +++ b/sys/dev/isci/isci_controller.c @@ -412,7 +412,6 @@ int isci_controller_allocate_memory(struct ISCI_CONTROLLER *controller) int error; device_t device = controller->isci->device; uint32_t max_segment_size = isci_io_request_get_max_io_size(); - uint32_t status = 0; struct ISCI_MEMORY *uncached_controller_memory = &controller->uncached_controller_memory; struct ISCI_MEMORY *cached_controller_memory = @@ -477,13 +476,16 @@ int isci_controller_allocate_memory(struct ISCI_CONTROLLER *controller) * will enable better performance than creating the DMA maps every time we get * an I/O. */ - status = bus_dma_tag_create(bus_get_dma_tag(device), 0x1, + error = bus_dma_tag_create(bus_get_dma_tag(device), 0x1, ISCI_DMA_BOUNDARY, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, isci_io_request_get_max_io_size(), SCI_MAX_SCATTER_GATHER_ELEMENTS, max_segment_size, 0, busdma_lock_mutex, &controller->lock, &controller->buffer_dma_tag); + if (error != 0) + return (error); + sci_pool_initialize(controller->request_pool); virtual_address = request_memory->virtual_address;