From nobody Fri Sep 27 03:36:25 2024 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 4XFGNB0Cz2z5XQ3l; Fri, 27 Sep 2024 03:36:26 +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 4XFGN94pMNz4nrd; Fri, 27 Sep 2024 03:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727408185; 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=lvjmdwODhyYoJ0QEJGBln7erkYj3vNveV153QuGF3qc=; b=MmollUnMY4dp9/l7WmsX6sZjaHrxOtnyyhrrccgLh2OizEgbIuyEuEaIhQHn5DWG0dP7xi Jv69hvz9Si9I3cpHZN+pFRnqQSEJH9N+aOH6rvCcq6wrt6utZiw1hdyrfuHjaOIIsvgrEA DJteabWaAA5D1/7GGBuIN9bYUGOjjxTE0bGEfMtPbsH8yrfUoxeQ5XJG91c2jrcEMAMg8a MYQmhwyOrvEJES5DT0ElVdcSCbeLYNA/zDwGoq8a43Xu5GcX/I77U8/RVR7IO2woMbIF0t jrfMUXcJskxWFESWoklM5rTH/K8SgxAki7URgcUSiomDx4QuVgNvOPMpV7Qqcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727408185; 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=lvjmdwODhyYoJ0QEJGBln7erkYj3vNveV153QuGF3qc=; b=t5ivy9paKnQ5vb/BLkU2ik1rvvVdTYwT1qz9pQppZTo2jSHABCBpgzxqGrDkck8W5b2XWC +DJKv4zpMdlfo9mZJqUkw9PT6qsCeIY5P5vUVA25IYeAbeBhBSPS+hUq+SaoGUB2FVpePV f9XTnJY+g8/T18wsaG3HAZrTSRRY2XK5EalfdQsfzIvIjPKnl+Mz4g4gJeSoPCETN45Wvu u2EOLUIjKGZ5Ealv39N8YWCnDZ+/1aknRoB4frOaNMp3HUrLusLrk7iKOnx1zmDVxlK8zp dzEXj8edo2e3P73SHBCh4J3fmFdb0ZcCZsiDN/Hl2QgkItlEMdNg4Qmq/Io+NQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727408185; a=rsa-sha256; cv=none; b=aEX2CgKoCTbEyT/0LAC1BHJEwrPCjbVDnvuiK+c8tneRo8uU3DZ8tWsXGNWoz2GftFrOeL DrOre3e5IYLTf7+yLBr6EfCi0fISlIIL102uqyVagVzEHRFYcArqQkBl6DIY7+3mAz1yNG gCOTSGtI8J8XWwXCJ/8VVSgrRiN9YPpgdXiGl4IRAV8m03Vx4JyOwmE0TKI1Jx3eNHB8h4 C7/tVXnI3jGviGsR2T8+0+uS5eVwBZe7zYlUFYNEkEbrHKQeYkmSPFqf8ZXGUbr3cNFzCP 1BgsBIqLstK26wqrYRLirRLPOynbLre42cxtsvdQCS5GEjMLadvix8JrTT/TTQ== 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 4XFGN94QblzNx4; Fri, 27 Sep 2024 03:36:25 +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 48R3aP3i039345; Fri, 27 Sep 2024 03:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48R3aPKg039342; Fri, 27 Sep 2024 03:36:25 GMT (envelope-from git) Date: Fri, 27 Sep 2024 03:36:25 GMT Message-Id: <202409270336.48R3aPKg039342@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: dcf7b92d48b6 - stable/14 - ixgbe: fix compilation for VF 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/14 X-Git-Reftype: branch X-Git-Commit: dcf7b92d48b6db30851b8b73cff8c8ef34f8f97a Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=dcf7b92d48b6db30851b8b73cff8c8ef34f8f97a commit dcf7b92d48b6db30851b8b73cff8c8ef34f8f97a Author: Doug Moore AuthorDate: 2024-09-20 07:54:48 +0000 Commit: Kevin Bowling CommitDate: 2024-09-27 03:35:06 +0000 ixgbe: fix compilation for VF The mailbox API changed in version 15 and these array ops were left out of the recent code import as applicable to FreeBSD. Reported by: vishwin, yasu Differential Revision: https://reviews.freebsd.org/D46708 (cherry picked from commit 267f223f622fdbf779cc43b5a564bb02e2b59ecd) --- sys/dev/ixgbe/if_sriov.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/ixgbe/if_sriov.c b/sys/dev/ixgbe/if_sriov.c index a16092c9f688..112c34849e65 100644 --- a/sys/dev/ixgbe/if_sriov.c +++ b/sys/dev/ixgbe/if_sriov.c @@ -100,7 +100,7 @@ ixgbe_send_vf_msg(struct ixgbe_softc *sc, struct ixgbe_vf *vf, u32 msg) if (vf->flags & IXGBE_VF_CTS) msg |= IXGBE_VT_MSGTYPE_CTS; - sc->hw.mbx.ops.write(&sc->hw, &msg, 1, vf->pool); + sc->hw.mbx.ops[0].write(&sc->hw, &msg, 1, vf->pool); } static inline void @@ -374,7 +374,7 @@ ixgbe_vf_reset_msg(struct ixgbe_softc *sc, struct ixgbe_vf *vf, uint32_t *msg) resp[0] = IXGBE_VF_RESET | ack | IXGBE_VT_MSGTYPE_CTS; bcopy(vf->ether_addr, &resp[1], ETHER_ADDR_LEN); resp[3] = hw->mac.mc_filter_type; - hw->mbx.ops.write(hw, resp, IXGBE_VF_PERMADDR_MSG_LEN, vf->pool); + hw->mbx.ops[0].write(hw, resp, IXGBE_VF_PERMADDR_MSG_LEN, vf->pool); } /* ixgbe_vf_reset_msg */ @@ -565,7 +565,7 @@ ixgbe_vf_get_queues(struct ixgbe_softc *sc, struct ixgbe_vf *vf, uint32_t *msg) resp[IXGBE_VF_TRANS_VLAN] = (vf->default_vlan != 0); resp[IXGBE_VF_DEF_QUEUE] = 0; - hw->mbx.ops.write(hw, resp, IXGBE_VF_GET_QUEUES_RESP_LEN, vf->pool); + hw->mbx.ops[0].write(hw, resp, IXGBE_VF_GET_QUEUES_RESP_LEN, vf->pool); } /* ixgbe_vf_get_queues */ @@ -582,7 +582,7 @@ ixgbe_process_vf_msg(if_ctx_t ctx, struct ixgbe_vf *vf) hw = &sc->hw; - error = hw->mbx.ops.read(hw, msg, IXGBE_VFMAILBOX_SIZE, vf->pool); + error = hw->mbx.ops[0].read(hw, msg, IXGBE_VFMAILBOX_SIZE, vf->pool); if (error != 0) return; @@ -643,13 +643,13 @@ ixgbe_handle_mbx(void *context) vf = &sc->vfs[i]; if (vf->flags & IXGBE_VF_ACTIVE) { - if (hw->mbx.ops.check_for_rst(hw, vf->pool) == 0) + if (hw->mbx.ops[0].check_for_rst(hw, vf->pool) == 0) ixgbe_process_vf_reset(sc, vf); - if (hw->mbx.ops.check_for_msg(hw, vf->pool) == 0) + if (hw->mbx.ops[0].check_for_msg(hw, vf->pool) == 0) ixgbe_process_vf_msg(ctx, vf); - if (hw->mbx.ops.check_for_ack(hw, vf->pool) == 0) + if (hw->mbx.ops[0].check_for_ack(hw, vf->pool) == 0) ixgbe_process_vf_ack(sc, vf); } }