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

Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata updates from Tejun Heo:
 "Nothing too interesting. Mostly ahci and ahci_platform changes, many
  around power management"

* 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
  ata: ahci_platform: enable to get and control reset
  ata: libahci_platform: add reset control support
  ata: add an extra argument to ahci_platform_get_resources()
  ata: sata_rcar: Add r8a77965 support
  ata: sata_rcar: exclude setting of PHY registers in Gen3
  ata: sata_rcar: really mask all interrupts on Gen2 and later
  Revert "ata: ahci_platform: allow disabling of hotplug to save power"
  ata: libahci: Allow reconfigure of DEVSLP register
  ata: libahci: Correct setting of DEVSLP register
  ata: ahci: Enable DEVSLP by default on x86 with SLP_S0
  ata: ahci: Support state with min power but Partial low power state
  Revert "ata: ahci_platform: convert kcalloc to devm_kcalloc"
  ata: sata_rcar: Add rudimentary Runtime PM support
  ata: sata_rcar: Provide a short-hand for &pdev->dev
  ata: Only output sg element mapped number in verbose debug
  ata: Guard ata_scsi_dump_cdb() by ATA_VERBOSE_DEBUG
  ata: ahci_platform: convert kcalloc to devm_kcalloc
  ata: ahci_platform: convert kzallloc to kcalloc
  ata: ahci_platform: correct parameter documentation for ahci_platform_shutdown
  libata: remove ata_sff_data_xfer_noirq()
  ...
parents 59676610 2d17f460

Documentation/devicetree/bindings/ata/ahci-platform.txt

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ compatible: 
Optional properties:

- dma-coherent      : Present if dma operations are coherent

- clocks            : a list of phandle + clock specifier pairs

- resets            : a list of phandle + reset specifier pairs

- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

Documentation/devicetree/bindings/ata/sata_rcar.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
			  - "renesas,sata-r8a7791" for R-Car M2-W

			  - "renesas,sata-r8a7793" for R-Car M2-N

			  - "renesas,sata-r8a7795" for R-Car H3

			  - "renesas,sata-r8a77965" for R-Car M3-N

			  - "renesas,rcar-gen2-sata" for a generic R-Car Gen2 compatible device

			  - "renesas,rcar-gen3-sata" for a generic R-Car Gen3 compatible device

			  - "renesas,rcar-sata" is deprecated

Documentation/driver-api/libata.rst

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ PIO data read/write 
All bmdma-style drivers must implement this hook. This is the low-level

operation that actually copies the data bytes during a PIO data

transfer. Typically the driver will choose one of

:c:func:`ata_sff_data_xfer_noirq`, :c:func:`ata_sff_data_xfer`, or

:c:func:`ata_sff_data_xfer32`.

:c:func:`ata_sff_data_xfer`, or :c:func:`ata_sff_data_xfer32`.



ATA command execute

~~~~~~~~~~~~~~~~~~~

drivers/ata/ahci.c

+33 −5
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static int marvell_enable = 1; 
module_param(marvell_enable, int, 0644);

MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");



static int mobile_lpm_policy = CONFIG_SATA_MOBILE_LPM_POLICY;

static int mobile_lpm_policy = -1;

module_param(mobile_lpm_policy, int, 0644);

MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets");
@@ -1604,6 +1604,37 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports, 
	return pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSIX);

}



static void ahci_update_initial_lpm_policy(struct ata_port *ap,

					   struct ahci_host_priv *hpriv)

{

	int policy = CONFIG_SATA_MOBILE_LPM_POLICY;





	/* Ignore processing for non mobile platforms */

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

		return;



	/* user modified policy via module param */

	if (mobile_lpm_policy != -1) {

		policy = mobile_lpm_policy;

		goto update_policy;

	}



#ifdef CONFIG_ACPI

	if (policy > ATA_LPM_MED_POWER &&

	    (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)) {

		if (hpriv->cap & HOST_CAP_PART)

			policy = ATA_LPM_MIN_POWER_WITH_PARTIAL;

		else if (hpriv->cap & HOST_CAP_SSC)

			policy = ATA_LPM_MIN_POWER;

	}

#endif



update_policy:

	if (policy >= ATA_LPM_UNKNOWN && policy <= ATA_LPM_MIN_POWER)

		ap->target_lpm_policy = policy;

}



static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	unsigned int board_id = ent->driver_data;
@@ -1807,10 +1838,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		if (ap->flags & ATA_FLAG_EM)

			ap->em_message_type = hpriv->em_msg_type;



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

		    mobile_lpm_policy >= ATA_LPM_UNKNOWN &&

		    mobile_lpm_policy <= ATA_LPM_MIN_POWER)

			ap->target_lpm_policy = mobile_lpm_policy;

		ahci_update_initial_lpm_policy(ap, hpriv);



		/* disabled/not-implemented port */

		if (!(hpriv->port_map & (1 << i)))

drivers/ata/ahci.h

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ struct ahci_host_priv { 
	u32			em_msg_type;	/* EM message type */

	bool			got_runtime_pm; /* Did we do pm_runtime_get? */

	struct clk		*clks[AHCI_MAX_CLKS]; /* Optional */

	struct reset_control	*rsts;		/* Optional */

	struct regulator	**target_pwrs;	/* Optional */

	/*

	 * If platform uses PHYs. There is a 1:1 relation between the port number and

CRA Git | Maintained and supported by SUSTech CRA and CCSE