[siemens/jailhouse] bfcf4a: create config: fix 64bit PCI device configuration

3 views
Skip to first unread message

GitHub

unread,
Aug 19, 2016, 5:54:46 AM8/19/16
to jailho...@googlegroups.com
Branch: refs/heads/next
Home: https://github.com/siemens/jailhouse
Commit: bfcf4ab9920477d80b7f1bc43a49057bc8b877c1
https://github.com/siemens/jailhouse/commit/bfcf4ab9920477d80b7f1bc43a49057bc8b877c1
Author: Benedikt Spranger <b.spr...@linutronix.de>
Date: 2016-08-19 (Fri, 19 Aug 2016)

Changed paths:
M tools/jailhouse-config-create

Log Message:
-----------
create config: fix 64bit PCI device configuration

The PCI device BAR configuration generated by "jailhouse config create"
of the following device is broken:

05:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 P
CI Express Gigabit Ethernet Controller (rev 06)
Subsystem: Device 7470:3468
Flags: bus master, fast devsel, latency 0
I/O ports at d000 [size=256]
Memory at f3204000 (64-bit, non-prefetchable) [size=4K]
Memory at f3200000 (64-bit, prefetchable) [size=16K]
Capabilities: [40] Power Management version 3
Capabilities: [50] MSI: Enable+ Count=1/1 Maskable- 64bit+
Capabilities: [70] Express Endpoint, MSI 01
Capabilities: [b0] MSI-X: Enable- Count=4 Masked-
Capabilities: [d0] Vital Product Data
Capabilities: [100] Advanced Error Reporting
Capabilities: [140] Virtual Channel
Capabilities: [160] Device Serial Number 1a-0e-00-00-68-4c-e0-00

...
.bar_mask = {
0xffffff00, 0x00000000, 0xfffff000,
0xffffffff, 0x00000000, 0xffffc000,
},
...

Fix the config generation script:
...
.bar_mask = {
0xffffff00, 0x00000000, 0xfffff000,
0xffffffff, 0xffffc000, 0xffffffff,
},
...

Signed-off-by: Benedikt Spranger <b.spr...@linutronix.de>
Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 89d410ec55942a4d1561004d591112e9b185d67f
https://github.com/siemens/jailhouse/commit/89d410ec55942a4d1561004d591112e9b185d67f
Author: Henning Schild <henning...@siemens.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)

Changed paths:
M tools/jailhouse-config-create

Log Message:
-----------
tools: config-create: fix iterator index manipulation in PCIBARs

The n += 1, to skip a line in the 64bit case, never had an effect.
Change the iterator so it can be manipulated like that.

Fixes: d1f763162ce6 ("core, tools: Add BAR masks to
jailhouse_pci_device")

Signed-off-by: Henning Schild <henning...@siemens.com>
Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: d1209796599388337f2183f81930869cbbf73401
https://github.com/siemens/jailhouse/commit/d1209796599388337f2183f81930869cbbf73401
Author: Ralf Ramsauer <ra...@ramses-pyramidenbau.de>
Date: 2016-08-19 (Fri, 19 Aug 2016)

Changed paths:
M tools/jailhouse-completion.bash

Log Message:
-----------
tools: fix typos

Fix some minor spelling mistakes in the documentation of
jailhouse-completion.bash.

Signed-off-by: Ralf Ramsauer <ra...@ramses-pyramidenbau.de>
[Jan: additional fix to "distribution's"]
Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 401a2d880a1ba80494e2a1192d5734be392d0eee
https://github.com/siemens/jailhouse/commit/401a2d880a1ba80494e2a1192d5734be392d0eee
Author: Ralf Ramsauer <ra...@ramses-pyramidenbau.de>
Date: 2016-08-19 (Fri, 19 Aug 2016)

Changed paths:
M hypervisor/control.c

Log Message:
-----------
hypervisor: fix typo

Signed-off-by: Ralf Ramsauer <ra...@ramses-pyramidenbau.de>
Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 3558c653184818596c0c131355c6730515929216
https://github.com/siemens/jailhouse/commit/3558c653184818596c0c131355c6730515929216
Author: Ralf Ramsauer <ra...@ramses-pyramidenbau.de>
Date: 2016-08-19 (Fri, 19 Aug 2016)

Changed paths:
M hypervisor/control.c

Log Message:
-----------
hypervisor: amend misleading comment

Documentation of cell_init states that the cell structure must be zero
initialised. Callers of cell_init do not pass zero initialised
structures, in fact they are preparing the structure.

Amend the comment to avoid misunderstandings.

Signed-off-by: Ralf Ramsauer <ra...@ramses-pyramidenbau.de>
Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Compare: https://github.com/siemens/jailhouse/compare/fd6ba7a69816...3558c6531848
Reply all
Reply to author
Forward
0 new messages