From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (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 962E52641C3 for ; Mon, 5 May 2025 15:49:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746460201; cv=none; b=VRmgUVF/W1sS+ERLfeemnBHDjcw6cYhSvsKD/6M/fV6xD7MCtkZL5pPZaJ0x6saLaNw+ivpxxPWRWJpRzHhzDve1JJ05WeRRl6q0wuqj0c2ns1VFI2nxLRaQVumuQY4IQK+n7/tAvs24nLBRXkhWrBfcmjCR7/LFAVvMGQ3bo2c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746460201; c=relaxed/simple; bh=oBMozJskEtvEjWYaahWUrCheNux/pXEF9fkwgtqsPEo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TxqhWk0DCCUbp9bMcrmSkbAQ6lshmlb2jyxmR7wNynCrTkYslq4IcymbBpbef7XqWhujgVM+7nP4BQRqvPqjaV+gFr4fp7Fu29u/1lUwweq3MJRojMGeFX7Q9QeGjZnGCHB/IDxgPm2fZ70hzuVE3D3DkCVO3/97zhYApJl3/h0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dcJG/wU+; arc=none smtp.client-ip=209.85.161.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dcJG/wU+" Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-601f3674116so1031179eaf.2 for ; Mon, 05 May 2025 08:49:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746460198; x=1747064998; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bF/eU9zOanUVVZXeOgSfSnbo986yXdUGTIPTl3NGixQ=; b=dcJG/wU+2U1xIvZMIpIqJijkJkmpmxypjvhE4PpPPwHRuhFj8AGjGGALfDMVU1gMcP oZRcIPKjIBhrP0iZ/EX1dGEEWknDXRWkxGcDgz/O289ZHeEa3VJClyHwK9Jbkp8IUqu9 8W4Rhi0z26A7Dw9vxKwuoVilbUR2ubnF5/PZBaxReEmfUEUXKUHcK7riqGKEHPMihwOm bMAXKbYs89D7YszqKIsXgkNliiCPqNUbeM2XkKt8HON01WYOx59JjfO6n/9/LAdxEZef HUFPK5ZdhtkPGwJ5UviCjlRTa3bn0Qz/T5GuvE6yfJvi3gewmBaP/uzEaTe24FELpMMC /h6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746460198; x=1747064998; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bF/eU9zOanUVVZXeOgSfSnbo986yXdUGTIPTl3NGixQ=; b=vjlAw3DP5q9ccHTY3miSmlgQva37P/x0acIeRqRGkZ1RICRzo2pw+IUAeevQokZSYp 43Lqkrub1TzlYVYJFEvVeH66BtJlM6UAAFlT4qLF8lgb/BmBCQsa0sdTUWo9JO2IDecv qIBiZ0pBbUo//qE/hr5qPTNjvT8lgerQPM8i5WNxE1hpMU2twpTazXV/0281NN63H6Oa O9awXwjLozoN2mW2IkbiK1SFivj/jz1RF2pUr5Om8Q05GzZYq3ffwPbKqx2ftpuY92kE q1upxYGul6UIN4mMTtoZQhyiDIUtiy9gXcUPB3sCPNy8avwypp/Ap5eDbvWnZA8zFtS8 crrA== X-Forwarded-Encrypted: i=1; AJvYcCWrp+sJAUrJIutDEMWERAw4VVAWacK/+EQH6NiTycF6awu1N9qWujewcuKjspECvIB7Y1Y=@lists.linux.dev X-Gm-Message-State: AOJu0Yx94IfqeSzPMdH35xnqQ40G5ugFsaqlOy1ScCOixLCaBvrBkmX6 ub/f2olIiYK8swY1aYlaiS/ZMclXcY/ZXILSiwCekGnGWG40ZVrT X-Gm-Gg: ASbGncvOVWq3HG4XlcGabY3YloLmNiqs/xoeYhVSmxKujKERVWzhed4TiOHTJuE6QG7 LnjpwHq/o7u4qTXLW+9hgleKzcxp8tyaTMup2YCeoNNp3HFXkoPtKEdT/vmjL584v5UnSKbrzxZ wTOwvFA514N1pPFiykRpFcJQdwnk7yjkhzW4hQHZNbDUZvcjeadgHey/9FQk/80/jQoq5LPSKBa gQR4fFnt2cUB2Zb1P8+JA18xQkyz1rSUSzUJx5VL0vH97P0Va6G8Vlv3ehZUkeChnbIsh7oyhZ2 1twCFTEV21Cdd5jKZYRV6nGEQ9FVX8WY5kFq7CT2/k3RQgsyh7al+1FzVAVs3wU= X-Google-Smtp-Source: AGHT+IFxOKSARBqkkegTT/BsbuPFrrDgx1ik3eNh9a8qIMK8qDnzx+rY6GvlMdOoHHyHuHjMiQD4vQ== X-Received: by 2002:a05:6820:208:b0:603:f973:1b3 with SMTP id 006d021491bc7-607fa81c1f3mr5567422eaf.0.1746460198572; Mon, 05 May 2025 08:49:58 -0700 (PDT) Received: from hiagof-nb.corp.toradex.com ([67.159.246.222]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-607e7fe84a8sm1606217eaf.36.2025.05.05.08.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 08:49:57 -0700 (PDT) From: Hiago De Franco To: Mathieu Poirier , Ulf Hansson , linux-pm@vger.kernel.org, linux-remoteproc@vger.kernel.org Cc: Shawn Guo , Sascha Hauer , Bjorn Andersson , Hiago De Franco , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan , daniel.baluta@nxp.com, iuliana.prodan@oss.nxp.com, Fabio Estevam , Pengutronix Kernel Team Subject: [PATCH 2/3] firmware: imx: move get power mode function from scu-pd.c to misc.c Date: Mon, 5 May 2025 12:48:48 -0300 Message-Id: <20250505154849.64889-3-hiagofranco@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505154849.64889-1-hiagofranco@gmail.com> References: <20250505154849.64889-1-hiagofranco@gmail.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Hiago De Franco Move imx_sc_get_pd_power() from pmdomain/imx/scu-pd.c to firmware/imx/misc.c and rename it to imx_sc_pm_get_resource_power_mode() to maintain the same naming logic with other functions in misc.c. This makes the API available for other use cases. For example, remoteproc/imx_rproc.c can now use this function to check the power mode of the remote core. Signed-off-by: Hiago De Franco --- drivers/firmware/imx/misc.c | 47 +++++++++++++++++++++++++++ drivers/pmdomain/imx/scu-pd.c | 29 ++++------------- include/linux/firmware/imx/svc/misc.h | 8 +++++ 3 files changed, 62 insertions(+), 22 deletions(-) diff --git a/drivers/firmware/imx/misc.c b/drivers/firmware/imx/misc.c index d073cb3ce699..61fcb0066ec9 100644 --- a/drivers/firmware/imx/misc.c +++ b/drivers/firmware/imx/misc.c @@ -37,6 +37,18 @@ struct imx_sc_msg_resp_misc_get_ctrl { u32 val; } __packed __aligned(4); +struct imx_sc_msg_req_get_resource_power_mode { + struct imx_sc_rpc_msg hdr; + union { + struct { + u16 resource; + } req; + struct { + u8 mode; + } resp; + } data; +} __packed __aligned(4); + /* * This function sets a miscellaneous control value. * @@ -135,3 +147,38 @@ int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource, return imx_scu_call_rpc(ipc, &msg, true); } EXPORT_SYMBOL(imx_sc_pm_cpu_start); + +/* + * This function gets the power mode from a given @resource + * + * @param[in] ipc IPC handle + * @param[in] resource resource to check the power mode + * + * @return Returns < 0 for errors or the following for success: + * IMX_SC_PM_PW_MODE_OFF 0 Power off + * IMX_SC_PM_PW_MODE_STBY 1 Power in standby + * IMX_SC_PM_PW_MODE_LP 2 Power in low-power + * IMX_SC_PM_PW_MODE_ON 3 Power on + * + * These are defined under firmware/imx/svc/pm.h + */ +int imx_sc_pm_get_resource_power_mode(struct imx_sc_ipc *ipc, u32 resource) +{ + struct imx_sc_msg_req_get_resource_power_mode msg; + struct imx_sc_rpc_msg *hdr = &msg.hdr; + int ret; + + hdr->ver = IMX_SC_RPC_VERSION; + hdr->svc = IMX_SC_RPC_SVC_PM; + hdr->func = IMX_SC_PM_FUNC_GET_RESOURCE_POWER_MODE; + hdr->size = 2; + + msg.data.req.resource = resource; + + ret = imx_scu_call_rpc(ipc, &msg, true); + if (ret) + return ret; + + return msg.data.resp.mode; +} +EXPORT_SYMBOL(imx_sc_pm_get_resource_power_mode); diff --git a/drivers/pmdomain/imx/scu-pd.c b/drivers/pmdomain/imx/scu-pd.c index 01d465d88f60..945f972e636f 100644 --- a/drivers/pmdomain/imx/scu-pd.c +++ b/drivers/pmdomain/imx/scu-pd.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -328,27 +329,6 @@ static void imx_sc_pd_get_console_rsrc(void) imx_con_rsrc = specs.args[0]; } -static int imx_sc_get_pd_power(struct device *dev, u32 rsrc) -{ - struct imx_sc_msg_req_get_resource_power_mode msg; - struct imx_sc_rpc_msg *hdr = &msg.hdr; - int ret; - - hdr->ver = IMX_SC_RPC_VERSION; - hdr->svc = IMX_SC_RPC_SVC_PM; - hdr->func = IMX_SC_PM_FUNC_GET_RESOURCE_POWER_MODE; - hdr->size = 2; - - msg.data.req.resource = rsrc; - - ret = imx_scu_call_rpc(pm_ipc_handle, &msg, true); - if (ret) - dev_err(dev, "failed to get power resource %d mode, ret %d\n", - rsrc, ret); - - return msg.data.resp.mode; -} - static int imx_sc_pd_power(struct generic_pm_domain *domain, bool power_on) { struct imx_sc_msg_req_set_resource_power_mode msg; @@ -438,7 +418,12 @@ imx_scu_add_pm_domain(struct device *dev, int idx, if (imx_con_rsrc == sc_pd->rsrc) sc_pd->pd.flags = GENPD_FLAG_RPM_ALWAYS_ON; - mode = imx_sc_get_pd_power(dev, pd_ranges->rsrc + idx); + mode = imx_sc_pm_get_resource_power_mode(pm_ipc_handle, + pd_ranges->rsrc + idx); + if (mode < 0) + dev_err(dev, "failed to get power resource %d mode, ret %d\n", + pd_ranges->rsrc + idx, mode); + if (mode == IMX_SC_PM_PW_MODE_ON) is_off = false; else diff --git a/include/linux/firmware/imx/svc/misc.h b/include/linux/firmware/imx/svc/misc.h index 760db08a67fc..376c800a88d0 100644 --- a/include/linux/firmware/imx/svc/misc.h +++ b/include/linux/firmware/imx/svc/misc.h @@ -55,6 +55,8 @@ int imx_sc_misc_get_control(struct imx_sc_ipc *ipc, u32 resource, int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource, bool enable, u64 phys_addr); + +int imx_sc_pm_get_resource_power_mode(struct imx_sc_ipc *ipc, u32 resource); #else static inline int imx_sc_misc_set_control(struct imx_sc_ipc *ipc, u32 resource, u8 ctrl, u32 val) @@ -73,5 +75,11 @@ static inline int imx_sc_pm_cpu_start(struct imx_sc_ipc *ipc, u32 resource, { return -ENOTSUPP; } + +static inline int imx_sc_pm_get_resource_power_mode(struct imx_sc_ipc *ipc, + u32 resource) +{ + return -ENOTSUPP; +} #endif #endif /* _SC_MISC_API_H */ -- 2.39.5