From nobody Sun May 15 16:32:44 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 80A0A1AD207D; Sun, 15 May 2022 16:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L1Sbd0ft3z3NC5; Sun, 15 May 2022 16:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652632365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ez3CT4sEqP7LIyAJ51/kP5PLzeuB2q1HQ23kediEMTo=; b=RtZmNxbur8EpclPBA2gj8P1jWKEC5gSn85VvlX59o7k6lSSCwm8ITVxUan/8PDxebqVnRD 6EaneKpF+xxzRzfkS3W8ns1ArpzO6X9qeZtFHI4QOP4SDgMMfF47OClJ8yNefAO2Jgp8MC rjI9z+iHeuEAK/8vX5yfrSfnsVHWd8ELdfkjIHdyE4CqGcfDOf2MeDg8cYqRdzXfmq7iYK OS5dRGey1EOXX2KyPQec8RK6fTjkjYWONitI7JnFmqSwobds2zATqBym31eyLaAGF7RmUJ MuyUAcRJYR1vdgWFZ2Tf2X2cWHlEXbbcikLV+xv8dhwO5DI8p/mlqyPb6IRnhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C4D157486; Sun, 15 May 2022 16:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24FGWiYA046049; Sun, 15 May 2022 16:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24FGWitJ046048; Sun, 15 May 2022 16:32:44 GMT (envelope-from git) Date: Sun, 15 May 2022 16:32:44 GMT Message-Id: <202205151632.24FGWitJ046048@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 15adc3b3b4ab - stable/12 - Default to always accepting the PHY that's present. Linux did something similar a while back, and there are devices in the wild that otherwise won't attach. This patch is temporary until the PHY code is further cleared up. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 15adc3b3b4ab6215e4c9370cf6467a8fac596ecf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652632365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ez3CT4sEqP7LIyAJ51/kP5PLzeuB2q1HQ23kediEMTo=; b=Zk/ywSyU4UuZ2qhBfVJluGoCTt7NJ04pmKyLdwuWsyGVF7o4agi21IKu4SSm2mpfnSimor kCpjQF4szt8UxDoM1w/MuVr8Eng7+2YyJOdEZd6Pmbz1tpnk5prrc3LvcFeI/1bXNaBHzp HwkRMvPHr7ZrBvi3mw24js93fMBlNRjhM8ZO+MQT2sgKb854CuCWGyFTUugnrQBU9caKHa 1WeXq/M2ORo4CgDFK3b8yzOCrooZKkWsF5SzzJnZHeFjpvHP+EJP5/jNDZtv/QkIW8KpWX PJI6CyvgnWDJk0N+2eLIaHbsLufgYf6RxITFFc6NilSV+mgW0Ld7C40AxNsJyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652632365; a=rsa-sha256; cv=none; b=F36nM/0owy/yRlrIjtCbyf6vVUwFPENwKuqdq30VNa6qKv5xD4LZ07lLAxUIwUI/MgMNIT +UoyBFIn0DC+Ne1rmkVl4RjMDvy5wC/dufCQ9mi1dmrPNybcbrvJXLEII0ucp9WIqiFqWA AHSoH85jcVp5+/QuCq5/M8qb0r99+feDuf3xzNp+gTig8q4TtHWIhUVpLgE5qngYeUa26l b+SA8bzrmaUhcYy0tQGaj+Tc61MI8j2+EykU2AlNe23IemjkOWCLFsh9uVFql81USnTMqT Zcp89UGsKH1LMhzvlU0LkTwmTLSRBbgLWbzmVd/uE+wSKfDhfENXOUF9sw8e3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=15adc3b3b4ab6215e4c9370cf6467a8fac596ecf commit 15adc3b3b4ab6215e4c9370cf6467a8fac596ecf Author: Scott Long AuthorDate: 2022-02-27 01:29:08 +0000 Commit: Alexander Motin CommitDate: 2022-05-15 16:32:26 +0000 Default to always accepting the PHY that's present. Linux did something similar a while back, and there are devices in the wild that otherwise won't attach. This patch is temporary until the PHY code is further cleared up. Obtained from: grehan (cherry picked from commit 6f3c0d2764f230444818a95009028861493c1594) --- sys/dev/igc/igc_i225.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/igc/igc_i225.c b/sys/dev/igc/igc_i225.c index 4c50daa16b79..95d7d1536184 100644 --- a/sys/dev/igc/igc_i225.c +++ b/sys/dev/igc/igc_i225.c @@ -172,14 +172,12 @@ static s32 igc_init_phy_params_i225(struct igc_hw *hw) /* Verify phy id and set remaining function pointers */ switch (phy->id) { case I225_I_PHY_ID: + default: phy->type = igc_phy_i225; phy->ops.set_d0_lplu_state = igc_set_d0_lplu_state_i225; phy->ops.set_d3_lplu_state = igc_set_d3_lplu_state_i225; /* TODO - complete with GPY PHY information */ break; - default: - ret_val = -IGC_ERR_PHY; - goto out; } out: