From patchwork Thu Jun 14 04:40:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 164805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DA631B7050 for ; Thu, 14 Jun 2012 14:40:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751040Ab2FNEkK (ORCPT ); Thu, 14 Jun 2012 00:40:10 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:61837 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965Ab2FNEkJ (ORCPT ); Thu, 14 Jun 2012 00:40:09 -0400 Received: by pbbrp8 with SMTP id rp8so3246066pbb.19 for ; Wed, 13 Jun 2012 21:40:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding:x-gm-message-state; bh=a4KEK5aJ6j+jcrZaAtUjn8AYmVIGOpabVmkdRLcSeec=; b=WMyhA78g+QV/l9DLW4diJKsEFGxUrVj5uskoL96eDQY7NvQghBx0UbRwhIu26D4Lvb qFOI13vthug3E3TMpkrlsHi/ilQgNPaBcwG5KDM8NGCN1XOq9DVg148PM5JHoFZYzmgy rZpsvGAm8HTJxWUvWNN2X8H8XpJOmm1jAK0QK69m/qGNUJstT3DjPIcBIU7/f0CEAqMn T2vtCqpq4EXx1Pf2ZeNlQHku6ag3I7qmaNOKZw7RI449SWuqArj0POUdWD5RGcS67BjJ Jf8ELt5VzP5m5tkbl48CwXUImwvst4r1sAwXNQoStpNZmdO8O58ixITbyrnSadTPkQGp xHOA== Received: by 10.68.222.9 with SMTP id qi9mr3253580pbc.164.1339648809326; Wed, 13 Jun 2012 21:40:09 -0700 (PDT) Received: from [10.61.2.175] (ibmaus65.lnk.telstra.net. [165.228.126.9]) by mx.google.com with ESMTPS id gj8sm8122937pbc.39.2012.06.13.21.40.07 (version=SSLv3 cipher=OTHER); Wed, 13 Jun 2012 21:40:08 -0700 (PDT) Message-ID: <4FD96B26.70305@ozlabs.ru> Date: Thu, 14 Jun 2012 14:40:06 +1000 From: Alexey Kardashevskiy User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: kvm-ppc@vger.kernel.org, "qemu-devel@nongnu.org" , Benjamin Herrenschmidt Subject: [PATCH] pseries pci: spapr_populate_pci_devices renamed to spapr_populate_pci_dt X-Gm-Message-State: ALoCoQlv/RhWhetqGA8PkHZB8bazURbq+Z007tRL5q9pVFTU6B15XPPM/6mvVV3fh/S+YojX3kIf Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org spapr_populate_pci_devices() populates the device tree only with bus properties and has nothing to do with the devices on it as PCI BAR allocation is done by the system firmware (SLOF). New name - spapr_populate_pci_dt() - describes the functionality better. Signed-off-by: Alexey Kardashevskiy --- hw/spapr.c | 2 +- hw/spapr_pci.c | 6 +++--- hw/spapr_pci.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 47b26ee..2e0b4b8 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -551,7 +551,7 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr, } QLIST_FOREACH(phb, &spapr->phbs, list) { - ret = spapr_populate_pci_devices(phb, PHANDLE_XICP, fdt); + ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt); } if (ret < 0) { diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index 1c0b605..269dbbf 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -345,9 +345,9 @@ void spapr_create_phb(sPAPREnvironment *spapr, #define b_fff(x) b_x((x), 8, 3) /* function number */ #define b_rrrrrrrr(x) b_x((x), 0, 8) /* register number */ -int spapr_populate_pci_devices(sPAPRPHBState *phb, - uint32_t xics_phandle, - void *fdt) +int spapr_populate_pci_dt(sPAPRPHBState *phb, + uint32_t xics_phandle, + void *fdt) { int bus_off, i, j; char nodename[256]; diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h index a141764..dd66f4b 100644 --- a/hw/spapr_pci.h +++ b/hw/spapr_pci.h @@ -55,8 +55,8 @@ void spapr_create_phb(sPAPREnvironment *spapr, uint64_t mem_win_addr, uint64_t mem_win_size, uint64_t io_win_addr); -int spapr_populate_pci_devices(sPAPRPHBState *phb, - uint32_t xics_phandle, - void *fdt); +int spapr_populate_pci_dt(sPAPRPHBState *phb, + uint32_t xics_phandle, + void *fdt); #endif /* __HW_SPAPR_PCI_H__ */