From patchwork Mon Jan 29 12:11:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jaiswal X-Patchwork-Id: 193429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp521787dyb; Mon, 29 Jan 2024 04:13:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGLKrV5JKs/y4+a/iKLKiyTRRQ/DLip3IJhYamaGQo5zDg9ppOHYwOuBwakJb4pokPD6iEd X-Received: by 2002:a17:906:f908:b0:a35:ce76:dd68 with SMTP id lc8-20020a170906f90800b00a35ce76dd68mr1102461ejb.46.1706530417622; Mon, 29 Jan 2024 04:13:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706530417; cv=pass; d=google.com; s=arc-20160816; b=HmynftfmgDTwp07fc28RPv2j4F8yqK20IrqLLXUKwNQKbNU1Eby8siu9M4uaiaLxnE FhNSu5v/zxEj67A6Dwmb/oNsx9aw4KH+QHSUXqCcc84J9tYpCPn+82hEX0IdyUCdD6Kp ZzwxszF/U7M0a47tQu9eHGOMOnAcgso/zCX4QpTkciZ/UvwXwOSVYZ488EtbfpH/y6/r +AJkCXRGVFUgTr+pYyaKMPvIrktsGXqyL49jAhlzVfqFkuyWXz3R9Qkq4eEc/v10oo9F wkU4Nd7FikcPhjbpZDPISbQc5zrs+Ner7X7vF79IFWje5yUTG+Fi8HwNh1wAJah/+SWU F2+A== 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=OGr+qfOfk2bZgN+dmcruOI1RCwdJVnOxTVOXEkod2ORf6q8K5Ni+x3MItWd9OyBR6d DrMcYyPyatLnoJdgNk3MnGi6MgXBbdaVfWe6VlQ7zz8h3IEKRYwBuiDsPo+F66sYbYmK hyv8uII4VaKrWz/xtE3vDt04wUBsfi/E9hn42XQIb44sLCrsK97AeQRg6qfdSfXQYdnz HV/nrndX2aJ6DvRVsjkEccL4WZezJZrY/+FoYrIadc91RvtOp55jzH4nPPFM0Eyi02/8 KJwDewFrIn4VpmVrNZ7YY94/ZKxxSLkGjczZfYdYakxutdj09Y3B6vSVwbSfAO15Bsae 0sHg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=WJKlrPWI; 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-42672-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42672-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id q19-20020a170906771300b00a31818aa0d0si3326017ejm.403.2024.01.29.04.13.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 04:13:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-42672-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=WJKlrPWI; 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-42672-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42672-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 0E5091F22330 for ; Mon, 29 Jan 2024 12:13:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0E78860BBE; Mon, 29 Jan 2024 12:12:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="WJKlrPWI" 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 527E45B5D5; Mon, 29 Jan 2024 12:12:30 +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=1706530351; cv=none; b=rYNW6cpqK0P15/ZvGKKWTM7O8xLNfRx+GfTRdwEHfFT17+FDyNgSun853MElSDPDG5lH1YaLj/BydtTGyM0mojzHSp/y4TCo09/SZH4REaGxgiKsetYT0zQY0BydiWGZWXHzTvv+3L1qHXayddc6YzgelbmGyMFM11seFVF8/p8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706530351; 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=aTyTEa7oLl+qaQuHXm+IZZdL5Ezz8l7eNwXTu4C8ra4rWMmNxvLYwVdIJLzboF4/qMloB8GiQ36u/TUaCecJV9KkOyUL16Uf20Uvm4dbSIVXEKPPX7cJhWWyWmTFtUid9jEafsxyYOpITm2oAdo3XRNZmP2TQu8LvBZxnytqo9A= 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=WJKlrPWI; 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 (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40T9nRsm012455; Mon, 29 Jan 2024 12:12:13 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=WJ KlrPWIRlusYi0b1tNOFtEoeR6SnkO8X/V4XetbSw+NQcwsybuKRGH/xzIsonzF0G O7ND5rKhJMDXG1/X82bE2QIaI2l6TrNgL9WURNYtAY05XwWfyyfm0CeJfGNEowbc DoEUEdzfXyYSQZofXUQCpxyaHUSGmhMx3AlASXkn7VDU+3YEzQ87uOnUlP+YMsA6 YuPTC+5XThxh6u0DUN24K/HFgMNuJsEFfuF01aOKi/4+1myqAg9AgKn45xqRLyD7 ZlGfq4M9Ja1BAvYGgGGU+3S5HPsIUndfpKfLLTjJsPu83pFS8UqR/585t5Vct2sW Mn09tDGNvdNSx6hRaURQ== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vvqhmus68-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jan 2024 12:12:13 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 40TCBxqi027834 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jan 2024 12:11:59 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; Mon, 29 Jan 2024 04:11:49 -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 v10 1/3] dt-bindings: net: qcom,ethqos: add binding doc for safety IRQ for sa8775p Date: Mon, 29 Jan 2024 17:41:27 +0530 Message-ID: <20240129121129.3581530-2-quic_jsuraj@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240129121129.3581530-1-quic_jsuraj@quicinc.com> References: <20240129121129.3581530-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: nasanex01b.na.qualcomm.com (10.46.141.250) 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: FdumseHTZYJKNw0f3ZwsIGcfvnYhKCVb X-Proofpoint-ORIG-GUID: FdumseHTZYJKNw0f3ZwsIGcfvnYhKCVb 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-29_07,2024-01-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 mlxlogscore=999 spamscore=0 impostorscore=0 clxscore=1015 mlxscore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401290089 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789426838834181381 X-GMAIL-MSGID: 1789426838834181381 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 Mon Jan 29 12:11:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jaiswal X-Patchwork-Id: 193427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp521630dyb; Mon, 29 Jan 2024 04:13:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSmqakD2m0W1oIQpuRC7/j0XjSKu5hiPFql0OeJom165J2CHja0s1DVKcQvjpnTy8OiS1A X-Received: by 2002:a05:6a20:94c5:b0:19c:ae4c:1757 with SMTP id ht5-20020a056a2094c500b0019cae4c1757mr1354415pzb.52.1706530400132; Mon, 29 Jan 2024 04:13:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706530400; cv=pass; d=google.com; s=arc-20160816; b=GC8cfyKOiGCkcUCvLg7K1V+Eq8Rjli66YxilOX12QTzZ1G5F9OtPp3ms6zcyHO/YvR 3anBESrFHd4tbg5QgnoYAGLrV0y4ePCIfmK8bE7vzbQOPz6fgrze1GN++rKsGeGF7WqI /G7QDwtLN/TbB2UVpiJ0wu3AcsaxJzWHT2R4gJHYH8PFnNGKoUAYm4MnSKhcKudFSYak m3lPIxzG8XWHL0qhdSyea7jcUXc5b0tIjc3Hq1ce+8RcBiTpEKWYpQ0brvl1Zl9O6XPH pmlslKj68eI4c+nq2sXkmn+xcJP0HrvkIflFDlexNR8Sba2l/LitB3DqXCUpf8fk+i0e fYfg== 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=QYB2nL9Ef0zv94lmn7EA3bR4bQA5zFyrUXFMroTcfWR/PxNY354edN2q+MHVL+tW4t BDKbqgfJpQgk7nEZhplQwJvT1XTaEYKvvyL94PrjqDc63/lQJcitF5L0m0vxHmQdhtZ4 CizlqCeMwPwbcCPPQmLgetVQfa/nWkaQ5QXZDEAl38obKu/5VaP5+smHfmWbOTc4AGbN UTy/d3ACb1wp9GfDckdIUIaSLQ7EOiVE1xM5Owf9f4MlIpKOCmuuq2+DSk4iKlTUs4v7 7kiWxf41AcTFzsXb32ollRqD0Z5rZ2ZmPfMLNau+teuDiuvdy2zCuiGBvxyQ1wwDhsVH lMcg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=gqfwgsIM; 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-42670-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42670-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 lk18-20020a17090b33d200b00292a409e5b3si5736038pjb.55.2024.01.29.04.13.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 04:13:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-42670-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=gqfwgsIM; 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-42670-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42670-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 E2F932838A6 for ; Mon, 29 Jan 2024 12:13:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2FEAE60896; Mon, 29 Jan 2024 12:12:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="gqfwgsIM" 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 99C7A5FDCB; Mon, 29 Jan 2024 12:12:28 +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=1706530350; cv=none; b=jgc+CXUmrzpEy5s9bT+3Ird7LpjQELtb0oguAnb+OXCRQUsH6r+NYZlN+r5quyzWCeX2o9IewEHvqBfwx8X5+BkihBCQzasCEYEuB3Auw0Ot4tSTmu/drMB1U6N0oNNOjaP1nQ78vpjoeeX6MlURPSeDOE0aezmwV5UhnLEoxGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706530350; c=relaxed/simple; bh=Q9GexvbMR9U9svXdctm9mgfVDg3Vr0FetBCYCg0EYkw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bmp30Zv7MpHO5WkPB0SR1AM6mjJoHZ7nhtcQAaGz4U8Sz4+jCp9MrWsC44Mnd7DwxzCvDZFI8NhRwOBXXlKv6OEAncrybWRc89ogETUtVQULt5KzTeewipkzuHaZr0E/A0hpj8M+saDZzuVFsnI0D/ss/1ZIROJhxdu/u8T6jXY= 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=gqfwgsIM; 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 40TBdjHt031046; Mon, 29 Jan 2024 12:12:13 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=gq fwgsIMp1ETcK7pj/m3MU1KiISijj/wc2j2Xv8gqGbEoSV/Duu9gV4pu9u5+JNFy5 /DzS2LNM1qDko1qB9GcmGrplwe5jNY17aZ61eBdBv65UDkIf4Pynuf0u1bZ1fGW7 SARYp0jlO4b9x+lE5c+jeersS9QI4Hb6C2oIFgegmCQj/DPmguHkMtSEY3iwjETm 13LJymm6NXTdhAkx9OoM0TeSKJyhAq0GK+ATgeWJArIAtb57/ofkaSOzS6vZV8Js jTjWlrYVbrtAViS2jX++QrGviSKi0pMTJjMMdk3haUZPVt1GlSDRD1KKEdL9uAbV a6caC/Ub9gAb3zACqWEQ== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vxa42g77r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jan 2024 12:12:12 +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 40TCC6gE006052 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jan 2024 12:12:06 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; Mon, 29 Jan 2024 04:11:57 -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 v10 2/3] arm64: dts: qcom: sa8775p: enable safety IRQ Date: Mon, 29 Jan 2024 17:41:28 +0530 Message-ID: <20240129121129.3581530-3-quic_jsuraj@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240129121129.3581530-1-quic_jsuraj@quicinc.com> References: <20240129121129.3581530-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: nasanex01b.na.qualcomm.com (10.46.141.250) 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: Ane17WTh6W5zSS-234QRcRPc9ZohJfEf X-Proofpoint-ORIG-GUID: Ane17WTh6W5zSS-234QRcRPc9ZohJfEf 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-29_07,2024-01-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=670 phishscore=0 malwarescore=0 mlxscore=0 clxscore=1011 spamscore=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401290089 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789426820744916404 X-GMAIL-MSGID: 1789426820744916404 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 Mon Jan 29 12:11:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Jaiswal X-Patchwork-Id: 193428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp521747dyb; Mon, 29 Jan 2024 04:13:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfK9NXTK53MSvBOyHdWzbhzrSHk1T6//wrnOm2DLUwxQbN6HuMduAMRiJF4nwYAwhSyFp6 X-Received: by 2002:a05:6402:2792:b0:55e:f590:620e with SMTP id b18-20020a056402279200b0055ef590620emr2262371ede.35.1706530413578; Mon, 29 Jan 2024 04:13:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706530413; cv=pass; d=google.com; s=arc-20160816; b=xEj0Hum2L/V2B74iu3+kmGPfrVOBH2LRn8Nkyk01ksWlt0kO+ADrVHrKBXxPDpVfdF UtyOfgNfzV41V3bInYrM7og3Qh/YsOFlj5b1yI+ToSqM+rnIs2nAgIwIOZurH1Ki083L uQIdNBNHuj7K0tejnZV5rvTPpAuBstmhPmSURaObN5KFDP0tu8A7Jl0lKzdNV/MXc/16 Pjii4o0u6/QnYSRO3ASXIO2KyXQbee9wyAaDicu77MoX0RJBlcggr5z7IqSB8joX4StB BvHFYfs572oH8Yk9zXlp7PVFbS10uJ40Zu0bzrZ0s0YdrvYlb1Z4mpKguDh87jhtSSBt rDQw== 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=5wESy/498DHj/3BcjLShykVaFa+dINc2CeCNCA27zfU=; fh=AO1athPla3jqhCn4k6adBHi7gs3A5EcpzQmM6u71SYU=; b=A5Fqh31TcR37B3gV1oBERUnhW5ByS0oh2GZnflI+ARwPneQww7IX61k2Yhrnx9UtBI 7biTNg2KDKueFdOK09UK+BzXsznKQTMkzP/cL7W1Tu0+6bY/7KzvLOSxlYRe8/gg2h6p zsnGO46eyuNGMHjkuIUeh7EigA7tqWVLYaKNOAI2gCHw13Z1dp6A7m8FmtbQ1q6lRUuZ virOxtb5zvl0m7BmWzD+/3OQ1Rq+jG3ZRuZqXaZZ/q6p7BhsO1v36xZRaUrO0HrkAI// s+7WwfnVLPKVJ/JyO39+55WF4JW3sUKEntf9inF/bjQkbDIhOZppJ9YvHO8Qw/bAFBcO /hUg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=BxU+D5Xl; 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-42671-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42671-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ig5-20020a056402458500b0055eea8aec34si1340874edb.586.2024.01.29.04.13.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 04:13:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-42671-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=BxU+D5Xl; 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-42671-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-42671-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 0E4B01F22E8F for ; Mon, 29 Jan 2024 12:13:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8701260BAB; Mon, 29 Jan 2024 12:12:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="BxU+D5Xl" 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 45F935FEED; Mon, 29 Jan 2024 12:12:29 +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=1706530350; cv=none; b=aFCJAbju37UFVXIyNlM5DCfZlF/we9jSBsYdyKbYhkY5Zncwfz7cdR3JvkPwX8TPiY54zN0DIogHwWGw1e+XE2f5bFyuiq84VRvh469gl7Wt+HdbCfDTdAnDVm6gN97jt6/kigRvF+cmSYscKCRvigvQrCAGFpHL6CQjHsteLAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706530350; c=relaxed/simple; bh=GaSDuS+sDglwSyiar59DjSzyNTlD1BqHSEPx3+jWZXM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TO5BZDkUkqPD0U9mrB+2+xTdt3WrVausLn1nmmlyB/MHp/3FQpA5M4ivNF4k6UtZpTqJET3aKEypsQpCaOHD9iynPrMWhz2C07fKjfqcSHHpqOlBGY6WKRtBn+YylemxW3uVKhIy2gNX8RSn+Uhn2Vl//PA+EZmSEypLhYQ8SRo= 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=BxU+D5Xl; 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 40TAG2aT019995; Mon, 29 Jan 2024 12:12:15 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=5wESy/498DHj/3BcjLShykVaFa+dINc2CeCNCA27zfU=; b=Bx U+D5XluH0+6ZMv+WrOFEpordF3PfPgtHkd1wOStsBJe6CS6QoJNUFpkCZL2AZPt7 XPsbPNNuRPoOPrz5IiS6gOPRREJ4KlfgCJ3ZIhZmWzLDYETiXT3ijOFrfhYT1/l0 9PZpJUR9a1jrdueE/cU83LLU6He4IWB35JAU8aTrl/anjWLEXeKAqscxqwp2kyad 7x2YPtKrpCyXImsOh7X25qgt3aeMYK6fza2ZTH5b7GIleirMaCNk5p/e5oS3rHHr vc0ZedeZfro7+r85M3IRfHkWnwyQJIv3OUh9DVdtRaPVRWsT/Hi618EaoYs6i8tJ 8uDcjqhJncfSExaY991Q== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3vxa42g782-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jan 2024 12:12:14 +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 40TCCEwl006136 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jan 2024 12:12:14 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; Mon, 29 Jan 2024 04:12:04 -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 v10 3/3] net: stmmac: Add driver support for common safety IRQ Date: Mon, 29 Jan 2024 17:41:29 +0530 Message-ID: <20240129121129.3581530-4-quic_jsuraj@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240129121129.3581530-1-quic_jsuraj@quicinc.com> References: <20240129121129.3581530-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: nasanex01b.na.qualcomm.com (10.46.141.250) 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: pSMvFbj37y4zu4r-YTICZ7j9vwsBx4F5 X-Proofpoint-ORIG-GUID: pSMvFbj37y4zu4r-YTICZ7j9vwsBx4F5 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-29_07,2024-01-29_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=951 phishscore=0 malwarescore=0 mlxscore=0 clxscore=1015 spamscore=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401190000 definitions=main-2401290089 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789426834576536934 X-GMAIL-MSGID: 1789426834576536934 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..ab250161fd79 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 safety IRQ not found\n"); + } + stmmac_res->addr = devm_platform_ioremap_resource(pdev, 0); return PTR_ERR_OR_ZERO(stmmac_res->addr);