| Message ID | 1403489682-14841-2-git-send-email-gwshan@linux.vnet.ibm.com |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2014-06-23 at 12:14 +1000, Gavin Shan wrote: > The patch synchronizes firmware header file (opal.h) for PCI error > injection The FW API you expose is not PCI specific. I haven't seen the corresponding FW patches yet but I'm not fan of that single call that collates unrelated things. I much'd prefer see a opal_pci_err_inject that is specific to IO(D)A errors, which takes a PHB ID and goes via the normal dispatch to PHB ops inside OPAL. For the rest, especially core specific injections, we can provide a separate dedicated call. Cheers, Ben. > Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/opal.h | 65 ++++++++++++++++++++++++++ > arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + > 2 files changed, 66 insertions(+) > > diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h > index 66ad7a7..d982bb8 100644 > --- a/arch/powerpc/include/asm/opal.h > +++ b/arch/powerpc/include/asm/opal.h > @@ -175,6 +175,7 @@ extern int opal_enter_rtas(struct rtas_args *args, > #define OPAL_SET_PARAM 90 > #define OPAL_DUMP_RESEND 91 > #define OPAL_DUMP_INFO2 94 > +#define OPAL_ERR_INJECT 96 > > #ifndef __ASSEMBLY__ > > @@ -219,6 +220,69 @@ enum OpalPciErrorSeverity { > OPAL_EEH_SEV_INF = 5 > }; > > +enum OpalErrinjctType { > + OpalErrinjctTypeFirst = 0, > + OpalErrinjctTypeFatal = 1, > + OpalErrinjctTypeRecoverRandomEvent = 2, > + OpalErrinjctTypeRecoverSpecialEvent = 3, > + OpalErrinjctTypeCorruptedPage = 4, > + OpalErrinjctTypeCorruptedSlb = 5, > + OpalErrinjctTypeTranslatorFailure = 6, > + OpalErrinjctTypeIoaBusError = 7, > + OpalErrinjctTypeIoaBusError64 = 8, > + OpalErrinjctTypePlatformSpecific = 9, > + OpalErrinjctTypeDcacheStart = 10, > + OpalErrinjctTypeDcacheEnd = 11, > + OpalErrinjctTypeIcacheStart = 12, > + OpalErrinjctTypeIcacheEnd = 13, > + OpalErrinjctTypeTlbStart = 14, > + OpalErrinjctTypeTlbEnd = 15, > + OpalErrinjctTypeUpstreamIoError = 16, > + OpalErrinjctTypeLast = 17, > + > + /* IoaBusError & IoaBusError64 */ > + OpalEitIoaLoadMemAddr = 0, > + OpalEitIoaLoadMemData = 1, > + OpalEitIoaLoadIoAddr = 2, > + OpalEitIoaLoadIoData = 3, > + OpalEitIoaLoadConfigAddr = 4, > + OpalEitIoaLoadConfigData = 5, > + OpalEitIoaStoreMemAddr = 6, > + OpalEitIoaStoreMemData = 7, > + OpalEitIoaStoreIoAddr = 8, > + OpalEitIoaStoreIoData = 9, > + OpalEitIoaStoreConfigAddr = 10, > + OpalEitIoaStoreConfigData = 11, > + OpalEitIoaDmaReadMemAddr = 12, > + OpalEitIoaDmaReadMemData = 13, > + OpalEitIoaDmaReadMemMaster = 14, > + OpalEitIoaDmaReadMemTarget = 15, > + OpalEitIoaDmaWriteMemAddr = 16, > + OpalEitIoaDmaWriteMemData = 17, > + OpalEitIoaDmaWriteMemMaster = 18, > + OpalEitIoaDmaWriteMemTarget = 19, > +}; > + > +struct OpalErrinjct { > + int32_t type; > + union { > + struct { > + uint32_t addr; > + uint32_t mask; > + uint64_t phb_id; > + uint32_t pe; > + uint32_t function; > + } ioa; > + struct { > + uint64_t addr; > + uint64_t mask; > + uint64_t phb_id; > + uint32_t pe; > + uint32_t function; > + } ioa64; > + }; > +}; > + > enum OpalShpcAction { > OPAL_SHPC_GET_LINK_STATE = 0, > OPAL_SHPC_GET_SLOT_STATE = 1 > @@ -870,6 +934,7 @@ int64_t opal_update_flash(uint64_t blk_list); > int64_t opal_dump_init(uint8_t dump_type); > int64_t opal_dump_info(__be32 *dump_id, __be32 *dump_size); > int64_t opal_dump_info2(__be32 *dump_id, __be32 *dump_size, __be32 *dump_type); > +int64_t opal_err_injct(struct OpalErrinjct *ei); > int64_t opal_dump_read(uint32_t dump_id, uint64_t buffer); > int64_t opal_dump_ack(uint32_t dump_id); > int64_t opal_dump_resend_notification(void); > diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S > index f531ffe..44b3d81 100644 > --- a/arch/powerpc/platforms/powernv/opal-wrappers.S > +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S > @@ -136,6 +136,7 @@ OPAL_CALL(opal_resync_timebase, OPAL_RESYNC_TIMEBASE); > OPAL_CALL(opal_dump_init, OPAL_DUMP_INIT); > OPAL_CALL(opal_dump_info, OPAL_DUMP_INFO); > OPAL_CALL(opal_dump_info2, OPAL_DUMP_INFO2); > +OPAL_CALL(opal_err_injct, OPAL_ERR_INJECT); > OPAL_CALL(opal_dump_read, OPAL_DUMP_READ); > OPAL_CALL(opal_dump_ack, OPAL_DUMP_ACK); > OPAL_CALL(opal_get_msg, OPAL_GET_MSG); -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jun 24, 2014 at 07:10:14AM +1000, Benjamin Herrenschmidt wrote: >On Mon, 2014-06-23 at 12:14 +1000, Gavin Shan wrote: >> The patch synchronizes firmware header file (opal.h) for PCI error >> injection > >The FW API you expose is not PCI specific. I haven't seen the >corresponding FW patches yet but I'm not fan of that single call >that collates unrelated things. > >I much'd prefer see a opal_pci_err_inject that is specific to >IO(D)A errors, which takes a PHB ID and goes via the normal dispatch >to PHB ops inside OPAL. For the rest, especially core specific >injections, we can provide a separate dedicated call. > Thanks, Ben. I'll change the firmware API to have a separate API (opal_pci_err_inject) for PCI errors. >Cheers, >Ben. > Thanks, Gavin >> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> >> --- >> arch/powerpc/include/asm/opal.h | 65 ++++++++++++++++++++++++++ >> arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + >> 2 files changed, 66 insertions(+) >> >> diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h >> index 66ad7a7..d982bb8 100644 >> --- a/arch/powerpc/include/asm/opal.h >> +++ b/arch/powerpc/include/asm/opal.h >> @@ -175,6 +175,7 @@ extern int opal_enter_rtas(struct rtas_args *args, >> #define OPAL_SET_PARAM 90 >> #define OPAL_DUMP_RESEND 91 >> #define OPAL_DUMP_INFO2 94 >> +#define OPAL_ERR_INJECT 96 >> >> #ifndef __ASSEMBLY__ >> >> @@ -219,6 +220,69 @@ enum OpalPciErrorSeverity { >> OPAL_EEH_SEV_INF = 5 >> }; >> >> +enum OpalErrinjctType { >> + OpalErrinjctTypeFirst = 0, >> + OpalErrinjctTypeFatal = 1, >> + OpalErrinjctTypeRecoverRandomEvent = 2, >> + OpalErrinjctTypeRecoverSpecialEvent = 3, >> + OpalErrinjctTypeCorruptedPage = 4, >> + OpalErrinjctTypeCorruptedSlb = 5, >> + OpalErrinjctTypeTranslatorFailure = 6, >> + OpalErrinjctTypeIoaBusError = 7, >> + OpalErrinjctTypeIoaBusError64 = 8, >> + OpalErrinjctTypePlatformSpecific = 9, >> + OpalErrinjctTypeDcacheStart = 10, >> + OpalErrinjctTypeDcacheEnd = 11, >> + OpalErrinjctTypeIcacheStart = 12, >> + OpalErrinjctTypeIcacheEnd = 13, >> + OpalErrinjctTypeTlbStart = 14, >> + OpalErrinjctTypeTlbEnd = 15, >> + OpalErrinjctTypeUpstreamIoError = 16, >> + OpalErrinjctTypeLast = 17, >> + >> + /* IoaBusError & IoaBusError64 */ >> + OpalEitIoaLoadMemAddr = 0, >> + OpalEitIoaLoadMemData = 1, >> + OpalEitIoaLoadIoAddr = 2, >> + OpalEitIoaLoadIoData = 3, >> + OpalEitIoaLoadConfigAddr = 4, >> + OpalEitIoaLoadConfigData = 5, >> + OpalEitIoaStoreMemAddr = 6, >> + OpalEitIoaStoreMemData = 7, >> + OpalEitIoaStoreIoAddr = 8, >> + OpalEitIoaStoreIoData = 9, >> + OpalEitIoaStoreConfigAddr = 10, >> + OpalEitIoaStoreConfigData = 11, >> + OpalEitIoaDmaReadMemAddr = 12, >> + OpalEitIoaDmaReadMemData = 13, >> + OpalEitIoaDmaReadMemMaster = 14, >> + OpalEitIoaDmaReadMemTarget = 15, >> + OpalEitIoaDmaWriteMemAddr = 16, >> + OpalEitIoaDmaWriteMemData = 17, >> + OpalEitIoaDmaWriteMemMaster = 18, >> + OpalEitIoaDmaWriteMemTarget = 19, >> +}; >> + >> +struct OpalErrinjct { >> + int32_t type; >> + union { >> + struct { >> + uint32_t addr; >> + uint32_t mask; >> + uint64_t phb_id; >> + uint32_t pe; >> + uint32_t function; >> + } ioa; >> + struct { >> + uint64_t addr; >> + uint64_t mask; >> + uint64_t phb_id; >> + uint32_t pe; >> + uint32_t function; >> + } ioa64; >> + }; >> +}; >> + >> enum OpalShpcAction { >> OPAL_SHPC_GET_LINK_STATE = 0, >> OPAL_SHPC_GET_SLOT_STATE = 1 >> @@ -870,6 +934,7 @@ int64_t opal_update_flash(uint64_t blk_list); >> int64_t opal_dump_init(uint8_t dump_type); >> int64_t opal_dump_info(__be32 *dump_id, __be32 *dump_size); >> int64_t opal_dump_info2(__be32 *dump_id, __be32 *dump_size, __be32 *dump_type); >> +int64_t opal_err_injct(struct OpalErrinjct *ei); >> int64_t opal_dump_read(uint32_t dump_id, uint64_t buffer); >> int64_t opal_dump_ack(uint32_t dump_id); >> int64_t opal_dump_resend_notification(void); >> diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S >> index f531ffe..44b3d81 100644 >> --- a/arch/powerpc/platforms/powernv/opal-wrappers.S >> +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S >> @@ -136,6 +136,7 @@ OPAL_CALL(opal_resync_timebase, OPAL_RESYNC_TIMEBASE); >> OPAL_CALL(opal_dump_init, OPAL_DUMP_INIT); >> OPAL_CALL(opal_dump_info, OPAL_DUMP_INFO); >> OPAL_CALL(opal_dump_info2, OPAL_DUMP_INFO2); >> +OPAL_CALL(opal_err_injct, OPAL_ERR_INJECT); >> OPAL_CALL(opal_dump_read, OPAL_DUMP_READ); >> OPAL_CALL(opal_dump_ack, OPAL_DUMP_ACK); >> OPAL_CALL(opal_get_msg, OPAL_GET_MSG); > > -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 2014-06-24 at 09:44 +1000, Gavin Shan wrote: > >I much'd prefer see a opal_pci_err_inject that is specific to > >IO(D)A errors, which takes a PHB ID and goes via the normal dispatch > >to PHB ops inside OPAL. For the rest, especially core specific > >injections, we can provide a separate dedicated call. > > > > Thanks, Ben. I'll change the firmware API to have a separate > API (opal_pci_err_inject) for PCI errors. Also, how do we expose to Linux that the new API is supported ? Linux shouldn't create the additional files if it isn't... There are two ways, we can have a property in the DT of the PHB indicating that it supports error injection or we can check for the existence of the OPAL token at boot (there's an OPAL call to do that). Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index 66ad7a7..d982bb8 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -175,6 +175,7 @@ extern int opal_enter_rtas(struct rtas_args *args, #define OPAL_SET_PARAM 90 #define OPAL_DUMP_RESEND 91 #define OPAL_DUMP_INFO2 94 +#define OPAL_ERR_INJECT 96 #ifndef __ASSEMBLY__ @@ -219,6 +220,69 @@ enum OpalPciErrorSeverity { OPAL_EEH_SEV_INF = 5 }; +enum OpalErrinjctType { + OpalErrinjctTypeFirst = 0, + OpalErrinjctTypeFatal = 1, + OpalErrinjctTypeRecoverRandomEvent = 2, + OpalErrinjctTypeRecoverSpecialEvent = 3, + OpalErrinjctTypeCorruptedPage = 4, + OpalErrinjctTypeCorruptedSlb = 5, + OpalErrinjctTypeTranslatorFailure = 6, + OpalErrinjctTypeIoaBusError = 7, + OpalErrinjctTypeIoaBusError64 = 8, + OpalErrinjctTypePlatformSpecific = 9, + OpalErrinjctTypeDcacheStart = 10, + OpalErrinjctTypeDcacheEnd = 11, + OpalErrinjctTypeIcacheStart = 12, + OpalErrinjctTypeIcacheEnd = 13, + OpalErrinjctTypeTlbStart = 14, + OpalErrinjctTypeTlbEnd = 15, + OpalErrinjctTypeUpstreamIoError = 16, + OpalErrinjctTypeLast = 17, + + /* IoaBusError & IoaBusError64 */ + OpalEitIoaLoadMemAddr = 0, + OpalEitIoaLoadMemData = 1, + OpalEitIoaLoadIoAddr = 2, + OpalEitIoaLoadIoData = 3, + OpalEitIoaLoadConfigAddr = 4, + OpalEitIoaLoadConfigData = 5, + OpalEitIoaStoreMemAddr = 6, + OpalEitIoaStoreMemData = 7, + OpalEitIoaStoreIoAddr = 8, + OpalEitIoaStoreIoData = 9, + OpalEitIoaStoreConfigAddr = 10, + OpalEitIoaStoreConfigData = 11, + OpalEitIoaDmaReadMemAddr = 12, + OpalEitIoaDmaReadMemData = 13, + OpalEitIoaDmaReadMemMaster = 14, + OpalEitIoaDmaReadMemTarget = 15, + OpalEitIoaDmaWriteMemAddr = 16, + OpalEitIoaDmaWriteMemData = 17, + OpalEitIoaDmaWriteMemMaster = 18, + OpalEitIoaDmaWriteMemTarget = 19, +}; + +struct OpalErrinjct { + int32_t type; + union { + struct { + uint32_t addr; + uint32_t mask; + uint64_t phb_id; + uint32_t pe; + uint32_t function; + } ioa; + struct { + uint64_t addr; + uint64_t mask; + uint64_t phb_id; + uint32_t pe; + uint32_t function; + } ioa64; + }; +}; + enum OpalShpcAction { OPAL_SHPC_GET_LINK_STATE = 0, OPAL_SHPC_GET_SLOT_STATE = 1 @@ -870,6 +934,7 @@ int64_t opal_update_flash(uint64_t blk_list); int64_t opal_dump_init(uint8_t dump_type); int64_t opal_dump_info(__be32 *dump_id, __be32 *dump_size); int64_t opal_dump_info2(__be32 *dump_id, __be32 *dump_size, __be32 *dump_type); +int64_t opal_err_injct(struct OpalErrinjct *ei); int64_t opal_dump_read(uint32_t dump_id, uint64_t buffer); int64_t opal_dump_ack(uint32_t dump_id); int64_t opal_dump_resend_notification(void); diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S index f531ffe..44b3d81 100644 --- a/arch/powerpc/platforms/powernv/opal-wrappers.S +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S @@ -136,6 +136,7 @@ OPAL_CALL(opal_resync_timebase, OPAL_RESYNC_TIMEBASE); OPAL_CALL(opal_dump_init, OPAL_DUMP_INIT); OPAL_CALL(opal_dump_info, OPAL_DUMP_INFO); OPAL_CALL(opal_dump_info2, OPAL_DUMP_INFO2); +OPAL_CALL(opal_err_injct, OPAL_ERR_INJECT); OPAL_CALL(opal_dump_read, OPAL_DUMP_READ); OPAL_CALL(opal_dump_ack, OPAL_DUMP_ACK); OPAL_CALL(opal_get_msg, OPAL_GET_MSG);
The patch synchronizes firmware header file (opal.h) for PCI error injection. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- arch/powerpc/include/asm/opal.h | 65 ++++++++++++++++++++++++++ arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + 2 files changed, 66 insertions(+)