From patchwork Tue Jan 30 11:41:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jaiswal X-Patchwork-Id: 194033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1155819dyb; Tue, 30 Jan 2024 03:44:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEIRAZNKrUtTtgLY8l7FOWw3efi4NlB/GfiqQtQz0vbr4crG+wbOM+0+ohDfUN3m7gWdL4i X-Received: by 2002:a05:6870:bb0f:b0:210:cfd5:4d91 with SMTP id nw15-20020a056870bb0f00b00210cfd54d91mr5433603oab.38.1706615078315; Tue, 30 Jan 2024 03:44:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706615078; cv=pass; d=google.com; s=arc-20160816; b=uHWQmhbz6LAf/qVb55i1jWIt/spotGmV6r0F2giwC9BC+skQfGS3U0Jkk6Flk8LqJH Bffi8KFCjP3ATvxN1mbuk6AY8kWBou/UR4g3GW59CvOYlcq9Rtd7kYXl4jd8ZgFFzsfN zx3aoys0e5Ek+9+d13unHf+hWA6uACLs+putBP5a94V+/DHYm2aPnlZqrMCAKBchEuhv 5bYAjUhe7GW9wv/CVlaEENx56CvzAAFtLjWUBRa9f5g2YofdvBHbc1e1sXKcxW7PcK7s PSoqEslfObgEq/Ea37bCMh04utgq+P9De1GPP4V6OLCrV7UK2S9BTLI1ETtX6YPSZWnm fjbQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=B+sgRFv5yp3Rlr3nFlR9pT+L2BHT0szx2DeDHoUL8MA=; fh=AO1athPla3jqhCn4k6adBHi7gs3A5EcpzQmM6u71SYU=; b=PC4h08EJFPjDYsV7mUp1WEEsc65Zlt6UZsLajc4GRzl53m+zDE8zwcPFEgzdlOFr0/ gWw3svy5Yk7xizUymnPTUnIC0YexIpga3wt70FFnMdhn99EwI0Q6SXRN3HstFHRPcMcB yTWfHJ/oEC1IdY92piuqtyreUyvQ0LyMzkIFMryjAn0/aFXud7s71lm8F3ZyNQRlSmVq 8xUsL7mXfyQCT9rP4DjuM6R32i4hb7z7/pE+wY44KCIOTqSEanyj1QS7GFeVrAbt9oAm 1bYPXZqDp6SHMIrJXaqSXj+yuGq42cE0OUkDygbmEJ8C8VUNklXP2n6viu8wtu3rRSYU +tBg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=P7AKwmmF; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-44538-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44538-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e19-20020a656793000000b005d8e0d0353dsi1248324pgr.834.2024.01.30.03.44.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 03:44:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-44538-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=P7AKwmmF; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-44538-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44538-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 795FF286842 for ; Tue, 30 Jan 2024 11:42:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 090D66A00E; Tue, 30 Jan 2024 11:41:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="P7AKwmmF" 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 3C8B567E74; Tue, 30 Jan 2024 11:41:45 +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=1706614907; cv=none; b=MSYd21dBpfrjLG0q4C9u3eKuDsA3rEKhkAe1QxETAhd2pReiCYwl4M1IhDSC0iQe+VQKq85+EYRp7v85SqSDhrn06BwJsV7dgrzVpZbBd0eKVNYbvZfwP21mYNxNkNzUtrsLnb793ObURbxTSqH+yViAHymgxMznk751Xea9E/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706614907; c=relaxed/simple; bh=esY0uBf4zsMIdX/4kPGQ/PfpmPjCKcRYlITObxhO+SI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NSIDl++KlFn2DytgkY2cFYObjItqGgEpy1FTWqZucz0CMY2iqE3Ws7smJWcd9BSq7EjFxv6BELRz55q+Px9DhKmVlqwxmQfX7tRA4MdMU4V/BzPxofyyVj9hI4NkxihjfD/Ht30ou8I/5SdaKlyRft/ifsh/KIhDgmstMk+bNcM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=P7AKwmmF; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40UAMCMN007743; Tue, 30 Jan 2024 11:41:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= qcppdkim1; bh=B+sgRFv5yp3Rlr3nFlR9pT+L2BHT0szx2DeDHoUL8MA=; b=P7 AKwmmFOD9hhZEPaENetHA10fwwSrbJSsaRV6qG5JIYSIsL24ywSyzS5A26Qd5Wp+ lzdhDoQ8nL78u6lhZpbFeSY6ZwhhwwxCygiqGrmwZ/8ariQHkqrX9oYs1zbqVQNC ct0gZPhAHYKD25zZLqkqjO+LDtn9e6HtR87G6BoERHrcpjQoC+2ahbE+YRRe71nR EXMxLQB3HfPwsRxGYLFHG1t9xa5x7s00Hh0JuZj7R2bdjbsGIz/e+KISB8BC2DC9 EA7Og9q4YpWvMpfep14eVr8tKT0Yhq/OrvMRc2AFxgnqo2owIuDLfXY/6WtQd8O3 jrcNDvloYfWl2pcy7e7w== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vxupk8mb7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jan 2024 11:41:33 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40UBfW88019889 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jan 2024 11:41:32 GMT Received: from hu-jsuraj-hyd.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Tue, 30 Jan 2024 03:41:22 -0800 From: Suraj Jaiswal To: , Vinod Koul , Bhupesh Sharma , Andy Gross , Bjorn Andersson , Konrad Dybcio , "David S. Miller" , Eric Dumazet , "Jakub Kicinski" , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , Alexandre Torgue , "Jose Abreu" , Maxime Coquelin , , , , , , Prasad Sodagudi , Andrew Halaney , Rob Herring CC: Subject: [PATCH net-next v11 1/3] dt-bindings: net: qcom,ethqos: add binding doc for safety IRQ for sa8775p Date: Tue, 30 Jan 2024 17:11:00 +0530 Message-ID: <20240130114102.4116046-2-quic_jsuraj@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240130114102.4116046-1-quic_jsuraj@quicinc.com> References: <20240130114102.4116046-1-quic_jsuraj@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: DZV3wbsbTzzs5mg0v0ZNJszw2PARvbNG X-Proofpoint-ORIG-GUID: DZV3wbsbTzzs5mg0v0ZNJszw2PARvbNG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-30_05,2024-01-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 malwarescore=0 impostorscore=0 priorityscore=1501 clxscore=1015 phishscore=0 spamscore=0 bulkscore=0 adultscore=0 suspectscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401300085 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789515612318127027 X-GMAIL-MSGID: 1789515612318127027 Add binding doc for safety IRQ. The safety IRQ will be triggered for ECC(error correction code), DPP(data path parity), FSM(finite state machine) error. Signed-off-by: Suraj Jaiswal Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/net/qcom,ethqos.yaml | 9 ++++++--- Documentation/devicetree/bindings/net/snps,dwmac.yaml | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml index 7bdb412a0185..69a337c7e345 100644 --- a/Documentation/devicetree/bindings/net/qcom,ethqos.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ethqos.yaml @@ -37,12 +37,14 @@ properties: items: - description: Combined signal for various interrupt events - description: The interrupt that occurs when Rx exits the LPI state + - description: The interrupt that occurs when HW safety error triggered interrupt-names: minItems: 1 items: - const: macirq - - const: eth_lpi + - enum: [eth_lpi, sfty] + - const: sfty clocks: maxItems: 4 @@ -89,8 +91,9 @@ examples: <&gcc GCC_ETH_PTP_CLK>, <&gcc GCC_ETH_RGMII_CLK>; interrupts = , - ; - interrupt-names = "macirq", "eth_lpi"; + , + ; + interrupt-names = "macirq", "eth_lpi", "sfty"; rx-fifo-depth = <4096>; tx-fifo-depth = <4096>; diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml index 5c2769dc689a..9b04e2ed7c18 100644 --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml @@ -107,13 +107,15 @@ properties: - description: Combined signal for various interrupt events - description: The interrupt to manage the remote wake-up packet detection - description: The interrupt that occurs when Rx exits the LPI state + - description: The interrupt that occurs when HW safety error triggered interrupt-names: minItems: 1 items: - const: macirq - - enum: [eth_wake_irq, eth_lpi] - - const: eth_lpi + - enum: [eth_wake_irq, eth_lpi, sfty] + - enum: [eth_wake_irq, eth_lpi, sfty] + - enum: [eth_wake_irq, eth_lpi, sfty] clocks: minItems: 1 From patchwork Tue Jan 30 11:41:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jaiswal X-Patchwork-Id: 194039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1170029dyb; Tue, 30 Jan 2024 04:05:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGrRCU9R3G4ImAhjGoyRg/0Mp4+JnmR9Oi94aMdeHDuXMcAUOYjmPwo/rO6RG83Y2We+YDB X-Received: by 2002:a17:90a:a581:b0:28f:f19d:e43 with SMTP id b1-20020a17090aa58100b0028ff19d0e43mr5226406pjq.3.1706616334625; Tue, 30 Jan 2024 04:05:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706616334; cv=pass; d=google.com; s=arc-20160816; b=DNgxq/qp48VD+nAN8KgX5080qIcvaHfSA3P27jsONrGaMN4fr61EO2ZJhrxagamczF Cv+xs6k0RWeRL0rrqDj3Eg7bojIIIXX6bnc99sTGAFb4ce+UEFe+yPN70B6VngCqqeDF HrIzumyzMxAtK8kktaeP1/UOQaWiphnXpFNjY+/tRvCBLXR9URFUVaqyC8Yey+vYaYyN yjn9hM86vnhLjeDCVvqiBug33Eyp1pRxF4eOQBGZfvaHtoCe/fC9PS1kit6nQo9UP3Nb MCMJRy02pLkS+ndAONTvn46+9jo8FQ0aQiRzM/BzAyDlzXcT2hxuH6Os2zndYpctHFnH YH8g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TfqR6JKafu34tfx0jZ0jFDiYXMECziyEP7kmMeKNiTk=; fh=AO1athPla3jqhCn4k6adBHi7gs3A5EcpzQmM6u71SYU=; b=Wh6lLBcYnitqJMoFJXXrxxVCl9SKgE7CdX7ZWQHyARVlWdAMl46KF3hSqOuY+BVFsy 7k3JV7nZdFtg7OeX4AI+wHXup0BpYveaBBojW27tMoEImr5/5mkUEmFFNMUU4nrpe5xv QP8nmvWkgrmuS8reCVPtTN/WqcFqxAQnhbIAqXgoRrhrPOW9qViGquclfVeHL6YWjH3V b32YMTM2Tg6uumYGLCfUF9FbUsDVnN9aNtpHQv7ycUVGwNG8ZEu+311oEoKv8z6bra/o JJsLs8+u6RCoWfDO76yqvwYOTlVrWr6Aq+6i3KmEbaUdEcOC8RPZBF4iMLE0bFt7GKva gDYA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=avdZGDnw; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-44539-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44539-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id q4-20020a17090aa00400b0028fef76a8f6si9417857pjp.8.2024.01.30.04.05.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:05:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-44539-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=avdZGDnw; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-44539-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44539-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 504B7B25DB1 for ; Tue, 30 Jan 2024 11:42:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8BF156A026; Tue, 30 Jan 2024 11:42:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="avdZGDnw" 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 46F196A011; Tue, 30 Jan 2024 11:41:56 +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=1706614917; cv=none; b=iMQCl0kfzGNJePgljG0sCD7+Qsn5kfrE9o9PZy7t2iuPP6ApvE5haExyBdBOKbC19QBYv2x9MrgrJNIFAEjuRpVGOz83M0y6+nQra82O7xG+3eEGYsoM+T1lon5ZyII4tKen9VJs0YO5qBZCeBWlJbaXwTxTfzb+DCo3bI3s4R0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706614917; c=relaxed/simple; bh=Q9GexvbMR9U9svXdctm9mgfVDg3Vr0FetBCYCg0EYkw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MGqsCekIrBAyPSem/Aoj0388uQccv/J3KeIu4FcpVGgT9+XxA4ecdGsfSnufyOnpKxgp2NN5nPgTAQRP6GpD5Gw6qnqr5jtmFSBc+7sMrCh+ETF1FkIrNA5WGRSwhrKYTy0+Op2JGk2eadQxxgAGv+emHrx2TccIUo+kziohLr0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=avdZGDnw; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40UB0BY2004123; Tue, 30 Jan 2024 11:41:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= qcppdkim1; bh=TfqR6JKafu34tfx0jZ0jFDiYXMECziyEP7kmMeKNiTk=; b=av dZGDnwy0IerDPmv/Pg1JuFXJwt26TVt0AMrnmxMcY8hb5HcB0FEGC1FuYw2WNDWV e+Q3ZPt2uaXOY6BtuAF2Hk7wpeV8iVp1p4YSdHW6vOIFeb9bXhteiEDlTfb/GMa2 +qwQFRH2HwxTjdFfPrY3ezGdm2yL0waswPQ6kI8XJFiIVHl7xYpclCIDJkZusXXE IpQnMv/D+vo9ZCQhtzj+bE++pmspwnF7uVWiQvQ6rdgUn+hwGnRsH/S5PZKxWQP1 r+hgl14Am56ylpMiVPzN7pDDI4F/Vm9OU8hXXVk3ryyo+7Ne4W6uWLBrZRe7Rd+m FHa8pwrxhCEOtuNfREag== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vxydh04qp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jan 2024 11:41:40 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40UBfdw6012472 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jan 2024 11:41:39 GMT Received: from hu-jsuraj-hyd.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Tue, 30 Jan 2024 03:41:29 -0800 From: Suraj Jaiswal To: , Vinod Koul , Bhupesh Sharma , Andy Gross , Bjorn Andersson , Konrad Dybcio , "David S. Miller" , Eric Dumazet , "Jakub Kicinski" , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , Alexandre Torgue , "Jose Abreu" , Maxime Coquelin , , , , , , Prasad Sodagudi , Andrew Halaney , Rob Herring CC: Subject: [PATCH net-next v11 2/3] arm64: dts: qcom: sa8775p: enable safety IRQ Date: Tue, 30 Jan 2024 17:11:01 +0530 Message-ID: <20240130114102.4116046-3-quic_jsuraj@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240130114102.4116046-1-quic_jsuraj@quicinc.com> References: <20240130114102.4116046-1-quic_jsuraj@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: Ykg0lYW5EsysBMdbaef5o40UorIhrsEP X-Proofpoint-GUID: Ykg0lYW5EsysBMdbaef5o40UorIhrsEP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-30_05,2024-01-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 mlxscore=0 malwarescore=0 clxscore=1015 spamscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 priorityscore=1501 mlxlogscore=670 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401300085 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789516446929642438 X-GMAIL-MSGID: 1789516929454262038 Add changes to support safety IRQ handling support for ethernet. Signed-off-by: Suraj Jaiswal Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sa8775p.dtsi | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8775p.dtsi b/arch/arm64/boot/dts/qcom/sa8775p.dtsi index a7eaca33d326..f3645c3f96a1 100644 --- a/arch/arm64/boot/dts/qcom/sa8775p.dtsi +++ b/arch/arm64/boot/dts/qcom/sa8775p.dtsi @@ -2394,8 +2394,9 @@ ethernet1: ethernet@23000000 { <0x0 0x23016000 0x0 0x100>; reg-names = "stmmaceth", "rgmii"; - interrupts = ; - interrupt-names = "macirq"; + interrupts = , + ; + interrupt-names = "macirq", "sfty"; clocks = <&gcc GCC_EMAC1_AXI_CLK>, <&gcc GCC_EMAC1_SLV_AHB_CLK>, @@ -2427,8 +2428,9 @@ ethernet0: ethernet@23040000 { <0x0 0x23056000 0x0 0x100>; reg-names = "stmmaceth", "rgmii"; - interrupts = ; - interrupt-names = "macirq"; + interrupts = , + ; + interrupt-names = "macirq", "sfty"; clocks = <&gcc GCC_EMAC0_AXI_CLK>, <&gcc GCC_EMAC0_SLV_AHB_CLK>, From patchwork Tue Jan 30 11:41:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jaiswal X-Patchwork-Id: 194034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1156012dyb; Tue, 30 Jan 2024 03:45:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgAogTX/JrSQPq58Jrjow511NoY+3MI5E/Qsg53RtP/PfyGwcXoU+bMqcPW0ESQsR2K2aZ X-Received: by 2002:a05:6830:100a:b0:6dd:e518:e44 with SMTP id a10-20020a056830100a00b006dde5180e44mr5907901otp.9.1706615105588; Tue, 30 Jan 2024 03:45:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706615105; cv=pass; d=google.com; s=arc-20160816; b=XmuHPRZmAV8HG+DvD5CKYtalctxOym7adcTVsDFqnnSUPfFtqXQLifddHoYxK7uBZr PtFqEk7NDcrkOr9Khrj9i3MN71nn16q4ALwndLadOga1Jb0f6iYCiWQl+Y2ChsiqhUcq 7DhFzRQFDDzEsaZ9bTln7j3Cif6htQKjlllS7N1FBflN0uNbCHgFFBjEtnE/tiiZJB8d ND1zZQ3in+tFz1PgRL8U3vqyfwOVtOEhNSu+apb8hommOvXb64CHsh22Q8WZQNl1Mcl1 7MXVkx8aUqHva0VlbNVWEVn5BfDQmgn1gKq377L7iCfiDuURtimCwwmez18ZV4ZeAOFF 5GZw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=msJtk1y9oJkWDBLU/idb1XEPdK9Io00hJGpVDrzv7vw=; fh=ftEXz4R57Tf6iVZuaUjC/6znbwzxDNFxe1AuHy/CGlY=; b=aOGdfG1GduhOL0xk6st+/2/5kLDM57tXmPTEsbAfNFWEIbJ5GkoxKaQ19IzuwYP6KA D+ldjsBNlatfABntOMvtgcmdukSkf7CdtoYo/Ts2GISAWhmFX/auP/5P9k9XUV7cZG6s Lljwl+EynBTA9xLsiZNuXr9rE4tkehVb5LH5vF4mMK5NIbMxFXmu1cG+aUO9dZDEfkKB t7ID6SAi2a6TF4L5w+YizvCRuBAtHNAJaBrbvFrszcezkXnctOxmFpyZB0csWbMMHFbS fl11GYhGjoZFmiwpczZlSPdHtJfpTxeUiLyHMropaegQhlWwOkd09W9Zfnxaqh6/6teX B9MQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=Z8ugWddl; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-44540-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44540-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e19-20020a656793000000b005d8e0d0353dsi1248324pgr.834.2024.01.30.03.45.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 03:45:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-44540-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=Z8ugWddl; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-44540-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-44540-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 5EA9B283B0E for ; Tue, 30 Jan 2024 11:43:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E7A526A331; Tue, 30 Jan 2024 11:42:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="Z8ugWddl" 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 A496767748; Tue, 30 Jan 2024 11:42:03 +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=1706614925; cv=none; b=hied74aqZsq0ppiPm055zbkdyONhpItXFh1vS5PDqY3P8wGZ1BwzDVBLgX8up69kVWbbREQZLJbRSDdpeOzoTAVMUwX0e67VVedSVRLW+LuBEZJ/jahl7STSoA0LVQiyDMUP9isAdhiiFfV6mdEWrBeTu17IaBwdnNjQAhcW7ng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706614925; c=relaxed/simple; bh=xlEvpcnjawwGtVk1gYoFn/Jy/FWOMLEHqp/mURg+HH0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MCOcTe7nsI7MKUsNYryvJ5e5W5M9i/AImf3puIqy4BkukyL4OpzqUKQn/yf2NPuaIST6LJ6LGbaX99b899ZhIgqDuwbRpGKqNKdDne623ra+K2VKwUmpf0dSKtvBqss6GyNOfQ4g/LBji+j3HBbcMw8Uf02eTf6diZNOgN9ufNQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=Z8ugWddl; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40U9SLdt008805; Tue, 30 Jan 2024 11:41:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= qcppdkim1; bh=msJtk1y9oJkWDBLU/idb1XEPdK9Io00hJGpVDrzv7vw=; b=Z8 ugWddlG4fUkMaQvwk6UuIXlr9BkJ8vImZ/6KrnlpY2aKWZyNDFHmUaJtjrG9azAd Q7c4xQ2d1kjgWoNdvtNdlVk2lqJ0G/xur2ytX6ITZgQg2wZ4wNFxNBTHs7+PXEuO BMmXuXR/ks11FgTHYalRghJlY4nkC6KjrB0hKAOTSyF8SUUrJO9kt5mhWa9lP4TC iTZq8PMsWmBPiiYWDIlWusRbZ6DkJdViSrHRZkegOhdYriu4WdGITyfOjpjA56v/ mLo8SVlCESuMJYZcjGvioYEZhSpjl+4lQX4nmhbgmtxXA6I/QOq6ZIfiW0u/U5LZ T+xP7q7Loby/0hVbwOlw== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vxvwqrfww-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jan 2024 11:41:48 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40UBflKt027077 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 30 Jan 2024 11:41:47 GMT Received: from hu-jsuraj-hyd.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Tue, 30 Jan 2024 03:41:37 -0800 From: Suraj Jaiswal To: , Vinod Koul , Bhupesh Sharma , Andy Gross , Bjorn Andersson , Konrad Dybcio , "David S. Miller" , Eric Dumazet , "Jakub Kicinski" , Rob Herring , "Krzysztof Kozlowski" , Conor Dooley , Alexandre Torgue , "Jose Abreu" , Maxime Coquelin , , , , , , Prasad Sodagudi , Andrew Halaney , Rob Herring CC: , Serge Semin Subject: [PATCH net-next v11 3/3] net: stmmac: Add driver support for common safety IRQ Date: Tue, 30 Jan 2024 17:11:02 +0530 Message-ID: <20240130114102.4116046-4-quic_jsuraj@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240130114102.4116046-1-quic_jsuraj@quicinc.com> References: <20240130114102.4116046-1-quic_jsuraj@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: nLHbdiFy91mGZLLkZrXkV7y0C_A_5Xi0 X-Proofpoint-GUID: nLHbdiFy91mGZLLkZrXkV7y0C_A_5Xi0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-30_05,2024-01-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=954 spamscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 adultscore=0 malwarescore=0 suspectscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401300085 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789515640934381484 X-GMAIL-MSGID: 1789515640934381484 Add support to listen HW safety IRQ like ECC(error correction code), DPP(data path parity), FSM(finite state machine) fault in common IRQ line. Signed-off-by: Suraj Jaiswal Reviewed-by: Serge Semin --- drivers/net/ethernet/stmicro/stmmac/common.h | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 ++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 41 ++++++++++++++++++- .../ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h index 721c1f8e892f..b9233b09b80f 100644 --- a/drivers/net/ethernet/stmicro/stmmac/common.h +++ b/drivers/net/ethernet/stmicro/stmmac/common.h @@ -344,6 +344,7 @@ enum request_irq_err { REQ_IRQ_ERR_ALL, REQ_IRQ_ERR_TX, REQ_IRQ_ERR_RX, + REQ_IRQ_ERR_SFTY, REQ_IRQ_ERR_SFTY_UE, REQ_IRQ_ERR_SFTY_CE, REQ_IRQ_ERR_LPI, diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 9f89acf31050..ca3d93851bed 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -31,6 +31,7 @@ struct stmmac_resources { int wol_irq; int lpi_irq; int irq; + int sfty_irq; int sfty_ce_irq; int sfty_ue_irq; int rx_irq[MTL_MAX_RX_QUEUES]; @@ -297,6 +298,7 @@ struct stmmac_priv { void __iomem *ptpaddr; void __iomem *estaddr; unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; + int sfty_irq; int sfty_ce_irq; int sfty_ue_irq; int rx_irq[MTL_MAX_RX_QUEUES]; @@ -305,6 +307,7 @@ struct stmmac_priv { char int_name_mac[IFNAMSIZ + 9]; char int_name_wol[IFNAMSIZ + 9]; char int_name_lpi[IFNAMSIZ + 9]; + char int_name_sfty[IFNAMSIZ + 10]; char int_name_sfty_ce[IFNAMSIZ + 10]; char int_name_sfty_ue[IFNAMSIZ + 10]; char int_name_rx_irq[MTL_MAX_TX_QUEUES][IFNAMSIZ + 14]; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 47de466e432c..e0192a282121 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3592,6 +3592,10 @@ static void stmmac_free_irq(struct net_device *dev, if (priv->wol_irq > 0 && priv->wol_irq != dev->irq) free_irq(priv->wol_irq, dev); fallthrough; + case REQ_IRQ_ERR_SFTY: + if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) + free_irq(priv->sfty_irq, dev); + fallthrough; case REQ_IRQ_ERR_WOL: free_irq(dev->irq, dev); fallthrough; @@ -3661,6 +3665,23 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) } } + /* Request the common Safety Feature Correctible/Uncorrectible + * Error line in case of another line is used + */ + if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) { + int_name = priv->int_name_sfty; + sprintf(int_name, "%s:%s", dev->name, "safety"); + ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt, + 0, int_name, dev); + if (unlikely(ret < 0)) { + netdev_err(priv->dev, + "%s: alloc sfty MSI %d (error: %d)\n", + __func__, priv->sfty_irq, ret); + irq_err = REQ_IRQ_ERR_SFTY; + goto irq_error; + } + } + /* Request the Safety Feature Correctible Error line in * case of another line is used */ @@ -3798,6 +3819,21 @@ static int stmmac_request_irq_single(struct net_device *dev) } } + /* Request the common Safety Feature Correctible/Uncorrectible + * Error line in case of another line is used + */ + if (priv->sfty_irq > 0 && priv->sfty_irq != dev->irq) { + ret = request_irq(priv->sfty_irq, stmmac_safety_interrupt, + IRQF_SHARED, dev->name, dev); + if (unlikely(ret < 0)) { + netdev_err(priv->dev, + "%s: ERROR: allocating the sfty IRQ %d (%d)\n", + __func__, priv->sfty_irq, ret); + irq_err = REQ_IRQ_ERR_SFTY; + goto irq_error; + } + } + return 0; irq_error: @@ -6022,8 +6058,8 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) if (test_bit(STMMAC_DOWN, &priv->state)) return IRQ_HANDLED; - /* Check if a fatal error happened */ - if (stmmac_safety_feat_interrupt(priv)) + /* Check ASP error if it isn't delivered via an individual IRQ */ + if (priv->sfty_irq <= 0 && stmmac_safety_feat_interrupt(priv)) return IRQ_HANDLED; /* To handle Common interrupts */ @@ -7462,6 +7498,7 @@ int stmmac_dvr_probe(struct device *device, priv->dev->irq = res->irq; priv->wol_irq = res->wol_irq; priv->lpi_irq = res->lpi_irq; + priv->sfty_irq = res->sfty_irq; priv->sfty_ce_irq = res->sfty_ce_irq; priv->sfty_ue_irq = res->sfty_ue_irq; for (i = 0; i < MTL_MAX_RX_QUEUES; i++) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 70eadc83ca68..54797edc9b38 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -743,6 +743,14 @@ int stmmac_get_platform_resources(struct platform_device *pdev, dev_info(&pdev->dev, "IRQ eth_lpi not found\n"); } + stmmac_res->sfty_irq = + platform_get_irq_byname_optional(pdev, "sfty"); + if (stmmac_res->sfty_irq < 0) { + if (stmmac_res->sfty_irq == -EPROBE_DEFER) + return -EPROBE_DEFER; + dev_info(&pdev->dev, "IRQ sfty not found\n"); + } + stmmac_res->addr = devm_platform_ioremap_resource(pdev, 0); return PTR_ERR_OR_ZERO(stmmac_res->addr);