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

Merge tag 'ata-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata updates from Damien Le Moal:
 "For this cycle, no big change but many small fixes and code cleanup to
  libata, the ahci driver and various pata drivers. In more details:

   - Code simplification in pata_platform using
     platform_get_mem_or_io(), from Lad.

   - Fix read-only arrays declarations as const in pata_atiixp and
     pata_pdc202xx_old, from Colin.

   - Various cleanups and code simplification in libata-scsi, from me.

   - Remove dead code in libata-acpi, from Sergey.

   - Skip device scan deboune delay for Marvell 88SE9235 adapters (ahci)
     to speedup boot, from Paul.

   - Simplify functions declaration and use for functions always
     returning 0 in libata-core, from Sergey.

   - Non-fatal error fixes and in the pata_hpt366 and pata_hpt3x2n
     drivers, from Sergey.

   - Various code cleanup in the pata_artop, pata_hpt37x, pata_hpt366,
     pata_hpt3x2n, pata_samsung_cf and sata_rcar drivers, from Sergey.

   - Some libata-sff and libata-scsi code cleanup (e.g. change functions
     to return "bool"), from Sergey.

   - Renae ahci_board_mobile to board_ahci_low_power to be more
     descriptive of the feature as that is also used on PC and server
     AHCI adapters, from Mario.

   - Cleanup of OF match tables, from Geert.

   - Simplify the pata_pxa driver initialization using
     platform_get_irq(), from Minghao"

* tag 'ata-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata: (38 commits)
  ata: pata_pxa: Use platform_get_irq() to get the interrupt
  ata: Drop commas after OF match table sentinels
  ata: ahci: Rename CONFIG_SATA_LPM_MOBILE_POLICY configuration item
  ata: ahci: Rename `AHCI_HFLAG_IS_MOBILE`
  ata: ahci: Rename board_ahci_mobile
  ata: pata_hpt37x: merge transfer mode setting methods
  ata: libata-sff: use *switch* statement in ata_sff_dev_classify()
  ata: add/use ata_taskfile::{error|status} fields
  ata: Kconfig: fix sata gemini compile test condition
  ata: libata-scsi: use *switch* statements to check SCSI command codes
  ata: libata-sff: refactor ata_sff_altstatus()
  ata: libata-sff: refactor ata_sff_set_devctl()
  ata: libata-sff: make ata_resources_present() return 'bool'
  ata: pata_hpt3x2n: disable fast interrupts in prereset() method
  ata: pata_hpt37x: disable fast interrupts in prereset() method
  ata: pata_hpt366: disable fast interrupts in prereset() method
  ata: pata_mpc52xx: use GFP_KERNEL
  ata: sata_rcar: drop unused #define's
  ata: pata_hpt366: check channel enable bits
  ata: sata_rcar: make sata_rcar_ata_devchk() return 'bool'
  ...
parents d51b1b33 d268afa1

drivers/ata/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -115,14 +115,14 @@ config SATA_AHCI 


	  If unsure, say N.



config SATA_MOBILE_LPM_POLICY

	int "Default SATA Link Power Management policy for mobile chipsets"

config SATA_LPM_POLICY

	int "Default SATA Link Power Management policy for low power chipsets"

	range 0 4

	default 0

	depends on SATA_AHCI

	help

	  Select the Default SATA Link Power Management (LPM) policy to use

	  for mobile / laptop variants of chipsets / "South Bridges".

	  for chipsets / "South Bridges" designated as supporting low power.



	  The value set has the following meanings:

		0 => Keep firmware settings
@@ -283,7 +283,7 @@ config SATA_FSL 


config SATA_GEMINI

	tristate "Gemini SATA bridge support"

	depends on ARCH_GEMINI || COMPILE_TEST

	depends on ARCH_GEMINI || (OF && COMPILE_TEST)

	select SATA_HOST

	default ARCH_GEMINI

	help

drivers/ata/acard-ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
	if (qc->tf.protocol == ATA_PROT_PIO && qc->dma_dir == DMA_FROM_DEVICE &&

	    !(qc->flags & ATA_QCFLAG_FAILED)) {

		ata_tf_from_fis(rx_fis + RX_FIS_PIO_SETUP, &qc->result_tf);

		qc->result_tf.command = (rx_fis + RX_FIS_PIO_SETUP)[15];

		qc->result_tf.status = (rx_fis + RX_FIS_PIO_SETUP)[15];

	} else

		ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf);

drivers/ata/ahci.c

