From patchwork Fri Jun 4 02:26:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 1487543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=KbqNP3E+; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=HxFd231M; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fx6Gs1Mb7z9sRK for ; Fri, 4 Jun 2021 12:32:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Ljbaq34Xt2jyV7yitGBwBrorQFulT86/FQ+igT0WjEI=; b=KbqNP3E+1oehtx P2Jd2nysrDYwSHs84qt0M1yQyvb7DMkTYeE76FFGRUE2+e6o6M5cuyz7XotBFtfKpO5byHGzjM5Of rsiME8eG/FAm40wfLbkS4c+lhxbi0aUKiAem5Prm8MzKLsvOrhe10kREI+bwlsKdv1PO/gkN3B19I 7+7+YOf6HG/8kt3/mC6KhFrT00G+xB+q5GrZA/WKnXoahRq+BdC8HNI3TLGL8108Kec/xGMTNNL+1 fDwch35YYSlFuGmkm+QkgEB8rI8helFzAgxQ6dmfNUtNQknRXG6cY+5V/Hv+NnAnR8OS3mGfDqf8S luDdRoJiI4tEVWq4nEFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lozb2-00BGSn-63; Fri, 04 Jun 2021 02:30:04 +0000 Received: from mail-pf1-f176.google.com ([209.85.210.176]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lozaw-00BGHY-8I for openwrt-devel@lists.openwrt.org; Fri, 04 Jun 2021 02:30:00 +0000 Received: by mail-pf1-f176.google.com with SMTP id k15so6364178pfp.6 for ; Thu, 03 Jun 2021 19:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7Zsw4tA3sCF2QEorAWctyDXQe4tzKPDE97qJgK8nH9E=; b=HxFd231MiMb0E0pI7DaG6FjZGmcui4+nWZCh77eJhCxG7J0a8o0+/1n6CjtEEJAxTA LbJRdbquKSScUvb0IY9Za4LHpeu7IKGz8e8IPFntqt6v6lLsx4MDtmB2sdwyaaYfwCm2 iSS6KyQNoOxzkiWXx1KB/kGC5KLTkLNzfzuxDkNNEULjyhmeE/ts0EK6jmTXhwpxTCIb +9NqVRrV5qIXxCprTKB9H9F2UCP1/OaE/n2rIi/R+VfwuQN9qP42TVRPdqo08bFpQAam VV7pWNPJ7XfLkiC8UTPreArRtdP10CFl1H0C3L12xkI7cVadIUo0YSqfOAkk5HCUpLCu hAKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7Zsw4tA3sCF2QEorAWctyDXQe4tzKPDE97qJgK8nH9E=; b=D7Nr9KI1MPXD3S3NHb7Keex9wAE1M5Y9WnptiXo9fYTgWoE7CXJJBuMWKNHm4HgqMr hYXXBz9OsaFrapjDDcZEfJkQUb2uia3grYBjH11DXFG3YrrT9m/hF+LVXaHXnNb60gU4 I06mHyLSP27V6g7armKhS2VJzcujYzBczRFf4unGKptbjPe0lTXso/qzwYmiMt0lLp09 OfOBEnKdDj9n8OlUwxuquOM2pTqXbLFAwGQKQlR9uPc0daYtE9GKTJfC2GsvjJ8u+UUC DwPHHPwdGGxbbHCFmBzHI1cb++llx3FXuLWSiy7HvDHlH+lP4DnfJzdabr3JE/quEREW 1Iiw== X-Gm-Message-State: AOAM531JczSlZphTC9y2lvAoTNSt1FuiuCsZyKrHfURcq3jzh9eP6K0W gj9OhMf41GvIjoWdkxlIbgl/nak3Ba5U/A== X-Google-Smtp-Source: ABdhPJzYFhvKjZ/n4pbxankLZmDzDFOqeLDnem1nl/3NgvQYuhVVQkl1Rm6+Qk8f7xFVlU6fKmUQvQ== X-Received: by 2002:a65:6549:: with SMTP id a9mr2465700pgw.213.1622773615442; Thu, 03 Jun 2021 19:26:55 -0700 (PDT) Received: from localhost.localdomain ([138.197.212.246]) by smtp.gmail.com with ESMTPSA id h16sm315366pfk.119.2021.06.03.19.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 19:26:54 -0700 (PDT) From: DENG Qingfang To: openwrt-devel@lists.openwrt.org Cc: David Bauer , =?utf-8?q?Ren=C3=A9_van_Dorst?= , CHEN Minqiang Subject: [PATCH] ramips: fix at803x patch again Date: Fri, 4 Jun 2021 10:26:48 +0800 Message-Id: <20210604022648.1155657-1-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210603_192958_317071_0D993137 X-CRM114-Status: GOOD ( 12.81 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Commit 8222f8e1b9be overrides AR8031's PHY features, making its fibre feature unavailable. To fix that, override it again with the correct features flag in ramips patch. Reported-by: CHEN Minqiang Fixes: 8222f8e1b9be ("ath79: fix link mode support list on UniFi AC") Signed-off-by: DENG Qingfang --- .../ramips/patches-5.10/710-at803x.patch | 13 ++++++++++-- .../lin [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.210.176 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.210.176 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dqfext[at]gmail.com] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Commit 8222f8e1b9be overrides AR8031's PHY features, making its fibre feature unavailable. To fix that, override it again with the correct features flag in ramips patch. Reported-by: CHEN Minqiang Fixes: 8222f8e1b9be ("ath79: fix link mode support list on UniFi AC") Signed-off-by: DENG Qingfang --- .../ramips/patches-5.10/710-at803x.patch | 13 ++++++++++-- .../linux/ramips/patches-5.4/991-at803x.patch | 21 ++++++++++++------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/target/linux/ramips/patches-5.10/710-at803x.patch b/target/linux/ramips/patches-5.10/710-at803x.patch index dab62b7607..f4d92a53e1 100644 --- a/target/linux/ramips/patches-5.10/710-at803x.patch +++ b/target/linux/ramips/patches-5.10/710-at803x.patch @@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: René van Dorst --- - drivers/net/phy/at803x.c | 91 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 91 insertions(+) + drivers/net/phy/at803x.c | 86 +++++++++++++++++++++++++++++++++++++++- + 1 file changed, 85 insertions(+), 1 deletion(-) --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -147,3 +147,12 @@ Signed-off-by: René van Dorst .flags = PHY_POLL_CABLE_TEST, .probe = at803x_probe, .remove = at803x_remove, +@@ -1119,7 +1203,7 @@ static struct phy_driver at803x_driver[] + .get_wol = at803x_get_wol, + .suspend = at803x_suspend, + .resume = at803x_resume, +- .features = PHY_GBIT_FEATURES, ++ .features = PHY_GBIT_FIBRE_FEATURES, + .read_status = at803x_read_status, + .aneg_done = at803x_aneg_done, + .ack_interrupt = &at803x_ack_interrupt, diff --git a/target/linux/ramips/patches-5.4/991-at803x.patch b/target/linux/ramips/patches-5.4/991-at803x.patch index 95411211b2..8381aa9f3f 100644 --- a/target/linux/ramips/patches-5.4/991-at803x.patch +++ b/target/linux/ramips/patches-5.4/991-at803x.patch @@ -9,8 +9,8 @@ Content-Transfer-Encoding: 8bit Signed-off-by: René van Dorst --- - drivers/net/phy/at803x.c | 91 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 91 insertions(+) + drivers/net/phy/at803x.c | 93 +++++++++++++++++++++++++++++++++++++++- + 1 file changed, 92 insertions(+), 1 deletion(-) --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -146,11 +146,18 @@ Signed-off-by: René van Dorst static struct phy_driver at803x_driver[] = { { /* ATHEROS 8035 */ -@@ -461,6 +551,7 @@ static struct phy_driver at803x_driver[] +@@ -485,12 +575,13 @@ static struct phy_driver at803x_driver[] + .name = "Atheros 8031 ethernet", + .phy_id_mask = AT803X_PHY_ID_MASK, + .probe = at803x_probe, ++ .config_aneg = at803x_config_aneg, + .config_init = at803x_config_init, + .set_wol = at803x_set_wol, + .get_wol = at803x_get_wol, .suspend = at803x_suspend, .resume = at803x_resume, - /* PHY_GBIT_FEATURES */ -+ .config_aneg = at803x_config_aneg, +- .features = PHY_GBIT_FEATURES, ++ .features = PHY_GBIT_FIBRE_FEATURES, .read_status = at803x_read_status, - .ack_interrupt = at803x_ack_interrupt, - .config_intr = at803x_config_intr, + .aneg_done = at803x_aneg_done, + .ack_interrupt = &at803x_ack_interrupt,