Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 132ea5e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv: shorten register names
  sata_mv: workaround errata SATA#13
  sata_mv: cosmetic renames
  sata_mv: workaround errata SATA#26
  sata_mv: workaround errata PCI#7
  sata_mv: replace 0x1f with ATA_PIO4 (v2)
  sata_mv: fix irq mask races
  sata_mv: revert SoC irq breakage
  libata: ahci enclosure management bios workaround
  ata: Add TRIM infrastructure
  ata_piix: VGN-BX297XP wants the controller power up on suspend
  libata: Remove some redundant casts from pata_octeon_cf.c
  pata_artop: typo
parents 0e26da0f cae5a29d

block/blk-settings.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ EXPORT_SYMBOL(blk_queue_segment_boundary); 
 *

 * description:

 *    set required memory and length alignment for direct dma transactions.

 *    this is used when buiding direct io requests for the queue.

 *    this is used when building direct io requests for the queue.

 *

 **/

void blk_queue_dma_alignment(struct request_queue *q, int mask)

drivers/ata/ahci.c

+15 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf, 
static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state,

					ssize_t size);

#define MAX_SLOTS 8

#define MAX_RETRY 15



enum {

	AHCI_PCI_BAR		= 5,
@@ -1115,6 +1116,8 @@ static void ahci_start_port(struct ata_port *ap) 
	struct ahci_port_priv *pp = ap->private_data;

	struct ata_link *link;

	struct ahci_em_priv *emp;

	ssize_t rc;

	int i;



	/* enable FIS reception */

	ahci_start_fis_rx(ap);
@@ -1126,7 +1129,17 @@ static void ahci_start_port(struct ata_port *ap) 
	if (ap->flags & ATA_FLAG_EM) {

		ata_for_each_link(link, ap, EDGE) {

			emp = &pp->em_priv[link->pmp];

			ahci_transmit_led_message(ap, emp->led_state, 4);



			/* EM Transmit bit maybe busy during init */

			for (i = 0; i < MAX_RETRY; i++) {

				rc = ahci_transmit_led_message(ap,

							       emp->led_state,

							       4);

				if (rc == -EBUSY)

					udelay(100);

				else

					break;

			}

		}

	}
@@ -1331,7 +1344,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, 
	em_ctl = readl(mmio + HOST_EM_CTL);

	if (em_ctl & EM_CTL_TM) {

		spin_unlock_irqrestore(ap->lock, flags);

		return -EINVAL;

		return -EBUSY;

	}



	/*

drivers/ata/ata_piix.c

+7 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,13 @@ static int piix_broken_suspend(void) 
				DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),

			},

		},

		{

			.ident = "VGN-BX297XP",

			.matches = {

				DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),

				DMI_MATCH(DMI_PRODUCT_NAME, "VGN-BX297XP"),

			},

		},



		{ }	/* terminate list */

	};

drivers/ata/pata_octeon_cf.c

+3 −3
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static void octeon_cf_dma_setup(struct ata_queued_cmd *qc) 
	struct ata_port *ap = qc->ap;

	struct octeon_cf_port *cf_port;



	cf_port = (struct octeon_cf_port *)ap->private_data;

	cf_port = ap->private_data;

	DPRINTK("ENTER\n");

	/* issue r/w command */

	qc->cursg = qc->sg;
@@ -596,7 +596,7 @@ static unsigned int octeon_cf_dma_finished(struct ata_port *ap, 
	if (ap->hsm_task_state != HSM_ST_LAST)

		return 0;



	cf_port = (struct octeon_cf_port *)ap->private_data;

	cf_port = ap->private_data;



	dma_cfg.u64 = cvmx_read_csr(CVMX_MIO_BOOT_DMA_CFGX(ocd->dma_engine));

	if (dma_cfg.s.size != 0xfffff) {
@@ -657,7 +657,7 @@ static irqreturn_t octeon_cf_interrupt(int irq, void *dev_instance) 
			continue;



		ocd = ap->dev->platform_data;

		cf_port = (struct octeon_cf_port *)ap->private_data;

		cf_port = ap->private_data;

		dma_int.u64 =

			cvmx_read_csr(CVMX_MIO_BOOT_DMA_INTX(ocd->dma_engine));

		dma_cfg.u64 =

drivers/ata/sata_mv.c

+277 −210

File changed.

Preview size limit exceeded, changes collapsed.