From 2e1686558cb25cac8b49938b90f8e7467dd43511 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 9 Feb 2015 14:57:04 +0100 Subject: [PATCH] run: constrain physical memory for pci/acpi driver Permit pci/acpi driver to constrain physical memory allocation to needs of the driver it serves. Fixes #1045 --- repos/dde_linux/run/usb_hid.run | 4 ++-- repos/dde_linux/run/usb_net.run | 4 ++-- repos/dde_linux/run/usb_storage.run | 4 ++-- repos/dde_linux/run/wifi.run | 4 ++-- repos/dde_oss/run/oss.run | 2 +- repos/gems/run/http_blk.run | 4 ++-- repos/gems/run/tcp_terminal.run | 4 ++-- repos/libports/run/avplay.run | 4 ++-- repos/libports/run/http_srv_tracing.run | 4 ++-- repos/libports/run/libc_block.run | 4 ++-- repos/libports/run/libc_ffat_fs.run | 4 ++-- repos/libports/run/libc_filesystem_test.inc | 4 ++-- repos/libports/run/lwip.run | 4 ++-- repos/libports/run/network_test.inc | 4 ++-- repos/libports/run/qt5_drivers.inc | 4 ++-- repos/os/run/ahci.run | 4 ++-- repos/os/run/ahci_bench.run | 4 ++-- repos/os/run/framebuffer.run | 4 ++-- repos/os/run/mixer.run | 2 +- repos/os/run/network_test_nic.inc | 4 ++-- repos/ports-foc/run/l4linux.run | 4 ++-- repos/ports-foc/run/l4linux_netperf.inc | 4 ++-- repos/ports/run/dosbox.run | 2 +- repos/ports/run/genode_org.run | 4 ++-- repos/ports/run/netperf.inc | 4 ++-- repos/ports/run/noux_net_netcat.run | 4 ++-- repos/ports/run/noux_tool_chain.inc | 4 ++-- repos/ports/run/noux_trace_fs.run | 4 ++-- repos/ports/run/seoul.inc | 4 ++-- repos/ports/run/virtualbox.run | 4 ++-- repos/ports/run/virtualbox_auto.inc | 4 ++-- 31 files changed, 59 insertions(+), 59 deletions(-) diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index 6b936783b..714d55d74 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -57,7 +57,7 @@ append_if [have_spec gpio] config { append_if [have_spec acpi] config { - + @@ -71,7 +71,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 1534743fe..c30777b4b 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -72,7 +72,7 @@ set config { append_if [have_spec acpi] config { - + @@ -99,7 +99,7 @@ append_if [have_spec gpio] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/dde_linux/run/usb_storage.run b/repos/dde_linux/run/usb_storage.run index 41a345444..6a9e1298b 100644 --- a/repos/dde_linux/run/usb_storage.run +++ b/repos/dde_linux/run/usb_storage.run @@ -50,7 +50,7 @@ set config { append_if [have_spec acpi] config { - + @@ -64,7 +64,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/wifi.run index d1220be19..acc2c47d6 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/wifi.run @@ -88,7 +88,7 @@ network={ append_if [have_spec acpi] config { - + @@ -115,7 +115,7 @@ append_if [have_spec gpio] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/dde_oss/run/oss.run b/repos/dde_oss/run/oss.run index b7ca014c9..2d2ed64d2 100644 --- a/repos/dde_oss/run/oss.run +++ b/repos/dde_oss/run/oss.run @@ -46,7 +46,7 @@ append config { - + diff --git a/repos/gems/run/http_blk.run b/repos/gems/run/http_blk.run index ac1c75fda..74cab207d 100644 --- a/repos/gems/run/http_blk.run +++ b/repos/gems/run/http_blk.run @@ -92,7 +92,7 @@ append_if $use_nic_driver config { append_if [have_spec acpi] config { - + @@ -106,7 +106,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index 6dc2e618f..63bc43bd0 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -76,7 +76,7 @@ set config { append_if [have_spec acpi] config { - + @@ -91,7 +91,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/libports/run/avplay.run b/repos/libports/run/avplay.run index cf34acecd..d71b23a04 100644 --- a/repos/libports/run/avplay.run +++ b/repos/libports/run/avplay.run @@ -57,7 +57,7 @@ append_if [have_spec sdl] config { append_if [have_spec acpi] config { - + @@ -71,7 +71,7 @@ append_if [have_spec acpi] config { append_if [expr [have_spec pci] && ![have_spec acpi]] config { - + diff --git a/repos/libports/run/http_srv_tracing.run b/repos/libports/run/http_srv_tracing.run index bd456a171..5588d9bbb 100644 --- a/repos/libports/run/http_srv_tracing.run +++ b/repos/libports/run/http_srv_tracing.run @@ -77,7 +77,7 @@ set config { append_if [have_spec acpi] config { - + @@ -91,7 +91,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index 3fad4fd39..b6d22ee0c 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -90,7 +90,7 @@ set config { append_if [have_spec acpi] config { - + @@ -104,7 +104,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_ffat_fs.run index d4b26fcd7..ef5cea7e5 100644 --- a/repos/libports/run/libc_ffat_fs.run +++ b/repos/libports/run/libc_ffat_fs.run @@ -78,7 +78,7 @@ set config { append_if [have_spec acpi] config { - + @@ -92,7 +92,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index 71996ea56..9e26026ea 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -119,7 +119,7 @@ append config { append_if [have_spec acpi] config { - + @@ -133,7 +133,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 25d313440..103a991f5 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -122,7 +122,7 @@ append_if $use_nic_driver config { append_if [have_spec acpi] config { - + @@ -136,7 +136,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/libports/run/network_test.inc b/repos/libports/run/network_test.inc index ca4eef25a..568d15b90 100644 --- a/repos/libports/run/network_test.inc +++ b/repos/libports/run/network_test.inc @@ -119,7 +119,7 @@ append_if [expr ![have_spec omap4] && ![have_spec exynos5]] config { append_if [have_spec acpi] config { - + @@ -133,7 +133,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/libports/run/qt5_drivers.inc b/repos/libports/run/qt5_drivers.inc index ed157698c..6acce9033 100644 --- a/repos/libports/run/qt5_drivers.inc +++ b/repos/libports/run/qt5_drivers.inc @@ -123,7 +123,7 @@ proc drivers_start_nodes { feature_arg } { append_if [use_acpi_drv feature] start_nodes { - + @@ -177,7 +177,7 @@ proc drivers_start_nodes { feature_arg } { append_if [expr [use_pci_drv feature] && ![use_acpi_drv feature]] start_nodes { - + } diff --git a/repos/os/run/ahci.run b/repos/os/run/ahci.run index bb69546f1..97caf2829 100644 --- a/repos/os/run/ahci.run +++ b/repos/os/run/ahci.run @@ -49,7 +49,7 @@ append_if [have_spec exynos5] config { append_if [have_spec acpi] config { - + @@ -63,7 +63,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/os/run/ahci_bench.run b/repos/os/run/ahci_bench.run index 0de83623a..378809db6 100644 --- a/repos/os/run/ahci_bench.run +++ b/repos/os/run/ahci_bench.run @@ -71,7 +71,7 @@ append_if [expr ![have_spec acpi] && ![have_spec pci]] config { append_if [have_spec acpi] config { - + @@ -85,7 +85,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/os/run/framebuffer.run b/repos/os/run/framebuffer.run index a1547ea49..87f874ee6 100644 --- a/repos/os/run/framebuffer.run +++ b/repos/os/run/framebuffer.run @@ -51,7 +51,7 @@ append_if [have_spec sdl] config { append_if [have_spec acpi] config { - + @@ -65,7 +65,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run index a7338998a..2074b3a44 100644 --- a/repos/os/run/mixer.run +++ b/repos/os/run/mixer.run @@ -49,7 +49,7 @@ set config { if {![have_spec linux]} { append config { - + diff --git a/repos/os/run/network_test_nic.inc b/repos/os/run/network_test_nic.inc index 0d3e988c4..3e8b18649 100644 --- a/repos/os/run/network_test_nic.inc +++ b/repos/os/run/network_test_nic.inc @@ -112,7 +112,7 @@ append_if $use_nic_client config { append_if [have_spec acpi] config { - + @@ -126,7 +126,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports-foc/run/l4linux.run b/repos/ports-foc/run/l4linux.run index d94af2795..0a0fa0513 100644 --- a/repos/ports-foc/run/l4linux.run +++ b/repos/ports-foc/run/l4linux.run @@ -63,7 +63,7 @@ set config { append_if [have_spec acpi] config { - + @@ -77,7 +77,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports-foc/run/l4linux_netperf.inc b/repos/ports-foc/run/l4linux_netperf.inc index 70c6b0bbe..a218bc555 100644 --- a/repos/ports-foc/run/l4linux_netperf.inc +++ b/repos/ports-foc/run/l4linux_netperf.inc @@ -97,7 +97,7 @@ set config { append_if [have_spec acpi] config { - + @@ -111,7 +111,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports/run/dosbox.run b/repos/ports/run/dosbox.run index 192f7d744..50ff60e3d 100644 --- a/repos/ports/run/dosbox.run +++ b/repos/ports/run/dosbox.run @@ -51,7 +51,7 @@ append_if [have_spec sdl] config { append_if [have_spec acpi] config { - + diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 35d49439b..34bd5b9db 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -89,7 +89,7 @@ append_if $use_nic_driver config { append_if [have_spec acpi] config { - + @@ -103,7 +103,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 5b2fd55e6..6e07efcd0 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -150,7 +150,7 @@ append_if $use_nic_driver config { append_if [have_spec acpi] config { - + @@ -164,7 +164,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index 8985bb2ac..df863c7e5 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -137,7 +137,7 @@ append_if $use_usb_driver config { append_if [have_spec acpi] config { - + @@ -151,7 +151,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports/run/noux_tool_chain.inc b/repos/ports/run/noux_tool_chain.inc index 346bfd4a7..bc095ec32 100644 --- a/repos/ports/run/noux_tool_chain.inc +++ b/repos/ports/run/noux_tool_chain.inc @@ -134,7 +134,7 @@ append_if [have_spec sdl] config { append_if [have_spec acpi] config { - + @@ -154,7 +154,7 @@ append_if [have_spec framebuffer] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports/run/noux_trace_fs.run b/repos/ports/run/noux_trace_fs.run index 5da7d4da1..1db4eb2dd 100644 --- a/repos/ports/run/noux_trace_fs.run +++ b/repos/ports/run/noux_trace_fs.run @@ -94,7 +94,7 @@ append_if [have_spec sdl] config { append_if [have_spec acpi] config { - + @@ -108,7 +108,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index f4fdcad6a..4a4b45093 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -196,7 +196,7 @@ append_if $use_genode_iso config { append_if [have_spec acpi] config { - + @@ -210,7 +210,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 1aaf9ba37..df39b4807 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -44,7 +44,7 @@ set config { append_if [have_spec acpi] config { - + @@ -58,7 +58,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + } diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 8c99be0f9..1728274d5 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -91,7 +91,7 @@ append_if [expr $use_ram_fs] config { append_if [have_spec acpi] config { - + @@ -105,7 +105,7 @@ append_if [have_spec acpi] config { append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + }