The branch stable/13 has been updated by erj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3abd066b6dca7703173c9241ef7c0b4a6388b945

commit 3abd066b6dca7703173c9241ef7c0b4a6388b945
Author:     Piotr Kubaj <pku...@freebsd.org>
AuthorDate: 2022-01-20 21:32:02 +0000
Commit:     Eric Joyner <e...@freebsd.org>
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
 

Reply via email to