From nobody Fri Oct 18 20:31:05 2024 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 4XVbvF5xqFz5Yvmr; Fri, 18 Oct 2024 20:31:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XVbvF3GF7z4Hyj; Fri, 18 Oct 2024 20:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729283465; 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=bIKaz8V01IK4PvzkN5Lgczu6lbkKfi/s3Z5p1cYZ9j0=; b=hAIb56wTqvceqSb0fGLtobn3ut84EDRw3vn/Wxed8tV1gCgOHxd6MRIZ15aI0cRH2AydJd kts6lOGROJkR12B4QbLURbO5zbn0C5NhvbOgl/HurF11Rzq2mH46Z0uRKM0B8M65plJ8eP WLWllIkVqgR6pG/7qecUoWQsyY0R0aBf5RgzIltayRT3sXdXMylUgiR0tGAQe2LugzZlPg PVhTORKg6KOi9+it4AEL3yAUB6aFh8MtVqyedlWfqKsMPIiyXEsMotnsYc9jOoCX4KZKL/ uozWkLCoOEHXqo4dSWVri9LCTuecU3f/NRbD9VqgvFtxO4nhFJ2ZAFBx0k8m6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729283465; 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=bIKaz8V01IK4PvzkN5Lgczu6lbkKfi/s3Z5p1cYZ9j0=; b=M2KP1aFrS50cSUeKgaKFcgESd/DfPddomAT+CPijyJmHefun0RkuVxDzJO6iQsQs8L1FUY cf9ckeYi4D7KySo0xYxFaRuX4EtY7XopVOfvTyt+RGltVZTe2RBGkKgXSWmXzgWMs3EQ7N 0IoKqC82UeWWfuwb3mpAHLhmbzoe9bXEe2WtnBxJFmIvzDtyJ7HLaSZdzsudlX43xucEi3 puzi3CaKRYg6hLiAdMYnHQ1MEB5v9vW9FYqpV6pxcV7QZxygj2JjR4j2E19dm4zOC3vJ+y 3BWnqOFCP6g2QC+zwplyQjBjmtzcoU0TCRcfqkKOUwf8vA4HyLOEHm8MCq/cLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729283465; a=rsa-sha256; cv=none; b=mxtvnjSN6wq92F6W/UfL9gw7IIYagZuvGGjITOy5199SNqjgWii+8Rs+D1up+mwhrwT7P7 gTXbW8t3kffbIEx9xKI0YgDa/qMQFYipmpSy14oJTD3oBnYZ4Asq7Ihvs8wYJDK2+AUyRr Fd2r2Ve6ngqdnrMd6tey5n31FRwa++Hg4DuhT7NcTgLHSvQ5muPfItV3Sm69kcKoKtFYq4 bJSryi9tUGOtXuF+/45BpJqkwdqxxgIEjXJIIIqehbrUJxTU8wizCh1pDvCxwCxE48JIsI B+JuqbKtMZu3enzOiNgMn9sKODqAQ7VlChZprTYM+4yz7T3kQNKvEsEeKedaLQ== 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 4XVbvF2tH1zpDB; Fri, 18 Oct 2024 20:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49IKV5p4087227; Fri, 18 Oct 2024 20:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49IKV5so087224; Fri, 18 Oct 2024 20:31:05 GMT (envelope-from git) Date: Fri, 18 Oct 2024 20:31:05 GMT Message-Id: <202410182031.49IKV5so087224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b75e32a466db - main - ipmi: fix powerpc build 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b75e32a466dbab7a6729ff7a6472c6f9c9207491 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b75e32a466dbab7a6729ff7a6472c6f9c9207491 commit b75e32a466dbab7a6729ff7a6472c6f9c9207491 Author: Gleb Smirnoff AuthorDate: 2024-10-18 20:30:02 +0000 Commit: Gleb Smirnoff CommitDate: 2024-10-18 20:30:44 +0000 ipmi: fix powerpc build Fixes: 366d6a424e1faad9c151c5794978e218a79fbed8 --- sys/dev/ipmi/ipmi_opal.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/ipmi/ipmi_opal.c b/sys/dev/ipmi/ipmi_opal.c index ab0f14e8b3a8..ae7583a0d749 100644 --- a/sys/dev/ipmi/ipmi_opal.c +++ b/sys/dev/ipmi/ipmi_opal.c @@ -142,7 +142,8 @@ opal_ipmi_discard_msgs(struct opal_ipmi_softc *sc) } static int -opal_ipmi_polled_request(struct opal_ipmi_softc *sc, struct ipmi_request *req) +opal_ipmi_polled_request(struct opal_ipmi_softc *sc, struct ipmi_request *req, + int timo) { uint64_t msg_len; int err; @@ -191,7 +192,7 @@ opal_ipmi_polled_request(struct opal_ipmi_softc *sc, struct ipmi_request *req) goto out; } - if ((err = opal_ipmi_recv(sc, &msg_len, 0)) == 0) { + if ((err = opal_ipmi_recv(sc, &msg_len, timo)) == 0) { /* Subtract one extra for the completion code. */ req->ir_replylen = msg_len - sizeof(struct opal_ipmi_msg) - 1; req->ir_replylen = min(req->ir_replylen, req->ir_replybuflen); @@ -254,7 +255,7 @@ opal_ipmi_driver_request(struct ipmi_softc *isc, struct ipmi_request *req) for (i = 0; i < 3; i++) { IPMI_LOCK(&sc->ipmi); - err = opal_ipmi_polled_request(sc, req); + err = opal_ipmi_polled_request(sc, req, 0); IPMI_UNLOCK(&sc->ipmi); if (err == 0) break;