src/gateware/kasli_soc.py

@@ -10,7 +10,6 @@ from migen.genlib.cdc import MultiReg
 from migen_axi.integration.soc_core import SoCCore
 from migen_axi.platforms import kasli_soc
 from misoc.interconnect.csr import *
-from misoc.cores import virtual_leds
 from misoc.integration import cpu_interface
 
 from artiq.coredevice import jsondesc
@@ -124,8 +123,6 @@ class GenericStandalone(SoCCore):
             ident = "acpki_" + ident
         SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident)
 
-        self.config["hw_rev"] = description["hw_rev"]
-
         platform.add_platform_command("create_clock -name clk_fpga_0 -period 8 [get_pins \"PS7/FCLKCLK[0]\"]")
         platform.add_platform_command("set_input_jitter clk_fpga_0 0.24")
 
@@ -212,8 +209,6 @@ class GenericMaster(SoCCore):
             ident = "acpki_" + ident
         SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident)
 
-        self.config["hw_rev"] = description["hw_rev"]
-
         platform.add_platform_command("create_clock -name clk_fpga_0 -period 8 [get_pins \"PS7/FCLKCLK[0]\"]")
         platform.add_platform_command("set_input_jitter clk_fpga_0 0.24")
 
@@ -322,11 +317,6 @@ class GenericMaster(SoCCore):
             self.config["HAS_GRABBER"] = None
             self.add_csr_group("grabber", self.grabber_csr_group)
 
-        self.submodules.virtual_leds = virtual_leds.VirtualLeds()
-        self.csr_devices.append("virtual_leds")
-
-        self.comb += [self.virtual_leds.get(i).eq(channel.rx_ready)
-                for i, channel in enumerate(self.drtio_transceiver.channels)]
 
 class GenericSatellite(SoCCore):
     def __init__(self, description, acpki=False):
@@ -344,8 +334,6 @@ class GenericSatellite(SoCCore):
             ident = "acpki_" + ident
         SoCCore.__init__(self, platform=platform, csr_data_width=32, ident=ident)
 
-        self.config["hw_rev"] = description["hw_rev"]
-
         platform.add_platform_command("create_clock -name clk_fpga_0 -period 8 [get_pins \"PS7/FCLKCLK[0]\"]")
         platform.add_platform_command("set_input_jitter clk_fpga_0 0.24")
 
@@ -486,11 +474,6 @@ class GenericSatellite(SoCCore):
             self.add_csr_group("grabber", self.grabber_csr_group)
             # no RTIO CRG here
      
-        self.submodules.virtual_leds = virtual_leds.VirtualLeds()
-        self.csr_devices.append("virtual_leds")
-
-        self.comb += [self.virtual_leds.get(i).eq(channel.rx_ready)
-                for i, channel in enumerate(self.drtio_transceiver.channels)]
 
 def write_mem_file(soc, filename):
     with open(filename, "w") as f:

src/libboard_artiq/src/io_expander.rs

@@ -1,8 +1,6 @@
 use libboard_zynq::i2c;
 use log::info;
 
