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

Merge tag 'libata-5.6-2020-02-05' of git://git.kernel.dk/linux-block 

Pull libata updates from Jens Axboe:

 - Add a Sandisk CF card to supported pata_pcmcia list (Christian)

 - Move pata_arasan_cf away from legacy API (Peter)

 - Ensure ahci DMA/ints are shut down on shutdown (Prabhakar)

* tag 'libata-5.6-2020-02-05' of git://git.kernel.dk/linux-block:
  ata: pata_arasan_cf: Use dma_request_chan() instead dma_request_slave_channel()
  ata: ahci: Add shutdown to freeze hardware resources of ahci
  pata_pcmia: add SanDisk High (>8G) CF card to supported list
parents 4c7d00cc 79919010

drivers/ata/ahci.c

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ enum board_ids { 


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

static void ahci_remove_one(struct pci_dev *dev);

static void ahci_shutdown_one(struct pci_dev *dev);

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

				 unsigned long deadline);

static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,
@@ -606,6 +607,7 @@ static struct pci_driver ahci_pci_driver = { 
	.id_table		= ahci_pci_tbl,

	.probe			= ahci_init_one,

	.remove			= ahci_remove_one,

	.shutdown		= ahci_shutdown_one,

	.driver = {

		.pm		= &ahci_pci_pm_ops,

	},
@@ -1877,6 +1879,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return 0;

}



static void ahci_shutdown_one(struct pci_dev *pdev)

{

	ata_pci_shutdown_one(pdev);

}



static void ahci_remove_one(struct pci_dev *pdev)

{

	pm_runtime_get_noresume(&pdev->dev);

drivers/ata/libata-core.c

+21 −0
Original line number Diff line number Diff line
@@ -6767,6 +6767,26 @@ void ata_pci_remove_one(struct pci_dev *pdev) 
	ata_host_detach(host);

}



void ata_pci_shutdown_one(struct pci_dev *pdev)

{

	struct ata_host *host = pci_get_drvdata(pdev);

	int i;



	for (i = 0; i < host->n_ports; i++) {

		struct ata_port *ap = host->ports[i];



		ap->pflags |= ATA_PFLAG_FROZEN;



		/* Disable port interrupts */

		if (ap->ops->freeze)

			ap->ops->freeze(ap);



		/* Stop the port DMA engines */

		if (ap->ops->port_stop)

			ap->ops->port_stop(ap);

	}

}



/* move to PCI subsystem */

int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits)

{
@@ -7387,6 +7407,7 @@ EXPORT_SYMBOL_GPL(ata_timing_cycle2mode); 


#ifdef CONFIG_PCI

EXPORT_SYMBOL_GPL(pci_test_config_bits);

EXPORT_SYMBOL_GPL(ata_pci_shutdown_one);

EXPORT_SYMBOL_GPL(ata_pci_remove_one);

#ifdef CONFIG_PM

EXPORT_SYMBOL_GPL(ata_pci_device_do_suspend);

drivers/ata/pata_arasan_cf.c

+4 −2
Original line number Diff line number Diff line
@@ -526,9 +526,10 @@ static void data_xfer(struct work_struct *work) 


	/* request dma channels */

	/* dma_request_channel may sleep, so calling from process context */

	acdev->dma_chan = dma_request_slave_channel(acdev->host->dev, "data");

	if (!acdev->dma_chan) {

	acdev->dma_chan = dma_request_chan(acdev->host->dev, "data");

	if (IS_ERR(acdev->dma_chan)) {

		dev_err(acdev->host->dev, "Unable to get dma_chan\n");

		acdev->dma_chan = NULL;

		goto chan_request_fail;

	}
@@ -539,6 +540,7 @@ static void data_xfer(struct work_struct *work) 
	}



	dma_release_channel(acdev->dma_chan);

	acdev->dma_chan = NULL;



	/* data xferred successfully */

	if (!ret) {

drivers/ata/pata_pcmcia.c

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ static const struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_MANF_CARD(0x0098, 0x0000),	/* Toshiba */

	PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x002d),

	PCMCIA_DEVICE_MANF_CARD(0x00ce, 0x0000),	/* Samsung */

	PCMCIA_DEVICE_MANF_CARD(0x00f1, 0x0101),	/* SanDisk High (>8G) CFA */

	PCMCIA_DEVICE_MANF_CARD(0x0319, 0x0000),	/* Hitachi */

	PCMCIA_DEVICE_MANF_CARD(0x2080, 0x0001),

	PCMCIA_DEVICE_MANF_CARD(0x4e01, 0x0100),	/* Viking CFA */

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -1226,6 +1226,7 @@ struct pci_bits { 
};



extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);

extern void ata_pci_shutdown_one(struct pci_dev *pdev);

extern void ata_pci_remove_one(struct pci_dev *pdev);



#ifdef CONFIG_PM

CRA Git | Maintained and supported by SUSTech CRA and CCSE