armv7: fsl: remove sata support
Subsystems (2)
PATCH 1/4 armv7: fsl: remove sata support
Remove the old implementation in order to enable DM for sata
--- arch/arm/cpu/armv7/ls102xa/Makefile | 1 - arch/arm/cpu/armv7/ls102xa/ls102xa_sata.c | 41 --------------------- arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 27 -------------- arch/arm/include/asm/arch-ls102xa/ls102xa_sata.h | 10 ----- board/freescale/ls1021aiot/ls1021aiot.c | 5 --- board/freescale/ls1021aqds/ls1021aqds.c | 4 -- board/freescale/ls1021atwr/ls1021atwr.c | 4 -- 7 files changed, 0 insertions(+), 92 deletions(-) delete mode 100644 arch/arm/cpu/armv7/ls102xa/ls102xa_sata.c delete mode 100644 arch/arm/include/asm/arch-ls102xa/ls102xa_sata.h
arch/arm/cpu/armv7/ls102xa/Makefile +0 -1
@@ -10,7 +10,6 @@ obj-y += timer.o obj-y += fsl_epu.o obj-y += soc.o -obj-$(CONFIG_SCSI_AHCI_PLAT) += ls102xa_sata.o obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-$(CONFIG_SYS_HAS_SERDES) += fsl_ls1_serdes.o ls102xa_serdes.o obj-$(CONFIG_SPL) += spl.o
arch/arm/cpu/armv7/ls102xa/ls102xa_sata.c deleted +0 -41
41 lines not on this page · raw message
arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +0 -27
@@ -389,33 +389,6 @@ struct ccsr_serdes {u8 res_a00[0x1000 -0xa00 ];/* from 0xa00 to 0xfff */ }; - - -/* AHCI (sata) register map */ -struct ccsr_ahci { -u32 res1[0xa4 /4 ];/* 0x0 - 0xa4 */ -u32 pcfg;/* port config */ -u32 ppcfg;/* port phy1 config */ -u32 pp2c;/* port phy2 config */ -u32 pp3c;/* port phy3 config */ -u32 pp4c;/* port phy4 config */ -u32 pp5c;/* port phy5 config */ -u32 paxic;/* port AXI config */ -u32 axicc;/* AXI cache control */ -u32 axipc;/* AXI PROT control */ -u32 ptc;/* port Trans Config */ -u32 pts;/* port Trans Status */ -u32 plc;/* port link config */ -u32 plc1;/* port link config1 */ -u32 plc2;/* port link config2 */ -u32 pls;/* port link status */ -u32 pls1;/* port link status1 */ -u32 pcmdc;/* port CMD config */ -u32 ppcs;/* port phy control status */ -u32 pberr;/* port 0/1 BIST error */ -u32 cmds;/* port 0/1 CMD status error */ -}; -#define RCPM_POWMGTCSR 0x130#define RCPM_POWMGTCSR_SERDES_PW 0x80000000#define RCPM_POWMGTCSR_LPM20_REQ 0x00100000
arch/arm/include/asm/arch-ls102xa/ls102xa_sata.h deleted +0 -10
@@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright 2015 Freescale Semiconductor, Inc. -*/ - -#ifndef __FSL_SATA_H_ -#define __FSL_SATA_H_ - -int ls1021a_sata_init (void ); -#endif
board/freescale/ls1021aiot/ls1021aiot.c +0 -5
@@ -11,7 +11,6 @@#include <asm/arch/ls102xa_devdis.h> #include <asm/arch/ls102xa_soc.h> -#include <asm/arch/ls102xa_sata.h> #include <fsl_csu.h> #include <fsl_esdhc.h> #include <fsl_immap.h>
@@ -206,10 +205,6 @@ int board_init(void)#ifdef CONFIG_BOARD_LATE_INIT int board_late_init (void ) { -#ifdef CONFIG_SCSI_AHCI_PLAT -ls1021a_sata_init (); -#endif -return 0 ; }#endif
board/freescale/ls1021aqds/ls1021aqds.c +0 -4
@@ -11,7 +11,6 @@#include <asm/arch/fsl_serdes.h> #include <asm/arch/ls102xa_soc.h> #include <asm/arch/ls102xa_devdis.h> -#include <asm/arch/ls102xa_sata.h> #include <hwconfig.h> #include <mmc.h> #include <fsl_csu.h>
@@ -362,9 +361,6 @@ int config_serdes_mux(void)#ifdef CONFIG_BOARD_LATE_INIT int board_late_init (void ) { -#ifdef CONFIG_SCSI_AHCI_PLAT -ls1021a_sata_init (); -#endif #ifdef CONFIG_CHAIN_OF_TRUST fsl_setenv_chain_of_trust ();#endif
board/freescale/ls1021atwr/ls1021atwr.c +0 -4
@@ -11,7 +11,6 @@#include <asm/arch/fsl_serdes.h> #include <asm/arch/ls102xa_devdis.h> #include <asm/arch/ls102xa_soc.h> -#include <asm/arch/ls102xa_sata.h> #include <hwconfig.h> #include <mmc.h> #include <fsl_csu.h>
@@ -556,9 +555,6 @@ void spl_board_init(void)#ifdef CONFIG_BOARD_LATE_INIT int board_late_init (void ) { -#ifdef CONFIG_SCSI_AHCI_PLAT -ls1021a_sata_init (); -#endif #ifdef CONFIG_CHAIN_OF_TRUST fsl_setenv_chain_of_trust ();#endif
Signature · 1 line
1.7.1
PATCH 2/4 armv7: dts: fsl-ls1021a: add sata node support enable sata for ls1021a-qds and ls1021a-twr
Add sata node to support this feature.
--- arch/arm/dts/ls1021a-qds.dtsi | 4 ++++ arch/arm/dts/ls1021a-twr.dtsi | 4 ++++ arch/arm/dts/ls1021a.dtsi | 7 +++++++ 3 files changed, 15 insertions(+), 0 deletions(-)
arch/arm/dts/ls1021a-qds.dtsi +4 -0
@@ -212,3 +212,7 @@ &uart1 { status = "okay"; }; + +&sata { + status = "okay"; +};
arch/arm/dts/ls1021a-twr.dtsi +4 -0
@@ -103,3 +103,7 @@ &uart1 { status = "okay"; }; + +&sata { + status = "okay"; +};
arch/arm/dts/ls1021a.dtsi +7 -0
@@ -404,5 +404,12 @@ ranges = <0x81000000 0x0 0x00000000 0x34020000 0x0 0x00010000 /* downstream I/O */ 0x82000000 0x0 0x38000000 0x38000000 0x0 0x08000000>; /* non-prefetchable memory */ }; + + sata: sata at 3200000 { + compatible = "fsl,ls1021a-ahci"; + reg = <0x3200000 0x10000>; + interrupts = <0 101 4>; + status = "disabled"; + }; }; };
Signature · 1 line
1.7.1
PATCH 3/4 arm: ls1021atwr: enable DM support for sata
In reply to Peng MaEnable related configs to support sata DM feature.
--- configs/ls1021atwr_nor_defconfig | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
configs/ls1021atwr_nor_defconfig +5 -0
@@ -50,3 +50,8 @@ CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_BLK=y CONFIG_DM_MMC=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y +CONFIG_AHCI=y
Signature · 1 line
1.7.1
PATCH 3/4 arm: ls1021atwr: enable DM support for sata
Quoted 13 lines · Peng Ma
Enable related configs to support sata DM feature.
Signed-off-by Peng Ma <[email protected]>--- configs/ls1021atwr_nor_defconfig | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)configs/ls1021atwr_nor_defconfig +0
-0
configs/ls1021atwr_nor_defconfig CONFIG_VIDEO=y · line 57
Quoted 8 lines
configs/ls1021atwr_nor_defconfig +5
-0@@ -50,3 +50,8 @@ CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_BLK=y CONFIG_DM_MMC=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y +CONFIG_AHCI=y
Peng,
Your code base has CONFIG_BLK=y but upstream code doesn't have it. Please rebase your patches and verify before sending another version.
Thanks.
York
PATCH 3/4 arm: ls1021atwr: enable DM support for sata
Hi York,
This patch depend on https://patchwork.ozlabs.org/patch/941093/ , I forgot to write depend on. Could I add "depend on" in My patch at V3 or not?
Best regards
Peng Ma
-----Original Message-----
From: York Sun
Sent: 2018年8月8日 5:49
To: Peng Ma <[email protected]>
Cc: albert.u.boot at aribaud.net; feng.li_2 at nxp.com; Alison Wang <[email protected]>; sumit.garg at nxp.com; Sriram Dash <[email protected]>; suresh.bhagat at nxp.com; Ran Wang <[email protected]>; Rajesh Bhagat <[email protected]>; Ashish Kumar <[email protected]>; michal.simek at xilinx.com; sjg at chromium.org; Andy Tang <[email protected]>; u-boot at lists.denx.de
Subject: Re: [PATCH 3/4] arm: ls1021atwr: enable DM support for sata
Quoted 13 lines · Peng Ma
Enable related configs to support sata DM feature.
Signed-off-by Peng Ma <[email protected]>--- configs/ls1021atwr_nor_defconfig | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)configs/ls1021atwr_nor_defconfig +0
-0
configs/ls1021atwr_nor_defconfig CONFIG_VIDEO=y · line 57
Quoted 8 lines
configs/ls1021atwr_nor_defconfig +5
-0@@ -50,3 +50,8 @@ CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_BLK=y CONFIG_DM_MMC=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y +CONFIG_AHCI=y
Peng,
Your code base has CONFIG_BLK=y but upstream code doesn't have it. Please rebase your patches and verify before sending another version.
Thanks.
York
PATCH 3/4 arm: ls1021atwr: enable DM support for sata
Quoted 3 lines · Peng Ma
Hi York,
This patch depend on https://patchwork.ozlabs.org/patch/941093/ , I forgot to write depend on. Could I add "depend on" in My patch at V3 or not?
Do not send another version for this explanation. The patch set you depend on need to change. I see v4 for that set, but the first patch is not right. Please respond to my comment for that patch
https://patchwork.ozlabs.org/patch/953746/.
York
PATCH 4/4 scsi: ceva: add ls1021a soc support.
In reply to Peng MaAdd ahci compatible support for ls1021a soc.
--- drivers/ata/sata_ceva.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)
drivers/ata/sata_ceva.c +23 -0
@@ -82,13 +82,24 @@#define CEVA_TRANS_CFG 0x08000029#define CEVA_AXICC_CFG 0x3fffffff +/* for ls1021a */ +#define LS1021_AHCI_VEND_AXICC 0xC0 +#define LS1021_CEVA_PHY2_CFG 0x28183414 +#define LS1021_CEVA_PHY3_CFG 0x0e080e06 +#define LS1021_CEVA_PHY4_CFG 0x064a080b +#define LS1021_CEVA_PHY5_CFG 0x2aa86470 +/* ecc addr-val pair */ #define ECC_DIS_ADDR_CH2 0x80000000#define ECC_DIS_VAL_CH2 0x20140520 +#define SATA_ECC_REG_ADDR 0x20220520 +#define SATA_ECC_DISABLE 0x00020000enum ceva_soc {CEVA_1V84 ,CEVA_LS1012A , +CEVA_LS1021A ,CEVA_LS1043A , };
@@ -115,6 +126,18 @@ static int ceva_init_sata(struct ceva_sata_priv *priv)writel (tmp, base +AHCI_VEND_PTC );break ; +case CEVA_LS1021A : +writel (SATA_ECC_DISABLE ,SATA_ECC_REG_ADDR ); +writel (CEVA_PHY1_CFG , base +AHCI_VEND_PPCFG ); +writel (LS1021_CEVA_PHY2_CFG , base +AHCI_VEND_PP2C ); +writel (LS1021_CEVA_PHY3_CFG , base +AHCI_VEND_PP3C ); +writel (LS1021_CEVA_PHY4_CFG , base +AHCI_VEND_PP4C ); +writel (LS1021_CEVA_PHY5_CFG , base +AHCI_VEND_PP5C ); +writel (CEVA_TRANS_CFG , base +AHCI_VEND_PTC ); +if (priv->flag &FLAG_COHERENT ) +writel (CEVA_AXICC_CFG , base +LS1021_AHCI_VEND_AXICC ); +break ; +case CEVA_LS1012A :case CEVA_LS1043A :writel (ECC_DIS_ADDR_CH2 ,ECC_DIS_VAL_CH2 );
@@ -147,6 +170,7 @@ static int sata_ceva_probe(struct udevice *dev)static const struct udevice_id sata_ceva_ids[] = { { .compatible ="ceva,ahci-1v84" , .data =CEVA_1V84 }, { .compatible ="fsl,ls1012a-ahci" , .data =CEVA_LS1012A }, + { .compatible ="fsl,ls1021a-ahci" , .data =CEVA_LS1021A }, { .compatible ="fsl,ls1043a-ahci" , .data =CEVA_LS1043A }, { } };
Signature · 1 line
1.7.1
PATCH 4/4 scsi: ceva: add ls1021a soc support.
Quoted 56 lines · Peng Ma
Add ahci compatible support for ls1021a soc.
Signed-off-by Peng Ma <[email protected]>--- drivers/ata/sata_ceva.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)drivers/ata/sata_ceva.c +22
-0@@ -82,13 +82,24 @@#define CEVA_TRANS_CFG 0x08000029#define CEVA_AXICC_CFG 0x3fffffff +/* for ls1021a */ +#define LS1021_AHCI_VEND_AXICC 0xC0 +#define LS1021_CEVA_PHY2_CFG 0x28183414 +#define LS1021_CEVA_PHY3_CFG 0x0e080e06 +#define LS1021_CEVA_PHY4_CFG 0x064a080b +#define LS1021_CEVA_PHY5_CFG v + /* ecc addr-val pair */c#define ECC_DIS_ADDR_CH2 0x80000000#define ECC_DIS_VAL_CH2 0x20140520 +#define SATA_ECC_REG_ADDR 0x20220520 +#define SATA_ECC_DISABLE 0x00020000enum ceva_soc {CEVA_1V84 ,CEVA_LS1012A , +CEVA_LS1021A ,CEVA_LS1043A , };@@ -115,6 +126,18 @@ static int ceva_init_sata(struct ceva_sata_priv *priv)writel (tmp, base +AHCI_VEND_PTC );break ; +case CEVA_LS1021A : +writel (SATA_ECC_DISABLE ,SATA_ECC_REG_ADDR ); +writel (CEVA_PHY1_CFG , base +AHCI_VEND_PPCFG ); +writel (LS1021_CEVA_PHY2_CFG , base +AHCI_VEND_PP2C ); +writel (LS1021_CEVA_PHY3_CFG , base +AHCI_VEND_PP3C ); +writel (LS1021_CEVA_PHY4_CFG , base +AHCI_VEND_PP4C ); +writel (LS1021_CEVA_PHY5_CFG , base +AHCI_VEND_PP5C ); +writel (CEVA_TRANS_CFG , base +AHCI_VEND_PTC ); +if (priv->flag &FLAG_COHERENT ) +writel (CEVA_AXICC_CFG , base +LS1021_AHCI_VEND_AXICC ); +break ; +case CEVA_LS1012A :case CEVA_LS1043A :writel (ECC_DIS_ADDR_CH2 ,ECC_DIS_VAL_CH2 );
drivers/ata/sata_ceva.c static int sata_ceva_probe(struct udevice *dev) · line 176
Quoted 7 lines
drivers/ata/sata_ceva.c +1
-0@@ -147,6 +170,7 @@ static int sata_ceva_probe(struct udevice *dev)static const struct udevice_id sata_ceva_ids[] = { { .compatible ="ceva,ahci-1v84" , .data =CEVA_1V84 }, { .compatible ="fsl,ls1012a-ahci" , .data =CEVA_LS1012A }, + { .compatible ="fsl,ls1021a-ahci" , .data =CEVA_LS1021A }, { .compatible ="fsl,ls1043a-ahci" , .data =CEVA_LS1043A }, { } };
Thanks,
Michal
PATCH 4/4 scsi: ceva: add ls1021a soc support.
In reply to Peng MaQuoted 13 lines · Peng Ma
Add ahci compatible support for ls1021a soc.
Signed-off-by Peng Ma <[email protected]>Acked-by Michal Simek <[email protected]>--- drivers/ata/sata_ceva.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)drivers/ata/sata_ceva.c +2
-0writel (tmp, base +AHCI_VEND_PTC );break ; +case CEVA_LS1021A : +writel (SATA_ECC_DISABLE ,SATA_ECC_REG_ADDR );
drivers/ata/sata_ceva.c static int ceva_init_sata(struct ceva_sata_priv *priv) · line 140
Quoted 10 lines
drivers/ata/sata_ceva.c +10
-0+writel (CEVA_PHY1_CFG , base +AHCI_VEND_PPCFG ); +writel (LS1021_CEVA_PHY2_CFG , base +AHCI_VEND_PP2C ); +writel (LS1021_CEVA_PHY3_CFG , base +AHCI_VEND_PP3C ); +writel (LS1021_CEVA_PHY4_CFG , base +AHCI_VEND_PP4C ); +writel (LS1021_CEVA_PHY5_CFG , base +AHCI_VEND_PP5C ); +writel (CEVA_TRANS_CFG , base +AHCI_VEND_PTC ); +if (priv->flag &FLAG_COHERENT ) +writel (CEVA_AXICC_CFG , base +LS1021_AHCI_VEND_AXICC ); +break ; +
Peng,
Looks this this patch is corrupted. Is the above change at line 116?
York
PATCH 1/4 armv7: fsl: remove sata support
In reply to Peng MaQuoted 4 lines · Peng Ma
Remove the old implementation in order to enable DM for sata
Signed-off-by Peng Ma <[email protected]>---
This patch set has been applied to fsl-qoriq master, awaiting upstream. Thanks.
York