| Message ID | 20201028105009.27398-1-Lulu_Su@wistron.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [1/2] platform/mowgli: modify slot_name | expand |
On 10/28/20 4:20 PM, Lulu Su wrote: > From: LuluTHSu <Lulu_Su@wistron.com> > > Since Mowgli has only one slot, modify the names of other slots to avoid confusion. Lulu, General process is to post patch to skiboot mailing list and get it accepted in upstream. Then backport patch to applicable stable branches. I dont see this patch posted to upstream. Can you please post it to skiboot mailing list? -Vasant > > Cc: skiboot-stable@lists.ozlabs.org > Signed-off-by: LuluTHSu <Lulu_Su@wistron.com> > --- > platforms/astbmc/mowgli.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/platforms/astbmc/mowgli.c b/platforms/astbmc/mowgli.c > index 9bfe7a4..40436d9 100644 > --- a/platforms/astbmc/mowgli.c > +++ b/platforms/astbmc/mowgli.c > @@ -15,17 +15,17 @@ > > #include "astbmc.h" > > -ST_PLUGGABLE(mowgli_slot1, "Pcie Slot1 (16x)"); > -ST_PLUGGABLE(mowgli_slot2, "Pcie Slot2 (8x)"); > +ST_PLUGGABLE(mowgli_slot1, "Pcie Slot1"); > +ST_BUILTIN_DEV(mowgli_builtin_SAS, "Builtin SAS"); > ST_BUILTIN_DEV(mowgli_builtin_bmc, "BMC"); > -ST_PLUGGABLE(mowgli_slot3, "Pcie Slot3 (8x)"); > +ST_BUILTIN_DEV(mowgli_builtin_ethernet, "Builtin Ethernet"); > ST_BUILTIN_DEV(mowgli_builtin_usb, "Builtin USB"); > > static const struct slot_table_entry mowgli_phb_table[] = { > ST_PHB_ENTRY(0, 0, mowgli_slot1), > - ST_PHB_ENTRY(0, 1, mowgli_slot2), > + ST_PHB_ENTRY(0, 1, mowgli_builtin_SAS), > ST_PHB_ENTRY(0, 2, mowgli_builtin_bmc), > - ST_PHB_ENTRY(0, 3, mowgli_slot3), > + ST_PHB_ENTRY(0, 3, mowgli_builtin_ethernet), > ST_PHB_ENTRY(0, 4, mowgli_builtin_usb), > > { .etype = st_end }, >
diff --git a/platforms/astbmc/mowgli.c b/platforms/astbmc/mowgli.c index 9bfe7a4..40436d9 100644 --- a/platforms/astbmc/mowgli.c +++ b/platforms/astbmc/mowgli.c @@ -15,17 +15,17 @@ #include "astbmc.h" -ST_PLUGGABLE(mowgli_slot1, "Pcie Slot1 (16x)"); -ST_PLUGGABLE(mowgli_slot2, "Pcie Slot2 (8x)"); +ST_PLUGGABLE(mowgli_slot1, "Pcie Slot1"); +ST_BUILTIN_DEV(mowgli_builtin_SAS, "Builtin SAS"); ST_BUILTIN_DEV(mowgli_builtin_bmc, "BMC"); -ST_PLUGGABLE(mowgli_slot3, "Pcie Slot3 (8x)"); +ST_BUILTIN_DEV(mowgli_builtin_ethernet, "Builtin Ethernet"); ST_BUILTIN_DEV(mowgli_builtin_usb, "Builtin USB"); static const struct slot_table_entry mowgli_phb_table[] = { ST_PHB_ENTRY(0, 0, mowgli_slot1), - ST_PHB_ENTRY(0, 1, mowgli_slot2), + ST_PHB_ENTRY(0, 1, mowgli_builtin_SAS), ST_PHB_ENTRY(0, 2, mowgli_builtin_bmc), - ST_PHB_ENTRY(0, 3, mowgli_slot3), + ST_PHB_ENTRY(0, 3, mowgli_builtin_ethernet), ST_PHB_ENTRY(0, 4, mowgli_builtin_usb), { .etype = st_end },