* [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI
@ 2015-03-20 2:27 Tang Yuantian
2015-03-20 3:44 ` Bin Meng
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tang Yuantian @ 2015-03-20 2:27 UTC (permalink / raw)
To: u-boot
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;
--
2.1.0.27.g96db324
^ permalink raw reply related [flat|nested] 5+ messages in thread* [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI
2015-03-20 2:27 [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI Tang Yuantian
@ 2015-03-20 3:44 ` Bin Meng
2015-04-10 2:09 ` Yuantian Tang
2015-03-20 15:24 ` Tom Rini
2015-04-23 13:14 ` [U-Boot] " Tom Rini
2 siblings, 1 reply; 5+ messages in thread
From: Bin Meng @ 2015-03-20 3:44 UTC (permalink / raw)
To: u-boot
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>
^ permalink raw reply [flat|nested] 5+ messages in thread* [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI
2015-03-20 3:44 ` Bin Meng
@ 2015-04-10 2:09 ` Yuantian Tang
0 siblings, 0 replies; 5+ messages in thread
From: Yuantian Tang @ 2015-04-10 2:09 UTC (permalink / raw)
To: u-boot
PING.
Thanks,
Yuantian
> -----Original Message-----
> From: Bin Meng [mailto:bmeng.cn at 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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI
2015-03-20 2:27 [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI Tang Yuantian
2015-03-20 3:44 ` Bin Meng
@ 2015-03-20 15:24 ` Tom Rini
2015-04-23 13:14 ` [U-Boot] " Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2015-03-20 15:24 UTC (permalink / raw)
To: u-boot
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>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150320/c99ec9c8/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] cmd_scsi: Enable SoC AHCI device on platforms with PCI
2015-03-20 2:27 [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI Tang Yuantian
2015-03-20 3:44 ` Bin Meng
2015-03-20 15:24 ` Tom Rini
@ 2015-04-23 13:14 ` Tom Rini
2 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2015-04-23 13:14 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150423/9e990b71/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-04-23 13:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-20 2:27 [U-Boot] [PATCH] cmd_scsi: Enable SoC AHCI device on platforms with PCI Tang Yuantian
2015-03-20 3:44 ` Bin Meng
2015-04-10 2:09 ` Yuantian Tang
2015-03-20 15:24 ` Tom Rini
2015-04-23 13:14 ` [U-Boot] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox