Commit 79ec6d9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libata-5.10-2020-10-12' of git://git.kernel.dk/linux-block 

Pull libata updates from Jens Axboe:
 "Nothing major in here, just fixes or improvements collected over the
  last few months"

* tag 'libata-5.10-2020-10-12' of git://git.kernel.dk/linux-block:
  ata: ahci: mvebu: Make SATA PHY optional for Armada 3720
  MAINTAINERS: remove LIBATA PATA DRIVERS entry
  pata_cmd64x: Use fallthrough pseudo-keyword
  ahci: qoriq: enable acpi support in qoriq ahci driver
  sata, highbank: simplify the return expression of ahci_highbank_suspend
  ahci: Add Intel Rocket Lake PCH-H RAID PCI IDs
parents 6ad4bf6e 45aefe3d

MAINTAINERS

+0 −9
Original line number Diff line number Diff line
@@ -9882,15 +9882,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git 
F:	drivers/ata/pata_arasan_cf.c

F:	include/linux/pata_arasan_cf_data.h









LIBATA PATA DRIVERS









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









M:	Jens Axboe <axboe@kernel.dk>









L:	linux-ide@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git









F:	drivers/ata/ata_generic.c









F:	drivers/ata/pata_*.c

















LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS









M:	Linus Walleij <linus.walleij@linaro.org>









L:	linux-ide@vger.kernel.org
































drivers/ata/ahci.c



+4
−0






























Original line number
Diff line number
Diff line







@@ -360,6 +360,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {







	{ PCI_VDEVICE(INTEL, 0x1f3f), board_ahci_avn }, /* Avoton RAID */









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









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









	{ PCI_VDEVICE(INTEL, 0x43d4), board_ahci }, /* Rocket Lake PCH-H RAID */









	{ PCI_VDEVICE(INTEL, 0x43d5), board_ahci }, /* Rocket Lake PCH-H RAID */









	{ PCI_VDEVICE(INTEL, 0x43d6), board_ahci }, /* Rocket Lake PCH-H RAID */









	{ PCI_VDEVICE(INTEL, 0x43d7), board_ahci }, /* Rocket Lake PCH-H RAID */









	{ PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */









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









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
































drivers/ata/ahci.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -240,6 +240,8 @@ enum {







							as default lpm_policy */









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









							suspend/resume */









	AHCI_HFLAG_IGN_NOTSUPP_POWER_ON	= (1 << 27), /* ignore -EOPNOTSUPP









							from phy_power_on() */



















	/* ap->flags bits */










































drivers/ata/ahci_mvebu.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -227,7 +227,7 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_380_plat_data = {

















static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = {









	.plat_config = ahci_mvebu_armada_3700_config,









	.flags = AHCI_HFLAG_SUSPEND_PHYS,









	.flags = AHCI_HFLAG_SUSPEND_PHYS | AHCI_HFLAG_IGN_NOTSUPP_POWER_ON,









};



















static const struct of_device_id ahci_mvebu_of_match[] = {
































drivers/ata/ahci_qoriq.c



+17
−3






























Original line number
Diff line number
Diff line







@@ -6,6 +6,7 @@







 *   Tang Yuantian <Yuantian.Tang@freescale.com>









 */



















#include <linux/acpi.h>









#include <linux/kernel.h>









#include <linux/module.h>









#include <linux/pm.h>








@@ -80,6 +81,12 @@ static const struct of_device_id ahci_qoriq_of_match[] = {







};









MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);



















static const struct acpi_device_id ahci_qoriq_acpi_match[] = {









	{"NXP0004", .driver_data = (kernel_ulong_t)AHCI_LX2160A},









	{ }









};









MODULE_DEVICE_TABLE(acpi, ahci_qoriq_acpi_match);



















static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class,









			  unsigned long deadline)









{








@@ -255,6 +262,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)







static int ahci_qoriq_probe(struct platform_device *pdev)









{









	struct device_node *np = pdev->dev.of_node;









	const struct acpi_device_id *acpi_id;









	struct device *dev = &pdev->dev;









	struct ahci_host_priv *hpriv;









	struct ahci_qoriq_priv *qoriq_priv;








@@ -267,14 +275,18 @@ static int ahci_qoriq_probe(struct platform_device *pdev)







		return PTR_ERR(hpriv);



















	of_id = of_match_node(ahci_qoriq_of_match, np);









	if (!of_id)









	acpi_id = acpi_match_device(ahci_qoriq_acpi_match, &pdev->dev);









	if (!(of_id || acpi_id))









		return -ENODEV;



















	qoriq_priv = devm_kzalloc(dev, sizeof(*qoriq_priv), GFP_KERNEL);









	if (!qoriq_priv)









		return -ENOMEM;



















	if (of_id)









		qoriq_priv->type = (enum ahci_qoriq_type)of_id->data;









	else









		qoriq_priv->type = (enum ahci_qoriq_type)acpi_id->driver_data;



















	if (unlikely(!ecc_initialized)) {









		res = platform_get_resource_byname(pdev,








@@ -288,7 +300,8 @@ static int ahci_qoriq_probe(struct platform_device *pdev)







		}









	}



















	qoriq_priv->is_dmacoherent = of_dma_is_coherent(np);









	if (device_get_dma_attr(&pdev->dev) == DEV_DMA_COHERENT)









		qoriq_priv->is_dmacoherent = true;



















	rc = ahci_platform_enable_resources(hpriv);









	if (rc)








@@ -354,6 +367,7 @@ static struct platform_driver ahci_qoriq_driver = {







	.driver = {









		.name = DRV_NAME,









		.of_match_table = ahci_qoriq_of_match,









		.acpi_match_table = ahci_qoriq_acpi_match,









		.pm = &ahci_qoriq_pm_ops,









	},









};