From patchwork Mon Oct 12 07:19:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD483C433E7 for ; Mon, 12 Oct 2020 07:23:44 +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 4569320790 for ; Mon, 12 Oct 2020 07:23:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pfFllSo4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4569320790 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRsBL-0008W7-AL for qemu-devel@archiver.kernel.org; Mon, 12 Oct 2020 03:23:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRs72-0004GA-Ge; Mon, 12 Oct 2020 03:19:17 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:33429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRs71-0007jI-2o; Mon, 12 Oct 2020 03:19:16 -0400 Received: by mail-wr1-x442.google.com with SMTP id b8so4662170wrn.0; Mon, 12 Oct 2020 00:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FNdBGLPtUmVgTnuJXhsVPUN2AJb8yl0wVfZR/zSesG8=; b=pfFllSo4wPcfOL5nfEYYQGO+RFiHSqSqh1GIfRBmfXe/xhGgsNbofZlLZG+OyuFQND oFMekdD3p17psKz3AKCO+QsTmnb2i8tDoC/BjX0533st0mmuE7gplb8iDdKXWVXW+Vnh zCp+bYETTRNIHDOh0ZyIM9X2O3wWcOLG1IKWtkrN8CfpFmf9P/jTvwKOOFc2qrhDF19o daPl3crQzmVHHL6sL4pdBqfGIXEI1kT4rIq0AV9z7PSUzCuXq+3+I4FxTQB+UI6fDoqj PXOjL1GwN6DgMCivcm5NQ60w2rRMyndnQSE14z7EhaPFT25e5xtwzkvjNAh2VZ01LbxJ t+NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FNdBGLPtUmVgTnuJXhsVPUN2AJb8yl0wVfZR/zSesG8=; b=in2JQ0K5Q60XNv4NdrDqERnzhKGOAoSCHtKHrUx8LuLIs9Z5zE+gK7+5CkAsv+Frt2 y+xgqjV9y9V4YY74ecZ431Ffd6juiPwZVO9RyVM6FNbJCUl/vX3gjq+hTPixakvPB4ud q6+DVNtaO14jH99HZ8SwGU2q7Lw8riuBnoGekQWT6S1GJL7EA0UzQesT1jbGFFWjFAoq 0cr35t1i2ZHQps3oxs6NRzip7T13XpUeuj/cm59y2IE0VM1EIHL4TWhDw3/2wg94vIUN qLNmjoTUfLDQVggPLweANaGJmUImcasdOgrZIiLjvKpka1Z07KGoZJO5+rfQ0dNp3zMS WzSg== X-Gm-Message-State: AOAM530gnEC6v/1Pzsjvs4Z73zG90UGjULvzRwRAQWzFdPDy1ihY05zy 2xR0MczD7mxOpUIucJ24olP7BRoshoM= X-Google-Smtp-Source: ABdhPJzEzzm0FwZernmGPYHASlngnmunDkeK2EmNJ/XBpOIjCHXZXUIsX6G9hWKrGwZ8Tqm1BVuxWQ== X-Received: by 2002:a5d:608f:: with SMTP id w15mr13152054wrt.183.1602487153125; Mon, 12 Oct 2020 00:19:13 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id s11sm19372193wrm.56.2020.10.12.00.19.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 00:19:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/4] hw/pci-host/prep: Update coding style to make checkpatch.pl happy Date: Mon, 12 Oct 2020 09:19:03 +0200 Message-Id: <20201012071906.3301481-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012071906.3301481-1-f4bug@amsat.org> References: <20201012071906.3301481-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?utf-8?q?Herv=C3=A9_Poussineau?= , Thomas Huth , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" To make the next commit easier to review, clean this code first. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: David Gibson --- hw/pci-host/prep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index d0323fefb10..80dfb67da43 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -234,8 +234,10 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) sysbus_init_irq(dev, &s->pci_irqs[i]); } } else { - /* According to PReP specification section 6.1.6 "System Interrupt - * Assignments", all PCI interrupts are routed via IRQ 15 */ + /* + * According to PReP specification section 6.1.6 "System Interrupt + * Assignments", all PCI interrupts are routed via IRQ 15 + */ s->or_irq = OR_IRQ(object_new(TYPE_OR_IRQ)); object_property_set_int(OBJECT(s->or_irq), "num-lines", PCI_NUM_PINS, &error_fatal); From patchwork Mon Oct 12 07:19:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303134 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D6E6C433E7 for ; Mon, 12 Oct 2020 07:21:13 +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 A18C720790 for ; Mon, 12 Oct 2020 07:21:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e/LyL0de" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A18C720790 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRs8t-0005ub-Ml for qemu-devel@archiver.kernel.org; Mon, 12 Oct 2020 03:21:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRs77-0004JY-Nj; Mon, 12 Oct 2020 03:19:21 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRs76-0007kf-66; Mon, 12 Oct 2020 03:19:21 -0400 Received: by mail-wm1-x341.google.com with SMTP id 13so16257243wmf.0; Mon, 12 Oct 2020 00:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=prE09q32YD42ye5PeFp5wgpW0hirQThD2Ei+DC4S6LM=; b=e/LyL0deoDjKJ5DmtoHS2Tl8PTMDBMjgD4tbM8Y1MGo6wVAYsDZnQmk1I3W2R5VLbe VwrLQHBotPCBVLHMeNwgtOLM0C47DGnNHKiVbiq3M55b00yd8kySvPyuXOMGe4Qx5NP5 6tCATx4KCo7SvZdb0uXL8pTnV29QhSFULyX9wlshb1lWXGLgmNW7u2Q1nq/4v8Aatpbl knlMysnqhrJFGA9gI9E7DvXg6zQsvh21dAfsgwEZqSQTCtWXBSCLYxsVf1A8s82FS2Co QUtynV96f3qR5KW0kPKlgSOzz4bCGSzSAo1CPQ1n5BB56pADSu1NL6Z6gvFlURJtnsp7 4oUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=prE09q32YD42ye5PeFp5wgpW0hirQThD2Ei+DC4S6LM=; b=N6JUzLKU1rsTiUcUshC+5nuBZyD7QkN4E1MmmYpufBCz7+bdZLxBPBewW+wsJHNGzf VOW2M5kSquOeeb/Z5UjIFYfYu4lc4ymTqiRAGclkgPgTRvlbKTgkhOwMUiwQcygVX4e6 dJQdYW4+aUoYDaB0BNd8eLLrR/hC1iWBEX2dexK9cQBsMKwI9i7sJmEr6TC3FG2pPClX 4gSw0kNMTsKQUMt4NSPYfyy208fAth0q5xlUJPstofNFXTYVQdSDRoSIj4jx9eVjSnG1 vTjTrqRfLpH4cn2/5vfX2apuuIF5TjJwD+mtQpZeBp9FZXwpJOcgF+aHQBlwXJG/CZ9c S9ag== X-Gm-Message-State: AOAM530KzO4fJlo2nq5jOvCI15uLs4E0mD2oUZ4YunqUgI0QYxKG1s17 w8GELeEJao2DLgmIBTL6b+Hdpx3O28s= X-Google-Smtp-Source: ABdhPJy61sTR4ko9asU1VmmS8JjOErOGh2Q9ze45Be5RN1ru14PYI68qUpvioV5DZUa5xQVcXoaAvg== X-Received: by 2002:a1c:4d05:: with SMTP id o5mr9216349wmh.94.1602487157626; Mon, 12 Oct 2020 00:19:17 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id 205sm8020285wme.38.2020.10.12.00.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 00:19:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/4] hw/pci-host/prep: Remove legacy PReP machine temporary workaround Date: Mon, 12 Oct 2020 09:19:04 +0200 Message-Id: <20201012071906.3301481-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012071906.3301481-1-f4bug@amsat.org> References: <20201012071906.3301481-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?utf-8?q?Herv=C3=A9_Poussineau?= , Thomas Huth , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The legacy PReP machine has been removed in commit b2ce76a0730 ("hw/ppc/prep: Remove the deprecated "prep" machine and the OpenHackware BIOS"). This temporary workaround is no more required, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Mark Cave-Ayland Reviewed-by: David Gibson --- hw/pci-host/prep.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 80dfb67da43..064593d1e52 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -75,7 +75,6 @@ struct PRePPCIState { RavenPCIState pci_dev; int contiguous_map; - bool is_legacy_prep; }; #define BIOS_SIZE (1 * MiB) @@ -229,24 +228,18 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) MemoryRegion *address_space_mem = get_system_memory(); int i; - if (s->is_legacy_prep) { - for (i = 0; i < PCI_NUM_PINS; i++) { - sysbus_init_irq(dev, &s->pci_irqs[i]); - } - } else { - /* - * According to PReP specification section 6.1.6 "System Interrupt - * Assignments", all PCI interrupts are routed via IRQ 15 - */ - s->or_irq = OR_IRQ(object_new(TYPE_OR_IRQ)); - object_property_set_int(OBJECT(s->or_irq), "num-lines", PCI_NUM_PINS, - &error_fatal); - qdev_realize(DEVICE(s->or_irq), NULL, &error_fatal); - sysbus_init_irq(dev, &s->or_irq->out_irq); + /* + * According to PReP specification section 6.1.6 "System Interrupt + * Assignments", all PCI interrupts are routed via IRQ 15. + */ + s->or_irq = OR_IRQ(object_new(TYPE_OR_IRQ)); + object_property_set_int(OBJECT(s->or_irq), "num-lines", PCI_NUM_PINS, + &error_fatal); + qdev_realize(DEVICE(s->or_irq), NULL, &error_fatal); + sysbus_init_irq(dev, &s->or_irq->out_irq); - for (i = 0; i < PCI_NUM_PINS; i++) { - s->pci_irqs[i] = qdev_get_gpio_in(DEVICE(s->or_irq), i); - } + for (i = 0; i < PCI_NUM_PINS; i++) { + s->pci_irqs[i] = qdev_get_gpio_in(DEVICE(s->or_irq), i); } qdev_init_gpio_in(d, raven_change_gpio, 1); @@ -403,9 +396,6 @@ static Property raven_pcihost_properties[] = { DEFINE_PROP_UINT32("elf-machine", PREPPCIState, pci_dev.elf_machine, EM_NONE), DEFINE_PROP_STRING("bios-name", PREPPCIState, pci_dev.bios_name), - /* Temporary workaround until legacy prep machine is removed */ - DEFINE_PROP_BOOL("is-legacy-prep", PREPPCIState, is_legacy_prep, - false), DEFINE_PROP_END_OF_LIST() }; From patchwork Mon Oct 12 07:19:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271536 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B8EFC433E7 for ; Mon, 12 Oct 2020 07:21:15 +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 F02FC20790 for ; Mon, 12 Oct 2020 07:21:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DwBYrj4i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F02FC20790 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRs8v-0005zU-Ui for qemu-devel@archiver.kernel.org; Mon, 12 Oct 2020 03:21:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRs7C-0004Oo-0r; Mon, 12 Oct 2020 03:19:26 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:39843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRs7A-0007kz-Hl; Mon, 12 Oct 2020 03:19:25 -0400 Received: by mail-wm1-x341.google.com with SMTP id d3so16472564wma.4; Mon, 12 Oct 2020 00:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g0zIvNiiPuD3jbI/3K2hr7asrKbop6KgBlLoFr6P7Cg=; b=DwBYrj4iarsfdZqAG0JGjOLQAX2Ct2Jedc91riWUKh16WbCtwv/z55Y0GLKCD1c18w dyEpaNhTxdPBvN7X1N/kOojjvz8Ai2dI/DZM66kSxUKNRF68O2mGDdct5BUfB5/3i+2C mdYTuK0DN7F4YkmvEvAuNrTbXBjUfM1A9B2puRYBilGQZ5Q0Wwn50M+l3+hqMNPbmi3c OLvju6TioFIz50uiRJbJROstlepTcC4SbM7nC8zcjLUW9mgXQQGXbTZFQvoiVuw84nWq L98gQexhecOWDYMCqXDfOOOAPRKYGqF4lqK7DC08RTbP6j76aUCeEUkPohNpCwOTKRI9 RlMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=g0zIvNiiPuD3jbI/3K2hr7asrKbop6KgBlLoFr6P7Cg=; b=ClVGr6XN1VEEsJ2ro5U83YpSGADACxO87ixgopvnlTnLtt5iLpQ3G7VHa64mqgCG1O 4+CxBXPXsobXWvyx1InqSQCdctYpmCiiZxyBjaztwJzeOtt3M/re2xiIF/QCzPDzwizy FE2wUStsXaBF4H/Y/j2W9WiWUTXDaoy682QgYx/xnhN5Fis3uNPcvAt7KfGHaplLIIBr 0w6v72KEYedUmQ99uXZJw1kQowwpMQtpRp78tN8CW80sVw1H1bjKcyJlbmepLosqSpAq eRmxumKoZnLeqvt3P/G2eIFo4D7EIy+z3TWQDcGmYsSbwFfgGhAsG8g3aX4WzodEptRV bI1A== X-Gm-Message-State: AOAM531FcxG0JgxVwWtUolN5QdlbUh3EJlsAtN/F8N4vEo4P1NKRHfNi yGEkjIeXXZO9UfS5Pm+KxfjvjqPdWCM= X-Google-Smtp-Source: ABdhPJyWpKeDDs5xuL5WPEYWcVXnqyp7ftM5jKJeFNQ6BFviUDbMc8+oaVFFWlf6URDxRnoJuKvBDA== X-Received: by 2002:a1c:e3c6:: with SMTP id a189mr9224253wmh.167.1602487162785; Mon, 12 Oct 2020 00:19:22 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id w5sm22605270wmg.42.2020.10.12.00.19.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 00:19:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/4] hw/pci-host/prep: Fix PCI swizzling in map_irq() Date: Mon, 12 Oct 2020 09:19:05 +0200 Message-Id: <20201012071906.3301481-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012071906.3301481-1-f4bug@amsat.org> References: <20201012071906.3301481-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Thomas Huth , Jocelyn Mayer , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Herv=C3=A9_Poussineau?= , Julian Seward , qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In commit a01d8cadadf we changed the number of IRQs to 4 but forgot to update the map_irq() function. Do it now. Fixes: a01d8cadadf ("Fix memory corruption ... in PreP emulation") Signed-off-by: Philippe Mathieu-Daudé --- Cc: Jocelyn Mayer Cc: Julian Seward Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/prep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 064593d1e52..2224135fedb 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -195,7 +195,7 @@ static const MemoryRegionOps raven_io_ops = { static int raven_map_irq(PCIDevice *pci_dev, int irq_num) { - return (irq_num + (pci_dev->devfn >> 3)) & 1; + return (irq_num + (pci_dev->devfn >> 3)) & 3; } static void raven_set_irq(void *opaque, int irq_num, int level) From patchwork Mon Oct 12 07:19:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E33BEC433E7 for ; Mon, 12 Oct 2020 07:23:48 +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 7307A20790 for ; Mon, 12 Oct 2020 07:23:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g44jfOtb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7307A20790 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kRsBP-0000BX-FM for qemu-devel@archiver.kernel.org; Mon, 12 Oct 2020 03:23:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kRs7H-0004a9-GY; Mon, 12 Oct 2020 03:19:33 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kRs7F-0007lb-Mx; Mon, 12 Oct 2020 03:19:31 -0400 Received: by mail-wm1-x343.google.com with SMTP id 13so16257606wmf.0; Mon, 12 Oct 2020 00:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tYzLZREDW3URWnaaoeiBhAsMJbb0gBuvk98LmQJHEME=; b=g44jfOtbICWhW1cQLpon96c5oRq//ayVBkUGbrdQv7Xd8M2pGx/81inIxbtDgslH4k K4ll3BnIHR8yKR8urqr+c7gxi3d02cZSsZ+ZWCt/al1bYCSqeI/+LyFIFlDiu8D34NGB EnOuBx8dMlOuQ+cPYVq877lGpoCd0rKY3IpjdwUs+514RnjCN8MxAZGMNEPy8Lva12iT piznBd2SogTagK8G+E2LH6Yu5RM4jTpokKF7ZCSWt57md/iVNTLNcrPXDLBuRgft6UXD FwEiVgWEPUmRKNTh7cLOrSa17ePnzbS5FGsSXZ8rL56lJ6M1cSTvJftgYtfHS57aL0fe l1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tYzLZREDW3URWnaaoeiBhAsMJbb0gBuvk98LmQJHEME=; b=oxcLgNO7GqeaWch+D0i6gMNQ/1oNnPg4FGhZ5gSYtkmH5Uzn24Qi8VccsYlLyYkny4 g6rDO7VwrCist1Xp4WynRLh/aRTdhN61jhtjzAVfjEm/jt2lpzG099JnlYRypC/VqX/P dGauEvu8LUAyvawQ5LFOdNdsH5WgExFqNj4IeLSiKw3Uxpa57mo1T49QLcUAIpeCIBgD 9F74ythKb4ftXz4THMB1ztiWcrFsVDGqTAoCTcgBwXpPPEg7mlu15g9fwKV/wr7Olt74 VyFAZ3EZxDW6exJVj/q4JtYUSeLh0ctDGgCtq8DxoDxgHjXSisJVMPZbYPW10rp5TwYM yeKQ== X-Gm-Message-State: AOAM5325ltPEW0ZIcG98fkvZWRDFBW0y4IxnvBoLHS0myPZSaw2M6c40 Q0KkYypRBOzndzM0OidqsmsfUMfd9TQ= X-Google-Smtp-Source: ABdhPJz7QzODVMJn47gP9WoE8gqwMTzg967ajncO3RgmPm8Z10lIZcbvOIbUYRDsqV2LT7ctKjWyxQ== X-Received: by 2002:a1c:81ce:: with SMTP id c197mr9475886wmd.111.1602487167478; Mon, 12 Oct 2020 00:19:27 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id q4sm23298709wru.65.2020.10.12.00.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 00:19:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/4] docs/system/target-ppc.rst: Update PReP historical information Date: Mon, 12 Oct 2020 09:19:06 +0200 Message-Id: <20201012071906.3301481-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012071906.3301481-1-f4bug@amsat.org> References: <20201012071906.3301481-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Jocelyn Mayer , =?utf-8?q?Herv=C3=A9_Poussineau?= , Thomas Huth , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Link Jocelyn Mayer's web page from the Wayback Machine, and correct the PReP acronym. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- Cc: Jocelyn Mayer --- docs/system/target-ppc.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/system/target-ppc.rst b/docs/system/target-ppc.rst index a2f04c533c2..1f57966771d 100644 --- a/docs/system/target-ppc.rst +++ b/docs/system/target-ppc.rst @@ -3,7 +3,7 @@ PowerPC System emulator ----------------------- -Use the executable ``qemu-system-ppc`` to simulate a complete 40P (PREP) +Use the executable ``qemu-system-ppc`` to simulate a complete 40P (PReP) or PowerMac PowerPC system. QEMU emulates the following PowerMac peripherals: @@ -20,7 +20,7 @@ QEMU emulates the following PowerMac peripherals: - VIA-CUDA with ADB keyboard and mouse. -QEMU emulates the following 40P (PREP) peripherals: +QEMU emulates the following 40P (PReP) peripherals: - PCI Bridge @@ -43,5 +43,5 @@ the g3beige and mac99 PowerMac and the 40p machines. OpenBIOS is a free (GPL v2) portable firmware implementation. The goal is to implement a 100% IEEE 1275-1994 (referred to as Open Firmware) compliant firmware. -More information is available at -http://perso.magic.fr/l_indien/qemu-ppc/. +Archived historical information is available at +https://web.archive.org/web/20051212135300/http://perso.magic.fr/l_indien/qemu-ppc/.