From nobody Sun Apr 5 13:12:28 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 F2FFB346E55 for ; Wed, 11 Mar 2026 05:46:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773208009; cv=none; b=PawAyeMajzM5U/2jwcFQF99Z6+s1yH6TrmiVsdCDvckzHawmjzXizzZ7ais7s854fWT2ilswo4yasSvhbxmhFjD5afrhL1HsF6yMeIGOWfrP8ALGi0Mth0Za186inODEgM3QecMYY1YpAv44QVbjGDMvY0nWloFAix5ipBaEBRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773208009; c=relaxed/simple; bh=cVVG4MkyscY1qtPoUsoyn8mWMRvlJbKMwxOJCEj7VLg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k/gVOGlCRQphX8ULsaXVy1XjCsPTjvs4pT0ZyYSRSOOlNmEzB745kenGIby7CO1d8h6wlf9wwbuhBRT1IlqGtXiwj/5jD9orl4H//bOOzn+sIyE6paIgUJ63eGku7MHH3a9M5Ep/M2xThKjrlZcAreZe+3NTH/Yf/rIM4Xg7kGw= 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=erMPqiE6; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=A/qQSC+6; arc=none smtp.client-ip=205.220.180.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="erMPqiE6"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="A/qQSC+6" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B2tn8F249216 for ; Wed, 11 Mar 2026 05:46:46 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= RGjJZDCOw/JM7x4VTsDtjQl0GpiD3yXd9P4Ux06z21k=; b=erMPqiE6z4nLBgSL YYh5dZelzYYFOdO7oJN2sicJ2NDagoQsRCMGhRVO0o1lkux18AMWeyD0fL4yQJ44 BsxtfMTgeZa+NQAldjqcauT1dHZ/5F4MZyslGwfA73fs5exfSdufXq7UI3/+GuWL sGIcjBHTIZxVYG6UHgPp+HPXjhNQIQ/bNhi9aCtYbqliODHfOpmRBabprjjXEtgQ TDtIrMQS32W7HmGwIu23vMdyrf43yDHmxy64WBrAEj/XR1tntjAyCcZ8p+JCq5MR 5joRlSH8mT9zOb4AuIf6LvJYgSwwNilMp9ii2cC6wmiUbGahugEpyP5fV8P4GLfo 4D52OQ== Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctqv12258-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 05:46:45 +0000 (GMT) Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-c737b6686ddso4225752a12.3 for ; Tue, 10 Mar 2026 22:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773208005; x=1773812805; 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=RGjJZDCOw/JM7x4VTsDtjQl0GpiD3yXd9P4Ux06z21k=; b=A/qQSC+6IxQeSuJCPWEiVG61B/CbY5Qr1CoUU7YgZdXhrCNtkCwiZPFrdj0bdiEVOc owosN599LcjXY+4126ilPnOl8Tyn48ce/If6qhhWUrAX74Mj6Vvqqwp6KBVVOwuyUFSF Id4kAU46kEW3mitJ5edGzuuVpACWCkMA9QicE1mLhP2ctMzRA2APszQ9sBfBCZVL+CXH 7ztieUWCyhasv0lcf7/1S2O9BNzC3sUp8kZcjDGsD5wT+pvitsLe/K7Za16tXQ2sDXQS lDV/DrUy37seESE+JzwVUPot5GDp15XychWV8u06/08oX/xG88DGa/YP12L+6my8kfw8 AdnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773208005; x=1773812805; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=RGjJZDCOw/JM7x4VTsDtjQl0GpiD3yXd9P4Ux06z21k=; b=GpWvANlITvcNuto2DK++6+EuzE24NfYw+nOBiAdhYetU28XsbtG97LdXHzBxaPds5S WXM2+O4HVtTDTelNSmm376iCvdvxPsXYIsS1RQrUAKQiSLVZ/x8rW4dDUIgwPC1/Bj9i twlgNTsTB3DoH5bKIkJDrJEZ68cZRHWuWdekDILpf0c8SAdvLz2AOh6quvH6XMIknk+g dgc4G3K0ZQlA9pM5EtmVSF5wEXsFvbJC+EMjWn2C59l6TccBE3mENa+H7derGdJ4qo8m aAnvh0PZ2qSBU7gEDTTNnBuVWp8rd3zBTjxJ4FQyXpwxW5suH8uINeMbeZkOU+khw31f 9ozw== X-Forwarded-Encrypted: i=1; AJvYcCWWr8OjkaZ2uvuem4rL/6lD+HySiUJYtC4vyIE0eCIX3D0abvCRX5SDtzcitPK1t98Q9y7gPy3H/srh/ZA=@vger.kernel.org X-Gm-Message-State: AOJu0YzbOMwoo0Ghw3Hviec8TJz9W9R14EF0tW/dN8IaXDzykhjAGxSX VSd8rMUhec2wlWiuT3zrDq93ouGU2JiQqVpcdtXB1ul2Q1IADk3Vle5b/mwhuhfNxwKS3sdSDMS oUUyW3jnK+WhOxhNFHGr+sr+5fvQGxIlROI4w/8LX/t/VeQWLv9hZwJM5Wj5f511vRX/gKWR0Cv g= X-Gm-Gg: ATEYQzwXoMKn+7h+wDCaTJVMj5oy9YySa1e9JsJP5BRie6+RWmttMxiepR3JDucQevU SsZMgEQPBfvy/T3cpdofx9UxUbmaCIqV7l4NnT8V3w1pmdYvUcXhEIJpaTfJanPSmaHt0Ijh6KU FcQKhVRpgWJXiCuZua1uLcDrj9XZjrkhBWpYPXFGfXcWUe6hNUADUgUmHhdyo9BzQoPMeQ3ukG7 QN/7q+g6iUjkM9BzuES+e748Gaql+QO2cNOrYzf0IsnJFxetZiSSC1f+DXfZN82DPHUXsvVyJ1b ZsXiW4BzOaLLBQGsho4d7z9yAqlZpnme8Jw8huPDw8Eg/+53rpLbkFoYZDHqys+D0JCK3gK1kyx Mg/1bYPpyy37LbHs63KqO/A+ArKLEiwxiEksFJV5H6GCYzlun8B1Y8cc= X-Received: by 2002:a05:6a00:f04:b0:829:9ea2:3e17 with SMTP id d2e1a72fcca58-829f6e68c8bmr1376787b3a.9.1773208004748; Tue, 10 Mar 2026 22:46:44 -0700 (PDT) X-Received: by 2002:a05:6a00:f04:b0:829:9ea2:3e17 with SMTP id d2e1a72fcca58-829f6e68c8bmr1376770b3a.9.1773208004254; Tue, 10 Mar 2026 22:46:44 -0700 (PDT) Received: from hu-pkondeti-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829f6eebf43sm1114108b3a.39.2026.03.10.22.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 22:46:43 -0700 (PDT) From: Pavankumar Kondeti Date: Wed, 11 Mar 2026 11:16:30 +0530 Subject: [PATCH RESEND v8 1/2] firmware: qcom: scm: Register gunyah watchdog device 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="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260311-gunyah_watchdog-v8-1-4c1c0689de22@oss.qualcomm.com> References: <20260311-gunyah_watchdog-v8-0-4c1c0689de22@oss.qualcomm.com> In-Reply-To: <20260311-gunyah_watchdog-v8-0-4c1c0689de22@oss.qualcomm.com> To: Bjorn Andersson , Konrad Dybcio , Wim Van Sebroeck , Guenter Roeck Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Hrishabh Rajput , Pavankumar Kondeti , Dmitry Baryshkov , Shivendra Pratap , Neil Armstrong X-Mailer: b4 0.15-dev-dd521 X-Developer-Signature: v=1; a=ed25519-sha256; t=1773207995; l=3227; i=pavan.kondeti@oss.qualcomm.com; s=20260311; h=from:subject:message-id; bh=Ixc7jFfJtf3sYdNbi1DoA+ted+UPWdZsOBlvyEIVFtk=; b=kaXDlCTlXIpFBqcbs0fuEmRqJ3g7Ex/Y1wLPSAa8uN54wY7kFMvphZCwNmf7qDdPkUBkzq76F yVhrewOPHYYC5us3GUJDdJ6gN6r24Uii+rqF83sKb7nyUvFg50bvPPq X-Developer-Key: i=pavan.kondeti@oss.qualcomm.com; a=ed25519; pk=Pdl9NnQpMlqbYaAGGkgBGpURTnZFe2de5LRZSGHkbHY= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDA0NiBTYWx0ZWRfX07pjIxqzrwjN SqPuvYraK0XyZuafojRBsDTMJLvZtK5/LgM7IeF0xfEHyrHYC475F54qRfDu3PMJ8vujnBfZbVU VsVtVRjaMTnX7+0FtiFgKJFeBMe4QS+1BQPRL8/N475q7jVPz3gWUsnhMSGDR2LPln5DWk7LtT2 TUjojaoCsdidvF+MsZfSlVls+D8KJtt4N9Q9VxLERykacNm8KZCECT6SSBqiIzGuPH66H5JauJI 3doo8ZusEPcGLAGuY0Dec5HMziAD9D9LoH7LdlAfaIz3IGgU3iKVQhWl1k0zvWag9sFrOSfQUoA SmHm5iyQYgczOG2glyITt5zuNZiLjv/eiVfGDLUKnv4J/fo8ax0KTQDvVPOrxsxv7tH0/aSvNM5 LRLcNqOaDwBcyvl+bj6L3vUVO2pHtHO4uaxuhWakBPq92u2k7JV518fSKQrVHn5ThG7qiEnP5d6 3HPVNPIkwOuPRIFvKUg== X-Proofpoint-GUID: lvNopAH1Q5K4ztrjLty-NOrwDtObXDUu X-Authority-Analysis: v=2.4 cv=S5vUAYsP c=1 sm=1 tr=0 ts=69b101c5 cx=c_pps a=oF/VQ+ItUULfLr/lQ2/icg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=KKAkSRfTAAAA:8 a=g8_2rFH-n0ZcawzQyqcA:9 a=QEXdDO2ut3YA:10 a=3WC7DwWrALyhR5TkjVHa:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: lvNopAH1Q5K4ztrjLty-NOrwDtObXDUu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-10_05,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110046 From: Hrishabh Rajput To restrict Gunyah watchdog initialization to Qualcomm platforms running under the Gunyah Hypervisor, register the watchdog device in the QCOM SCM driver. When Gunyah is not present or Gunyah emulates MMIO-based watchdog, we expect Qualcomm watchdog or ARM SBSA watchdog device to be present in the devicetree. First, we make sure we're running under the Gunyah Hypervisor. Then we move to check if any of the above mentioned watchdog device nodes are present, if not then we proceed to register the SMC-based Gunyah watchdog device. Reviewed-by: Dmitry Baryshkov Tested-by: Shivendra Pratap Tested-by: Neil Armstrong Signed-off-by: Hrishabh Rajput Signed-off-by: Pavankumar Kondeti Tested-by: Mukesh Ojha --- drivers/firmware/qcom/qcom_scm.c | 53 ++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 53 insertions(+) diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_= scm.c index 8fbc96693a55..1611e1ab3a31 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -2467,6 +2467,56 @@ int qcom_scm_qtee_callback_response(phys_addr_t buf,= size_t buf_size, } EXPORT_SYMBOL(qcom_scm_qtee_callback_response); =20 +static void qcom_scm_gunyah_wdt_free(void *data) +{ + struct platform_device *gunyah_wdt_dev =3D data; + + platform_device_unregister(gunyah_wdt_dev); +} + +static void qcom_scm_gunyah_wdt_init(struct qcom_scm *scm) +{ + struct platform_device *gunyah_wdt_dev; + struct device_node *np; + bool of_wdt_available; + int i; + static const uuid_t gunyah_uuid =3D UUID_INIT(0xc1d58fcd, 0xa453, 0x5fdb, + 0x92, 0x65, 0xce, 0x36, + 0x67, 0x3d, 0x5f, 0x14); + static const char * const of_wdt_compatible[] =3D { + "qcom,kpss-wdt", + "arm,sbsa-gwdt", + }; + + /* Bail out if we are not running under Gunyah */ + if (!IS_ENABLED(CONFIG_HAVE_ARM_SMCCC_DISCOVERY) || + !arm_smccc_hypervisor_has_uuid(&gunyah_uuid)) + return; + + /* + * Gunyah emulates either of Qualcomm watchdog or ARM SBSA watchdog on + * newer platforms. Bail out if we find them in the devicetree. + */ + for (i =3D 0; i < ARRAY_SIZE(of_wdt_compatible); i++) { + np =3D of_find_compatible_node(NULL, NULL, of_wdt_compatible[i]); + of_wdt_available =3D of_device_is_available(np); + of_node_put(np); + if (of_wdt_available) + return; + } + + gunyah_wdt_dev =3D platform_device_register_simple("gunyah-wdt", -1, + NULL, 0); + if (IS_ERR(gunyah_wdt_dev)) { + dev_err(scm->dev, "Failed to register Gunyah watchdog device: %ld\n", + PTR_ERR(gunyah_wdt_dev)); + return; + } + + devm_add_action_or_reset(scm->dev, qcom_scm_gunyah_wdt_free, + gunyah_wdt_dev); +} + static void qcom_scm_qtee_free(void *data) { struct platform_device *qtee_dev =3D data; @@ -2811,6 +2861,9 @@ static int qcom_scm_probe(struct platform_device *pde= v) /* Initialize the QTEE object interface. */ qcom_scm_qtee_init(scm); =20 + /* Initialize the Gunyah watchdog platform device. */ + qcom_scm_gunyah_wdt_init(scm); + return 0; } =20 --=20 2.34.1