From 0da42dc1dd6ea59b4f443ec2072306b6aeb7914d Mon Sep 17 00:00:00 2001
From: Toshiki Nishioka <toshiki.nishioka@intel.com>
Date: Fri, 4 Sep 2020 13:20:47 +0900
Subject: [PATCH] acrn-config: add swiotlb to sos kernel bootargs to increase
 bounce bufs

EHL PSE TSN GbE driver is default set to use 32bit of dma addressing.

net: stmmac: configure PSE Gbe to 32bit dma addressing
https://github.com/intel/linux-intel-lts/commit/011c8f

When VM has more than 4GB physical memory, Linux kernel uses the bounce
buffers (swiotlb) to translate kernel data in 64bit memory to 32bit
range for the sake of the DMA because iommu is not available. The
default swiotlb value 32768 is insufficient to support two PSE TSN GbEs
at the same time. Increase the value to 131072 otherwise two GbEs can't
link up.

Tracked-On: #5243

Signed-off-by: Toshiki Nishioka <toshiki.nishioka@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
---
 misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml    | 2 +-
 misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml | 2 +-
 misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml  | 2 +-
 misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc.xml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml
index 425713f54..c6915a262 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid.xml
@@ -164,7 +164,7 @@
             <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
             <bootargs desc="Specify kernel boot arguments">
         rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
-        i915.nuclear_pageflip=1
+        i915.nuclear_pageflip=1 swiotlb=131072
         </bootargs>
         </board_private>
     </vm>
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml
index f7eb6f1f4..71693a5ff 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/hybrid_rt.xml
@@ -158,7 +158,7 @@
             <rootfs desc="rootfs for Linux kernel">/dev/mmcblk0p2</rootfs>
             <bootargs desc="Specify kernel boot arguments">
             rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
-            i915.nuclear_pageflip=1
+            i915.nuclear_pageflip=1 swiotlb=131072
             </bootargs>
         </board_private>
     </vm>
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml
index 18590ce46..bb5428df9 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/industry.xml
@@ -107,7 +107,7 @@
             <rootfs desc="rootfs for Linux kernel">/dev/mmcblk0p2</rootfs>
             <bootargs desc="Specify kernel boot arguments">
         rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
-        i915.nuclear_pageflip=1
+        i915.nuclear_pageflip=1 swiotlb=131072
         </bootargs>
         </board_private>
     </vm>
diff --git a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc.xml b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc.xml
index 1bc411d52..1ddee04ac 100644
--- a/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc.xml
+++ b/misc/vm_configs/xmls/config-xmls/ehl-crb-b/sdc.xml
@@ -107,7 +107,7 @@
             <rootfs desc="rootfs for Linux kernel">/dev/sda3</rootfs>
             <bootargs desc="Specify kernel boot arguments">
         rw rootwait console=tty0 consoleblank=0 no_timer_check quiet loglevel=3
-        i915.nuclear_pageflip=1
+        i915.nuclear_pageflip=1 swiotlb=131072
         </bootargs>
         </board_private>
     </vm>