From nobody Sat May 20 01:01:03 2023 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 4QNQPq63kQz4CZk1; Sat, 20 May 2023 01:01:03 +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 4QNQPq5XKJz43sk; Sat, 20 May 2023 01:01:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684544463; 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=laA6n9cc/Q/MwmrggcTzXLe0HcthTi7t5XLUsvWsGVo=; b=yDoTHQmYGJCNtQsoCNoim+cw3cUSoPaMJgQC32iZkIAJuXnY0xC/hmBFLOWks40VAa3Jcx vOD8xpMG1xUSxGLxFMHbMSbE/KFicL83eNXyF07t1lxb6zd/fKJZr4IU14dXqSucTKFFMp 7bPFvtFLfIIRcIbSBDYvAE1+uhAVNnZw9xIPNWTrLyIz1bcAjq5MRuKzy0Khp6u3FPvPQ5 +pci/i2pCJXP5ar4N66hgGushqgIK2/kwkutT2jNbqxxv+diOowbc6Cdr7V7X+s3bwmBo5 iSKvxer4Nig7mls0ncESUl1AJJJgF8fz279ShQMLG8wyG3fO87x97JpNYuZenQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684544463; 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=laA6n9cc/Q/MwmrggcTzXLe0HcthTi7t5XLUsvWsGVo=; b=V+l+87jzn3MJD6YrYdtN6mt+w8pR5NI6U5oD2q0whE6Kvya1fInfeu5BHFD9sk3l++JX26 YrccmLY+WaJHaUvAznELLK2ptsOFeZdxKLjiLt7KkQxqmrgcR04X2CWbzekPa0ANRxzg8f n3gQpDogBbi+kY8abxwv97F+fCItcKZv2PGxfb15AdTKkU7AzCmky0qPTBgz6viXPVStBl fo2bGLnKeGL/S2Wf9fSh3LYUAs/3/0spGq7Tf7tpsE2s7yz7IFjFObvIn1wOMjIM9jGp4H WCvP7ApKIYcdJC+wkF/sM7DDJGey55KNsZiCKCUfq1Ru487QYi6auFXf81g/cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684544463; a=rsa-sha256; cv=none; b=oxgORNjsPtoxV2Up/RhVqfZ2xTbOO4gEWTOOOdlcLXtQkQORlYEtCSOoEkujTUrrnOaQBL aEICQGub+HjS57wFEaBw2QEZA0NcN5YXhvEzwxBcUU2vZ1iCiTB8DCp+q6NrzWt0C16sME dROXRPKBJ6q8+pqLPprPQVl+SoRcPRCIQSoKmgN7pCC/Go9VTNkFnJZUy/FWJdVphRWJRf /zPOGkMMZhyf3hexPMXgOt2/1nrTSQWrgZKROrOAz7o81lEkPiZ6v8uZRwG3LvTnrIHtmy 7LQf17Ps5O5im+0cTeHByJC+9iZZRaezxy+u/PN9sXeP1l5gmsG7shOqkle1Og== 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 4QNQPq4Rm9zq8V; Sat, 20 May 2023 01:01:03 +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 34K113Z2077348; Sat, 20 May 2023 01:01:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34K1136b077347; Sat, 20 May 2023 01:01:03 GMT (envelope-from git) Date: Sat, 20 May 2023 01:01:03 GMT Message-Id: <202305200101.34K1136b077347@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: 047298203fc3 - main - LinuxKPI: qcom: update qmi and mhi 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: 047298203fc3bc2b290f44b9531a7b7d553fe9b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=047298203fc3bc2b290f44b9531a7b7d553fe9b7 commit 047298203fc3bc2b290f44b9531a7b7d553fe9b7 Author: Bjoern A. Zeeb AuthorDate: 2023-05-20 00:50:10 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-20 00:57:10 +0000 LinuxKPI: qcom: update qmi and mhi Update qcom QMI and MHI bits in order to keep an upcoming driver compiling. MFC after: 10 days --- sys/compat/linuxkpi/common/include/linux/mhi.h | 21 +++++++++++++++++++-- .../linuxkpi/common/include/linux/soc/qcom/qmi.h | 16 ++++++++-------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/mhi.h b/sys/compat/linuxkpi/common/include/linux/mhi.h index 3d3965d3f42a..427ac626f494 100644 --- a/sys/compat/linuxkpi/common/include/linux/mhi.h +++ b/sys/compat/linuxkpi/common/include/linux/mhi.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2023 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -40,6 +40,14 @@ enum mhi_callback { MHI_CB_SYS_ERROR, + MHI_CB_BW_REQ, + MHI_CB_EE_MISSION_MODE, + MHI_CB_EE_RDDM, + MHI_CB_FATAL_ERROR, + MHI_CB_IDLE, + MHI_CB_LPM_ENTER, + MHI_CB_LPM_EXIT, + MHI_CB_PENDING_DATA, }; struct mhi_channel_config { @@ -71,6 +79,7 @@ struct mhi_controller { const char *fw_image; bool fbc_download; + size_t rddm_size; size_t sbl_size; size_t seg_len; size_t reg_len; @@ -130,10 +139,11 @@ mhi_unregister_controller(struct mhi_controller *mhi_ctrl) /* -------------------------------------------------------------------------- */ -static __inline void +static __inline int mhi_device_get_sync(struct mhi_device *mhi_dev) { /* XXX TODO */ + return (-1); } static __inline void @@ -151,6 +161,13 @@ mhi_prepare_for_power_up(struct mhi_controller *mhi_ctrl) return (0); } +static __inline int +mhi_sync_power_up(struct mhi_controller *mhi_ctrl) +{ + /* XXX TODO */ + return (0); +} + static __inline int mhi_async_power_up(struct mhi_controller *mhi_ctrl) { diff --git a/sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h b/sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h index fc7cfc0480a9..765398557ed5 100644 --- a/sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h +++ b/sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2023 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -67,7 +67,7 @@ struct qmi_elem_info { enum soc_qcom_qmi_array_type array_type; uint8_t tlv_type; uint32_t offset; - struct qmi_elem_info *ei_array; + const struct qmi_elem_info *ei_array; }; struct qmi_response_type_v01 { @@ -84,10 +84,10 @@ struct qmi_service { }; struct qmi_msg_handler { - uint32_t type; - uint32_t msg_id; - struct qmi_elem_info *ei; - size_t decoded_size; + uint32_t type; + uint32_t msg_id; + const struct qmi_elem_info *ei; + size_t decoded_size; void (*fn)(struct qmi_handle *, struct sockaddr_qrtr *, struct qmi_txn *, const void *); }; @@ -140,7 +140,7 @@ qmi_handle_release(struct qmi_handle *handle) static __inline int qmi_send_request(struct qmi_handle *handle, void *x, struct qmi_txn *txn, - uint32_t msd_id, size_t len, struct qmi_elem_info *ei, void *req) + uint32_t msd_id, size_t len, const struct qmi_elem_info *ei, void *req) { /* XXX TODO */ @@ -156,7 +156,7 @@ qmi_txn_cancel(struct qmi_txn *txn) static __inline int qmi_txn_init(struct qmi_handle *handle, struct qmi_txn *txn, - struct qmi_elem_info *ei, void *resp) + const struct qmi_elem_info *ei, void *resp) { /* XXX TODO */