diff --git a/ocaml/xenopsd/lib/xenopsd.ml b/ocaml/xenopsd/lib/xenopsd.ml
index 5ad6401730b..275cdcb79fa 100644
--- a/ocaml/xenopsd/lib/xenopsd.ml
+++ b/ocaml/xenopsd/lib/xenopsd.ml
@@ -49,6 +49,8 @@ let default_vbd_backend_kind = ref "vbd"
 
 let ca_140252_workaround = ref false
 
+let xen_platform_pci_bar_uc = ref true
+
 let action_after_qemu_crash = ref None
 
 let additional_ballooning_timeout = ref 120.
@@ -207,6 +209,14 @@ let options =
     , (fun () -> string_of_bool !ca_140252_workaround)
     , "Workaround for evtchn misalignment for legacy PV tools"
     )
+  ; ( "xen-platform-pci-bar-uc"
+    , Arg.Bool (fun x -> xen_platform_pci_bar_uc := x)
+    , (fun () -> string_of_bool !xen_platform_pci_bar_uc)
+    , "Controls whether, when the VM starts in HVM mode, the Xen PCI MMIO used \
+       by grant tables is mapped as Uncached (UC, the default) or WriteBack \
+       (WB, the workaround). WB mapping could improve performance of devices \
+       using grant tables. This is useful on AMD platform only."
+    )
   ; ( "additional-ballooning-timeout"
     , Arg.Set_float additional_ballooning_timeout
     , (fun () -> string_of_float !additional_ballooning_timeout)
diff --git a/ocaml/xenopsd/xc/domain.ml b/ocaml/xenopsd/xc/domain.ml
index 287c1c77b27..5e335874fe8 100644
--- a/ocaml/xenopsd/xc/domain.ml
+++ b/ocaml/xenopsd/xc/domain.ml
@@ -501,6 +501,9 @@ let make ~xc ~xs vm_info vcpus domain_config uuid final_uuid no_sharept =
     xs.Xs.writev (dom_path ^ "/bios-strings") vm_info.bios_strings ;
     if vm_info.is_uefi then
       xs.Xs.write (dom_path ^ "/hvmloader/bios") "ovmf" ;
+    xs.Xs.write
+      (dom_path ^ "/hvmloader/pci/xen-platform-pci-bar-uc")
+      (if !Xenopsd.xen_platform_pci_bar_uc then "1" else "0") ;
     (* If a toolstack sees a domain which it should own in this state then the
        domain is not completely setup and should be shutdown. *)
     xs.Xs.write (dom_path ^ "/action-request") "poweroff" ;
diff --git a/ocaml/xenopsd/xenopsd.conf b/ocaml/xenopsd/xenopsd.conf
index e80194c1f55..447d6cde54a 100644
--- a/ocaml/xenopsd/xenopsd.conf
+++ b/ocaml/xenopsd/xenopsd.conf
@@ -108,3 +108,9 @@ disable-logging-for=http tracing tracing_export
 # time to wait for in-guest PV drivers to acknowledge a shutdown request
 # before we conclude that the drivers have failed
 # domain_shutdown_ack_timeout = 60
+
+# Controls whether, when the VM starts in HVM mode, the Xen PCI MMIO used
+# by grant tables is mapped as Uncached (UC, the default) or WriteBack
+# (WB, the workaround). WB mapping could improve performance of devices
+# using grant tables. This is useful on AMD platform only.
+# xen-platform-pci-bar-uc=true