+58 −55
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ enum board_ids { 
	/* board IDs by feature in alphabetical order */

	board_ahci,

	board_ahci_ign_iferr,

	board_ahci_mobile,

	board_ahci_low_power,

	board_ahci_no_debounce_delay,

	board_ahci_nomsi,

	board_ahci_noncq,
@@ -135,8 +135,8 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_mobile] = {

		AHCI_HFLAGS	(AHCI_HFLAG_IS_MOBILE),

	[board_ahci_low_power] = {

		AHCI_HFLAGS	(AHCI_HFLAG_USE_LPM_POLICY),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,
@@ -275,13 +275,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x2924), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2925), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2927), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2929), board_ahci_mobile }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292a), board_ahci_mobile }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292b), board_ahci_mobile }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292c), board_ahci_mobile }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292f), board_ahci_mobile }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x2929), board_ahci_low_power }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292a), board_ahci_low_power }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292b), board_ahci_low_power }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292c), board_ahci_low_power }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292f), board_ahci_low_power }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x294d), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x294e), board_ahci_mobile }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x294e), board_ahci_low_power }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x502a), board_ahci }, /* Tolapai */

	{ PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */

	{ PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */
@@ -291,9 +291,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x3b23), board_ahci }, /* PCH AHCI */

	{ PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x3b29), board_ahci_mobile }, /* PCH M AHCI */

	{ PCI_VDEVICE(INTEL, 0x3b29), board_ahci_low_power }, /* PCH M AHCI */

	{ PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x3b2c), board_ahci_mobile }, /* PCH M RAID */

	{ PCI_VDEVICE(INTEL, 0x3b2c), board_ahci_low_power }, /* PCH M RAID */

	{ PCI_VDEVICE(INTEL, 0x3b2f), board_ahci }, /* PCH AHCI */

	{ PCI_VDEVICE(INTEL, 0x19b0), board_ahci_pcs7 }, /* DNV AHCI */

	{ PCI_VDEVICE(INTEL, 0x19b1), board_ahci_pcs7 }, /* DNV AHCI */
@@ -316,9 +316,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x19cE), board_ahci_pcs7 }, /* DNV AHCI */

	{ PCI_VDEVICE(INTEL, 0x19cF), board_ahci_pcs7 }, /* DNV AHCI */

	{ PCI_VDEVICE(INTEL, 0x1c02), board_ahci }, /* CPT AHCI */

	{ PCI_VDEVICE(INTEL, 0x1c03), board_ahci_mobile }, /* CPT M AHCI */

	{ PCI_VDEVICE(INTEL, 0x1c03), board_ahci_low_power }, /* CPT M AHCI */

	{ PCI_VDEVICE(INTEL, 0x1c04), board_ahci }, /* CPT RAID */

	{ PCI_VDEVICE(INTEL, 0x1c05), board_ahci_mobile }, /* CPT M RAID */

	{ PCI_VDEVICE(INTEL, 0x1c05), board_ahci_low_power }, /* CPT M RAID */

	{ PCI_VDEVICE(INTEL, 0x1c06), board_ahci }, /* CPT RAID */

	{ PCI_VDEVICE(INTEL, 0x1c07), board_ahci }, /* CPT RAID */

	{ PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */
@@ -327,29 +327,29 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG/Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e02), board_ahci }, /* Panther Point AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e03), board_ahci_mobile }, /* Panther M AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e03), board_ahci_low_power }, /* Panther M AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e04), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e05), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e06), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x1e07), board_ahci_mobile }, /* Panther M RAID */

	{ PCI_VDEVICE(INTEL, 0x1e07), board_ahci_low_power }, /* Panther M RAID */

	{ PCI_VDEVICE(INTEL, 0x1e0e), board_ahci }, /* Panther Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c02), board_ahci }, /* Lynx Point AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c03), board_ahci_mobile }, /* Lynx M AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c03), board_ahci_low_power }, /* Lynx M AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c04), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c05), board_ahci_mobile }, /* Lynx M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c05), board_ahci_low_power }, /* Lynx M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c06), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c07), board_ahci_mobile }, /* Lynx M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c07), board_ahci_low_power }, /* Lynx M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c0e), board_ahci }, /* Lynx Point RAID */

	{ PCI_VDEVICE(INTEL, 0x8c0f), board_ahci_mobile }, /* Lynx M RAID */

	{ PCI_VDEVICE(INTEL, 0x9c02), board_ahci_mobile }, /* Lynx LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c03), board_ahci_mobile }, /* Lynx LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c04), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c05), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c06), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c07), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0e), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0f), board_ahci_mobile }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9dd3), board_ahci_mobile }, /* Cannon Lake PCH-LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c0f), board_ahci_low_power }, /* Lynx M RAID */

	{ PCI_VDEVICE(INTEL, 0x9c02), board_ahci_low_power }, /* Lynx LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c03), board_ahci_low_power }, /* Lynx LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c04), board_ahci_low_power }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c05), board_ahci_low_power }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c06), board_ahci_low_power }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c07), board_ahci_low_power }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0e), board_ahci_low_power }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c0f), board_ahci_low_power }, /* Lynx LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9dd3), board_ahci_low_power }, /* Cannon Lake PCH-LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x1f22), board_ahci }, /* Avoton AHCI */

	{ PCI_VDEVICE(INTEL, 0x1f23), board_ahci }, /* Avoton AHCI */

	{ PCI_VDEVICE(INTEL, 0x1f24), board_ahci }, /* Avoton RAID */
