ata: update the libata.h from ata.h of linux kernel
PATCH 1/1 ata: update the libata.h from ata.h of linux kernel
Current libata.h of u-boot is out of sync from linux kernel, this patch make it be consistent with linux kernel.
Signed-off-by Dave Liu <[email protected]>
Signed-off-by Tor Krill <[email protected]>
--- drivers/block/fsl_sata.c | 14 +- include/libata.h | 644 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 561 insertions(+), 97 deletions(-)
drivers/block/fsl_sata.c +7 -7
@@ -600,7 +600,7 @@ static u32 fsl_sata_rw_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_wr cfis->fis_type =SATA_FIS_TYPE_REGISTER_H2D ; cfis->pm_port_c =0x80 ;/* is command */ - cfis->command = (is_write) ?ATA_CMD_WRITE_DMA :ATA_CMD_READ_DMA ; + cfis->command = (is_write) ?ATA_CMD_WRITE :ATA_CMD_READ ; cfis->device =ATA_LBA ; cfis->device |= (block >>24 ) &0xf ;
@@ -625,7 +625,7 @@ void fsl_sata_flush_cache(int dev) cfis->fis_type =SATA_FIS_TYPE_REGISTER_H2D ; cfis->pm_port_c =0x80 ;/* is command */ - cfis->command =ATA_CMD_FLUSH_CACHE ; + cfis->command =ATA_CMD_FLUSH ;fsl_sata_exec_cmd (sata, cfis,CMD_ATA ,0 ,NULL ,0 ); }
@@ -645,8 +645,8 @@ static u32 fsl_sata_rw_cmd_ext(int dev, u32 start, u32 blkcnt, u8 *buffer, int i cfis->fis_type =SATA_FIS_TYPE_REGISTER_H2D ; cfis->pm_port_c =0x80 ;/* is command */ - cfis->command = (is_write) ?ATA_CMD_WRITE_DMA_EXT - :ATA_CMD_READ_DMA_EXT ; + cfis->command = (is_write) ?ATA_CMD_WRITE_EXT + :ATA_CMD_READ_EXT ; cfis->lba_high_exp = (block >>40 ) &0xff ; cfis->lba_mid_exp = (block >>32 ) &0xff ;
@@ -683,8 +683,8 @@ u32 fsl_sata_rw_ncq_cmd(int dev, u32 start, u32 blkcnt, u8 *buffer, int is_write cfis->fis_type =SATA_FIS_TYPE_REGISTER_H2D ; cfis->pm_port_c =0x80 ;/* is command */ - cfis->command = (is_write) ?ATA_CMD_WRITE_FPDMA_QUEUED - :ATA_CMD_READ_FPDMA_QUEUED ; + cfis->command = (is_write) ?ATA_CMD_FPDMA_WRITE + :ATA_CMD_FPDMA_READ ; cfis->lba_high_exp = (block >>40 ) &0xff ; cfis->lba_mid_exp = (block >>32 ) &0xff ;
@@ -719,7 +719,7 @@ void fsl_sata_flush_cache_ext(int dev) cfis->fis_type =SATA_FIS_TYPE_REGISTER_H2D ; cfis->pm_port_c =0x80 ;/* is command */ - cfis->command =ATA_CMD_FLUSH_CACHE_EXT ; + cfis->command =ATA_CMD_FLUSH_EXT ;fsl_sata_exec_cmd (sata, cfis,CMD_ATA ,0 ,NULL ,0 ); }
include/libata.h +554 -90
706 lines not on this page · raw message
Signature · 1 line
1.5.4.rc4
Wolfgang Denk
AppliedPATCH 1/1 ata: update the libata.h from ata.h of linux kernel
Quoted 9 lines · In message <[email protected]> you wrote:
Current
libata.hof u-boot is out of sync from linux kernel, this patch make it be consistent with linux kernel.Signed-off-by Dave Liu <[email protected]>Signed-off-by Tor Krill <[email protected]>--- drivers/block/fsl_sata.c | 14 +- include/libata.h | 644 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 561 insertions(+), 97 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Why waste negative entropy on comments, when you could use the same entropy to create bugs instead?" - Steve Elias