From nobody Sun May 15 16:31:59 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 2EAF01AD1A81; Sun, 15 May 2022 16:32:00 +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 4L1SZl700sz3MqC; Sun, 15 May 2022 16:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652632320; 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=QC1C3VZyktFaq7MxlV8y/mSw+0jmbJjNuSFIrOOs6Ik=; b=Wh/FdZA2qDfMB5Q75JMRBJLZk7UAelaTIz5mGfwRR/6Yl7XuNP0cLvZYJ07oLsNzWFy5Ja v1K488hnGMS3JJisYsjMDM6U0IXzjy+H3ND1HIPnwe6Xl6smzPL+HSw41eqJKJc+RWBnqm cqWjbdk47xwFHts3hawfAP74QpW81uizd1g5Ts5zM01wCweIQG+pMMd3T8JOvasu/r7JkW lLPlxUdrLLNrCLCjm+a3K/z+KeT41aMdawvJgCb5y1oNgp0aQEK9sZdHfKvfNKkwEGsnyY 0Ax+bz79Tw/u9Q63ErvM+WRG8NHIOF1nHJpsqvMmzbLKrmc01RXAssOS/bGEUw== 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 D10D06C72; Sun, 15 May 2022 16:31:59 +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 24FGVxqf044880; Sun, 15 May 2022 16:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24FGVxNu044879; Sun, 15 May 2022 16:31:59 GMT (envelope-from git) Date: Sun, 15 May 2022 16:31:59 GMT Message-Id: <202205151631.24FGVxNu044879@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: c16cbd2e9162 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c16cbd2e9162c33e9eee76653dccda7bd6ec2160 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652632320; 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=QC1C3VZyktFaq7MxlV8y/mSw+0jmbJjNuSFIrOOs6Ik=; b=a5ABxastCUGqQra2P3eYWHJBn1fj11DDtSV9a5AmfHi4XzSnTA/fgymN1/IpIf9xuktilI NcTyg8tlniFimMx0Qr7e7uezPv9XcGCZUZQiKibwpO5SO60X8PWN+purOTuvbRlgJJpmsN t4tWr7a1SaL9tLmtjepKpHXR7umFyrq1IrTJo+mDH2RPYqGDrv2LtbmhaKjDhbcJ0iiDcA 1ybac+RvnbkwspkchsBGqw5WQ78TfZbtOHCQMZYs8sdYABvA22jeUedA0IJKOVDrBiXtgX eeDYLGCXN86+3aun72XDysb2a8oZWndzLoQIZ6SF/dMLgpg01EGPUewB5UC0Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652632320; a=rsa-sha256; cv=none; b=pc2M1dRinUwLzUwcpw+S2e2JHNbSvEdlEiPdpl53AwHC7LrRPK9DX+fYMIGJZCBzBSUkzC jJkwrwwViJ+qmFwOHzet60wLx4/IImFHQPX+z8w5CngerTzsQ1PUjCDp7yOk3w37txW6Gk JwbMKR+ExZJ3UuDi6nBsRBrNnFb7NplIZ3y1gGFHa3h+D2TPtGNHPKVMkIxssqZdow5uEQ zN6rBezY8z5keHUevWjoA1KUn5ujzELjxA9l6fB05mZodKDxoQ0X7WunFTC1d7Y0yg/C+z 2F+PHjyjjUA7TlIcs73ZewTqoYE/Q1uRQiVq9r5jvGjfCJ46G16GtcVnMDBFmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=c16cbd2e9162c33e9eee76653dccda7bd6ec2160 commit c16cbd2e9162c33e9eee76653dccda7bd6ec2160 Author: Scott Long AuthorDate: 2022-02-27 01:29:08 +0000 Commit: Alexander Motin CommitDate: 2022-05-15 16:29:57 +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: