From nobody Fri Feb 14 01:25:23 2025 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 4YvDrN0yCQz5nYx7; Fri, 14 Feb 2025 01:25:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvDrN0Hgjz43cg; Fri, 14 Feb 2025 01:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496324; 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=nA/fAWgBRG2Oo/UgkpBdavuvu5dX/Zn855D/2tolQp0=; b=Jhvxj+yF1J2Zw5hoSkcgTqhnpdwnuLd9mgvfZsI5dqd5ZYktw8UA/MGN+ZJvRUYrXlURsW lPWp4jXl7+Qp8pvaxtWE3WdRC0tcjCkT2Gfd4uEC9OQPBZ5AiyfkTny+KxdSMWvjByJQ0J zVeIXIKnnqOvG6di2c+iqc13x4DeYSzSf5HFY0/GCoZOObgItvcq86dlpqAOij/JlTu+8i CmWOEeu4SEvR0amX8rfPVSSCOkZyl/hB40MECO2ucB1SMijqc6XyEpao8liD6r8PpDdMiL HHwaT0BzWV4vKkNZb3QFbV2wE6bN9A90Bug7wgX54IYvsnTmAMTMUmjVTV2Q4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496324; 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=nA/fAWgBRG2Oo/UgkpBdavuvu5dX/Zn855D/2tolQp0=; b=e98g9KXI1frkkJeDo/diRYLBwKtU3R6C8GjTdnPYrpbWwgagSQcJ7d1I8fl99o3CINioF4 4Q1os9XU9GXqpsYJVWU03v/eYzrwrkRXT1wjFd9KS8sfOBATgsUzTg3bPj919uymacRBEh 1KJ3KCtLrGnOS9h4tDnP6KDx8gFO+3+JocjFLJ+P4MLXFGW6GrSO0VBW4trdO7rHg98n5A QCfuuUQDm+x2n3ueLOQDMGPN9FTAIIwMxurNbKpMmVXR7GkYZd8wKizJg6p4zXXx49eJyL PUmwkKMV/w0h6KFPIL7NFLTn2UW8Vc2TOUs3LJ2aZzz0bptVcCoD7Y43tSFnOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739496324; a=rsa-sha256; cv=none; b=Kju6WU2BbLvqjU4nJd25mLbnZqsukA1sJpgdwXpUeWryFQQy6G0DygY05ntvvwKCbK3foa rAQVsNUVvQCl4efAURSZ3zE3IbpD6VhjAf8BXX9QU4uqiU7BHTdeyHTSCNWimsNYlAJ7xk /CPveylEO2tnHxnT+nh1cQ6QfxZmKk1D77Jk/8xywu4wwZhwpEi891fHvq7dreqqApy57A sAa8wE7T82dC10CFSL42K3isp7st032jjfueI9iRM0UETMRdh/OjL8fAZ947fRAgpM6ePY F0XGhvd/BJg9JwFHgBon28b0jidVcXFZ2nCC05L0I+bRX0YP30l4g+i6UOTXNg== 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 4YvDrM6zC0z188W; Fri, 14 Feb 2025 01:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51E1PN8n014191; Fri, 14 Feb 2025 01:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E1PN9b014188; Fri, 14 Feb 2025 01:25:23 GMT (envelope-from git) Date: Fri, 14 Feb 2025 01:25:23 GMT Message-Id: <202502140125.51E1PN9b014188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 4759b165d598 - stable/13 - ixgbe: Add ixgbe_dev_from_hw() back 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4759b165d5985d6c3b0beb928a1f99efe79b294e Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=4759b165d5985d6c3b0beb928a1f99efe79b294e commit 4759b165d5985d6c3b0beb928a1f99efe79b294e Author: Kevin Bowling AuthorDate: 2025-02-11 03:40:51 +0000 Commit: Kevin Bowling CommitDate: 2025-02-14 01:25:09 +0000 ixgbe: Add ixgbe_dev_from_hw() back This got lost many years ago in 8eb6488ebb0dcd92517625e4833ddf7d26e3b3a3 It is used by the driver's DBG printfs. (cherry picked from commit bf6f0db8a762966b08430692c92ae34e667948db) --- sys/dev/ixgbe/ixgbe_osdep.c | 6 ++++++ sys/dev/ixgbe/ixgbe_osdep.h | 1 + 2 files changed, 7 insertions(+) diff --git a/sys/dev/ixgbe/ixgbe_osdep.c b/sys/dev/ixgbe/ixgbe_osdep.c index 2fa651df8936..892924712c38 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.c +++ b/sys/dev/ixgbe/ixgbe_osdep.c @@ -33,6 +33,12 @@ #include "ixgbe.h" +inline device_t +ixgbe_dev_from_hw(struct ixgbe_hw *hw) +{ + return ((struct ixgbe_softc *)hw->back)->dev; +} + inline u16 ixgbe_read_pci_cfg(struct ixgbe_hw *hw, u32 reg) { diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h index 7aabfea66484..6dad776eb056 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.h +++ b/sys/dev/ixgbe/ixgbe_osdep.h @@ -209,6 +209,7 @@ struct ixgbe_osdep /* These routines need struct ixgbe_hw declared */ struct ixgbe_hw; +device_t ixgbe_dev_from_hw(struct ixgbe_hw *hw); /* These routines are needed by the shared code */ extern u16 ixgbe_read_pci_cfg(struct ixgbe_hw *, u32);