Fix VGA initialization with correct PCI address

Signed-off-by: Harry Chen <i@harrychen.xyz>

kernel/src/arch/mipsel/board/malta/mod.rs

@@ -31,7 +31,7 @@ pub fn init_serial_early() {
 /// Initialize other board drivers
 pub fn init_driver() {
     // TODO: add possibly more drivers
-    vga::init(0xb8000000, 0x92050000, 800, 600);
+    vga::init(0xb8000000, 0xb2050000, 800, 600);
 }
 
 pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferResult {
@@ -44,8 +44,8 @@ pub fn probe_fb_info(_width: u32, _height: u32, _depth: u32) -> fb::FramebufferR
         yoffset: 0,
         depth: 8,
         pitch: 800,
-        bus_addr: 0x90000000,
+        bus_addr: 0xb0000000,
         screen_size: 800 * 600,
     };
-    Ok((fb_info, fb::ColorConfig::VgaPalette, 0x90000000))
+    Ok((fb_info, fb::ColorConfig::VgaPalette, 0xb0000000))
 }

kernel/src/drivers/gpu/qemu_stdvga.rs

@@ -15,30 +15,24 @@ const VGA_AR_PAS: u8 =  0x20;
 const VBE_DISPI_ENABLED: u16 = 0x01;
 
 const PCIR_COMMAND: u8 = 0x04;
-const PCIM_CMD_PORTEN: u16 = 0x0001;
+const PCIM_CMD_PORTEN: u32 = 0x0001;
-const PCIM_CMD_MEMEN: u16 = 0x0002;
+const PCIM_CMD_MEMEN: u32 = 0x0002;
 
 
-fn pci_read_config(pci_base: usize, bus: u8, slot: u8, func: u8, offset: u8) -> u16 {
+fn pci_read_config(pci_base: usize, bus: u8, slot: u8, func: u8, offset: u8) -> u32 {
-    // enable access mechanism
+    // write config address
-    let data = 0xF0 | (func << 1);
+    let address = (1 << 31) | ((bus as u32) << 16) | ((slot as u32) << 11) | ((func as u32) << 8) | (offset as u32);
-    write(pci_base + 0xcf8, data);
+    write(pci_base + 0xcf8, address);
-    write(pci_base + 0xcfa, bus);
-    // calculate port address
-    let addr: u16 = (0xC000 | ((slot as u16) << 8) | (offset as u16)) & 0xFFFC;
     // do the actual work
-    read(pci_base + addr as usize)
+    read(pci_base + 0xcfc)
 }
 
-fn pci_write_config(pci_base: usize, bus: u8, slot: u8, func: u8, offset: u8, value: u16) {
+fn pci_write_config(pci_base: usize, bus: u8, slot: u8, func: u8, offset: u8, value: u32) {
-    // enable access mechanism
+    // write config address
-    let data = 0xF0 | (func << 1);
+    let address = (1 << 31) | ((bus as u32) << 16) | ((slot as u32) << 11) | ((func as u32) << 8) | (offset as u32);
-    write(pci_base + 0xcf8, data);
+    write(pci_base + 0xcf8, address);
-    write(pci_base + 0xcfa, bus);
-    // calculate port address
-    let addr: u16 = (0xC000 | ((slot as u16) << 8) | (offset as u16)) & 0xFFFC;
     // do the actual work
-    write(pci_base + addr as usize, value);
+    write(pci_base + 0xcfc, value)
 }
 
 pub fn init(pci_base: usize, vga_base: usize, x_res: u16, y_res: u16) {