From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31FAA225A3B for ; Sat, 19 Jul 2025 15:13:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752938018; cv=none; b=tf9eQrHhy9NF+DrsPxPxb7/a3xHXwBwabaI7HijaqIhom+AvQbLmYOJaXUTRDGJqwhh7hqlAkakqd01moa1PxpWMcgZ86s1aSEWxkf6PiUye+z915YRQPFyFJ4xh9rsilPRK2ttbwGs9QgKeBCXXbud070hij2f5ohNAfCe+Dxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752938018; c=relaxed/simple; bh=LHiSpD9ddzHXs5xA36UiO0jJfHyA3jmQvsxYCvrKPJM=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=VqiACwcqcZFGi/8Tw7oahO1E/C4snzwzxXqw+V+uMl9hYumWoclrVBim5aleuqYql75qMbcrPpssyZnzJjC7OvuGRE3kAmw48LoiSgMi7xeNFnv07L/jSZeX+htFZhGUp5+PZvAQrJVc3tZVxZ3uwulOBZn0iTgHparIu612HHo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=lhkpmHk4; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="lhkpmHk4" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56J5Z8bu032483 for ; Sat, 19 Jul 2025 15:13:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= N4yenXeA82Xv9d2lazGQ09pdNlii0X5jAguSOhQVfak=; b=lhkpmHk4TYybt0y8 0w5Yus7BwA+TFSsHgD8uulAJs9hfpI2uj1Fk8Z5TVCGApXfauPjl7PmlW4QUy7HY tZx6SmbTpNPfB9XJz3ieDpUziuH793PV0vmUrVRifKW34d8T7V/ViymRSxIC15yZ tuEsv7qkHgXO2GoFjPHks40BJJ9vH04I+VhzYqF/PhN80jE/V19m/52fQ5kredkc N/Zgn8JQ/Lzx3G6m3MDznOzvzHnRfapYsPyuNs+BfmuPlzJ9o8nn/wZa1ANqUKjF HqoeHVKgm6kvd84Uf3lrfUSE02NCRWIevNG1H2w9hoF20nkutJjW7FoB0Aw2emJu 65PV6A== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48048v0t2b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 19 Jul 2025 15:13:36 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-747ddba7c90so2624548b3a.0 for ; Sat, 19 Jul 2025 08:13:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752938015; x=1753542815; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=N4yenXeA82Xv9d2lazGQ09pdNlii0X5jAguSOhQVfak=; b=g7sTcqOqyHBci5nB7r469rkB+44zKDWHialqqDX87sdoV0T0CwcXE2pEwGYDHixo8C TiCUKeF1CYhqabJ2d15/HPH97JW348liLIrv2YjfBPTe6otharkrGNTwOs6QeNA6l6P9 I+DkezjVfG8Wv5s69BmAmjTIxtNJPB4k0mF3b9qpVHqt5/V/WAkAEbfjhgb/RgbZfj6F nnkcdwoAgn/yMo7IxQs2juA57A7RJpt7rXmePEji4mr8OMXk4CNx49bsCgk1w09Py00Z 30AictrA73PJLEb7OFId4cqCekkZi2WfayAcVPdWuWYTUTKJ7a0gOAo2z57Cd6zfcmSr sKhw== X-Forwarded-Encrypted: i=1; AJvYcCVaPYAo9pIWBSBOA5uNG/mMKEPMbsLnHuduxVb2lpknI+JSimH1OuEpzkVrPA+FEokjVlxXFc3c2JPn9j4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8yBIsik4zjZXphfUo+nYALkr8OmqnU8UicJE3ZOK+05wnjaS/ ucuyEYwBezCjtyDeMk1qjxUNemmAME/DfoyKbz1obFGfifYpFEZm1v/HyNcHHO7OQkUVUbbcqVq RfoNQBRU8uXdGZDY/+b/hHX48SYjspVuv4Jwtjj+cMuYBgXdwpN1gwNjjc8tM9IDEcjE= X-Gm-Gg: ASbGnctfJCXdKE0EIOcx/5EnRWkP+KZ3YVY54caLrN/zYx/lULa+455ZmTiM5FFm9Sw EVx+1NuiH9pheY80rhSZyqFP8F57hK1fWl6tgZ+6Py932T/+FxUtWV39YhlsEeooFnsN6LB3efb QlNwVtfQIhbqey+5iivkrJMlyF0OSxo6XNyFm1/5WF0xMFGal+bNRR+/pylwIafrHuOX1aj1exh JVE0sTHI7JcJLbjARxsHAUHaLPufJrofZ6Yrt3MVEe+6sP9GILKF6AwXFLNB5X+ClMjGxyAueO9 DRoa4zvupulpsTdL+fHkb0HmRDWFvymnqU+Rt28wPOYDKWIZA5KCh90HC6XSFyt3fc0LPUkJvho q X-Received: by 2002:a05:6a20:7288:b0:234:6752:3990 with SMTP id adf61e73a8af0-23810d51028mr20981363637.17.1752938014950; Sat, 19 Jul 2025 08:13:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzmo2GUvd5Jo/4KSwDINSwLCCMWzD5il+U3EunZk8kHN8TP0NkWz6wI5LF7R6azoXh6FMvVQ== X-Received: by 2002:a05:6a20:7288:b0:234:6752:3990 with SMTP id adf61e73a8af0-23810d51028mr20981321637.17.1752938014405; Sat, 19 Jul 2025 08:13:34 -0700 (PDT) Received: from [192.168.29.115] ([49.43.231.65]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b3f2ffa9850sm2781064a12.65.2025.07.19.08.13.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 19 Jul 2025 08:13:33 -0700 (PDT) Message-ID: <713b2cc8-1bc7-a8b7-678b-5fc7fe25615a@oss.qualcomm.com> Date: Sat, 19 Jul 2025 20:43:24 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH v11 2/8] power: reset: reboot-mode: Add support for 64 bit magic Content-Language: en-US To: Dmitry Baryshkov Cc: Bartosz Golaszewski , Bjorn Andersson , Sebastian Reichel , Rob Herring , Sudeep Holla , Souvik Chakravarty , Krzysztof Kozlowski , Conor Dooley , Andy Yan , Mark Rutland , Lorenzo Pieralisi , Arnd Bergmann , Konrad Dybcio , cros-qcom-dts-watchers@chromium.org, Vinod Koul , Catalin Marinas , Will Deacon , Florian Fainelli , Mukesh Ojha , Stephen Boyd , Andre Draszik , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Elliot Berman , Srinivas Kandagatla References: <20250717-arm-psci-system_reset2-vendor-reboots-v11-0-df3e2b2183c3@oss.qualcomm.com> <20250717-arm-psci-system_reset2-vendor-reboots-v11-2-df3e2b2183c3@oss.qualcomm.com> <6vlm3ybjpy2jq3cr2pzj4vcmqwoissdml2xmhfzlulfbrpzakt@xrepu6c5zykb> From: Shivendra Pratap In-Reply-To: <6vlm3ybjpy2jq3cr2pzj4vcmqwoissdml2xmhfzlulfbrpzakt@xrepu6c5zykb> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: KSuYg6MnUAnT41TBVhZ6hruuVAobDECp X-Authority-Analysis: v=2.4 cv=SYL3duRu c=1 sm=1 tr=0 ts=687bb620 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=PsbcbGlCJbaar3GLNM5paQ==:17 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=EUspDBNiAAAA:8 a=inMTZjCaIjW8_VgAgDgA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzE5MDE1MiBTYWx0ZWRfX0xnHhcnxNoa0 8NC69R397g15gYB5OebW4QxjVWZawKNWUZRTELeJRX0kjOIlDup0ZEZTOOuugeXtdXXOgxkUykg r2RPOps/w6s3V2awHXf06N90GfDHhPl16cPxkUtFAbpjJMQHDO2haTxQCla6rlj9KTXQ/W4fJur QEgmQq9vXozJjlTFDEdR7orSb4RVDZ6ldmTMsVKwA5vDuuYWuc5dvLePcdwy0EbIj76UJGNyLzE OmupyPvFqwG/9ctG4iZAVK1Qrkgodno7DsLIrbW/Ai8VlIhHgUmreCFVq6TlBaqvolqKQIADqIa aHATNRRN8GY5aBsq2Qttkgz+6dRn1tCk6Km4MpyoMsr9Be1uryA9VEwqZy6R3WytwbpygqoB29o 3Ku0lEVV0KnepKCHe0uE1OUrM4HJ4qCKSxILg42OZnvUMi9A3kQ1707nylRC+jFZP7vCs1c3 X-Proofpoint-ORIG-GUID: KSuYg6MnUAnT41TBVhZ6hruuVAobDECp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-19_01,2025-07-17_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 malwarescore=0 spamscore=0 clxscore=1015 priorityscore=1501 adultscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507190152 On 7/19/2025 12:10 AM, Dmitry Baryshkov wrote: > On Thu, Jul 17, 2025 at 06:16:48PM +0530, Shivendra Pratap wrote: >> Current reboot-mode supports a single 32-bit argument for any >> supported mode. Some reboot-mode based drivers may require >> passing two independent 32-bit arguments during a reboot >> sequence, for uses-cases, where a mode requires an additional >> argument. Such drivers may not be able to use the reboot-mode >> driver. For example, ARM PSCI vendor-specific resets, need two >> arguments for its operation – reset_type and cookie, to complete >> the reset operation. If a driver wants to implement this >> firmware-based reset, it cannot use reboot-mode framework. >> >> Introduce 64-bit magic values in reboot-mode driver to >> accommodate dual 32-bit arguments when specified via device tree. >> In cases, where no second argument is passed from device tree, >> keep the upper 32-bit of magic un-changed(0) to maintain backward >> compatibility. >> >> Update the current drivers using reboot-mode for a 64-bit magic >> value. >> >> Signed-off-by: Shivendra Pratap >> --- >> drivers/power/reset/nvmem-reboot-mode.c | 5 ++--- >> drivers/power/reset/qcom-pon.c | 5 ++--- >> drivers/power/reset/reboot-mode.c | 27 +++++++++++++++------------ >> drivers/power/reset/syscon-reboot-mode.c | 5 ++--- >> include/linux/reboot-mode.h | 4 +++- >> 5 files changed, 24 insertions(+), 22 deletions(-) >> >> diff --git a/drivers/power/reset/nvmem-reboot-mode.c b/drivers/power/reset/nvmem-reboot-mode.c >> index 41530b70cfc48c2a83fbbd96f523d5816960a0d1..e3eed943fdefa271b22e1f1891abef5c9095b9a5 100644 >> --- a/drivers/power/reset/nvmem-reboot-mode.c >> +++ b/drivers/power/reset/nvmem-reboot-mode.c >> @@ -16,15 +16,14 @@ struct nvmem_reboot_mode { >> struct nvmem_cell *cell; >> }; >> >> -static int nvmem_reboot_mode_write(struct reboot_mode_driver *reboot, >> - unsigned int magic) >> +static int nvmem_reboot_mode_write(struct reboot_mode_driver *reboot, u64 magic) >> { >> int ret; >> struct nvmem_reboot_mode *nvmem_rbm; >> >> nvmem_rbm = container_of(reboot, struct nvmem_reboot_mode, reboot); >> >> - ret = nvmem_cell_write(nvmem_rbm->cell, &magic, sizeof(magic)); >> + ret = nvmem_cell_write(nvmem_rbm->cell, (u32 *)&magic, sizeof(u32)); > > This will work differently on BE and LE systems. Assign a temp var and > use it. Ack. > >> if (ret < 0) >> dev_err(reboot->dev, "update reboot mode bits failed\n"); >> >> diff --git a/drivers/power/reset/qcom-pon.c b/drivers/power/reset/qcom-pon.c >> index 7e108982a582e8243c5c806bd4a793646b87189f..93daf93c097f970afbaf43d36b1e4f725ca7a81f 100644 >> --- a/drivers/power/reset/qcom-pon.c >> +++ b/drivers/power/reset/qcom-pon.c >> @@ -27,8 +27,7 @@ struct qcom_pon { >> long reason_shift; >> }; >> >> -static int qcom_pon_reboot_mode_write(struct reboot_mode_driver *reboot, >> - unsigned int magic) >> +static int qcom_pon_reboot_mode_write(struct reboot_mode_driver *reboot, u64 magic) >> { >> struct qcom_pon *pon = container_of >> (reboot, struct qcom_pon, reboot_mode); >> @@ -37,7 +36,7 @@ static int qcom_pon_reboot_mode_write(struct reboot_mode_driver *reboot, >> ret = regmap_update_bits(pon->regmap, >> pon->baseaddr + PON_SOFT_RB_SPARE, >> GENMASK(7, pon->reason_shift), >> - magic << pon->reason_shift); >> + ((u32)magic) << pon->reason_shift); >> if (ret < 0) >> dev_err(pon->dev, "update reboot mode bits failed\n"); >> >> diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c >> index 0269ec55106472cf2f2b12bd65704dd0114bf4a3..1196627fbf98d87eec57a3d4ee544e403e6eb946 100644 >> --- a/drivers/power/reset/reboot-mode.c >> +++ b/drivers/power/reset/reboot-mode.c >> @@ -19,12 +19,11 @@ >> >> struct mode_info { >> const char *mode; >> - u32 magic; >> + u64 magic; >> struct list_head list; >> }; >> >> -static unsigned int get_reboot_mode_magic(struct reboot_mode_driver *reboot, >> - const char *cmd) >> +static struct mode_info *get_reboot_mode_info(struct reboot_mode_driver *reboot, const char *cmd) > > Why? This doesn't seem relevant to u32 -> u64 conversion. yes. This function is no more needed. Will update it for u64. > >> { >> const char *normal = "normal"; >> struct mode_info *info; >> @@ -35,11 +34,11 @@ static unsigned int get_reboot_mode_magic(struct reboot_mode_driver *reboot, >> >> list_for_each_entry(info, &reboot->head, list) >> if (!strcmp(info->mode, cmd)) >> - return info->magic; >> + return info; >> >> /* try to match again, replacing characters impossible in DT */ >> if (strscpy(cmd_, cmd, sizeof(cmd_)) == -E2BIG) >> - return 0; >> + return NULL; >> >> strreplace(cmd_, ' ', '-'); >> strreplace(cmd_, ',', '-'); >> @@ -47,21 +46,21 @@ static unsigned int get_reboot_mode_magic(struct reboot_mode_driver *reboot, >> >> list_for_each_entry(info, &reboot->head, list) >> if (!strcmp(info->mode, cmd_)) >> - return info->magic; >> + return info; >> >> - return 0; >> + return NULL; >> } >> >> static int reboot_mode_notify(struct notifier_block *this, >> unsigned long mode, void *cmd) >> { >> struct reboot_mode_driver *reboot; >> - unsigned int magic; >> + struct mode_info *info; >> >> reboot = container_of(this, struct reboot_mode_driver, reboot_notifier); >> - magic = get_reboot_mode_magic(reboot, cmd); >> - if (magic) >> - reboot->write(reboot, magic); >> + info = get_reboot_mode_info(reboot, cmd); >> + if (info) >> + reboot->write(reboot, info->magic); >> >> return NOTIFY_DONE; >> } >> @@ -78,6 +77,7 @@ int reboot_mode_register(struct reboot_mode_driver *reboot, struct device_node * >> struct mode_info *info; >> struct property *prop; >> size_t len = strlen(PREFIX); >> + u32 magic_64; >> int ret; >> >> if (!np) >> @@ -95,12 +95,15 @@ int reboot_mode_register(struct reboot_mode_driver *reboot, struct device_node * >> goto error; >> } >> >> - if (of_property_read_u32(np, prop->name, &info->magic)) { >> + if (of_property_read_u32(np, prop->name, (u32 *)&info->magic)) { > > Again, somebody didn't think about endianness. Ack. will update this wherever applicable. > >> pr_err("reboot mode %s without magic number\n", info->mode); >> kfree(info); >> continue; >> } >> >> + if (!of_property_read_u32_index(np, prop->name, 1, &magic_64)) >> + info->magic |= (u64)magic_64 << 32; >> + >> info->mode = kstrdup_const(prop->name + len, GFP_KERNEL); >> if (!info->mode) { >> ret = -ENOMEM; >> diff --git a/drivers/power/reset/syscon-reboot-mode.c b/drivers/power/reset/syscon-reboot-mode.c >> index e0772c9f70f7a19cd8ec8a0b7fdbbaa7ba44afd0..6783d05e80fbc2c812b45ffe69755478af90d30a 100644 >> --- a/drivers/power/reset/syscon-reboot-mode.c >> +++ b/drivers/power/reset/syscon-reboot-mode.c >> @@ -20,8 +20,7 @@ struct syscon_reboot_mode { >> u32 mask; >> }; >> >> -static int syscon_reboot_mode_write(struct reboot_mode_driver *reboot, >> - unsigned int magic) >> +static int syscon_reboot_mode_write(struct reboot_mode_driver *reboot, u64 magic) >> { >> struct syscon_reboot_mode *syscon_rbm; >> int ret; >> @@ -29,7 +28,7 @@ static int syscon_reboot_mode_write(struct reboot_mode_driver *reboot, >> syscon_rbm = container_of(reboot, struct syscon_reboot_mode, reboot); >> >> ret = regmap_update_bits(syscon_rbm->map, syscon_rbm->offset, >> - syscon_rbm->mask, magic); >> + syscon_rbm->mask, (u32)magic); >> if (ret < 0) >> dev_err(reboot->dev, "update reboot mode bits failed\n"); >> >> diff --git a/include/linux/reboot-mode.h b/include/linux/reboot-mode.h >> index 36f071f4b82e1fc255d8dd679a18e537655c3179..d9d9165a8635e5d55d92197a69c7fae179ac2045 100644 >> --- a/include/linux/reboot-mode.h >> +++ b/include/linux/reboot-mode.h >> @@ -2,10 +2,12 @@ >> #ifndef __REBOOT_MODE_H__ >> #define __REBOOT_MODE_H__ >> >> +#include >> + >> struct reboot_mode_driver { >> struct device *dev; >> struct list_head head; >> - int (*write)(struct reboot_mode_driver *reboot, unsigned int magic); >> + int (*write)(struct reboot_mode_driver *reboot, u64 magic); >> struct notifier_block reboot_notifier; >> }; >> >> >> -- >> 2.34.1 >> >