From 1fcf0d7773bf99d0357bc647304541d4dbaf2611 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 17 Apr 2014 15:57:47 +0100
Subject: [PATCH] kvm tools: ARM: bring generated pci FDT node in-line with
 kernel binding

Now that the dust has settled on the devicetree bindings for the generic
PCI host controller in the Linux kernel, update the node generated by
kvmtool to match what mainline kernels will expect.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---
 arm/fdt.c |  1 +
 arm/kvm.c |  5 -----
 arm/pci.c | 25 ++++++++++++-------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/arm/fdt.c b/arm/fdt.c
index d90fc9e..30cd75a 100644
--- a/arm/fdt.c
+++ b/arm/fdt.c
@@ -114,6 +114,7 @@ static int setup_fdt(struct kvm *kvm)
 
 	/* /chosen */
 	_FDT(fdt_begin_node(fdt, "chosen"));
+	_FDT(fdt_property_cell(fdt, "linux,pci-probe-only", 1));
 	_FDT(fdt_property_string(fdt, "bootargs", kern_cmdline));
 
 	/* Initrd */
diff --git a/arm/kvm.c b/arm/kvm.c
index 6db646b..008b7fe 100644
--- a/arm/kvm.c
+++ b/arm/kvm.c
@@ -56,11 +56,6 @@ void kvm__arch_read_term(struct kvm *kvm)
 
 void kvm__arch_set_cmdline(char *cmdline, bool video)
 {
-	/*
-	 * We don't support movable BARs, so force the guest to use what
-	 * we tell it.
-	 */
-	strcpy(cmdline, "pci=firmware");
 }
 
 void kvm__arch_init(struct kvm *kvm, const char *hugetlbfs_path, u64 ram_size)
diff --git a/arm/pci.c b/arm/pci.c
index ce1932e..9f4dabc 100644
--- a/arm/pci.c
+++ b/arm/pci.c
@@ -26,17 +26,13 @@ void pci__generate_fdt_nodes(void *fdt, u32 gic_phandle)
 	struct device_header *dev_hdr;
 	struct of_interrupt_map_entry irq_map[OF_PCI_IRQ_MAP_MAX];
 	unsigned nentries = 0;
-	/* Describe the memory ranges (config and memory) */
+	/* Bus range */
+	u32 bus_range[] = { cpu_to_fdt32(0), cpu_to_fdt32(1), };
+	/* Configuration Space */
+	u64 cfg_reg_prop[] = { cpu_to_fdt64(KVM_PCI_CFG_AREA),
+			       cpu_to_fdt64(ARM_PCI_CFG_SIZE), };
+	/* Describe the memory ranges */
 	struct of_pci_ranges_entry ranges[] = {
-		{
-			.pci_addr = {
-				.hi	= cpu_to_fdt32(of_pci_b_ss(OF_PCI_SS_CONFIG)),
-				.mid	= 0,
-				.lo	= 0,
-			},
-			.cpu_addr	= cpu_to_fdt64(KVM_PCI_CFG_AREA),
-			.length		= cpu_to_fdt64(ARM_PCI_CFG_SIZE),
-		},
 		{
 			.pci_addr = {
 				.hi	= cpu_to_fdt32(of_pci_b_ss(OF_PCI_SS_IO)),
@@ -49,8 +45,8 @@ void pci__generate_fdt_nodes(void *fdt, u32 gic_phandle)
 		{
 			.pci_addr = {
 				.hi	= cpu_to_fdt32(of_pci_b_ss(OF_PCI_SS_M32)),
-				.mid	= 0,
-				.lo	= 0,
+				.mid	= cpu_to_fdt32(KVM_PCI_MMIO_AREA >> 32),
+				.lo	= cpu_to_fdt32(KVM_PCI_MMIO_AREA),
 			},
 			.cpu_addr	= cpu_to_fdt64(KVM_PCI_MMIO_AREA),
 			.length		= cpu_to_fdt64(ARM_PCI_MMIO_SIZE),
@@ -59,11 +55,14 @@ void pci__generate_fdt_nodes(void *fdt, u32 gic_phandle)
 
 	/* Boilerplate PCI properties */
 	_FDT(fdt_begin_node(fdt, "pci"));
+	_FDT(fdt_property_string(fdt, "device_type", "pci"));
 	_FDT(fdt_property_cell(fdt, "#address-cells", 0x3));
 	_FDT(fdt_property_cell(fdt, "#size-cells", 0x2));
 	_FDT(fdt_property_cell(fdt, "#interrupt-cells", 0x1));
-	_FDT(fdt_property_string(fdt, "compatible", "linux,pci-virt"));
+	_FDT(fdt_property_string(fdt, "compatible", "pci-host-cam-generic"));
 
+	_FDT(fdt_property(fdt, "bus-range", bus_range, sizeof(bus_range)));
+	_FDT(fdt_property(fdt, "reg", &cfg_reg_prop, sizeof(cfg_reg_prop)));
 	_FDT(fdt_property(fdt, "ranges", ranges, sizeof(ranges)));
 
 	/* Generate the interrupt map ... */