[PATCH] move pcibios mem base back to 0xf0000000

[Marcelo Tosatti]

Commit d9104ffe085bffdd35196b70672883cc6af8808f moved pcibios mem base
to 0xe0000000, which conflicts with the address of the VBE mapping.

Move it back to 0xf0000000.

Fixes http://sourceforge.net/tracker/?func=detail&atid=893831&aid=2936094&...

Signed-off-by: Marcelo Tosatti

diff --git a/src/pciinit.c b/src/pciinit.c
index a6070e7..c849a4c 100644
--- a/src/pciinit.c
+++ b/src/pciinit.c
@@ -194,7 +194,7 @@ pci_setup(void)
     dprintf(3, "pci setup\n");

pci_bios_io_addr = 0xc000;
-    pci_bios_mem_addr = BUILD_MAX_HIGHMEM;
+    pci_bios_mem_addr = 0xf0000000;

int bdf, max;
     foreachpci(bdf, max) {

[Sebastian Herbszt]

Marcelo Tosatti wrote:
> Commit d9104ffe085bffdd35196b70672883cc6af8808f moved pcibios mem base
> to 0xe0000000, which conflicts with the address of the VBE mapping.

vgabios changelog [1] has

vgabios-0.6c : Apr 08 2009
* use VBE LFB address from PCI base address if present

[1] http://www.nongnu.org/vgabios/ChangeLog.html

- Sebastian

[Kevin O'Connor]

On Sat, Jan 23, 2010 at 03:56:28PM -0200, Marcelo Tosatti wrote:
> Commit d9104ffe085bffdd35196b70672883cc6af8808f moved pcibios mem base
> to 0xe0000000, which conflicts with the address of the VBE mapping.
>
> Move it back to 0xf0000000.

If accepted, this patch would be the forth move of pci_bios_mem_addr
in seven months.  The last three (which tracked commits to bochs) are:

d9104ffe085bffdd35196b70672883cc6af8808f
d1c4d6461468550e0639b6bc08eaa48da4617f4e
8740e3a8325de8e6453da1db1b011c036d021789

I need some background on why the address can't be at the end of
memory.  Why can't VBE use a PCI bar like a real device would?

-Kevin

[Stefan Reinauer]

On 1/23/10 6:56 PM, Marcelo Tosatti wrote:
> Commit d9104ffe085bffdd35196b70672883cc6af8808f moved pcibios mem base
> to 0xe0000000, which conflicts with the address of the VBE mapping.
>
> Move it back to 0xf0000000.
>
> Fixes http://sourceforge.net/tracker/?func=detail&atid=893831&aid=2936094&...
>
> Signed-off-by: Marcelo Tosatti
>
> diff --git a/src/pciinit.c b/src/pciinit.c
> index a6070e7..c849a4c 100644
> --- a/src/pciinit.c
> +++ b/src/pciinit.c
> @@ -194,7 +194,7 @@ pci_setup(void)
>      dprintf(3, "pci setup\n");
>  pci_bios_io_addr = 0xc000;
> pci_bios_mem_addr = BUILD_MAX_HIGHMEM;
>
> pci_bios_mem_addr = 0xf0000000;
>
> int bdf, max;
> foreachpci(bdf, max) {

Could this stay a define in config.h rather than a hard code?

Stefan