From nobody Fri Jan 21 01:17:51 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 5270D1958566; Fri, 21 Jan 2022 01:17:52 +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 4Jg1hc1Rp5z3rT9; Fri, 21 Jan 2022 01:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642727872; 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=lbKV0ivJBMT8gUUkKvQc4c++IX7AON/ohw/omEKeyHc=; b=BzrVj5ZEw/v835QzLjnVQC317oTPU7qYXqiJvMk+GsR+jxv9fVfDjI7QoCrI95xCWKN4fl 3h3Ke3AYNZTZNXzNIhZZraarXJtYnAFnxGBU2pqg2ulSgneGESZEHHxCAVK5dI4uHIEocL MTA+aNiSDIpxBjZedC+xOdH1Br+wVG6yIAmau9K7WBP8npQwtA8zqSdYXA+X5q49gJv1QO 2ij+gV+gHsrqT5pFlBLjP8rNWa5H5tFTRvjLF7ffewDgAe9UpgBTienbs/MrAwv17ZSq0Q 76PW4mAiCUlZYKE7GT9wNinTB71gKLq3ID4UOEatXVocdwQvKnX42JN1PsKlZg== 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 D175112D68; Fri, 21 Jan 2022 01:17:51 +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 20L1Hpr3008190; Fri, 21 Jan 2022 01:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20L1HpoS008189; Fri, 21 Jan 2022 01:17:51 GMT (envelope-from git) Date: Fri, 21 Jan 2022 01:17:51 GMT Message-Id: <202201210117.20L1HpoS008189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: a0f3abb09879 - main - 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: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0f3abb098799ec05b6dd8a40363b1093cf81d49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642727872; 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=lbKV0ivJBMT8gUUkKvQc4c++IX7AON/ohw/omEKeyHc=; b=QpNc4jmyVa1nEMVJ+wwqaRi2nZ/tUdHBpnmREQRnqW9c6jtujrAIIp/S4XEE+40zGKko2N P/kT8y+wcDFKWQBGVnJYe7yo10T+yufvZv7oq64YyvxDXj5FqDcJ2B9mFJ0pBO+1BSPe35 e4GMWzyx/76BKpamG8xtCouT/YaXCifQ3Q18790la1H9Yo63ziFoGYB9f2hfS9voRlg9bq BIF2rdFQlzr+Qg32RjsiOfn/AI2tsYoum1TqTRBiDgnKn7HcQlsA3J3mtuJ2+vSAxwwJMV vWHk3UYuOpXHg72lcwf9SG7wolfWPULOr0Ev+vqgBAcSF+StsAdwEavBFpuxIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642727872; a=rsa-sha256; cv=none; b=bnK1g0eCPj7MuJx6HGdzOM8yop66qPpcYR017Rpz2UYUB0TWX5jOYupP0AebHNlbVUP+Su eZxkQknoOxW83gxSaSSF6AINTTSyKuOlA8dVZsk4CUANTk20NjHq9u925CQhlrEejlSdDz DdOcbdm82G9T2ngpBiaB7SU7FCbcW8QjHZdVxyqOO9s0ie8lo4OgWpoAYbdIyM52xHXhmc lgzKiXqstwRG2J6xwSNzbmOi2wdqhipGJAnKrDefbKNRr7dIaYOTsf4fpYLA3OoVKmvEv0 CEOXnOPK1H7uZElZir63RrcZ10Ze3EbZBs/dLzdEisU2N6ij0x0LZ199jriKwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a0f3abb098799ec05b6dd8a40363b1093cf81d49 commit a0f3abb098799ec05b6dd8a40363b1093cf81d49 Author: Piotr Kubaj AuthorDate: 2022-01-20 21:32:02 +0000 Commit: Piotr Kubaj CommitDate: 2022-01-21 01:17:46 +0000 powerpc: enable ice in GENERIC64LE Approved by: erj Differential Revision: https://reviews.freebsd.org/D33974 --- 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 f904c17b2294..bcadda5baac4 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -39,6 +39,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 65d7ea7fefa2..af9357de1c7d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -562,7 +562,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 7238f7ccefd8..5b59a8c1fba2 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -169,6 +169,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