@@ -381,26 +381,26 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x8d66), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d6e), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x23a3), board_ahci }, /* Coleto Creek AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c83), board_ahci_mobile }, /* Wildcat LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c85), board_ahci_mobile }, /* Wildcat LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c87), board_ahci_mobile }, /* Wildcat LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c8f), board_ahci_mobile }, /* Wildcat LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c83), board_ahci_low_power }, /* Wildcat LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9c85), board_ahci_low_power }, /* Wildcat LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c87), board_ahci_low_power }, /* Wildcat LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9c8f), board_ahci_low_power }, /* Wildcat LP RAID */

	{ PCI_VDEVICE(INTEL, 0x8c82), board_ahci }, /* 9 Series AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c83), board_ahci_mobile }, /* 9 Series M AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c83), board_ahci_low_power }, /* 9 Series M AHCI */

	{ PCI_VDEVICE(INTEL, 0x8c84), board_ahci }, /* 9 Series RAID */

	{ PCI_VDEVICE(INTEL, 0x8c85), board_ahci_mobile }, /* 9 Series M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c85), board_ahci_low_power }, /* 9 Series M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c86), board_ahci }, /* 9 Series RAID */

	{ PCI_VDEVICE(INTEL, 0x8c87), board_ahci_mobile }, /* 9 Series M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c87), board_ahci_low_power }, /* 9 Series M RAID */

	{ PCI_VDEVICE(INTEL, 0x8c8e), board_ahci }, /* 9 Series RAID */

	{ PCI_VDEVICE(INTEL, 0x8c8f), board_ahci_mobile }, /* 9 Series M RAID */

	{ PCI_VDEVICE(INTEL, 0x9d03), board_ahci_mobile }, /* Sunrise LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9d05), board_ahci_mobile }, /* Sunrise LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9d07), board_ahci_mobile }, /* Sunrise LP RAID */

	{ PCI_VDEVICE(INTEL, 0x8c8f), board_ahci_low_power }, /* 9 Series M RAID */

	{ PCI_VDEVICE(INTEL, 0x9d03), board_ahci_low_power }, /* Sunrise LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9d05), board_ahci_low_power }, /* Sunrise LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9d07), board_ahci_low_power }, /* Sunrise LP RAID */

	{ PCI_VDEVICE(INTEL, 0xa102), board_ahci }, /* Sunrise Point-H AHCI */

	{ PCI_VDEVICE(INTEL, 0xa103), board_ahci_mobile }, /* Sunrise M AHCI */

	{ PCI_VDEVICE(INTEL, 0xa103), board_ahci_low_power }, /* Sunrise M AHCI */

	{ PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa106), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa107), board_ahci_mobile }, /* Sunrise M RAID */

	{ PCI_VDEVICE(INTEL, 0xa107), board_ahci_low_power }, /* Sunrise M RAID */

	{ PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa182), board_ahci }, /* Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0xa186), board_ahci }, /* Lewisburg RAID*/
