From patchwork Wed Dec 27 09:19:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 183445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1326283dyb; Wed, 27 Dec 2023 01:21:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IF92HWPbN6PU9qLiqzA+92H8f8lEREfkBUmWYn6B7rW48jhserf4bs01Ej+ZunQFnQnIrmB X-Received: by 2002:a37:c201:0:b0:781:54fd:3060 with SMTP id i1-20020a37c201000000b0078154fd3060mr2670088qkm.114.1703668864752; Wed, 27 Dec 2023 01:21:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703668864; cv=none; d=google.com; s=arc-20160816; b=0yZCMhl/E5mNAjDSFFwXRwLybTwsgW3/aiG2WGIYQ+bOXqQz9ow5+avAcGQb9Tsr2X 0BmEdcTYCYmmwfHCrncrL/WOIAMOEDNfSUMF9Cetib0BAFcxgIXL51pwh3K2yVgJr3PZ Oo3t4llZRFwIP78XpgszfA3Oo/7p5bqj/OKTLfRdx7dGl7A761DhMxfcSyCZodqqWxN1 k1pKzh5beEpAhJnZy+Ne1TCNQLA6KsklThK4fPSUEz77f8oDauc8ggyuCsU8VcPMRbnJ kDBX9ua/NXjg2HyDRy9QD5MXyqcNs9HcXp1P1+98ydt3h2I5kzjvkUo0uXFWxPWL974/ aiEw== ARC-Message-Signature: i=1; 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=Unh7AvAJhOG23vCAC0eq7TJOfT6O1MnHdkMG11zksUI=; fh=utmrxdkgikAlLxVfQI1kldUG+rNjhrLN+3fAlOYj01s=; b=Z2tg6vMpTusPobzwFwwQETq+8V3abHZvoEunUIbow4fOTMkmXl6/3KHGn1mW/mjVo5 mGV5PcDHXMJ0PcicIY3r5181U4uODn9tVRx2Ff5He2SPTkqIELRbmV1DKHFCFvTfUZbo 6Q1b40oW9Ajq0DAd8NuFxohxLt7nObfhfx0FEno24O516DPEbQI3mqX2ItArgD7ldM3H +VV5yN1FTDITflYkD3V2PqVtw+SVyblKFP8t8mrIBUiDAMFECLQgOVyfbMqE6a3L5jig E5cGw4NIIEzMPD19pcZ0rdhWOoxcpKjId2dZ5gFoOa0I8nOxpd0V7Q6fu9/YItz3dXJ+ kNdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Bz4kV9yN; spf=pass (google.com: domain of linux-kernel+bounces-11929-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11929-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id v1-20020a05620a0f0100b0077f1c5f835csi14347550qkl.311.2023.12.27.01.21.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:21:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11929-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Bz4kV9yN; spf=pass (google.com: domain of linux-kernel+bounces-11929-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11929-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 76DC01C21746 for ; Wed, 27 Dec 2023 09:21:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AF3202E407; Wed, 27 Dec 2023 09:20:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bz4kV9yN" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A26BA24B2A; Wed, 27 Dec 2023 09:20:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40d5ab2f9f1so11430585e9.3; Wed, 27 Dec 2023 01:20:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703668801; x=1704273601; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Unh7AvAJhOG23vCAC0eq7TJOfT6O1MnHdkMG11zksUI=; b=Bz4kV9yNYkmPoDJnD+BDNtyO6dbgKopH9JYaOmf7QqrNlTXN6cApf1MxZ1GdBDrIOI hySf6sx+CNON8582wuQVRHnu080uoN6jYbNibUZC8fCzXDucOex2wcy1rYSJei6DwAPz Lp9sjnIyoeLr2hVAMHIGRd62XJsvaaaaX/XusHmQnVJHB698N7Lf8N4QXd9yXGPpEQYr Jj05QqjwlXI4PgA+twUIFvEdOojsgJDi0b66vEInqirMf1IRW7K+3k30Zkf45Mi/f6xY i1nX0vsmzxqTqP7nQZbAvM9TWq+v0ieYQ7ujO4x/JrBBvMUYdpAGZaJBMoS0LJWf2aAv KGhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703668801; x=1704273601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Unh7AvAJhOG23vCAC0eq7TJOfT6O1MnHdkMG11zksUI=; b=d3ZXlANSxLUTr2DWr007MAuumUkIYddC/n35JFgcJdyt2oIX2DkJ/J4X/COYtEMyJb OrEFoBuvgBrUoZgIdqoqHyxjM4LWAVifVsKlXLoT9BqL2I1QMUGVGdO+u1OgyiZ3iliP MIuap0QGUOgi2Lloa28ddUz8dlYg3aFy6u7dJZ2pAMCHzyrHrP3ol9+1wbSkXQK6G9S6 AcOSSdDYBtft5oHBqMDA3iwkPUCm7jmCZ4IP7pwNCVDLq5+afkUwzAAPk2UGYJ/1E5hW id5ECtYO5OY/LtaEX1rGvMOfGZxVgN6DvuzBihuWu8TEPi2LFgVbbvxu+kDcM5tQvZj7 7u7g== X-Gm-Message-State: AOJu0YxWXRq7VjzhEAUfQwH6t934jTh4cAd5vo5+2Humn5GdzyapFpfl xFlnD8PIhpBVE2zEMj6cHfU= X-Received: by 2002:a05:600c:1d88:b0:40d:5b89:71a5 with SMTP id p8-20020a05600c1d8800b0040d5b8971a5mr607275wms.214.1703668800689; Wed, 27 Dec 2023 01:20:00 -0800 (PST) Received: from localhost.localdomain (host-95-250-248-68.retail.telecomitalia.it. [95.250.248.68]) by smtp.googlemail.com with ESMTPSA id i2-20020a05600c354200b0040d5ac00dc6sm4539749wmq.8.2023.12.27.01.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:20:00 -0800 (PST) From: Christian Marangi To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [net-next PATCH 1/3] net: phy: at803x: generalize cdt fault length function Date: Wed, 27 Dec 2023 10:19:44 +0100 Message-Id: <20231227091946.12937-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231227091946.12937-1-ansuelsmth@gmail.com> References: <20231227091946.12937-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786426283601461983 X-GMAIL-MSGID: 1786426283601461983 Generalize cable test fault length function since they all base on the same magic values (already reverse engineered to understand the meaning of it) to have consistenct values on every PHY. Signed-off-by: Christian Marangi --- drivers/net/phy/at803x.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 0db653b57494..072bcd670ef0 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -1259,10 +1259,8 @@ static bool at803x_cdt_fault_length_valid(u16 status) return false; } -static int at803x_cdt_fault_length(u16 status) +static int at803x_cdt_fault_length(int dt) { - int dt; - /* According to the datasheet the distance to the fault is * DELTA_TIME * 0.824 meters. * @@ -1278,8 +1276,6 @@ static int at803x_cdt_fault_length(u16 status) * With a VF of 0.69 we get the factor 0.824 mentioned in the * datasheet. */ - dt = FIELD_GET(AT803X_CDT_STATUS_DELTA_TIME_MASK, status); - return (dt * 824) / 10; } @@ -1332,9 +1328,11 @@ static int at803x_cable_test_one_pair(struct phy_device *phydev, int pair) ethnl_cable_test_result(phydev, ethtool_pair[pair], at803x_cable_test_result_trans(val)); - if (at803x_cdt_fault_length_valid(val)) + if (at803x_cdt_fault_length_valid(val)) { + val = FIELD_GET(AT803X_CDT_STATUS_DELTA_TIME_MASK, val); ethnl_cable_test_fault_length(phydev, ethtool_pair[pair], at803x_cdt_fault_length(val)); + } return 1; } @@ -2059,7 +2057,8 @@ static int qca808x_cdt_fault_length(struct phy_device *phydev, int pair) if (val < 0) return val; - return (FIELD_GET(QCA808X_CDT_DIAG_LENGTH, val) * 824) / 10; + val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH, val); + return at803x_cdt_fault_length(val); } static int qca808x_cable_test_start(struct phy_device *phydev) From patchwork Wed Dec 27 09:19:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 183446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp1326455dyb; Wed, 27 Dec 2023 01:21:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFlFDzMNb9p0StqbjtgD4Jkv5+LYIqFEEtiJVJH73F0Zhqk+0GYPVQuInjMsjt8aisxFYOM X-Received: by 2002:a05:6214:1948:b0:67c:d2fd:3e3f with SMTP id q8-20020a056214194800b0067cd2fd3e3fmr13170687qvk.27.1703668896646; Wed, 27 Dec 2023 01:21:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703668896; cv=none; d=google.com; s=arc-20160816; b=jVUkwRLY7ry/FG6TL+7oC7BFtf5XY5hF21yNCpHBY3kDBTJnNi24pDXa/MTljK997H vh6qwdIAoJvipeIa9eoEAmhbDyHgxMBHLIcmEd6JQqa4GtN1qOwS75J+tcPiw6Eq4JlY dHWPwxfBsdarbd+O88F6NgUYmfsp5ifSY5Zt9H9WCf7VUkDupFEtTifY6sjX0U3p1uGZ oVNAcYgLdQ0D8wKD/f2Naz2oTHuhmKYu1hgh0jntnMqMTxEA5jPO2O+iNn3Iz1TB3t0M 9Q8vMcSOxNUZow9REbNLR3lZFB30nwlUVcKja8sVCikq7y8D+8o7PnylnumTvX/7vbeT NI+A== ARC-Message-Signature: i=1; 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=SK3beSWkL1WdKpoVMiSUuExdWouQ1FOB/P9yoXlJNOA=; fh=utmrxdkgikAlLxVfQI1kldUG+rNjhrLN+3fAlOYj01s=; b=h0T63FiQT3lzTAmS4lq01Nq6udCbc9TyBL55aPFtjlk2v6RpMWdafexDQ8MXKsZqK5 P1GWH2/kPshEWidGgtC0ulFmzINMDyHdGpnrgPGZTQOVA0c6JSCeVdzemsxHoDevBZxY 5KsGJt24P+d5zF+9JZILSnaue28daJdPdaiqnkAVGtMJv2ndvaAolsWmNlD1dbNMOOWB LmWVp/6Z2lr5YhfUUpmoVTieleErLhCaT1XvcvERprtRLTSt7uuBUdiSuHbzDIIib5xp VHd1efp0iBhv0qrVpmrnVd/QOvS810FrsgJdNZ4bZJnTopmhf6sR1iZELGF6CXEJxjc6 PWLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=geNpBe3a; spf=pass (google.com: domain of linux-kernel+bounces-11931-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11931-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id l7-20020a056214104700b0067f81005f4csi13926997qvr.176.2023.12.27.01.21.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:21:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11931-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=geNpBe3a; spf=pass (google.com: domain of linux-kernel+bounces-11931-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11931-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 718EB1C223BF for ; Wed, 27 Dec 2023 09:21:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C0002EB1A; Wed, 27 Dec 2023 09:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="geNpBe3a" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 457382DF65; Wed, 27 Dec 2023 09:20:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-33666fb9318so4840605f8f.2; Wed, 27 Dec 2023 01:20:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703668803; x=1704273603; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SK3beSWkL1WdKpoVMiSUuExdWouQ1FOB/P9yoXlJNOA=; b=geNpBe3aTn72lfEyVWXcjgdMF/dEyPcqeAfmA2RynctaDBWx/GQ7daq7HsYKYk8+v+ tH/JQIWL2h/CILGq1xRGRKv1mmoR4D/ghwQITMjOXvMleXZleXUeChLOUWqnIuHn0ilZ GV+KEw2lshBnx4nPqU1DkjKDuwY8wzwbGAWJw26wTaJLHqAvToRhCcfMDyz2fc4IB05J WobItAzQFkmfg6+zfkq7IKvQGy3ljJxXV9HhqkjIHkfhQhY+023qQaAIuMliqNH1HyyJ GA/NPfOxbMRhHmxeuc02qIxvFK0/KbjhhSoLm5O1S/paeg3bIih3og9p0/TOcNGK1TvU Thng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703668803; x=1704273603; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SK3beSWkL1WdKpoVMiSUuExdWouQ1FOB/P9yoXlJNOA=; b=uH1XbxE2Du2JFKMNu6h73wjmBuzvOm0BG0tbiiyD/qqGbV2tI6VaYmTqdgqDp/zSwK CA4bUpp2s/QjZ5dygUIDBpqBA/wu+KJVvAqsBkL6oOlo0itivWxmSYTfCx/s5OoXB2KP gvrZ4AUKDRcHzp4gNrVlvjzBinG3JLVH7V/GXsmVNSNr6JgRs1he7jiC4cb4QX09liE2 BaydVbEGdrYc3e8cQUwPKbG7FWIGKx90oetOweOWinzwYjy7Oz6egPTbKZv8tI1QeEf0 4dq0Ky+Uy/WVzuUuYzYOS0dlMHRHHvD/B9fjbxuzDFTzt8MkHs11yQHB26lc9Ayhcocx lbFw== X-Gm-Message-State: AOJu0YwmZXqcv15fL+S4fSs7+nVzGaxSveH0IvJ9JrsgCe73IWGaj4i/ 4hA6XTd3IoMVyCiZKc9HokzY2ndyBfg= X-Received: by 2002:a05:600c:4e92:b0:40d:53c4:9eec with SMTP id f18-20020a05600c4e9200b0040d53c49eecmr2608669wmq.73.1703668803461; Wed, 27 Dec 2023 01:20:03 -0800 (PST) Received: from localhost.localdomain (host-95-250-248-68.retail.telecomitalia.it. [95.250.248.68]) by smtp.googlemail.com with ESMTPSA id i2-20020a05600c354200b0040d5ac00dc6sm4539749wmq.8.2023.12.27.01.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 01:20:03 -0800 (PST) From: Christian Marangi To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [net-next PATCH 3/3] net: phy: at803x: make read_status more generic Date: Wed, 27 Dec 2023 10:19:46 +0100 Message-Id: <20231227091946.12937-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231227091946.12937-1-ansuelsmth@gmail.com> References: <20231227091946.12937-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786426316872765115 X-GMAIL-MSGID: 1786426316872765115 Make read_status more generic in preparation on moving it to shared library as other PHY Family Driver will have the exact same implementation. The only specific part was a check for AR8031/33 if 1000basex was used. The check is moved to a dedicated function specific for those PHYs. Signed-off-by: Christian Marangi --- drivers/net/phy/at803x.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index a2f5d608b59e..2408001683cf 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -1087,13 +1087,9 @@ static int at803x_read_specific_status(struct phy_device *phydev, static int at803x_read_status(struct phy_device *phydev) { - struct at803x_priv *priv = phydev->priv; struct at803x_ss_mask ss_mask = { 0 }; int err, old_link = phydev->link; - if (priv->is_1000basex) - return genphy_c37_read_status(phydev); - /* Update the link, but return if there was an error */ err = genphy_update_link(phydev); if (err) @@ -1685,6 +1681,17 @@ static int at8031_config_intr(struct phy_device *phydev) return at803x_config_intr(phydev); } +/* AR8031 and AR8033 share the same read status logic */ +static int at8031_read_status(struct phy_device *phydev) +{ + struct at803x_priv *priv = phydev->priv; + + if (priv->is_1000basex) + return genphy_c37_read_status(phydev); + + return at803x_read_status(phydev); +} + /* AR8031 and AR8035 share the same cable test get status reg */ static int at8031_cable_test_get_status(struct phy_device *phydev, bool *finished) @@ -2569,7 +2576,7 @@ static struct phy_driver at803x_driver[] = { .read_page = at803x_read_page, .write_page = at803x_write_page, .get_features = at803x_get_features, - .read_status = at803x_read_status, + .read_status = at8031_read_status, .config_intr = at8031_config_intr, .handle_interrupt = at803x_handle_interrupt, .get_tunable = at803x_get_tunable,