[U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI
Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file.
Signed-off-by: Shaohui Xie Shaohui.Xie@freescale.com Signed-off-by: Tang Yuantian Yuantian.Tang@freescale.com --- common/cmd_scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index a0a62eb..f80f549 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -37,7 +37,7 @@ #define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} #endif
-#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST }; #endif static ccb tempccb; /* temporary scsi command buffer */ @@ -179,7 +179,7 @@ int scsi_get_disk_count(void) return scsi_max_devs; }
-#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) void scsi_init(void) { int busdevfunc;
On Fri, Mar 20, 2015 at 10:27 AM, Tang Yuantian Yuantian.Tang@freescale.com wrote:
Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file.
Signed-off-by: Shaohui Xie Shaohui.Xie@freescale.com Signed-off-by: Tang Yuantian Yuantian.Tang@freescale.com
common/cmd_scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index a0a62eb..f80f549 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -37,7 +37,7 @@ #define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} #endif
-#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST }; #endif static ccb tempccb; /* temporary scsi command buffer */ @@ -179,7 +179,7 @@ int scsi_get_disk_count(void) return scsi_max_devs; }
-#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) void scsi_init(void) { int busdevfunc; --
Reviewed-by: Bin Meng bmeng.cn@gmail.com
PING.
Thanks, Yuantian
-----Original Message----- From: Bin Meng [mailto:bmeng.cn@gmail.com] Sent: Friday, March 20, 2015 11:44 AM To: Tang Yuantian-B29983 Cc: Tom Rini; Simon Glass; U-Boot Mailing List; Sun York-R58495; Xie Shaohui-B21989 Subject: Re: [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI
On Fri, Mar 20, 2015 at 10:27 AM, Tang Yuantian Yuantian.Tang@freescale.com wrote:
Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file.
Signed-off-by: Shaohui Xie Shaohui.Xie@freescale.com Signed-off-by: Tang Yuantian Yuantian.Tang@freescale.com
common/cmd_scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index a0a62eb..f80f549 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -37,7 +37,7 @@ #define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} #endif
-#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST }; #endif static ccb tempccb; /* temporary scsi command buffer */ @@ -179,7 +179,7 @@ int scsi_get_disk_count(void) return scsi_max_devs; }
-#ifdef CONFIG_PCI +#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) void scsi_init(void) { int busdevfunc; --
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Fri, Mar 20, 2015 at 10:27:54AM +0800, Tang Yuantian wrote:
Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file.
Signed-off-by: Shaohui Xie Shaohui.Xie@freescale.com Signed-off-by: Tang Yuantian Yuantian.Tang@freescale.com
Reviewed-by: Tom Rini trini@konsulko.com
On Fri, Mar 20, 2015 at 10:27:54AM +0800, tang yuantian wrote:
Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file.
Signed-off-by: Shaohui Xie Shaohui.Xie@freescale.com Signed-off-by: Tang Yuantian Yuantian.Tang@freescale.com Reviewed-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (4)
-
Bin Meng -
Tang Yuantian -
Tom Rini -
Yuantian Tang