From patchwork Tue Dec 29 17:56:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Cave-Ayland X-Patchwork-Id: 1421230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ilande.co.uk 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 ozlabs.org (Postfix) with ESMTPS id 4D52GM6D3Cz9sWR for ; Wed, 30 Dec 2020 04:58:35 +1100 (AEDT) Received: from localhost ([::1]:55658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kuJGT-00010r-RG for incoming@patchwork.ozlabs.org; Tue, 29 Dec 2020 12:58:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kuJEX-0006gR-9F; Tue, 29 Dec 2020 12:56:33 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:49844 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kuJEV-0004zV-54; Tue, 29 Dec 2020 12:56:33 -0500 Received: from host86-148-34-1.range86-148.btcentralplus.com ([86.148.34.1] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kuJER-0007wV-3E; Tue, 29 Dec 2020 17:56:30 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au, thuth@redhat.com Date: Tue, 29 Dec 2020 17:56:12 +0000 Message-Id: <20201229175619.6051-1-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 86.148.34.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 0/7] macio: remove PIC object property links X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patchset follows on from the dicussion at https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg02630.html where the user_creatable flag for the macio devices was set back to false just before the 5.2 release. The underlying cause was that the PIC object property links were not being set before realise. Whilst this cannot happen when launching the g3beige and mac99 machines from qemu-system-ppc, it caused some automated tests to fail. Here we fix the real problem which is to move the PIC for both machines into the macio device, which not only matches real hardware but also enables the PIC object property links to be completely removed. Patch 6 rewires the macio gpios for the mac99 machine as per Ben's original comment after the OpenPIC device has been moved into the macio-newworld device, and then finally patch 7 removes setting the user_creatable flag to false on the macio devices once again. Signed-off-by: Mark Cave-Ayland v2: - Add R-B tag for patch 1 from David - Update commit messages to included more detail as requested by David Mark Cave-Ayland (7): mac_oldworld: remove duplicate bus check for PPC_INPUT(env) mac_oldworld: move initialisation of grackle before heathrow macio: move heathrow PIC inside macio-oldworld device mac_newworld: delay wiring of PCI IRQs in New World machine macio: move OpenPIC inside macio-newworld device macio: wire macio GPIOs to OpenPIC using sysbus IRQs macio: don't set user_creatable to false hw/misc/macio/gpio.c | 24 +++-------- hw/misc/macio/macio.c | 53 ++++++++++++------------ hw/ppc/mac_newworld.c | 71 ++++++++++++++++---------------- hw/ppc/mac_oldworld.c | 76 ++++++++++++++++------------------- include/hw/misc/macio/gpio.h | 2 - include/hw/misc/macio/macio.h | 4 +- 6 files changed, 104 insertions(+), 126 deletions(-)