pata_hpt366: support ->cable_detect (fecfda5d) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/ata/pata_hpt366.c

+13 −8

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

		#define DRV_NAME "pata_hpt366"
		#define DRV_VERSION "0.6.0"
		#define DRV_VERSION "0.6.1"

		struct hpt_clock {
		u8 xfer_speed;
		@@ -210,24 +210,28 @@ static u32 hpt36x_find_mode(struct ata_port *ap, int speed)
		return 0xffffffffU; /* silence compiler warning */
		}

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

		pci_read_config_byte(pdev, 0x5A, &ata66);
		if (ata66 & (1 << ap->port_no))
		return ATA_CBL_PATA40;
		return ATA_CBL_PATA80;
		}

		static int hpt36x_pre_reset(struct ata_port *ap)
		{
		static const struct pci_bits hpt36x_enable_bits[] = {
		{ 0x50, 1, 0x04, 0x04 },
		{ 0x54, 1, 0x04, 0x04 }
		};

		u8 ata66;
		struct pci_dev *pdev = to_pci_dev(ap->host->dev);

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

		pci_read_config_byte(pdev, 0x5A, &ata66);
		if (ata66 & (1 << ap->port_no))
		ap->cbl = ATA_CBL_PATA40;
		else
		ap->cbl = ATA_CBL_PATA80;
		return ata_std_prereset(ap);
		}

		@@ -354,6 +358,7 @@ static struct ata_port_operations hpt366_port_ops = {
		.thaw = ata_bmdma_thaw,
		.error_handler = hpt36x_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = hpt36x_cable_detect,

		.bmdma_setup = ata_bmdma_setup,
		.bmdma_start = ata_bmdma_start,