Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D570C2BB40 for ; Tue, 15 Dec 2020 01:08:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B8B9820705 for ; Tue, 15 Dec 2020 01:08:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B8B9820705 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 320996E158; Tue, 15 Dec 2020 01:08:09 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id B9DE06E0C6 for ; Tue, 15 Dec 2020 01:08:03 +0000 (UTC) IronPort-SDR: tuw7kTV3LzsurW7ZHBx2yVJQIX0XrLKNLwObKDqhafgE9OxgLkgHWGu/Y1GULZKuBjWKHbilBZ HDB9ZXJHeKZg== X-IronPort-AV: E=McAfee;i="6000,8403,9835"; a="171298007" X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="171298007" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 17:08:02 -0800 IronPort-SDR: PRVjczrzYdd2972HC0PxnOOsASZD1m0yrTZzZqxwW9kvvKnZdkKRW8Xuf6y5bKQ5TQ8r/BKqSf AmRWTZyR1WMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="331861159" Received: from sean-virtualbox.fm.intel.com ([10.105.158.96]) by fmsmga007.fm.intel.com with ESMTP; 14 Dec 2020 17:08:01 -0800 From: "Huang, Sean Z" To: Intel-gfx@lists.freedesktop.org Date: Mon, 14 Dec 2020 17:07:25 -0800 Message-Id: <20201215010726.15898-23-sean.z.huang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215010726.15898-1-sean.z.huang@intel.com> References: <20201215010726.15898-1-sean.z.huang@intel.com> Subject: [Intel-gfx] [RFC-v9 22/23] mei: pxp: add vtag parameter to mei_pxp_send/receive interface X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomas Winkler MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Tomas Winkler Added vtag parameter to mei_pxp_send_message and mei_pxp_receive_message functions. Signed-off-by: Vitaly Lubart Signed-off-by: Tomas Winkler --- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 4 ++-- drivers/misc/mei/pxp/mei_pxp.c | 10 ++++++---- include/drm/i915_pxp_tee_interface.h | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c index e0815b2ee9ab..002275ff9c71 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c @@ -31,13 +31,13 @@ static int intel_pxp_tee_io_message(struct intel_pxp *pxp, print_hex_dump(KERN_DEBUG, "TEE input message binaries:", DUMP_PREFIX_OFFSET, 4, 4, msg_in, msg_in_size, true); - ret = pxp_tee_master->ops->send(pxp_tee_master->tee_dev, msg_in, msg_in_size); + ret = pxp_tee_master->ops->send(pxp_tee_master->tee_dev, msg_in, msg_in_size, 1); if (ret) { drm_err(&i915->drm, "Failed to send TEE message\n"); return -EFAULT; } - ret = pxp_tee_master->ops->receive(pxp_tee_master->tee_dev, msg_out, msg_out_buf_size); + ret = pxp_tee_master->ops->receive(pxp_tee_master->tee_dev, msg_out, msg_out_buf_size, 1); if (ret < 0) { drm_err(&i915->drm, "Failed to receive TEE message\n"); return -EFAULT; diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index 5bd61fe445e3..55d4cb772367 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -27,10 +27,11 @@ * @dev: device corresponding to the mei_cl_device * @message: a message buffer to send * @size: size of the message + * @vtag: the vtag of the connection (use 0 for default) * Return: 0 on Success, <0 on Failure */ static int -mei_pxp_send_message(struct device *dev, const void *message, size_t size) +mei_pxp_send_message(struct device *dev, const void *message, size_t size, u8 vtag) { struct mei_cl_device *cldev; ssize_t byte; @@ -41,7 +42,7 @@ mei_pxp_send_message(struct device *dev, const void *message, size_t size) cldev = to_mei_cl_device(dev); /* temporary drop const qualifier till the API is fixed */ - byte = mei_cldev_send(cldev, (u8 *)message, size); + byte = mei_cldev_send_vtag(cldev, (u8 *)message, size, vtag); if (byte < 0) { dev_dbg(dev, "mei_cldev_send failed. %zd\n", byte); return byte; @@ -55,10 +56,11 @@ mei_pxp_send_message(struct device *dev, const void *message, size_t size) * @dev: device corresponding to the mei_cl_device * @buffer: a message buffer to contain the received message * @size: size of the buffer + * @vtag: the vtag of the connection (use 0 for default) * Return: bytes sent on Success, <0 on Failure */ static int -mei_pxp_receive_message(struct device *dev, void *buffer, size_t size) +mei_pxp_receive_message(struct device *dev, void *buffer, size_t size, u8 vtag) { struct mei_cl_device *cldev; ssize_t byte; @@ -68,7 +70,7 @@ mei_pxp_receive_message(struct device *dev, void *buffer, size_t size) cldev = to_mei_cl_device(dev); - byte = mei_cldev_recv(cldev, buffer, size); + byte = mei_cldev_recv_vtag(cldev, buffer, size, &vtag); if (byte < 0) { dev_dbg(dev, "mei_cldev_recv failed. %zd\n", byte); return byte; diff --git a/include/drm/i915_pxp_tee_interface.h b/include/drm/i915_pxp_tee_interface.h index 3999e255e145..cacde01058fc 100644 --- a/include/drm/i915_pxp_tee_interface.h +++ b/include/drm/i915_pxp_tee_interface.h @@ -24,8 +24,8 @@ struct i915_pxp_component_ops { */ struct module *owner; - int (*send)(struct device *dev, const void *message, size_t size); - int (*receive)(struct device *dev, void *buffer, size_t size); + int (*send)(struct device *dev, const void *message, size_t size, u8 vtag); + int (*receive)(struct device *dev, void *buffer, size_t size, u8 vtag); }; /** -- 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx