From nobody Tue Mar 08 00:21:37 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 D01C319FAD33; Tue, 8 Mar 2022 00:21:39 +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 4KCGGV6LRmz4lgT; Tue, 8 Mar 2022 00:21:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646698899; 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=nukwZvO2K4y/vN6Lx4/5BRaQE1egSmA64Ksw31xE+A0=; b=h2hHVlRQkPCCxsbKQ9VGqh1hV1Jx0do8brHcXv2xpkNz6dd9r3GvSlInpd72cfZpPwVGRo N7MA8YJG4nyxHlgttoHIDfhzASSG+c2nPgdECDxJ+VRLWX2HtC0g2B+kI1IujHtGgNz9lr onMsinu+JGWJk4x0KpwaJNYUs2rCiYwKieTVyJWM6pVeCU8MzaRn3dyaOoCwHlkc98mx7Y +o69TbPpvHQQ6yywnul5IVH1dB+bnE7tkwN80Mtrw4rbKrdfqglWq1iWhZyd9fKeSkgC8J Qu1zFLWNGYAYT1SlC2UpEGDcsyPAVXb+OBkDVbeFlAzdqhSaYLPp6xUKoh2P/Q== 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 4E9C012551; Tue, 8 Mar 2022 00:21:37 +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 2280Lb4m072690; Tue, 8 Mar 2022 00:21:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2280LbKY072689; Tue, 8 Mar 2022 00:21:37 GMT (envelope-from git) Date: Tue, 8 Mar 2022 00:21:37 GMT Message-Id: <202203080021.2280LbKY072689@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: 3abd066b6dca - stable/13 - powerpc: enable ice in GENERIC64LE 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/13 X-Git-Reftype: branch X-Git-Commit: 3abd066b6dca7703173c9241ef7c0b4a6388b945 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646698899; 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=nukwZvO2K4y/vN6Lx4/5BRaQE1egSmA64Ksw31xE+A0=; b=tAVMMK6BTehTYQDXVw1HrD95kxpAa5egCDLr4dFynDrkPblDzahrWEIwsT0NVhbdM9gtV/ BTGeJtiQimGSvMpr0QnddFK49ZZIZxF1UMsLa6dD8gLKYBshO3aA9URihOEi3t5KXX/xxN vg1OXK+OZ0RQURbxVGlEQu3MAuvqVn2/fORbUnGfGBAVhJKlUKMycIw+c5wAWzHY9RYpf8 UP9znVzMo3Qwe1aIzi0ttP1UCbHqYdUpUVdYzrGtLsxYN8CBX+g5DG+hzDFzVkhmGsht3t 7Mvd0848ZUa6ubqLjna0cYKKIXGv1pBMNIm9eMO+2VsoPFavj/UEmG8HNRpvXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646698899; a=rsa-sha256; cv=none; b=WQYwulrZWuBfWucArBwPWtk/pQ9b1wM2g0/y2qJzzscFnmvQxISbZHFRRbbCnaxbHUJdwx Y1AHmK2hl4L4gF9GoyCjX/WPMpg8rhjpF6pbd+ibr38JxpeFIgSpIvxvHhrNeIcAKzVQx6 RkBZvg9OdBUj/tNf6mJiDOs+0xdzBbz2JFJRvriSzztX1Ks8kWN7xG4yFbQ7M8Sia3UUW2 9DSrMYsDoDxSWG1oLtUt32grFkUtL4l3xzDXPI4Df+sNd+lrOriVGCAF5OwgFoQCakOvZ1 bosuTk4ZbGoX8ew9HEHoH4W6CgV5u/Y9xOo10wb85Ylbsgbo3C5KKf3OPDTYkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=3abd066b6dca7703173c9241ef7c0b4a6388b945 commit 3abd066b6dca7703173c9241ef7c0b4a6388b945 Author: Piotr Kubaj AuthorDate: 2022-01-20 21:32:02 +0000 Commit: Eric Joyner CommitDate: 2022-03-08 00:09:12 +0000 powerpc: enable ice in GENERIC64LE Approved by: erj Differential Revision: https://reviews.freebsd.org/D33974 (cherry picked from commit a0f3abb098799ec05b6dd8a40363b1093cf81d49) --- sys/conf/files.powerpc | 48 ++++++++++++++++++++++++++++++++++++++++++++ sys/modules/Makefile | 2 +- sys/powerpc/conf/GENERIC64LE | 1 + 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index c8de9f5fa7a8..f0f59940b1f4 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -38,6 +38,54 @@ dev/iicbus/max6690.c optional max6690 powermac dev/iicbus/ofw_iicbus.c optional iicbus aim dev/ipmi/ipmi.c optional ipmi dev/ipmi/ipmi_opal.c optional powernv ipmi +dev/ice/if_ice_iflib.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_lib.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_osdep.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_resmgr.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_strings.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_iflib_recovery_txrx.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_iflib_txrx.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_common.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_controlq.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_dcb.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_flex_pipe.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_flow.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_nvm.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_sched.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_sriov.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_switch.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +dev/ice/ice_vlan_mode.c optional ice pci powerpc64 \ + compile-with "${NORMAL_C} -I$S/dev/ice" +ice_ddp.c optional ice_ddp powerpc64 \ + 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 powerpc64 \ + dependency "ice_ddp.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "ice_ddp.fwo" +ice_ddp.fw optional ice_ddp powerpc64 \ + 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/ixl/if_ixl.c optional ixl pci powerpc64 \ compile-with "${NORMAL_C} -I$S/dev/ixl" dev/ixl/ixl_pf_main.c optional ixl pci powerpc64 \ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 79ede8e571e4..46d36631dea8 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -578,7 +578,7 @@ _rtwnfw= rtwnfw _cxgbe= cxgbe .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64" || ${MACHINE_ARCH:Mpowerpc64*} _ice= ice .if ${MK_SOURCELESS_UCODE} != "no" _ice_ddp= ice_ddp diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 5129c5e76388..969208dc83b1 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -158,6 +158,7 @@ device em # Intel PRO/1000 Gigabit Ethernet Family device ix # Intel PRO/10GbE PCIE PF Ethernet Family device ixl # Intel 700 Series Physical Function device ixv # Intel PRO/10GbE PCIE VF Ethernet Family +device ice # Intel 800 Series Physical Function device llan # IBM pSeries Virtual Ethernet device cxgbe # Chelsio 10/25G NIC