LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ata: ahci: Fix usage on big-endian platforms 

This patch adds a few missing virt_to_phys() to use the correct physical
address for DMA operations in the common AHCI code. This is done to
support the big-endian MIPS Octeon platform.

Additionally the code a cleaned up a bit (remove some empty lines) and
made a bit better readable.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Aaron Williams <awilliams@marvell.com>
Cc: Chandrakala Chavva <cchavva@marvell.com>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:
Stefan Roese 2021-04-07 09:12:35 +02:00
parent 089884dbac
commit d960a70efb
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/ata/ahci.c
View File

@ -500,6 +500,7 @@ static int ahci_fill_sg(struct ahci_uc_priv *uc_priv, u8 port,
{ {
struct ahci_ioports *pp = &(uc_priv->port[port]); struct ahci_ioports *pp = &(uc_priv->port[port]);
struct ahci_sg *ahci_sg = pp->cmd_tbl_sg; struct ahci_sg *ahci_sg = pp->cmd_tbl_sg;
phys_addr_t pa = virt_to_phys(buf);
u32 sg_count; u32 sg_count;
int i; int i;
@ -510,9 +511,6 @@ static int ahci_fill_sg(struct ahci_uc_priv *uc_priv, u8 port,
} }
for (i = 0; i < sg_count; i++) { for (i = 0; i < sg_count; i++) {
/* We assume virt=phys */
phys_addr_t pa = (unsigned long)buf + i * MAX_DATA_BYTE_COUNT;
ahci_sg->addr = cpu_to_le32(lower_32_bits(pa)); ahci_sg->addr = cpu_to_le32(lower_32_bits(pa));
ahci_sg->addr_hi = cpu_to_le32(upper_32_bits(pa)); ahci_sg->addr_hi = cpu_to_le32(upper_32_bits(pa));
if (ahci_sg->addr_hi && !(uc_priv->cap & AHCI_CAP_S64A)) { if (ahci_sg->addr_hi && !(uc_priv->cap & AHCI_CAP_S64A)) {
@ -520,25 +518,26 @@ static int ahci_fill_sg(struct ahci_uc_priv *uc_priv, u8 port,
return -1; return -1;
} }
ahci_sg->flags_size = cpu_to_le32(0x3fffff & ahci_sg->flags_size = cpu_to_le32(0x3fffff &
(buf_len < MAX_DATA_BYTE_COUNT (buf_len < MAX_DATA_BYTE_COUNT ?
? (buf_len - 1) (buf_len - 1) :
: (MAX_DATA_BYTE_COUNT - 1))); (MAX_DATA_BYTE_COUNT - 1)));
ahci_sg++; ahci_sg++;
buf_len -= MAX_DATA_BYTE_COUNT; buf_len -= MAX_DATA_BYTE_COUNT;
pa += MAX_DATA_BYTE_COUNT;
} }
return sg_count; return sg_count;
} }
static void ahci_fill_cmd_slot(struct ahci_ioports *pp, u32 opts) static void ahci_fill_cmd_slot(struct ahci_ioports *pp, u32 opts)
{ {
phys_addr_t pa = virt_to_phys((void *)pp->cmd_tbl);
pp->cmd_slot->opts = cpu_to_le32(opts); pp->cmd_slot->opts = cpu_to_le32(opts);
pp->cmd_slot->status = 0; pp->cmd_slot->status = 0;
pp->cmd_slot->tbl_addr = cpu_to_le32((u32)pp->cmd_tbl & 0xffffffff); pp->cmd_slot->tbl_addr = cpu_to_le32(lower_32_bits(pa));
#ifdef CONFIG_PHYS_64BIT #ifdef CONFIG_PHYS_64BIT
pp->cmd_slot->tbl_addr_hi = pp->cmd_slot->tbl_addr_hi = cpu_to_le32(upper_32_bits(pa));
cpu_to_le32((u32)(((pp->cmd_tbl) >> 16) >> 16));
#endif #endif
} }
@ -674,12 +673,12 @@ static int ahci_device_data_io(struct ahci_uc_priv *uc_priv, u8 port, u8 *fis,
ahci_dcache_invalidate_range((unsigned long)buf, ahci_dcache_invalidate_range((unsigned long)buf,
(unsigned long)buf_len); (unsigned long)buf_len);
debug("%s: %d byte transferred.\n", __func__, pp->cmd_slot->status); debug("%s: %d byte transferred.\n", __func__,
le32_to_cpu(pp->cmd_slot->status));
return 0; return 0;
} }
static char *ata_id_strcpy(u16 *target, u16 *src, int len) static char *ata_id_strcpy(u16 *target, u16 *src, int len)
{ {
int i; int i;