Repair and secure erasure of non-mechanical storage devices may be performed. In at least some embodiments, a non-mechanical storage device may be detected and device information may be obtained for the non-mechanical storage device. Based, at least in part, on the device information, it may be determined whether the non-mechanical storage device is eligible for secure erasure. For an eligible device, a secure erase procedure may be initiated and success or failure of the secure erasure procedure may be reported. In at least some embodiments, firmware bugs may be detected and repaired when performing the secure erasure procedure.