From owner-dev-commits-src-main@freebsd.org Thu Jan 7 19:47:37 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5DA094DA1F4; Thu, 7 Jan 2021 19:47:37 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBcG129M4z3lMv; Thu, 7 Jan 2021 19:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3D40A16AA2; Thu, 7 Jan 2021 19:47: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 107JlbSZ082259; Thu, 7 Jan 2021 19:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 107JlbQ4082258; Thu, 7 Jan 2021 19:47:37 GMT (envelope-from git) Date: Thu, 7 Jan 2021 19:47:37 GMT Message-Id: <202101071947.107JlbQ4082258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 40d0971bbe5d - main - arm64: enable build of the ipmi module MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40d0971bbe5dbb591bb923d0fbea67fab6f38d30 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2021 19:47:37 -0000 The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=40d0971bbe5dbb591bb923d0fbea67fab6f38d30 commit 40d0971bbe5dbb591bb923d0fbea67fab6f38d30 Author: Mitchell Horne AuthorDate: 2021-01-06 20:27:40 +0000 Commit: Mitchell Horne CommitDate: 2021-01-07 19:45:25 +0000 arm64: enable build of the ipmi module Only ACPI attachment is supported for now, some others depend on the presence of smbios(4) support, which we lack on arm64. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D28009 --- sys/conf/files.arm64 | 4 ++++ sys/modules/Makefile | 2 +- sys/modules/ipmi/Makefile | 16 ++++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index f421304b1903..4bb454fd4e2a 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -361,6 +361,10 @@ dev/iicbus/twsi/a10_twsi.c optional twsi fdt dev/iicbus/twsi/twsi.c optional twsi fdt dev/iommu/busdma_iommu.c optional iommu dev/iommu/iommu_gas.c optional iommu +dev/ipmi/ipmi.c optional ipmi +dev/ipmi/ipmi_acpi.c optional ipmi acpi +dev/ipmi/ipmi_kcs.c optional ipmi +dev/ipmi/ipmi_smic.c optional ipmi dev/mbox/mbox_if.m optional soc_brcm_bcm2837 dev/mmc/host/dwmmc.c optional dwmmc fdt dev/mmc/host/dwmmc_altera.c optional dwmmc dwmmc_altera fdt diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 2a294aa68462..49b9960596e9 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -505,6 +505,7 @@ _ibcore= ibcore _ipoib= ipoib _iser= iser .endif +_ipmi= ipmi _mlx4= mlx4 _mlx5= mlx5 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \ @@ -682,7 +683,6 @@ _ichwd= ichwd _ida= ida _iir= iir _intelspi= intelspi -_ipmi= ipmi _ips= ips _isci= isci _ipw= ipw diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile index 4539dfda3b28..733ac6f30222 100644 --- a/sys/modules/ipmi/Makefile +++ b/sys/modules/ipmi/Makefile @@ -7,11 +7,19 @@ KMOD= ipmi SRCS= ipmi.c SRCS+= bus_if.h device_if.h -.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -SRCS+= ipmi_kcs.c ipmi_smic.c ipmi_smbios.c ipmi_ssif.c -SRCS+= ipmi_acpi.c ipmi_isa.c ipmi_pci.c ipmi_smbus.c + +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "aarch64" +SRCS+= ipmi_kcs.c ipmi_smic.c +SRCS+= ipmi_acpi.c SRCS+= opt_acpi.h -SRCS+= acpi_if.h isa_if.h pci_if.h smbus_if.h +SRCS+= acpi_if.h +.endif + +.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" +SRCS+= ipmi_smbios.c ipmi_ssif.c +SRCS+= ipmi_isa.c ipmi_pci.c ipmi_smbus.c +SRCS+= isa_if.h pci_if.h smbus_if.h SUBDIR+= ipmi_linux