| Message ID | 20200212202236.6255-1-fbarrat@linux.ibm.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | capp: Add lid definition for P9 DD2.3 | expand |
On Thu, Feb 13, 2020 at 7:23 AM Frederic Barrat <fbarrat@linux.ibm.com> wrote: > > Add the definition of the CAPP microcode for DD2.3 to the lid map. > > Cc: skiboot-stable@lists.ozlabs.org # v6.5+ > Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> > --- > Oliver, Vasant: this is a bug fix for FW941/ZZ-ESS, which I think > means it should also go to the 6.5 branch FW941 isn't using 6.5.x > hw/fsp/fsp.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c > index 7592ee07..196fa34d 100644 > --- a/hw/fsp/fsp.c > +++ b/hw/fsp/fsp.c > @@ -2362,6 +2362,7 @@ int fsp_fetch_data_queue(uint8_t flags, uint16_t id, uint32_t sub_id, > #define CAPP_IDX_NIMBUS_DD20 0x200d1 > #define CAPP_IDX_NIMBUS_DD21 0x201d1 > #define CAPP_IDX_NIMBUS_DD22 0x202d1 > +#define CAPP_IDX_NIMBUS_DD23 0x203d1 > > #define IMA_CATALOG_NIMBUS 0x4e0200 > > @@ -2382,6 +2383,7 @@ static struct { > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD20, 0x80a02007 }, > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD21, 0x80a02007 }, > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD22, 0x80a02007 }, > + { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD23, 0x80a02007 }, > }; > > static void fsp_start_fetching_next_lid(void); > -- > 2.21.1 > > -- > Skiboot-stable mailing list > Skiboot-stable@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot-stable
On 2/13/20 1:52 AM, Frederic Barrat wrote: > Add the definition of the CAPP microcode for DD2.3 to the lid map. > > Cc: skiboot-stable@lists.ozlabs.org # v6.5+ > Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> > --- > Oliver, Vasant: this is a bug fix for FW941/ZZ-ESS, which I think > means it should also go to the 6.5 branch > > hw/fsp/fsp.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c > index 7592ee07..196fa34d 100644 > --- a/hw/fsp/fsp.c > +++ b/hw/fsp/fsp.c > @@ -2362,6 +2362,7 @@ int fsp_fetch_data_queue(uint8_t flags, uint16_t id, uint32_t sub_id, > #define CAPP_IDX_NIMBUS_DD20 0x200d1 > #define CAPP_IDX_NIMBUS_DD21 0x201d1 > #define CAPP_IDX_NIMBUS_DD22 0x202d1 > +#define CAPP_IDX_NIMBUS_DD23 0x203d1 > > #define IMA_CATALOG_NIMBUS 0x4e0200 > > @@ -2382,6 +2383,7 @@ static struct { > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD20, 0x80a02007 }, > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD21, 0x80a02007 }, > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD22, 0x80a02007 }, > + { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD23, 0x80a02007 }, Patch looks ok to me. Fixes current issue. Tested-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> IMO If LID number is fixed across DD versions then we should workout better way to find LID number and load it automatically (of course may not be worth to make change now for ZZ). -Vasant
Le 13/02/2020 à 17:15, Vasant Hegde a écrit : > On 2/13/20 1:52 AM, Frederic Barrat wrote: >> Add the definition of the CAPP microcode for DD2.3 to the lid map. >> >> Cc: skiboot-stable@lists.ozlabs.org # v6.5+ >> Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> >> --- >> Oliver, Vasant: this is a bug fix for FW941/ZZ-ESS, which I think >> means it should also go to the 6.5 branch >> >> hw/fsp/fsp.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c >> index 7592ee07..196fa34d 100644 >> --- a/hw/fsp/fsp.c >> +++ b/hw/fsp/fsp.c >> @@ -2362,6 +2362,7 @@ int fsp_fetch_data_queue(uint8_t flags, uint16_t >> id, uint32_t sub_id, >> #define CAPP_IDX_NIMBUS_DD20 0x200d1 >> #define CAPP_IDX_NIMBUS_DD21 0x201d1 >> #define CAPP_IDX_NIMBUS_DD22 0x202d1 >> +#define CAPP_IDX_NIMBUS_DD23 0x203d1 >> >> #define IMA_CATALOG_NIMBUS 0x4e0200 >> >> @@ -2382,6 +2383,7 @@ static struct { >> { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD20, 0x80a02007 }, >> { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD21, 0x80a02007 }, >> { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD22, 0x80a02007 }, >> + { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD23, 0x80a02007 }, > > Patch looks ok to me. Fixes current issue. > > Tested-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> > > > IMO If LID number is fixed across DD versions then we should workout > better way to > find LID number and load it automatically (of course may not be worth to > make change now for ZZ). Agreed! We never thought they would be that many iterations, and the capp ucode has been stable on P9 DD2. My crystal ball tells me I shouldn't spend time improving it though. Fred > -Vasant
On 13/2/20 7:22 am, Frederic Barrat wrote: > Add the definition of the CAPP microcode for DD2.3 to the lid map. > > Cc: skiboot-stable@lists.ozlabs.org # v6.5+ > Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> This seems appropriate. Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> > --- > Oliver, Vasant: this is a bug fix for FW941/ZZ-ESS, which I think > means it should also go to the 6.5 branch > > hw/fsp/fsp.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c > index 7592ee07..196fa34d 100644 > --- a/hw/fsp/fsp.c > +++ b/hw/fsp/fsp.c > @@ -2362,6 +2362,7 @@ int fsp_fetch_data_queue(uint8_t flags, uint16_t id, uint32_t sub_id, > #define CAPP_IDX_NIMBUS_DD20 0x200d1 > #define CAPP_IDX_NIMBUS_DD21 0x201d1 > #define CAPP_IDX_NIMBUS_DD22 0x202d1 > +#define CAPP_IDX_NIMBUS_DD23 0x203d1 > > #define IMA_CATALOG_NIMBUS 0x4e0200 > > @@ -2382,6 +2383,7 @@ static struct { > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD20, 0x80a02007 }, > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD21, 0x80a02007 }, > { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD22, 0x80a02007 }, > + { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD23, 0x80a02007 }, > }; > > static void fsp_start_fetching_next_lid(void); >
On Thu, Feb 13, 2020 at 7:23 AM Frederic Barrat <fbarrat@linux.ibm.com> wrote: > > Add the definition of the CAPP microcode for DD2.3 to the lid map. > > Cc: skiboot-stable@lists.ozlabs.org # v6.5+ > Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> Thanks Fred, merged as 59482b92af1b7cc1a75d39b64a956ef6ae08b538 Oliver
diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c index 7592ee07..196fa34d 100644 --- a/hw/fsp/fsp.c +++ b/hw/fsp/fsp.c @@ -2362,6 +2362,7 @@ int fsp_fetch_data_queue(uint8_t flags, uint16_t id, uint32_t sub_id, #define CAPP_IDX_NIMBUS_DD20 0x200d1 #define CAPP_IDX_NIMBUS_DD21 0x201d1 #define CAPP_IDX_NIMBUS_DD22 0x202d1 +#define CAPP_IDX_NIMBUS_DD23 0x203d1 #define IMA_CATALOG_NIMBUS 0x4e0200 @@ -2382,6 +2383,7 @@ static struct { { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD20, 0x80a02007 }, { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD21, 0x80a02007 }, { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD22, 0x80a02007 }, + { RESOURCE_ID_CAPP, CAPP_IDX_NIMBUS_DD23, 0x80a02007 }, }; static void fsp_start_fetching_next_lid(void);
Add the definition of the CAPP microcode for DD2.3 to the lid map. Cc: skiboot-stable@lists.ozlabs.org # v6.5+ Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com> --- Oliver, Vasant: this is a bug fix for FW941/ZZ-ESS, which I think means it should also go to the 6.5 branch hw/fsp/fsp.c | 2 ++ 1 file changed, 2 insertions(+)