From fd40a7a4c4f9af093f0bbc506843a3c432be2b4d Mon Sep 17 00:00:00 2001
From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Fri, 22 Apr 2016 02:29:31 +0200
Subject: [PATCH] jailhouse: configs: qemu and fiasco: 	--reconfigure delay
 port on 0xed in qemu 	--add pci devices for keyboard: ehci-usb 
 --remove virtion-9p-pci device form cfg

	--enable 0x80 port back in fiasco. linux cell don't use it anymore.
---
 configs/fiasco-demo.c | 16 +++++++-------
 configs/qemu-vm.c     | 50 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/configs/fiasco-demo.c b/configs/fiasco-demo.c
index 0fb38e2..0d7657b 100755
--- a/configs/fiasco-demo.c
+++ b/configs/fiasco-demo.c
@@ -38,14 +38,14 @@ struct {
 	},
 
 	.cpus = {
-		0xc,
+		0x1,
 	},
 
 	.mem_regions = {
 		/* low RAM */ {
 			.phys_start = 0x3b600000,
 			.virt_start = 0,
-			.size = 0x44ff000,
+			.size = 0x3bff000,
 			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
 				JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA |
 				JAILHOUSE_MEM_LOADABLE,
@@ -76,12 +76,12 @@ struct {
 
 	.pio_bitmap = {
 		
-		[  0x0/8 ...  0x3f7/8] = -1,
-//Uncomment this to enable 0x80 port
-/*		[  	0/8 ...   0x7f/8] = -1,
-		[  0x80/8 ...   0x87/8] = 0xfe,
-		[  0x88/8 ...  0x3f7/8] = -1,
-*/		
+		[     0/8 ...   0x5f/8] = -1,
+		[  0x60/8 ...   0x67/8] = 0,
+		[  0x68/8 ...   0x7f/8] = -1,
+		[  0x80/8 ...   0x88/8] = 0xfe, //delay
+		[  0x89/8 ...  0x3f7/8] = -1,
+		
 		[ 0x3f8/8 ...  0x3ff/8] = 0, /* serial1 */
 		[ 0x400/8 ... 0xe00f/8] = -1,
 		[0xe010/8 ... 0xe017/8] = 0, /* OXPCIe952 serial1 */
diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c
index 6f068dd..0d2d257 100755
--- a/configs/qemu-vm.c
+++ b/configs/qemu-vm.c
@@ -34,11 +34,11 @@
 struct {
 	struct jailhouse_system header;
 	__u64 cpus[1];
-	struct jailhouse_memory mem_regions[13];
+	struct jailhouse_memory mem_regions[14];
 	struct jailhouse_irqchip irqchips[1];
 	__u8 pio_bitmap[0x2000];
-	struct jailhouse_pci_device pci_devices[8];
-	struct jailhouse_pci_capability pci_caps[5];
+	struct jailhouse_pci_device pci_devices[11];
+	struct jailhouse_pci_capability pci_caps[4];
 } __attribute__((packed)) config = {
 	.header = {
 		.signature = JAILHOUSE_SYSTEM_SIGNATURE,
@@ -148,6 +148,14 @@ struct {
 			.size = 0x1000,
 			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
 		},
+		/* MemRegion: febf6000-febf6fff : virtio-9p */
+		{
+			.phys_start = 0xfebf6000,
+			.virt_start = 0xfebf6000,
+			.size = 0x1000,
+			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+		},
+		
 		/* MemRegion: fed00000-fed003ff : PNP0103:00 */
 		{
 			.phys_start = 0xfed00000,
@@ -182,7 +190,11 @@ struct {
 		[  0x70/8 ...   0x77/8] = 0xfc, /* rtc */
 		[  0x78/8 ...   0x7f/8] = -1,
 		[  0x80/8 ...   0x87/8] = 0xfe, /* port 80 (delays) */
-		[  0x88/8 ...  0x1c7/8] = -1,
+
+		[  0x88/8 ...	0xec/8] = -1,
+		[  0xed/8 ...   0xf5/8]	= 0xfe, /*port 0xed delay experimental*/	
+		[  0xf6/8 ...  0x1c7/8] = -1,
+		
 		[ 0x1c8/8 ...  0x1cf/8] = 0x3f, /* vbe */
 		[ 0x1d0/8 ...  0x1d7/8] = 0xfe, /* vbe */
 		[ 0x1d8/8 ...  0x2f7/8] = -1,
@@ -220,6 +232,28 @@ struct {
 			.num_msi_vectors = 1,
 			.msi_64bits = 1,
 		},
+
+		{/*uhci_hcd 00:1d.0*/
+			.type = JAILHOUSE_PCI_TYPE_DEVICE,
+			.domain = 0x0000,
+			.bdf = 0x00e8,
+		},
+		{/*uhci_hcd 00:1d.1*/
+			.type = JAILHOUSE_PCI_TYPE_DEVICE,
+			.domain = 0x0000,
+			.bdf = 0x00e9,
+		},
+		{/*uhci_hcd 00:1d.2*/
+			.type = JAILHOUSE_PCI_TYPE_DEVICE,
+			.domain = 0x0000,
+			.bdf = 0x00ea,
+		},		
+		{/*ehci_pci 00:1d.7*/
+			.type = JAILHOUSE_PCI_TYPE_DEVICE,
+			.domain = 0x0000,
+			.bdf = 0x00ef,
+		},
+
 		{ /* ISA bridge */
 			.type = JAILHOUSE_PCI_TYPE_DEVICE,
 			.domain = 0x0000,
@@ -239,7 +273,7 @@ struct {
 			.domain = 0x0000,
 			.bdf = 0x00fb,
 		},
-		{ /* virtio-9p-pci */
+		/*{ // virtio-9p-pci /
 			.type = JAILHOUSE_PCI_TYPE_DEVICE,
 			.domain = 0x0000,
 			.bdf = 0x00ff,
@@ -248,7 +282,7 @@ struct {
 			.num_msix_vectors = 2,
 			.msix_region_size = 0x1000,
 			.msix_address = 0xfebf6000,
-		},
+		},*/
 		{
 			.type = JAILHOUSE_PCI_TYPE_IVSHMEM,
 			.domain = 0x0,
@@ -287,11 +321,11 @@ struct {
 			.len = 14,
 			.flags = JAILHOUSE_PCICAPS_WRITE,
 		},
-		{ /* virtio-9p-pci */
+		/*{ // virtio-9p-pci //
 			.id = 0x11,
 			.start = 0x40,
 			.len = 12,
 			.flags = JAILHOUSE_PCICAPS_WRITE,
-		},
+		},*/
 	},
 };
-- 
2.39.2