From patchwork Mon Jul 12 18:41:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 58653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C4F08B6F17 for ; Tue, 13 Jul 2010 04:55:40 +1000 (EST) Received: from localhost ([127.0.0.1]:44683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYOA6-0002Od-V4 for incoming@patchwork.ozlabs.org; Mon, 12 Jul 2010 14:55:30 -0400 Received: from [140.186.70.92] (port=47674 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYNwx-000176-0P for qemu-devel@nongnu.org; Mon, 12 Jul 2010 14:41:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYNwv-0006K5-PK for qemu-devel@nongnu.org; Mon, 12 Jul 2010 14:41:54 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:61407) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYNwv-0006Jw-Jj for qemu-devel@nongnu.org; Mon, 12 Jul 2010 14:41:53 -0400 Received: by pvg7 with SMTP id 7so1958349pvg.4 for ; Mon, 12 Jul 2010 11:41:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=Ig2pCb59seRZysSqlFopPhBcj5f16rRlqu9r3jib1eE=; b=j9IeQiYHfqvB4oKWctD87uDy3tWHTBlQye9y2XcGaWX1Rxlljfzoj8Vmn1J6lSyyES ft8MRdRBRN0tZ16b5m5wBebc2I6X5EDcN/MyjjgPGJcF5KplG34oZpMmx3qQW/1pDrnM ze1roZeUEW6XKDeteFYWSl3K+Yb8kFVksyosw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=iLG+CRkFz++1Cd5QGi8PmxKkTxXv/fVuVqSAoJz04hhxA9qBHqJQ89P+FYVUY9auVt cLPsX+mIije+A1i/h3v6c0QtBpIyWxq5EO04GZkFd+NCfPonqt/+oKWWb6/usPDQvaEG tu6OjBMSntjh6efOBock8KSAxAou+8uSPVHLQ= Received: by 10.142.204.17 with SMTP id b17mr1159013wfg.37.1278960110221; Mon, 12 Jul 2010 11:41:50 -0700 (PDT) MIME-Version: 1.0 Received: by 10.142.212.14 with HTTP; Mon, 12 Jul 2010 11:41:30 -0700 (PDT) From: Blue Swirl Date: Mon, 12 Jul 2010 18:41:30 +0000 Message-ID: To: qemu-devel , Anthony Liguori , "Michael S. Tsirkin" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH 10/15] openpic: convert to pci_bar_map X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use pci_bar_map() instead of a mapping function. Signed-off-by: Blue Swirl --- hw/openpic.c | 36 +++++------------------------------- 1 files changed, 5 insertions(+), 31 deletions(-) opp->nb_cpus = nb_cpus; diff --git a/hw/openpic.c b/hw/openpic.c index 01bf15f..3f97afd 100644 --- a/hw/openpic.c +++ b/hw/openpic.c @@ -1013,34 +1013,6 @@ static CPUReadMemoryFunc * const openpic_read[] = { &openpic_readl, }; -static void openpic_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - openpic_t *opp; - - DPRINTF("Map OpenPIC\n"); - opp = (openpic_t *)pci_dev; - /* Global registers */ - DPRINTF("Register OPENPIC gbl %08x => %08x\n", - addr + 0x1000, addr + 0x1000 + 0x100); - /* Timer registers */ - DPRINTF("Register OPENPIC timer %08x => %08x\n", - addr + 0x1100, addr + 0x1100 + 0x40 * MAX_TMR); - /* Interrupt source registers */ - DPRINTF("Register OPENPIC src %08x => %08x\n", - addr + 0x10000, addr + 0x10000 + 0x20 * (OPENPIC_EXT_IRQ + 2)); - /* Per CPU registers */ - DPRINTF("Register OPENPIC dst %08x => %08x\n", - addr + 0x20000, addr + 0x20000 + 0x1000 * MAX_CPU); - cpu_register_physical_memory(addr, 0x40000, opp->mem_index); -#if 0 // Don't implement ISU for now - opp_io_memory = cpu_register_io_memory(openpic_src_read, - openpic_src_write); - cpu_register_physical_memory(isu_base, 0x20 * (EXT_IRQ + 2), - opp_io_memory); -#endif -} - static void openpic_save_IRQ_queue(QEMUFile* f, IRQ_queue_t *q) { unsigned int i; @@ -1198,12 +1170,14 @@ qemu_irq *openpic_init (PCIBus *bus, int *pmem_index, int nb_cpus, /* Register I/O spaces */ pci_register_bar((PCIDevice *)opp, 0, 0x40000, - PCI_BASE_ADDRESS_SPACE_MEMORY, &openpic_map); + PCI_BASE_ADDRESS_SPACE_MEMORY, NULL); } else { opp = qemu_mallocz(sizeof(openpic_t)); } - opp->mem_index = cpu_register_io_memory(openpic_read, - openpic_write, opp); + opp->mem_index = cpu_register_io_memory(openpic_read, openpic_write, opp); + if (bus) { + pci_bar_map((PCIDevice *)opp, 0, 0, 0x40000, 0, opp->mem_index); + } // isu_base &= 0xFFFC0000;