Six-step operation of interior permanent magnet synchronous machines (IPMSMs) has many advantages such as the full utilization of the DC-link voltage and the minimization of the switching losses. Deadbeat Flux Control (DBFC) is a control strategy designed to achieve overmodulation and six-step operation with competent dynamic performance. This paper presents an upgraded implementation of the DBFC controller. One unique control law can operate in the entire torque-speed plane with a simple methodology for continuous and smooth transition between the four different operating regions (i.e., linear, overmodulation I, overmodulation II, and six-step), and under voltage and current limitations. Combining multiple controllers and switching between different control laws is completely avoided. This paper presents an approach for closed-loop torque regulation that has high dynamic performance, high accuracy, and is robust against parameter variations. The proposed controller is evaluated in simulation and experimentally. It is implemented on an automotive microcontroller for a 300 kW IPMSM traction drive.