From nobody Sat Jun 10 23:09:00 2023 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 4QdttN6gCRz4d6TS; Sat, 10 Jun 2023 23:09:00 +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 4QdttN6B44z3Ng7; Sat, 10 Jun 2023 23:09:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686438540; 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=z2TGY2dYZTwRAOPOvDX4oMnqQkdSA5EU7wzr0zfcTiE=; b=rbp7pernvT2y5xl9W34YhGqtlsz/wQRWw0RFdk1vnPwCsxEKAkOIJD7WELdtA7DGy+x7Dx vmAgzoKpNa7ErAd+G3oRidZWMfCnXaMDUwM2idDWZ3yBHsAOy93UKYgybClHgwOHKbyxIA MwNOJpfxufePyCEPBUqSlIXxa7Cum3GtsENctULFtqyUhcu/ZT5bZKc5LxMnqvUJt+nGSx 0CNQP+XzHru4w4fLtybAjVH4x4rUmneI1CwPAEfTEkURMxo+YK9zk+DBw7oChkqBoiuioZ VwvHReofQYc2s42M/VUBw0jz1GWEQzYVQh+FLdW3K6lXuWrjmxAlXwLkY8grTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686438540; 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=z2TGY2dYZTwRAOPOvDX4oMnqQkdSA5EU7wzr0zfcTiE=; b=PKcoLxv75ugG6xFUzliv5bI5RGVtIl1s2dQUV0xolRU7wwUNATZD24v9zzIKnBJEDYiYit p5JuBEPLjyi9xIDJOv+P3Qt1In4JQPcMs4eeHzsVyD9JXXwiyj9btSz29jqi3IIf/3x2HC nESVcYCgpwXgi1BFwby6dIBXnV0LRAzxgej/OT2zb+mtTpO5WiHGo2nLV/nQbevS/UuBKE 90urcvIIZodChMuETjqVICbz3veji7WvOxkYl1gWBOCzp2eF4xg3impjczJ61SZ8hgmWQm +szWxTmIawrf3ZyCVkNq/CZriSOXuhHQPfiGPBp+bvbkFNsWyJUozvYJiXTdlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686438540; a=rsa-sha256; cv=none; b=NpwGfg8zL0P194yFfl3/hnQkSO9OuuTagh9qevUO6yBZVXON0BCjTMYA7jdT6E6GQ1hBGs mOj4n5LkipDR3ZTCei9o7JFMPu8IC7Tyw/AZqXkWvqOl01dhCMpqITzsJe8JPmWKRh8Sy1 ahdckBJfY6f6jWqND7mYEKyorHNRTME6N0u9owUUBkzaPLNgbtovONaYEoPPecG7I9C2++ l7wHACu79FdovghmP66tErsNurxIAW/J3mT1SfI/uwwZBnEDp83xCL7RrKCoDJtVcPEtGI 123j3LMPMMOXH67PmDF5OKmCa9y0+eYWSQWZvyRaudRvXH/COg+gY9yd2X67oA== 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 4QdttN5HNPzbKQ; Sat, 10 Jun 2023 23:09:00 +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 35AN90e7060702; Sat, 10 Jun 2023 23:09:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35AN90n2060701; Sat, 10 Jun 2023 23:09:00 GMT (envelope-from git) Date: Sat, 10 Jun 2023 23:09:00 GMT Message-Id: <202306102309.35AN90n2060701@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: bee50f894b9e - main - LinuxKPI: qcom: update QMI and MHI 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bee50f894b9e0b51668c83e24bf2ec7c275725eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bee50f894b9e0b51668c83e24bf2ec7c275725eb commit bee50f894b9e0b51668c83e24bf2ec7c275725eb Author: Bjoern A. Zeeb AuthorDate: 2023-06-10 22:54:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-10 23:06:04 +0000 LinuxKPI: qcom: update QMI and MHI Minor updates to QMI and MHI (mostly making arguments const) in order to facilitate porting the next generation athk driver. MFC after: 10 days --- sys/compat/linuxkpi/common/include/linux/mhi.h | 13 ++++++++++--- sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h | 1 + sys/compat/linuxkpi/common/src/linux_mhi.c | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/mhi.h b/sys/compat/linuxkpi/common/include/linux/mhi.h index 427ac626f494..5f59db81a6db 100644 --- a/sys/compat/linuxkpi/common/include/linux/mhi.h +++ b/sys/compat/linuxkpi/common/include/linux/mhi.h @@ -63,7 +63,7 @@ struct mhi_device { }; struct mhi_controller_config { - struct mhi_channel_config *ch_cfg; + const struct mhi_channel_config *ch_cfg; struct mhi_event_config *event_cfg; int buf_len, max_channels, num_channels, num_events, use_bounce_buf; @@ -102,7 +102,7 @@ struct mhi_controller { struct mhi_controller *linuxkpi_mhi_alloc_controller(void); void linuxkpi_mhi_free_controller(struct mhi_controller *); int linuxkpi_mhi_register_controller(struct mhi_controller *, - struct mhi_controller_config *); + const struct mhi_controller_config *); void linuxkpi_mhi_unregister_controller(struct mhi_controller *); /* -------------------------------------------------------------------------- */ @@ -124,7 +124,7 @@ mhi_free_controller(struct mhi_controller *mhi_ctrl) static inline int mhi_register_controller(struct mhi_controller *mhi_ctrl, - struct mhi_controller_config *cfg) + const struct mhi_controller_config *cfg) { return (linuxkpi_mhi_register_controller(mhi_ctrl, cfg)); @@ -196,6 +196,13 @@ mhi_pm_suspend(struct mhi_controller *mhi_ctrl) return (0); } +static __inline int +mhi_pm_resume(struct mhi_controller *mhi_ctrl) +{ + /* XXX TODO */ + return (0); +} + static __inline int mhi_pm_resume_force(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 765398557ed5..63e0cd3e45fc 100644 --- a/sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h +++ b/sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h @@ -54,6 +54,7 @@ struct qmi_handle; enum soc_qcom_qmi_array_type { NO_ARRAY, + STATIC_ARRAY, VAR_LEN_ARRAY, }; diff --git a/sys/compat/linuxkpi/common/src/linux_mhi.c b/sys/compat/linuxkpi/common/src/linux_mhi.c index 698a2553c1ec..fb68f1ef8305 100644 --- a/sys/compat/linuxkpi/common/src/linux_mhi.c +++ b/sys/compat/linuxkpi/common/src/linux_mhi.c @@ -60,7 +60,7 @@ linuxkpi_mhi_free_controller(struct mhi_controller *mhi_ctrl) int linuxkpi_mhi_register_controller(struct mhi_controller *mhi_ctrl, - struct mhi_controller_config *cfg) + const struct mhi_controller_config *cfg) { if (mhi_ctrl == NULL || cfg == NULL)