From nobody Wed Oct 19 23:23:35 2022 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 4Mt6HC6pbcz4g2gV; Wed, 19 Oct 2022 23:23:35 +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 4Mt6HC5sFWz3Txv; Wed, 19 Oct 2022 23:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666221815; 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=aj3DoW1vO85e26/8ecbSKTXEumH2kkx3Qtj18dSFhzg=; b=HfetkPdlTchKZK4QLNE4n3uE769hAJ9jhFsommwo/krP+8HSyiP7wMSiEkUM2qBgnfxrNv bTeMkv791oLjTyfI42EUH6Bv/KyMjUBHNsYxWIeWeRKeQa26y/rALY5ZBVO+FKcwha2mWp jXcm3nBVm5o/8oIHfsWq8dz/2twsClS7dXCcJ88+2miXJIIZr28lq6FYCYgwASWL/iPi5B 7ffpImbCreFSh8J6dlC1Lr6VebJjXYgCcEKViuU90db9PDqHcjIXiophMzeQ1gzVz3ZZAW Ryp91LbsDkodTjlkZDkGqw0e5ZQ/extOA6Ng1x+xeRoNNEm1C7WSyGqPMxbz6w== 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 4Mt6HC4KDxzhPM; Wed, 19 Oct 2022 23:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29JNNZ2A021347; Wed, 19 Oct 2022 23:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JNNZSn021346; Wed, 19 Oct 2022 23:23:35 GMT (envelope-from git) Date: Wed, 19 Oct 2022 23:23:35 GMT Message-Id: <202210192323.29JNNZSn021346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric Joyner Subject: git: 2d9d209fdbbe - stable/12 - ice_ddp: Update to 1.3.24.0 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: erj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2d9d209fdbbe0c4b2db770f17cec2178321decdf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666221815; 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=aj3DoW1vO85e26/8ecbSKTXEumH2kkx3Qtj18dSFhzg=; b=u6bHk8vC28XiMVY+sWqZ3irYSpoXXFMeAunEbCjKL+oib9fTobIJbqcV2zzPkF7zDqEI0i U0mTWaTUERKDLBCGKhx8PGsjz6S19nFZbTdJ8Irc2z2Axc8I+QbqALZeEQvn8o0dALv41W 4bNnKYvFfw84xDyCNQ0Vubr3RaaYI8kSWot6E7IQ7GL1BYKi3AP1yOr6NOSRVMgkGkipCS GpP2adW3mUwVQf9SIshSQpVOBpf/J3tbCKi6ZaaFo4oiC4SX1/70U751ffLGe9vb/jrC6A zER3RfjvCRJ1V4obdrgMcoY28xlwWg86Tht0vdtxgOPspORvYusxyeF1URrcpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666221815; a=rsa-sha256; cv=none; b=xtd6iuh1F7qB7InBL+tI5R6AOQ15k8tLMY6DXnrr0tpTlSP4Mum3KLDwubiAZG70zFsiyz dYNFEN5Iz/wt+1fKwRElzqHykKv+7DMXOzidGixc6ThG2G/SqD2VKOavfGysbDVyyZfq+Z OOEjQMioGK+Z/3lVS7DQk/3mPTaH0sSiTDjeTurGjZ/OvNsBry0dWGKRBAL/9QpIAFvfrs J1qaZ5N9V6JpacmlS5OD7OvezyIPWjVNHYfBmE0bURI8DxauIapbzml/P108m+8Ru9byJt 6H+zBoEVK385WFtWfNs3QeoTdMj1AaLU1JiPX2nDEjNEyxb5b1CT1BY/MRJPbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=2d9d209fdbbe0c4b2db770f17cec2178321decdf commit 2d9d209fdbbe0c4b2db770f17cec2178321decdf Author: Eric Joyner AuthorDate: 2021-06-25 17:20:24 +0000 Commit: Eric Joyner CommitDate: 2022-10-19 21:47:15 +0000 ice_ddp: Update to 1.3.24.0 This version is intended to be used with the 0.29.4 version of the ice(4) driver, which will be be committed afterwards. Signed-off-by: Eric Joyner Reviewed by: stallamr_netapp.com Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D30887 (cherry picked from commit 538ef055b7ea11326ba22197537e617587a0d677) (cherry picked from commit 070f7812da16b692d4e65fdfd418654fdb42729d) --- sys/conf/files.amd64 | 6 +++--- sys/conf/files.arm64 | 8 ++++---- .../dev/ice/{ice-1.3.19.0.pkg => ice-1.3.24.0.pkg} | Bin 614660 -> 622852 bytes sys/modules/ice_ddp/Makefile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 879c25f10c27..88f84ee88a8e 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -290,7 +290,7 @@ dev/ice/ice_switch.c optional ice pci \ dev/ice/ice_vlan_mode.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031800 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -299,8 +299,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.19.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.19.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.24.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.24.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ioat/ioat.c optional ioat pci diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 1eaf553973e5..aa4d7fda5bf1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -261,17 +261,17 @@ dev/ice/ice_switch.c optional ice pci \ dev/ice/ice_vlan_mode.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031800 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" -ice_ddp.fwo optional ice_ddp \ +ice_ddp.fwo optional ice_ddp \ dependency "ice_ddp.fw" \ compile-with "${NORMAL_FWO}" \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.19.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.19.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.24.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.24.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/iicbus/sy8106a.c optional sy8106a fdt diff --git a/sys/contrib/dev/ice/ice-1.3.19.0.pkg b/sys/contrib/dev/ice/ice-1.3.24.0.pkg similarity index 82% rename from sys/contrib/dev/ice/ice-1.3.19.0.pkg rename to sys/contrib/dev/ice/ice-1.3.24.0.pkg index 32e2603bc131..db2520cbe9aa 100644 Binary files a/sys/contrib/dev/ice/ice-1.3.19.0.pkg and b/sys/contrib/dev/ice/ice-1.3.24.0.pkg differ diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile index 38337a106368..563655349bb8 100644 --- a/sys/modules/ice_ddp/Makefile +++ b/sys/modules/ice_ddp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= ice_ddp -FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.19.0.pkg:ice_ddp:0x01031300 +FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.24.0.pkg:ice_ddp:0x01031800 .include