pata_atiixp: support ->cable_detect (84708606) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/ata/pata_atiixp.c

+16 −10

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		#include <linux/libata.h>

		#define DRV_NAME "pata_atiixp"
		#define DRV_VERSION "0.4.4"
		#define DRV_VERSION "0.4.5"

		enum {
		ATIIXP_IDE_PIO_TIMING = 0x40,
		@@ -35,23 +35,15 @@ enum {

		static int atiixp_pre_reset(struct ata_port *ap)
		{
		struct pci_dev *pdev = to_pci_dev(ap->host->dev);
		static const struct pci_bits atiixp_enable_bits[] = {
		{ 0x48, 1, 0x01, 0x00 },
		{ 0x48, 1, 0x08, 0x00 }
		};
		u8 udma;
		struct pci_dev *pdev = to_pci_dev(ap->host->dev);

		if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no]))
		return -ENOENT;

		/* Hack from drivers/ide/pci. Really we want to know how to do the
		raw detection not play follow the bios mode guess */
		pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ap->port_no, &udma);
		if ((udma & 0x07) >= 0x04 \|\| (udma & 0x70) >= 0x40)
		ap->cbl = ATA_CBL_PATA80;
		else
		ap->cbl = ATA_CBL_PATA40;
		return ata_std_prereset(ap);
		}

		@@ -60,6 +52,19 @@ static void atiixp_error_handler(struct ata_port *ap)
		ata_bmdma_drive_eh(ap, atiixp_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
		}

		static int atiixp_cable_detect(struct ata_port *ap)
		{
		struct pci_dev *pdev = to_pci_dev(ap->host->dev);
		u8 udma;

		/* Hack from drivers/ide/pci. Really we want to know how to do the
		raw detection not play follow the bios mode guess */
		pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ap->port_no, &udma);
		if ((udma & 0x07) >= 0x04 \|\| (udma & 0x70) >= 0x40)
		return ATA_CBL_PATA80;
		return ATA_CBL_PATA40;
		}

		/**
		* atiixp_set_pio_timing - set initial PIO mode data
		* @ap: ATA interface
		@@ -245,6 +250,7 @@ static struct ata_port_operations atiixp_port_ops = {
		.thaw = ata_bmdma_thaw,
		.error_handler = atiixp_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = atiixp_cable_detect,

		.bmdma_setup = ata_bmdma_setup,
		.bmdma_start = atiixp_bmdma_start,