Revert "ata: fsl_ahci: Add sata DM support for Freescale powerpc socs"
PATCH v3 1/5 Revert "ata: fsl_ahci: Add sata DM support for Freescale powerpc socs"
This reverts commit 1ee494291880fd51ef0c5f7342e072bdb069d7ff.
Commit 1ee494291880 ("ata: fsl_ahci: Add sata DM support for Freescale powerpc socs") introduced SCSI layer to call AHCI private API in order to support sata operations, In DM mode, This is not necessary for non-AHCI sata. So revert it and have already updated the driver itself to operate sata directly.
---
Changed for v3:
- make rebase.
- add Reviewed-by.
drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/fsl_ahci.c | 1031 ---------------------------------------- drivers/ata/fsl_sata.h | 1 - 4 files changed, 1043 deletions(-) delete mode 100644 drivers/ata/fsl_ahci.c
drivers/ata/Kconfig +0 -10
@@ -59,16 +59,6 @@ config DWC_AHCI Enable this driver to support Sata devices through Synopsys DWC AHCI module. -config FSL_AHCI - bool "Enable Freescale AHCI driver support" - select SCSI_AHCI - depends on AHCI - depends on DM_SCSI - help - Enable this driver to support Sata devices found in - some Freescale PowerPC SoCs. - - config DWC_AHSATA bool "Enable DWC AHSATA driver support" select LIBATA
drivers/ata/Makefile +0 -1
@@ -4,7 +4,6 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. obj-$(CONFIG_DWC_AHCI) += dwc_ahci.o -obj-$(CONFIG_FSL_AHCI) += fsl_ahci.o obj-$(CONFIG_AHCI) += ahci-uclass.o obj-$(CONFIG_AHCI_PCI) += ahci-pci.o obj-$(CONFIG_SCSI_AHCI) += ahci.o
drivers/ata/fsl_ahci.c deleted +0 -1031
1,031 lines not on this page · raw message
drivers/ata/fsl_sata.h +0 -1
@@ -313,7 +313,6 @@ typedef struct fsl_sata {int wcache;int flush;int flush_ext; -u32 dma_flag; } fsl_sata_t;#define READ_CMD 0
Signature · 1 line
2.17.1
PATCH v3 2/5 Revert "powerpc: mpc85xx: delete FSL_SATA for T2080QDS board."
This reverts commit 856b9cdb53f0e6c8d98f81cf71ef363c16b0aa0e.
Commit 856b9cdb53f0 ("powerpc: mpc85xx: delete FSL_SATA for T2080QDS board.") is to fit support sata DM mode, Now the driver will be reverted, So revert it.
---
Changed for v3:
- make rebase.
- add Reviewed-by.
arch/powerpc/cpu/mpc85xx/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/cpu/mpc85xx/Kconfig +3 -1
@@ -352,6 +352,7 @@ config TARGET_T2080QDS select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE select FSL_DDR_INTERACTIVE + imply CMD_SATA config TARGET_T2080RDB bool "Support T2080RDB"
@@ -360,7 +361,6 @@ config TARGET_T2080RDB select SUPPORT_SPL select PHYS_64BIT imply CMD_SATA - imply FSL_SATA imply PANIC_HANG config TARGET_T2081QDS
@@ -1099,8 +1099,10 @@ config ARCH_T2080 select SYS_FSL_SEC_COMPAT_4 select SYS_PPC64 select FSL_IFC + imply CMD_SATA imply CMD_NAND imply CMD_REGINFO + imply FSL_SATA config ARCH_T2081 bool
Signature · 1 line
2.17.1
PATCH v3 3/5 Revert "configs: enable sata device module in T2080QDS"
In reply to Peng MaThis reverts commit 02dc1599ba0b16eb21ba0c206e5b6f38fe7b67a7
Commit 02dc1599ba0b ("configs: enable sata, eSDHC, USB device module in T2080QDS")
has some sata defconfig changes to fit support DM mode, Now the driver will be reverted, So revert it.
---
Changed for v3:
- make rebase.
- add Reviewed-by.
configs/T2080QDS_NAND_defconfig | 4 ---- configs/T2080QDS_SDCARD_defconfig | 4 ---- configs/T2080QDS_SECURE_BOOT_defconfig | 4 +--- configs/T2080QDS_SPIFLASH_defconfig | 4 ---- configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 4 ---- configs/T2080QDS_defconfig | 4 ---- 6 files changed, 1 insertion(+), 23 deletions(-)
configs/T2080QDS_NAND_defconfig +0 -4
@@ -9,7 +9,6 @@ CONFIG_ENV_OFFSET=0x140000 CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y -CONFIG_AHCI=y CONFIG_SPL_TEXT_BASE=0xFFFD8000 CONFIG_SYS_CUSTOM_LDSCRIPT=y CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
@@ -47,7 +46,6 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y -CONFIG_FSL_AHCI=y CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y
@@ -73,8 +71,6 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_FSL=y CONFIG_SYS_QE_FMAN_FW_IN_NAND=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y
configs/T2080QDS_SDCARD_defconfig +0 -4
@@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0x100000 CONFIG_SPL=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y -CONFIG_AHCI=y CONFIG_SPL_TEXT_BASE=0xFFFD8000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y
@@ -45,7 +44,6 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y -CONFIG_FSL_AHCI=y CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y
@@ -70,8 +68,6 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_FSL=y CONFIG_SYS_QE_FMAN_FW_IN_MMC=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -3
@@ -5,7 +5,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y -CONFIG_AHCI=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y
@@ -57,8 +56,6 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_FSL=y CONFIG_SYS_QE_FMAN_FW_IN_NOR=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y
@@ -68,3 +65,4 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +-CONFIG_FSL_AHCI=y
configs/T2080QDS_SPIFLASH_defconfig +0 -4
@@ -12,7 +12,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y -CONFIG_AHCI=y CONFIG_SPL_TEXT_BASE=0xFFFD8000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y
@@ -48,7 +47,6 @@ CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_DM=y -CONFIG_FSL_AHCI=y CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y
@@ -73,8 +71,6 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_FSL=y CONFIG_SYS_QE_FMAN_FW_IN_SPIFLASH=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +0 -4
@@ -4,7 +4,6 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y -CONFIG_AHCI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y
@@ -30,7 +29,6 @@ CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_ENV_IS_IN_REMOTE=y CONFIG_ENV_ADDR=0xFFE20000 CONFIG_DM=y -CONFIG_FSL_AHCI=y CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y
@@ -50,8 +48,6 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_FSL=y CONFIG_SYS_QE_FMAN_FW_IN_REMOTE=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y
configs/T2080QDS_defconfig +0 -4
@@ -5,7 +5,6 @@ CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_MPC85xx=y CONFIG_TARGET_T2080QDS=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y -CONFIG_AHCI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y
@@ -33,7 +32,6 @@ CONFIG_DEFAULT_DEVICE_TREE="t2080qds" CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_AHCI=y CONFIG_FSL_CAAM=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y
@@ -58,8 +56,6 @@ CONFIG_DM_PCI=y CONFIG_DM_PCI_COMPAT=y CONFIG_PCIE_FSL=y CONFIG_SYS_QE_FMAN_FW_IN_NOR=y -CONFIG_SCSI=y -CONFIG_DM_SCSI=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_FSL_ESPI=y
Signature · 1 line
2.17.1
PATCH v3 4/5 arch: powerpc: Rewrite the sata node to fit the driver
In reply to Peng MaThe sata of our powerpc platforms are updated. These changes is to fit the driver probe.
---
Changed for v3:
- make rebase.
- add Reviewed-by.
arch/powerpc/dts/t2080.dtsi | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
arch/powerpc/dts/t2080.dtsi +4 -11
@@ -88,20 +88,13 @@ phy_type = "utmi"; }; - sata0: sata at 220000 { + sata: sata at 220000 { compatible = "fsl,pq-sata-v2"; reg = <0x220000 0x1000>; interrupts = <68 0x2 0 0>; - sata-number = <0x0>; - sata-fpdma = <0x0>; - }; - - sata1: sata at 221000 { - compatible = "fsl,pq-sata-v2"; - reg = <0x221000 0x1000>; - interrupts = <69 0x2 0 0>; - sata-number = <0x0>; - sata-fpdma = <0x0>; + sata-offset = <0x1000>; + sata-number = <2>; + sata-fpdma = <0>; }; };
Signature · 1 line
2.17.1
PATCH v3 5/5 ata: fsl_sata: Update fsl sata header file
In reply to Peng MaThe variable(dma_flag) will be used by both fsl_ahci.c and fsl_sata.c, Now we support the fsl_sata.c to DM mode and revert fsl_ahci.c(This variable declare here). So we should Add this change.
---
Changed for v3:
- make rebase.
- add Reviewed-by.
drivers/ata/fsl_sata.h | 1 + 1 file changed, 1 insertion(+)
drivers/ata/fsl_sata.h +1 -0
@@ -313,6 +313,7 @@ typedef struct fsl_sata {int wcache;int flush;int flush_ext; +u32 dma_flag; } fsl_sata_t;#define READ_CMD 0
Signature · 1 line
2.17.1
PATCH v3 1/5 Revert "ata: fsl_ahci: Add sata DM support for Freescale powerpc socs"
In reply to Peng MaQuoted 24 lines
-----Original Message-----
From: Peng Ma <[email protected]>
Sent: Tuesday, December 17, 2019 3:34 PM
To: sjg at chromium.org; Priyanka Jain <[email protected]>; Marcel Ziswiler <[email protected]>; Andy Tang <[email protected]>
Cc: u-boot at lists.denx.de; Peng Ma <[email protected]>
Subject: [v3 1/5] Revert "ata:fsl_ahci: Add sata DM support for Freescale powerpc socs"This reverts commit
1ee494291880fd51ef0c5f7342e072bdb069d7ff.Commit
1ee494291880("ata:fsl_ahci: Add sata DM support for Freescale powerpc socs") introduced SCSI layer to call AHCI private API in order to support sata operations, In DM mode, This is not necessary for non-AHCI sata. So revert it and have already updated the driver itself to operate sata directly.Reviewed-by Stefan Roese <[email protected]>Signed-off-by Peng Ma <[email protected]>---
Changed for v3:
- make rebase.
- add Reviewed-by.
Quoted 6 lines
drivers/ata/Kconfig | 10 - drivers/ata/Makefile | 1 - drivers/ata/fsl_ahci.c | 1031 ---------------------------------------- drivers/ata/fsl_sata.h | 1 - 4 files changed, 1043 deletions(-)delete mode 100644
drivers/ata/fsl_ahci.c
<snip>
Getting below compilation error with this patch:
"drivers/ata/fsl_sata.c: In function init_sata:drivers/ata/fsl_sata.c:131:6: error: fsl_sata_t {aka struct fsl_sata} has no member named dma_flag
sata->dma_flag = fsl_sata_info[dev].flags;"
I do see a patch "ata: fsl_sata: Update fsl sata header file" later in the series which fixes this.
But as per the process, each individual patch in series should apply cleanly and does not break compilation of existing platforms. Re-order/merge accordingly.
Thanks
Priyanka