diff options
author | zbb <zbb@FreeBSD.org> | 2016-03-29 15:19:56 +0000 |
---|---|---|
committer | zbb <zbb@FreeBSD.org> | 2016-03-29 15:19:56 +0000 |
commit | fc42f4865c7d38605eba632eba3f102112e68976 (patch) | |
tree | b0ba83207bab9525934dc8eaed7ce4eb918ad758 /sys/conf | |
parent | ca92bb3067ab9958b69fda6b1f710ff0db5fea96 (diff) | |
download | FreeBSD-src-fc42f4865c7d38605eba632eba3f102112e68976.zip FreeBSD-src-fc42f4865c7d38605eba632eba3f102112e68976.tar.gz |
Reduce OFW PCI code duplication - involves ARM, PPC and SPARC64
Import portions of the PowerPC OF PCI implementation into new file
"ofwpci.c", common for other platforms. The files ofw_pci.c and ofw_pci.h
from sys/powerpc/ofw no longer exist. All required declarations are moved
to sys/dev/ofw/ofwpci.h. This creates a new ofw_pci_write_ivar() function
and modifies some others methods. Most functions contain existing ppc
implementations in the majority unchanged. Now there is no need to have
multiple identical copies of methods for various architectures.
Requested by: jhibbits
Reviewed by: jhibbits, marius
Submitted by: Marcin Mazurek <mma@semihalf.com>
Obtained from: Semihalf
Sponsored by: Annapurna Labs
Differential Revision: https://reviews.freebsd.org/D4879
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/files.arm | 1 | ||||
-rw-r--r-- | sys/conf/files.arm64 | 1 | ||||
-rw-r--r-- | sys/conf/files.i386 | 1 | ||||
-rw-r--r-- | sys/conf/files.mips | 3 | ||||
-rw-r--r-- | sys/conf/files.powerpc | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 5d3eedf..a9da11c 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -103,6 +103,7 @@ dev/hwpmc/hwpmc_arm.c optional hwpmc dev/hwpmc/hwpmc_armv7.c optional hwpmc armv6 dev/iicbus/twsi/twsi.c optional twsi dev/ofw/ofw_cpu.c optional fdt +dev/ofw/ofwpci.c optional fdt pci dev/pci/pci_host_generic.c optional pci_host_generic pci fdt dev/psci/psci.c optional psci dev/psci/psci_arm.S optional psci diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 8f5f10a..b1fa207 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -66,6 +66,7 @@ dev/hwpmc/hwpmc_arm64_md.c optional hwpmc dev/mmc/host/dwmmc.c optional dwmmc dev/mmc/host/dwmmc_hisi.c optional dwmmc soc_hisi_hi6220 dev/ofw/ofw_cpu.c optional fdt +dev/ofw/ofwpci.c optional fdt pci dev/pci/pci_host_generic.c optional pci fdt dev/psci/psci.c optional psci dev/psci/psci_arm64.S optional psci diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 66dd2ef..1947671 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -285,6 +285,7 @@ dev/nvme/nvme_sysctl.c optional nvme dev/nvme/nvme_test.c optional nvme dev/nvme/nvme_util.c optional nvme dev/nvram/nvram.c optional nvram isa +dev/ofw/ofwpci.c optional fdt pci dev/pcf/pcf_isa.c optional pcf dev/random/ivy.c optional rdrand_rng dev/random/nehemiah.c optional padlock_rng diff --git a/sys/conf/files.mips b/sys/conf/files.mips index 91d53aa..4cacac4 100644 --- a/sys/conf/files.mips +++ b/sys/conf/files.mips @@ -92,3 +92,6 @@ dev/nvram2env/nvram2env.c optional nvram2env dev/hwpmc/hwpmc_mips.c optional hwpmc dev/hwpmc/hwpmc_mips24k.c optional hwpmc_mips24k dev/hwpmc/hwpmc_mips74k.c optional hwpmc_mips74k + +# ofw support +dev/ofw/ofwpci.c optional fdt pci diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0a1e7c1..e39343b 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -57,6 +57,7 @@ dev/ofw/ofw_console.c optional aim dev/ofw/ofw_disk.c optional ofwd aim dev/ofw/ofw_iicbus.c optional iicbus aim dev/ofw/ofwbus.c optional aim | fdt +dev/ofw/ofwpci.c optional fdt pci dev/ofw/ofw_standard.c optional aim powerpc dev/ofw/ofw_subr.c optional aim powerpc dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac @@ -145,7 +146,6 @@ powerpc/mpc85xx/pci_mpc85xx.c optional pci mpc85xx | pci qoriq_dpaa powerpc/mpc85xx/pci_mpc85xx_pcib.c optional pci mpc85xx | pci qoriq_dpaa powerpc/mpc85xx/qoriq_gpio.c optional mpc85xx gpio | qoriq_dpaa gpio powerpc/ofw/ofw_machdep.c standard -powerpc/ofw/ofw_pci.c optional pci powerpc/ofw/ofw_pcibus.c optional pci powerpc/ofw/ofw_pcib_pci.c optional pci powerpc/ofw/ofw_real.c optional aim |