net_settings: fix typo in fn name (get_addresses)

net_settings: read mac from eeprom for kasli-soc
2022-03-07 15:29:37 +08:00 · 2022-03-07 15:28:22 +08:00
16 changed files with 96 additions and 208 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -8,9 +8,9 @@ checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"

 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "byteorder"
@ -20,9 +20,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"

 [[package]]
 name = "cfg-if"
@ -47,9 +47,9 @@ dependencies = [

 [[package]]
 name = "embedded-hal"
-version = "0.2.7"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff"
+checksum = "e36cfb62ff156596c892272f3015ef952fe1525e85261fa3a7f327bd6b384ab9"
 dependencies = [
 "nb 0.1.3",
 "void",
@ -250,9 +250,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"

 [[package]]
 name = "volatile-register"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6"
+checksum = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"
 dependencies = [
 "vcell",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -14,7 +14,7 @@ members = [
 panic = "abort"
 debug = true
 codegen-units = 1
-opt-level = 's'
+opt-level = 'z'
 lto = true
 debug-assertions = false
 overflow-checks = false
--- a/flake.lock
+++ b/flake.lock
@ -3,11 +3,11 @@
    "mozilla-overlay": {
      "flake": false,
      "locked": {
-        "lastModified": 1645464064,
-        "narHash": "sha256-YeN4bpPvHkVOpQzb8APTAfE7/R+MFMwJUMkqmfvytSk=",
+        "lastModified": 1638887313,
+        "narHash": "sha256-FMYV6rVtvSIfthgC1sK1xugh3y7muoQcvduMdriz4ag=",
        "owner": "mozilla",
        "repo": "nixpkgs-mozilla",
-        "rev": "15b7a05f20aab51c4ffbefddb1b448e862dccb7d",
+        "rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f",
        "type": "github"
      },
      "original": {
@ -18,11 +18,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1646588256,
-        "narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=",
+        "lastModified": 1642961095,
+        "narHash": "sha256-RLatktZmvwFBOyqdoIk4qdS4OGKB7aKIvvs4ZP2L8D8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04",
+        "rev": "604c44137d97b5111be1ca5c0d97f6e24fbc5c2c",
        "type": "github"
      },
      "original": {
--- a/libboard_zynq/src/eth/mod.rs
+++ b/libboard_zynq/src/eth/mod.rs
@ -310,8 +310,6 @@ impl<GEM: Gem> Eth<GEM, (), ()> {
        let phy = Phy::find(&mut inner).expect("phy");
        phy.reset(&mut inner);
        phy.restart_autoneg(&mut inner);
-        #[cfg(feature="target_kasli_soc")]
-        phy.set_leds(&mut inner);

        Eth {
            rx: (),
--- a/libboard_zynq/src/eth/phy/control.rs
+++ b/libboard_zynq/src/eth/phy/control.rs
@ -82,10 +82,6 @@ impl PhyRegister for Control {
    fn addr() -> u8 {
        0
    }
-    
-    fn page() -> u8 {
-        0
-    }
 }

 impl From<u16> for Control {
--- a/libboard_zynq/src/eth/phy/id.rs
+++ b/libboard_zynq/src/eth/phy/id.rs
@ -11,9 +11,6 @@ pub struct PhyIdentifier {
 }

 pub fn identify_phy<PA: PhyAccess>(pa: &mut PA, addr: u8) -> Option<PhyIdentifier> {
-    #[cfg(feature = "target_kasli_soc")]
-    pa.write_phy(addr, 0x16, 0); //reset page
-    
    let id1 = pa.read_phy(addr, 2);
    let id2 = pa.read_phy(addr, 3);
    if id1 != 0xFFFF || id2 != 0xFFFF {
--- a/libboard_zynq/src/eth/phy/leds.rs
+++ b/libboard_zynq/src/eth/phy/leds.rs
@ -1,79 +0,0 @@
-use bit_field::BitField;
-use super::{PhyRegister, Led0Control, Led1Control};
-
-#[derive(Clone, Copy, Debug)]
-/// LED Control Register
-pub struct Leds(pub u16);
-
-impl Leds {
-    pub fn led0(&self) -> Led0Control {
-        match self.0.get_bits(0..=3) {
-            0b0000 => Led0Control::OnLinkOffNoLink,
-            0b0001 => Led0Control::OnLinkBlinkActivityOffNoLink,
-            0b0010 => Led0Control::BlinkDependingOnLink,
-            0b0011 => Led0Control::OnActivityOffNoActivity,
-            0b0100 => Led0Control::BlinkActivityOffNoActivity,
-            0b0101 => Led0Control::OnTransmitOffNoTransmit,
-            0b0110 => Led0Control::OnCopperLinkOffElse,
-            0b0111 => Led0Control::On1000LinkOffElse,
-            0b1000 => Led0Control::ForceOff,
-            0b1001 => Led0Control::ForceOn,
-            0b1010 => Led0Control::ForceHiZ,
-            0b1011 => Led0Control::ForceBlink,
-            0b1100 => Led0Control::Mode1,
-            0b1101 => Led0Control::Mode2,
-            0b1110 => Led0Control::Mode3,
-            0b1111 => Led0Control::Mode4,
-            _ => unreachable!()
-        }
-    }
-    pub fn led1(&self) -> Led1Control {
-        match self.0.get_bits(4..=7) {
-            0b0000 => Led1Control::OnReceiveOffNoReceive,
-            0b0001 => Led1Control::OnLinkBlinkActivityOffNoLink,
-            0b0010 => Led1Control::OnLinkBlinkReceiveOffNoLink,
-            0b0011 => Led1Control::OnActivityOffNoActivity,
-            0b0100 => Led1Control::BlinkActivityOffNoActivity,
-            0b0101 => Led1Control::On100OrFiberOffElse,
-            0b0110 => Led1Control::On1001000LinkOffElse,
-            0b0111 => Led1Control::On100LinkOffElse,
-            0b1000 => Led1Control::ForceOff,
-            0b1001 => Led1Control::ForceOn,
-            0b1010 => Led1Control::ForceHiZ,
-            0b1011 => Led1Control::ForceBlink,
-            _ => unreachable!()
-        }
-    }
-
-    pub fn set_led0(mut self, setting: Led0Control) -> Self {
-        self.0.set_bits(0..=3, setting as u16);
-        self
-    }
-
-    pub fn set_led1(mut self, setting: Led1Control) -> Self {
-        self.0.set_bits(4..=7, setting as u16);
-        self
-    }
-}
-
-impl PhyRegister for Leds {
-    fn addr() -> u8 {
-        0x10
-    }
-        
-    fn page() -> u8 {
-        3
-    }
-}
-
-impl From<u16> for Leds {
-    fn from(value: u16) -> Self {
-        Leds(value)
-    }
-}
-
-impl Into<u16> for Leds {
-    fn into(self) -> u16 {
-        self.0
-    }
-}
--- a/libboard_zynq/src/eth/phy/mod.rs
+++ b/libboard_zynq/src/eth/phy/mod.rs
@ -6,8 +6,6 @@ mod control;
 pub use control::Control;
 mod pssr;
 pub use pssr::PSSR;
-mod leds;
-pub use leds::Leds;

 #[derive(Copy, Clone, Debug, PartialEq)]
 pub struct Link {
@ -28,42 +26,6 @@ pub enum LinkDuplex {
    Full,
 }

-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum Led0Control {
-    OnLinkOffNoLink = 0b0000,
-    OnLinkBlinkActivityOffNoLink = 0b0001,
-    BlinkDependingOnLink = 0b0010,
-    OnActivityOffNoActivity = 0b0011,
-    BlinkActivityOffNoActivity = 0b0100,
-    OnTransmitOffNoTransmit = 0b0101,
-    OnCopperLinkOffElse = 0b0110,
-    On1000LinkOffElse = 0b0111,
-    ForceOff = 0b1000,
-    ForceOn = 0b1001,
-    ForceHiZ = 0b1010,
-    ForceBlink = 0b1011,
-    Mode1 = 0b1100,
-    Mode2 = 0b1101,
-    Mode3 = 0b1110,
-    Mode4 = 0b1111
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-pub enum Led1Control {
-    OnReceiveOffNoReceive = 0b0000,
-    OnLinkBlinkActivityOffNoLink = 0b0001,
-    OnLinkBlinkReceiveOffNoLink = 0b0010,
-    OnActivityOffNoActivity = 0b0011,
-    BlinkActivityOffNoActivity = 0b0100,
-    On100OrFiberOffElse = 0b0101,
-    On1001000LinkOffElse = 0b0110,
-    On100LinkOffElse = 0b0111,
-    ForceOff = 0b1000,
-    ForceOn = 0b1001,
-    ForceHiZ = 0b1010,
-    ForceBlink = 0b1011,
-}
-
 pub trait PhyAccess {
    fn read_phy(&mut self, addr: u8, reg: u8) -> u16;
    fn write_phy(&mut self, addr: u8, reg: u8, data: u16);
@ -71,7 +33,6 @@ pub trait PhyAccess {

 pub trait PhyRegister {
    fn addr() -> u8;
-    fn page() -> u8;
 }


@ -84,10 +45,6 @@ const OUI_MARVELL: u32 = 0x005043;
 const OUI_REALTEK: u32 = 0x000732;
 const OUI_LANTIQ : u32 = 0x355969;

-//only change pages on Kasli-SoC's Marvel 88E11xx
-#[cfg(feature="target_kasli_soc")]
-const PAGE_REGISTER: u8 = 0x16;
-
 impl Phy {
    /// Probe all addresses on MDIO for a known PHY
    pub fn find<PA: PhyAccess>(pa: &mut PA) -> Option<Phy> {
@ -127,9 +84,6 @@ impl Phy {
        PA: PhyAccess,
        PR: PhyRegister + From<u16>,
    {
-        #[cfg(feature="target_kasli_soc")]
-        pa.write_phy(self.addr, PAGE_REGISTER, PR::page().into());
-
        pa.read_phy(self.addr, PR::addr()).into()
    }

@ -139,9 +93,6 @@ impl Phy {
        PR: PhyRegister + From<u16> + Into<u16>,
        F: FnMut(PR) -> PR,
    {
-        #[cfg(feature="target_kasli_soc")]
-        pa.write_phy(self.addr, PAGE_REGISTER, PR::page().into());
-        
        let reg = pa.read_phy(self.addr, PR::addr()).into();
        let reg = f(reg);
        pa.write_phy(self.addr, PR::addr(), reg.into())
@ -155,14 +106,6 @@ impl Phy {
        self.modify_reg(pa, f)
    }

-    pub fn modify_leds<PA, F>(&self, pa: &mut PA, f: F)
-    where
-        PA: PhyAccess,
-        F: FnMut(Leds) -> Leds,
-    {
-        self.modify_reg(pa, f)   
-    }
-
    pub fn get_control<PA: PhyAccess>(&self, pa: &mut PA) -> Control {
        self.read_reg(pa)
    }
@ -196,12 +139,4 @@ impl Phy {
                .set_restart_autoneg(true)
        );
    }
-
-    #[cfg(feature="target_kasli_soc")]
-    pub fn set_leds<PA: PhyAccess>(&self, pa: &mut PA) {
-        self.modify_leds(pa, |leds|
-            leds.set_led0(Led0Control::OnCopperLinkOffElse)
-                .set_led1(Led1Control::BlinkActivityOffNoActivity)
-        );
-    }
 }
--- a/libboard_zynq/src/eth/phy/pssr.rs
+++ b/libboard_zynq/src/eth/phy/pssr.rs
@ -43,10 +43,6 @@ impl PhyRegister for PSSR {
    fn addr() -> u8 {
        0x11
    }
-        
-    fn page() -> u8 {
-        0
-    }
 }

 impl From<u16> for PSSR {
--- a/libboard_zynq/src/eth/phy/status.rs
+++ b/libboard_zynq/src/eth/phy/status.rs
@ -100,10 +100,6 @@ impl PhyRegister for Status {
    fn addr() -> u8 {
        1
    }
-        
-    fn page() -> u8 {
-        0
-    }
 }

 impl From<u16> for Status {
--- a/openocd/common.cfg
+++ b/openocd/common.cfg
@ -1,20 +0,0 @@
-set XC7_JSHUTDOWN 0x0d
-set XC7_JPROGRAM 0x0b
-set XC7_JSTART 0x0c
-set XC7_BYPASS 0x3f
-
-proc xc7_program {tap} {
-    global XC7_JSHUTDOWN XC7_JPROGRAM XC7_JSTART XC7_BYPASS
-    irscan $tap $XC7_JSHUTDOWN
-    irscan $tap $XC7_JPROGRAM
-    runtest 60000
-    #JSTART prevents this from working...
-    #irscan $tap $XC7_JSTART
-    runtest 2000
-    irscan $tap $XC7_BYPASS
-    runtest 2000
-}
-
-pld device virtex2 zynq.tap 1
-init
-xc7_program zynq.tap
--- a/openocd/cora-z7-10.cfg
+++ b/openocd/cora-z7-10.cfg
@ -8,7 +8,26 @@ source ./zynq-7000.cfg

 reset_config srst_only srst_push_pull

-source ./common.cfg
+set XC7_JSHUTDOWN 0x0d
+set XC7_JPROGRAM 0x0b
+set XC7_JSTART 0x0c
+set XC7_BYPASS 0x3f
+
+proc xc7_program {tap} {
+    global XC7_JSHUTDOWN XC7_JPROGRAM XC7_JSTART XC7_BYPASS
+    irscan $tap $XC7_JSHUTDOWN
+    irscan $tap $XC7_JPROGRAM
+    runtest 60000
+    #JSTART prevents this from working...
+    #irscan $tap $XC7_JSTART
+    runtest 2000
+    irscan $tap $XC7_BYPASS
+    runtest 2000
+}
+
+pld device virtex2 zynq.tap 1
+init
+xc7_program zynq.tap

 reset halt

--- a/openocd/kasli_soc.cfg
+++ b/openocd/kasli_soc.cfg
@ -17,7 +17,26 @@ reset_config srst_only srst_open_drain
 adapter srst pulse_width 250
 adapter srst delay 400

-source ./common.cfg
+set XC7_JSHUTDOWN 0x0d
+set XC7_JPROGRAM 0x0b
+set XC7_JSTART 0x0c
+set XC7_BYPASS 0x3f
+
+proc xc7_program {tap} {
+    global XC7_JSHUTDOWN XC7_JPROGRAM XC7_JSTART XC7_BYPASS
+    irscan $tap $XC7_JSHUTDOWN
+    irscan $tap $XC7_JPROGRAM
+    runtest 60000
+    #JSTART prevents this from working...
+    #irscan $tap $XC7_JSTART
+    runtest 2000
+    irscan $tap $XC7_BYPASS
+    runtest 2000
+}
+
+pld device virtex2 zynq.tap 1
+init
+xc7_program zynq.tap

 reset halt

--- a/openocd/redpitaya.cfg
+++ b/openocd/redpitaya.cfg
@ -8,7 +8,26 @@ source ./zynq-7000.cfg

 reset_config none

-source ./common.cfg
+set XC7_JSHUTDOWN 0x0d
+set XC7_JPROGRAM 0x0b
+set XC7_JSTART 0x0c
+set XC7_BYPASS 0x3f
+
+proc xc7_program {tap} {
+    global XC7_JSHUTDOWN XC7_JPROGRAM XC7_JSTART XC7_BYPASS
+    irscan $tap $XC7_JSHUTDOWN
+    irscan $tap $XC7_JPROGRAM
+    runtest 60000
+    #JSTART prevents this from working...
+    #irscan $tap $XC7_JSTART
+    runtest 2000
+    irscan $tap $XC7_BYPASS
+    runtest 2000
+}
+
+pld device virtex2 zynq.tap 1
+init
+xc7_program zynq.tap

 halt

--- a/openocd/zc706.cfg
+++ b/openocd/zc706.cfg
@ -10,7 +10,26 @@ reset_config srst_only srst_open_drain
 adapter srst pulse_width 250
 adapter srst delay 400

-source ./common.cfg
+set XC7_JSHUTDOWN 0x0d
+set XC7_JPROGRAM 0x0b
+set XC7_JSTART 0x0c
+set XC7_BYPASS 0x3f
+
+proc xc7_program {tap} {
+    global XC7_JSHUTDOWN XC7_JPROGRAM XC7_JSTART XC7_BYPASS
+    irscan $tap $XC7_JSHUTDOWN
+    irscan $tap $XC7_JPROGRAM
+    runtest 60000
+    #JSTART prevents this from working...
+    #irscan $tap $XC7_JSTART
+    runtest 2000
+    irscan $tap $XC7_BYPASS
+    runtest 2000
+}
+
+pld device virtex2 zynq.tap 1
+init
+xc7_program zynq.tap

 reset halt

--- a/szl/src/main.rs
+++ b/szl/src/main.rs
@ -136,14 +136,7 @@ pub fn main_core0() {
                }
            }
            v => {
-                log::error!("Boot mode {:?} not supported", v);
-                log::info!("Fall back on netboot");
-                netboot::netboot(
-                    &mut bootgen_file,
-                    config,
-                    &mut __runtime_start as *mut usize as *mut u8,
-                    max_len,
-                )
+                panic!("Boot mode {:?} not supported", v);
            }
        };
    }
Author	SHA1	Message	Date
mwojcik	ce6589c017	net_settings: fix typo in fn name (get_addresses)	2022-03-07 15:29:37 +08:00
mwojcik	84bbf00128	net_settings: read mac from eeprom for kasli-soc	2022-03-07 15:28:22 +08:00