From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEAFBC433F5 for ; Mon, 18 Oct 2021 01:42:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 467A0604D2 for ; Mon, 18 Oct 2021 01:42:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 467A0604D2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eik.bme.hu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:55488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcHfU-0006gU-1m for qemu-devel@archiver.kernel.org; Sun, 17 Oct 2021 21:42:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcHeH-0005LS-Aq for qemu-devel@nongnu.org; Sun, 17 Oct 2021 21:41:09 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:57871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcHeC-0001rs-8T for qemu-devel@nongnu.org; Sun, 17 Oct 2021 21:41:08 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 3796C746399; Mon, 18 Oct 2021 03:40:59 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 13E65746353; Mon, 18 Oct 2021 03:40:59 +0200 (CEST) From: BALATON Zoltan Subject: [PATCH] via-ide: Avoid expensive operations in irq handler Date: Mon, 18 Oct 2021 03:36:46 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: qemu-devel@nongnu.org Message-Id: <20211018014059.13E65746353@zero.eik.bme.hu> Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Huacai Chen , John Snow , Gerd Hoffmann , Philippe M-D Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Cache the pointer to PCI function 0 (ISA bridge, that this IDE device has to use for IRQs) in the PCIIDEState and pass that as the opaque data for the interrupt handler to eliminate both the need to look up function 0 at every interrupt and also a QOM type cast of the opaque pointer as that's also expensive (mainly due to qom-debug being enabled by default). Suggested-by: Philippe Mathieu-Daudé Signed-off-by: BALATON Zoltan --- hw/ide/via.c | 11 ++++++----- include/hw/ide/pci.h | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 82def819c4..30566bc409 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -104,15 +104,15 @@ static void bmdma_setup_bar(PCIIDEState *d) static void via_ide_set_irq(void *opaque, int n, int level) { - PCIDevice *d = PCI_DEVICE(opaque); + PCIIDEState *d = opaque; if (level) { - d->config[0x70 + n * 8] |= 0x80; + d->parent_obj.config[0x70 + n * 8] |= 0x80; } else { - d->config[0x70 + n * 8] &= ~0x80; + d->parent_obj.config[0x70 + n * 8] &= ~0x80; } - via_isa_set_irq(pci_get_function_0(d), 14 + n, level); + via_isa_set_irq(d->func0, 14 + n, level); } static void via_ide_reset(DeviceState *dev) @@ -188,7 +188,8 @@ static void via_ide_realize(PCIDevice *dev, Error **errp) bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); - qdev_init_gpio_in(ds, via_ide_set_irq, 2); + d->func0 = pci_get_function_0(dev); + qdev_init_gpio_in_named_with_opaque(ds, via_ide_set_irq, d, NULL, 2); for (i = 0; i < 2; i++) { ide_bus_init(&d->bus[i], sizeof(d->bus[i]), ds, i, 2); ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i)); diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index d8384e1c42..89d14abf95 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -50,6 +50,7 @@ struct PCIIDEState { IDEBus bus[2]; BMDMAState bmdma[2]; uint32_t secondary; /* used only for cmd646 */ + PCIDevice *func0; /* used only by IDE functions of superio chips */ MemoryRegion bmdma_bar; MemoryRegion cmd_bar[2]; MemoryRegion data_bar[2]; -- 2.21.4