From patchwork Fri Jan 13 15:45:10 2023 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: 1726081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=sdsORpm8; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ntmz4579Lz23fk for ; Sat, 14 Jan 2023 03:27:11 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGMHG-0002MB-3H; Fri, 13 Jan 2023 10:47:34 -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 1pGMHE-0002Lq-Mh for qemu-devel@nongnu.org; Fri, 13 Jan 2023 10:47:32 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGMHD-0006Jq-3W for qemu-devel@nongnu.org; Fri, 13 Jan 2023 10:47:32 -0500 Received: by mail-wr1-x434.google.com with SMTP id t5so17052599wrq.1 for ; Fri, 13 Jan 2023 07:47:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=w8hMS9BXzYnzncszcpUENaGcSPp4qf+CCZgWrkLFPz8=; b=sdsORpm8N0McvSOt1oyq6vQ3CVpMgAcOLpfWqLnL5gze6zuICPJdR51kE3xA1nZphn h2+zzfyxKuj3uwNqNSamuejQU8HZuzISODkqalUj7BxMlvu5YUbERdxPKVqpcjax5Nyt 5IdtohrMDGe3jat6N8VM/nCz2QXfzHhafRIefFQRgIKTzk4jvOidsGa69St6xr/u0jie np/emipmB6MY04IEXy19qbl7WEFDtr5LeTgy5zkVejrhBSVOuwgKXKDZQDUNVnDQfFfj I1W/a8z7UapHvhYg0PCU74TYYknoLp9cjuBJ9shUGHySVmWucwVCl8NKCMLFeKKY89so 7gxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=w8hMS9BXzYnzncszcpUENaGcSPp4qf+CCZgWrkLFPz8=; b=g1xKpGeP8RVOI9hYgJykzXa7J5VDnr+YH/PhSUg4b5lXLakLG0wO7Q3qFecqQW86Gp ZXQvwI3jR1ZI6ViftkdJDSZvU/aSVEotIFj6VtMoZN0MkLb3zmtl181RGiVsaQbxeBro s368pLZfY4ZJyE42agv3QPc6yvb9kE0LgOL2yDMv3pfJXZDMyXOnaKmNXojDxEPlm+/b p6RlWovXgme5nQRDn8ElHt9AOGdo3zfOe0eEmW2OoRk6ZxQTJ14vjeOAuXAZ8OalQPDh 7pKhRydwK1AGCMeeFjPIDUQ4CTyOs+DNx0jWuSSqValSy34Xb8TWZgv9/CP/CEOJPdDH XTTQ== X-Gm-Message-State: AFqh2kqMwr4X2U8AFfHCD+D1my/sUMOZ8j8Y/5dXdsTZJX3Aj4HIjJH5 Y7u1saz5JtW4HNY0ioTLEnOr3Mu3avNI3hij X-Google-Smtp-Source: AMrXdXtfAp8ClCEYicR7u66mbLvApWhNJB9lCyaTkM/PwqjRHcyYs28IjLSDbRJKVMNRzUM/snkitA== X-Received: by 2002:a5d:55c5:0:b0:242:3812:f948 with SMTP id i5-20020a5d55c5000000b002423812f948mr156443wrw.24.1673624850215; Fri, 13 Jan 2023 07:47:30 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id f2-20020adfdb42000000b0024274a5db0asm19415361wrj.2.2023.01.13.07.47.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Jan 2023 07:47:29 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bernhard Beschow , Igor Mammedov , "Michael S . Tsirkin" Subject: [PULL 24/46] hw/mips/malta: Introduce PIIX4_PCI_DEVFN definition Date: Fri, 13 Jan 2023 16:45:10 +0100 Message-Id: <20230113154532.49979-25-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230113154532.49979-1-philmd@linaro.org> References: <20230113154532.49979-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The PIIX4 PCI-ISA bridge function is always located at 10:0. Since we want to re-use its address, add the PIIX4_PCI_DEVFN definition. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow Reviewed-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Message-Id: <20221027204720.33611-2-philmd@linaro.org> --- hw/mips/malta.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 34c24110cd..9fc3280407 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -71,6 +71,8 @@ #define FLASH_SIZE 0x400000 +#define PIIX4_PCI_DEVFN PCI_DEVFN(10, 0) + typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */ @@ -1239,7 +1241,7 @@ void mips_malta_init(MachineState *machine) pci_bus = PCI_BUS(qdev_get_child_bus(dev, "pci")); /* Southbridge */ - piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true, + piix4 = pci_create_simple_multifunction(pci_bus, PIIX4_PCI_DEVFN, true, TYPE_PIIX4_PCI_DEVICE); isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix4), "isa.0"));