pata_efar: support ->cable_detect (6bfed3fb) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/ata/pata_efar.c

+22 −9

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

		#define DRV_NAME "pata_efar"
		#define DRV_VERSION "0.4.3"
		#define DRV_VERSION "0.4.4"

		/**
		* efar_pre_reset - check for 40/80 pin
		* efar_pre_reset - Enable bits
		* @ap: Port
		*
		* Perform cable detection for the EFAR ATA interface. This is
		@@ -38,18 +38,11 @@ static int efar_pre_reset(struct ata_port *ap)
		{ 0x41U, 1U, 0x80UL, 0x80UL }, /* port 0 */
		{ 0x43U, 1U, 0x80UL, 0x80UL }, /* port 1 */
		};

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

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

		pci_read_config_byte(pdev, 0x47, &tmp);
		if (tmp & (2 >> ap->port_no))
		ap->cbl = ATA_CBL_PATA40;
		else
		ap->cbl = ATA_CBL_PATA80;
		return ata_std_prereset(ap);
		}

		@@ -66,6 +59,25 @@ static void efar_error_handler(struct ata_port *ap)
		ata_bmdma_drive_eh(ap, efar_pre_reset, ata_std_softreset, NULL, ata_std_postreset);
		}

		/**
		* efar_cable_detect - check for 40/80 pin
		* @ap: Port
		*
		* Perform cable detection for the EFAR ATA interface. This is
		* different to the PIIX arrangement
		*/

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

		pci_read_config_byte(pdev, 0x47, &tmp);
		if (tmp & (2 >> ap->port_no))
		return ATA_CBL_PATA40;
		return ATA_CBL_PATA80;
		}

		/**
		* efar_set_piomode - Initialize host controller PATA PIO timings
		* @ap: Port whose timings we are configuring
		@@ -256,6 +268,7 @@ static const struct ata_port_operations efar_ops = {
		.thaw = ata_bmdma_thaw,
		.error_handler = efar_error_handler,
		.post_internal_cmd = ata_bmdma_post_internal_cmd,
		.cable_detect = efar_cable_detect,

		.bmdma_setup = ata_bmdma_setup,
		.bmdma_start = ata_bmdma_start,