Impl reset via ACPI

Author: hikalium

src/acpi.h

@@ -293,6 +293,7 @@ packed_struct GAS {
   uint8_t reserved;
   void* address;
 };
+static_assert(sizeof(GAS) == 12);
 
 packed_struct HPET {
   char signature[4];
@@ -357,6 +358,13 @@ packed_struct FADT {
   uint32_t smi_cmd;
   uint8_t acpi_enable;
   uint8_t acpi_disable;
+
+  uint16_t GetResetReg() {
+    return reinterpret_cast<uint64_t>(reinterpret_cast<GAS *>(reinterpret_cast<uint64_t>(this) + 116)->address);
+  }
+  uint8_t GetResetValue() {
+    return reinterpret_cast<uint8_t *>(this)[128];
+  }
 };
 static_assert(sizeof(FADT) == 54);
 

src/command.cc

@@ -320,6 +320,20 @@ void ShowFADT() {
   PutStringAndHex("smi_cmd", fadt.smi_cmd);
   PutStringAndHex("acpi_enable", fadt.acpi_enable);
   PutStringAndHex("acpi_disable", fadt.acpi_disable);
+  PutStringAndHex("reset_register", fadt.GetResetReg());
+  PutStringAndHex("reset_value", fadt.GetResetValue());
+}
+
+void Reset() {
+  using namespace ACPI;
+  if (!liumos->acpi.fadt) {
+    PutString("FADT not found.\n");
+    return;
+  }
+  FADT& fadt = *liumos->acpi.fadt;
+  WriteIOPort8(fadt.GetResetReg(), fadt.GetResetValue());
+  for (;;) {
+  }
 }
 
 void ShowEFIMemoryMap() {
@@ -577,6 +591,8 @@ void Run(TextBox& tbox) {
   const char* line = tbox.GetRecordedString();
   if (IsEqualString(line, "hello")) {
     PutString("Hello, world!\n");
+  } else if (IsEqualString(line, "reset")) {
+    Reset();
   } else if (IsEqualString(line, "show xsdt")) {
     ShowXSDT();
   } else if (IsEqualString(line, "show nfit")) {

src/xhci.cc

@@ -245,9 +245,20 @@ void Controller::Init() {
   NotifyHostControllerDoorbell();
 
   // 4.3.1 Resetting a Root Hub Port
+  /*
   for (int slot = 1; slot <= num_of_slots_enabled_; slot++) {
     ResetPort(slot);
   }
+  */
+  for (int port = 1; port <= max_ports_; port++) {
+    uint32_t portsc = ReadPORTSC(port);
+    if(!portsc) continue;
+    PutStringAndHex("port", port);
+    PutStringAndHex("  PORTSC", portsc);
+    if(portsc & 1 && port_state_[port] == kDisconnected) {
+      port_state_[port] = kNeedsPortReset;
+    }
+  }
 }
 
 void Controller::ResetPort(int port) {
@@ -318,6 +329,10 @@ class Controller::DeviceContext {
     endpoint_ctx[kDCISlotContext][0] =
         CombineFieldBits<31, 27>(endpoint_ctx[kDCISlotContext][0], num_of_ent);
   }
+  void SetPortSpeed(uint32_t port_speed) {
+    endpoint_ctx[kDCISlotContext][0] = CombineFieldBits<23, 20>(
+        endpoint_ctx[kDCISlotContext][0], port_speed);
+  }
   void SetRootHubPortNumber(uint32_t root_port_num) {
     endpoint_ctx[kDCISlotContext][1] = CombineFieldBits<23, 16>(
         endpoint_ctx[kDCISlotContext][1], root_port_num);
@@ -415,6 +430,7 @@ class Controller::InputContext {
 };
 static_assert(sizeof(Controller::InputContext) == 0x420);
 
+constexpr uint32_t kPortSpeedFS = 1;
 constexpr uint32_t kPortSpeedLS = 2;
 constexpr uint32_t kPortSpeedHS = 3;
 constexpr uint32_t kPortSpeedSS = 4;
@@ -426,7 +442,7 @@ static uint16_t GetMaxPacketSizeFromPORTSCPortSpeed(uint32_t port_speed) {
   //    • Max Packet Size = The default maximum packet size for the Default
   //    Control Endpoint, as function of the PORTSC Port Speed field.
   // 7.2.2.1.1 Default USB Speed ID Mapping
-  if (port_speed == kPortSpeedLS)
+  if (port_speed == kPortSpeedLS || port_speed || kPortSpeedFS)
     return 8;
   if (port_speed == kPortSpeedHS)
     return 64;
@@ -436,13 +452,16 @@ static uint16_t GetMaxPacketSizeFromPORTSCPortSpeed(uint32_t port_speed) {
 }
 
 static const char* GetSpeedNameFromPORTSCPortSpeed(uint32_t port_speed) {
+  if (port_speed == kPortSpeedFS)
+    return "Full-speed";
   if (port_speed == kPortSpeedLS)
     return "Low-speed";
   if (port_speed == kPortSpeedHS)
     return "High-speed";
   if (port_speed == kPortSpeedSS)
     return "SuperSpeed Gen1 x1";
   PutString("GetSpeedNameFromPORTSCPortSpeed: Not supported speed\n");
+  PutStringAndHex("  port_speed", port_speed);
   return nullptr;
 }
 
@@ -474,6 +493,7 @@ void Controller::HandleEnableSlotCompleted(int slot, int port) {
   // 5. Initialize the Input default control Endpoint 0 Context (6.2.3)
   uint32_t portsc = ReadPORTSC(port);
   uint32_t port_speed = GetBits<13, 10, uint32_t, uint32_t>(portsc);
+  dctx.SetPortSpeed(port_speed);
   PutString("  Port Speed: ");
   const char* speed_str = GetSpeedNameFromPORTSCPortSpeed(port_speed);
   if (!speed_str) {
@@ -945,6 +965,13 @@ void Controller::CheckPortAndInitiateProcess() {
       return;
     }
   }
+  for (int i = 0; i < kMaxNumOfPorts; i++) {
+    if (port_state_[i] == kNeedsPortReset) {
+      ResetPort(i);
+      port_state_[i] = kNeedsInitializing;
+      return;
+    }
+  }
 }
 
 void Controller::PollEvents() {
@@ -1005,11 +1032,13 @@ void Controller::PollEvents() {
         }
         break;
       case kTRBTypePortStatusChangeEvent:
+        /*
         if (e.IsCompletedWithSuccess()) {
           HandlePortStatusChange(
               static_cast<int>(GetBits<31, 24, uint64_t>(e.data)));
           break;
         }
+        */
         PutString("PortStatusChangeEvent\n");
         e.PrintCompletionCode();
         break;

src/xhci.h

@@ -222,6 +222,7 @@ class Controller {
   RingBuffer<uint16_t, 16> keyid_buffer_;
   enum PortState {
     kDisconnected,
+    kNeedsPortReset,
     kNeedsInitializing,
     kInitializing,
     kInitialized,