ARM: kirkwood: lsxl: enable DM for SATA
cover ARM: kirkwood: lsxl: enable DM for SATA
Please note that this patchset depends on the following series:
https://patchwork.ozlabs.org/cover/1055937/
(ARM: kirkwood: migrate to DM_USB)
https://patchwork.ozlabs.org/patch/1054403/
(sata: sata_mv: Add DM support to enable CONFIG_BLK usage)
Michael Walle (4):
sata: sata_mv: use correct format specifier in debug()
sata: sata_mv: support kirkwood architecture
sata: sata_mv: add orion-sata compatible string
arm: kirkwood: lsxl: enable DM for SATA
configs/lschlv2_defconfig | 4 ++-- configs/lsxhl_defconfig | 4 ++-- drivers/ata/sata_mv.c | 10 +++++----- include/configs/lsxl.h | 23 ++++++++++------------- 4 files changed, 19 insertions(+), 22 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/4 sata: sata_mv: use correct format specifier in debug()
This fixes a compile error on kirkwood.
--- drivers/ata/sata_mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ata/sata_mv.c +1 -1
@@ -727,7 +727,7 @@ static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr,u8 *addr;int max_blks; -debug ("%s: %ld %ld\n" , __func__, blknr, blkcnt); +debug ("%s: " LBAFU " " LBAFU "\n" , __func__, blknr, blkcnt); start = blknr; blks = blkcnt;
Signature · 1 line
2.11.0
PATCH 1/4 sata: sata_mv: use correct format specifier in debug()
Quoted 4 lines · Michael Walle
This fixes a compile error on kirkwood.
Signed-off-by Michael Walle <[email protected]>
Quoted 20 lines
--- drivers/ata/sata_mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/ata/sata_mv.c +1
-2@@ -727,7 +727,7 @@ static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr,u8 *addr;int max_blks; -debug ("%s: %ld %ld\n" , __func__, blknr, blkcnt); +debug ("%s: " LBAFU " " LBAFU "\n" , __func__, blknr, blkcnt); start = blknr; blks = blkcnt; --2.11.0
PATCH 1/4 sata: sata_mv: use correct format specifier in debug()
In reply to Michael WalleQuoted 13 lines · Michael Walle
This fixes a compile error on kirkwood.
Signed-off-by Michael Walle <[email protected]>--- drivers/ata/sata_mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/ata/sata_mv.c +0
-0
drivers/ata/sata_mv.c static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr, · line 733
Quoted 8 lines
drivers/ata/sata_mv.c +1
-1@@ -727,7 +727,7 @@ static u32 ata_low_level_rw(struct udevice *dev, int port, lbaint_t blknr,u8 *addr;int max_blks; -debug ("%s: %ld %ld\n" , __func__, blknr, blkcnt); +debug ("%s: " LBAFU " " LBAFU "\n" , __func__, blknr, blkcnt); start = blknr; blks = blkcnt;
Thanks,
Stefan
PATCH 1/4 sata: sata_mv: use correct format specifier in debug()
In reply to Michael WalleQuoted 3 lines · Michael Walle
This fixes a compile error on kirkwood.
Signed-off-by Michael Walle <[email protected]>
Applied to u-boot-marvell/master.
Thanks,
Stefan
PATCH 2/4 sata: sata_mv: support kirkwood architecture
In reply to Michael WalleFix the worng include and offset macros.
--- drivers/ata/sata_mv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/ata/sata_mv.c +3 -4
@@ -44,11 +44,10 @@#include <asm/io.h> #include <linux/mbus.h> +#include <asm/arch/soc.h> #if defined(CONFIG_KIRKWOOD ) -#include <asm/arch/kirkwood.h> #define SATAHC_BASE KW_SATA_BASE#else -#include <asm/arch/soc.h> #define SATAHC_BASE MVEBU_AXP_SATA_BASE#endif
@@ -218,8 +217,8 @@ struct crqb {#define CRQB_SECTCOUNT_COUNT_EXP_MASK (0xff << 8)#define CRQB_SECTCOUNT_COUNT_EXP_SHIFT 8 -#define MVSATA_WIN_CONTROL (w) (MVEBU_AXP_SATA_BASE + 0x30 + ((w) << 4)) -#define MVSATA_WIN_BASE (w) (MVEBU_AXP_SATA_BASE + 0x34 + ((w) << 4)) +#define MVSATA_WIN_CONTROL (w) (SATAHC_BASE + 0x30 + ((w) << 4)) +#define MVSATA_WIN_BASE (w) (SATAHC_BASE + 0x34 + ((w) << 4))struct eprd {u32 phyaddr_low;
Signature · 1 line
2.11.0
PATCH 2/4 sata: sata_mv: support kirkwood architecture
Quoted 2 lines · Michael Walle
Fix the worng include and offset macros.
Typo worng -> wrong
Quoted 12 lines
Signed-off-by Michael Walle <[email protected]>--- drivers/ata/sata_mv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/ata/sata_mv.c +0
-0@@ -44,11 +44,10 @@#include <asm/io.h>
drivers/ata/sata_mv.c line 52
Quoted 10 lines
drivers/ata/sata_mv.c +1
-2#include <linux/mbus.h> +#include <asm/arch/soc.h> #if defined(CONFIG_KIRKWOOD ) -#include <asm/arch/kirkwood.h> #define SATAHC_BASE KW_SATA_BASE#else -#include <asm/arch/soc.h> #define SATAHC_BASE MVEBU_AXP_SATA_BASE#endif
It might be a better idea to update these defines to be definitions for these in the soc.h. We're already doing this for some other peripheral blocks between mach-kirkwood and mach-mvebu. On the other hand SATAHC_BASE already achieves this so maybe it's not worth bothering.
Quoted 15 lines
drivers/ata/sata_mv.c +2
-3@@ -218,8 +217,8 @@ struct crqb {#define CRQB_SECTCOUNT_COUNT_EXP_MASK (0xff << 8)#define CRQB_SECTCOUNT_COUNT_EXP_SHIFT 8 -#define MVSATA_WIN_CONTROL (w) (MVEBU_AXP_SATA_BASE + 0x30 + ((w) << 4)) -#define MVSATA_WIN_BASE (w) (MVEBU_AXP_SATA_BASE + 0x34 + ((w) << 4)) +#define MVSATA_WIN_CONTROL (w) (SATAHC_BASE + 0x30 + ((w) << 4)) +#define MVSATA_WIN_BASE (w) (SATAHC_BASE + 0x34 + ((w) << 4))struct eprd {u32 phyaddr_low; --2.11.0
PATCH 2/4 sata: sata_mv: support kirkwood architecture
Quoted 20 lines · Chris Packham
Quoted 2 lines · Michael Walle
Fix the worng include and offset macros.
Typo worng -> wrong
Quoted 14 lines
Signed-off-by Michael Walle <[email protected]>--- drivers/ata/sata_mv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/ata/sata_mv.c +0
-0@@ -44,11 +44,10 @@#include <asm/io.h> #include <linux/mbus.h>
Quoted 14 lines
drivers/ata/sata_mv.c line 52
Quoted 8 lines
drivers/ata/sata_mv.c +1
-2+#include <asm/arch/soc.h> #if defined(CONFIG_KIRKWOOD ) -#include <asm/arch/kirkwood.h> #define SATAHC_BASE KW_SATA_BASE#else -#include <asm/arch/soc.h> #define SATAHC_BASE MVEBU_AXP_SATA_BASE#endif It might be a better idea to update these defines to be definitions for these in the
soc.h. We're already doing this for some other peripheral blocks between mach-kirkwood and mach-mvebu. On the other handSATAHC_BASEalready achieves this so maybe it's not worth bothering.
I'm fine with this change for now. *If* we change something here, we might make the step towards address probing via DT. But that's some future work, if it's really worth it. As we most likely won't see new platforms with new addresses to support any more.
Thanks,
Stefan
PATCH 2/4 sata: sata_mv: support kirkwood architecture
In reply to Michael WalleQuoted 26 lines · Michael Walle
Fix the worng include and offset macros.
Signed-off-by Michael Walle <[email protected]>--- drivers/ata/sata_mv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/ata/sata_mv.c +1
-2@@ -44,11 +44,10 @@#include <asm/io.h> #include <linux/mbus.h> +#include <asm/arch/soc.h> #if defined(CONFIG_KIRKWOOD ) -#include <asm/arch/kirkwood.h> #define SATAHC_BASE KW_SATA_BASE#else -#include <asm/arch/soc.h> #define SATAHC_BASE MVEBU_AXP_SATA_BASE#endif
drivers/ata/sata_mv.c struct crqb { · line 224
Quoted 10 lines
drivers/ata/sata_mv.c +2
-2@@ -218,8 +217,8 @@ struct crqb {#define CRQB_SECTCOUNT_COUNT_EXP_MASK (0xff << 8)#define CRQB_SECTCOUNT_COUNT_EXP_SHIFT 8 -#define MVSATA_WIN_CONTROL (w) (MVEBU_AXP_SATA_BASE + 0x30 + ((w) << 4)) -#define MVSATA_WIN_BASE (w) (MVEBU_AXP_SATA_BASE + 0x34 + ((w) << 4)) +#define MVSATA_WIN_CONTROL (w) (SATAHC_BASE + 0x30 + ((w) << 4)) +#define MVSATA_WIN_BASE (w) (SATAHC_BASE + 0x34 + ((w) << 4))struct eprd {u32 phyaddr_low;
Thanks,
Stefan
PATCH 2/4 sata: sata_mv: support kirkwood architecture
In reply to Michael WalleQuoted 3 lines · Michael Walle
Fix the worng include and offset macros.
Signed-off-by Michael Walle <[email protected]>
Applied to u-boot-marvell/master.
Thanks,
Stefan
PATCH 3/4 sata: sata_mv: add orion-sata compatible string
In reply to Michael WalleThe kirkwood devices are compatible with this driver.
--- drivers/ata/sata_mv.c | 1 + 1 file changed, 1 insertion(+)
drivers/ata/sata_mv.c +1 -0
@@ -1079,6 +1079,7 @@ static int sata_mv_scan(struct udevice *dev)static const struct udevice_id sata_mv_ids[] = { { .compatible ="marvell,armada-370-sata" }, + { .compatible ="marvell,orion-sata" }, { } };
Signature · 1 line
2.11.0
PATCH 3/4 sata: sata_mv: add orion-sata compatible string
Quoted 4 lines · Michael Walle
The kirkwood devices are compatible with this driver.
Signed-off-by Michael Walle <[email protected]>
Quoted 19 lines
--- drivers/ata/sata_mv.c | 1 + 1 file changed, 1 insertion(+)drivers/ata/sata_mv.c +1
-1@@ -1079,6 +1079,7 @@ static int sata_mv_scan(struct udevice *dev)static const struct udevice_id sata_mv_ids[] = { { .compatible ="marvell,armada-370-sata" }, + { .compatible ="marvell,orion-sata" }, { } }; --2.11.0
PATCH 3/4 sata: sata_mv: add orion-sata compatible string
In reply to Michael WalleQuoted 13 lines · Michael Walle
The kirkwood devices are compatible with this driver.
Signed-off-by Michael Walle <[email protected]>--- drivers/ata/sata_mv.c | 1 + 1 file changed, 1 insertion(+)drivers/ata/sata_mv.c +0
-0
drivers/ata/sata_mv.c static int sata_mv_scan(struct udevice *dev) · line 1085
Quoted 7 lines
drivers/ata/sata_mv.c +1
-0@@ -1079,6 +1079,7 @@ static int sata_mv_scan(struct udevice *dev)static const struct udevice_id sata_mv_ids[] = { { .compatible ="marvell,armada-370-sata" }, + { .compatible ="marvell,orion-sata" }, { } };
Thanks,
Stefan
PATCH 3/4 sata: sata_mv: add orion-sata compatible string
In reply to Michael WalleQuoted 3 lines · Michael Walle
The kirkwood devices are compatible with this driver.
Signed-off-by Michael Walle <[email protected]>
Applied to u-boot-marvell/master.
Thanks,
Stefan
PATCH 4/4 arm: kirkwood: lsxl: enable DM for SATA
In reply to Michael WalleSwitch from legacy IDE driver to sata_mv driver.
--- configs/lschlv2_defconfig | 4 ++-- configs/lsxhl_defconfig | 4 ++-- include/configs/lsxl.h | 23 ++++++++++------------- 3 files changed, 14 insertions(+), 17 deletions(-)
configs/lschlv2_defconfig +2 -2
@@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_FLASH is not set -CONFIG_CMD_IDE=y +CONFIG_CMD_SATA=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y
@@ -26,7 +26,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lschlv2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -CONFIG_MVSATA_IDE=y +CONFIG_SATA_MV=y CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y
configs/lsxhl_defconfig +2 -2
@@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_FLASH is not set -CONFIG_CMD_IDE=y +CONFIG_CMD_SATA=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y
@@ -26,7 +26,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lsxhl" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -CONFIG_MVSATA_IDE=y +CONFIG_SATA_MV=y CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=y
include/configs/lsxl.h +10 -13
@@ -76,9 +76,9 @@"kernel_addr=0x00800000\0" \"ramdisk_addr=0x01000000\0" \"fdt_addr=0x00ff0000\0" \ -"bootcmd_legacy=ide reset " \ -"&& load ide ${hdpart} ${kernel_addr} /uImage.buffalo " \ -"&& load ide ${hdpart} ${ramdisk_addr} /initrd.buffalo " \ +"bootcmd_legacy=sata init " \ +"&& load sata ${hdpart} ${kernel_addr} /uImage.buffalo " \ +"&& load sata ${hdpart} ${ramdisk_addr} /initrd.buffalo " \"&& bootm ${kernel_addr} ${ramdisk_addr}\0" \"bootcmd_net=bootp ${kernel_addr} vmlinuz " \"&& tftpboot ${ramdisk_addr} initrd.img " \
@@ -86,11 +86,11 @@"&& tftpboot ${fdt_addr} " CONFIG_FDTFILE " " \"&& bootz ${kernel_addr} " \"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \ -"bootcmd_hdd=ide reset " \ -"&& load ide ${hdpart} ${kernel_addr} /vmlinuz " \ -"&& load ide ${hdpart} ${ramdisk_addr} /initrd.img " \ +"bootcmd_hdd=sata init " \ +"&& load sata ${hdpart} ${kernel_addr} /vmlinuz " \ +"&& load sata ${hdpart} ${ramdisk_addr} /initrd.img " \"&& setenv ramdisk_len ${filesize} " \ -"&& load ide ${hdpart} ${fdt_addr} /dtb " \ +"&& load sata ${hdpart} ${fdt_addr} /dtb " \"&& bootz ${kernel_addr} " \"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \"bootcmd_usb=usb start " \
@@ -131,13 +131,10 @@#undef CONFIG_RESET_PHY_R#endif /* CONFIG_CMD_NET */ -#ifdef CONFIG_IDE -#undef CONFIG_SYS_IDE_MAXBUS -#define CONFIG_SYS_IDE_MAXBUS 1 -#undef CONFIG_SYS_IDE_MAXDEVICE -#define CONFIG_SYS_IDE_MAXDEVICE 1 -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET +#ifdef CONFIG_SATA +#define CONFIG_SYS_SATA_MAX_DEVICE 1#define CONFIG_SYS_64BIT_LBA +#define CONFIG_LBA48 #endif #endif /* _CONFIG_LSXL_H */
Signature · 1 line
2.11.0
PATCH 4/4 arm: kirkwood: lsxl: enable DM for SATA
Quoted 94 lines · Michael Walle
Switch from legacy IDE driver to
sata_mvdriver.Signed-off-by Michael Walle <[email protected]>--- configs/lschlv2_defconfig | 4 ++-- configs/lsxhl_defconfig | 4 ++-- include/configs/lsxl.h | 23 ++++++++++------------- 3 files changed, 14 insertions(+), 17 deletions(-)configs/lschlv2_defconfig +2
-2@@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_FLASH is not set -CONFIG_CMD_IDE=y +CONFIG_CMD_SATA=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y@@ -26,7 +26,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lschlv2" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -CONFIG_MVSATA_IDE=y +CONFIG_SATA_MV=y CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=yconfigs/lsxhl_defconfig +2
-2@@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_CMD_FLASH is not set -CONFIG_CMD_IDE=y +CONFIG_CMD_SATA=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y@@ -26,7 +26,7 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-lsxhl" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -CONFIG_MVSATA_IDE=y +CONFIG_SATA_MV=y CONFIG_BLK=y # CONFIG_MMC is not set CONFIG_DM_SPI_FLASH=yinclude/configs/lsxl.h +7
-10@@ -76,9 +76,9 @@"kernel_addr=0x00800000\0" \"ramdisk_addr=0x01000000\0" \"fdt_addr=0x00ff0000\0" \ -"bootcmd_legacy=ide reset " \ -"&& load ide ${hdpart} ${kernel_addr} /uImage.buffalo " \ -"&& load ide ${hdpart} ${ramdisk_addr} /initrd.buffalo " \ +"bootcmd_legacy=sata init " \ +"&& load sata ${hdpart} ${kernel_addr} /uImage.buffalo " \ +"&& load sata ${hdpart} ${ramdisk_addr} /initrd.buffalo " \"&& bootm ${kernel_addr} ${ramdisk_addr}\0" \"bootcmd_net=bootp ${kernel_addr} vmlinuz " \"&& tftpboot ${ramdisk_addr} initrd.img " \@@ -86,11 +86,11 @@"&& tftpboot ${fdt_addr} " CONFIG_FDTFILE " " \"&& bootz ${kernel_addr} " \"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \ -"bootcmd_hdd=ide reset " \ -"&& load ide ${hdpart} ${kernel_addr} /vmlinuz " \ -"&& load ide ${hdpart} ${ramdisk_addr} /initrd.img " \ +"bootcmd_hdd=sata init " \ +"&& load sata ${hdpart} ${kernel_addr} /vmlinuz " \ +"&& load sata ${hdpart} ${ramdisk_addr} /initrd.img " \"&& setenv ramdisk_len ${filesize} " \ -"&& load ide ${hdpart} ${fdt_addr} /dtb " \ +"&& load sata ${hdpart} ${fdt_addr} /dtb " \"&& bootz ${kernel_addr} " \"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \"bootcmd_usb=usb start " \@@ -131,13 +131,10 @@#undef CONFIG_RESET_PHY_R#endif /* CONFIG_CMD_NET */ -#ifdef CONFIG_IDE -#undef CONFIG_SYS_IDE_MAXBUS -#define CONFIG_SYS_IDE_MAXBUS 1
include/configs/lsxl.h line 140
Quoted 10 lines
include/configs/lsxl.h +3
-3-#undef CONFIG_SYS_IDE_MAXDEVICE -#define CONFIG_SYS_IDE_MAXDEVICE 1 -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET +#ifdef CONFIG_SATA +#define CONFIG_SYS_SATA_MAX_DEVICE 1#define CONFIG_SYS_64BIT_LBA +#define CONFIG_LBA48 #endif #endif /* _CONFIG_LSXL_H */
Thanks,
Stefan
PATCH 4/4 arm: kirkwood: lsxl: enable DM for SATA
In reply to Michael WalleQuoted 3 lines · Michael Walle
Switch from legacy IDE driver to
sata_mvdriver.Signed-off-by Michael Walle <[email protected]>
Applied to u-boot-marvell/master.
Thanks,
Stefan
cover ARM: kirkwood: lsxl: enable DM for SATA
In reply to Michael WalleQuoted 7 lines · Michael Walle
Please note that this patchset depends on the following series:
https://patchwork.ozlabs.org/cover/1055937/
(ARM: kirkwood: migrate toDM_USB)
https://patchwork.ozlabs.org/patch/1054403/
(sata:sata_mv: Add DM support to enableCONFIG_BLKusage)
Quoted 5 lines
Michael Walle (4):
sata:sata_mv: use correct format specifier indebug()
sata:sata_mv: support kirkwood architecture
sata:sata_mv: add orion-sata compatible string
arm: kirkwood: lsxl: enable DM for SATA
I've compile tested this. I don't have a spare SATA drive to actually test it on my kirkwood board. I might be able to have a dig through my pile of boards and cobble something together.
Quoted 10 lines
configs/lschlv2_defconfig | 4 ++-- configs/lsxhl_defconfig | 4 ++-- drivers/ata/sata_mv.c | 10 +++++----- include/configs/lsxl.h | 23 ++++++++++------------- 4 files changed, 19 insertions(+), 22 deletions(-)--
2.11.0