Skip to contentSkip to conversation

Canyonlands SATA harddisk driver

PATCH New Kazuaki Ichinohe 2 participants 2 messages May 13, 2009 – May 14, 2009 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Canyonlands SATA harddisk driver

This patch adds a SATA harddisk driver for the canyonlands. This patch is kernel driver's porting.
This pach corresponded to not cmd_scsi but cmd_sata.

[environment variable, boot script]
setenv bootargs root=/dev/sda7 rw
setenv bootargs ${bootargs} console=ttyS0,115200 ext2load sata 0:2 0x400000 /canyonlands/uImage ext2load sata 0:2 0x800000 /canyonlands/canyonlands.dtb fdt addr 0x800000 0x4000
bootm 0x400000 - 0x800000

If you drive SATA-2 disk on Canyonlands, you must change parts from PI2PCIE212 to PI2PCIE2212 on U25. We confirmed to boot by using following disk.

1.Vender: Fujitsu Type: MHW2040BS
2.Vender: Fujitsu Type: MHW2060BK
3.Vendor: HAGIWARA SYS-COM:HFD25S-032GT
4.Vender: WesternDigital Type: WD3200BJKT (CONFIG_LBA48 required) 5.Vender: WesternDigital Type: WD3200BEVT (CONFIG_LBA48 required) 6.Vender: hitachi Type: HTS543232L9A300 (CONFIG_LBA48 required) 7.Vender: Seagate Type: ST31000333AS (CONFIG_LBA48 required) 8.Vender: Transcend Type: TS32GSSD25S-M
9.Vender: MTRON Type: MSD-SATA1525-016

---

drivers/block/Makefile +1 -0
diff -uprN u-boot-0512/drivers/block/Makefile u-boot-sata/drivers/block/Makefile
@@ -31,6 +31,7 @@ COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o
 COBJS-$(CONFIG_IDE_SIL680) += sil680.o
 COBJS-$(CONFIG_LIBATA) += libata.o
 COBJS-$(CONFIG_PATA_BFIN) += pata_bfin.o
+COBJS-$(CONFIG_SATA_DWC) += sata_dwc.o
 COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
 COBJS-$(CONFIG_SCSI_AHCI) += ahci.o
 COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
drivers/block/sata_dwc.c +2110 -0

2,110 lines not on this page · raw message

drivers/block/sata_dwc.h +463 -0

463 lines not on this page · raw message

include/configs/canyonlands.h +14 -0
diff -uprN u-boot-0512/include/configs/canyonlands.h u-boot-sata/include/configs/canyonlands.h
@@ -451,6 +451,7 @@
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PCI
+#define CONFIG_CMD_SATA
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_USB
@@ -516,6 +517,19 @@
 #endif /* CONFIG_ARCHES */
 #endif /* CONFIG_460GT */
 
+/*
+ * S-ATA driver setup
+ */
+#ifdef CONFIG_CMD_SATA
+#define CONFIG_SATA_DWC
+#define CONFIG_LIBATA
+#define SATA_BASE_ADDR		0xe20d1000	/* PPC460EX SATA Base Address */
+#define SATA_DMA_REG_ADDR	0xe20d0800	/* PPC460EX SATA Base Address */
+#define CONFIG_SYS_SATA_MAX_DEVICE	1	/* SATA MAX DEVICE */
+/* Convert sectorsize to wordsize */
+#define ATA_SECTOR_WORDS (ATA_SECT_SIZE/2)
+#endif
+
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup
  *----------------------------------------------------------------------*/
#1 lore raw

PATCH 1/1 Canyonlands SATA harddisk driver

Quoted 26 lines · On Wednesday 13 May 2009 10:56:00 Kazuaki Ichinohe wrote:

This patch adds a SATA harddisk driver for the canyonlands. This patch is kernel driver's porting.
This pach corresponded to not cmd_scsi but cmd_sata.

