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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 19289C433F5 for ; Sat, 18 Sep 2021 03:28:55 +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 BC86260F50 for ; Sat, 18 Sep 2021 03:28:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BC86260F50 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mRR25-0003jw-V2 for qemu-devel@archiver.kernel.org; Fri, 17 Sep 2021 23:28:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRR0O-0001GS-PX; Fri, 17 Sep 2021 23:27:10 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:35729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRR0N-0001Fy-5r; Fri, 17 Sep 2021 23:27:08 -0400 Received: by mail-ed1-x52e.google.com with SMTP id v5so36708046edc.2; Fri, 17 Sep 2021 20:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=s5Vr/zA2zt4lOiSB4MG4VzpuIqJdvbqXLzvoT2soEjs=; b=ZgUzqSGEH1WWBI/0jC898KzTmjUnLzx/ECu7A9866jvrHQn2xDOPt9on5YD93sV1jk nsCwMK96GkDg9soMua3Mp2RCWIjI5iA/OPjklXgVk3o/V/ezC/svNHPiU5TriGg+ssbW gklSMJf5FOB02goQbn8yT0AYLMfrBYOOmTM0Lr+bAZlS6+61AcCnt3W9gWMTnPJSyQaf cTqi7Yu8EVoWLjkMTXVAMT8DeJCzLZMBF1pdsOqBzaE8KZ1dfFTpIOQCEumKCn31yc87 OJnnghonhHNQYNDylTyQcr1z7Gf9V3vOZk2HWigAIC99pKxIiZtMuROGWE9kOl5nMtPo zA+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s5Vr/zA2zt4lOiSB4MG4VzpuIqJdvbqXLzvoT2soEjs=; b=h6ClLQKXVtAwUxFVacCd/hj9B0ES7WRooIX/aG2QWxW5UyijCLD57ZsQviJts9djvf jze20wiHfcF0CdzLxQlEIlt+xzPjDX3bwLmDhbfrr2Uz6rSRhcyZVuaU9cIxbTlVpMnW GIySEkhwnYSPyZszT7lfxCuQlWTeckCojB2tfDUmXvbpjGt4FxfirrvWVeTkhog3aCdx WGCWubeHe3Ft8/28Rpi0ThHrqvzN0HE6C8vAzYR1SQIOBeAO8ba0mkCIm34XcgW5mj7A /qH3pj1EcOKi6WcV6hWXhoqFUQLBSDyR/n2ndhYCjCWbfF1nBuSmkmmxfpcF8fw2hUPp +Snw== X-Gm-Message-State: AOAM530rGkriu1N3h0lyzAqV57/mbRcGJiE9n7MhFUKA0yreVWb9fID/ zw+9BjB5Igq444Y9apgeF0o= X-Google-Smtp-Source: ABdhPJxKIwhjd76gV8H/A2e9RuWXvTffcJiMFOYoBmSgFKpKEr5snCg2dFEeraF9ci9dnMZnjMwc1w== X-Received: by 2002:a05:6402:cae:: with SMTP id cn14mr15811779edb.212.1631935624957; Fri, 17 Sep 2021 20:27:04 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id k4sm3439693edq.92.2021.09.17.20.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 20:27:04 -0700 (PDT) From: Bin Meng X-Google-Original-From: Bin Meng To: David Gibson , Greg Kurz , qemu-devel@nongnu.org, qemu-ppc@nongnu.org Subject: [RESEND PATCH 2/3] hw/intc: openpic: Drop Raven related codes Date: Sat, 18 Sep 2021 11:26:52 +0800 Message-Id: <20210918032653.646370-2-bin.meng@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210918032653.646370-1-bin.meng@windriver.com> References: <20210918032653.646370-1-bin.meng@windriver.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=bmeng.cn@gmail.com; helo=mail-ed1-x52e.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There is no machine that uses Motorola MCP750 (aka Raven) model. Drop the related codes. While we are here, drop the mentioning of Intel GW80314 I/O companion chip in the comments as it has been obsolete for years, and correct a typo too. Signed-off-by: Bin Meng --- include/hw/ppc/openpic.h | 16 ---------------- hw/intc/openpic.c | 28 +--------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/include/hw/ppc/openpic.h b/include/hw/ppc/openpic.h index 74ff44bff0..f89802a15c 100644 --- a/include/hw/ppc/openpic.h +++ b/include/hw/ppc/openpic.h @@ -21,7 +21,6 @@ enum { typedef struct IrqLines { qemu_irq irq[OPENPIC_OUTPUT_NB]; } IrqLines; -#define OPENPIC_MODEL_RAVEN 0 #define OPENPIC_MODEL_FSL_MPIC_20 1 #define OPENPIC_MODEL_FSL_MPIC_42 2 #define OPENPIC_MODEL_KEYLARGO 3 @@ -32,13 +31,6 @@ typedef struct IrqLines { qemu_irq irq[OPENPIC_OUTPUT_NB]; } IrqLines; #define OPENPIC_MAX_IRQ (OPENPIC_MAX_SRC + OPENPIC_MAX_IPI + \ OPENPIC_MAX_TMR) -/* Raven */ -#define RAVEN_MAX_CPU 2 -#define RAVEN_MAX_EXT 48 -#define RAVEN_MAX_IRQ 64 -#define RAVEN_MAX_TMR OPENPIC_MAX_TMR -#define RAVEN_MAX_IPI OPENPIC_MAX_IPI - /* KeyLargo */ #define KEYLARGO_MAX_CPU 4 #define KEYLARGO_MAX_EXT 64 @@ -49,14 +41,6 @@ typedef struct IrqLines { qemu_irq irq[OPENPIC_OUTPUT_NB]; } IrqLines; /* Timers don't exist but this makes the code happy... */ #define KEYLARGO_TMR_IRQ (KEYLARGO_IPI_IRQ + KEYLARGO_MAX_IPI) -/* Interrupt definitions */ -#define RAVEN_FE_IRQ (RAVEN_MAX_EXT) /* Internal functional IRQ */ -#define RAVEN_ERR_IRQ (RAVEN_MAX_EXT + 1) /* Error IRQ */ -#define RAVEN_TMR_IRQ (RAVEN_MAX_EXT + 2) /* First timer IRQ */ -#define RAVEN_IPI_IRQ (RAVEN_TMR_IRQ + RAVEN_MAX_TMR) /* First IPI IRQ */ -/* First doorbell IRQ */ -#define RAVEN_DBL_IRQ (RAVEN_IPI_IRQ + (RAVEN_MAX_CPU * RAVEN_MAX_IPI)) - typedef struct FslMpicInfo { int max_ext; } FslMpicInfo; diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c index 2790c6710a..23eafb32bd 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -25,12 +25,8 @@ /* * * Based on OpenPic implementations: - * - Intel GW80314 I/O companion chip developer's manual * - Motorola MPC8245 & MPC8540 user manuals. - * - Motorola MCP750 (aka Raven) programmer manual. - * - Motorola Harrier programmer manuel - * - * Serial interrupts, as implemented in Raven chipset are not supported yet. + * - Motorola Harrier programmer manual * */ @@ -1564,28 +1560,6 @@ static void openpic_realize(DeviceState *dev, Error **errp) break; - case OPENPIC_MODEL_RAVEN: - opp->nb_irqs = RAVEN_MAX_EXT; - opp->vid = VID_REVISION_1_3; - opp->vir = VIR_GENERIC; - opp->vector_mask = 0xFF; - opp->tfrr_reset = 4160000; - opp->ivpr_reset = IVPR_MASK_MASK | IVPR_MODE_MASK; - opp->idr_reset = 0; - opp->max_irq = RAVEN_MAX_IRQ; - opp->irq_ipi0 = RAVEN_IPI_IRQ; - opp->irq_tim0 = RAVEN_TMR_IRQ; - opp->brr1 = -1; - opp->mpic_mode_mask = GCR_MODE_MIXED; - - if (opp->nb_cpus != 1) { - error_setg(errp, "Only UP supported today"); - return; - } - - map_list(opp, list_le, &list_count); - break; - case OPENPIC_MODEL_KEYLARGO: opp->nb_irqs = KEYLARGO_MAX_EXT; opp->vid = VID_REVISION_1_2; -- 2.25.1