Commit d6c75284 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide 

Pull IDE updates from David Miller:
 "Primarily IRQ disabling avoidance changes from Sebastian Andrzej
  Siewior"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: don't enable/disable interrupts in force threaded-IRQ mode
  ide: don't disable interrupts during kmap_atomic()
  ide: Handle irq disabling consistently
  alim15x3: move irq-restore before pci_dev_put()
parents eafdca4d 47b82e88

drivers/ide/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -323,9 +323,9 @@ out: 


		pci_write_config_byte(dev, 0x53, tmpbyte);

	}

	local_irq_restore(flags);

	pci_dev_put(north);

	pci_dev_put(isa_dev);

	local_irq_restore(flags);

	return 0;

}

drivers/ide/ide-io.c

+2 −2
Original line number Diff line number Diff line
@@ -659,8 +659,7 @@ void ide_timer_expiry (struct timer_list *t) 
		spin_unlock(&hwif->lock);

		/* disable_irq_nosync ?? */

		disable_irq(hwif->irq);

		/* local CPU only, as if we were handling an interrupt */

		local_irq_disable();



		if (hwif->polling) {

			startstop = handler(drive);

		} else if (drive_is_ready(drive)) {
@@ -679,6 +678,7 @@ void ide_timer_expiry (struct timer_list *t) 
				startstop = ide_error(drive, "irq timeout",

					hwif->tp_ops->read_status(hwif));

		}

		/* Disable interrupts again, `handler' might have enabled it */

		spin_lock_irq(&hwif->lock);

		enable_irq(hwif->irq);

		if (startstop == ide_stopped && hwif->polling == 0) {

drivers/ide/ide-iops.c

+9 −4
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, 
	ide_hwif_t *hwif = drive->hwif;

	const struct ide_tp_ops *tp_ops = hwif->tp_ops;

	unsigned long flags;

	bool irqs_threaded = force_irqthreads;

	int i;

	u8 stat;
@@ -115,8 +116,10 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, 
	stat = tp_ops->read_status(hwif);



	if (stat & ATA_BUSY) {

		if (!irqs_threaded) {

			local_save_flags(flags);

			local_irq_enable_in_hardirq();

		}

		timeout += jiffies;

		while ((stat = tp_ops->read_status(hwif)) & ATA_BUSY) {

			if (time_after(jiffies, timeout)) {
@@ -129,11 +132,13 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, 
				if ((stat & ATA_BUSY) == 0)

					break;



				if (!irqs_threaded)

					local_irq_restore(flags);

				*rstat = stat;

				return -EBUSY;

			}

		}

		if (!irqs_threaded)

			local_irq_restore(flags);

	}

	/*

drivers/ide/ide-taskfile.c

+1 −9
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, 


	while (len) {

		unsigned nr_bytes = min(len, cursg->length - cmd->cursg_ofs);

		int page_is_high;



		page = sg_page(cursg);

		offset = cursg->offset + cmd->cursg_ofs;
@@ -248,10 +247,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, 


		nr_bytes = min_t(unsigned, nr_bytes, (PAGE_SIZE - offset));



		page_is_high = PageHighMem(page);

		if (page_is_high)

			local_irq_save(flags);



		buf = kmap_atomic(page) + offset;



		cmd->nleft -= nr_bytes;
@@ -270,9 +265,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, 


		kunmap_atomic(buf);



		if (page_is_high)

			local_irq_restore(flags);



		len -= nr_bytes;

	}

}
@@ -413,7 +405,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, 
		return startstop;

	}



	if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)

	if (!force_irqthreads && (drive->dev_flags & IDE_DFLAG_UNMASK) == 0)

		local_irq_disable();



	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);

kernel/irq/manage.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#ifdef CONFIG_IRQ_FORCED_THREADING

__read_mostly bool force_irqthreads;

EXPORT_SYMBOL_GPL(force_irqthreads);



static int __init setup_forced_irqthreads(char *arg)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE