From: Mario Limonciello <mario.limonciello@dell.com> To: Jeff Kirsher <jeffrey.t.kirsher@intel.com>, Tony Nguyen <anthony.l.nguyen@intel.com>, intel-wired-lan@lists.osuosl.org, David Miller <davem@davemloft.net> Cc: linux-kernel@vger.kernel.org, Netdev <netdev@vger.kernel.org>, Alexander Duyck <alexander.duyck@gmail.com>, Jakub Kicinski <kuba@kernel.org>, Sasha Netfin <sasha.neftin@intel.com>, Aaron Brown <aaron.f.brown@intel.com>, Stefan Assmann <sassmann@redhat.com>, darcari@redhat.com, Yijun.Shen@dell.com, Perry.Yuan@dell.com, anthony.wong@canonical.com, Vitaly Lifshits <vitaly.lifshits@intel.com>, Alexander Duyck <alexanderduyck@fb.com>, Mario Limonciello <mario.limonciello@dell.com> Subject: [PATCH RESEND] e1000e: fix S0ix flow to allow S0i3.2 subset entry Date: Tue, 8 Dec 2020 12:56:32 -0600 [thread overview] Message-ID: <20201208185632.151052-1-mario.limonciello@dell.com> (raw) From: Vitaly Lifshits <vitaly.lifshits@intel.com> Changed a configuration in the flows to align with architecture requirements to achieve S0i3.2 substate. This helps both i219V and i219LM configurations. Also fixed a typo in the previous commit 632fbd5eb5b0 ("e1000e: fix S0ix flows for cable connected case"). Fixes: 632fbd5eb5b0 ("e1000e: fix S0ix flows for cable connected case"). Signed-off-by: Vitaly Lifshits <vitaly.lifshits@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Reviewed-by: Alexander Duyck <alexanderduyck@fb.com> Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> --- This patch was originally part of https://marc.info/?l=linux-netdev&m=160677194809564&w=2 which requested fixes. It was then resubmitted as part of: https://patchwork.ozlabs.org/project/netdev/list/?series=218712 However there is discussion on the other patches of the series. As it fixes existing hardware that is not blocked by ME check (i219V) resubmit it separately to at least fix that hardware. drivers/net/ethernet/intel/e1000e/netdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 3ecd05b28fe6..6588f5d4a2be 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6475,13 +6475,13 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter) /* Ungate PGCB clock */ mac_data = er32(FEXTNVM9); - mac_data |= BIT(28); + mac_data &= ~BIT(28); ew32(FEXTNVM9, mac_data); /* Enable K1 off to enable mPHY Power Gating */ mac_data = er32(FEXTNVM6); mac_data |= BIT(31); - ew32(FEXTNVM12, mac_data); + ew32(FEXTNVM6, mac_data); /* Enable mPHY power gating for any link and speed */ mac_data = er32(FEXTNVM8); @@ -6525,11 +6525,11 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter) /* Disable K1 off */ mac_data = er32(FEXTNVM6); mac_data &= ~BIT(31); - ew32(FEXTNVM12, mac_data); + ew32(FEXTNVM6, mac_data); /* Disable Ungate PGCB clock */ mac_data = er32(FEXTNVM9); - mac_data &= ~BIT(28); + mac_data |= BIT(28); ew32(FEXTNVM9, mac_data); /* Cancel not waking from dynamic -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Mario Limonciello <mario.limonciello@dell.com> To: intel-wired-lan@osuosl.org Subject: [Intel-wired-lan] [PATCH RESEND] e1000e: fix S0ix flow to allow S0i3.2 subset entry Date: Tue, 8 Dec 2020 12:56:32 -0600 [thread overview] Message-ID: <20201208185632.151052-1-mario.limonciello@dell.com> (raw) From: Vitaly Lifshits <vitaly.lifshits@intel.com> Changed a configuration in the flows to align with architecture requirements to achieve S0i3.2 substate. This helps both i219V and i219LM configurations. Also fixed a typo in the previous commit 632fbd5eb5b0 ("e1000e: fix S0ix flows for cable connected case"). Fixes: 632fbd5eb5b0 ("e1000e: fix S0ix flows for cable connected case"). Signed-off-by: Vitaly Lifshits <vitaly.lifshits@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Reviewed-by: Alexander Duyck <alexanderduyck@fb.com> Signed-off-by: Mario Limonciello <mario.limonciello@dell.com> --- This patch was originally part of https://marc.info/?l=linux-netdev&m=160677194809564&w=2 which requested fixes. It was then resubmitted as part of: https://patchwork.ozlabs.org/project/netdev/list/?series=218712 However there is discussion on the other patches of the series. As it fixes existing hardware that is not blocked by ME check (i219V) resubmit it separately to at least fix that hardware. drivers/net/ethernet/intel/e1000e/netdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 3ecd05b28fe6..6588f5d4a2be 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6475,13 +6475,13 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter) /* Ungate PGCB clock */ mac_data = er32(FEXTNVM9); - mac_data |= BIT(28); + mac_data &= ~BIT(28); ew32(FEXTNVM9, mac_data); /* Enable K1 off to enable mPHY Power Gating */ mac_data = er32(FEXTNVM6); mac_data |= BIT(31); - ew32(FEXTNVM12, mac_data); + ew32(FEXTNVM6, mac_data); /* Enable mPHY power gating for any link and speed */ mac_data = er32(FEXTNVM8); @@ -6525,11 +6525,11 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter) /* Disable K1 off */ mac_data = er32(FEXTNVM6); mac_data &= ~BIT(31); - ew32(FEXTNVM12, mac_data); + ew32(FEXTNVM6, mac_data); /* Disable Ungate PGCB clock */ mac_data = er32(FEXTNVM9); - mac_data &= ~BIT(28); + mac_data |= BIT(28); ew32(FEXTNVM9, mac_data); /* Cancel not waking from dynamic -- 2.25.1
next reply other threads:[~2020-12-09 0:27 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-08 18:56 Mario Limonciello [this message] 2020-12-08 18:56 ` [Intel-wired-lan] [PATCH RESEND] e1000e: fix S0ix flow to allow S0i3.2 subset entry Mario Limonciello 2020-12-09 23:43 ` Jakub Kicinski 2020-12-09 23:43 ` [Intel-wired-lan] " Jakub Kicinski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201208185632.151052-1-mario.limonciello@dell.com \ --to=mario.limonciello@dell.com \ --cc=Perry.Yuan@dell.com \ --cc=Yijun.Shen@dell.com \ --cc=aaron.f.brown@intel.com \ --cc=alexander.duyck@gmail.com \ --cc=alexanderduyck@fb.com \ --cc=anthony.l.nguyen@intel.com \ --cc=anthony.wong@canonical.com \ --cc=darcari@redhat.com \ --cc=davem@davemloft.net \ --cc=intel-wired-lan@lists.osuosl.org \ --cc=jeffrey.t.kirsher@intel.com \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=sasha.neftin@intel.com \ --cc=sassmann@redhat.com \ --cc=vitaly.lifshits@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.