From nobody Fri Feb 14 01:24:52 2025 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 4YvDqm722pz5nZ0l; Fri, 14 Feb 2025 01:24:52 +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 4YvDqm6bkrz43GS; Fri, 14 Feb 2025 01:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496292; 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=hKexVI+Ji0XZBcuTNhU0hxOvY5bvRRjMQNBnts7Lcbg=; b=C0esaWKJVm+Q8ssKd+0lAB5MfxTiXSeTubDya98S01035oGy6CesYNT/9OSEkDACONCD78 BK2ugNkFVpOtQ9YDSmouwiy+ZvbEIOxMKkU3mbOxo2ne/LcpkprNyX9eRcBLs6clsW9bEs iCaCSGI4YnsXkiVnaApP+DXBRx0KWvRyShzczJF3lIvh7Nye577nnvQkNcpTVsXj6AzJ2D drXuTWQQyta9hPSvtqzD6vI6L0A8VTNIO11tFfr5nY5WoaS7E5X6gns9V0TDkcxcBi0Ow7 1f+F28gmbxmgFgHE5+K1OsokhKlLSnjohAAhDQY+PCZiJMyvr6AaDxAe5EB9lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739496292; 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=hKexVI+Ji0XZBcuTNhU0hxOvY5bvRRjMQNBnts7Lcbg=; b=LmGBHpfCNwJkWmUg0cYA0Zd/wMm++EGyZel3lKj/wGbrQf98aIM2LgsdOq+aHXV4y/C8Ep uXMz2TUA+5TqeOEs7Dz5aWqwvIMfxC8L3K4zEi3H3AZ9qP6ukRGI3V3cUDpII8KpXZPps7 NdXOOJNhpX/cR99Fe0gJktx8QLEb8fQZCar4vmB7zF4zmyq8qjMMQ2GoVEchCg2hbR0kdG eqF/VEc2kFSeDc+0FuNM6cHY4ey/hBGZC/YV5MPdvvYNbretjEY6+c10+L015MgMbwImqG THshgAvoY566xXrewN19aYL795IJsMEoJSC9JEspPSqoVEcxTGAJsnSLt0GXKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739496292; a=rsa-sha256; cv=none; b=J6KjlGB2xpDWfyoITte2P0NHQsWdf7Q5ZgA3Oyb5dXPDqkz1kIXKb6vIgho0j5oS8yIvqP xoLzZS5/pZ3OJg4HQ78M6j2fQM9csTn3QNrO5krzHbNk0s0Lj9F5tbzoN/Tn5aTJoz6P45 qx1f9AAeFVFCoSHBsov3csFqN5E7gRFV+dSECFVb4DAy7TSht0p8sPMJiPv35bg0mDi/LF FgyxW6wqORI/+v4EUMqvfbP5f8fFh6RZZemcUjUghQgGBXO4j2e8CShm+Y4HwffXkH4zE6 4pxZLbP7oitUwgnFZ2/5fGZmlzAkx1HnZZB3HqqzpkbMFZv6sEkjmtybXY5b5A== 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 4YvDqm65Jpz18X3; Fri, 14 Feb 2025 01:24:52 +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 51E1Oqg7013948; Fri, 14 Feb 2025 01:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E1OqEj013945; Fri, 14 Feb 2025 01:24:52 GMT (envelope-from git) Date: Fri, 14 Feb 2025 01:24:52 GMT Message-Id: <202502140124.51E1OqEj013945@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: 0d1eed3701a8 - stable/14 - ixgbe: Add ixgbe_dev_from_hw() back 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 0d1eed3701a836d0a8d0152619b1dccc96c810ba Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0d1eed3701a836d0a8d0152619b1dccc96c810ba commit 0d1eed3701a836d0a8d0152619b1dccc96c810ba Author: Kevin Bowling AuthorDate: 2025-02-11 03:40:51 +0000 Commit: Kevin Bowling CommitDate: 2025-02-14 01:24:31 +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 eca15f0f3816..cf7c578fd684 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.h +++ b/sys/dev/ixgbe/ixgbe_osdep.h @@ -197,6 +197,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);