From nobody Wed Sep 7 23:55:45 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 4MNJzj2jx8z4bTkK; Wed, 7 Sep 2022 23:55:45 +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 4MNJzj1z9qz3kGp; Wed, 7 Sep 2022 23:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662594945; 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=ovI3543QDc5WNTOTfrrSqaBKnrhirxioAeBqIifO89k=; b=mUNjN6MTE1vXKgdL5qud2QJNykM6b7tCM2ngSQ1KQ27jB5mzJ6astxZo+6ivtnQxjG5zV1 B2AE1gv87vqjot1KavMkl2c0V2psqCRnM8EV8Pd2rrrmZ03rsB4AEOYX4VS4Y5dv5Y8fM5 4voLQDUj9iPRdOEPccUYf7gvm+6mkGPPyH6aD7AI5cLF4IewSrItCcybkQZaiJjHW1UTz2 HrD3tmGgTI7gjpwDfgng573JsjXkoUwsQTLi0Fvq6YuadOK1A9sLNN8rHrOmcBrQJKUtg6 514ydK6+DfFfGcqo87oiTptGUyuqXsKOmYiUk+rhRh8f/rhx13+zspUYWb5s6Q== 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 4MNJzj12yHzhZS; Wed, 7 Sep 2022 23:55:45 +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 287Ntj59054683; Wed, 7 Sep 2022 23:55:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287Ntjis054682; Wed, 7 Sep 2022 23:55:45 GMT (envelope-from git) Date: Wed, 7 Sep 2022 23:55:45 GMT Message-Id: <202209072355.287Ntjis054682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fb3c549738bf - main - LinuxKPI: firmware: add request_partial_firmware_into_buf() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb3c549738bfed0607d95120e5dbf03a62e61b49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662594945; 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=ovI3543QDc5WNTOTfrrSqaBKnrhirxioAeBqIifO89k=; b=I958uSxAMGz0dkA+awXZVXv7giJlv35PCQSuH9wzhJLtyYklyfTWl2uowFY2p8kowMw6Hv /cNWLTRIMCbuJ1NwVDUMGUPcZHYmweCCBja1NA+FhetahQYTLxCm0AiB1hnCnZ0DUd1GfR 7l7ClLi6GewCYxsobPrhM6MnguqvTwtGAzCzgdKa09DP7HVEmPCxqI++WipZoV9bQHbgRL 1TnbRHoU2qqCjf7map58rdQZ25IBL1UoQHO59/5xZEayIG/rXnTQXV9JWHwoj0YdVI8Vjk SsH1g+ZVTU37mJZ8kLrow4veWmHvxyfMFMGkRVwG6wJQ+AwxeJ2u3Q1fpK4toQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662594945; a=rsa-sha256; cv=none; b=IpQS+R017IPi3KCTOjPwJcbKTHc1Z8KkvVrZXDj8CTCvieevr706pYvthxYgAnLDVhUbYq z4Lxn/47YfUAFxxFEKPb2ee+BEnpTDsIcLS5QF7ms2LPN3NJxAUpicaib/BLrhFQXRI0dJ c+Ob0B79SzJ34vK4UZR8IInN37dd+05w2HOyKnAs++Xu/XGEw66aUniVgPVLXR2RQMWjmO 9c68QocgcQ0/09vbd5ZYVJmtC+lwv/D1haX/ZZVknEeh8SWKH3P05Z7ksgsyTLgZ4LSSEv U/3UPKxI+xDzNDW/gx55eA67ajq/6gNN9WT/nLUpbnzSni528eAGSNat0ABl5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb3c549738bfed0607d95120e5dbf03a62e61b49 commit fb3c549738bfed0607d95120e5dbf03a62e61b49 Author: Bjoern A. Zeeb AuthorDate: 2022-09-07 23:33:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-07 23:33:45 +0000 LinuxKPI: firmware: add request_partial_firmware_into_buf() A (so far out-of-tree) driver update needs request_partial_firmware_into_buf(). Given we load the full .ko file using firmware(9) just do that and copy the requeste data into the buffer (rather than poissibly only reading portions of the firmware file). MFC after: 1 week --- .../linuxkpi/common/include/linux/firmware.h | 13 ++++++++++++ sys/compat/linuxkpi/common/src/linux_firmware.c | 24 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/firmware.h b/sys/compat/linuxkpi/common/include/linux/firmware.h index ada7d0d73edf..ed84d6fbf58f 100644 --- a/sys/compat/linuxkpi/common/include/linux/firmware.h +++ b/sys/compat/linuxkpi/common/include/linux/firmware.h @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2022 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -56,6 +57,8 @@ int linuxkpi_request_firmware(const struct linuxkpi_firmware **, int linuxkpi_firmware_request_nowarn(const struct linuxkpi_firmware **, const char *, struct device *); void linuxkpi_release_firmware(const struct linuxkpi_firmware *); +int linuxkpi_request_partial_firmware_into_buf(const struct linuxkpi_firmware **, + const char *, struct device *, uint8_t *, size_t, size_t); static __inline int @@ -100,6 +103,16 @@ release_firmware(const struct linuxkpi_firmware *fw) linuxkpi_release_firmware(fw); } +static inline int +request_partial_firmware_into_buf(const struct linuxkpi_firmware **fw, + const char *fw_name, struct device *dev, void *buf, size_t buflen, + size_t offset) +{ + + return (linuxkpi_request_partial_firmware_into_buf(fw, fw_name, + dev, buf, buflen, offset)); +} + #define firmware linuxkpi_firmware #endif /* _LINUXKPI_LINUX_FIRMWARE_H */ diff --git a/sys/compat/linuxkpi/common/src/linux_firmware.c b/sys/compat/linuxkpi/common/src/linux_firmware.c index 47cccd42da20..7e8418151c64 100644 --- a/sys/compat/linuxkpi/common/src/linux_firmware.c +++ b/sys/compat/linuxkpi/common/src/linux_firmware.c @@ -2,6 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2022 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -223,3 +224,26 @@ linuxkpi_release_firmware(const struct linuxkpi_firmware *fw) firmware_put(fw->fbdfw, FIRMWARE_UNLOAD); free(__DECONST(void *, fw), M_LKPI_FW); } + +int +linuxkpi_request_partial_firmware_into_buf(const struct linuxkpi_firmware **fw, + const char *fw_name, struct device *dev, uint8_t *buf, size_t buflen, + size_t offset) +{ + const struct linuxkpi_firmware *lfw; + int error; + + error = linuxkpi_request_firmware(fw, fw_name, dev); + if (error != 0) + return (error); + + lfw = *fw; + if ((offset + buflen) >= lfw->size) { + linuxkpi_release_firmware(lfw); + return (-ERANGE); + } + + memcpy(buf, lfw->data + offset, buflen); + + return (0); +}