| Message ID | 1504717175-11844-1-git-send-email-suneelglinux@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,v1] drivers: ahci: write upper 32 bits for clb and fis registers | expand |
On 6 September 2017 at 10:59, Suneel Garapati <suneelglinux@gmail.com> wrote: > 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 <suneelglinux@gmail.com> > --- > > Changes v1: > - add macro definitions for LOWER32, UPPER32 > > > drivers/ata/ahci.c | 14 ++++++++++++-- > include/ahci.h | 1 + > 2 files changed, 13 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Wed, Sep 06, 2017 at 09:59:35AM -0700, Suneel Garapati wrote: > 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 <suneelglinux@gmail.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > 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!
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 5e4df19..178d9a7 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -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); diff --git a/include/ahci.h b/include/ahci.h index 33171b7..80e7f13 100644 --- a/include/ahci.h +++ b/include/ahci.h @@ -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 */
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 <suneelglinux@gmail.com> --- Changes v1: - add macro definitions for LOWER32, UPPER32 drivers/ata/ahci.c | 14 ++++++++++++-- include/ahci.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-)