ahci: don't enable port irq before handler is registered (7b3a24c5) · Commits · 戴 / test

drivers/ata/libahci.c

+15 −2

Original line number	Diff line number	Diff line
		@@ -1919,6 +1919,16 @@ static void ahci_pmp_attach(struct ata_port *ap)
		ahci_enable_fbs(ap);

		pp->intr_mask \|= PORT_IRQ_BAD_PMP;

		/*
		* We must not change the port interrupt mask register if the
		* port is marked frozen, the value in pp->intr_mask will be
		* restored later when the port is thawed.
		*
		* Note that during initialization, the port is marked as
		* frozen since the irq handler is not yet registered.
		*/
		if (!(ap->pflags & ATA_PFLAG_FROZEN))
		writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK);
		}

		@@ -1935,6 +1945,9 @@ static void ahci_pmp_detach(struct ata_port *ap)
		writel(cmd, port_mmio + PORT_CMD);

		pp->intr_mask &= ~PORT_IRQ_BAD_PMP;

		/* see comment above in ahci_pmp_attach() */
		if (!(ap->pflags & ATA_PFLAG_FROZEN))
		writel(pp->intr_mask, port_mmio + PORT_IRQ_MASK);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -5480,7 +5480,7 @@ struct ata_port ata_port_alloc(struct ata_host host)
		if (!ap)
		return NULL;

		ap->pflags \|= ATA_PFLAG_INITIALIZING;
		ap->pflags \|= ATA_PFLAG_INITIALIZING \| ATA_PFLAG_FROZEN;
		ap->lock = &host->lock;
		ap->print_id = -1;
		ap->host = host;