From patchwork Thu Jun 27 14:44:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 808108 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72516198A0A for ; Thu, 27 Jun 2024 14:44:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719499491; cv=none; b=bMB6XEgIPeXanxZTEH5HJhy8q08mK80eEs6fMr+z22mYgquccGDoebUjlHQFPy6os3yzGYnYMk6oZpdQNAXZcyTJF7KXqfF3cq+DUy86FoCpQmaz0E+sK2m434bSc/9TcEwRdJefhkvshbM5Oyj2zWAOJzvY9IkEUopSaeEPATA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719499491; c=relaxed/simple; bh=SvL4pINrFSRfen69Stj/4WrpwjGf+jKWJ5TFSri6EH8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LwcUnZ2PvElN/09EsVP87+rbnODlu6ykMFol+Jk8PwdfCa43z6+RyJOs56bYCI8pTRJgVKQ16cTz3SsmNyQIugI1KmpvG5WV6cbfpY+q1el1F+1b23KAzjofi4KIH+H3idbVKcpTG1Es1xFn8ydJpgWrpOkOp61nHEldZNpfHao= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ISjkY0uz; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ISjkY0uz" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2ec3f875e68so88786521fa.0 for ; Thu, 27 Jun 2024 07:44:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719499487; x=1720104287; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=efQFGr6jGBKjwmMdwj9cOaioErJGFDxQ/6GTKiEu6I8=; b=ISjkY0uzEaUKcTtmmBcaXyQRxc1savsL7LlDJI4PU2yAliqWsjRZoOwtMKYp6bkKaS fpeOfZYJTDyahVPxMZcZ8bd/jInub/R+UaNGs92FsILEYzsJ8d46INI9LcxT1VWowtak vZVhpvaolnTF3VPauubJKpsI0C7XcPewsL7KdgeX0MaYVYvwyiwn5TP7oaF9Zv1vmYiP H7XF0SByhXDL8rPO+vutbPLGbpr4yIPm4ceRu1YgNH/X15NCPjBFhQ1KNy31J6Av/QWo sEl5yVKx7VadGt2E1Wsd0t4WSqkjpLJV31UM618JVTP9LV3KLN/iIJU1ShhDjOPV4VD0 6GDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719499487; x=1720104287; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=efQFGr6jGBKjwmMdwj9cOaioErJGFDxQ/6GTKiEu6I8=; b=LJ9/bzPaqJLK5UEFa8xErVyiSftflU4Ljuz52/NdMlUzYkBSCfjs5LEcTZBt98D9MT Ihvl8TfWYv5DATrdJ+pdf1MRqh+a8epyVL6XS3DGbU4fP/SYUBDTjusflJHf5cTwY6vJ VHSdxjVqhqk3LEmGIy98JizIan338GNeM/C/rf9lswkdkDfbOtuSXWE91roN4Va1SrAt v7vkIKf97LBeQHS8G9goJ8owFnvDCfZTeh7HMuFpEafMH6Dx4Y8hYhtdetjECvgNQTP/ uzdvHF6OQNO4BKJBehHc2s/bQqOAunfrDaWgReuozU7YoHTePmp2IX/DTcfZWou+s2rA gLxg== X-Forwarded-Encrypted: i=1; AJvYcCXJlaEyUBKXkJiv3CVVqm58ZfKPmq1MmaaZmiG/25asC2OYTWLZ2Qw5NNAnPv3knvgt7F7DTiIsaZrCuWXg3Okte0aICSTnTkbB X-Gm-Message-State: AOJu0Yw4GL4kfiUKaVc6hkMlgH1yM/N0XR2RyY1ebWfdJKf2PzoPBNU4 guumh5LFUdjbMaqOEcixrbfm1mvpvIYJrrPP5vDUdI54++koUYyPl2cUoAvLFXc= X-Google-Smtp-Source: AGHT+IEEpm4AxqCI4MvWw10l4nicg9YGmxodxCLh1opitXtQr+B6jBW4EVR2xxnMzOMkHx2ZA4GduA== X-Received: by 2002:a2e:9e96:0:b0:2ec:588d:7eb8 with SMTP id 38308e7fff4ca-2ec5b37a303mr79821721fa.21.1719499487664; Thu, 27 Jun 2024 07:44:47 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2ee4a34447fsm2775911fa.11.2024.06.27.07.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 07:44:47 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 27 Jun 2024 17:44:44 +0300 Subject: [PATCH v4 5/7] usb: typec: ucsi: inline ucsi_read_message_in Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240627-ucsi-rework-interface-v4-5-289ddc6874c7@linaro.org> References: <20240627-ucsi-rework-interface-v4-0-289ddc6874c7@linaro.org> In-Reply-To: <20240627-ucsi-rework-interface-v4-0-289ddc6874c7@linaro.org> To: Heikki Krogerus , Greg Kroah-Hartman , Maxime Coquelin , Alexandre Torgue Cc: Nikita Travkin , Neil Armstrong , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1732; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=SvL4pINrFSRfen69Stj/4WrpwjGf+jKWJ5TFSri6EH8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBmfXrZIK3sNxYmewLsvSN+DxSJY8UC0w0Xoamap /iSt4ILkayJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZn162QAKCRCLPIo+Aiko 1TewB/0eEGE2cnF0wQ2wiEEsma6QExZ1Yav41XkW8NpVgs9JLW96sutdqzAxS5BpJsP1PoyaRCD lVRCv4c2T2eHdMrZRGrTExG691TNA1w2rDx/gDgFf7lEdxtOwgxSmsxk+CZrGAP00z9k5kHoWNY Vl0IFKa8sP3qSpbB0wkrpjQtK2vRBUgU4B8WqycBSdLOhQ+exl7xVKHjc0No1McFtSOU7arST9a zqlmROo8rQ3p1nZ3ASP///xGQKpo21+K1ATF8ekM5/kHEdhrW88lVnMrvqP88SBLbPnauJG13pH e5DyIzX3Lb9EIQqQgnWEHAhv8mFDrOhGm+yKzc1znzn2VMcp X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A There is no need to have a separate wrapper for reading MESSAGE_IN data, inline it to ucsi_run_command(). Tested-by: Heikki Krogerus Reviewed-by: Heikki Krogerus Signed-off-by: Dmitry Baryshkov --- drivers/usb/typec/ucsi/ucsi.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 10a8fe893333..2d87fe277c62 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -36,19 +36,6 @@ */ #define UCSI_SWAP_TIMEOUT_MS 5000 -static int ucsi_read_message_in(struct ucsi *ucsi, void *buf, - size_t buf_size) -{ - /* - * Below UCSI 2.0, MESSAGE_IN was limited to 16 bytes. Truncate the - * reads here. - */ - if (ucsi->version <= UCSI_VERSION_1_2) - buf_size = clamp(buf_size, 0, 16); - - return ucsi->ops->read_message_in(ucsi, buf, buf_size); -} - static int ucsi_acknowledge(struct ucsi *ucsi, bool conn_ack) { u64 ctrl; @@ -70,6 +57,13 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci, *cci = 0; + /* + * Below UCSI 2.0, MESSAGE_IN was limited to 16 bytes. Truncate the + * reads here. + */ + if (ucsi->version <= UCSI_VERSION_1_2) + size = clamp(size, 0, 16); + ret = ucsi->ops->sync_control(ucsi, command); if (ret) return ret; @@ -98,7 +92,7 @@ static int ucsi_run_command(struct ucsi *ucsi, u64 command, u32 *cci, } if (data) { - ret = ucsi_read_message_in(ucsi, data, size); + ret = ucsi->ops->read_message_in(ucsi, data, size); if (ret) return ret; }