From nobody Sat Nov 23 22:26:50 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1730679695; cv=none; d=zohomail.com; s=zohoarc; b=FtjiazX4oJcQxyj6KU1zEXTO1eYtWl0yq6Z2Z4wORd9Ft2UvPIeCs7QiJkHx8oI/xc7E4v8h33b3Oy8n1nCqzyEzN6EkRCudnlfi7BN5Vh2tQLIdRDg3FYQM1ueq+vUWkKPktQfHoXkNs3FLQUidvZBxuRoevjV6Dk20YYvM3XI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730679695; h=Content-Type:Content-Transfer-Encoding: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=J2ew3CyVLXi8mBOhBcW6uwQfd5spGfa4C9fjmp/PKBQ=; b=SVkd3Ryh0hUM9ihEjiTMtNcE/vu3X6AlFEKBPvzSuoZL/bLvxjPtpbmSne1APyrYsFjAVERb+1xNdeP3ksoueT2GdoKE/cBGjorj8vZvDnvP9Q0JjJK5qCX4nptXOF6czUhJuRRjx3wWYozjzzZq/omZBjYOEnt5kM83QJCYIxA= 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 1730679695619551.5849638175072; Sun, 3 Nov 2024 16:21:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7kpj-000857-OE; Sun, 03 Nov 2024 19:20:40 -0500 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 1t7kpW-0007se-6E; Sun, 03 Nov 2024 19:20:28 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t7kpT-0002bP-EH; Sun, 03 Nov 2024 19:20:25 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-207115e3056so33152875ad.2; Sun, 03 Nov 2024 16:20:22 -0800 (PST) Received: from wheely.local0.net (124-171-217-17.tpgi.com.au. [124.171.217.17]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7ee45a0081esm5900648a12.59.2024.11.03.16.20.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2024 16:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730679621; x=1731284421; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J2ew3CyVLXi8mBOhBcW6uwQfd5spGfa4C9fjmp/PKBQ=; b=EeJ/WyGDfdV4hZJw8Kq2jhZOs8Ge9mbo91eLE0mFwPX4I0P00OZCjjLk4o4PxKnuYI +yCxb1Pr1ccfzFkcYFuHJULtyxvn7FFinCBBdPNjz2lTHjAtxWpibl0cY0lI6ZEKbBM4 U48Ipjl1qweOxs89CFjZklv+G1sbo56NddEMhvdcyXrzprq9WjM32QOSOKWfbZDvKVWU q+Q0E1CmIUA+Ng1moh9sqNhj8KDOO3FmDbekvM+nTs+DjuJ8lcEFCx9Q6rtp62uvxIXz udTEegUgq+Y1polvlUUeAhPIeUNItIDEHxa+ToXZzlxHZdUziZ3V2H4pSEK78eSTIkSm UVxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730679621; x=1731284421; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J2ew3CyVLXi8mBOhBcW6uwQfd5spGfa4C9fjmp/PKBQ=; b=Vu8rWj+QUV7w0PQ/Qrvd5k4KbzVYh8c5WwJzpra6aI40TVP51R2V8ZvY6KnY2m0arf eepkT1KemEN8PZ//EwuC6IlhFo1m/fMX7nlJ6smFO3AA9g/xhbuC6nW/Y3esd14sGBB0 FVJjJdxXw3jtPagfr2rwomEff0Fnxp+LpvIqL47Wao762pcqGtar88W615LFOpqtRj4w r/iWXf3trMpOLM7Oz1uYF7zlsHM7Mjg8sa/OT2WpDx3oZvl1apBxB51hloi4ILd58gGR 6WMpvKI5xnRidyDVNQqg9hmGMtkFmn3tHe4gIR1B9QmVJidayQswysPuks6XmxoMOKNh Cp5w== X-Forwarded-Encrypted: i=1; AJvYcCUbKBiyUM+R0Q6U2boY5c1WjO44qAX+ClDx3aEEpvlALoN32TDaWjhKSBNLUCSga/GMfKeEBxClIA==@nongnu.org X-Gm-Message-State: AOJu0YwJGBYkfqHRB2fduhBIJCB8yEo+7OYSfwUV0Aal18xaJXkfeclL PCrIVDXOIsOHEm2B+nfC7i4aeAA/kleLkjnQNwhahDjzKZls77SQlS2uSQ== X-Google-Smtp-Source: AGHT+IEntoyZ6tveFP0+JxzUDcL28RX2zlm0Ic4SBwxfa0c6W6Kq8abe+Em9f37Jbw/rnylKf1fsvw== X-Received: by 2002:a17:902:da8c:b0:20b:79cb:492f with SMTP id d9443c01a7336-210c6c3446bmr452597295ad.43.1730679620711; Sun, 03 Nov 2024 16:20:20 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 19/67] ppc/spapr: remove deprecated machine pseries-2.3 Date: Mon, 4 Nov 2024 10:18:08 +1000 Message-ID: <20241104001900.682660-20-npiggin@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241104001900.682660-1-npiggin@gmail.com> References: <20241104001900.682660-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::62d; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62d.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 @gmail.com) X-ZM-MESSAGEID: 1730679697263116600 From: Harsh Prateek Bora Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as deprecated with reasons mentioned in its commit log. Removing pseries-2.3 specific code with this patch for now. While at it, also remove the dynamic-reconfiguration option which was introduced to disable it by default for legacy machines until pseries-2.3. Suggested-by: C=C3=A9dric Le Goater Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/core/machine.c | 13 ------------- hw/ppc/spapr.c | 15 --------------- hw/ppc/spapr_pci.c | 35 ----------------------------------- include/hw/boards.h | 3 --- include/hw/pci-host/spapr.h | 1 - 5 files changed, 67 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 2bbfcd1ede..0f10b4f992 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -281,19 +281,6 @@ GlobalProperty hw_compat_2_4[] =3D { }; const size_t hw_compat_2_4_len =3D G_N_ELEMENTS(hw_compat_2_4); =20 -GlobalProperty hw_compat_2_3[] =3D { - { "virtio-blk-pci", "any_layout", "off" }, - { "virtio-balloon-pci", "any_layout", "off" }, - { "virtio-serial-pci", "any_layout", "off" }, - { "virtio-9p-pci", "any_layout", "off" }, - { "virtio-rng-pci", "any_layout", "off" }, - { TYPE_PCI_DEVICE, "x-pcie-lnksta-dllla", "off" }, - { "migration", "send-configuration", "off" }, - { "migration", "send-section-footer", "off" }, - { "migration", "store-global-state", "off" }, -}; -const size_t hw_compat_2_3_len =3D G_N_ELEMENTS(hw_compat_2_3); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 34d655d0b3..599a59910c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5349,21 +5349,6 @@ static void spapr_machine_2_4_class_options(MachineC= lass *mc) =20 DEFINE_SPAPR_MACHINE(2, 4); =20 -/* - * pseries-2.3 - */ - -static void spapr_machine_2_3_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] =3D { - { "spapr-pci-host-bridge", "dynamic-reconfiguration", "off" }, - }; - spapr_machine_2_4_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_3, hw_compat_2_3_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} -DEFINE_SPAPR_MACHINE(2, 3); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 5c0024bef9..8f1964ce52 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1237,10 +1237,6 @@ static void add_drcs(SpaprPhbState *phb, PCIBus *bus) int i; uint8_t chassis; =20 - if (!phb->dr_enabled) { - return; - } - chassis =3D chassis_from_bus(bus); =20 if (pci_bus_is_root(bus)) { @@ -1260,10 +1256,6 @@ static void remove_drcs(SpaprPhbState *phb, PCIBus *= bus) int i; uint8_t chassis; =20 - if (!phb->dr_enabled) { - return; - } - chassis =3D chassis_from_bus(bus); =20 for (i =3D PCI_SLOT_MAX * PCI_FUNC_MAX - 1; i >=3D 0; i--) { @@ -1548,17 +1540,6 @@ static void spapr_pci_pre_plug(HotplugHandler *plug_= handler, PCIBus *bus =3D PCI_BUS(qdev_get_parent_bus(DEVICE(pdev))); uint32_t slotnr =3D PCI_SLOT(pdev->devfn); =20 - if (!phb->dr_enabled) { - /* if this is a hotplug operation initiated by the user - * we need to let them know it's not enabled - */ - if (plugged_dev->hotplugged) { - error_setg(errp, "Bus '%s' does not support hotplugging", - phb->parent_obj.bus->qbus.name); - return; - } - } - if (IS_PCI_BRIDGE(plugged_dev)) { if (!bridge_has_valid_chassis_nr(OBJECT(plugged_dev), errp)) { return; @@ -1591,14 +1572,6 @@ static void spapr_pci_plug(HotplugHandler *plug_hand= ler, SpaprDrc *drc =3D drc_from_dev(phb, pdev); uint32_t slotnr =3D PCI_SLOT(pdev->devfn); =20 - /* - * If DR is disabled we don't need to do anything in the case of - * hotplug or coldplug callbacks. - */ - if (!phb->dr_enabled) { - return; - } - g_assert(drc); =20 if (IS_PCI_BRIDGE(plugged_dev)) { @@ -1673,12 +1646,6 @@ static void spapr_pci_unplug_request(HotplugHandler = *plug_handler, PCIDevice *pdev =3D PCI_DEVICE(plugged_dev); SpaprDrc *drc =3D drc_from_dev(phb, pdev); =20 - if (!phb->dr_enabled) { - error_setg(errp, "Bus '%s' does not support hotplugging", - phb->parent_obj.bus->qbus.name); - return; - } - g_assert(drc); g_assert(drc->dev =3D=3D plugged_dev); =20 @@ -2089,8 +2056,6 @@ static Property spapr_phb_properties[] =3D { SPAPR_PCI_MEM64_WIN_SIZE), DEFINE_PROP_UINT64("io_win_size", SpaprPhbState, io_win_size, SPAPR_PCI_IO_WIN_SIZE), - DEFINE_PROP_BOOL("dynamic-reconfiguration", SpaprPhbState, dr_enabled, - true), /* Default DMA window is 0..1GB */ DEFINE_PROP_UINT64("dma_win_addr", SpaprPhbState, dma_win_addr, 0), DEFINE_PROP_UINT64("dma_win_size", SpaprPhbState, dma_win_size, 0x4000= 0000), diff --git a/include/hw/boards.h b/include/hw/boards.h index 7e849bb30d..eea592b720 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -822,7 +822,4 @@ extern const size_t hw_compat_2_5_len; extern GlobalProperty hw_compat_2_4[]; extern const size_t hw_compat_2_4_len; =20 -extern GlobalProperty hw_compat_2_3[]; -extern const size_t hw_compat_2_3_len; - #endif diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index 3778aac27b..79187e80fd 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -53,7 +53,6 @@ struct SpaprPhbState { uint32_t index; uint64_t buid; char *dtbusname; - bool dr_enabled; =20 MemoryRegion memspace, iospace; hwaddr mem_win_addr, mem_win_size, mem64_win_addr, mem64_win_size; --=20 2.45.2