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

Commit 3c136f29 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:
  libata: ahci enclosure management bit mask
  libata: ahci enclosure management led sync
  pata_ninja32: suspend/resume support
  libata: Fix LBA48 on pata_it821x RAID volumes.
  libata: clear saved xfer_mode and ncq_enabled on device detach
  sata_sil24: configure max read request size to 4k
  libata: add missing kernel-doc
  libata: fix device iteration bugs
  ahci: Add support for Promise PDC42819
  ata: Switch all my stuff to a common address
parents 49fdf678 87943acf

drivers/ata/ahci.c

+29 −12
Original line number Diff line number Diff line
@@ -49,6 +49,17 @@ 
#define DRV_NAME	"ahci"

#define DRV_VERSION	"3.0"



/* Enclosure Management Control */

#define EM_CTRL_MSG_TYPE              0x000f0000



/* Enclosure Management LED Message Type */

#define EM_MSG_LED_HBA_PORT           0x0000000f

#define EM_MSG_LED_PMP_SLOT           0x0000ff00

#define EM_MSG_LED_VALUE              0xffff0000

#define EM_MSG_LED_VALUE_ACTIVITY     0x00070000

#define EM_MSG_LED_VALUE_OFF          0xfff80000

#define EM_MSG_LED_VALUE_ON           0x00010000



static int ahci_skip_host_reset;

module_param_named(skip_host_reset, ahci_skip_host_reset, int, 0444);

MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip)");
@@ -588,6 +599,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */

	{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },	/* 6121 */



	/* Promise */

	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */



	/* Generic, PCI class code for AHCI */

	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
@@ -1220,18 +1234,20 @@ static void ahci_sw_activity_blink(unsigned long arg) 
	struct ahci_em_priv *emp = &pp->em_priv[link->pmp];

	unsigned long led_message = emp->led_state;

	u32 activity_led_state;

	unsigned long flags;



	led_message &= 0xffff0000;

	led_message &= EM_MSG_LED_VALUE;

	led_message |= ap->port_no | (link->pmp << 8);



	/* check to see if we've had activity.  If so,

	 * toggle state of LED and reset timer.  If not,

	 * turn LED to desired idle state.

	 */

	spin_lock_irqsave(ap->lock, flags);

	if (emp->saved_activity != emp->activity) {

		emp->saved_activity = emp->activity;

		/* get the current LED state */

		activity_led_state = led_message & 0x00010000;

		activity_led_state = led_message & EM_MSG_LED_VALUE_ON;



		if (activity_led_state)

			activity_led_state = 0;
@@ -1239,17 +1255,18 @@ static void ahci_sw_activity_blink(unsigned long arg) 
			activity_led_state = 1;



		/* clear old state */

		led_message &= 0xfff8ffff;

		led_message &= ~EM_MSG_LED_VALUE_ACTIVITY;



		/* toggle state */

		led_message |= (activity_led_state << 16);

		mod_timer(&emp->timer, jiffies + msecs_to_jiffies(100));

	} else {

		/* switch to idle */

		led_message &= 0xfff8ffff;

		led_message &= ~EM_MSG_LED_VALUE_ACTIVITY;

		if (emp->blink_policy == BLINK_OFF)

			led_message |= (1 << 16);

	}

	spin_unlock_irqrestore(ap->lock, flags);

	ahci_transmit_led_message(ap, led_message, 4);

}
@@ -1294,7 +1311,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, 
	struct ahci_em_priv *emp;



	/* get the slot number from the message */

	pmp = (state & 0x0000ff00) >> 8;

	pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;

	if (pmp < MAX_SLOTS)

		emp = &pp->em_priv[pmp];

	else
@@ -1319,7 +1336,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, 
	message[0] |= (4 << 8);



	/* ignore 0:4 of byte zero, fill in port info yourself */

	message[1] = ((state & 0xfffffff0) | ap->port_no);

	message[1] = ((state & ~EM_MSG_LED_HBA_PORT) | ap->port_no);



	/* write message to EM_LOC */

	writel(message[0], mmio + hpriv->em_loc);
@@ -1362,7 +1379,7 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf, 
	state = simple_strtoul(buf, NULL, 0);



	/* get the slot number from the message */

	pmp = (state & 0x0000ff00) >> 8;

	pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;

	if (pmp < MAX_SLOTS)

		emp = &pp->em_priv[pmp];

	else
@@ -1373,7 +1390,7 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf, 
	 * activity led through em_message

	 */

	if (emp->blink_policy)

		state &= 0xfff8ffff;

		state &= ~EM_MSG_LED_VALUE_ACTIVITY;



	return ahci_transmit_led_message(ap, state, size);

}
@@ -1392,16 +1409,16 @@ static ssize_t ahci_activity_store(struct ata_device *dev, enum sw_activity val) 
		link->flags &= ~(ATA_LFLAG_SW_ACTIVITY);



		/* set the LED to OFF */

		port_led_state &= 0xfff80000;

		port_led_state &= EM_MSG_LED_VALUE_OFF;

		port_led_state |= (ap->port_no | (link->pmp << 8));

		ahci_transmit_led_message(ap, port_led_state, 4);

	} else {

		link->flags |= ATA_LFLAG_SW_ACTIVITY;

		if (val == BLINK_OFF) {

			/* set LED to ON for idle */

			port_led_state &= 0xfff80000;

			port_led_state &= EM_MSG_LED_VALUE_OFF;

			port_led_state |= (ap->port_no | (link->pmp << 8));

			port_led_state |= 0x00010000; /* check this */

			port_led_state |= EM_MSG_LED_VALUE_ON; /* check this */

			ahci_transmit_led_message(ap, port_led_state, 4);

		}

	}
