From patchwork Tue Oct 15 06:57:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ley Foon Tan X-Patchwork-Id: 13835787 X-Patchwork-Delegate: kuba@kernel.org Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on2135.outbound.protection.partner.outlook.cn [139.219.146.135]) (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 0DD8B18B488; Tue, 15 Oct 2024 06:57:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=139.219.146.135 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728975469; cv=fail; b=GWHsS87eWcgb8zysgputbBX7E0WN/2EcW186rIdqD5yYp4IEllITn8tSMYxlWhDf95nsKVL/mwCeir3xOx8BUEfbyvzzsk1CdDckVGRhUItgRTxcmroMqcM2yHx2r3bH1iz/pfVu2nJ8RfMVP6mzfRdDBIDR97LUxBElEfShdj4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728975469; c=relaxed/simple; bh=cwFPG2v4y379AqoMakhH/VOnujPrf2B50yJg/NWeECA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=uYGO23fEIuywA1K9LwwUYKnr9E1KV4qRqi70bICLVt6VKnafFAK6HAZ6OFMJ4/2DXXDBp/v12reFjDPNvCJQiWw0l3oxX2OTMxJHLgrdMkGWi4ZMD0EDutT6whCaGGb8mjumNypmcmLTFuMgQVBCggXUzLY+IOc0FAxfYCa6OkY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com; spf=pass smtp.mailfrom=starfivetech.com; arc=fail smtp.client-ip=139.219.146.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NoWExZWAHL0Qf4YmTNlaDYX8BiRk4D3uN1JIrEXVeGia9ZUWm4ptxvk6HutqBpgEgMo+Rh8PlsZgvJzkaMq9aaYWR4KqhgBrg/JyhiegyNo5Y0T5K2n6fTOOgqA+Q4lgIYx+vVkxpcWc3sVt6+IdZXXdaR3OOTKvUMeoythZtvpeRhiKPKVM83h0nKJ5/bRyipThreoF+ND4tvtMQpzO8IT7XOuznhrZwLJJJTRLg0Rkk9BtnOiukPlh5SsG6mHHmPZvEeCLJQGy3uHOXk87QAIKKVsGVV6xZ9B4JNlfRLWhM7nQ72l4nQAV/IsvhZREH7e7wuYrKpRC6Sddu/2igQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7Ew6yLX4RyYhanwluElRJwwRUtQZfe9CNPH8Z9hkpj0=; b=ccZO2hYECtQJEHEqDvNrMQmFBrUR8lg0F/vDASWjpB68NsVSpsRafUzui4Y+1RyccS9AFAnjtlaMl70LSGitGkGMVTkCD20XVcRftsYi+HKVC4SvAdKAnuOUSWpaKDSKN7lgFI1ZsYvDBdN+sOCL4fWDInW5wvIs6q9DXD2dixV2sl3MTfFriNmSxnuqULs0cEsB9SZyFVs065kIeQVsP5cnErTJF1K7u37weSscuBPFRHGrhffd1vzyq0s+uStQOfNX+W83CVk6KkGrSUZciZBgPsbG997luaScw3Xct1zcZF6nHv6z6I/JcIpKP+uStrm473qGSMpzKIx7901tlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) by ZQZPR01MB1075.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.18; Tue, 15 Oct 2024 06:57:37 +0000 Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095]) by ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095%4]) with mapi id 15.20.8048.013; Tue, 15 Oct 2024 06:57:37 +0000 From: Ley Foon Tan To: Alexandre Torgue , Jose Abreu Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, lftan.linux@gmai.com Subject: [PATCH net-next 1/4] net: stmmac: dwmac4: Fix MTL_OP_MODE_RTC mask and shift macros Date: Tue, 15 Oct 2024 14:57:05 +0800 Message-ID: <20241015065708.3465151-2-leyfoon.tan@starfivetech.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> References: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> X-ClientProxiedBy: BJXPR01CA0067.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:12::34) To ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQZPR01MB0979:EE_|ZQZPR01MB1075:EE_ X-MS-Office365-Filtering-Correlation-Id: d8551536-b04a-40d8-a9ab-08dcece6a713 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|1800799024|41320700013|38350700014; X-Microsoft-Antispam-Message-Info: wWRL8LAAWcsFrSmdG6iV1gWUUybYE3z4yF2se4LBYcTAvN5G+b38M+JyTJLjuvaXdeYLrHkQ+XH78myP+VDHeJnkIdFBc4aAlcANglvgRpSm9mWo5nmfsICZQbrUznn9EWzvYMqr4aZVj79i2VokSH0uccpCbJOS60+3HWF6oykKap6hAHrYc+qz8AhlO5ileDMU4yghnMxAqECou8Ge9lzQC7qIVTVCD4WDGNRKMaH/hxaL+K30nq09AqPEfIYH/6xhwTcwzC5k5Bm9Cxt+0AINP4XAkD9HZ2yq8pAMFzjDVn1P/4H/CjyDZm5pWQvpQolEKhIl6yJIclBLifH7Kzz2LWHpBbVYU8vV6luVDbT/67ZWY6LRxl6XTSqzkzEYgiPfS4d4Cn1Pfh1+h2azqJ1G7sodjtmkSV2a78dcYC3kYdl/4KFT6/cAOCx8Bwo4jLi08vReefdQMxK/IUa5p+EVbyreB2MNDpPKzNDWxuavmyhoc6JXwoNFiDjoM5KoSAUx4EBQ9I/ku3AZV+EdQC6ivISfoGHI+0gzZnqmAlC7I0USsjhULTlAaC/dfAyT8qCEInejehUIdMurEngBhOrxhwDXaLtVG9p0xbA7LcTkZ96g7/5P2KAFmACGgC19 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn;PTR:;CAT:NONE;SFS:(13230040)(52116014)(366016)(1800799024)(41320700013)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ujxJsdhfcgKZMSWe9s+VLPcMFgtO4xcYNKbORxl8JwgitbngVgKxiDhBDQ6M6F2iEgdmRCzaDBQXXIuNN0xKCZ7XITEsFRRPOvlnJpQGkss8SlbDMR96LQzDpoMSv7v9T/WT7wwPk5GLXBV+hHAPvJfWcjytAFCZeZ/UklSsSC1/iBY0T9Ki87IxsrsvEasWe0Iod5B3O+Vwv7trBpw9NGloLMKaLivoVLFQ+vRu4iArAOvi5CrScbRNooy+FFDiHPTCNekF9woIYaz2eWdGZEaweNyJUeAbE5FvK+/lFWROgeeRig8FT+44A2f8GYlXBvY9tTMeHFTJip+ScPAVRWd1WbY1j5b9NSOwbi6wPlNIu1ThFLllxeQfG90WkfNbOJqipQa0QBeu+KTXI55uwlL5JTgaeOKX2h7E+1zw7kKie28qPYhL4ptPnKDI6LVsJPWNgbleg8Tw/PIj0Ass71uyxBXn7OKvrGepo6D9GTHfgEMzKQHa4H0W+IihurZoolWBFpcbp3cbT4N1eor1ZX0iuMzBhnHs5ZQTRgT62ADomdku7Ww87yyVncZ0Q/tmSOM4OsjyqWSQAfhDMz505GKOjitTS0XZAuOxTHj/6UzKSbOGoxGFoZ+F+9UAHamIlvgDK3oN4Fl/35UplqSLb6csaMUdVXFToECIV/aLILYUYwlvuIl+Ks9Wf5hhT5wLo1ciwi6NyH/oTYyE3dNlW4LZzoCZ5TcFZkAOWsOdfisBldXmKQk11fls85XEKvkFjrC/7erdIbMLrqVPYEDZ9PDzcnrQB/p/E8hKg0Mi7Zvp9XIxd/VeT86ZxYoEs6GCN6dybOsIMHAdolxVRzFWSOW4E9wertILHGC8YuBMdvqgZkEnakX3XXyI+HVJg0MzXEtiV87yVwRcT+jfh7tOvVFXDvbGKxruEKqrLjuKhaTw1uRC409IZTWLcOI8MPUz3HVInfEjsrbbWAZBsFYAWZkFvl2+qPbfgeJ3Qtc64eSjXvR9ZWVERvo8bx7QtJGuiZcL5Be313WHbvQBY2fevJPhwSiFl0PEbSL+xut+kukytVcgSuHIVbWktVxHBjG4Uk2+PGCT/flRgQDjkHVstXRhUnw1VP/a+O3bvcDVOfSHaRBnhphj7sGatbY8LrygHM3Dw2ThdDvArUBU+CsyhNLIFRcW9H6xtv51bMpmaFdStTtq5LM/i+RD4EDxrrZFdeEBuwkzHfF/KcCb6p5P136ZiY/FO9NgiocqHKm0GbPsM3BUgCUTVTz/hQwGZf7F+uU24bSjpMLZt1/xs+h6a4TXCS0ChyMZWvk0b+7i23phIzFLCEgCJj2xR4x+3x0s6sex4my3tLbdDf3FdVDP6+AD4XC6HXc0bcwzZtiu91k6JAOPHl/sHAOv7VrxpNjOPOqE8QOL9eHJT3+jv623uiDyUoOTRVBP3/4afAARRWXcT5NOJGRX6zq+zzPmeniuKXzootgEhyXOsnmfI737H1zu+H9zBQ25TXejJGiYxnlWraJb+MpI9mnlFi5enUEuCk/WytFTaFVZzSEBoZMbMM00rYqDfwRu3GYnSZ+mE60VvsILfAxl/760+9WDRig2LOHbFkik2kuVZjlXBpF5AQ== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8551536-b04a-40d8-a9ab-08dcece6a713 X-MS-Exchange-CrossTenant-AuthSource: ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 06:57:37.1343 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C/wiqGMHpHUg+r/fsQA/KidodZFBjY0SwX/EYYAav3Ff6fF5AiqsXMsvVQJ6Wp5moKRAzVu/nmstn8PF2siUz4ah76QcFQXe1fK8x6UQwI4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQZPR01MB1075 X-Patchwork-Delegate: kuba@kernel.org RTC fields are located in bits [1:0]. Correct the _MASK and _SHIFT macros to use the appropriate mask and shift. Fixes: 35f74c0c5dce ("stmmac: add GMAC4 DMA/CORE Header File") Signed-off-by: Ley Foon Tan --- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h index 93a78fd0737b..acbe5a027c85 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h @@ -389,8 +389,8 @@ static inline u32 mtl_chanx_base_addr(const struct dwmac4_addrs *addrs, #define MTL_OP_MODE_EHFC BIT(7) -#define MTL_OP_MODE_RTC_MASK 0x18 -#define MTL_OP_MODE_RTC_SHIFT 3 +#define MTL_OP_MODE_RTC_MASK GENMASK(1, 0) +#define MTL_OP_MODE_RTC_SHIFT 0 #define MTL_OP_MODE_RTC_32 (1 << MTL_OP_MODE_RTC_SHIFT) #define MTL_OP_MODE_RTC_64 0 From patchwork Tue Oct 15 06:57:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ley Foon Tan X-Patchwork-Id: 13836316 X-Patchwork-Delegate: kuba@kernel.org Received: from CHN02-BJS-obe.outbound.protection.partner.outlook.cn (mail-bjschn02on2103.outbound.protection.partner.outlook.cn [139.219.17.103]) (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 DDEF91CEADB; Tue, 15 Oct 2024 12:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=139.219.17.103 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728995661; cv=fail; b=lkI/EK6xIz1InjYGJJiZe+lXTaZeQdaaSGgaEXYxcKKj+U+egLNNuAMjy3Cp83L/q9kbyVBScNyk80y6b6PdOWPTbaBIxCtJcLPeIswERBiJG7Vivh8fi3GCkKeI3YhuCSKg0GmqCbZ4WsLvaKvHxdqaZdg9QeIzIjBpLKSUAq8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728995661; c=relaxed/simple; bh=iT2wgr2wM31RkT8f26iqfj2jdsdUVNCwTxf0kvAlRLw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=GtgQR88t77YLehDmVAp+eMtNhinmvyK2s4uwQKW+iER1ADriSp9jjDrNq6+3+ogiffai5jItOrsbPUsFkpQQfKgFLcrPcbKEjxbTBgI8MDnuuve/ZZ527i0hlwMQ4BgRlBSkDbf19cQfqc55bZtO5bUw79Vk6jKRPpuN8/Ya378= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com; spf=pass smtp.mailfrom=starfivetech.com; arc=fail smtp.client-ip=139.219.17.103 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UK43JSzZzdhYTdNvvIrIEqFcJdMyYRDiK62oNYXH2uTLr5gjhYdntzmXLNVBvm6DNKBajaKzUCBiDHLfkTrEwYRbyTSVYqqREpTAUfH0SyOo6WMYUx2n+VUVOBdcjwET0zyrkQKaD9+f/9ac9H84WBGShf0kNBLdjaI1x7RyyC3CYIimAXGxhJQc3/p7XMrYU01VOXDkm0dSbdYz6T4BEamrEZpnC4CbVU6RinR/gvrCMF1NTAmbWrrVtIsnDRhfMrmBgkvSMoXloy5ZJjDFjoEbrLfR/Z3J8ItEPMhk6Pf3FbmRjd8tlc9Dr0Xbi49HfiF2tAlFA7DsLMPPDXI0bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H21ENuAQ3xhhwqJ2Csk3hLYVtlxsl1QHD1/8Vp4Qjww=; b=T1SdBtCQQB1+3RyU+woKxl7WPmu5JFjM2wvOXF+ZRFgGFo3+snoo7SYhTgaNu6rTnKUr0DRzBuOSJ7hypCGZYbMtCMdSMG3MYHzSHeKtzaENorIZInXRODbyXMKab2XLBzMyjzHxAzi2/SJgz8/bqsQEWD8LwPsk4vUfNc9uo/jA1s45Hw+OFm1MNCQ/m9ZSEBixgSY1iutNf+/ZtzjpKkVwF6Y+ZFQ44D/kJjFozxVtnJHIC+sg8z4tdQ+CxMfpXhU3H0zXBgq3vp4sIzPW1X6bb7k0BcWib9/7EKPW5wSeC3/0DlRU2i9BcvY3xklQLnSebr/MUOYkOKGQpnbPsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) by ZQZPR01MB1105.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.20; Tue, 15 Oct 2024 06:57:39 +0000 Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095]) by ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095%4]) with mapi id 15.20.8048.013; Tue, 15 Oct 2024 06:57:39 +0000 From: Ley Foon Tan To: Alexandre Torgue , Jose Abreu Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, lftan.linux@gmai.com Subject: [PATCH net-next 2/4] net: stmmac: dwmac4: Fix the MTL_OP_MODE_*_MASK operation Date: Tue, 15 Oct 2024 14:57:06 +0800 Message-ID: <20241015065708.3465151-3-leyfoon.tan@starfivetech.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> References: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> X-ClientProxiedBy: BJXPR01CA0067.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:12::34) To ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQZPR01MB0979:EE_|ZQZPR01MB1105:EE_ X-MS-Office365-Filtering-Correlation-Id: 169e70cd-f86a-4f41-45da-08dcece6a84b X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|41320700013|38350700014; X-Microsoft-Antispam-Message-Info: 8hCt93Dzn0qARH+yZMf1xFVPEZQfzdSB4/je7g5znUq9voyY7tFHQSF+u1rdhsQONktH8hcLqJmNfNA/gcZJbKuWwRsT8KpbPFNun4+GppHNBmSjNDueZpdSb62pVb2WF3yOOhqWsOQCGz12hYddgQk/Owx9WazLYVVTxb19qMpkAelmguIdaZ7ccOtdk6JTiFfwn9xWzJkjyA/wFC6NGKrk+f9+zkCNX5XiK/8mATyjoS7r0HNoLHvqQ/YS6KwpF8+c61InZa5WSVu9mVJnqlpfi8WVn5j6w+Dt5HWOAB+mbukd9hWFGoQWAtu4XtiT6MCsDkhaIHFUG9cPvkJLyBe7Ov6iVDOoa2Ba57Gs9vAbmr9t2YsVzUooWzRuFlJNWWbMtTU45UB70bR6jAbblX1RB7L/dsYM1ewvkaOoHS7k9VblqpZbGu47ZSbFFbKnDiIOVjQ+8p8Zc3WJeSd58kf4fpAMSkKa3JcbO/wxEOqKgldCPVt4Lqy44jpElqPcAjN7YONO3hYEZJnNHEab/ggO4zy2XAvDSMbLRVwqKtDy5dojnG8FgAryoquIeg95SKUmT2N9iEG/3V0JD/TUqbZJWcILGKaUIZoxNgyT5h2xJPWvwS2xA/2A5QrJGoNf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(41320700013)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CQe9MP9CKByiZbEMu6KUJmGmXnONGjE1nBaFjMqYayy7LiHsTWjRXLWN+NgmMPI/sebm8ugplg5szNdP/GFTNVh2rv1TiFsxJCODXe/1/SyCmrF3eiaXL3YeSE0p2B+f0wGUqU9f7iT8A8aEQmvpyCgoHPldWfGQ+mxhcR6IZdKf4MplsSLcCGifkp3IX+6S+d6LY92+s8JO8X7ca1yeL1m/mL9pmWmNPzJeXJ1BF1j7O7zB1F+30uc3m81+kQ2oKC93V3xSqpcnHuw+aanZvCOZ835acJ20G777WYnefhaIYLbJKR74iUDT0Mnxi4t8W0yEm2q7+e7Uek8KYRqGmWAfHyTdBCP7BkrTHFAuWaln6EqM8IXNUxK6YUD1HdtF2h+8QdGHHuZpNfrhrImeXdHu08tMaybHciO4qgyolkveI32YxTdhSkypLOT2j8d4ax/kZ3DnOqbbopJqpCUqQ58SWbul9VM540Vm7dwUZjkf4Drb6+MaFIN1vlpiJVTbQtRX4osqGhRTkCuj1mYhnxUfQTYUe9xrzxqta/cMtuK23JhoEkcmfZekXua4NZTL7+110P3oXUN2r0jjqn+S+BXa358ljOlcs+94DwZpqtyXMnrinQuvEFh1AfOuPpyNk8xeVFJQUjUAFd164rE34xEkF8H7tdiYd+J3+yDxnUGZ1BCho3A/qNiTUdgFocCUjKikLUfA/BrcEs7yLUOPV9d8Yd4o+Zgc8DmdB1Hk48aF0tswCikwxAjlT18BN1VgIJ0KmZmYVpwG20qcyK7mbNJUnTVHX7/4/8WOubBFFePDJR6e16yyXIa6gz0dYa32RUsqp7YiOv0iLWE1IaU4f/cpKaj97xU8vhNH0Pb4OAXmZbdDhobtA4+zK+WC9CsS57jio+zgqo62GYM0mUPdLK67YU3RNBGD5A7Cp3e3b9PtP/iOdUQQMXAIC5Yol3zY8kxMEn1C5PGpy9r2xbnyBD0ubjoUAL/Ewo0QrlgWirBNN7iLb7FmeDsF6ltZKWS9JlA8V0DsQO7zpatoyBuc7X9AklPLItGzrMsMragnwiEy++pxMllTCiXLWSAYcTYadEWkwxKv1EomULsr12aUySrgQ9Jfd5He0tO+vhK7oGqBysZ25Dc9mNDQCJ+BLaO8FT3+Hh40AB440Vr4DNUfF3GNlZ67hLtXXh9uwlprh3YhRWeCh5aX+19JFmFTVQTos6ylnGcovYUws6WObuHi3bSGoxdupDyt0dSHNK668vLH/ttAlCncl7lvl+eoG8IsvXF0NJHUJO4dVYl+eBONkhEeqhpGxmuIltgnDg4YxGJuS5mpD62B7gbCSNOyNn3J7PhkHBWkqrMi0Q8JDRQbnqPbL5sZwI5bn1850F/Fic7h5zrKvbwSdk7rMVx6SK5vlupqpv+v3WZcT5I6QZwXCuKbGGtVYHkrR7WedpBB2DtgsBCZiCMja7Tm5j/ZqT7ZTlDjIjItWEkkzcKnGhIIR+Pi4cJrOyhYbuNY7qmBi0tgC8uDSdrPYry9LBqCdT5bdUhf2LCSQc6qK0KNBzL2Ibko54vTGW24GpNdNgqtC4xu+C/TZM8xzMUHRNYYGzqA1hbJLLVcV/If12Ez3+Sl/Q== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 169e70cd-f86a-4f41-45da-08dcece6a84b X-MS-Exchange-CrossTenant-AuthSource: ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 06:57:39.1528 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: M7RkyocCLzikBozWyB9GN9xrqvUyJrMwFRSMo3/2glVLgR19RqVr3rX3ubupoIFvbkRkycxgG0So4SPQ5pXPISgC/gk9IktDTuVbCwwEics= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQZPR01MB1105 X-Patchwork-Delegate: kuba@kernel.org In order to mask off the bits, we need to use the '~' operator to invert all the bits of _MASK and clear them. Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx") Signed-off-by: Ley Foon Tan --- drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c index e0165358c4ac..4e1b1bd98f68 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c @@ -266,7 +266,7 @@ static void dwmac4_dma_rx_chan_op_mode(struct stmmac_priv *priv, } else { pr_debug("GMAC: disable RX SF mode (threshold %d)\n", mode); mtl_rx_op &= ~MTL_OP_MODE_RSF; - mtl_rx_op &= MTL_OP_MODE_RTC_MASK; + mtl_rx_op &= ~MTL_OP_MODE_RTC_MASK; if (mode <= 32) mtl_rx_op |= MTL_OP_MODE_RTC_32; else if (mode <= 64) @@ -335,7 +335,7 @@ static void dwmac4_dma_tx_chan_op_mode(struct stmmac_priv *priv, } else { pr_debug("GMAC: disabling TX SF (threshold %d)\n", mode); mtl_tx_op &= ~MTL_OP_MODE_TSF; - mtl_tx_op &= MTL_OP_MODE_TTC_MASK; + mtl_tx_op &= ~MTL_OP_MODE_TTC_MASK; /* Set the transmit threshold */ if (mode <= 32) mtl_tx_op |= MTL_OP_MODE_TTC_32; From patchwork Tue Oct 15 06:57:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ley Foon Tan X-Patchwork-Id: 13835805 X-Patchwork-Delegate: kuba@kernel.org Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on2116.outbound.protection.partner.outlook.cn [139.219.146.116]) (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 6AB369474; Tue, 15 Oct 2024 07:29:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=139.219.146.116 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728977399; cv=fail; b=U5eDc9aag5gZo8GXRKDKvFGrl6ppedNd0YFal2BbP41q9p80v5SNrqngZ1tpio/ufrDUGQL2i2QCz5Ag7mPoKhrH54vn4Od9ul9drsMUqLFlxxPzLOXeQlh04rozV/Nd1GWyRQTZiXDIL+S2XCgl8Fbsysham5h1evni8z+v/rg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728977399; c=relaxed/simple; bh=XCLPmR0Le7fiiSbIqWvfFshIc15qkSSlQhSOMR74F4Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=PHYbk13BkXW8Zf+gEOkxSo35jMPjxHlekrZY4DKwObBjTlkhT0je+DZ1jzSg4eYAqy5fcwKLr1TKXDhcR+ae754CA3MRmEhENXtbQXRmTqWLyuXqjdKU5yCjY6e4KQXAIL6gbVGJ6sBZDmGlQt5YDarDmk5sPsxtAN7f5dErzkI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com; spf=pass smtp.mailfrom=starfivetech.com; arc=fail smtp.client-ip=139.219.146.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nMzZ4zfJoUmjI1WA39IFKga8wwOUGw7pE5gyJxVGDfFWqBE5+1mavK7mAinqpH8LB6XN1VwJ5XvVhpJaq/3mELUxF2vh9pczNppy2YfZvIVjynZSNxOZUdCfIl1nxj6qNwT3l9sxzu2P/zNDeQeYRaCTKEcSY8mXBPgY7uvS8amt6BeQFvRQCbC9euMq+LwkPobMs4vso55r8Yjil/Cbx6R/MeQUFgrhfpEJgazpNSVzYmWkxX59xeYPb0FDPRvWmukQkCK8dA0YJ3Pbivcl7rMqbIJ4w2ExByav3e2VUvGXDlDmqd8oK0L5AFuHdJC3Bfrfnuc6Pc2pl8dgDbbomA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iu4UJegdTlMh3TpMhAjavI1nxDebeKR67mjS+Twfsb8=; b=BQUmdV+tk++ipUyj4ylLzWMKn3j5W6g9x1AuUUNuEoZsQ+/DDELPZKKqF61gKpripi1qXlYhNZpeasJncwkyAIozY3W04VwUM/TCPfRm4njjsStTUHK9qSTIxHWUfQqLM8fOKn/CJyMYjAigR9psJbgZazRcD2qxnhBuEJ6Ltm6u+GZ5i02yiu/t5nITWQHONBQAZwcYYMUIHOMu+bzZwVBRQuBY4fAybfbPUjMmQbM8pDLNI/CLVwbZVbVIVYJ2x2qtERTl2f+6KvLZEAV+9QnHddNu5z/Ko4jR+s313bMN7xhqwN08cqsaQxyGyUDQ+dKv8krgX34Wf1aXEwrfMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) by ZQZPR01MB1105.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.20; Tue, 15 Oct 2024 06:57:40 +0000 Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095]) by ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095%4]) with mapi id 15.20.8048.013; Tue, 15 Oct 2024 06:57:40 +0000 From: Ley Foon Tan To: Alexandre Torgue , Jose Abreu Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, lftan.linux@gmai.com Subject: [PATCH net-next 3/4] net: stmmac: dwmac4: Receive Watchdog Timeout is not in abnormal interrupt summary Date: Tue, 15 Oct 2024 14:57:07 +0800 Message-ID: <20241015065708.3465151-4-leyfoon.tan@starfivetech.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> References: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> X-ClientProxiedBy: BJXPR01CA0067.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:12::34) To ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQZPR01MB0979:EE_|ZQZPR01MB1105:EE_ X-MS-Office365-Filtering-Correlation-Id: f3daca27-bfe6-4589-dd2f-08dcece6a94b X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|41320700013|38350700014; X-Microsoft-Antispam-Message-Info: xIMPSviKF9HNbxbamtLmJSRt9jsa2U2uOW/sK62vMkIjhdbeqtxYS7PzxQGc1Vv4bCW2jYJIXKdeCjq3D3XspjVLW8jz+NcatI8bPZQkovSJ54GGpYw4k/13hF2SciOkSarotJy3EZOxiY0Egyvi6FnqmZQvWpGiVkbph6HTAkwn5Vh4zSBm+fXM8W4Z+swDDGVC/Z9zvS3A36kch8O1la5KGvYgRAjZyNFOUt3Y8+llKXkKmSSswLKyJJxYlbKq9tB6ZgX8bdftnbVSCpucdbyaWt0z1ysyri/u75KEjxoKwb5f9MVJVzZYga/AdKIJJ04UprNaNlfubDFuKrwyGe3a/r4OADZ7Eig10M2BA0iaDaquCrmbpVLtQmD8d3zqEs269VCYNSjTIDPGxwI4e/oDnTXt9bbrWYdBNSrXqNQlK/Ne2oyChOwBmtP957Ee1UqRJHsDPYdZxUB/gZhrNyLytdQZOvKY6qFzB7ccHhvIog7CiotjRyEqTdpbenx56QR8A5YXmcoGkIB/+TPVgm0GhlQ2uaal6/CRPyGjo6QSMNhvJQEC1FpmvSGdwlHf9MQtWjon7jJL1fJ+0INPjbC4Rh/fszjIbdpLDB7/BsElPMaBLmB5wpgHXAZXWdQ7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(41320700013)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eo/qWIIChfDkyDxwUwUUM83xnzj8qlcVaZ8s5mLNlD0UeeA4vMBrJqlfd71/JUajw+zUgVJWTVD+ncCbQZvXyC2+gke14dGlCAFlIEOi0ro1hBOINK/sifz8HLeLmVlJ0b/e5dNtllD/Nd1L7dM0KkMfWEOeAhTe9CycqJWpEQvNjdPKxeJLFCNFpcGA0ZBsOeoO+shmINcPw6yJhezPPiAYsTrRQbEnUsRkRCn3btf5/0Eh/9eP2ViSoZ6MZeHDB7f1nQdNwfPwJzIPiFGMg4UrT9N7Nnj/RpdX9/JT2QV0ZJ9GMaiAh0h198iDS7viSWW0D5reIi9lkmMOa/PnNd+Ux3kzmCRW06mz5gr0wzVYO8GdX6wSgx5v76j88gv2ZypaviwFeKAZgVDvR1JXuyXlOZ60dMqK8L8BUWt1sv+koK5mMuZKdXhih5PnOW0g/DXRcE2SxJltXWMVAzSOufoM4iIfMk1ym3cD0hM7/IjOOtatSYGaorpOl+YgR3h6ImhkP8Eks9M7OUuRqnWuaz9/2XIaywfdKAPBb9P4v7edJ2LPGpLgYG8kJquMkIpk7ss90YVq3Uws0dXJG2EnBarpUn4mPkAYBN+oUEoHjXvxbmFE+qXniSx/RVp5BNkUrgR4LDrm8b6lgv7E+H+zB6QFrNEpZKdkMqtSx63HmoFyonSpwqEzVIZMmxSHm5e4LNDM3o53pwOGfyn53gcP1ywtJ/UHGb9ZFsNAX4rtGad7sPMwvLh/5bfcKJMsc4NZTPtRFN8GilObPdPdYHoXHGxmrD/63PiStZ7GvIBD6yJTogN+BpPu8Rv/qLoeMd8jkQQ0mDDAA4tQzsyaiK1Ark7c6gEeh63ZUj15xl3lKVBTcZ94/Qx6Ix9CLdTkTbCDPa9950mvzm/yfHGszRIngUAR4iJ9YV209FOQ2A+p+MDse1HNtkvaPOGT1GGfRSgr6xhMVeR7Kw7bWcybEoVfHnPBKqDXlpMa1WOWpzKy7CGCDFP1PyXhz1kQzAP/oAMSPIOnljGxlC1Km69BbQyASux0J6zYMce9Rg1gBfVLMsPjoiezqo5cS2g2d6Oii6/IYrFJJO/yejo3ExqR5VQy1fkTSe/qyTg0PzRggf4n91hG6DQhbrI3kQVaUQXoZAGJdCEhXFBaaEa06QtTjdCt5Y8s8wB9xDw+UqWTUW705iC7li+1XpVCMn/5bEQVCVp9+05u5A5Gyux2oj7GLvaG1UwUxQW7saGD5hxqEgNHLmzNniNSjaGxqgFMsc8p1zbNgZbWZvVM/k6tlYgH7POqiDvUTlbWWuccG2eu0Sqp8x4OIPvNTmsg/PTj36p4J0/nwy/lAQev/D7ZSyOfcVQG8BQjVVyvrza/W4+/fSkmfXoNfd2dJrAfDvTK1+R7wrYQ+m8zDnf+rrpE5WHacHSTFZhtzijz8cC5TVdLSp2Feba6dAgnKH7qNmKWukV2M6PsYMei/wJt1a6o96Y+Ncz3FqV4NQvFCGGv2YZaQ6HHphEjMlFkDP/u2cC2VHFxjzI5rg0dczaa/+GXo6SkE0e/ieQruLAgDfQe8CYf0an8oTlJHIqd9ozir2NkJZdgiW8JAtBS/ZM0SkH8THlIl/zoFg== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3daca27-bfe6-4589-dd2f-08dcece6a94b X-MS-Exchange-CrossTenant-AuthSource: ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 06:57:40.8337 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MnfijXcxy+QyJ9YzrA+MmFdt0H5ZJY8lTOY2epTd9Pi1G9KV3mGDXB4c3aIPhOPCzmTmQZb59nTaYx6TLEjbDQNKZgU9k4uLa05cu/52LSg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQZPR01MB1105 X-Patchwork-Delegate: kuba@kernel.org The Receive Watchdog Timeout (RWT, bit[9]) is not part of Abnormal Interrupt Summary (AIS). Move the RWT handling out of the AIS condition statement. From databook, the AIS is the logical OR of the following interrupt bits: - Bit 1: Transmit Process Stopped - Bit 7: Receive Buffer Unavailable - Bit 8: Receive Process Stopped - Bit 10: Early Transmit Interrupt - Bit 12: Fatal Bus Error - Bit 13: Context Descriptor Error Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx") Signed-off-by: Ley Foon Tan --- drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c index 0d185e54eb7e..57c03d491774 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c @@ -185,8 +185,6 @@ int dwmac4_dma_interrupt(struct stmmac_priv *priv, void __iomem *ioaddr, x->rx_buf_unav_irq++; if (unlikely(intr_status & DMA_CHAN_STATUS_RPS)) x->rx_process_stopped_irq++; - if (unlikely(intr_status & DMA_CHAN_STATUS_RWT)) - x->rx_watchdog_irq++; if (unlikely(intr_status & DMA_CHAN_STATUS_ETI)) x->tx_early_irq++; if (unlikely(intr_status & DMA_CHAN_STATUS_TPS)) { @@ -198,6 +196,10 @@ int dwmac4_dma_interrupt(struct stmmac_priv *priv, void __iomem *ioaddr, ret = tx_hard_error; } } + + if (unlikely(intr_status & DMA_CHAN_STATUS_RWT)) + x->rx_watchdog_irq++; + /* TX/RX NORMAL interrupts */ if (likely(intr_status & DMA_CHAN_STATUS_RI)) { u64_stats_update_begin(&stats->syncp); From patchwork Tue Oct 15 06:57:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ley Foon Tan X-Patchwork-Id: 13835806 X-Patchwork-Delegate: kuba@kernel.org Received: from CHN02-SH0-obe.outbound.protection.partner.outlook.cn (mail-sh0chn02on2116.outbound.protection.partner.outlook.cn [139.219.146.116]) (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 2F7EF198E9B; Tue, 15 Oct 2024 07:30:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=139.219.146.116 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728977402; cv=fail; b=AZcSgEffTgMS7m85I+ykQZ5E2QgZTryjdyTFEoZkrKxBugSqjRkytD7qmrj1t9rq2L5C4O11ScDa9bDmsjkss9Uj/evxjspV5u8FDA9hAYwscUYzCbvdwT0XtkmQw2627idaVg6LW1WoG4oW27+SPvSYjOyWDANdgn4Cpdo6uu4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728977402; c=relaxed/simple; bh=bLzd0eS3L6Jmo7TCTI/akWhZAsYGVTw5+EX7Ge8m9sE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=WTdzvCtvj0TugyrXm26luidG8tXQBeTfKpGUdlzj2uJJcNTpU6bnrd8chUhmxMrHEx3qHKXU89u6lmViMu4KYTPhuW+7I6qYfR0bSw9i7wlLYLAgPk5PhWBeEN1BjV9KpeX/DPGYZ+9iJjHu5niJOh42MFWJho1qeNB9F2XKAU0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com; spf=pass smtp.mailfrom=starfivetech.com; arc=fail smtp.client-ip=139.219.146.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starfivetech.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XLW+950HJadrdw1MOeTd3wtdRLK+p840wMnG4E1hYfLdu4H1qDyCKdGbRXoegIAoA2hHbRbb6FjqXnj8eSwulN1eJlE0cs/HIod3l3JyrfAPNxiH1PJUxovJYViADdnmJwBJHEcOlvWYAV/45a/EIBKJLyFqK9zS9egjLG4YuUFQCAzTMHArG2PoBTRpH1AA68xUYt/5tQlajjwG8dTh8VaO0u51kuqtVlmH8Z3aNGHJ92khMMrZiiRbTzHFSO0CSVM/HM0ueA9izhsszVKOlZ4Pdqwje/jRIqS0CotNnZLD7gOALSZ5kHcQ2cu2ccUrp4FVe73BgWKgZmprLhlU8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=u9jVMtRFsPCo3HS2I26E6bGM9KeUSpTylAxw3pJ2MqM=; b=Iu7k+XUOwMa1PoA1BJswnqteE1pqy4hw2i4N2T9vV1dc4SxqTsj6GrndS/2gWKmaO/j2iy5f394yHwFP7dUCkKXa3k+H318y1Sd9Mz54vSHcGa1fFgV52f6kCRBZHwDpdD0R8x79+oiZcqzEx++Q5PE89ILxoldtHBuyGJ+hF4zY09rwyUdsrqoZK6KaTvhn3OYY88kiG0WGALYdfYxCH75HOhB2SSfw3cTljE4dlOFbUK+l0wuFEUkrewuevul0oNr548rCMsayLgAkF/vBOtueFWiq3F5ZltPQfO6ky0uI9FPZYACwgrziFIPCdgBEmD8/i+/RBuPlbZQGgEp7WQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) by ZQZPR01MB1105.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.20; Tue, 15 Oct 2024 06:57:42 +0000 Received: from ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095]) by ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn ([fe80::617c:34a2:c5bf:8095%4]) with mapi id 15.20.8048.013; Tue, 15 Oct 2024 06:57:42 +0000 From: Ley Foon Tan To: Alexandre Torgue , Jose Abreu Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, lftan.linux@gmai.com Subject: [PATCH net-next 4/4] net: stmmac: dwmac4: Dump the DMA high address registers Date: Tue, 15 Oct 2024 14:57:08 +0800 Message-ID: <20241015065708.3465151-5-leyfoon.tan@starfivetech.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> References: <20241015065708.3465151-1-leyfoon.tan@starfivetech.com> X-ClientProxiedBy: BJXPR01CA0067.CHNPR01.prod.partner.outlook.cn (2406:e500:c211:12::34) To ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:f::12) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQZPR01MB0979:EE_|ZQZPR01MB1105:EE_ X-MS-Office365-Filtering-Correlation-Id: 96413965-669b-42df-c786-08dcece6aa47 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|41320700013|38350700014; X-Microsoft-Antispam-Message-Info: GQ1uH14mh0k33SyhZFfmMxWfXxqUmGh4JXEriYk8hcgr4Slx28UOZgTVoCPno1/Ec2Ij7K/bNIkactzqUpIapxapDm4jl4Fa419gEp6y5yIdvbeBCYTmOvifqxzo7NbHRoygxt0x/yXioqEpIoQx4rHPdKJC/NrWF0yy9Q4eSQPH3Sw0rxJi01SFf+QfbsL9IkPfoOJ6kaT9l6YR7rABuj8oJfMb1HaQz3OVlOX6aQO7O3/NeAju+SkejReMWS1yK4s0wWdxQhQiitwKeU7+wcZm11K9t6Q+cCZ6H6gvrtBkQaaQX7gAOdCy9TfUMdy8j9TdWwRoCfRj61PE/idoz7VJUaAjRPSOA2k42AF2+NIFdVN6GJaNUfEs0zzm/FwCc5d/lwtdvVEFlo8PeijhqPYwPAJgC1hlL8xGRs66sFupPpjcbhFShLyWqch0XBhx4Iajmgtz2lURNW1Hen6HEL3bB+TYjSdHFhoG5211h9q6c0BfoAHNwfvBrFl4cjld3yFjTsh40+z0Qk96D1YjYnIwwSz3h97X47nqIqP+yo+g4Pa9uBsxz9DqLtYv42ciIAtuPO77sFzaP0xW39/RoPoviv4VjIqk+2seV4TGKAlqlThA3PRuz22ZWcjLqfud X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(41320700013)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xmRV0pqcihnXxkmnMfJcEGs4+yZrF9Vt1um8qVj5rQ80N+IjwTYjMbwJ5fZHg6Rk6g/cJv4kBH4o9E9+un0KzUzIOgt+HbZnbEitt7X67cEWwAMK6ZXDG6ZNl4qV9U3GNafjacvH+ro9rKPTQ4Vld6wuXMwHTQjhnS2Rn+7i4jTwHJOTx6euDUBkmcKwqw/WIRaaXQOgu+/bFkgauvSvaavBBPYbWd/JQrnnoviajQfoaChKRGS4QW8jGJKz5zQq6su7njYvQHY3bB+6yScMwxOVMs9IhOQaDtX/hJEGOee8xvdec0jrCYxM8mZUuTLELPuZB/KTOi5sUey/FRgJY4pcIV4ahGYKFWCdVbseHWORQ+NnmCn9j2tqn6OsRWJqDvSup8t8rQQEEyqgrtji/PZFNcXHPW7S4YMpdaw4RgGOJAvbto7eAek9RMv1eZLDDKVfEj/PuuXC2d0noKKtmhWXlw4t1UZ1aRunwY7XPeUsS9ZBf2ou1luDBfGbuoo42p7PRekhDipBqMmLTum6nZbsmd3DnHcrkb27IBCtkFQ+52q613cdiMYmpDhK9HbSesIByzGbxbQa4OkdoQtVeJvpv7LEZUbiFixhjeN5JftDhJoLCFGJWbAFMts9CN5weUCiAi+AgB2UoXj/1MAqnf/ZIP/1j4RhHw8K9N+nogpIqc8mKFR1VUfStyWepLXOD8WI5dQb6GvWRCpJUpqxRBKeffJqOvkr/FUNJwHtoyo84BWioqtFTfWwRqbKd14lLmfQ7hwGRPDS5r04Tf5I3LMMVSDJK7GkRlqezbm7xcrtaEpPwl9KePlQpM6DDTv0JgtPYVtlrj8ijNUPMLvHm/K2mEnCAXHCARvyuQ+a+T5C3WiHBGIrc4ZrRAsxYe4+dEYb78UD0kQ/DVaeLQmmMVeSbY3u91uFd19MdwbrMYNUZgfin3W4S99j6ihOo6tWqmNiQL+dhaDFGdgtbecjOjVeGf8weoQ3/Sysn2Ogzczib8XvjlSz9lQG4p2pA6C/q42ujsAFBAOyIhd/qm2TURyOaKmT6Dxw40SkO6zxQ1FmdHoBd7MA4y9BhSyJllxrF8XukL/tu0f2A8lPjrVgUtcaoOegs6uXOdCoip2E2sCXIYFR8HXapSxggMnu66I4Yg/ik52oupe5/s5IuC/odNlxsVfJPifDBLn0sH+UhSE9pH0oVVPXC+TXDzDyyS8P/HY/eB/bsbtaKw9klGRrXXKKeq47HOoIet9A44Qni7UVnHTImub6KCU60KTNdcjh6E3dBUN/owV0xr/KNbdYy7oAwKD4zVRQwzZ3NPiVL+pTzthrEs3qcWzOESjRk/xltc0Ez2aBGBRMOHMRWJ5fTcF0hi89UtXgGCoAW/pPtw+GGZrLcMC3ejN3Qv42l1/ZzoBBlnfbFI9YkSx3o0nOHfOWNjF6H3ckzyrkYGCdefd/Zy8BBAxHT8L+mTrd5Diz1KjdC25mNGTOow5KA4MI7QJGErLJnftXGTEINJPnJRi2wG7KoxQvVBMiHabcP9p2iZUkD5/Y80ZOBBtZvypBBQ0DOT6DH08iNG9r5jKsVmnzbofM5il38FCXSxQ6+nAmLm3+4us2VsOfxoVsEd5LdA== X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96413965-669b-42df-c786-08dcece6aa47 X-MS-Exchange-CrossTenant-AuthSource: ZQZPR01MB0979.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2024 06:57:42.4835 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UO/E+cIgL87WAq1EN9cDcoDdtW7+4JN8H9hxuDCSCeQ6JwNtbj1UWTtFMDUvj63yWC8DzpPR2ORa6KY105oNDMN1ODcPwK1zUqvYvZty5SQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQZPR01MB1105 X-Patchwork-Delegate: kuba@kernel.org Dump the DMA high address registers (upper 32-bit address). Signed-off-by: Ley Foon Tan --- drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 8 ++++++++ drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c index 4e1b1bd98f68..60cee7a06ba2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c @@ -203,8 +203,12 @@ static void _dwmac4_dump_dma_regs(struct stmmac_priv *priv, readl(ioaddr + DMA_CHAN_TX_CONTROL(dwmac4_addrs, channel)); reg_space[DMA_CHAN_RX_CONTROL(default_addrs, channel) / 4] = readl(ioaddr + DMA_CHAN_RX_CONTROL(dwmac4_addrs, channel)); + reg_space[DMA_CHAN_TX_BASE_ADDR_HI(default_addrs, channel) / 4] = + readl(ioaddr + DMA_CHAN_TX_BASE_ADDR_HI(dwmac4_addrs, channel)); reg_space[DMA_CHAN_TX_BASE_ADDR(default_addrs, channel) / 4] = readl(ioaddr + DMA_CHAN_TX_BASE_ADDR(dwmac4_addrs, channel)); + reg_space[DMA_CHAN_RX_BASE_ADDR_HI(default_addrs, channel) / 4] = + readl(ioaddr + DMA_CHAN_RX_BASE_ADDR_HI(dwmac4_addrs, channel)); reg_space[DMA_CHAN_RX_BASE_ADDR(default_addrs, channel) / 4] = readl(ioaddr + DMA_CHAN_RX_BASE_ADDR(dwmac4_addrs, channel)); reg_space[DMA_CHAN_TX_END_ADDR(default_addrs, channel) / 4] = @@ -225,8 +229,12 @@ static void _dwmac4_dump_dma_regs(struct stmmac_priv *priv, readl(ioaddr + DMA_CHAN_CUR_TX_DESC(dwmac4_addrs, channel)); reg_space[DMA_CHAN_CUR_RX_DESC(default_addrs, channel) / 4] = readl(ioaddr + DMA_CHAN_CUR_RX_DESC(dwmac4_addrs, channel)); + reg_space[DMA_CHAN_CUR_TX_BUF_ADDR_HI(default_addrs, channel) / 4] = + readl(ioaddr + DMA_CHAN_CUR_TX_BUF_ADDR_HI(dwmac4_addrs, channel)); reg_space[DMA_CHAN_CUR_TX_BUF_ADDR(default_addrs, channel) / 4] = readl(ioaddr + DMA_CHAN_CUR_TX_BUF_ADDR(dwmac4_addrs, channel)); + reg_space[DMA_CHAN_CUR_RX_BUF_ADDR_HI(default_addrs, channel) / 4] = + readl(ioaddr + DMA_CHAN_CUR_RX_BUF_ADDR_HI(dwmac4_addrs, channel)); reg_space[DMA_CHAN_CUR_RX_BUF_ADDR(default_addrs, channel) / 4] = readl(ioaddr + DMA_CHAN_CUR_RX_BUF_ADDR(dwmac4_addrs, channel)); reg_space[DMA_CHAN_STATUS(default_addrs, channel) / 4] = diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h index 17d9120db5fe..4f980dcd3958 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h @@ -127,7 +127,9 @@ static inline u32 dma_chanx_base_addr(const struct dwmac4_addrs *addrs, #define DMA_CHAN_SLOT_CTRL_STATUS(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x3c) #define DMA_CHAN_CUR_TX_DESC(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x44) #define DMA_CHAN_CUR_RX_DESC(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x4c) +#define DMA_CHAN_CUR_TX_BUF_ADDR_HI(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x50) #define DMA_CHAN_CUR_TX_BUF_ADDR(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x54) +#define DMA_CHAN_CUR_RX_BUF_ADDR_HI(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x58) #define DMA_CHAN_CUR_RX_BUF_ADDR(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x5c) #define DMA_CHAN_STATUS(addrs, x) (dma_chanx_base_addr(addrs, x) + 0x60)