From nobody Wed Nov 27 17:31:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697966971; cv=none; d=zohomail.com; s=zohoarc; b=Ds6YZ1LfbNh77qZ8vfPONgpYZEDeFDEvD6VDePO/sbe6MAwGjx1Q/vY0LGbg40vBopK0JKI7Ihgou+1kytFjSqLdR3U2wKZwcv4RC8fqJ/ZOkQcmNG+AxIyPqeUhWofAUruHZAhft6CkjFj3Mp1xk86qjJNj6XObtm3UASGsD4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697966971; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pkIPSukbn4TdWmXR29nNf5zPEIsdHpMleShz6bahFgE=; b=OpZu67tEaM2ZkWSAIpHEZDof1cyDVNWBbk3A7KFr7se1ADCFrbKAB18eD8c1TJj/aS/uCAsG6uLPFLgqOcm5iq9MF+GyUcoX01PQrCHaLIX9ffirKta4vcXHfaCsnotVIh4GxQ7+8Qb4bi5HFkHS7vtNeVquxiS9WOXoApqH7/w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697966971315321.24400579022017; Sun, 22 Oct 2023 02:29:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quUhx-0005uR-HD; Sun, 22 Oct 2023 05:25:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quUhv-0005h7-HH for qemu-devel@nongnu.org; Sun, 22 Oct 2023 05:25:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quUht-0000pF-Jj for qemu-devel@nongnu.org; Sun, 22 Oct 2023 05:25:15 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-_wanT6LjOsyutrxJ4wQeEg-1; Sun, 22 Oct 2023 05:25:11 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3f42bcef2acso12651275e9.2 for ; Sun, 22 Oct 2023 02:25:10 -0700 (PDT) Received: from redhat.com ([2.52.1.53]) by smtp.gmail.com with ESMTPSA id j7-20020a5d6187000000b003253523d767sm5279180wru.109.2023.10.22.02.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 02:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697966712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pkIPSukbn4TdWmXR29nNf5zPEIsdHpMleShz6bahFgE=; b=Tyi/bOzIEPlrJVMXtGKEjR6bUNF0RI4I4JGiKpWUTQjzmqK1/SXGzbKp9hmQaMtdqkwffW RHMM/84E+k6vb79HgQB6qTVSBlIXzcYD9tGffBKoaQuIhARMxJBX+Yohosx3zn9wntOiHq 7THIgRGfvpt9wGJyYla5QdPrPi8GAd4= X-MC-Unique: _wanT6LjOsyutrxJ4wQeEg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697966709; x=1698571509; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pkIPSukbn4TdWmXR29nNf5zPEIsdHpMleShz6bahFgE=; b=T817GlXj47Dak/IfqmHvbjOS4rveAfWOGOekTVyicsznyw/0HwfaP2bigra46LDMs9 N+PnryZv6/sgxaJoL83fRnBnQs/Is5rHpEubnmXGN+ma6oZ0D/FGT/GM1vOMnFISE1yY t9zd6MzGk7GU4z/6Ii4SGCnGd7mLck6XWuQsxd7a50Rt0FWJLvKwuohabhnRiJlsHoRe SVlEeC1Lf/nVealCh1WVMEGKPu/Y8quolbE3CICR01X55DuaU4HqNND2mXO5nCKsEpBO 6ZggFSdclQG8uLqvKDB6Nd10wNoQ8LbSgpofWl4P85nMGIWKqSXvi/MtDUHdUOLyH8/2 nUlg== X-Gm-Message-State: AOJu0Yw6tMSuhFzfHqIRnOpDOiJI91RYhp4+neihc4pLJvLs5A+p7bwB HZC5rY3WOg+0pagHjSQPfuPUzBp2fyNxEerA92NRIuMJwEeL53sNzCwcNze0Tc2ovj64MDW/yMq jJZ7pnsvRg1iVRlZInBwwAfLZiog+o5Bq/FYXP6Ti0IeKnl097HwbF1ddUquORvcVkSO+ X-Received: by 2002:a05:600c:314d:b0:401:b2c7:34a4 with SMTP id h13-20020a05600c314d00b00401b2c734a4mr4638693wmo.11.1697966709291; Sun, 22 Oct 2023 02:25:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaB7wdJBXCgIR5OxEK1GQJe3Ra4X/ERn9co3phLXh3Bq9mWsgRGvm179+SYuyQ4yNw+xCTxg== X-Received: by 2002:a05:600c:314d:b0:401:b2c7:34a4 with SMTP id h13-20020a05600c314d00b00401b2c734a4mr4638675wmo.11.1697966708797; Sun, 22 Oct 2023 02:25:08 -0700 (PDT) Date: Sun, 22 Oct 2023 05:25:05 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Bernhard Beschow , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Aurelien Jarno , =?utf-8?B?SGVydsOp?= Poussineau , Marcel Apfelbaum Subject: [PULL v3 46/62] hw/isa/piix: Rename functions to be shared for PCI interrupt triggering Message-ID: <2a62c47926420128bb23edd2ba7d4b339db86660.1697966402.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697966971543100005 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bernhard Beschow PIIX4 will get the same optimizations which are already implemented for PIIX3. Signed-off-by: Bernhard Beschow Reviewed-by: Michael S. Tsirkin Message-Id: <20231007123843.127151-26-shentey@gmail.com> Signed-off-by: Michael S. Tsirkin --- hw/isa/piix.c | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/hw/isa/piix.c b/hw/isa/piix.c index 2ab799b95e..449c1baaab 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -38,47 +38,47 @@ #include "migration/vmstate.h" #include "hw/acpi/acpi_aml_interface.h" =20 -static void piix3_set_irq_pic(PIIXState *piix3, int pic_irq) +static void piix_set_irq_pic(PIIXState *s, int pic_irq) { - qemu_set_irq(piix3->isa_irqs_in[pic_irq], - !!(piix3->pic_levels & + qemu_set_irq(s->isa_irqs_in[pic_irq], + !!(s->pic_levels & (((1ULL << PIIX_NUM_PIRQS) - 1) << (pic_irq * PIIX_NUM_PIRQS)))); } =20 -static void piix3_set_irq_level_internal(PIIXState *piix3, int pirq, int l= evel) +static void piix_set_pci_irq_level_internal(PIIXState *s, int pirq, int le= vel) { int pic_irq; uint64_t mask; =20 - pic_irq =3D piix3->dev.config[PIIX_PIRQCA + pirq]; + pic_irq =3D s->dev.config[PIIX_PIRQCA + pirq]; if (pic_irq >=3D ISA_NUM_IRQS) { return; } =20 mask =3D 1ULL << ((pic_irq * PIIX_NUM_PIRQS) + pirq); - piix3->pic_levels &=3D ~mask; - piix3->pic_levels |=3D mask * !!level; + s->pic_levels &=3D ~mask; + s->pic_levels |=3D mask * !!level; } =20 -static void piix3_set_irq_level(PIIXState *piix3, int pirq, int level) +static void piix_set_pci_irq_level(PIIXState *s, int pirq, int level) { int pic_irq; =20 - pic_irq =3D piix3->dev.config[PIIX_PIRQCA + pirq]; + pic_irq =3D s->dev.config[PIIX_PIRQCA + pirq]; if (pic_irq >=3D ISA_NUM_IRQS) { return; } =20 - piix3_set_irq_level_internal(piix3, pirq, level); + piix_set_pci_irq_level_internal(s, pirq, level); =20 - piix3_set_irq_pic(piix3, pic_irq); + piix_set_irq_pic(s, pic_irq); } =20 -static void piix3_set_irq(void *opaque, int pirq, int level) +static void piix_set_pci_irq(void *opaque, int pirq, int level) { - PIIXState *piix3 =3D opaque; - piix3_set_irq_level(piix3, pirq, level); + PIIXState *s =3D opaque; + piix_set_pci_irq_level(s, pirq, level); } =20 static void piix4_set_irq(void *opaque, int irq_num, int level) @@ -108,10 +108,10 @@ static void piix_request_i8259_irq(void *opaque, int = irq, int level) qemu_set_irq(s->cpu_intr, level); } =20 -static PCIINTxRoute piix3_route_intx_pin_to_irq(void *opaque, int pin) +static PCIINTxRoute piix_route_intx_pin_to_irq(void *opaque, int pin) { - PIIXState *piix3 =3D opaque; - int irq =3D piix3->dev.config[PIIX_PIRQCA + pin]; + PCIDevice *pci_dev =3D opaque; + int irq =3D pci_dev->config[PIIX_PIRQCA + pin]; PCIINTxRoute route; =20 if (irq < ISA_NUM_IRQS) { @@ -125,29 +125,29 @@ static PCIINTxRoute piix3_route_intx_pin_to_irq(void = *opaque, int pin) } =20 /* irq routing is changed. so rebuild bitmap */ -static void piix3_update_irq_levels(PIIXState *piix3) +static void piix_update_pci_irq_levels(PIIXState *s) { - PCIBus *bus =3D pci_get_bus(&piix3->dev); + PCIBus *bus =3D pci_get_bus(&s->dev); int pirq; =20 - piix3->pic_levels =3D 0; + s->pic_levels =3D 0; for (pirq =3D 0; pirq < PIIX_NUM_PIRQS; pirq++) { - piix3_set_irq_level(piix3, pirq, pci_bus_get_irq_level(bus, pirq)); + piix_set_pci_irq_level(s, pirq, pci_bus_get_irq_level(bus, pirq)); } } =20 -static void piix3_write_config(PCIDevice *dev, - uint32_t address, uint32_t val, int len) +static void piix_write_config(PCIDevice *dev, uint32_t address, uint32_t v= al, + int len) { pci_default_write_config(dev, address, val, len); if (ranges_overlap(address, len, PIIX_PIRQCA, 4)) { - PIIXState *piix3 =3D PIIX_PCI_DEVICE(dev); + PIIXState *s =3D PIIX_PCI_DEVICE(dev); int pic_irq; =20 - pci_bus_fire_intx_routing_notifier(pci_get_bus(&piix3->dev)); - piix3_update_irq_levels(piix3); + pci_bus_fire_intx_routing_notifier(pci_get_bus(&s->dev)); + piix_update_pci_irq_levels(s); for (pic_irq =3D 0; pic_irq < ISA_NUM_IRQS; pic_irq++) { - piix3_set_irq_pic(piix3, pic_irq); + piix_set_irq_pic(s, pic_irq); } } } @@ -193,9 +193,9 @@ static void piix_reset(DeviceState *dev) d->rcr =3D 0; } =20 -static int piix3_post_load(void *opaque, int version_id) +static int piix_post_load(void *opaque, int version_id) { - PIIXState *piix3 =3D opaque; + PIIXState *s =3D opaque; int pirq; =20 /* @@ -207,10 +207,10 @@ static int piix3_post_load(void *opaque, int version_= id) * Here, we update irq levels without raising the interrupt. * Interrupt state will be deserialized separately through the i8259. */ - piix3->pic_levels =3D 0; + s->pic_levels =3D 0; for (pirq =3D 0; pirq < PIIX_NUM_PIRQS; pirq++) { - piix3_set_irq_level_internal(piix3, pirq, - pci_bus_get_irq_level(pci_get_bus(&piix3->dev), pirq)); + piix_set_pci_irq_level_internal(s, pirq, + pci_bus_get_irq_level(pci_get_bus(&s->dev), pirq)); } return 0; } @@ -261,7 +261,7 @@ static const VMStateDescription vmstate_piix3 =3D { .name =3D "PIIX3", .version_id =3D 3, .minimum_version_id =3D 2, - .post_load =3D piix3_post_load, + .post_load =3D piix_post_load, .pre_save =3D piix3_pre_save, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIXState), @@ -481,8 +481,8 @@ static void piix3_realize(PCIDevice *dev, Error **errp) return; } =20 - pci_bus_irqs(pci_bus, piix3_set_irq, piix3, PIIX_NUM_PIRQS); - pci_bus_set_route_irq_fn(pci_bus, piix3_route_intx_pin_to_irq); + pci_bus_irqs(pci_bus, piix_set_pci_irq, piix3, PIIX_NUM_PIRQS); + pci_bus_set_route_irq_fn(pci_bus, piix_route_intx_pin_to_irq); } =20 static void piix3_init(Object *obj) @@ -497,7 +497,7 @@ static void piix3_class_init(ObjectClass *klass, void *= data) DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 - k->config_write =3D piix3_write_config; + k->config_write =3D piix_write_config; k->realize =3D piix3_realize; /* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */ k->device_id =3D PCI_DEVICE_ID_INTEL_82371SB_0; --=20 MST