[environment variable, boot script]
setenv bootargs root=/dev/sda7 rw
setenv bootargs ${bootargs} console=ttyS0,115200 ext2load sata 0:2 0x400000 /canyonlands/uImage ext2load sata 0:2 0x800000 /canyonlands/canyonlands.dtb fdt addr 0x800000 0x4000
bootm 0x400000 - 0x800000

If you drive SATA-2 disk on Canyonlands, you must change parts from PI2PCIE212 to PI2PCIE2212 on U25. We confirmed to boot by using following disk.

1.Vender: Fujitsu Type: MHW2040BS
2.Vender: Fujitsu Type: MHW2060BK
3.Vendor: HAGIWARA SYS-COM:HFD25S-032GT
4.Vender: WesternDigital Type: WD3200BJKT (CONFIG_LBA48 required) 5.Vender: WesternDigital Type: WD3200BEVT (CONFIG_LBA48 required) 6.Vender: hitachi Type: HTS543232L9A300 (CONFIG_LBA48 required) 7.Vender: Seagate Type: ST31000333AS (CONFIG_LBA48 required) 8.Vender: Transcend Type: TS32GSSD25S-M
9.Vender: MTRON Type: MSD-SATA1525-016

Quoted 1 line

This finally looks good. :)

Some comments below.

Quoted 4 lines

+++ u-boot-sata/drivers/block/sata_dwc.c 2009-05-07 09:37:53.000000000
+0900 @@ -0,0 +1,2110 @@
+/*
+ * sata_dwc.c

<snip>

drivers/block/sata_dwc.c line 460

Quoted 2 lines
drivers/block/sata_dwc.c +2 -0
+	if ((nsect == 0x55) && (lbal == 0xaa)) {
+		printf("we found a device\n");
		printf("Device found\n");

drivers/block/sata_dwc.c line 462

Quoted 2 lines
drivers/block/sata_dwc.c +2 -0
+	} else {
+		printf("Not found a device.\n");
		printf("No device found\n");

drivers/block/sata_dwc.c line 468

Quoted 6 lines
drivers/block/sata_dwc.c +6 -0
+		dev_state = SATA_NODEVICE;
+		return FALSE;
+	}
+
+	tmp = ATA_DEVICE_OBS;
+	writeb(tmp,ioaddr->device_addr);

Add a space after the ",".

Review

Quoted 1 line
(quoted diff) +1 -0
+	writeb(ap->ctl,ioaddr->ctl_addr);

Here again...

drivers/block/sata_dwc.c line 476

Quoted 7 lines
drivers/block/sata_dwc.c +7 -0
+
+	udelay(200);
+
+	writeb(ap->ctl | ATA_SRST, ioaddr->ctl_addr);
+
+	udelay(200);
+	writeb(ap->ctl,ioaddr->ctl_addr);

And here again. I won't mention this again. Please check the whole source for such missing spaces.

<snip>

Quoted 1 line

+int scan_sata (int dev)

Please remove the space before "(". Use a consistent coding style in this file. So check for other occurrences too.

drivers/block/sata_dwc.c line 542

Quoted 12 lines
drivers/block/sata_dwc.c +12 -0
+{
+	int i;
+	int rc;
+	u8 status;
+	const u16 *id;
+	struct ata_device *ata_dev = &ata_device;
+	unsigned long pio_mask, mwdma_mask, udma_mask;
+	unsigned long xfer_mask;
+	char revbuf[7];
+	u16 iobuf[ATA_SECTOR_WORDS];
+
+	memset ( iobuf, 0, sizeof(iobuf));
	memset(iobuf, 0, sizeof(iobuf));

drivers/block/sata_dwc.c line 547

Quoted 5 lines
drivers/block/sata_dwc.c +5 -0
+
+	if (dev_state == SATA_NODEVICE)
+		return 1;
+
+	printf("waitng for device ready.");
	printf("Waiting for device...");

There are two places where "waiting" is misspelled. Please fix both.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================