-use crate::pl::csr;
-
 // Only the bare minimum registers. Bits/IO connections equivalent between IC types.
 struct Registers {
     // PCA9539 equivalent register names in comments
@@ -12,28 +10,8 @@ struct Registers {
     gpiob: u8,  // Output Port 1
 }
 
-//IO expanders pins
-const IODIR_OUT_SFP_TX_DISABLE: u8 = 0x02;
-const IODIR_OUT_SFP_LED: u8 = 0x40;
-#[cfg(hw_rev = "v1.0")]
-const IODIR_OUT_SFP0_LED: u8 = 0x40;
-#[cfg(hw_rev = "v1.1")]
-const IODIR_OUT_SFP0_LED: u8 = 0x80;
-
-//IO expander port direction
-const IODIR0: [u8; 2] = [
-    0xFF & !IODIR_OUT_SFP_TX_DISABLE & !IODIR_OUT_SFP0_LED,
-    0xFF & !IODIR_OUT_SFP_TX_DISABLE & !IODIR_OUT_SFP_LED,
-];
-
-const IODIR1: [u8; 2] = [
-    0xFF & !IODIR_OUT_SFP_TX_DISABLE & !IODIR_OUT_SFP_LED,
-    0xFF & !IODIR_OUT_SFP_TX_DISABLE & !IODIR_OUT_SFP_LED,
-];
-
 pub struct IoExpander {
     address: u8,
-    virtual_led_mapping: &'static [(u8, u8, u8)],
     iodir: [u8; 2],
     out_current: [u8; 2],
     out_target: [u8; 2],
@@ -42,19 +20,12 @@ pub struct IoExpander {
 
 impl IoExpander {
     pub fn new(i2c: &mut i2c::I2c, index: u8) -> Result<Self, &'static str> {
-        #[cfg(hw_rev = "v1.0")]
-        const VIRTUAL_LED_MAPPING0: [(u8, u8, u8); 2] = [(0, 0, 6), (1, 1, 6)];
-        #[cfg(hw_rev = "v1.1")]
-        const VIRTUAL_LED_MAPPING0: [(u8, u8, u8); 2] = [(0, 0, 7), (1, 1, 6)];
-
-        const VIRTUAL_LED_MAPPING1: [(u8, u8, u8); 2] = [(2, 0, 6), (3, 1, 6)];
 
         // Both expanders on SHARED I2C bus
         let mut io_expander = match index {
             0 => IoExpander {
                 address: 0x40,
-                virtual_led_mapping: &VIRTUAL_LED_MAPPING0,
+                iodir: [0xff; 2],
-                iodir: IODIR0,
                 out_current: [0; 2],
                 out_target: [0; 2],
                 registers: Registers {
@@ -66,8 +37,7 @@ impl IoExpander {
             },
             1 => IoExpander {
                 address: 0x42,
-                virtual_led_mapping: &VIRTUAL_LED_MAPPING1,
+                iodir: [0xff; 2],
-                iodir: IODIR1,
                 out_current: [0; 2],
                 out_target: [0; 2],
                 registers: Registers {
@@ -154,12 +124,6 @@ impl IoExpander {
     }
 
     pub fn service(&mut self, i2c: &mut i2c::I2c) -> Result<(), &'static str> {
-        #[cfg(has_virtual_leds)]
-        for (led, port, bit) in self.virtual_led_mapping.iter() {
-            let level = unsafe { csr::virtual_leds::status_read() >> led & 1 };
-            self.set(*port, *bit, level != 0);
-        }
-
         if self.out_target != self.out_current {
             self.select(i2c)?;
             if self.out_target[0] != self.out_current[0] {

src/runtime/src/main.rs

@@ -11,7 +11,6 @@
 
 extern crate alloc;
 
-use core::cell::RefCell;
 use log::{info, warn, error};
 
 use libboard_zynq::{timer::GlobalTimer, mpcore, gic};
@@ -92,24 +91,6 @@ async fn report_async_rtio_errors() {
 
 
 
-#[cfg(feature = "target_kasli_soc")]
-async fn io_expanders_service(
-    i2c_bus: RefCell<&mut libboard_zynq::i2c::I2c>,
-    io_expander0: RefCell<io_expander::IoExpander>,
-    io_expander1: RefCell<io_expander::IoExpander>,
-) {
-    loop {
-        task::r#yield().await;
-        io_expander0
-            .borrow_mut()
-            .service(&mut i2c_bus.borrow_mut())
-            .expect("I2C I/O expander #0 service failed");
-        io_expander1
-            .borrow_mut()
-            .service(&mut i2c_bus.borrow_mut())
-            .expect("I2C I/O expander #1 service failed");
-    }
-}
 static mut LOG_BUFFER: [u8; 1<<17] = [0; 1<<17];
 
 #[no_mangle]
@@ -147,7 +128,11 @@ pub fn main_core0() {
         io_expander1
             .init(i2c_bus)
             .expect("I2C I/O expander #1 initialization failed");
-        // Drive TX_DISABLE to false on SFP0..3
+        // Actively drive TX_DISABLE to false on SFP0..3
+        io_expander0.set_oe(i2c_bus, 0, 1 << 1).unwrap();
+        io_expander1.set_oe(i2c_bus, 0, 1 << 1).unwrap();
+        io_expander0.set_oe(i2c_bus, 1, 1 << 1).unwrap();
+        io_expander1.set_oe(i2c_bus, 1, 1 << 1).unwrap();
         io_expander0.set(0, 1, false);
         io_expander1.set(0, 1, false);
         io_expander0.set(1, 1, false);
@@ -168,11 +153,5 @@ pub fn main_core0() {
 
     task::spawn(report_async_rtio_errors());
 
-    #[cfg(feature = "target_kasli_soc")]
-    task::spawn(io_expanders_service(
-        RefCell::new(i2c_bus),
-        RefCell::new(io_expander0),
-        RefCell::new(io_expander1),
-    ));
     comms::main(timer, cfg);
 }

src/satman/src/main.rs

@@ -483,7 +483,11 @@ pub extern fn main_core0() -> i32 {
         io_expander1
             .init(&mut i2c)
             .expect("I2C I/O expander #1 initialization failed");
-        // Drive TX_DISABLE to false on SFP0..3
+        // Actively drive TX_DISABLE to false on SFP0..3
+        io_expander0.set_oe(&mut i2c, 0, 1 << 1).unwrap();
+        io_expander1.set_oe(&mut i2c, 0, 1 << 1).unwrap();
+        io_expander0.set_oe(&mut i2c, 1, 1 << 1).unwrap();
+        io_expander1.set_oe(&mut i2c, 1, 1 << 1).unwrap();
         io_expander0.set(0, 1, false);
         io_expander1.set(0, 1, false);
         io_expander0.set(1, 1, false);
@@ -524,16 +528,6 @@ pub extern fn main_core0() -> i32 {
             for mut rep in repeaters.iter_mut() {
                 rep.service(&routing_table, rank, &mut timer);
             }
-            #[cfg(feature = "target_kasli_soc")]
-            {
-                io_expander0
-                    .service(&mut i2c)
-                    .expect("I2C I/O expander #0 service failed");
-                io_expander1
-                    .service(&mut i2c)
-                    .expect("I2C I/O expander #1 service failed");
-            }
-
             hardware_tick(&mut hardware_tick_ts, &mut timer);
         }
 
@@ -555,15 +549,6 @@ pub extern fn main_core0() -> i32 {
             for mut rep in repeaters.iter_mut() {
                 rep.service(&routing_table, rank, &mut timer);
             }
-            #[cfg(feature = "target_kasli_soc")]
-            {
-                io_expander0
-                    .service(&mut i2c)
-                    .expect("I2C I/O expander #0 service failed");
-                io_expander1
-                    .service(&mut i2c)
-                    .expect("I2C I/O expander #1 service failed");
-            }
             hardware_tick(&mut hardware_tick_ts, &mut timer);
             if drtiosat_tsc_loaded() {
                 info!("TSC loaded from uplink");