[U-Boot-Users] [PATCH v1 2/5] ATA: Add the libata support

Tor Krill tor at excito.com
Wed Mar 19 10:35:35 CET 2008



Hi again,

After some further work with these pathces. (I currently work on a
SIL3114 driver using them)

It seems like there is a "lot" of code duplication in libata.h and the
existant ata.h. Thus making it impossible to include both ones. Which i
would like to do.

Pasted below is the modifications i did to do to get it working.

Could one perhaps merge the differences? Or is there other suggestions on
how to solve this?

/Tor

--- ../u-boot/include/ata.h	2008-02-28 07:40:55.000000000 +0100
+++ u-boot/include/ata.h	2008-03-18 11:53:43.000000000 +0100
@@ -84,43 +84,45 @@
 #define ATA_LBA		0xE0

 enum {
-	ATA_MAX_DEVICES = 1,	/* per bus/port */
-	ATA_MAX_PRD = 256,	/* we could make these 256/256 */
-	ATA_SECT_SIZE = 256,	/*256 words per sector */
+	ATA_MAX_DEVICES 	= 1,	/* per bus/port */
+	ATA_MAX_PRD 		= 256,	/* we could make these 256/256 */
+	ATA_SECT_SIZE 		= 256,	/*256 words per sector */

 	/* bits in ATA command block registers */
-	ATA_HOB = (1 << 7),	/* LBA48 selector */
-	ATA_NIEN = (1 << 1),	/* disable-irq flag */
-	/*ATA_LBA                 = (1 << 6), */ /* LBA28 selector */
-	ATA_DEV1 = (1 << 4),	/* Select Device 1 (slave) */
-	ATA_DEVICE_OBS = (1 << 7) | (1 << 5),	/* obs bits in dev reg */
-	ATA_DEVCTL_OBS = (1 << 3),	/* obsolete bit in devctl reg */
-	ATA_BUSY = (1 << 7),	/* BSY status bit */
-	ATA_DRDY = (1 << 6),	/* device ready */
-	ATA_DF = (1 << 5),	/* device fault */
-	ATA_DRQ = (1 << 3),	/* data request i/o */
-	ATA_ERR = (1 << 0),	/* have an error */
-	ATA_SRST = (1 << 2),	/* software reset */
-	ATA_ABORTED = (1 << 2),	/* command aborted */
+	ATA_HOB			= (1 << 7),	/* LBA48 selector */
+	ATA_NIEN		= (1 << 1),	/* disable-irq flag */
+	/*ATA_LBA			= (1 << 6),	*//* LBA28 selector */
+	ATA_DEV1 		= (1 << 4),	/* Select Device 1 (slave) */
+	ATA_DEVICE_OBS 	= (1 << 7) | (1 << 5),	/* obs bits in dev reg */
+	ATA_DEVCTL_OBS 	= (1 << 3),	/* obsolete bit in devctl reg */
+	ATA_BUSY 		= (1 << 7),	/* BSY status bit */
+	ATA_DRDY 		= (1 << 6),	/* device ready */
+	ATA_DF 			= (1 << 5),	/* device fault */
+	ATA_DRQ			= (1 << 3),	/* data request i/o */
+	ATA_ERR			= (1 << 0),	/* have an error */
+	ATA_SRST		= (1 << 2),	/* software reset */
+	ATA_ABORTED		= (1 << 2),	/* command aborted */
 	/* ATA command block registers */
-	ATA_REG_DATA = 0x00,
-	ATA_REG_ERR = 0x01,
-	ATA_REG_NSECT = 0x02,
-	ATA_REG_LBAL = 0x03,
-	ATA_REG_LBAM = 0x04,
-	ATA_REG_LBAH = 0x05,
-	ATA_REG_DEVICE = 0x06,
-	ATA_REG_STATUS = 0x07,
-	ATA_PCI_CTL_OFS = 0x02,
+	ATA_REG_DATA 	= 0x00,
+	ATA_REG_ERR 	= 0x01,
+	ATA_REG_NSECT	= 0x02,
+	ATA_REG_LBAL	= 0x03,
+	ATA_REG_LBAM	= 0x04,
+	ATA_REG_LBAH	= 0x05,
+	ATA_REG_DEVICE	= 0x06,
+	ATA_REG_STATUS	= 0x07,
+	ATA_PCI_CTL_OFS	= 0x02,
 	/* and their aliases */
-	ATA_REG_FEATURE = ATA_REG_ERR,
-	ATA_REG_CMD = ATA_REG_STATUS,
-	ATA_REG_BYTEL = ATA_REG_LBAM,
-	ATA_REG_BYTEH = ATA_REG_LBAH,
-	ATA_REG_DEVSEL = ATA_REG_DEVICE,
-	ATA_REG_IRQ = ATA_REG_NSECT,
+	ATA_REG_FEATURE	= ATA_REG_ERR,
+	ATA_REG_CMD		= ATA_REG_STATUS,
+	ATA_REG_BYTEL	= ATA_REG_LBAM,
+	ATA_REG_BYTEH	= ATA_REG_LBAH,
+	ATA_REG_DEVSEL	= ATA_REG_DEVICE,
+	ATA_REG_IRQ		= ATA_REG_NSECT,
+};

