solo5: Move softreset to platforms, fix some solo5net issues

Author: fwsGonzo

src/CMakeLists.txt

@@ -39,7 +39,7 @@ set(OS_OBJECTS
   kernel/elf.cpp kernel/terminal.cpp kernel/terminal_disk.cpp
   kernel/vga.cpp kernel/context.cpp kernel/context_asm.asm
   kernel/fiber.cpp kernel/tls.cpp
-  kernel/profile.cpp kernel/softreset.cpp
+  kernel/profile.cpp
   kernel/timers.cpp kernel/rtc.cpp kernel/rng.cpp kernel/rdrand.cpp
   kernel/solo5_manager.cpp
   util/memstream.c util/async.cpp util/statman.cpp util/logger.cpp util/sha1.cpp

src/drivers/solo5net.cpp

@@ -28,14 +28,14 @@
 extern "C" {
 #include <solo5.h>
 }
-
+static const uint32_t NUM_BUFFERS = 1024;
 using namespace net;
 
 const char* Solo5Net::driver_name() const { return "Solo5Net"; }
 
 Solo5Net::Solo5Net()
   : Link(Link_protocol{{this, &Solo5Net::transmit}, mac()},
-         2048u, sizeof(net::Packet) + MTU()),
+         NUM_BUFFERS, 2048u), // don't change this
     packets_rx_{Statman::get().create(Stat::UINT64, device_name() + ".packets_rx").get_uint64()},
     packets_tx_{Statman::get().create(Stat::UINT64, device_name() + ".packets_tx").get_uint64()}
 {
@@ -70,32 +70,29 @@ void Solo5Net::transmit(net::Packet_ptr pckt)
   }
 }
 
-std::unique_ptr<Packet>
-Solo5Net::create_packet(int link_offset)
+net::Packet_ptr Solo5Net::create_packet(int link_offset)
 {
   auto buffer = bufstore().get_buffer();
   auto* pckt = (net::Packet*) buffer.addr;
 
   new (pckt) net::Packet(link_offset, 0, packet_len(), buffer.bufstore);
   return net::Packet_ptr(pckt);
 }
-
-std::unique_ptr<Packet>
-Solo5Net::recv_packet()
+net::Packet_ptr Solo5Net::recv_packet()
 {
   auto buffer = bufstore().get_buffer();
   auto* pckt = (net::Packet*) buffer.addr;
-  new (pckt) net::Packet(0, MTU(), packet_len(), &bufstore());
-  uint8_t *buf = pckt->buf();
+  new (pckt) net::Packet(0, MTU(), packet_len(), buffer.bufstore);
   // Populate the packet buffer with new packet, if any
   int size = MTU();
-  if (solo5_net_read_sync(buf, &size) == 0) {
+  if (solo5_net_read_sync(pckt->buf(), &size) == 0) {
     // Adjust packet size to match received data
     if (size) {
       pckt->set_data_end(size);
       return net::Packet_ptr(pckt);
     }
   }
+  bufstore().release(buffer.addr);
   return nullptr;
 }
 

src/kernel/profile.cpp

@@ -17,7 +17,7 @@
 
 #include <profile>
 #include <common>
-#include "../platform/x86_pc/pit.hpp"
+//#include "../platform/x86_pc/pit.hpp"
 #include <kernel/cpuid.hpp>
 #include <kernel/elf.hpp>
 #include <kernel/irq_manager.hpp>
@@ -62,7 +62,7 @@ struct Sampler
 
   void begin() {
     // gather samples repeatedly over single period
-    x86::PIT::forever(gather_stack_sampling);
+    //x86::PIT::forever(gather_stack_sampling);
   }
   void add(void* current, void* ra)
   {

src/platform/x86_nano/CMakeLists.txt

@@ -10,7 +10,7 @@ set(PLATFORM_OBJECTS
   ../x86_pc/serial1.cpp
   ../x86_pc/os.cpp
   ../x86_pc/block.cpp
-  ../../kernel/softreset.cpp
+  ../x86_pc/softreset.cpp
   platform.cpp
   kernel_start.cpp
   )

src/platform/x86_pc/CMakeLists.txt

@@ -15,6 +15,7 @@ set(X86_PC_OBJECTS
   cpu_freq_sampling.cpp
   serial1.cpp
   pic.cpp
+  softreset.cpp
   )
 
 add_custom_command(

src/kernel/softreset.cpp src/platform/x86_pc/softreset.cppsrc/kernel/softreset.cpp renamed to src/platform/x86_pc/softreset.cpp

@@ -306,3 +306,6 @@ void OS::block(){
   // Decrement level
   *blocking_level -= 1;
 }
+
+extern "C"
+void __os_store_soft_reset(void*, size_t) {}