linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Mike Qiu <qiudayu@linux.vnet.ibm.com>,
	Gavin Shan <gwshan@linux.vnet.ibm.com>
Subject: [PATCH 06/21] powerpc/powernv: Sync header with firmware
Date: Tue, 30 Sep 2014 12:38:55 +1000	[thread overview]
Message-ID: <1412044750-24460-6-git-send-email-gwshan@linux.vnet.ibm.com> (raw)
In-Reply-To: <1412044750-24460-1-git-send-email-gwshan@linux.vnet.ibm.com>

The patch synchronizes firmware header file (opal.h) for PCI error
injection.

Signed-off-by: Mike Qiu <qiudayu@linux.vnet.ibm.com>
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
v2: Seperate enum error type and function and adjust the names
    according to mpe's suggestion. Also replacing "injct" with
    "inject"
---
 arch/powerpc/include/asm/opal.h                | 32 ++++++++++++++++++++++++++
 arch/powerpc/platforms/powernv/opal-wrappers.S |  1 +
 2 files changed, 33 insertions(+)

diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index 7127b87..f157941 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -148,6 +148,7 @@ struct opal_sg_list {
 #define OPAL_SET_PARAM				90
 #define OPAL_DUMP_RESEND			91
 #define OPAL_DUMP_INFO2				94
+#define OPAL_PCI_ERR_INJECT			96
 #define OPAL_PCI_EEH_FREEZE_SET			97
 #define OPAL_HANDLE_HMI				98
 #define OPAL_REGISTER_DUMP_REGION		101
@@ -200,6 +201,35 @@ enum OpalPciErrorSeverity {
 	OPAL_EEH_SEV_INF	= 5
 };
 
+enum OpalErrinjectType {
+	OPAL_ERR_INJECT_TYPE_IOA_BUS_ERR	= 0,
+	OPAL_ERR_INJECT_TYPE_IOA_BUS_ERR64	= 1,
+};
+
+enum OpalErrinjectFunc {
+	/* IOA bus specific errors */
+	OPAL_ERR_INJECT_FUNC_IOA_LD_MEM_ADDR	= 0,
+	OPAL_ERR_INJECT_FUNC_IOA_LD_MEM_DATA	= 1,
+	OPAL_ERR_INJECT_FUNC_IOA_LD_IO_ADDR	= 2,
+	OPAL_ERR_INJECT_FUNC_IOA_LD_IO_DATA	= 3,
+	OPAL_ERR_INJECT_FUNC_IOA_LD_CFG_ADDR	= 4,
+	OPAL_ERR_INJECT_FUNC_IOA_LD_CFG_DATA	= 5,
+	OPAL_ERR_INJECT_FUNC_IOA_ST_MEM_ADDR	= 6,
+	OPAL_ERR_INJECT_FUNC_IOA_ST_MEM_DATA	= 7,
+	OPAL_ERR_INJECT_FUNC_IOA_ST_IO_ADDR	= 8,
+	OPAL_ERR_INJECT_FUNC_IOA_ST_IO_DATA	= 9,
+	OPAL_ERR_INJECT_FUNC_IOA_ST_CFG_ADDR	= 10,
+	OPAL_ERR_INJECT_FUNC_IOA_ST_CFG_DATA	= 11,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_RD_ADDR	= 12,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_RD_DATA	= 13,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_RD_MASTER	= 14,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_RD_TARGET	= 15,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_WR_ADDR	= 16,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_WR_DATA	= 17,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_WR_MASTER	= 18,
+	OPAL_ERR_INJECT_FUNC_IOA_DMA_WR_TARGET	= 19,
+};
+
 enum OpalShpcAction {
 	OPAL_SHPC_GET_LINK_STATE = 0,
 	OPAL_SHPC_GET_SLOT_STATE = 1
@@ -820,6 +850,8 @@ int64_t opal_pci_eeh_freeze_clear(uint64_t phb_id, uint64_t pe_number,
 				  uint64_t eeh_action_token);
 int64_t opal_pci_eeh_freeze_set(uint64_t phb_id, uint64_t pe_number,
 				uint64_t eeh_action_token);
+int64_t opal_pci_err_inject(uint64_t phb_id, uint32_t pe_no, uint32_t type,
+			    uint32_t func, uint64_t addr, uint64_t mask);
 int64_t opal_pci_shpc(uint64_t phb_id, uint64_t shpc_action, uint8_t *state);
 
 
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S
index 5718855..15942b6 100644
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -184,6 +184,7 @@ OPAL_CALL(opal_register_exception_handler,	OPAL_REGISTER_OPAL_EXCEPTION_HANDLER)
 OPAL_CALL(opal_pci_eeh_freeze_status,		OPAL_PCI_EEH_FREEZE_STATUS);
 OPAL_CALL(opal_pci_eeh_freeze_clear,		OPAL_PCI_EEH_FREEZE_CLEAR);
 OPAL_CALL(opal_pci_eeh_freeze_set,		OPAL_PCI_EEH_FREEZE_SET);
+OPAL_CALL(opal_pci_err_inject,			OPAL_PCI_ERR_INJECT);
 OPAL_CALL(opal_pci_shpc,			OPAL_PCI_SHPC);
 OPAL_CALL(opal_pci_phb_mmio_enable,		OPAL_PCI_PHB_MMIO_ENABLE);
 OPAL_CALL(opal_pci_set_phb_mem_window,		OPAL_PCI_SET_PHB_MEM_WINDOW);
-- 
1.8.3.2

  parent reply	other threads:[~2014-09-30  2:39 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-30  2:38 [PATCH 01/21] powerpc/eeh: Drop unused argument in eeh_check_failure() Gavin Shan
2014-09-30  2:38 ` [PATCH 02/21] powerpc/eeh: Add eeh_pe_state sysfs entry Gavin Shan
2014-10-01  3:43   ` [02/21] " Michael Ellerman
2014-10-01  4:20     ` Gavin Shan
2014-09-30  2:38 ` [PATCH 03/21] powerpc/eeh: Freeze PE before PE reset Gavin Shan
2014-09-30  2:38 ` [PATCH 04/21] powerpc/eeh: Reenable PCI devices after reset Gavin Shan
2014-09-30  2:38 ` [PATCH 05/21] powerpc/eeh: Clear frozen state on passing device Gavin Shan
2014-09-30  2:38 ` Gavin Shan [this message]
2014-09-30  2:38 ` [PATCH 07/21] powerpc/eeh: Introduce eeh_ops::err_inject Gavin Shan
2014-09-30  2:38 ` [PATCH 08/21] powerpc/powernv: Add PCI error injection debugfs entry Gavin Shan
2014-09-30  2:38 ` [PATCH 09/21] powerpc/powernv: Clear PAPR error injection registers Gavin Shan
2014-09-30  2:38 ` [PATCH 10/21] powerpc/eeh: Clear frozen device state in time Gavin Shan
2014-09-30  2:39 ` [PATCH 11/21] powerpc/eeh: Fix improper condition in eeh_pci_enable() Gavin Shan
2014-09-30  2:39 ` [PATCH 12/21] powerpc/eeh: Unfreeze PE on enabling EEH functionality Gavin Shan
2014-09-30  2:39 ` [PATCH 13/21] powerpc/eeh: Use eeh_unfreeze_pe() Gavin Shan
2014-09-30  2:39 ` [PATCH 14/21] powerpc/eeh: Block PCI config access during reset Gavin Shan
2014-09-30  2:39 ` [PATCH 15/21] powerpc/pseries: Decrease message level on EEH initialization Gavin Shan
2014-09-30  2:39 ` [PATCH 16/21] powerpc/powernv: Sync OpalPciResetScope with firmware Gavin Shan
2014-09-30  2:39 ` [PATCH 17/21] powerpc/eeh: Tag reset state for user owned PE Gavin Shan
2014-09-30  2:39 ` [PATCH 18/21] powerpc/eeh: Emulate EEH recovery for VFIO devices Gavin Shan
2014-09-30  2:39 ` [PATCH 19/21] powerpc/eeh: Dump PCI config space for all child devices Gavin Shan
2014-09-30  2:39 ` [PATCH 20/21] powerpc/powernv: Fetch frozen PE on top level Gavin Shan
2014-09-30  2:39 ` [PATCH 21/21] powerpc/powernv: Override dma_get_required_mask() Gavin Shan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412044750-24460-6-git-send-email-gwshan@linux.vnet.ibm.com \
    --to=gwshan@linux.vnet.ibm.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=qiudayu@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).