Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (fffe566b) · Commits · 戴 / test

drivers/ata/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,11 @@ menuconfig ATA
		that "speaks" the ATA protocol, also called ATA controller),
		because you will be asked for it.

		NOTE: ATA enables basic SCSI support; however,
		'SCSI disk support', 'SCSI tape support', or
		'SCSI CDROM support' may also be needed,
		depending on your hardware configuration.

		if ATA

		config ATA_NONSTANDARD

drivers/ata/libata-core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3798,6 +3798,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
		/* Drives which do spurious command completion */
		{ "HTS541680J9SA00", "SB2IC7EP", ATA_HORKAGE_NONCQ, },
		{ "HTS541612J9SA00", "SBDIC7JP", ATA_HORKAGE_NONCQ, },
		{ "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, },
		{ "WDC WD740ADFD-00NLR1", NULL, ATA_HORKAGE_NONCQ, },

		/* Devices with NCQ limits */
		@@ -4781,8 +4782,6 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq)
		} else
		ata_qc_complete(qc);
		}

		ata_altstatus(ap); /* flush */
		}

		/**

drivers/ata/pata_pdc2027x.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -689,10 +689,12 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
		void __iomem *mmio_base = host->iomap[PDC_MMIO_BAR];
		u32 scr;
		long start_count, end_count;
		long pll_clock;
		struct timeval start_time, end_time;
		long pll_clock, usec_elapsed;

		/* Read current counter value */
		start_count = pdc_read_counter(host);
		do_gettimeofday(&start_time);

		/* Start the test mode */
		scr = readl(mmio_base + PDC_SYS_CTL);
		@@ -705,6 +707,7 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)

		/* Read the counter values again */
		end_count = pdc_read_counter(host);
		do_gettimeofday(&end_time);

		/* Stop the test mode */
		scr = readl(mmio_base + PDC_SYS_CTL);
		@@ -713,7 +716,11 @@ static long pdc_detect_pll_input_clock(struct ata_host *host)
		readl(mmio_base + PDC_SYS_CTL); /* flush */

		/* calculate the input clock in Hz */
		pll_clock = (start_count - end_count) * 10;
		usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
		(end_time.tv_usec - start_time.tv_usec);

		pll_clock = (start_count - end_count) / 100 *
		(100000000 / usec_elapsed);

		PDPRINTK("start[%ld] end[%ld] \n", start_count, end_count);
		PDPRINTK("PLL input clock[%ld]Hz\n", pll_clock);

drivers/ata/pata_sis.c

+44 −2

Original line number	Diff line number	Diff line
		@@ -560,6 +560,40 @@ static const struct ata_port_operations sis_133_ops = {
		.port_start = ata_port_start,
		};

		static const struct ata_port_operations sis_133_for_sata_ops = {
		.port_disable = ata_port_disable,
		.set_piomode = sis_133_set_piomode,
		.set_dmamode = sis_133_set_dmamode,
		.mode_filter = ata_pci_default_filter,

		.tf_load = ata_tf_load,
		.tf_read = ata_tf_read,
		.check_status = ata_check_status,
		.exec_command = ata_exec_command,
		.dev_select = ata_std_dev_select,

		.freeze = ata_bmdma_freeze,
		.thaw = ata_bmdma_thaw,
		.error_handler = ata_bmdma_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = sis_133_cable_detect,

		.bmdma_setup = ata_bmdma_setup,
		.bmdma_start = ata_bmdma_start,
		.bmdma_stop = ata_bmdma_stop,
		.bmdma_status = ata_bmdma_status,
		.qc_prep = ata_qc_prep,
		.qc_issue = ata_qc_issue_prot,
		.data_xfer = ata_data_xfer,

		.irq_handler = ata_interrupt,
		.irq_clear = ata_bmdma_irq_clear,
		.irq_on = ata_irq_on,
		.irq_ack = ata_irq_ack,

		.port_start = ata_port_start,
		};

		static const struct ata_port_operations sis_133_early_ops = {
		.port_disable = ata_port_disable,
		.set_piomode = sis_100_set_piomode,
		@@ -733,13 +767,20 @@ static const struct ata_port_info sis_info100_early = {
		.pio_mask = 0x1f, /* pio0-4 */
		.port_ops = &sis_66_ops,
		};
		const struct ata_port_info sis_info133 = {
		static const struct ata_port_info sis_info133 = {
		.sht = &sis_sht,
		.flags = ATA_FLAG_SLAVE_POSS \| ATA_FLAG_SRST,
		.pio_mask = 0x1f, /* pio0-4 */
		.udma_mask = ATA_UDMA6,
		.port_ops = &sis_133_ops,
		};
		const struct ata_port_info sis_info133_for_sata = {
		.sht = &sis_sht,
		.flags = ATA_FLAG_SLAVE_POSS \| ATA_FLAG_SRST,
		.pio_mask = 0x1f, /* pio0-4 */
		.udma_mask = ATA_UDMA6,
		.port_ops = &sis_133_for_sata_ops,
		};
		static const struct ata_port_info sis_info133_early = {
		.sht = &sis_sht,
		.flags = ATA_FLAG_SLAVE_POSS \| ATA_FLAG_SRST,
		@@ -749,7 +790,7 @@ static const struct ata_port_info sis_info133_early = {
		};

		/* Privately shared with the SiS180 SATA driver, not for use elsewhere */
		EXPORT_SYMBOL_GPL(sis_info133);
		EXPORT_SYMBOL_GPL(sis_info133_for_sata);

		static void sis_fixup(struct pci_dev pdev, struct sis_chipset sis)
		{
		@@ -975,6 +1016,7 @@ static int sis_init_one (struct pci_dev pdev, const struct pci_device_id ent)
		static const struct pci_device_id sis_pci_tbl[] = {
		{ PCI_VDEVICE(SI, 0x5513), }, /* SiS 5513 */
		{ PCI_VDEVICE(SI, 0x5518), }, /* SiS 5518 */
		{ PCI_VDEVICE(SI, 0x1180), }, /* SiS 1180 */

		{ }
		};

drivers/ata/sata_inic162x.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -496,6 +496,13 @@ static void inic_dev_config(struct ata_device *dev)
		/* inic can only handle upto LBA28 max sectors */
		if (dev->max_sectors > ATA_MAX_SECTORS)
		dev->max_sectors = ATA_MAX_SECTORS;

		if (dev->n_sectors >= 1 << 28) {
		ata_dev_printk(dev, KERN_ERR,
		"ERROR: This driver doesn't support LBA48 yet and may cause\n"
		" data corruption on such devices. Disabling.\n");
		ata_dev_disable(dev);
		}
		}

		static void init_port(struct ata_port *ap)

Admin message