| Message ID | 20200129035945.37765-2-mrjoel@lixil.net |
|---|---|
| State | Superseded |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | [1/2] arm: mvebu: clearfog: add SCSI to distro bootcmd | expand |
Added Josua to Cc. On 29.01.20 04:59, Joel Johnson wrote: > Enabled distro bootcmd support for additional SATA ports if enabled. > > Signed-off-by: Joel Johnson <mrjoel@lixil.net> > > --- > > > This patch builds on and requires the separate patch series adding > configurable SATA support ("arm: mvebu: clearfog: Add SATA mode flags"). > > --- > include/configs/clearfog.h | 31 ++++++++++++++++++++++++++++--- > 1 file changed, 28 insertions(+), 3 deletions(-) > > diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h > index a452f4b009..0bf7e9d950 100644 > --- a/include/configs/clearfog.h > +++ b/include/configs/clearfog.h > @@ -111,15 +111,40 @@ > #endif > > #ifdef CONFIG_SCSI > -#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) > +#define BOOT_TARGET_DEVICES_SCSI_M2SATA(func) func(SCSI, scsi, 0) > + > +/* > + * Either one or both mPCIe slots may be configured as mSATA interfaces. The > + * SCSI bus ids are assigned based on sequence of hardware present, not always > + * tied to hardware slot ids. As such, use second SCSI bus if either slot is > + * set for SATA, and only use third SCSI bus if both slots are SATA enabled. > + */ > +#if defined (CONFIG_CLEARFOG_CON2_SATA) || defined (CONFIG_CLEARFOG_CON3_SATA) > +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG2(func) func(SCSI, scsi, 1) > +#else > +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG2(func) > +#endif > + > +#if defined (CONFIG_CLEARFOG_CON2_SATA) && defined (CONFIG_CLEARFOG_CON3_SATA) > +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG3(func) func(SCSI, scsi, 2) > #else > -#define BOOT_TARGET_DEVICES_SCSI(func) > +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG3(func) > #endif > > +#else > +#define BOOT_TARGET_DEVICES_SCSI_M2SATA(func) > +#endif /* CONFIG_SCSI */ > + > +/* > + * The SCSI buses are attempted in increasing bus order, there is no current > + * mechanism to alter the default bus priority order for booting. > + */ > #define BOOT_TARGET_DEVICES(func) \ > BOOT_TARGET_DEVICES_MMC(func) \ > BOOT_TARGET_DEVICES_USB(func) \ > - BOOT_TARGET_DEVICES_SCSI(func) \ > + BOOT_TARGET_DEVICES_SCSI_M2SATA(func) \ > + BOOT_TARGET_DEVICES_SCSI_CLEARFOG2(func) \ > + BOOT_TARGET_DEVICES_SCSI_CLEARFOG3(func) \ > func(PXE, pxe, na) \ > func(DHCP, dhcp, na) > > Josua, Baruch, any comments from you on this one? Thanks, Stefan
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index a452f4b009..0bf7e9d950 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -111,15 +111,40 @@ #endif #ifdef CONFIG_SCSI -#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) +#define BOOT_TARGET_DEVICES_SCSI_M2SATA(func) func(SCSI, scsi, 0) + +/* + * Either one or both mPCIe slots may be configured as mSATA interfaces. The + * SCSI bus ids are assigned based on sequence of hardware present, not always + * tied to hardware slot ids. As such, use second SCSI bus if either slot is + * set for SATA, and only use third SCSI bus if both slots are SATA enabled. + */ +#if defined (CONFIG_CLEARFOG_CON2_SATA) || defined (CONFIG_CLEARFOG_CON3_SATA) +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG2(func) func(SCSI, scsi, 1) +#else +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG2(func) +#endif + +#if defined (CONFIG_CLEARFOG_CON2_SATA) && defined (CONFIG_CLEARFOG_CON3_SATA) +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG3(func) func(SCSI, scsi, 2) #else -#define BOOT_TARGET_DEVICES_SCSI(func) +#define BOOT_TARGET_DEVICES_SCSI_CLEARFOG3(func) #endif +#else +#define BOOT_TARGET_DEVICES_SCSI_M2SATA(func) +#endif /* CONFIG_SCSI */ + +/* + * The SCSI buses are attempted in increasing bus order, there is no current + * mechanism to alter the default bus priority order for booting. + */ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_DEVICES_MMC(func) \ BOOT_TARGET_DEVICES_USB(func) \ - BOOT_TARGET_DEVICES_SCSI(func) \ + BOOT_TARGET_DEVICES_SCSI_M2SATA(func) \ + BOOT_TARGET_DEVICES_SCSI_CLEARFOG2(func) \ + BOOT_TARGET_DEVICES_SCSI_CLEARFOG3(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na)
Enabled distro bootcmd support for additional SATA ports if enabled. Signed-off-by: Joel Johnson <mrjoel@lixil.net> --- This patch builds on and requires the separate patch series adding configurable SATA support ("arm: mvebu: clearfog: Add SATA mode flags"). --- include/configs/clearfog.h | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)