From nobody Fri Sep 20 07:58:14 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 4X94WV3jNDz5XBJC; Fri, 20 Sep 2024 07:58:14 +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 4X94WV2dh9z44fr; Fri, 20 Sep 2024 07:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726819094; 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=J4BxJ0/jNBQsBILQIFcrAW2vLucdk6gdJNuY/ED7QhQ=; b=DfkJ4iq/wc1y/b1vhKhJacIhVKpcTYNye0zIgFbfX19kKdWEvVoJNWaihvukYMP3Ni02ki 7jY2z1sgTScdR6zcZYzbvfQW9GHVP2GyTxY21Q4WGybQIvuh7AXUnoXXSOVagj60DRQjZI dv613vDEr6QOltLAIDovlQ+qzMQCSeQdmS9Q9Y1mtDaIGn1YlZ3B5hBLF/MUAzZrlhav0V YYLmahxjw9EiMOADioFu51U4nk7KKHkmSrD0AXEKOosz9y/NPjM/626LBYOsBOKG5Js4qJ SqtLV9DHxubLzygMEu4c8RczU39B0FeLhrwsKi8x7JsRNJynb3yqeW0V7dUiRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726819094; a=rsa-sha256; cv=none; b=US1sH/dtj6zzoKuKhN3LOh+FqMD+OfnPhA2pLkyWh5FHZnpsvEnQyu4Nq8XISlYmd3hPSj SIETqW01B/EjN8S7+wKmoc4+LaMCdJMgitM6UeDF930zvDDbt1w9Y7O4IsoXpN641B3fVI E/wakSqzLKOlHmCDjZl70OSHa2EvU27E86KDJA5mnTDjtvcr6S7I46MdGuyJlnlM67mhDB /8cbnmdwCukbolPWzlmy+WaX+J7XGbyj+/5zz0nc7c/DdhGccET6C/tznIBa0Vrdb5OJG3 OyaVOUYuvgIxKNKZ6blA95QKmzkPFT/J2VaopTqhAg9uNpGujMJvrb+Eh1jWwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726819094; 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=J4BxJ0/jNBQsBILQIFcrAW2vLucdk6gdJNuY/ED7QhQ=; b=W47F5IzATsazJd9WaRbj/JpIVTN6F1ZP14we6fTWBlVw1qDg/vVS1Y3W7XnIJvks9K339c o27QhUbq0FOhtL+Qu6ePETqVY3xEOSovhfOOqQ+nArh/u4Ld7sDvpTtDQG2q/1nSafZNkQ iM3ZadxJ3C7Ytp0XusNh2fdvzp8zJrL73NHO44kkNvxmZR3Y6+2/vNm0qOUs2RSMpVZGMr 8bp3JefDK1ax7iIFtv0MiGx8DenS3E1fOQGTqpRkFbCXNUhel8xE0xj0WqdprONhZbnU5J PGxN0edd0HWmLFS89jThq6il+HP7kDscDvKHWM/cCgH5rRPjO+1m5wlHg++Vgw== 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 4X94WV2Dptzhf0; Fri, 20 Sep 2024 07:58:14 +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 48K7wEgl029390; Fri, 20 Sep 2024 07:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48K7wEDp029387; Fri, 20 Sep 2024 07:58:14 GMT (envelope-from git) Date: Fri, 20 Sep 2024 07:58:14 GMT Message-Id: <202409200758.48K7wEDp029387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 267f223f622f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 267f223f622fdbf779cc43b5a564bb02e2b59ecd Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=267f223f622fdbf779cc43b5a564bb02e2b59ecd commit 267f223f622fdbf779cc43b5a564bb02e2b59ecd Author: Doug Moore AuthorDate: 2024-09-20 07:54:48 +0000 Commit: Kevin Bowling CommitDate: 2024-09-20 07:57:36 +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 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46708 --- 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); } }