From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 B4D491CEE8D for ; Wed, 22 Jan 2025 08:48:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737535741; cv=none; b=LTKvQN21HUzPhFAwk6WPBViWnJcYizXr+uUW3z1W8VFsUMwq3Fee1aVItO+NZAgBLdmK1MV8YIghWRX4y1BpWox0FpCxbAKGM6eE+2ASYQMKCJSkAwwK2Y8B/adzNEi6fqaLGQeut6Un9rIVgBp5ptfIOgMM/j3w2i/AtALhR+U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737535741; c=relaxed/simple; bh=8PHIgrQZeo8GwWqLbADYlL7NlWtuwVKaha55ZI/7k8o=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uexPya/2QeYKekGagAlEs0c2e1F3A4ISf1T+wQu8Drx+mXhR+1gO/ufc/WhC7O+JsiXg9oLH44jJPLz2VRz9qyApYfQ79FIoXZCxXiYixtbgTBQMCymfAqpPz3SBwTYwGFrv7ySvmHvuXCNLF/xJM2TEd3ZD1X2roupmWsWPtw8= 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=fFXywIu9; arc=none smtp.client-ip=209.85.128.50 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="fFXywIu9" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4368a293339so75713435e9.3 for ; Wed, 22 Jan 2025 00:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737535736; x=1738140536; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ahcAYxKCW2/TnZTsjnNnWROYjAukoakSCPj81fATNcw=; b=fFXywIu9Z8+LYdq9VjFb+W7mimd1Zu80S7c2qZWDo0bUjBIcI+D+9Ldvy0mBVbSzQq 0PIfqrZcxEdol3LvuzlBtufLi+xt+/yy/BFbxJk4wUGwx6eWHCNALS9erl+HHbswJA7G oI1WX1y4Su+WMWSPxWtycpnofnuWfD8Cdwv9DN5w0oKhVHhL8wtrDkyiOS0BqNjfYUJa Kz1jFIuih25KDXzYY+zMeaSk9UtvBd9oPw0mqTTRKnNdN5wJsCx3twF09umGOlpgUkku GK1BUtz5XDsZHVqtGCGCMgiNnnO9wA4murO42ctNIo2OAvZz1W6encY1tReWQ9Nw05yu dQtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737535736; x=1738140536; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ahcAYxKCW2/TnZTsjnNnWROYjAukoakSCPj81fATNcw=; b=Yh+jYpI545WdGRqfUnhxVVtdZB6+vLPl0+wvSJ8plD96xDToYCoUY1Sw8Nyr8ktCXb Xi6Q6xSVA3va685+ZWxdScYwEmw7S+h8hQdvIUuRjlFnWH9SISLGuM47FdYbJO15klHU zmbQWpCarupQwXIsg9Ib0W11NmSp292elChq8ezOOGdx2xsK57aZ24+Cries9WfNVwbQ csF6Spy6pf8uBcwJaULt6GS/clxqYBOrlQ5UoC7pCDBMADGtxa+jouvimVbMKkyuHPln R+Wnrc/ykNDRFhwq3yDEUgiMDya+/GIXh4/KmujNmCUQtekqSGGCJRyxXOanBOWzpAyI 5NWA== X-Forwarded-Encrypted: i=1; AJvYcCXKiNjQ9aDkCoHGIEc8UEF8xLERKOUGXD2SUXOtKizhxqT+jjvA1/9HhnSBY5Ur6F74REXk1RM0vXAApQ8=@vger.kernel.org X-Gm-Message-State: AOJu0YwkqrP+GvNnXb2ppYXLBSJi3kmVDmjTD0keD4pG6Z88L5Pm2v+H Aaf9ozTs9Wj9cd51sq6DZEJIF96FxjzIhqNEPOk43hhKx+FPJwhsNWDakbjX+XE= X-Gm-Gg: ASbGncvBQEB5c7xhQnWrdi95/axgPjkg8xvBC/xbmOfyPVcLHghEhXobAgdmSPJdOI6 YFl7iPr2bMxwQBlm4jOnLBiAOaTpAkJui4gQVPSyh5UUNXPWskfRhyx3NEdQu5mYw/vOE4GE/wi rGDzie++FjD6Y5dkoMpM+vcpwI3jzcdv+ZcFJUeZDhYQIdjh4JwvjjI6XEXIX070lKP2QaaMIZC CwLlUsuAwgQbECRMdW0inuxh3tl6boKbvtRL6XTJSmJjQ/oHdvohe+Dho4oN/bjsY+GiJlS38E= X-Google-Smtp-Source: AGHT+IHq3PpoCGSQdzJWDJkxvFTv6ixwaU5LzRSfdsLCE0QsOxCCYnY482OJuMYLEl9P4UbO7C0N0g== X-Received: by 2002:a05:600c:458a:b0:436:faeb:2a18 with SMTP id 5b1f17b1804b1-438913bed3fmr178285215e9.6.1737535735986; Wed, 22 Jan 2025 00:48:55 -0800 (PST) Received: from localhost ([196.207.164.177]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438b1d904cbsm12331605e9.1.2025.01.22.00.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 00:48:55 -0800 (PST) Date: Wed, 22 Jan 2025 11:48:52 +0300 From: Dan Carpenter To: "Peng Fan (OSS)" Cc: Sudeep Holla , Cristian Marussi , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , linux-kernel@vger.kernel.org, arm-scmi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, Peng Fan Subject: Re: [PATCH 2/5] firmware: arm_scmi: imx: Add i.MX95 CPU Protocol Message-ID: <3b9a7392-8ebe-4d43-a111-68bb6d2f93b6@stanley.mountain> References: <20250121-imx-lmm-cpu-v1-0-0eab7e073e4e@nxp.com> <20250121-imx-lmm-cpu-v1-2-0eab7e073e4e@nxp.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250121-imx-lmm-cpu-v1-2-0eab7e073e4e@nxp.com> On Tue, Jan 21, 2025 at 11:08:12PM +0800, Peng Fan (OSS) wrote: > From: Peng Fan > > This protocol allows an agent to start, stop a CPU or set reset vector. It > is used to manage auxiliary CPUs in an LM (e.g. additional cores in an AP > cluster). > > Signed-off-by: Peng Fan > --- > drivers/firmware/arm_scmi/vendors/imx/Kconfig | 13 +- > drivers/firmware/arm_scmi/vendors/imx/Makefile | 1 + > drivers/firmware/arm_scmi/vendors/imx/imx-sm-cpu.c | 283 +++++++++++++++++++++ > include/linux/scmi_imx_protocol.h | 10 + > 4 files changed, 306 insertions(+), 1 deletion(-) > > diff --git a/drivers/firmware/arm_scmi/vendors/imx/Kconfig b/drivers/firmware/arm_scmi/vendors/imx/Kconfig > index 1a936fc87d2350e2a21bccd45dfbeebfa3b90286..9070522510e4d3f3d7276a7581f8676006d20f90 100644 > --- a/drivers/firmware/arm_scmi/vendors/imx/Kconfig > +++ b/drivers/firmware/arm_scmi/vendors/imx/Kconfig > @@ -12,6 +12,17 @@ config IMX_SCMI_BBM_EXT > To compile this driver as a module, choose M here: the > module will be called imx-sm-bbm. > > +config IMX_SCMI_CPU_EXT > + tristate "i.MX SCMI CPU EXTENSION" > + depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF) > + default y if ARCH_MXC > + help > + This enables i.MX System CPU Protocol to manage cpu > + start, stop and etc. > + > + To compile this driver as a module, choose M here: the > + module will be called imx-sm-cpu. > + > config IMX_SCMI_LMM_EXT > tristate "i.MX SCMI LMM EXTENSION" > depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF) > @@ -21,7 +32,7 @@ config IMX_SCMI_LMM_EXT > manage Logical Machines boot, shutdown and etc. > > To compile this driver as a module, choose M here: the > - module will be called imx-sm-lmm. > + module will be called imx-sm-cpu. > It's supposed to be called imx-sm-lmm. > config IMX_SCMI_MISC_EXT > tristate "i.MX SCMI MISC EXTENSION" > diff --git a/drivers/firmware/arm_scmi/vendors/imx/Makefile b/drivers/firmware/arm_scmi/vendors/imx/Makefile > index f39a99ccaf9af757475e8b112d224669444d7ddc..e3a5ea46345c89da1afae25e55698044672b7c28 100644 > --- a/drivers/firmware/arm_scmi/vendors/imx/Makefile > +++ b/drivers/firmware/arm_scmi/vendors/imx/Makefile > @@ -1,4 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0-only > obj-$(CONFIG_IMX_SCMI_BBM_EXT) += imx-sm-bbm.o > +obj-$(CONFIG_IMX_SCMI_CPU_EXT) += imx-sm-cpu.o > obj-$(CONFIG_IMX_SCMI_LMM_EXT) += imx-sm-lmm.o > obj-$(CONFIG_IMX_SCMI_MISC_EXT) += imx-sm-misc.o > diff --git a/drivers/firmware/arm_scmi/vendors/imx/imx-sm-cpu.c b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-cpu.c > new file mode 100644 > index 0000000000000000000000000000000000000000..e3f294c2cb69a5b5a916d55984f4a63539937d02 > --- /dev/null > +++ b/drivers/firmware/arm_scmi/vendors/imx/imx-sm-cpu.c > @@ -0,0 +1,283 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * System control and Management Interface (SCMI) NXP CPU Protocol > + * > + * Copyright 2025 NXP > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "../../protocols.h" > +#include "../../notify.h" > + > +#define SCMI_PROTOCOL_SUPPORTED_VERSION 0x10000 > + > +enum scmi_imx_cpu_protocol_cmd { > + SCMI_IMX_CPU_ATTRIBUTES = 0x3, > + SCMI_IMX_CPU_START = 0x4, > + SCMI_IMX_CPU_STOP = 0x5, > + SCMI_IMX_CPU_RESET_VECTOR_SET = 0x6, > + SCMI_IMX_CPU_INFO_GET = 0xC, > +}; > + > +struct scmi_imx_cpu_info { > + u32 nr_cpu; > +}; > + > +#define SCMI_IMX_CPU_PROTO_ATTR_NUM_CPUS(x) ((x) & 0xFFFF) > +struct scmi_msg_imx_cpu_protocol_attributes { > + __le32 attributes; > +}; > + > +struct scmi_msg_imx_cpu_attributes_out { > + __le32 attributes; > +#define CPU_MAX_NAME 16 > + u8 name[CPU_MAX_NAME]; char is always unsigned in the kernel these days but strings should still always be char. Same thing in patch 1, there were a couple u8 names. > +}; > + > +struct scmi_imx_cpu_reset_vector_set_in { > + __le32 cpuid; > +#define CPU_VEC_FLAGS_RESUME BIT(31) > +#define CPU_VEC_FLAGS_START BIT(30) > +#define CPU_VEC_FLAGS_BOOT BIT(29) > + __le32 flags; > + __le32 resetvectorlow; > + __le32 resetvectorhigh; > +}; > + > +struct scmi_imx_cpu_info_get_out { > +#define CPU_RUN_MODE_START 0 > +#define CPU_RUN_MODE_HOLD 1 > +#define CPU_RUN_MODE_STOP 2 > +#define CPU_RUN_MODE_SLEEP 3 > + __le32 runmode; > + __le32 sleepmode; > + __le32 resetvectorlow; > + __le32 resetvectorhigh; > +}; > + > +static int scmi_imx_cpu_validate_cpuid(const struct scmi_protocol_handle *ph, > + u32 cpuid) > +{ > + struct scmi_imx_cpu_info *info = ph->get_priv(ph); > + > + if (cpuid >= info->nr_cpu) > + return -EINVAL; > + > + return 0; > +} > + > +static int scmi_imx_cpu_start(const struct scmi_protocol_handle *ph, u32 cpuid) > +{ > + struct scmi_xfer *t; > + int ret; > + > + ret = scmi_imx_cpu_validate_cpuid(ph, cpuid); > + if (ret) > + return ret; > + > + ret = ph->xops->xfer_get_init(ph, SCMI_IMX_CPU_START, sizeof(u32), > + 0, &t); > + if (ret) > + return ret; > + > + put_unaligned_le32(cpuid, t->tx.buf); > + ret = ph->xops->do_xfer(ph, t); > + > + ph->xops->xfer_put(ph, t); > + > + return ret; > +} > + > +static int scmi_imx_cpu_stop(const struct scmi_protocol_handle *ph, u32 cpuid) > +{ > + struct scmi_xfer *t; > + int ret; > + > + ret = scmi_imx_cpu_validate_cpuid(ph, cpuid); > + if (ret) > + return ret; > + > + ret = ph->xops->xfer_get_init(ph, SCMI_IMX_CPU_STOP, sizeof(u32), > + 0, &t); > + if (ret) > + return ret; > + > + put_unaligned_le32(cpuid, t->tx.buf); > + ret = ph->xops->do_xfer(ph, t); > + > + ph->xops->xfer_put(ph, t); > + > + return ret; > +} > + > +static int scmi_imx_cpu_reset_vector_set(const struct scmi_protocol_handle *ph, > + u32 cpuid, u64 vector, bool start, > + bool boot, bool resume) > +{ > + struct scmi_imx_cpu_reset_vector_set_in *in; > + struct scmi_xfer *t; > + int ret; > + > + ret = scmi_imx_cpu_validate_cpuid(ph, cpuid); > + if (ret) > + return ret; > + > + ret = ph->xops->xfer_get_init(ph, SCMI_IMX_CPU_RESET_VECTOR_SET, sizeof(*in), > + 0, &t); > + if (ret) > + return ret; > + > + in = t->tx.buf; > + in->cpuid = cpu_to_le32(cpuid); > + in->flags = start ? CPU_VEC_FLAGS_START : 0; > + in->flags |= boot ? CPU_VEC_FLAGS_BOOT : 0; > + in->flags |= resume ? CPU_VEC_FLAGS_BOOT : 0; s/CPU_VEC_FLAGS_BOOT/CPU_VEC_FLAGS_RESUME/ > + in->resetvectorlow = cpu_to_le32(lower_32_bits(vector)); > + in->resetvectorhigh = cpu_to_le32(upper_32_bits(vector)); > + ret = ph->xops->do_xfer(ph, t); > + > + ph->xops->xfer_put(ph, t); > + > + return ret; > +} > + > +static int scmi_imx_cpu_started(const struct scmi_protocol_handle *ph, u32 cpuid, > + bool *started) > +{ > + struct scmi_imx_cpu_info_get_out *out; > + struct scmi_xfer *t; > + int ret; > + > + *started = false; > + ret = scmi_imx_cpu_validate_cpuid(ph, cpuid); > + if (ret) > + return ret; > + > + ret = ph->xops->xfer_get_init(ph, SCMI_IMX_CPU_INFO_GET, sizeof(u32), > + 0, &t); > + if (ret) > + return ret; > + > + put_unaligned_le32(cpuid, t->tx.buf); > + ret = ph->xops->do_xfer(ph, t); > + if (!ret) { > + out = t->rx.buf; > + if ((out->runmode == CPU_RUN_MODE_START) || > + (out->runmode == CPU_RUN_MODE_SLEEP)) > + *started = true; > + } > + > + ph->xops->xfer_put(ph, t); > + > + return ret; > +} > + > +static const struct scmi_imx_cpu_proto_ops scmi_imx_cpu_proto_ops = { > + .cpu_reset_vector_set = scmi_imx_cpu_reset_vector_set, > + .cpu_start = scmi_imx_cpu_start, > + .cpu_started = scmi_imx_cpu_started, > + .cpu_stop = scmi_imx_cpu_stop, > +}; > + > +static int scmi_imx_cpu_protocol_attributes_get(const struct scmi_protocol_handle *ph, > + struct scmi_imx_cpu_info *info) > +{ > + struct scmi_msg_imx_cpu_protocol_attributes *attr; > + struct scmi_xfer *t; > + int ret; > + > + ret = ph->xops->xfer_get_init(ph, PROTOCOL_ATTRIBUTES, 0, > + sizeof(*attr), &t); > + if (ret) > + return ret; > + > + attr = t->rx.buf; > + > + ret = ph->xops->do_xfer(ph, t); > + if (!ret) { > + info->nr_cpu = SCMI_IMX_CPU_PROTO_ATTR_NUM_CPUS(attr->attributes); > + dev_info(ph->dev, "i.MX SM CPU: %d cpus\n", > + info->nr_cpu); This can fit in 80 characters: dev_info(ph->dev, "i.MX SM CPU: %d cpus\n", info->nr_cpu); > + } > + > + ph->xops->xfer_put(ph, t); > + > + return ret; > +} > + > +static int scmi_imx_cpu_attributes_get(const struct scmi_protocol_handle *ph, > + u32 cpuid, struct scmi_imx_cpu_info *info) No need to pass the "info" pointer. > +{ > + struct scmi_msg_imx_cpu_attributes_out *out; > + struct scmi_xfer *t; > + int ret; > + > + ret = ph->xops->xfer_get_init(ph, SCMI_IMX_CPU_ATTRIBUTES, sizeof(u32), 0, &t); > + if (ret) > + return ret; > + > + put_unaligned_le32(cpuid, t->tx.buf); > + ret = ph->xops->do_xfer(ph, t); > + if (!ret) { > + out = t->rx.buf; > + dev_info(ph->dev, "i.MX CPU: name: %s\n", out->name); > + } else { > + dev_err(ph->dev, "i.MX cpu: Failed to get info of cpu(%u)\n", cpuid); > + } > + > + ph->xops->xfer_put(ph, t); > + > + return ret; > +} > + > + Multiple blank lines (checkpatch.pl --strict). > +static int scmi_imx_cpu_protocol_init(const struct scmi_protocol_handle *ph) > +{ regards, dan carpenter