Unverified Commit 8545e9cf authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2173 ata: libahci: clear pending interrupt status 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xingui Yang <yangxingui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AXNHEXSK63HHDLP2YV6YA74MHXUF25JV/ 
 
https://gitee.com/openeuler/kernel/issues/I81M63 
 
Link:https://gitee.com/openeuler/kernel/pulls/2173

 

Reviewed-by: default avatarYihang Li <liyihang9@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b5cd306b 0a835ab1

drivers/ata/libahci.c

+23 −12
Original line number Diff line number Diff line
@@ -1205,6 +1205,26 @@ static ssize_t ahci_activity_show(struct ata_device *dev, char *buf) 
	return sprintf(buf, "%d\n", emp->blink_policy);

}



static void ahci_port_clear_pending_irq(struct ata_port *ap)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	void __iomem *port_mmio = ahci_port_base(ap);

	u32 tmp;



	/* clear SError */

	tmp = readl(port_mmio + PORT_SCR_ERR);

	dev_dbg(ap->host->dev, "PORT_SCR_ERR 0x%x\n", tmp);

	writel(tmp, port_mmio + PORT_SCR_ERR);



	/* clear port IRQ */

	tmp = readl(port_mmio + PORT_IRQ_STAT);

	dev_dbg(ap->host->dev, "PORT_IRQ_STAT 0x%x\n", tmp);

	if (tmp)

		writel(tmp, port_mmio + PORT_IRQ_STAT);



	writel(1 << ap->port_no, hpriv->mmio + HOST_IRQ_STAT);

}



static void ahci_port_init(struct device *dev, struct ata_port *ap,

			   int port_no, void __iomem *mmio,

			   void __iomem *port_mmio)
@@ -1219,18 +1239,7 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap, 
	if (rc)

		dev_warn(dev, "%s (%d)\n", emsg, rc);



	/* clear SError */

	tmp = readl(port_mmio + PORT_SCR_ERR);

	VPRINTK("PORT_SCR_ERR 0x%x\n", tmp);

	writel(tmp, port_mmio + PORT_SCR_ERR);



	/* clear port IRQ */

	tmp = readl(port_mmio + PORT_IRQ_STAT);

	VPRINTK("PORT_IRQ_STAT 0x%x\n", tmp);

	if (tmp)

		writel(tmp, port_mmio + PORT_IRQ_STAT);



	writel(1 << port_no, mmio + HOST_IRQ_STAT);

	ahci_port_clear_pending_irq(ap);



	/* mark esata ports */

	tmp = readl(port_mmio + PORT_CMD);
@@ -1560,6 +1569,8 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class, 
	tf.command = ATA_BUSY;

	ata_tf_to_fis(&tf, 0, 0, d2h_fis);



	ahci_port_clear_pending_irq(ap);



	rc = sata_link_hardreset(link, timing, deadline, online,

				 ahci_check_ready);