[PATCH 1/2] pata_legacy: export functionality to ide

[Borislav Petkov]

Ok, here's a definitely better solution:

---
From: Borislav Petkov <petkovbb@xxxxxxxxx>
Date: Sun, 3 Aug 2008 08:31:20 +0200
Subject: [PATCH 1/2] pata_legacy: export functionality to ide

export the legacy iobases checking code to other
users (ide) by pushing it up into the header.

CC: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <petkovbb@xxxxxxxxx>
---
 drivers/ata/pata_legacy.c |   63 +-----------------------------------------
 include/linux/ata.h       |   67 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index bc037ff..14d187e 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -50,7 +50,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
@@ -1040,47 +1039,6 @@ fail:
 	return ret;
 }
 
-/**
- *	legacy_check_special_cases	-	ATA special cases
- *	@p: PCI device to check
- *	@master: set this if we find an ATA master
- *	@master: set this if we find an ATA secondary
- *
- *	A small number of vendors implemented early PCI ATA interfaces
- *	on bridge logic without the ATA interface being PCI visible.
- *	Where we have a matching PCI driver we must skip the relevant
- *	device here. If we don't know about it then the legacy driver
- *	is the right driver anyway.
- */
-
-static void __init legacy_check_special_cases(struct pci_dev *p, int *primary,
-								int *secondary)
-{
-	/* Cyrix CS5510 pre SFF MWDMA ATA on the bridge */
-	if (p->vendor == 0x1078 && p->device == 0x0000) {
-		*primary = *secondary = 1;
-		return;
-	}
-	/* Cyrix CS5520 pre SFF MWDMA ATA on the bridge */
-	if (p->vendor == 0x1078 && p->device == 0x0002) {
-		*primary = *secondary = 1;
-		return;
-	}
-	/* Intel MPIIX - PIO ATA on non PCI side of bridge */
-	if (p->vendor == 0x8086 && p->device == 0x1234) {
-		u16 r;
-		pci_read_config_word(p, 0x6C, &r);
-		if (r & 0x8000) {
-			/* ATA port enabled */
-			if (r & 0x4000)
-				*secondary = 1;
-			else
-				*primary = 1;
-		}
-		return;
-	}
-}
-
 static __init void probe_opti_vlb(void)
 {
 	/* If an OPTI 82C46X is present find out where the channels are */
@@ -1210,26 +1168,7 @@ static __init int legacy_init(void)
 	struct legacy_probe *pl = &probe_list[0];
 	int slot = 0;
 
-	struct pci_dev *p = NULL;
-
-	for_each_pci_dev(p) {
-		int r;
-		/* Check for any overlap of the system ATA mappings. Native
-		   mode controllers stuck on these addresses or some devices
-		   in 'raid' mode won't be found by the storage class test */
-		for (r = 0; r < 6; r++) {
-			if (pci_resource_start(p, r) == 0x1f0)
-				primary = 1;
-			if (pci_resource_start(p, r) == 0x170)
-				secondary = 1;
-		}
-		/* Check for special cases */
-		legacy_check_special_cases(p, &primary, &secondary);
-
-		/* If PCI bus is present then don't probe for tertiary
-		   legacy ports */
-		pci_present = 1;
-	}
+	ata_legacy_check_iobases(&primary, &secondary, &pci_present);
 
 	if (winbond == 1)
 		winbond = 0x130;	/* Default port, alt is 1B0 */
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 11de32c..0470562 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -30,6 +30,7 @@
 #define __LINUX_ATA_H__
 
 #include <linux/types.h>
+#include <linux/pci.h>
 
 /* defines only for the constants which don't work well as enums */
 #define ATA_DMA_BOUNDARY	0xffffUL
@@ -776,4 +777,70 @@ static inline int lba_48_ok(u64 block, u32 n_block)
 #define sata_pmp_gscr_rev(gscr)		(((gscr)[SATA_PMP_GSCR_REV] >> 8) & 0xff)
 #define sata_pmp_gscr_ports(gscr)	((gscr)[SATA_PMP_GSCR_PORT_INFO] & 0xf)
 
+/**
+ *	legacy_check_special_cases	-	ATA special cases
+ *	@p: PCI device to check
+ *	@master: set this if we find an ATA master
+ *	@master: set this if we find an ATA secondary
+ *
+ *	A small number of vendors implemented early PCI ATA interfaces
+ *	on bridge logic without the ATA interface being PCI visible.
+ *	Where we have a matching PCI driver we must skip the relevant
+ *	device here. If we don't know about it then the legacy driver
+ *	is the right driver anyway.
+ */
+static inline void __init ata_legacy_check_special_cases(struct pci_dev *p,
+							 int *primary,
+							 int *secondary)
+{
+	/* Cyrix CS5510 pre SFF MWDMA ATA on the bridge */
+	if (p->vendor == 0x1078 && p->device == 0x0000) {
+		*primary = *secondary = 1;
+		return;
+	}
+	/* Cyrix CS5520 pre SFF MWDMA ATA on the bridge */
+	if (p->vendor == 0x1078 && p->device == 0x0002) {
+		*primary = *secondary = 1;
+		return;
+	}
+	/* Intel MPIIX - PIO ATA on non PCI side of bridge */
+	if (p->vendor == 0x8086 && p->device == 0x1234) {
+		u16 r;
+		pci_read_config_word(p, 0x6C, &r);
+		if (r & 0x8000) {
+			/* ATA port enabled */
+			if (r & 0x4000)
+				*secondary = 1;
+			else
+				*primary = 1;
+		}
+		return;
+	}
+}
+
+static inline void __init ata_legacy_check_iobases(int *primary, int *secondary,
+						   int *pci_present)
+{
+	struct pci_dev *p = NULL;
+
+	for_each_pci_dev(p) {
+		int r;
+		/* Check for any overlap of the system ATA mappings. Native
+		   mode controllers stuck on these addresses or some devices
+		   in 'raid' mode won't be found by the storage class test */
+		for (r = 0; r < 6; r++) {
+			if (pci_resource_start(p, r) == 0x1f0)
+				*primary = 1;
+			if (pci_resource_start(p, r) == 0x170)
+				*secondary = 1;
+		}
+		/* Check for special cases */
+		ata_legacy_check_special_cases(p, primary, secondary);
+
+		/* If PCI bus is present then don't probe for tertiary
+		   legacy ports */
+		*pci_present = 1;
+	}
+}
+
 #endif /* __LINUX_ATA_H__ */
-- 
1.5.5.4

-- 
Regards/Gruss,
    Boris.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/