Skip to content

Commit cad014b

Browse files
Sasha Neftinanguy11
authored andcommitted
e1000e: Handshake with CSME starts from ADL platforms
Handshake with CSME/AMT on none provisioned platforms during S0ix flow is not supported on TGL platform and can cause to HW unit hang. Update the handshake with CSME flow to start from the ADL platform. Fixes: 3e55d23 ("e1000e: Add handshake with the CSME to support S0ix") Signed-off-by: Sasha Neftin <[email protected]> Tested-by: Nechama Kraus <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 68defd5 commit cad014b

File tree

1 file changed

+4
-2
lines changed
  • drivers/net/ethernet/intel/e1000e

1 file changed

+4
-2
lines changed

drivers/net/ethernet/intel/e1000e/netdev.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6342,7 +6342,8 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter)
63426342
u32 mac_data;
63436343
u16 phy_data;
63446344

6345-
if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {
6345+
if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
6346+
hw->mac.type >= e1000_pch_adp) {
63466347
/* Request ME configure the device for S0ix */
63476348
mac_data = er32(H2ME);
63486349
mac_data |= E1000_H2ME_START_DPG;
@@ -6491,7 +6492,8 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter)
64916492
u16 phy_data;
64926493
u32 i = 0;
64936494

6494-
if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {
6495+
if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
6496+
hw->mac.type >= e1000_pch_adp) {
64956497
/* Request ME unconfigure the device from S0ix */
64966498
mac_data = er32(H2ME);
64976499
mac_data &= ~E1000_H2ME_START_DPG;

0 commit comments

Comments
 (0)