From 30a8ec8fbddd250db3d0634443f2266720dab772 Mon Sep 17 00:00:00 2001 From: morgan Date: Mon, 4 Sep 2023 09:52:46 +0800 Subject: [PATCH] - ioexpander.rs: use hw_rev to store SFP0LED pin - ioexpander.rs: now initialize the expander port direction - main.rs: remove set_oe for io_expander - kasli_sco.py: add hw_rev for rustc-cfg file --- src/gateware/kasli_soc.py | 6 ++++++ src/libboard_artiq/src/io_expander.rs | 23 +++++++++++++++++++++-- src/runtime/src/main.rs | 4 ---- src/satman/src/main.rs | 4 ---- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/gateware/kasli_soc.py b/src/gateware/kasli_soc.py index 21b8ca7..f7addcd 100755 --- a/src/gateware/kasli_soc.py +++ b/src/gateware/kasli_soc.py @@ -123,6 +123,8 @@ 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") @@ -209,6 +211,8 @@ 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") @@ -334,6 +338,8 @@ 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") diff --git a/src/libboard_artiq/src/io_expander.rs b/src/libboard_artiq/src/io_expander.rs index e9dfd14..328081c 100644 --- a/src/libboard_artiq/src/io_expander.rs +++ b/src/libboard_artiq/src/io_expander.rs @@ -10,6 +10,25 @@ 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, iodir: [u8; 2], @@ -25,7 +44,7 @@ impl IoExpander { let mut io_expander = match index { 0 => IoExpander { address: 0x40, - iodir: [0xff; 2], + iodir: IODIR0, out_current: [0; 2], out_target: [0; 2], registers: Registers { @@ -37,7 +56,7 @@ impl IoExpander { }, 1 => IoExpander { address: 0x42, - iodir: [0xff; 2], + iodir: IODIR1, out_current: [0; 2], out_target: [0; 2], registers: Registers { diff --git a/src/runtime/src/main.rs b/src/runtime/src/main.rs index a54321d..a2591cb 100644 --- a/src/runtime/src/main.rs +++ b/src/runtime/src/main.rs @@ -129,10 +129,6 @@ pub fn main_core0() { .init(i2c_bus) .expect("I2C I/O expander #1 initialization failed"); // 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); diff --git a/src/satman/src/main.rs b/src/satman/src/main.rs index 206e19e..ab207e0 100644 --- a/src/satman/src/main.rs +++ b/src/satman/src/main.rs @@ -484,10 +484,6 @@ pub extern fn main_core0() -> i32 { .init(&mut i2c) .expect("I2C I/O expander #1 initialization failed"); // 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);