e1000e: i219 - fix to enable both ULP and EEE in Sx state

e1000e: i219 - fix to enable both ULP and EEE in Sx state

Orabug: 21792108

In i219, there is a hardware bug that prevented ULP entry.
A side effect of the original software fix for this was that EEE in
Sx couldn't be enabled.
This patch implements a modified flow that allows both ULP and EEE in Sx.

Signed-off-by: Yanir Lubetkin <yanirx.lubetkin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 6607c99e7034e7565a1559a24dd35083d6719788)
Signed-off-by: Brian Maly <brian.maly@oracle.com>