From patchwork Sun Aug 15 19:57:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduard - Gabriel Munteanu X-Patchwork-Id: 119638 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7FK13xi027333 for ; Sun, 15 Aug 2010 20:01:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751385Ab0HOUAu (ORCPT ); Sun, 15 Aug 2010 16:00:50 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:64241 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217Ab0HOUAu (ORCPT ); Sun, 15 Aug 2010 16:00:50 -0400 Received: by fxm13 with SMTP id 13so2635014fxm.19 for ; Sun, 15 Aug 2010 13:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=xPc4HSeNWIyQ/O2uurkLcFv1lkpArrpyrQdwN9/taAc=; b=r5VPMko1jYKP37kVtU1e7f6XuDeN7Hfjqgur82gUL2Kh02hJRIQb07eD2wNmtQs0Np u9xgP1etWjL+ocy+Bs3YkQoCQJkRE8NLkZUhj6Y+opha4jdsqA2bw0l+PBUjcFdtWAo7 P+IunE+Tf8QNYT0Y7GGK+2zsTubxv4O8D87EE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=lgT6dxU41f9Mou3uVQg+EIaPRgaQrM8CNmDUu/iR4CgeXr8zUeEQZwYdKlj8ZgiXFZ T6M02H1zi5c05Mdm4jyJvP+D1mT8SMAdJ6Nf3Rc0TvOKk0PClF4yxjErGtp5KTYbssZ0 5GoehAFf+RSXWzfVWFPG0UiAtDVULzu4wKXnk= Received: by 10.223.108.137 with SMTP id f9mr4436546fap.3.1281902448845; Sun, 15 Aug 2010 13:00:48 -0700 (PDT) Received: from localhost.localdomain ([178.138.32.54]) by mx.google.com with ESMTPS id e17sm536426faa.15.2010.08.15.13.00.42 (version=SSLv3 cipher=RC4-MD5); Sun, 15 Aug 2010 13:00:48 -0700 (PDT) From: Eduard - Gabriel Munteanu To: joro@8bytes.org Cc: paul@codesourcery.com, blauwirbel@gmail.com, anthony@codemonkey.ws, avi@redhat.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, seabios@seabios.org, Eduard - Gabriel Munteanu Subject: [PATCH 1/2] Split region allocation code from pci_bios_init_device() Date: Sun, 15 Aug 2010 22:57:26 +0300 Message-Id: <1281902247-5151-1-git-send-email-eduard.munteanu@linux360.ro> X-Mailer: git-send-email 1.7.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 15 Aug 2010 20:01:03 +0000 (UTC) diff --git a/src/pciinit.c b/src/pciinit.c index 0556ee2..bfc669f 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -75,6 +75,16 @@ static void pci_bios_init_bridges(u16 bdf) } } +static inline u32 pci_bios_alloc(u32 *region, u32 size) +{ + u32 ret; + + ret = ALIGN(*region, size); + *region = ret + size; + + return ret; +} + static void pci_bios_init_device(u16 bdf) { int class; @@ -146,14 +156,13 @@ static void pci_bios_init_device(u16 bdf) pci_config_writel(bdf, ofs, old); if (val != 0) { - u32 size = (~(val & mask)) + 1; + u32 base, size = (~(val & mask)) + 1; if (val & PCI_BASE_ADDRESS_SPACE_IO) paddr = &pci_bios_io_addr; else paddr = &pci_bios_mem_addr; - *paddr = ALIGN(*paddr, size); - pci_set_io_region_addr(bdf, i, *paddr); - *paddr += size; + base = pci_bios_alloc(paddr, size); + pci_set_io_region_addr(bdf, i, base); } } break;