-	/* SETFEATURES stuff */
+/* SETFEATURES stuff */
+enum ata_set_features{
 	SETFEATURES_XFER = 0x03,
 	XFER_UDMA_7 = 0x47,
 	XFER_UDMA_6 = 0x46,
@@ -130,9 +132,13 @@
 	XFER_UDMA_2 = 0x42,
 	XFER_UDMA_1 = 0x41,
 	XFER_UDMA_0 = 0x40,
+	XFER_MW_DMA_4	= 0x24, /* CFA only */
+	XFER_MW_DMA_3	= 0x23, /* CFA only */
 	XFER_MW_DMA_2 = 0x22,
 	XFER_MW_DMA_1 = 0x21,
 	XFER_MW_DMA_0 = 0x20,
+	XFER_PIO_6		= 0x0E, /* CFA only */
+	XFER_PIO_5		= 0x0D, /* CFA only */
 	XFER_PIO_4 = 0x0C,
 	XFER_PIO_3 = 0x0B,
 	XFER_PIO_2 = 0x0A,
@@ -141,8 +147,14 @@
 	XFER_SW_DMA_2 = 0x12,
 	XFER_SW_DMA_1 = 0x11,
 	XFER_SW_DMA_0 = 0x10,
-	XFER_PIO_SLOW = 0x00
+	XFER_PIO_SLOW = 0x00,
+
+	SETFEATURES_WC_ON	= 0x02, /* Enable write cache */
+	SETFEATURES_WC_OFF	= 0x82, /* Disable write cache */
+
+	SETFEATURES_SPINUP	= 0x07, /* Spin-up drive */
 };
+
 /*
  * ATA Commands (only mandatory commands listed here)
  */
--- work/include/libata.h	2008-03-19 08:49:47.000000000 +0100
+++ u-boot/include/libata.h	2008-03-18 11:56:02.000000000 +0100
@@ -47,38 +47,6 @@
 	ATA_CMD_WRITE_FPDMA_QUEUED	= 0x61,
 };

-/* SETFEATURES stuff
- */
-enum ata_set_features {
-	/* SETFEATURES stuff */
-	SETFEATURES_XFER	= 0x03,
-	XFER_UDMA_7		= 0x47,
-	XFER_UDMA_6		= 0x46,
-	XFER_UDMA_5		= 0x45,
-	XFER_UDMA_4		= 0x44,
-	XFER_UDMA_3		= 0x43,
-	XFER_UDMA_2		= 0x42,
-	XFER_UDMA_1		= 0x41,
-	XFER_UDMA_0		= 0x40,
-	XFER_MW_DMA_4		= 0x24, /* CFA only */
-	XFER_MW_DMA_3		= 0x23, /* CFA only */
-	XFER_MW_DMA_2		= 0x22,
-	XFER_MW_DMA_1		= 0x21,
-	XFER_MW_DMA_0		= 0x20,
-	XFER_PIO_6		= 0x0E, /* CFA only */
-	XFER_PIO_5		= 0x0D, /* CFA only */
-	XFER_PIO_4		= 0x0C,
-	XFER_PIO_3		= 0x0B,
-	XFER_PIO_2		= 0x0A,
-	XFER_PIO_1		= 0x09,
-	XFER_PIO_0		= 0x08,
-	XFER_PIO_SLOW		= 0x00,
-
-	SETFEATURES_WC_ON	= 0x02, /* Enable write cache */
-	SETFEATURES_WC_OFF	= 0x82, /* Disable write cache */
-
-	SETFEATURES_SPINUP	= 0x07, /* Spin-up drive */
-};

 enum ata_protocol {
 	ATA_PROT_UNKNOWN,	/* unknown */
@@ -99,27 +67,10 @@
 };

 enum {
-	ATA_SECT_SIZE		= 512,
 	ATA_MAX_SECTORS_128	= 128,
 	ATA_MAX_SECTORS		= 256,
 	ATA_MAX_SECTORS_LBA48	= 65535,

-	/* bits in ATA command block registers */
-	ATA_HOB			= (1 << 7),	/* LBA48 selector */
-	ATA_NIEN		= (1 << 1),	/* disable-irq flag */
-	ATA_LBA			= (1 << 6),	/* LBA28 selector */
-	ATA_DEV1		= (1 << 4),	/* Select Device 1 (slave) */
-	ATA_BUSY		= (1 << 7),	/* BSY status bit */
-	ATA_DRDY		= (1 << 6),	/* device ready */
-	ATA_DF			= (1 << 5),	/* device fault */
-	ATA_DRQ			= (1 << 3),	/* data request i/o */
-	ATA_ERR			= (1 << 0),	/* have an error */
-	ATA_SRST		= (1 << 2),	/* software reset */
-	ATA_ICRC		= (1 << 7),	/* interface CRC error */
-	ATA_UNC			= (1 << 6),	/* uncorrectable media error */
-	ATA_IDNF		= (1 << 4),	/* ID not found */
-	ATA_ABORTED		= (1 << 2),	/* command aborted */
-
 	ATA_ID_WORDS		= 256,
 	ATA_ID_SERNO		= 10,
 	ATA_ID_FW_REV		= 23,
@@ -193,5 +144,5 @@
 }

 int sata_init(void);
-
+void ata_dump_id(u16 *id);
 #endif /* __LIBATA_H__ */




More information about the U-Boot mailing list