@@ -413,13 +413,13 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0xa356), board_ahci }, /* Cannon Lake PCH-H RAID */

	{ PCI_VDEVICE(INTEL, 0x06d7), board_ahci }, /* Comet Lake-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa386), board_ahci }, /* Comet Lake PCH-V RAID */

	{ PCI_VDEVICE(INTEL, 0x0f22), board_ahci_mobile }, /* Bay Trail AHCI */

	{ PCI_VDEVICE(INTEL, 0x0f23), board_ahci_mobile }, /* Bay Trail AHCI */

	{ PCI_VDEVICE(INTEL, 0x22a3), board_ahci_mobile }, /* Cherry Tr. AHCI */

	{ PCI_VDEVICE(INTEL, 0x5ae3), board_ahci_mobile }, /* ApolloLake AHCI */

	{ PCI_VDEVICE(INTEL, 0x34d3), board_ahci_mobile }, /* Ice Lake LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x02d3), board_ahci_mobile }, /* Comet Lake PCH-U AHCI */

	{ PCI_VDEVICE(INTEL, 0x02d7), board_ahci_mobile }, /* Comet Lake PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x0f22), board_ahci_low_power }, /* Bay Trail AHCI */

	{ PCI_VDEVICE(INTEL, 0x0f23), board_ahci_low_power }, /* Bay Trail AHCI */

	{ PCI_VDEVICE(INTEL, 0x22a3), board_ahci_low_power }, /* Cherry Tr. AHCI */

	{ PCI_VDEVICE(INTEL, 0x5ae3), board_ahci_low_power }, /* ApolloLake AHCI */

	{ PCI_VDEVICE(INTEL, 0x34d3), board_ahci_low_power }, /* Ice Lake LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x02d3), board_ahci_low_power }, /* Comet Lake PCH-U AHCI */

	{ PCI_VDEVICE(INTEL, 0x02d7), board_ahci_low_power }, /* Comet Lake PCH RAID */



	/* JMicron 360/1/3/5/6, match class to avoid IDE function */

	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -447,7 +447,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */

	{ PCI_VDEVICE(AMD, 0x7801), board_ahci_no_debounce_delay }, /* AMD Hudson-2 (AHCI mode) */

	{ PCI_VDEVICE(AMD, 0x7900), board_ahci }, /* AMD CZ */

	{ PCI_VDEVICE(AMD, 0x7901), board_ahci_mobile }, /* AMD Green Sardine */

	{ PCI_VDEVICE(AMD, 0x7901), board_ahci_low_power }, /* AMD Green Sardine */

	/* AMD is using RAID class only for ahci controllers */

	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci },
@@ -582,6 +582,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  .driver_data = board_ahci_yes_fbs },

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),

	  .driver_data = board_ahci_yes_fbs },

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9235),

	  .driver_data = board_ahci_no_debounce_delay },

	{ PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642), /* highpoint rocketraid 642L */

	  .driver_data = board_ahci_yes_fbs },

	{ PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0645), /* highpoint rocketraid 644L */
@@ -737,7 +739,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, 


	/* clear D2H reception area to properly wait for D2H FIS */

	ata_tf_init(link->device, &tf);

	tf.command = ATA_BUSY;

	tf.status = ATA_BUSY;

	ata_tf_to_fis(&tf, 0, 0, d2h_fis);



	rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),
@@ -806,7 +808,7 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, 


		/* clear D2H reception area to properly wait for D2H FIS */

		ata_tf_init(link->device, &tf);

		tf.command = ATA_BUSY;

		tf.status = ATA_BUSY;

		ata_tf_to_fis(&tf, 0, 0, d2h_fis);



		rc = sata_link_hardreset(link, timing, deadline, &online,
@@ -889,7 +891,8 @@ static int ahci_pci_device_suspend(struct device *dev) 
	}



	ahci_pci_disable_interrupts(host);

	return ata_host_suspend(host, PMSG_SUSPEND);

	ata_host_suspend(host, PMSG_SUSPEND);

	return 0;

}



static int ahci_pci_device_resume(struct device *dev)
@@ -1592,11 +1595,11 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports, 
static void ahci_update_initial_lpm_policy(struct ata_port *ap,

					   struct ahci_host_priv *hpriv)

{

	int policy = CONFIG_SATA_MOBILE_LPM_POLICY;

	int policy = CONFIG_SATA_LPM_POLICY;





	/* Ignore processing for non mobile platforms */

	if (!(hpriv->flags & AHCI_HFLAG_IS_MOBILE))

	/* Ignore processing for chipsets that don't use policy */

	if (!(hpriv->flags & AHCI_HFLAG_USE_LPM_POLICY))

		return;



	/* user modified policy via module param */

drivers/ata/ahci.h

+2 −2
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ enum { 
	AHCI_HFLAG_YES_ALPM		= (1 << 23), /* force ALPM cap on */

	AHCI_HFLAG_NO_WRITE_TO_RO	= (1 << 24), /* don't write to read

							only registers */

	AHCI_HFLAG_IS_MOBILE		= (1 << 25), /* mobile chipset, use

							SATA_MOBILE_LPM_POLICY

	AHCI_HFLAG_USE_LPM_POLICY	= (1 << 25), /* chipset that should use

							SATA_LPM_POLICY

							as default lpm_policy */

	AHCI_HFLAG_SUSPEND_PHYS		= (1 << 26), /* handle PHYs during

							suspend/resume */

drivers/ata/ahci_brcm.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static const struct of_device_id ahci_of_match[] = { 
	{.compatible = "brcm,bcm63138-ahci", .data = (void *)BRCM_SATA_BCM7445},

	{.compatible = "brcm,bcm-nsp-ahci", .data = (void *)BRCM_SATA_NSP},

	{.compatible = "brcm,bcm7216-ahci", .data = (void *)BRCM_SATA_BCM7216},

	{},

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, ahci_of_match);