Merge remote-tracking branch 'origin/bit-set' into update-epoch-sched…

…uler

Signed-off-by: Klimenty Tsoutsman <klim@tsoutsman.com>

Makefile

@@ -1,7 +1,7 @@
 ### This makefile is the top-level build script that builds all the crates in subdirectories 
 ### and combines them into the final OS .iso image.
 ### It also provides convenient targets for running and debugging Theseus and using GDB on your host computer.
-SHELL := /bin/bash
+SHELL := /usr/bin/env bash
 
 ## Disable parallelism for this Makefile since it breaks the build,
 ## as our dependencies aren't perfectly specified for each target.

applications/lspci/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "lspci"
+version = "0.1.0"
+description = "An application which lists currently connected PCI devices."
+authors = ["Nathan Royer <nathan.royer.pro@gmail.com>"]
+edition = "2021"
+
+[dependencies]
+getopts = "0.2.21"
+pci = { path = "../../kernel/pci" }
+memory = { path = "../../kernel/memory" }
+app_io = { path = "../../kernel/app_io" }

applications/lspci/src/lib.rs

@@ -0,0 +1,75 @@
+//! This application lists currently connected PCI devices.
+
+#![no_std]
+
+extern crate alloc;
+#[macro_use] extern crate app_io;
+extern crate getopts;
+
+use alloc::vec::Vec;
+use alloc::string::String;
+use getopts::Options;
+use pci::pci_device_iter;
+use memory::PhysicalAddress;
+
+pub fn main(args: Vec<String>) -> isize {
+    let mut opts = Options::new();
+    opts.optflag("h", "help", "print this help menu");
+
+    let matches = match opts.parse(args) {
+        Ok(m) => m,
+        Err(_f) => {
+            println!("{}", _f);
+            print_usage(opts);
+            return -1; 
+        }
+    };
+
+    if matches.opt_present("h") {
+        print_usage(opts);
+        return 0;
+    }
+
+    if let Err(msg) = list_pci_devices() {
+        println!("Error: {}", msg);
+    }
+
+    0
+}
+
+fn list_pci_devices() -> Result<(), &'static str> {
+    for dev in pci_device_iter()? {
+        println!("{} -- {:04x}:{:04x}", dev.location, dev.vendor_id, dev.device_id);
+        println!("- class, subclass, prog_if: {:x}, {:x}, {:x}", dev.class, dev.subclass, dev.prog_if);
+
+        for bar_idx in 0..6 {
+            let base = dev.determine_mem_base(bar_idx)?;
+            if base != PhysicalAddress::zero() {
+                let size = dev.determine_mem_size(bar_idx);
+                println!("- BAR {}: base = 0x{:x}, size = 0x{:x}", bar_idx, base, size);
+            }
+        }
+
+        let support = dev.modern_interrupt_support();
+        let supports = |b| match b {
+            true => "supported",
+            false => "not supported",
+        };
+
+        println!("- MSI interrupts: {}", supports(support.msi));
+        println!("- MSI-X interrupts: {}", supports(support.msix));
+        println!("- INTx enabled: {}", dev.pci_intx_enabled());
+        println!("- INTx status: {}", dev.pci_get_intx_status(false));
+    }
+
+    Ok(())
+}
+
+
+fn print_usage(opts: Options) {
+    println!("{}", opts.usage(USAGE));
+}
+
+
+const USAGE: &str = "Usage: lspci
+An application which lists currently connected PCI devices.";

cfg/Config.mk

@@ -3,7 +3,7 @@
 ### So, to access the directory containing this file, you would use "../"
 
 .DEFAULT_GOAL := all
-SHELL := /bin/bash
+SHELL := /usr/bin/env bash
 
 ## specifies which architecture we're building for
 ARCH ?= x86_64

kernel/device_manager/src/lib.rs

@@ -84,8 +84,6 @@ pub fn init(
         }
     }
 
-    pci::init()?;
-
     // Initialize/scan the PCI bus to discover PCI devices
     for dev in pci::pci_device_iter()? {
         debug!("Found PCI device: {:X?}", dev);

kernel/e1000/src/lib.rs

@@ -156,7 +156,7 @@ impl E1000Nic {
         //debug!("e1000_nc bar_type: {0}, mem_base: {1}, io_base: {2}", e1000_nc.bar_type, e1000_nc.mem_base, e1000_nc.io_base);
 
         // Get interrupt number
-        let interrupt_num = match e1000_pci_dev.pci_get_interrupt_info() {
+        let interrupt_num = match e1000_pci_dev.pci_get_intx_info() {
             Ok((Some(irq), _pin)) => (irq + IRQ_BASE_OFFSET) as InterruptNumber,
             _ => return Err("e1000: PCI device had no interrupt number (IRQ vector)"),
         };

kernel/interrupts/src/aarch64/mod.rs

@@ -217,28 +217,6 @@ pub fn init_pl011_rx_interrupt() -> Result<(), &'static str> {
     int_ctrl.set_destination(PL011_RX_SPI, Some(current_cpu()), u8::MAX)
 }
 
-/// Sets an interrupt handler for legacy PCI interrupts: INTA, INTB, INTC, INTD
-pub fn init_pci_interrupts(handlers: [InterruptHandler; 4]) -> Result<(), &'static str> {
-    let int_ctrl = SystemInterruptController::get()
-        .ok_or("SystemInterruptController was not yet initialized")?;
-    let dst = Some(cpu::bootstrap_cpu().unwrap());
-
-    let pci_intx_nums = BOARD_CONFIG.pci_intx.into_iter();
-    let pci_intx_handlers = handlers.into_iter();
-
-    for (int_num, handler) in pci_intx_nums.zip(pci_intx_handlers) {
-        if let Err(existing_handler) = register_interrupt(int_num, handler) {
-            if handler as InterruptHandler != existing_handler {
-                return Err("A different interrupt handler has already been setup for that PCI interrupt");
-            }
-        }
-
-        int_ctrl.set_destination(int_num, dst, u8::MAX)?;
-    }
-
-    Ok(())
-}
-
 /// Registers an interrupt handler at the given IRQ interrupt number.
 ///
 /// The function fails if the interrupt number is reserved or is already in use.

kernel/pci/Cargo.toml

@@ -21,6 +21,7 @@ port_io = { path = "../../libs/port_io" }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 arm_boards = { path = "../arm_boards" }
+interrupt_controller = { path = "../interrupt_controller" }
 
 [lib]
 crate-type = ["rlib"]