Commit 6f9cc5c1 authored by David E. Box's avatar David E. Box Committed by Ilpo Järvinen

platform/x86/intel/pmc: Allow reenabling LTRs

Commit 80495120 ("platform/x86:intel/pmc: Combine core_init() and
core_configure()") caused a network performance regression due to the GBE
LTR ignore that it added during probe. The fix will move the ignore to
occur at suspend-time (so as to not affect suspend power). This will
require the ability to enable the LTR again on resume. Modify
pmc_core_send_ltr_ignore() to allow enabling an LTR.

Fixes: 80495120 ("platform/x86:intel/pmc: Combine core_init() and core_configure()")
Signed-off-by: default avatar"David E. Box" <david.e.box@linux.intel.com>
Link: https://lore.kernel.org/r/20231223032548.1680738-5-david.e.box@linux.intel.comReviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 7c13f365
...@@ -323,7 +323,7 @@ int adl_core_init(struct pmc_dev *pmcdev) ...@@ -323,7 +323,7 @@ int adl_core_init(struct pmc_dev *pmcdev)
* when a cable is attached. Tell the PMC to ignore it. * when a cable is attached. Tell the PMC to ignore it.
*/ */
dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n"); dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");
pmc_core_send_ltr_ignore(pmcdev, 3); pmc_core_send_ltr_ignore(pmcdev, 3, 1);
return 0; return 0;
} }
...@@ -218,7 +218,7 @@ int cnp_core_init(struct pmc_dev *pmcdev) ...@@ -218,7 +218,7 @@ int cnp_core_init(struct pmc_dev *pmcdev)
* when a cable is attached. Tell the PMC to ignore it. * when a cable is attached. Tell the PMC to ignore it.
*/ */
dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n"); dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");
pmc_core_send_ltr_ignore(pmcdev, 3); pmc_core_send_ltr_ignore(pmcdev, 3, 1);
return 0; return 0;
} }
...@@ -460,7 +460,7 @@ static int pmc_core_pll_show(struct seq_file *s, void *unused) ...@@ -460,7 +460,7 @@ static int pmc_core_pll_show(struct seq_file *s, void *unused)
} }
DEFINE_SHOW_ATTRIBUTE(pmc_core_pll); DEFINE_SHOW_ATTRIBUTE(pmc_core_pll);
int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value) int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore)
{ {
struct pmc *pmc; struct pmc *pmc;
const struct pmc_reg_map *map; const struct pmc_reg_map *map;
...@@ -498,7 +498,10 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value) ...@@ -498,7 +498,10 @@ int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value)
mutex_lock(&pmcdev->lock); mutex_lock(&pmcdev->lock);
reg = pmc_core_reg_read(pmc, map->ltr_ignore_offset); reg = pmc_core_reg_read(pmc, map->ltr_ignore_offset);
reg |= BIT(ltr_index); if (ignore)
reg |= BIT(ltr_index);
else
reg &= ~BIT(ltr_index);
pmc_core_reg_write(pmc, map->ltr_ignore_offset, reg); pmc_core_reg_write(pmc, map->ltr_ignore_offset, reg);
mutex_unlock(&pmcdev->lock); mutex_unlock(&pmcdev->lock);
...@@ -521,7 +524,7 @@ static ssize_t pmc_core_ltr_ignore_write(struct file *file, ...@@ -521,7 +524,7 @@ static ssize_t pmc_core_ltr_ignore_write(struct file *file,
if (err) if (err)
return err; return err;
err = pmc_core_send_ltr_ignore(pmcdev, value); err = pmc_core_send_ltr_ignore(pmcdev, value, 1);
return err == 0 ? count : err; return err == 0 ? count : err;
} }
......
...@@ -488,7 +488,7 @@ extern const struct pmc_bit_map *mtl_ioem_lpm_maps[]; ...@@ -488,7 +488,7 @@ extern const struct pmc_bit_map *mtl_ioem_lpm_maps[];
extern const struct pmc_reg_map mtl_ioem_reg_map; extern const struct pmc_reg_map mtl_ioem_reg_map;
extern void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev); extern void pmc_core_get_tgl_lpm_reqs(struct platform_device *pdev);
extern int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value); int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value, int ignore);
int pmc_core_resume_common(struct pmc_dev *pmcdev); int pmc_core_resume_common(struct pmc_dev *pmcdev);
int get_primary_reg_base(struct pmc *pmc); int get_primary_reg_base(struct pmc *pmc);
......
...@@ -1006,7 +1006,7 @@ int mtl_core_init(struct pmc_dev *pmcdev) ...@@ -1006,7 +1006,7 @@ int mtl_core_init(struct pmc_dev *pmcdev)
* when a cable is attached. Tell the PMC to ignore it. * when a cable is attached. Tell the PMC to ignore it.
*/ */
dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n"); dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");
pmc_core_send_ltr_ignore(pmcdev, 3); pmc_core_send_ltr_ignore(pmcdev, 3, 1);
return 0; return 0;
} }
...@@ -268,7 +268,7 @@ int tgl_core_init(struct pmc_dev *pmcdev) ...@@ -268,7 +268,7 @@ int tgl_core_init(struct pmc_dev *pmcdev)
* when a cable is attached. Tell the PMC to ignore it. * when a cable is attached. Tell the PMC to ignore it.
*/ */
dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n"); dev_dbg(&pmcdev->pdev->dev, "ignoring GBE LTR\n");
pmc_core_send_ltr_ignore(pmcdev, 3); pmc_core_send_ltr_ignore(pmcdev, 3, 1);
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment