From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: linux-pci@vger.kernel.org, devicetree@vger.kernel.org,
benh@kernel.crashing.org, mpe@ellerman.id.au, aik@ozlabs.ru,
dja@axtens.net, bhelgaas@google.com, robherring2@gmail.com,
grant.likely@linaro.org, Gavin Shan <gwshan@linux.vnet.ibm.com>
Subject: [PATCH v8 33/45] powerpc/powernv: Simplify pnv_eeh_reset()
Date: Wed, 17 Feb 2016 14:44:16 +1100 [thread overview]
Message-ID: <1455680668-23298-34-git-send-email-gwshan@linux.vnet.ibm.com> (raw)
In-Reply-To: <1455680668-23298-1-git-send-email-gwshan@linux.vnet.ibm.com>
This drops unnecessary nested if statements in pnv_eeh_reset() to
improve the code readability. After the changes, the unused local
variable "ret" is dropped as well. No logical changes introduced.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
arch/powerpc/platforms/powernv/eeh-powernv.c | 67 +++++++++++++---------------
1 file changed, 31 insertions(+), 36 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 69e41ce..9226df1 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -1009,8 +1009,9 @@ static int pnv_eeh_reset_vf_pe(struct eeh_pe *pe, int option)
static int pnv_eeh_reset(struct eeh_pe *pe, int option)
{
struct pci_controller *hose = pe->phb;
+ struct pnv_phb *phb;
struct pci_bus *bus;
- int ret;
+ int64_t rc;
/*
* For PHB reset, we always have complete reset. For those PEs whose
@@ -1026,45 +1027,39 @@ static int pnv_eeh_reset(struct eeh_pe *pe, int option)
* reset. The side effect is that EEH core has to clear the frozen
* state explicitly after BAR restore.
*/
- if (pe->type & EEH_PE_PHB) {
- ret = pnv_eeh_phb_reset(hose, option);
- } else {
- struct pnv_phb *phb;
- s64 rc;
+ if (pe->type & EEH_PE_PHB)
+ return pnv_eeh_phb_reset(hose, option);
- /*
- * The frozen PE might be caused by PAPR error injection
- * registers, which are expected to be cleared after hitting
- * frozen PE as stated in the hardware spec. Unfortunately,
- * that's not true on P7IOC. So we have to clear it manually
- * to avoid recursive EEH errors during recovery.
- */
- phb = hose->private_data;
- if (phb->model == PNV_PHB_MODEL_P7IOC &&
- (option == EEH_RESET_HOT ||
- option == EEH_RESET_FUNDAMENTAL)) {
- rc = opal_pci_reset(phb->opal_id,
- OPAL_RESET_PHB_ERROR,
- OPAL_ASSERT_RESET);
- if (rc != OPAL_SUCCESS) {
- pr_warn("%s: Failure %lld clearing "
- "error injection registers\n",
- __func__, rc);
- return -EIO;
- }
+ /*
+ * The frozen PE might be caused by PAPR error injection
+ * registers, which are expected to be cleared after hitting
+ * frozen PE as stated in the hardware spec. Unfortunately,
+ * that's not true on P7IOC. So we have to clear it manually
+ * to avoid recursive EEH errors during recovery.
+ */
+ phb = hose->private_data;
+ if (phb->model == PNV_PHB_MODEL_P7IOC &&
+ (option == EEH_RESET_HOT ||
+ option == EEH_RESET_FUNDAMENTAL)) {
+ rc = opal_pci_reset(phb->opal_id,
+ OPAL_RESET_PHB_ERROR,
+ OPAL_ASSERT_RESET);
+ if (rc != OPAL_SUCCESS) {
+ pr_warn("%s: Failure %lld clearing error injection registers\n",
+ __func__, rc);
+ return -EIO;
}
-
- bus = eeh_pe_bus_get(pe);
- if (pe->type & EEH_PE_VF)
- ret = pnv_eeh_reset_vf_pe(pe, option);
- else if (pci_is_root_bus(bus) ||
- pci_is_root_bus(bus->parent))
- ret = pnv_eeh_root_reset(hose, option);
- else
- ret = pnv_eeh_bridge_reset(bus->self, option);
}
- return ret;
+ bus = eeh_pe_bus_get(pe);
+ if (pe->type & EEH_PE_VF)
+ return pnv_eeh_reset_vf_pe(pe, option);
+
+ if (pci_is_root_bus(bus) ||
+ pci_is_root_bus(bus->parent))
+ return pnv_eeh_root_reset(hose, option);
+
+ return pnv_eeh_bridge_reset(bus->self, option);
}
/**
--
2.1.0
next prev parent reply other threads:[~2016-02-17 3:46 UTC|newest]
Thread overview: 152+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 3:43 [PATCH v8 00/45] powerpc/powernv: PCI hotplug support Gavin Shan
2016-02-17 3:43 ` [PATCH v8 01/45] PCI: Add pcibios_setup_bridge() Gavin Shan
2016-02-17 3:43 ` [PATCH v8 02/45] powerpc/pci: Override pcibios_setup_bridge() Gavin Shan
2016-04-13 5:52 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 03/45] powerpc/pci: Cleanup on struct pci_controller_ops Gavin Shan
2016-02-17 4:18 ` Andrew Donnellan
2016-04-13 5:52 ` Alexey Kardashevskiy
2016-04-19 23:59 ` Gavin Shan
2016-02-17 3:43 ` [PATCH v8 04/45] powerpc/powernv: Cleanup on pci_controller_ops instances Gavin Shan
2016-02-17 4:38 ` Andrew Donnellan
2016-02-17 3:43 ` [PATCH v8 05/45] powerpc/powernv: Drop phb->bdfn_to_pe() Gavin Shan
2016-04-13 5:53 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 06/45] powerpc/powernv: Reorder fields in struct pnv_phb Gavin Shan
2016-04-13 5:56 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 07/45] powerpc/powernv: Rename PE# " Gavin Shan
2016-04-13 5:57 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 08/45] powerpc/powernv: Fix initial IO and M32 segmap Gavin Shan
2016-04-13 6:21 ` Alexey Kardashevskiy
2016-04-13 7:53 ` Gavin Shan
2016-04-13 9:53 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 09/45] powerpc/powernv: Simplify pnv_ioda_setup_pe_seg() Gavin Shan
2016-04-13 6:45 ` Alexey Kardashevskiy
2016-04-20 0:04 ` Gavin Shan
2016-02-17 3:43 ` [PATCH v8 10/45] powerpc/powernv: IO and M32 mapping based on PCI device resources Gavin Shan
2016-02-17 3:43 ` [PATCH v8 11/45] powerpc/powernv: Track M64 segment consumption Gavin Shan
2016-04-13 7:09 ` Alexey Kardashevskiy
2016-04-20 0:05 ` Gavin Shan
2016-02-17 3:43 ` [PATCH v8 12/45] powerpc/powernv: Rename M64 related functions Gavin Shan
2016-04-13 7:20 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 13/45] powerpc/powernv/ioda1: M64 support on P7IOC Gavin Shan
2016-04-13 7:47 ` Alexey Kardashevskiy
2016-04-20 0:22 ` Gavin Shan
2016-04-20 2:55 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 14/45] powerpc/powernv/ioda1: Rename pnv_pci_ioda_setup_dma_pe() Gavin Shan
2016-04-13 7:36 ` Alexey Kardashevskiy
2016-02-17 3:43 ` [PATCH v8 15/45] powerpc/powernv/ioda1: Introduce PNV_IODA1_DMA32_SEGSIZE Gavin Shan
2016-04-13 8:29 ` Alexey Kardashevskiy
2016-04-13 23:54 ` Gavin Shan
2016-04-14 3:36 ` Alexey Kardashevskiy
2016-04-20 0:25 ` Gavin Shan
2016-02-17 3:43 ` [PATCH v8 16/45] powerpc/powernv: Remove DMA32 PE list Gavin Shan
2016-04-13 8:59 ` Alexey Kardashevskiy
2016-04-20 0:34 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 17/45] powerpc/powernv/ioda1: Improve DMA32 segment track Gavin Shan
2016-04-19 1:50 ` Alexey Kardashevskiy
2016-04-20 0:49 ` Gavin Shan
2016-04-20 5:10 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 18/45] powerpc/powernv: Increase PE# capacity Gavin Shan
2016-04-19 2:02 ` Alexey Kardashevskiy
2016-04-20 0:52 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 19/45] powerpc/powernv: Use PE instead of number during setup and release Gavin Shan
2016-04-19 2:50 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 20/45] powerpc/powernv: Allocate PE# in reverse order Gavin Shan
2016-04-19 3:07 ` Alexey Kardashevskiy
2016-04-20 1:04 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 21/45] powerpc/powernv: Create PEs at PCI hot plugging time Gavin Shan
2016-04-19 4:16 ` Alexey Kardashevskiy
2016-04-20 1:12 ` Gavin Shan
2016-04-20 3:00 ` Alexey Kardashevskiy
2016-04-20 3:35 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 22/45] powerpc/powernv/ioda1: Support releasing IODA1 TCE table Gavin Shan
2016-04-19 4:28 ` Alexey Kardashevskiy
2016-04-20 1:15 ` Gavin Shan
2016-04-20 3:17 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 23/45] powerpc/powernv: Dynamically release PEs Gavin Shan
2016-04-19 5:19 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 24/45] powerpc/pci: Rename pcibios_{add,remove}_pci_devices() Gavin Shan
2016-04-19 5:28 ` Alexey Kardashevskiy
2016-04-20 1:23 ` Gavin Shan
2016-04-20 3:21 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 25/45] powerpc/pci: Rename pcibios_find_pci_bus() Gavin Shan
2016-04-19 5:31 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 26/45] powerpc/pci: Move pci_find_bus_by_node() around Gavin Shan
2016-02-17 3:44 ` [PATCH v8 27/45] powerpc/pci: Export pci_add_device_node_info() Gavin Shan
2016-04-19 5:35 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 28/45] powerpc/pci: Introduce pci_remove_device_node_info() Gavin Shan
2016-04-19 5:48 ` Alexey Kardashevskiy
2016-04-20 1:25 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 29/45] powerpc/pci: Export pci_traverse_device_nodes() Gavin Shan
2016-04-19 5:51 ` Alexey Kardashevskiy
2016-04-20 1:27 ` Gavin Shan
2016-04-20 3:39 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 30/45] powerpc/pci: Delay populating pdn Gavin Shan
2016-04-19 8:19 ` Alexey Kardashevskiy
2016-04-20 2:13 ` Gavin Shan
2016-04-20 3:54 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 31/45] powerpc/pci: Don't scan empty slot Gavin Shan
2016-04-19 8:19 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 32/45] powerpc/pci: Update bridge windows on PCI plug Gavin Shan
2016-04-19 8:47 ` Alexey Kardashevskiy
2016-02-17 3:44 ` Gavin Shan [this message]
2016-02-17 4:35 ` [PATCH v8 33/45] powerpc/powernv: Simplify pnv_eeh_reset() Andrew Donnellan
2016-04-19 8:49 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 34/45] powerpc/powernv: Exclude root bus in pnv_pci_reset_secondary_bus() Gavin Shan
2016-04-19 8:57 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 35/45] powerpc/powernv: Fundamental reset " Gavin Shan
2016-04-19 9:04 ` Alexey Kardashevskiy
2016-04-20 1:36 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 36/45] powerpc/powernv: Support PCI slot ID Gavin Shan
2016-04-19 9:28 ` Alexey Kardashevskiy
2016-04-20 2:28 ` Gavin Shan
2016-04-20 4:14 ` Alexey Kardashevskiy
2016-04-22 4:23 ` Alistair Popple
2016-02-17 3:44 ` [PATCH v8 37/45] powerpc/powernv: Use firmware PCI slot reset infrastructure Gavin Shan
2016-04-19 9:34 ` Alexey Kardashevskiy
2016-04-20 2:33 ` Gavin Shan
2016-04-20 4:17 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 38/45] powerpc/powernv: Functions to get/set PCI slot status Gavin Shan
2016-04-19 9:39 ` Alexey Kardashevskiy
2016-04-20 2:36 ` Gavin Shan
2016-04-20 4:25 ` Alexey Kardashevskiy
2016-02-17 3:44 ` [PATCH v8 39/45] powerpc/powernv: Select OF_DYNAMIC Gavin Shan
2016-04-19 9:42 ` Alexey Kardashevskiy
2016-04-20 2:38 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 40/45] drivers/of: Split unflatten_dt_node() Gavin Shan
2016-02-17 14:30 ` Rob Herring
2016-04-20 2:38 ` Gavin Shan
2016-05-02 2:02 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 41/45] drivers/of: Avoid recursively calling unflatten_dt_node() Gavin Shan
2016-02-17 14:53 ` Rob Herring
2016-02-17 3:44 ` [PATCH v8 42/45] drivers/of: Rename unflatten_dt_node() Gavin Shan
2016-02-17 14:59 ` Rob Herring
2016-02-19 3:16 ` Gavin Shan
2016-03-02 2:40 ` Rob Herring
2016-03-08 0:56 ` Gavin Shan
2016-03-17 13:31 ` Rob Herring
2016-03-17 22:44 ` Gavin Shan
2016-02-17 3:44 ` [PATCH v8 43/45] drivers/of: Specify parent node in of_fdt_unflatten_tree() Gavin Shan
2016-02-17 15:00 ` Rob Herring
2016-02-17 15:58 ` Jyri Sarha
2016-02-17 3:44 ` [PATCH v8 44/45] drivers/of: Return allocated memory from of_fdt_unflatten_tree() Gavin Shan
2016-02-17 3:44 ` [PATCH v8 45/45] PCI/hotplug: PowerPC PowerNV PCI hotplug driver Gavin Shan
2016-04-15 0:47 ` Alistair Popple
2016-04-15 1:39 ` Gavin Shan
2016-04-19 10:36 ` Alexey Kardashevskiy
2016-04-20 1:55 ` Alistair Popple
2016-05-02 23:41 ` Gavin Shan
2016-05-03 0:44 ` Alexey Kardashevskiy
2016-05-02 3:44 ` Gavin Shan
2016-05-02 6:11 ` Alexey Kardashevskiy
2016-05-02 23:38 ` Gavin Shan
2016-04-13 7:28 ` [PATCH v8 00/45] powerpc/powernv: PCI hotplug support Alexey Kardashevskiy
2016-04-13 7:42 ` Gavin Shan
2016-04-13 9:14 ` Alexey Kardashevskiy
2016-04-13 23:42 ` Gavin Shan
2016-04-13 23:57 ` Alistair Popple
2016-04-14 1:30 ` Gavin Shan
2016-04-14 3:38 ` Alexey Kardashevskiy
2016-04-15 16:10 ` Rob Herring
2016-04-20 2:40 ` Gavin Shan
2016-04-14 3:26 ` Alexey Kardashevskiy
2016-04-14 5:25 ` 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=1455680668-23298-34-git-send-email-gwshan@linux.vnet.ibm.com \
--to=gwshan@linux.vnet.ibm.com \
--cc=aik@ozlabs.ru \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=devicetree@vger.kernel.org \
--cc=dja@axtens.net \
--cc=grant.likely@linaro.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=robherring2@gmail.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).