[16/22] aerdrv: introduce set_e_source()

Commit Message

Hidetoshi Seto April 7, 2010, 7:32 a.m. UTC

None

Patch

diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 8344127..98d62d4 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -72,6 +72,34 @@  void pci_no_aer(void)
 }
 
 /**
+ * set_e_source - save an error source
+ * @rpc: pointer to the aer_rpc of the root port which save the error
+ * @status: error status to be saved
+ * @id: identifier of error device to be saved
+ *
+ * Invoked by Root Port's ISR with rpc->e_lock held.
+ * Return 1 on success, 0 on error.
+ */
+static int set_e_source(struct aer_rpc *rpc, unsigned int status,
+			unsigned int id)
+{
+	int next_prod_idx;
+
+	next_prod_idx = rpc->prod_idx + 1;
+	if (next_prod_idx == AER_ERROR_SOURCES_MAX)
+		next_prod_idx = 0;
+
+	if (next_prod_idx == rpc->cons_idx)
+		return 0;
+
+	rpc->e_sources[rpc->prod_idx].status = status;
+	rpc->e_sources[rpc->prod_idx].id = id;
+	rpc->prod_idx = next_prod_idx;
+
+	return 1;
+}
+
+/**
  * aer_irq - Root Port's ISR
  * @irq: IRQ assigned to Root Port
  * @context: pointer to Root Port data structure
@@ -83,7 +111,6 @@  irqreturn_t aer_irq(int irq, void *context)
 	unsigned int status, id;
 	struct pcie_device *pdev = (struct pcie_device *)context;
 	struct aer_rpc *rpc = get_service_data(pdev);
-	int next_prod_idx;
 	unsigned long flags;
 	int pos;
 
@@ -107,10 +134,7 @@  irqreturn_t aer_irq(int irq, void *context)
 	pci_write_config_dword(pdev->port, pos + PCI_ERR_ROOT_STATUS, status);
 
 	/* Store error source for later DPC handler */
-	next_prod_idx = rpc->prod_idx + 1;
-	if (next_prod_idx == AER_ERROR_SOURCES_MAX)
-		next_prod_idx = 0;
-	if (next_prod_idx == rpc->cons_idx) {
+	if (!set_e_source(rpc, status, id)) {
 		/*
 		 * Error Storm Condition - possibly the same error occurred.
 		 * Drop the error.
@@ -118,9 +142,6 @@  irqreturn_t aer_irq(int irq, void *context)
 		spin_unlock_irqrestore(&rpc->e_lock, flags);
 		return IRQ_HANDLED;
 	}
-	rpc->e_sources[rpc->prod_idx].status =  status;
-	rpc->e_sources[rpc->prod_idx].id = id;
-	rpc->prod_idx = next_prod_idx;
 	spin_unlock_irqrestore(&rpc->e_lock, flags);
 
 	/*  Invoke DPC handler */