drivers: ahci: write upper 32 bits for clb and fis registers
PATCH 1/1 drivers: ahci: write upper 32 bits for clb and fis registers
If 64-bit capability is supported, commandlistbase and fis base should be split as lower32 and upper32. upper32 should be written to PORT_(LST/FIS)_ADDR_HI.
---
Changes v1:
- add macro definitions for LOWER32, UPPER32
drivers/ata/ahci.c | 14 ++++++++++++-- include/ahci.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/ata/ahci.c +12 -2
@@ -27,6 +27,9 @@#include <dm/device-internal.h> #include <dm/lists.h> +#define LOWER32 (val) (u32)((u64)(val) & 0xFFFFFFFF) +#define UPPER32 (val) (u32)(((u64)(val) & 0xFFFFFFFF00000000ULL) >> 32) +static int ata_io_flush (struct ahci_uc_priv *uc_priv,u8 port);#ifndef CONFIG_DM_SCSI
@@ -607,10 +610,17 @@ static int ahci_port_start(struct ahci_uc_priv *uc_priv, u8 port) pp->cmd_tbl_sg = (struct ahci_sg *)(uintptr_t )virt_to_phys ((void *)mem); -writel_with_flush ((unsigned long )pp->cmd_slot, +if (uc_priv->cap &HOST_CAP_64 ) +writel_with_flush (cpu_to_le32 (UPPER32 (pp->cmd_slot)), + port_mmio +PORT_LST_ADDR_HI ); +writel_with_flush (cpu_to_le32 (LOWER32 (pp->cmd_slot)), port_mmio +PORT_LST_ADDR ); -writel_with_flush (pp->rx_fis, port_mmio +PORT_FIS_ADDR ); +if (uc_priv->cap &HOST_CAP_64 ) +writel_with_flush (cpu_to_le32 (UPPER32 (pp->rx_fis)), + port_mmio +PORT_FIS_ADDR_HI ); +writel_with_flush (cpu_to_le32 (LOWER32 (pp->rx_fis)), + port_mmio +PORT_FIS_ADDR );#ifdef CONFIG_SUNXI_AHCI sunxi_dma_init (port_mmio);
include/ahci.h +1 -0
@@ -40,6 +40,7 @@#define HOST_RESET (1 << 0)/* reset controller; self-clear */ #define HOST_IRQ_EN (1 << 1)/* global IRQ enable */ #define HOST_AHCI_EN (1 << 31)/* AHCI enabled */ +#define HOST_CAP_64 (1 << 31)/* 64bit addressing capability */ /* Registers for each SATA port */ #define PORT_LST_ADDR 0x00/* command list DMA addr */
Signature · 1 line
2.7.4
PATCH 1/1 drivers: ahci: write upper 32 bits for clb and fis registers
Quoted 7 lines · Suneel Garapati
If 64-bit capability is supported, commandlistbase and fis base should be split as lower32 and upper32. upper32 should be written to PORT_(LST/FIS)_ADDR_HI.
Signed-off-by Suneel Garapati <[email protected]>---
Quoted 7 lines
Changes v1:
- add macro definitions for LOWER32, UPPER32drivers/ata/ahci.c | 14 ++++++++++++-- include/ahci.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-)
PATCH 1/1 drivers: ahci: write upper 32 bits for clb and fis registers
In reply to Suneel GarapatiQuoted 10 lines · Suneel Garapati
If 64-bit capability is supported, commandlistbase and fis base should be split as lower32 and upper32. upper32 should be written to PORT_(LST/FIS)_ADDR_HI.
Signed-off-by Suneel Garapati <[email protected]>Reviewed-by Simon Glass <[email protected]>---
Changes v1:
- add macro definitions for LOWER32, UPPER32
This introduces warnings on 32bit platforms:
In file included from /home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/fsl_lbc.h:465:0,
from /home/trini/work/u-boot/u-boot/include/mpc86xx.h:10,
from /home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/ppc.h:20,
from /home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/u-boot.h:19,
from /home/trini/work/u-boot/u-boot/include/image.h:42,
from /home/trini/work/u-boot/u-boot/include/common.h:36,
from /home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:12:
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c: In function ‘ahci_port_start’:
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:31:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define UPPER32(val) (u32)(((u64)(val) & 0xFFFFFFFF00000000ULL) >> 32)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:3: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:33: note: in expansion of macro ‘UPPER32’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:31:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define UPPER32(val) (u32)(((u64)(val) & 0xFFFFFFFF00000000ULL) >> 32)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:3: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:33: note: in expansion of macro ‘UPPER32’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:31:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define UPPER32(val) (u32)(((u64)(val) & 0xFFFFFFFF00000000ULL) >> 32)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:3: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:33: note: in expansion of macro ‘UPPER32’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:31:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define UPPER32(val) (u32)(((u64)(val) & 0xFFFFFFFF00000000ULL) >> 32)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:3: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:33: note: in expansion of macro ‘UPPER32’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:31:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define UPPER32(val) (u32)(((u64)(val) & 0xFFFFFFFF00000000ULL) >> 32)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:3: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:33: note: in expansion of macro ‘UPPER32’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:31:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define UPPER32(val) (u32)(((u64)(val) & 0xFFFFFFFF00000000ULL) >> 32)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:3: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:614:33: note: in expansion of macro ‘UPPER32’
writel_with_flush(cpu_to_le32(UPPER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:30:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define LOWER32(val) (u32)((u64)(val) & 0xFFFFFFFF)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:2: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:32: note: in expansion of macro ‘LOWER32’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:30:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define LOWER32(val) (u32)((u64)(val) & 0xFFFFFFFF)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:2: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:32: note: in expansion of macro ‘LOWER32’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:30:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define LOWER32(val) (u32)((u64)(val) & 0xFFFFFFFF)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:2: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:32: note: in expansion of macro ‘LOWER32’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:30:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define LOWER32(val) (u32)((u64)(val) & 0xFFFFFFFF)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:2: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:32: note: in expansion of macro ‘LOWER32’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:30:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define LOWER32(val) (u32)((u64)(val) & 0xFFFFFFFF)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:2: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/swab.h:86:2: note: in expansion of macro ‘___swab32’
___swab32((x)) : \
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:32: note: in expansion of macro ‘LOWER32’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:30:28: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define LOWER32(val) (u32)((u64)(val) & 0xFFFFFFFF)
^
/home/trini/work/u-boot/u-boot/arch/powerpc/include/asm/io.h:34:57: note: in definition of macro ‘writel’
#define writel(b,addr) out_le32((volatile u32 *)(addr),(b))
^/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:2: note: in expansion of macro ‘writel_with_flush’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^/home/trini/work/u-boot/u-boot/include/linux/byteorder/big_endian.h:34:43: note: in expansion of macro ‘__swab32’
#define __cpu_to_le32(x) ((__force __le32)__swab32((x)))
^
/home/trini/work/u-boot/u-boot/include/linux/byteorder/generic.h:89:21: note: in expansion of macro ‘__cpu_to_le32’
#define cpu_to_le32 __cpu_to_le32
^
/home/trini/work/u-boot/u-boot/drivers/ata/ahci.c:616:32: note: in expansion of macro ‘LOWER32’
writel_with_flush(cpu_to_le32(LOWER32(pp->cmd_slot)),
^Try building for ls1021aqds_sdcard_qspi for example. Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170913/bc13c5d1/attachment.sig>