From nobody Thu Aug 10 13:44:41 2023 X-Original-To: dev-commits-src-all@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 4RM7T61sxCz4mHk4; Thu, 10 Aug 2023 13:44:42 +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 4RM7T61KdCz3Ryw; Thu, 10 Aug 2023 13:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691675082; 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=Pwbaa2ghVvJtwC3hkrfEHgiEdBjz5gy76MdZ58BnxqM=; b=ZkBSIljszfoA1Zez3nwm1I6n0uaoc7xtLIz0Z4W1+EdGaNmA6q9/XmzWCXdwN20BvC7DGe K0sEDSV6mEBWTKTHd7em3rH1c+sifptPTEKuP+CyFZqdPA+D0hU3SS+MP74JgSatHTxcYd iwYwyayDICbkFxVDIaJ5BO4uJTl519t9Gk5Gt1BRyM682wKji2r118JLGz0mdA/vs/tUNx 550OPKLQ/7d4ZtqILclJ6L3izqGkLf1VfDVB0YF85V01auPlfcOtgBXSRnlizz8QlHJ/uZ 7kyk2FVhLUmSjGWt0reIknnJa0VchZjIU9L/FvKLgh2ukDZy0wnulwuQX8WqsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691675082; 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=Pwbaa2ghVvJtwC3hkrfEHgiEdBjz5gy76MdZ58BnxqM=; b=kOnsnF5OWb5b8PxZJO5ht/pnVqUa9T7i3CWoQURSlBaSO6YkW8xr4+rKWblhgGV/sXGazw +an3vi//Qht2MR5zlvq3bAGrCsvfP0X3ntHqFwtqSLwqS5a9QDjE++VEDmZvq6w3ybqLc9 z3kCXqmmfG1NSVnawln0eS31n8bBBct16Ye8HJ3EXIQgCS4xtGGTJQQhoMxwjScfzc/QKh SY5pDZVyMHd5YA5lqVioDoEzYkiJn9wonIvQYnScKmTV3qZnA1oeEV3nVr9oF844xarzF/ Ual8kgpG8lzy2JHZ7ELEE9HEnPKm0nlPL5aAwmRZlkp6Rgm5f6d5ivi5/Ll22A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691675082; a=rsa-sha256; cv=none; b=pvyem+8ZWnPK0Fa1egBXW7OPYVkTpsVaHJJoEQrF82LyDkKVR7EErsHuXzOG2gwTmLimcS g0DsQ1NcUjT3T3OoBhr0msIlOFKIP6sbvlQxLReq0pFNS35hmsboZKxID1jcCfM+QXzUdC UpkYwZoosYACBhCK3lfkIVGfRhl89OodOfSkGQAe5/0p3TF7KTgCW0Quy+16V6d6yMb507 Mjy+OTDlKgNh5Xt4zotfI3xHRs0f9r5SzpKx6gHWheT0T0nFj2JJTiptX/1YoN2Pec3eXC lcbj9R2/fzl9NSoCjzqHnX8qk2Vv5RgluQx7eYYMp1lAf4rPkHfvzAacobyp2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RM7T60J3czyrj; Thu, 10 Aug 2023 13:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ADifvo058634; Thu, 10 Aug 2023 13:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ADif9B058632; Thu, 10 Aug 2023 13:44:41 GMT (envelope-from git) Date: Thu, 10 Aug 2023 13:44:41 GMT Message-Id: <202308101344.37ADif9B058632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 73fa89e041ff - main - ix: Fix accessing wrong register List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73fa89e041ffc3093178cb2bcc47a6adb7da7f42 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=73fa89e041ffc3093178cb2bcc47a6adb7da7f42 commit 73fa89e041ffc3093178cb2bcc47a6adb7da7f42 Author: Piotr Pietruszewski AuthorDate: 2023-08-10 13:43:21 +0000 Commit: Piotr Kubaj CommitDate: 2023-08-10 13:43:21 +0000 ix: Fix accessing wrong register Use IXGBE_GRC_BY_MAC(hw) macro instead of IXGBE_GRC as IXGBE_GRC's address is different on Denverton platform. This patch is part of change made in NetBSD kernel by Masanobu Saitoh, NetBSD maintainer. Differential Revision: https://reviews.freebsd.org/D19175 Approved by: erj --- sys/dev/ixgbe/if_ix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index c2a911773f4b..e76bed13e607 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -2855,8 +2855,8 @@ ixgbe_setup_low_power_mode(if_ctx_t ctx) if (hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T && hw->phy.ops.enter_lplu) { /* Turn off support for APM wakeup. (Using ACPI instead) */ - IXGBE_WRITE_REG(hw, IXGBE_GRC, - IXGBE_READ_REG(hw, IXGBE_GRC) & ~(u32)2); + IXGBE_WRITE_REG(hw, IXGBE_GRC_BY_MAC(hw), + IXGBE_READ_REG(hw, IXGBE_GRC_BY_MAC(hw)) & ~(u32)2); /* * Clear Wake Up Status register to prevent any previous wakeup