@@ -2612,7 +2629,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		u32 em_loc = readl(mmio + HOST_EM_LOC);

		u32 em_ctl = readl(mmio + HOST_EM_CTL);



		messages = (em_ctl & 0x000f0000) >> 16;

		messages = (em_ctl & EM_CTRL_MSG_TYPE) >> 16;



		/* we only support LED message type right now */

		if ((messages & 0x01) && (ahci_em_messages == 1)) {

drivers/ata/ata_generic.c

+1 −1
Original line number Diff line number Diff line 
/*

 *  ata_generic.c - Generic PATA/SATA controller driver.

 *  Copyright 2005 Red Hat Inc <alan@redhat.com>, all rights reserved.

 *  Copyright 2005 Red Hat Inc, all rights reserved.

 *

 *  Elements from ide/pci/generic.c

 *	    Copyright (C) 2001-2002	Andre Hedrick <andre@linux-ide.org>

drivers/ata/ata_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 *

 *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer

 *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>

 *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>

 *  Copyright (C) 2003 Red Hat Inc

 *

 *

 *  This program is free software; you can redistribute it and/or modify

drivers/ata/libata-core.c

+20 −15
Original line number Diff line number Diff line
@@ -4156,29 +4156,33 @@ static int cable_is_40wire(struct ata_port *ap) 
	struct ata_link *link;

	struct ata_device *dev;



	/* If the controller thinks we are 40 wire, we are */

	/* If the controller thinks we are 40 wire, we are. */

	if (ap->cbl == ATA_CBL_PATA40)

		return 1;

	/* If the controller thinks we are 80 wire, we are */



	/* If the controller thinks we are 80 wire, we are. */

	if (ap->cbl == ATA_CBL_PATA80 || ap->cbl == ATA_CBL_SATA)

		return 0;

	/* If the system is known to be 40 wire short cable (eg laptop),

	   then we allow 80 wire modes even if the drive isn't sure */



	/* If the system is known to be 40 wire short cable (eg

	 * laptop), then we allow 80 wire modes even if the drive

	 * isn't sure.

	 */

	if (ap->cbl == ATA_CBL_PATA40_SHORT)

		return 0;

	/* If the controller doesn't know we scan



	   - Note: We look for all 40 wire detects at this point.

	     Any 80 wire detect is taken to be 80 wire cable

	     because

	     - In many setups only the one drive (slave if present)

               will give a valid detect

             - If you have a non detect capable drive you don't

               want it to colour the choice

	/* If the controller doesn't know, we scan.

	 *

	 * Note: We look for all 40 wire detects at this point.  Any

	 *       80 wire detect is taken to be 80 wire cable because

	 * - in many setups only the one drive (slave if present) will

	 *   give a valid detect

	 * - if you have a non detect capable drive you don't want it

	 *   to colour the choice

	 */

	ata_port_for_each_link(link, ap) {

		ata_link_for_each_dev(dev, link) {

			if (!ata_is_40wire(dev))

			if (ata_dev_enabled(dev) && !ata_is_40wire(dev))

				return 0;

		}

	}
@@ -4553,6 +4557,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words) 
/**

 *	ata_qc_new_init - Request an available ATA command, and initialize it

 *	@dev: Device from whom we request an available command structure

 *	@tag: command tag

 *

 *	LOCKING:

 *	None.

drivers/ata/libata-eh.c

+13 −1
Original line number Diff line number Diff line
@@ -603,6 +603,9 @@ void ata_scsi_error(struct Scsi_Host *host) 
			ata_link_for_each_dev(dev, link) {

				int devno = dev->devno;



				if (!ata_dev_enabled(dev))

					continue;



				ehc->saved_xfer_mode[devno] = dev->xfer_mode;

				if (ata_ncq_enabled(dev))

					ehc->saved_ncq_enabled |= 1 << devno;
@@ -1161,6 +1164,7 @@ void ata_eh_detach_dev(struct ata_device *dev) 
{

	struct ata_link *link = dev->link;

	struct ata_port *ap = link->ap;

	struct ata_eh_context *ehc = &link->eh_context;

	unsigned long flags;



	ata_dev_disable(dev);
@@ -1174,9 +1178,11 @@ void ata_eh_detach_dev(struct ata_device *dev) 
		ap->pflags |= ATA_PFLAG_SCSI_HOTPLUG;

	}



	/* clear per-dev EH actions */

	/* clear per-dev EH info */

	ata_eh_clear_action(link, dev, &link->eh_info, ATA_EH_PERDEV_MASK);

	ata_eh_clear_action(link, dev, &link->eh_context.i, ATA_EH_PERDEV_MASK);

	ehc->saved_xfer_mode[dev->devno] = 0;

	ehc->saved_ncq_enabled &= ~(1 << dev->devno);



	spin_unlock_irqrestore(ap->lock, flags);

}
@@ -2787,6 +2793,9 @@ int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) 


	/* if data transfer is verified, clear DUBIOUS_XFER on ering top */

	ata_link_for_each_dev(dev, link) {

		if (!ata_dev_enabled(dev))

			continue;



		if (!(dev->flags & ATA_DFLAG_DUBIOUS_XFER)) {

			struct ata_ering_entry *ent;
@@ -2808,6 +2817,9 @@ int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) 
		u8 saved_xfer_mode = ehc->saved_xfer_mode[dev->devno];

		u8 saved_ncq = !!(ehc->saved_ncq_enabled & (1 << dev->devno));



		if (!ata_dev_enabled(dev))

			continue;



		if (dev->xfer_mode != saved_xfer_mode ||

		    ata_ncq_enabled(dev) != saved_ncq)

			dev->flags |= ATA_DFLAG_DUBIOUS_XFER;