On 2017-06-14 14:02, Henning Schild wrote:
> From: Henning Schild <henning.sch...@siemens.com>
>
> 211558763ddd set the default uart port base to 0x3f8 for all x86
> demo cells, which broke all demos which had a default of 0x2f8.
>
> Change the configs for all cells running the inmate lib, making
> sure that serial1 and 2 will work. Provide an example for command
> line parameters for pci-demo.
>
> Reported-by: Andreas Rollbuehler <andreas.rollbueh...@siemens.com>
> Signed-off-by: Henning Schild <henning.sch...@siemens.com>
> ---
> README.md | 6 ++++--
> configs/apic-demo.c | 4 +++-
> configs/e1000-demo.c | 4 +++-
> configs/ioapic-demo.c | 4 +++-
> configs/ivshmem-demo.c | 4 +++-
> configs/linux-x86-demo.c | 4 +++-
> configs/pci-demo.c | 4 +++-
> configs/smp-demo.c | 4 +++-
> configs/tiny-demo.c | 4 +++-
> 9 files changed, 28 insertions(+), 10 deletions(-)
>
> diff --git a/README.md b/README.md
> --- a/README.md
> +++ b/README.md
> @@ -320,7 +320,8 @@ To demonstrate the execution of a second
> commands:
>
> jailhouse cell create /path/to/pci-demo.cell
> - jailhouse cell load pci-demo /path/to/pci-demo.bin -a 0xf0000
> + jailhouse cell load pci-demo /path/to/pci-demo.bin -a 0xf0000 \
> + -s "con-base=0x2f8" -a 0xf0000
> jailhouse cell start pci-demo
>
> The pci-demo will use the second serial port provided by QEMU. You will find
> @@ -332,7 +333,8 @@ the content of existing cell (provided t
> reload and restart the tiny-demo, issue the following commands:
>
> jailhouse cell start apic-demo
> - jailhouse cell load pci-demo /path/to/pci-demo.bin -a 0xf0000
> + jailhouse cell load pci-demo /path/to/pci-demo.bin -a 0xf0000 \
> + -s "con-base=0x2f8" -a 0xf0000
> jailhouse cell start pci-demo
>
> Finally, Jailhouse is can be stopped completely again:
> diff --git a/configs/apic-demo.c b/configs/apic-demo.c
> --- a/configs/apic-demo.c
> +++ b/configs/apic-demo.c
> @@ -66,7 +66,9 @@ struct {
> },
>
> .pio_bitmap = {
> - [ 0/8 ... 0x3f7/8] = -1,
> + [ 0/8 ... 0x2f7/8] = -1,
> + [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> + [ 0x300/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/e1000-demo.c b/configs/e1000-demo.c
> --- a/configs/e1000-demo.c
> +++ b/configs/e1000-demo.c
> @@ -70,7 +70,9 @@ struct {
> .pio_bitmap = {
> [ 0/8 ... 0x2f7/8] = -1,
> [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> - [ 0x300/8 ... 0xbfff/8] = -1,
> + [ 0x300/8 ... 0x3f7/8] = -1,
> + [ 0x3f8/8 ... 0x3ff/8] = 0, /* serial1 */
> + [ 0x400/8 ... 0xbfff/8] = -1,
> [0xc000/8 ... 0xc03f/8] = 0, /* e1000 */
> [0xc040/8 ... 0xdfff/8] = -1,
> [0xe000/8 ... 0xe007/8] = 0, /* OXPCIe952 serial2 */
> diff --git a/configs/ioapic-demo.c b/configs/ioapic-demo.c
> --- a/configs/ioapic-demo.c
> +++ b/configs/ioapic-demo.c
> @@ -71,7 +71,9 @@ struct {
> .pio_bitmap = {
> [ 0/8 ... 0x2f7/8] = -1,
> [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> - [ 0x300/8 ... 0x5ff/8] = -1,
> + [ 0x300/8 ... 0x3f7/8] = -1,
> + [ 0x3f8/8 ... 0x3ff/8] = 0, /* serial1 */
> + [ 0x400/8 ... 0x5ff/8] = -1,
> [ 0x600/8 ... 0x607/8] = 0xf0, /* acpi-evt */
> [ 0x608/8 ... 0x7ff/8] = -1,
> [ 0x800/8 ... 0x807/8] = 0xf0 /* apci-pm1a */,
> diff --git a/configs/ivshmem-demo.c b/configs/ivshmem-demo.c
> --- a/configs/ivshmem-demo.c
> +++ b/configs/ivshmem-demo.c
> @@ -66,7 +66,9 @@ struct {
> },
>
> .pio_bitmap = {
> - [ 0/8 ... 0x3f7/8] = -1,
> + [ 0/8 ... 0x2f7/8] = -1,
> + [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> + [ 0x300/8 ... 0x3f7/8] = -1,
> [ 0x3f8/8 ... 0x3ff/8] = 0, /* serial1 */
> [ 0x400/8 ... 0xffff/8] = -1,
> },
> diff --git a/configs/linux-x86-demo.c b/configs/linux-x86-demo.c
> --- a/configs/linux-x86-demo.c
> +++ b/configs/linux-x86-demo.c
> @@ -125,7 +125,9 @@ struct {
> },
>
> .pio_bitmap = {
> - [ 0/8 ... 0x3f7/8] = -1,
> + [ 0/8 ... 0x2f7/8] = -1,
> + [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> + [ 0x300/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/pci-demo.c b/configs/pci-demo.c
> --- a/configs/pci-demo.c
> +++ b/configs/pci-demo.c
> @@ -69,7 +69,9 @@ struct {
> .pio_bitmap = {
> [ 0/8 ... 0x2f7/8] = -1,
> [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> - [ 0x300/8 ... 0xdfff/8] = -1,
> + [ 0x300/8 ... 0x3f7/8] = -1,
> + [ 0x3f8/8 ... 0x3ff/8] = 0, /* serial1 */
> + [ 0x400/8 ... 0xdfff/8] = -1,
> [0xe000/8 ... 0xe007/8] = 0, /* OXPCIe952 serial2 */
> [0xe008/8 ... 0xffff/8] = -1,
> },
> diff --git a/configs/smp-demo.c b/configs/smp-demo.c
> --- a/configs/smp-demo.c
> +++ b/configs/smp-demo.c
> @@ -59,7 +59,9 @@ struct {
> .pio_bitmap = {
> [ 0/8 ... 0x2f7/8] = -1,
> [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> - [ 0x300/8 ... 0xdfff/8] = -1,
> + [ 0x300/8 ... 0x3f7/8] = -1,
> + [ 0x3f8/8 ... 0x3ff/8] = 0, /* serial1 */
> + [ 0x400/8 ... 0xdfff/8] = -1,
> [0xe000/8 ... 0xe007/8] = 0, /* OXPCIe952 serial2 */
> [0xe008/8 ... 0xffff/8] = -1,
> },
> diff --git a/configs/tiny-demo.c b/configs/tiny-demo.c
> --- a/configs/tiny-demo.c
> +++ b/configs/tiny-demo.c
> @@ -69,7 +69,9 @@ struct {
> .pio_bitmap = {
> [ 0/8 ... 0x2f7/8] = -1,
> [ 0x2f8/8 ... 0x2ff/8] = 0, /* serial2 */
> - [ 0x300/8 ... 0xdfff/8] = -1,
> + [ 0x300/8 ... 0x3f7/8] = -1,
> + [ 0x3f8/8 ... 0x3ff/8] = 0, /* serial1 */
> + [ 0x400/8 ... 0xdfff/8] = -1,
> [0xe000/8 ... 0xe007/8] = 0, /* OXPCIe952 serial2 */
> [0xe008/8 ... 0xffff/8] = -1,
> },
>
Thanks, applied both.
Jan
--
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
