提交 7bf39571 编写于 作者: L LeoLiu-oc 提交者: leoliuoc

Add support for disabling PhyRdy Change Interrupt based on actual LPM capability

zhaoxin inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I54V27
CVE: NA

----------------------------------------------------------------

The ahci spec mentions that PhyRdy Change Interrupt and
Link Power Management (LPM) do not coexist.

However, before enabling LPM, the driver did not check whether
the host supports LPM, but directly disabled PhyRdy Change Interrupt.

Increase the judgment on the actual support of LPM, and disable PhyRdy
Change Interrupt only when it is supported.
Signed-off-by: NLeoLiu-oc <LeoLiu-oc@zhaoxin.com>
上级 b8db4a27
...@@ -1855,6 +1855,17 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1855,6 +1855,17 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
else else
dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n"); dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n");
if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) {
if (hpriv->cap & HOST_CAP_PART)
host->flags |= ATA_HOST_PART;
if (hpriv->cap & HOST_CAP_SSC)
host->flags |= ATA_HOST_SSC;
if (hpriv->cap2 & HOST_CAP2_SDS)
host->flags |= ATA_HOST_DEVSLP;
}
if (pi.flags & ATA_FLAG_EM) if (pi.flags & ATA_FLAG_EM)
ahci_reset_em(host); ahci_reset_em(host);
......
...@@ -3448,6 +3448,8 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, ...@@ -3448,6 +3448,8 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy,
struct ata_device **r_failed_dev) struct ata_device **r_failed_dev)
{ {
struct ata_port *ap = ata_is_host_link(link) ? link->ap : NULL; struct ata_port *ap = ata_is_host_link(link) ? link->ap : NULL;
struct device *device = ap->host->dev;
struct pci_dev *pdev = (!device || !dev_is_pci(device)) ? NULL : to_pci_dev(device);
struct ata_eh_context *ehc = &link->eh_context; struct ata_eh_context *ehc = &link->eh_context;
struct ata_device *dev, *link_dev = NULL, *lpm_dev = NULL; struct ata_device *dev, *link_dev = NULL, *lpm_dev = NULL;
enum ata_lpm_policy old_policy = link->lpm_policy; enum ata_lpm_policy old_policy = link->lpm_policy;
...@@ -3456,6 +3458,11 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, ...@@ -3456,6 +3458,11 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy,
unsigned int err_mask; unsigned int err_mask;
int rc; int rc;
/* if controller does not support lpm, then sets no LPM flags */
if ((pdev && pdev->vendor == PCI_VENDOR_ID_ZHAOXIN) &&
!(ap->host->flags & (ATA_HOST_PART | ATA_HOST_SSC | ATA_HOST_DEVSLP)))
link->flags |= ATA_LFLAG_NO_LPM;
/* if the link or host doesn't do LPM, noop */ /* if the link or host doesn't do LPM, noop */
if ((link->flags & ATA_LFLAG_NO_LPM) || (ap && !ap->ops->set_lpm)) if ((link->flags & ATA_LFLAG_NO_LPM) || (ap && !ap->ops->set_lpm))
return 0; return 0;
......
...@@ -276,6 +276,9 @@ enum { ...@@ -276,6 +276,9 @@ enum {
ATA_HOST_STARTED = (1 << 1), /* Host started */ ATA_HOST_STARTED = (1 << 1), /* Host started */
ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */ ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */
ATA_HOST_IGNORE_ATA = (1 << 3), /* Ignore ATA devices on this host. */ ATA_HOST_IGNORE_ATA = (1 << 3), /* Ignore ATA devices on this host. */
ATA_HOST_PART = (1 << 4), /* Host support partial. */
ATA_HOST_SSC = (1 << 5), /* Host support slumber. */
ATA_HOST_DEVSLP = (1 << 6), /* Host support devslp. */
/* bits 24:31 of host->flags are reserved for LLD specific flags */ /* bits 24:31 of host->flags are reserved for LLD specific flags */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册