From patchwork Fri May 15 05:46:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 6411351 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C16DA9F1CC for ; Fri, 15 May 2015 05:54:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE04320456 for ; Fri, 15 May 2015 05:54:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B285F20452 for ; Fri, 15 May 2015 05:54:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753087AbbEOFyK (ORCPT ); Fri, 15 May 2015 01:54:10 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:55263 "EHLO e23smtp03.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752142AbbEOFyK (ORCPT ); Fri, 15 May 2015 01:54:10 -0400 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 15 May 2015 15:54:08 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp03.au.ibm.com (202.81.31.209) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 15 May 2015 15:54:06 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 04C442CE8050 for ; Fri, 15 May 2015 15:54:06 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t4F5rvfM45875448 for ; Fri, 15 May 2015 15:54:05 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t4F5rX6w006344 for ; Fri, 15 May 2015 15:53:33 +1000 Received: from localhost ([9.123.251.150]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t4F5rW6h006037; Fri, 15 May 2015 15:53:32 +1000 From: Wei Yang To: gwshan@linux.vnet.ibm.com, bhelgaas@google.com Cc: linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, Wei Yang Subject: [PATCH V4 10/11] powerpc/powernv: use "compound" as the child's list_head for compound PE Date: Fri, 15 May 2015 13:46:25 +0800 Message-Id: <1431668786-30371-11-git-send-email-weiyang@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1431668786-30371-1-git-send-email-weiyang@linux.vnet.ibm.com> References: <1431668786-30371-1-git-send-email-weiyang@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15051505-0009-0000-0000-00000165337C Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 262af557dd75(powerpc/powernv: Enable M64 aperatus for PHB3) introduces the concept of compound PE, and they are linked together to master PE's slaves lish_head with the list field. While this field is usually used to linked to the phb->ioda.pe_list to represents the PE is used. This patch introduces a field "compound" to link those compound PEs. Signed-off-by: Wei Yang --- arch/powerpc/platforms/powernv/pci-ioda.c | 8 ++++---- arch/powerpc/platforms/powernv/pci.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 920c252..843457b 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -344,7 +344,7 @@ done: } else { pe->flags |= PNV_IODA_PE_SLAVE; pe->master = master_pe; - list_add_tail(&pe->list, &master_pe->slaves); + list_add_tail(&pe->compound, &master_pe->slaves); } } @@ -428,7 +428,7 @@ static void pnv_ioda_freeze_pe(struct pnv_phb *phb, int pe_no) if (!(pe->flags & PNV_IODA_PE_MASTER)) return; - list_for_each_entry(slave, &pe->slaves, list) { + list_for_each_entry(slave, &pe->slaves, compound) { rc = opal_pci_eeh_freeze_set(phb->opal_id, slave->pe_number, OPAL_EEH_ACTION_SET_FREEZE_ALL); @@ -464,7 +464,7 @@ static int pnv_ioda_unfreeze_pe(struct pnv_phb *phb, int pe_no, int opt) return 0; /* Clear frozen state for slave PEs */ - list_for_each_entry(slave, &pe->slaves, list) { + list_for_each_entry(slave, &pe->slaves, compound) { rc = opal_pci_eeh_freeze_clear(phb->opal_id, slave->pe_number, opt); @@ -516,7 +516,7 @@ static int pnv_ioda_get_pe_state(struct pnv_phb *phb, int pe_no) if (!(pe->flags & PNV_IODA_PE_MASTER)) return state; - list_for_each_entry(slave, &pe->slaves, list) { + list_for_each_entry(slave, &pe->slaves, compound) { rc = opal_pci_eeh_freeze_status(phb->opal_id, slave->pe_number, &fstate, diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h index 070ee88..540ab1e 100644 --- a/arch/powerpc/platforms/powernv/pci.h +++ b/arch/powerpc/platforms/powernv/pci.h @@ -73,6 +73,7 @@ struct pnv_ioda_pe { /* PEs in compound case */ struct pnv_ioda_pe *master; struct list_head slaves; + struct list_head compound; /* Link in list of PE#s */ struct list_head dma_link;