From patchwork Fri Oct 20 13:03:22 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: 736238 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp287881wrl; Fri, 20 Oct 2023 06:05:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF7bL50fFd+6yyTA3bMzQ8vQTcXteVkqfi4YG8NhfARn1ZJnoMSw3+Jztcn78RGpxlX6D+1 X-Received: by 2002:a05:620a:9448:b0:770:f877:e785 with SMTP id sm8-20020a05620a944800b00770f877e785mr1551558qkn.30.1697807113975; Fri, 20 Oct 2023 06:05:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807113; cv=none; d=google.com; s=arc-20160816; b=fFQwrdN47+AsBzoAc5+Uj71KgsTvDkj3A8qZ6XTSPEBky+r5IbfSMXurEj/HGDOVO7 Z8CPcVh1grBiufprftW+knwmTREMBRRYaV9ZO0MpL4YP7ujPcRAYRq0D349zO9ycw3fh BX43MDkmUW4CDL0irAvWekcrYvMWgonMesWnGYmvndWYe13qvEvqfcvrajiQu78R9IIH nHwoarGLRHYwnRSVzrfQ9px8iMBFM+5YlI5094eLYEGXv519Xi0I5hzyqi7xfzKZSGZz /GCNF+yvdqDEt8I6nC2ui+F9zNYExRwqHLSy1Cf0x3UIdCfCM/FbPGOrmzixWM/9ySnz Be6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=j7mClc/LVpV4WxhBVsV429+V8CLaLMPjHNY4x1KwfS4=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=QR+LIy5p0lk5l+yhg6JlN6ePgU35JwVc4wdG/9zGM28sfNL75/9fU5Rqbv+VctK29P 6hukjHT71ejzDlJokQAL1tXiwL8TIz4MrAO16I3Ax6nA3+LvH+U4WigKMDKkRJGbGzpk 7MSs+4RJm9+Qu+SCxm4KnPA3TbFG9OqlfHiS4SM6+8+uXuSTXWf0H0iOoynDd8oerzei UzDfDyrgbJUBjAeW6ziMA9Yn8GDaANkIZn5ndfnJeEQcrLhp4QLGp0ssAGzmU14bzrw8 iQTPB++PW75QYRjPKJVkCQdLKjARJdVxK4LjZ46yXC3IYoe8d4SIh7tcDvRoSATt5XFC HUww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F26q20g1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x13-20020a0cfe0d000000b0066d03a68aeasi1319613qvr.281.2023.10.20.06.05.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:05:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F26q20g1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAK-0000Fd-Kj; Fri, 20 Oct 2023 09:03:48 -0400 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 1qtpAH-0000Es-M7 for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:03:46 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAF-0005Fn-Vg for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:03:45 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9c5b313b3ffso122759566b.0 for ; Fri, 20 Oct 2023 06:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807020; x=1698411820; 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=j7mClc/LVpV4WxhBVsV429+V8CLaLMPjHNY4x1KwfS4=; b=F26q20g1TgPUCF56MHKXbOwhTHzuhOBmxQ8CZdXZhKODaqrC66aYi8bSQR0/ZFoKMT um4l5dcYdyr/hnuBrO30prSEW5M3u1rJSlBXzPGWvTNtjXvhuoAfFQdJjbhc9tV3GoYW FHQSAhTrMtRmO9W0V9GUGvFE45x4i6uJf/J4QNX56nZOgPZ3E1/72cvjB3YNmqueP35Q KNa6CqHNXvHY9a4tFcZD1cJ6WnZqK9RL1ccZGccxpo3atjG46KgrNUlHqOftvWxBYSch WYatl4vnNM06C9qSvGE473V9Gbi+rozL6hpNrIt1VSreBgMe2RhUw+WK4CwhSyQf+t0t j4bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807020; x=1698411820; 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=j7mClc/LVpV4WxhBVsV429+V8CLaLMPjHNY4x1KwfS4=; b=lKA6Rd66NlEE6TOp1bSh09dvEu9johIQS44xuk/WjwZlMMC6dGvRhmDBYT6yzXR7TQ QthhtZExEcp5N3r8pRwYzBqinPn86z6OeEfoUpOSLIaWTizCaLQmr65G/sUw8iRn3FWM XoPVN+UO5hFEAeymlKH2mdqE/AbZEo6fz+5MPZfR3178iWvRTker8Ci0HHzrOu2jlHSn liKczUerbXds79IwmFMDjEDk2siDYPJolAjwK9BvvsEjMHLKm4SfG83Wv5Rwh5FMu9Xb FeBlqgmz2YVi6MbwgpfmM1t9K7vmMSImC8RT/68rZ+LOEkn8+I1djDIVbmuZaQ37ZWgn txUg== X-Gm-Message-State: AOJu0YyJve+KkzpBJDDpzelk04u3UfS8tO4tyXG93F0r0o8f/ksLvcVx NAb5Dtt7ee+Vgf/CnCC9AnQ/D8GFiF4sD/IzurU= X-Received: by 2002:a17:907:26c9:b0:9c6:287d:c59d with SMTP id bp9-20020a17090726c900b009c6287dc59dmr1485002ejc.28.1697807019858; Fri, 20 Oct 2023 06:03:39 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id f26-20020a170906085a00b009ad8796a6aesm1454419ejd.56.2023.10.20.06.03.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:03:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/9] hw/sd/pxa2xx: Realize sysbus device before accessing it Date: Fri, 20 Oct 2023 15:03:22 +0200 Message-ID: <20231020130331.50048-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org sysbus_mmio_map() and sysbus_connect_irq() should not be called on unrealized device. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/sd/pxa2xx_mmci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 124fbf8bbd..9f7a880bac 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -483,11 +483,11 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, dev = qdev_new(TYPE_PXA2XX_MMCI); sbd = SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sbd, &error_fatal); sysbus_mmio_map(sbd, 0, base); sysbus_connect_irq(sbd, 0, irq); qdev_connect_gpio_out_named(dev, "rx-dma", 0, rx_dma); qdev_connect_gpio_out_named(dev, "tx-dma", 0, tx_dma); - sysbus_realize_and_unref(sbd, &error_fatal); return PXA2XX_MMCI(dev); } From patchwork Fri Oct 20 13:03:23 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: 736237 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp287848wrl; Fri, 20 Oct 2023 06:05:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaDALw6RWKsBOxskrEE773zXn1f/qlzmmqYAAKKWqGKWiZH23/SLyknjjOH05wxbm8bJFA X-Received: by 2002:a05:620a:1103:b0:778:930c:1e09 with SMTP id o3-20020a05620a110300b00778930c1e09mr1872372qkk.15.1697807111087; Fri, 20 Oct 2023 06:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807111; cv=none; d=google.com; s=arc-20160816; b=mELp1WxhTc7Lg6jmlndb6aPZZnfV70dbo80Z1tFMoIuQYIKMgC3rgMGdFzddTsVc6t m1Wqa+QlqxHt/7RnR1hV5kDaoFlM3RoiXYWRtQ/EmGXEpoYiWRiPwnHwIGtNo10Z4kjY ymYBOgjDR4hQIaMxptpwYS0fJNkHmaOS51YgGpplI91D+wK3wrEINUQfLVeU5WbcGOVO FCvm+lRKLC5opy8S3YpI83EYS9tnm2Jb4sdZBF4Annj85oOR4U43mGLaf6waR1/DphSr Qc8UcnItm4xlQ4LVSvuSR8Pgn0/igYXz84JZ5/zXgbsXluXeFEPw4DXFqdBkPP/k2QAO M/dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zkM/85hWmZ9SV/FNcYSH0O2+Ai96FulzN3LwQBfEAtk=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=0fYC4GuWq0InNCWxiljpnEFvxV0TaNlzQh+rVwPNLnK8J0AyNATmIFUgo1OijQ6EIg /liWaikx4iO9d10ZyMofq8pVb0kSjY1AHxnjxTJiiAy0pDolqgygf6PYXHvxx4g05RTv 4sM+lnwTvdmxhk/DpGDLlfVQQk8xW5WzIics5uESKZk3I8PlT0mJoWJmblxhEDx2PTs9 o67HrD+gEiF4MtTTnt7mTuCXEx6PGRuXbm7HRzG8sCNp60BDLC/ZgJV0GVxelyodxwOz AAszwXY5ZP3uo+EDVdspR5UzKHl0B/RX7rN0oyalqOfnCbVuFmGeHN2qUsGWVTTUpHEO Z1sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fz0NQGU9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i1-20020a05620a404100b0077428b66050si1338536qko.173.2023.10.20.06.05.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:05:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fz0NQGU9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAP-0000Q0-OZ; Fri, 20 Oct 2023 09:03:53 -0400 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 1qtpAM-0000H4-LL for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:03:50 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAK-0005I5-M8 for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:03:50 -0400 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9adb9fa7200so177212166b.0 for ; Fri, 20 Oct 2023 06:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807026; x=1698411826; 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=zkM/85hWmZ9SV/FNcYSH0O2+Ai96FulzN3LwQBfEAtk=; b=fz0NQGU9471iYg4GO3VbOIPLGT9uobXl9GyUpEDQYX6fPwUXO9wWJx5rHb9iIZj2/a 7t8L+KCAhofo0UmDlkanyNd6JhZxUM6ag+rrYfivzUpSwrPz4vF7jiCQMhPIhbmnMMc9 lSlvHUkKPmQGt/1ditwzusqn363BvpA1aiKv1xH5ZUskJJ/DwBL474XZ4l5Qxj+Kk0qF a3/G4Em1s9p/s4A7Nd7MgWHyF+7xWJRsQ+RQyWJ9mbQwOaK4WScHBy30MKF1B7hFZos3 YmKBcogPNcUJl7RZK8nns6di5Z5G0Jko2I1siSeevHn9suBhC4FsdsjWbzJgwI7y0P71 5ZSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807026; x=1698411826; 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=zkM/85hWmZ9SV/FNcYSH0O2+Ai96FulzN3LwQBfEAtk=; b=PT8DnIn/w4tNdl02eqsRaK8Kj1gvB8gGLzP8KYTbArP3CTHrzhr+/7oE/y+7Hu4Qv7 l3xqkWQHNJ3N3NEJhhqV/vdaV+m1Y+/F2oRY1lVgDp5hRgscKZAso2zei5Ny44zWCwVQ 4MuHi7DNB2HDS5+bUrNpbHu2a9XDRTpQjxYK53iZfspp1ijdnKzIQzo1zQ/Y3Nrjf/oL tl+VNZRZfCdtVOTzqFBxmkJZcmVOPhHuwHk+V7aVjTI/a9VG8OhdvqndXa6EditCNa3L RoCmRZ8mDmsJLH0VOADJvipv3d5E7F2KpLooizddgpmIs9GE0OYltJrqGa3k2jbCc42L 25Cw== X-Gm-Message-State: AOJu0YzOS0LRy5bwsqv3NCOOgOmRZkFeocP+gHfr4khTNHlo8BDxrkKt ZQabrYtS1A80b7eRA7ny4nN82rrbnZnmXb4W40I= X-Received: by 2002:a17:907:868f:b0:9ad:e3fd:d46c with SMTP id qa15-20020a170907868f00b009ade3fdd46cmr4254879ejc.10.1697807025923; Fri, 20 Oct 2023 06:03:45 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id lg15-20020a170906f88f00b009ae587ce135sm1452393ejb.223.2023.10.20.06.03.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:03:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/9] hw/sd/pxa2xx: Do not open-code sysbus_create_simple() Date: Fri, 20 Oct 2023 15:03:23 +0200 Message-ID: <20231020130331.50048-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=philmd@linaro.org; helo=mail-ej1-x62a.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/sd/pxa2xx_mmci.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index 9f7a880bac..4749e935d8 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -479,13 +479,8 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, qemu_irq irq, qemu_irq rx_dma, qemu_irq tx_dma) { DeviceState *dev; - SysBusDevice *sbd; - dev = qdev_new(TYPE_PXA2XX_MMCI); - sbd = SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(sbd, &error_fatal); - sysbus_mmio_map(sbd, 0, base); - sysbus_connect_irq(sbd, 0, irq); + dev = sysbus_create_simple(TYPE_PXA2XX_MMCI, base, irq); qdev_connect_gpio_out_named(dev, "rx-dma", 0, rx_dma); qdev_connect_gpio_out_named(dev, "tx-dma", 0, tx_dma); From patchwork Fri Oct 20 13:03:24 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: 736239 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp287883wrl; Fri, 20 Oct 2023 06:05:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBpDIFIyjVHnmc5NG0FpV4QgRPulb0E8sGQbbjbNNjiYzX4gFN1ejfrPqlEBduOfAnxdKt X-Received: by 2002:ac8:5d8c:0:b0:403:e3ce:565b with SMTP id d12-20020ac85d8c000000b00403e3ce565bmr1744435qtx.4.1697807113980; Fri, 20 Oct 2023 06:05:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807113; cv=none; d=google.com; s=arc-20160816; b=PRMK1y/1KTipR4To7/aSrOvvuZuFXEI+mbCw3MBX+txUT5l9eO/dxrLixq9hgVHI64 otKPVDhD4RmTfo4IenzCx66wsi1ttL0wXCOtrSOseWeVhygvbj8HVeH9Lp76KQZR667L p9iLwUOSmCIJeMc1TP9iz3po8ygqoqFYfxD7c7L8IuUJDm0VvBNSKPGWyj1rEeZbSB/7 x7nT5nRNRknc7HQ0vri501kskT+jt4DyO8snTLL0T6mdS6NHYBoS0O4wuWPHt6siwalk +hYArcyVMT+bB1uFYHWhV5ZQn+APKUltXS3qbhYjW+exnQr+0xmAIZ4Jjcq7bUyKa5xp pNlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VvkfRXdPjwZ/XLZmVrV6N6IqteNQI6rI35LT6QBMgTk=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=HZyJzc0GVp07S+NvFPoEsEkUiRv+2KnK7rfMagBWe+GUZENAYISvSngRq+/2ROlKfs NOEK2iIGsBi55SmnOQc/uSPv6YS48mejo5KLeN499B7HR0cx76X+tCjqNU/180POuFx8 vxDb+j7qxaQgmvIC7hZCAQwhlh8dVQbPSxsQaqr/JVjGGpq0A40upNTjil6t84CAD1r1 J/TjqEUy/PLjlwBIUJEfUNJdeu7HzDfiyen+GVT+VaWwWbwoahKBxNakDQIjLMhZTE41 IBtqywoq60586xRhUwgvZkIe24t0B8449LFN8dOy++/2OjX6IbrJMBqfyIjSny+anaoi bADQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yDVvaO3D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n20-20020a05622a11d400b0041cbb79ad47si1194894qtk.271.2023.10.20.06.05.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:05:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yDVvaO3D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAs-0000uQ-4K; Fri, 20 Oct 2023 09:04:22 -0400 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 1qtpAV-0000gr-Pv for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:05 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAP-0005Iw-MI for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:03:58 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9be02fcf268so120804766b.3 for ; Fri, 20 Oct 2023 06:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807032; x=1698411832; 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=VvkfRXdPjwZ/XLZmVrV6N6IqteNQI6rI35LT6QBMgTk=; b=yDVvaO3DVY4OzZlGv3c9ePTIEw+jlkjRZBltkcoxAWrV3Lfl0jp9MYTk91cDFNww45 a/vOljD97KW3biVxE1EHabSBZspZEO0ZT/2CzOpOs9JgUJAjrXnnwNiZpGFo7oWwowvG IO6oi49jYb39w6KfFlRS2Rodlr573boO3f453PYz6gFINSdfzCsXXl0ZGT2X5EYennmS pl6sGRAKVvDA1hY9YlsgQ3c7Uczu4h1fI+DbbtrprVvYoEE8Srp0DXjA3bwj8GkxC8mA XPOCsTbDBM3CUZ6+WASRi7n7z5PVt5rm6W52HkGgZ7V2pPHDTcdmn4qJvW+gn2SyZ8Ur mnqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807032; x=1698411832; 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=VvkfRXdPjwZ/XLZmVrV6N6IqteNQI6rI35LT6QBMgTk=; b=pE+7dGOQFIfiW3kimSDAM4t6y/yBbbMnSHM2gqcFEZeGcVZn4rzl/BYBCxSFkmDAyy 9sQjHLLOGZFQ8doZBcz2eYa86QIPDymK0dWSZwJRXP58d9fXUp+1PBAMUKroP3BOel56 yOHheO/SyN8lnLJs2rtWKymBJgzeJrW/XqIjKuGc1lV9j7qjni2HpOelV7EobrzyPcr8 I8ArldCkAXuSlxlKJ6OoHuAdRBSGjCNJ5QPk10YYvztP3VMyx9cCthPHzyGpdrDsQcLM IfA0OuUwlY/tuQ2WFgVuVdME9ifre0y8ja6mhvI6QC6syE9g2K85ctfs/VP9nx4uOzDP WS2A== X-Gm-Message-State: AOJu0YxazWkhPvkcjnPtyLvpDuWv6FAmTsAKA+rXYH3gCDjlU1tE94F0 V4z4e1b4cXd9sCtQdZNfcM4PvvjZbTMQrD5BVLE= X-Received: by 2002:a17:907:d19:b0:9b6:550c:71cb with SMTP id gn25-20020a1709070d1900b009b6550c71cbmr1132082ejc.52.1697807031911; Fri, 20 Oct 2023 06:03:51 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id j12-20020a170906050c00b00977eec7b7e8sm1474283eja.68.2023.10.20.06.03.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:03:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/9] hw/pcmcia/pxa2xx: Realize sysbus device before accessing it Date: Fri, 20 Oct 2023 15:03:24 +0200 Message-ID: <20231020130331.50048-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org sysbus_mmio_map() should not be called on unrealized device. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/pcmcia/pxa2xx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index fcca7e571b..e7264feb45 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -142,15 +142,12 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, hwaddr base) { DeviceState *dev; - PXA2xxPCMCIAState *s; dev = qdev_new(TYPE_PXA2XX_PCMCIA); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - s = PXA2XX_PCMCIA(dev); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - return s; + return PXA2XX_PCMCIA(dev); } static void pxa2xx_pcmcia_initfn(Object *obj) From patchwork Fri Oct 20 13:03:25 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: 736244 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp288545wrl; Fri, 20 Oct 2023 06:06:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrMGdLfXP8+y7e0MvbIwZoLWOMy8Yq45/XLR2HOh2NoZFbcWrAaPvcUjKIXP89VYpt5qFz X-Received: by 2002:a05:622a:15d3:b0:41c:d8b6:27ef with SMTP id d19-20020a05622a15d300b0041cd8b627efmr1687504qty.65.1697807172796; Fri, 20 Oct 2023 06:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807172; cv=none; d=google.com; s=arc-20160816; b=ADiLmZx+KpH1rG9803fckNVp6gdDWlCYWkn0uIlK7vB7E0wF8Fm8lllmTUAwB9B5tl /1/QBezPcg3G7H/BJXrTzAbM6izLGIE8IRUkaA8Z7dvYN1PdZ3sAWsArqJ2VtOTOhWdi yQNogLEqDf4st0onStcfleLhk9ZUZdtA/2qyRvcKWIMM2peqmuem4p+SPRh9QCQhorhc jg4IHNK/rTOsknowNiNsqAwVt9NjGVBIxoAapqNazypxeAXFsDOx/NxnYdU3dOAMb8Cy Fy2UfyJQA/t1zAZKt4EMLlVpxem4DQ+6VSSfHRUdVhC/AwuPtrSH1pBa5/BNz2IpMHar LBJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qVpVhfYsMArn5+3t2ZWXwVgzj4H5ByX4fZEF0dWkMj4=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=yUTg3x0C6RMBPo8L8wLWlKHuDawFKAf869JIUfkQyqNqDDrIozLAA1FOaMtfp6aQot 6IfPSuL/Qcty/CiaWT5pydi4oztkc8A0FxXzqK61/wqOwnF3ls5L5SsooOeWu0kolCTd setKYAQLBG0R9F7V9R6CppyfEAuEan8E9+zgl/fhG4vfrxfUHRu6BWAliDZJY6WOV4z6 ElkO5YNZ1YGBvIeHe8qVLjYPUgtw7unQZaPcPOMJEDtoho2h+/TdSqNxFAgvaOCHAeU3 ZhCpGLZpYssIk85G147251j2OTBi9HTHzSycGtWCDeR4fH7x8epFDtSYZea7o7b1Tbr/ R52g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pDh492T0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 7-20020ac85947000000b0041cb5fb2194si1213491qtz.155.2023.10.20.06.06.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:06:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pDh492T0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAt-00019f-5p; Fri, 20 Oct 2023 09:04:23 -0400 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 1qtpAZ-0000hL-QR for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:10 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAX-0005K4-SB for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:03 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9b96c3b4be4so121593266b.1 for ; Fri, 20 Oct 2023 06:04:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807038; x=1698411838; 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=qVpVhfYsMArn5+3t2ZWXwVgzj4H5ByX4fZEF0dWkMj4=; b=pDh492T0LIHfqyFWzMWdCkOe2e5VCyI6wjvYCJ1hnXWIQzVhBvHoi4OhSjtyO0NZXy xwi2tUgYe+PZETFDCKjCgKNIpRrdA528KnQqUKB3B0WDdi+fbIDuBjIQ68P7z1yxSKZR 51nUQpL0KwnZALAi3NStibBptq3T6L8jGXhN0cye6UIxDUq8T+KgjRWSstc7Tp/srljR kb+hr94b4xl4SkjuZtNIjK7VFzYYZXZwD3Y7KLELxnL6d2GU9D+nMhueThiiiIcCqWGH YaPBvSJ2oPYpTCkl3ILjXNPoU1+IOoGErLOupU1brNWw48kpzQ5EJPZbamxEb3CdYUvy 8BBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807038; x=1698411838; 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=qVpVhfYsMArn5+3t2ZWXwVgzj4H5ByX4fZEF0dWkMj4=; b=b6+qXp0l36ceJYXeeEdQPVnWQQXGXt5vgFmgp3xJVU9NFiDv/c+yY3Oem0kvWUqiqb JsLh7xTNz8pMBvaGvdymER4gJsrb/bHgrGK0zhlk1tARuFShgCp5g7mK2VizpJb7hodR lbwUla2MSRPlYcUZropJvVs/sWuhAsNWckZblZL7IoMnilHgsJa7zk1ROnOGKlsJg750 jxc67m60Hd+Dg451iqyDT8WxtyMHZzCbFjBiYbCi9ElozKXHv916gYJRUctETGVAeIP9 6lQte6/pRO3zQHJcZod+9R0KEh9fJKwP3iaSXwByl99t+rJCGiK50iVp5G2/JwkZ8p6y b1iw== X-Gm-Message-State: AOJu0Yx5kw5pNZ0Dc0LtbywCR7v+FK6wKpvqbX7r01oPjmdhzrm11xN8 rAhUzbMLQ9YiOzWaQUDukTJlObg979fzQbkHCSM= X-Received: by 2002:a17:906:d555:b0:9be:fc31:8cd4 with SMTP id cr21-20020a170906d55500b009befc318cd4mr1556257ejc.18.1697807037847; Fri, 20 Oct 2023 06:03:57 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id my18-20020a1709065a5200b009a9fbeb15f5sm1447874ejc.46.2023.10.20.06.03.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:03:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/9] hw/pcmcia/pxa2xx: Do not open-code sysbus_create_simple() Date: Fri, 20 Oct 2023 15:03:25 +0200 Message-ID: <20231020130331.50048-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- hw/pcmcia/pxa2xx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index e7264feb45..3d512a292c 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -143,9 +143,7 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, { DeviceState *dev; - dev = qdev_new(TYPE_PXA2XX_PCMCIA); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + dev = sysbus_create_simple(TYPE_PXA2XX_PCMCIA, base, NULL); return PXA2XX_PCMCIA(dev); } From patchwork Fri Oct 20 13:03:26 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: 736245 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp288606wrl; Fri, 20 Oct 2023 06:06:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF49n0tI+X0itnAQVdNC/3TyDrNGu0PU0YyiOzxZ78n/zNlfSVI2L6ghZvD6RPVpZwHJWk6 X-Received: by 2002:a05:6214:c47:b0:65a:fcd1:1d85 with SMTP id r7-20020a0562140c4700b0065afcd11d85mr2082231qvj.60.1697807177695; Fri, 20 Oct 2023 06:06:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807177; cv=none; d=google.com; s=arc-20160816; b=bsz2ftTX5pM0bXAkUCF6JQIfOCLIb3LnYXWpY7DvZgU3NXdmNvpw7W07sEl9zhc7Jm M0k538oKhkcPjGkBPxrvWjWtazK51CTnux/P7q62D6GPwPjSf6kh2jaDj8fH7tCekpbW /ctW8MRVqeiZWqcOe5sn47pgdhYnG+o4PYA2D9s5Y2du2V9PCK8mTcRqd558zkUHmYCp oSMeSZuYbvtGlhfoUmeS9OJi8fy4qG0yf3hOxnb7khh7xL0ZHLMg7XBNDcKtVNyDrFRa QhXRGDRJgQGvWafUknxn6G7/9Vpsrjs+272kN9/D+fnodl7aP84Z6LkESdkODzEciqnk EhxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UmDbO/dcRUqE0czIvHJsu49pLqguapp9vtFtJrgXUPM=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=b8WPaWL19VlqRCq7/+d1gNRkVi1/NEONT1jQ+LIeqPqN0iIEjyap9Qz1epwCxznBe4 SlPGy8xsXl3LcdDdWc//WpXQPenCQOYIVswcpPZ5Lf/s6JYuFZQPfFY869szsya6F482 YKc56wVIgTsE8Ia3iGt0JHiKiZreBNRNCuIP3ZTWJJBEQRCWd46/dlR5wVUyrRlakvLf uZRPTgX88itEpqCm2/R3S7fQrZHK+aIBpbTVwWOMy9OKO6fXsTNvfUvdkjZ0msiK+lM3 YToeKZfT0WwS7PQwXcvEj3DkwHTrjEJ3J51wBwHaDI+48rqeNwKdmRR20ZTMWJHTB5zt btGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k2lBeoG9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y9-20020a05620a25c900b0077437335298si1213173qko.765.2023.10.20.06.06.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:06:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k2lBeoG9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAu-0001MA-L9; Fri, 20 Oct 2023 09:04:24 -0400 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 1qtpAh-0000jg-2p for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:12 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAc-0005Kp-FN for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:10 -0400 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-53e08b60febso1167223a12.1 for ; Fri, 20 Oct 2023 06:04:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807044; x=1698411844; 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=UmDbO/dcRUqE0czIvHJsu49pLqguapp9vtFtJrgXUPM=; b=k2lBeoG910M0jYNxBlYsd7Xo0RPA2TJGgHN3ZlfloV6jh/xDTxeMGa2YqPRv/158s/ fkxGTHNDeIPI0wbJ0YL5mCQFLJCMSTo2casywlQ6NMiHylMGG92KmbX9bZwL6BFJJN2j SnvYRe6c4t2kBaRF8lQ33DIXL/mcXGfp20GkrVHhBd1snEMFRk3THD4A35k2zDH/MAXz nLKAYM4zVUr+GfnLo6CvbshYeLlMAG7bz3U4K1U3D+2NzjbweuNM9GbCxVfKMJfE+nTW Q7e9+wRkMh36Ed68T0l9bBhs6uayqyDNJ5q5JBBSBY8WFCQdsOuBMrqwqQFal11BrQXR Pihg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807044; x=1698411844; 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=UmDbO/dcRUqE0czIvHJsu49pLqguapp9vtFtJrgXUPM=; b=NVLTqJ4rvv+aFaHEOoHw8PDfx3ZwnAnYqs29gA/xh3GE87mSi5fXaNvbN+Y1a1SkiZ HcuC0JY/z4IlqArHj5elRVUXHVQpDwOOCEHLLufR6ckCTmclGQwrYY8xVcwMOfrPGHKJ ohedRflA+cRN4LK/wZN7pj1qIqit556cYx99ZwjCPIfhLsz8gyp4FnA5hBh+3tQ5FnyI sfeVSou26YqkzQgC1qpIMzubBlQ/kebwCfK7/GHIvBWcVcAKX1fPrS2UeXNVa3RbOLYf MO6vZNLohgxCIV0k++TpZTuwXMKHb/oWNCUSeJGJWE01Ph6D+AVSjextJbzZlLhS/Enl 7j4Q== X-Gm-Message-State: AOJu0YxbGOyxX9qDrEDAPfnlvycydKsy/cEXhK5DvbhNCjsCxzOToTfI uQeBiJJoi2VelLCICX0IAYhn1MkQz+FtO7tOuz8= X-Received: by 2002:a50:9ecb:0:b0:53e:f9ef:ca6b with SMTP id a69-20020a509ecb000000b0053ef9efca6bmr1462884edf.7.1697807044042; Fri, 20 Oct 2023 06:04:04 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id q28-20020a50cc9c000000b0053f84540db8sm1449027edi.17.2023.10.20.06.04.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:04:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/9] hw/pcmcia/pxa2xx: Inline pxa2xx_pcmcia_init() Date: Fri, 20 Oct 2023 15:03:26 +0200 Message-ID: <20231020130331.50048-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=philmd@linaro.org; helo=mail-ed1-x533.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- include/hw/arm/pxa.h | 2 -- hw/arm/pxa2xx.c | 12 ++++++++---- hw/pcmcia/pxa2xx.c | 10 ---------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index 54eb895e42..4c6caee113 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -100,8 +100,6 @@ void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq readonly, #define TYPE_PXA2XX_PCMCIA "pxa2xx-pcmcia" OBJECT_DECLARE_SIMPLE_TYPE(PXA2xxPCMCIAState, PXA2XX_PCMCIA) -PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, - hwaddr base); int pxa2xx_pcmcia_attach(void *opaque, PCMCIACardState *card); int pxa2xx_pcmcia_detach(void *opaque); void pxa2xx_pcmcia_set_irq_cb(void *opaque, qemu_irq irq, qemu_irq cd_irq); diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 07d5dd8691..601ddd8766 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -2205,8 +2205,10 @@ PXA2xxState *pxa270_init(unsigned int sdram_size, const char *cpu_type) sysbus_create_simple("sysbus-ohci", 0x4c000000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1)); - s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000); - s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000); + s->pcmcia[0] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA, + 0x20000000, NULL)); + s->pcmcia[1] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA, + 0x30000000, NULL)); sysbus_create_simple(TYPE_PXA2XX_RTC, 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM)); @@ -2338,8 +2340,10 @@ PXA2xxState *pxa255_init(unsigned int sdram_size) s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi"); } - s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000); - s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000); + s->pcmcia[0] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA, + 0x20000000, NULL)); + s->pcmcia[1] = PXA2XX_PCMCIA(sysbus_create_simple(TYPE_PXA2XX_PCMCIA, + 0x30000000, NULL)); sysbus_create_simple(TYPE_PXA2XX_RTC, 0x40900000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_RTCALARM)); diff --git a/hw/pcmcia/pxa2xx.c b/hw/pcmcia/pxa2xx.c index 3d512a292c..e3111fdf1a 100644 --- a/hw/pcmcia/pxa2xx.c +++ b/hw/pcmcia/pxa2xx.c @@ -138,16 +138,6 @@ static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level) qemu_set_irq(s->irq, level); } -PXA2xxPCMCIAState *pxa2xx_pcmcia_init(MemoryRegion *sysmem, - hwaddr base) -{ - DeviceState *dev; - - dev = sysbus_create_simple(TYPE_PXA2XX_PCMCIA, base, NULL); - - return PXA2XX_PCMCIA(dev); -} - static void pxa2xx_pcmcia_initfn(Object *obj) { SysBusDevice *sbd = SYS_BUS_DEVICE(obj); From patchwork Fri Oct 20 13:03:27 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: 736240 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp287885wrl; Fri, 20 Oct 2023 06:05:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQ1gY3gFZmFgGHe3eqyax+vcC3LNUxGYRJdkuukWzV+pZC6MUDPMLQxdsctfl6y04RQhyB X-Received: by 2002:a05:622a:96:b0:403:9a33:5f53 with SMTP id o22-20020a05622a009600b004039a335f53mr2079199qtw.38.1697807114290; Fri, 20 Oct 2023 06:05:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807114; cv=none; d=google.com; s=arc-20160816; b=mdMMmm7OggMPgDm3Tk59I55hnQOv/FZcZxQNHQZ1AW+JnENPe2jLBSx/A71WNKnKIo i8qBJBVXb6iGuWEzVY+0T8DObuhRZKQo1VAeBI2iupQiQo5j2lZAKqHg6F+J7dfE2Q5G EaG127C1OJKuWTLruKzFlSsCt31uw1z96WYMp2ucBh30M5pv0avY67j+tjg16XiKBc0s ljNhNzu8nWlPh4E2+8mBZtX1OWAM9euQcgx3a1iMutQKuOYImy/rxccnWJuaYyjxPYiW b80/qwFvLWh1a/GyN0t+bsokM99vEYVZsyopZ0nHmYeCpjcQAAKs1ihuyb12oAU6Haeb TFkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LSmy0AQ2ctzt4sBy/4+sAM4ntN11b2Cq/iHR2Msv118=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=Ni7ZaNPKzYQjE75+EhMY1v70BiKGFjHltGJy1h4Z1a3LyxJy8+FqJyHJ8850Pp2G0k c0+yIiyaVdZpDVS+fRUW8qdmRCsSaw6KDPgYAwhSBCwnOhvLvVRJllDnAzc1OJZIR32D tnTtiP1F1w6KTjJ0WyhV43zf4nYnAkr/VMZKkzlHWeXaCOPZI/H5ZLRT3+aMkj9fc6Al IqyK3HkLJR3ezjA0Xsd2U1Uuf27lmD7m4y0XqeijVlX8WPWyIR0yd9H6A8n00rEsC5hh jRiy0M4QYhS8Ki1jrCTpKzkPeKYKBHukf5kT5Z/Fs0MNj2doKrT5bNW4FiNm2bHi0/q5 k82A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZaOVU1Wd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h22-20020ac87d56000000b0041816d65a98si1218579qtb.421.2023.10.20.06.05.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:05:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZaOVU1Wd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAz-0001rB-5T; Fri, 20 Oct 2023 09:04:29 -0400 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 1qtpAl-0000rk-1i for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:16 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAi-0005Lx-C4 for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:14 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-9ada2e6e75fso121421866b.2 for ; Fri, 20 Oct 2023 06:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807050; x=1698411850; 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=LSmy0AQ2ctzt4sBy/4+sAM4ntN11b2Cq/iHR2Msv118=; b=ZaOVU1WdVB2Eu95j73/qAX8nJn8MV4rWIVcHDVM2rMhC1sxAp/tokeGQd8GlpdqfKY X2nC+WJp5gZeg2NFCY/FzqwrB2rFWH265bO2IRC+ckfUpLlsb63WiAUk/wwRlS+hBtHD jc8/cO+9PMFrRnz0yoE9Ox+gywvv2n5dmfI4Iutv/TsV7LaB+R025mtm17bdt1gmd4mR TOYeWAAQ6kPnECS/RMAfEYXS80yyBAEd4F2m66nKYWkEcZh3/9TEc3N0ma5AG9InXkIG Nj4+ew/esqESDofflc5jWEPDk3XcpBz4fzrmFgcTVDz00lCq/4UQgsViI3f0aARD+blO 1dxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807050; x=1698411850; 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=LSmy0AQ2ctzt4sBy/4+sAM4ntN11b2Cq/iHR2Msv118=; b=snJoinZoCsAJ8jcDBEAroFyOJVSAA09wJiSmC1Vntz3BIjzPCAtlzuo1XD/sd74AG3 JxH2Lz1PG+IGmdOvxVHHN+/FthqTtHI+9nBT4Q571JSfv7FoS8vGS8ulRUnc5ivsej/D OjXXRLR4/b4Tyi+oarv6bMQMIo8GckMX1zwtzGoztFDhUEPaQgS2DXMeUCCm8iEZncuI dpsTbObdBxei5BZZXY+sOAAHzkuXGLULgbvCqEPIlqZpTT1t7s0Lh29MiuRP+n9RHeOU bdzG5nQ5wouBRCk4KmssHE5PkHMgZES1UVpTtudyXy1rcZP2kwuyIyjFGvOMK/5PiLXa Dk1A== X-Gm-Message-State: AOJu0YwiYBBs4ZwuJY8+x7UnWea3FEnm2xw72bolyU1zV0IUoTy1AFXa rOna6nSFN2F8BzDAVWnST3m7BpTMiX57ebRxS5E= X-Received: by 2002:a17:907:a03:b0:9be:5ab2:73c2 with SMTP id bb3-20020a1709070a0300b009be5ab273c2mr1295033ejc.58.1697807049770; Fri, 20 Oct 2023 06:04:09 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id y19-20020a170906519300b009adc7733f98sm1484765ejk.97.2023.10.20.06.04.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:04:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/9] hw/intc/pxa2xx: Convert to Resettable interface Date: Fri, 20 Oct 2023 15:03:27 +0200 Message-ID: <20231020130331.50048-7-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Factor reset code out of the DeviceRealize() handler. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/pxa2xx_pic.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 47132ab982..2eb869a605 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -271,12 +271,9 @@ static int pxa2xx_pic_post_load(void *opaque, int version_id) return 0; } -DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) +static void pxa2xx_pic_reset_hold(Object *obj) { - DeviceState *dev = qdev_new(TYPE_PXA2XX_PIC); - PXA2xxPICState *s = PXA2XX_PIC(dev); - - s->cpu = cpu; + PXA2xxPICState *s = PXA2XX_PIC(obj); s->int_pending[0] = 0; s->int_pending[1] = 0; @@ -284,6 +281,14 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) s->int_enabled[1] = 0; s->is_fiq[0] = 0; s->is_fiq[1] = 0; +} + +DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) +{ + DeviceState *dev = qdev_new(TYPE_PXA2XX_PIC); + PXA2xxPICState *s = PXA2XX_PIC(dev); + + s->cpu = cpu; sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); @@ -319,9 +324,11 @@ static const VMStateDescription vmstate_pxa2xx_pic_regs = { static void pxa2xx_pic_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + ResettableClass *rc = RESETTABLE_CLASS(klass); dc->desc = "PXA2xx PIC"; dc->vmsd = &vmstate_pxa2xx_pic_regs; + rc->phases.hold = pxa2xx_pic_reset_hold; } static const TypeInfo pxa2xx_pic_info = { From patchwork Fri Oct 20 13:03:28 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: 736241 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp288018wrl; Fri, 20 Oct 2023 06:05:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqdo9jC3XWlyBk/kICVcjWXDZjcomvU+YONfKMk0X7JW1M1tAYyywa2qF3ipaNimUnu4VJ X-Received: by 2002:a05:620a:b11:b0:774:19cf:f3e3 with SMTP id t17-20020a05620a0b1100b0077419cff3e3mr1466314qkg.76.1697807126910; Fri, 20 Oct 2023 06:05:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807126; cv=none; d=google.com; s=arc-20160816; b=BPs1GZiCq3JhDRLFYisoom5a/yv0fo9zcf8X476RhIsizdeqWrN43qt4LewYSfofsu s/ijEiZ5tc2l/Q5UhR1d3RbEzMfnxyJeRHeV2KroOiD3xUuf+j2GLjEYBMsb05Py6doO UnzaJPl2WxVUttgHmyFwwECCt6dV5MQPcOn/OSSRTJQmIO9br3pjOrVlaV1Jwy5XZ9w3 0kn+0vyOqieIqJj6cEFQTVSTyxiCFsya1dfHnsUW4GEMxR2d8RxgYhdLHLoYKIcXlKJg N5p2+h7/zet++DjsjelIjhj1IGpxHNbtbCTMRpBVczIW6v209Egk/fPOaeUmFrCe2Lz2 JuSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RG5zLlWN/LC4pJbPVJoFLnGQz4i0tpH2bVvTXsYTeOI=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=knheHxXigvUVwT6l5Koy7eXBEeYFg/uXaJJg5vRIoyWvqJOtRBe0Z0DZ0y+uDDkukf bYo5ELW47nGDtNbbx9AZaaUAStLIeAQZvKZcbvBWKDDJBgZHW8WaLGUxR+fihLC+vR+f yhGqmWfV5IYVlZCwucUdG3gQq7eyMziF7kny1Ej1mObQt4qRChpbX0IwkaKNrK0z1oqT gA9hvnaq4xMoeidDqmC6N+pNs1bC6V0I8mdNDm3/WiFTidfGbo8sJ6q91Xea7oqGAW+G 4m3LNJYLee1IDySa14bPeqj6x12Lr6jpTMiUIjA5p8ZCkDD5OnIUQMiEITIU/mSOQxXS tiGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LEz5uXfa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h14-20020ac85e0e000000b00417ba0580b1si1245281qtx.626.2023.10.20.06.05.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:05:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LEz5uXfa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAy-0001cy-3G; Fri, 20 Oct 2023 09:04:28 -0400 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 1qtpAr-0000xf-4X for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:22 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAn-0005N4-VO for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:20 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9c603e2354fso173640766b.1 for ; Fri, 20 Oct 2023 06:04:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807056; x=1698411856; 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=RG5zLlWN/LC4pJbPVJoFLnGQz4i0tpH2bVvTXsYTeOI=; b=LEz5uXfath7rEbO83c35/Oj3IIKvsGh54n6x23rKD0IQlgkDCWUhS9vFYWejXNP3VX n1japTovWUJOzG6NYZBkiAeZKUbPZfTx2wZRZace+8d1Vd2PdcXYrLzc9eHaDwWtLvCR hNxmM/gTdd7xQmO48Xl7TdXZzieECl4nFZgh8qekpYRY3jBUhbmzkwjm3NeRcxQ4czq+ rbMHqABjjAqkMJOADXfKGxrzjB5gpwAgv+h7Th1LBxogLmDxxqKUd2u6AupRCyNzaL1g l3kaULXyjAT+Vf8EAZoIkLDqYFIDe5Oto42GzjOiByFo1zvEFl8rpvppGA1xQQqZMSlq wF0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807056; x=1698411856; 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=RG5zLlWN/LC4pJbPVJoFLnGQz4i0tpH2bVvTXsYTeOI=; b=IGlsMtEN7GK+QMqi1qalh6clZtEPH/SfaFET/DHL6MhMU+o/vJ3hS/TC9Bfbyristp qCrhPfo8AzmSXV4Ivg+p3crJ5/m6noE+tf92JNvthvH2hufcZ4E792IAcNy9nTxQkslz 7JOkWYMSddkr9yZXcIUYqNxRdlNiOo7APWWOSL8HujPmelOe1nE12cIFLSAvchezQeEI yDWzUTMxWffW3kCuPg5Pk6VSbz2b4n7D6We8z7wn8zK/8VhhT6X0Z8SoC5zhsgOI0q9M c5y54UVqJhOmG0B1iLEMCag2iBVeU4pzJRg9OnfVQQ5kAfAHhWcL1muRgl8D9stBm075 Lw8A== X-Gm-Message-State: AOJu0YzVRF1CLGdwP41uy0vFaxULFpSfoW+FMLBnwJss/KLaScFtP2A7 /5z6BT4PS6MEQv+yvZ2kFmTKoKfMi8Sp0jQ3ejM= X-Received: by 2002:a17:907:3daa:b0:9bd:81c3:2a85 with SMTP id he42-20020a1709073daa00b009bd81c32a85mr4700129ejc.32.1697807055916; Fri, 20 Oct 2023 06:04:15 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id x20-20020a170906149400b0098884f86e41sm1459879ejc.123.2023.10.20.06.04.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:04:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 7/9] hw/intc/pxa2xx: Pass CPU reference using QOM link property Date: Fri, 20 Oct 2023 15:03:28 +0200 Message-ID: <20231020130331.50048-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=philmd@linaro.org; helo=mail-ej1-x62c.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org QOM objects shouldn't access each other internals fields except using the QOM API. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/arm/pxa2xx_pic.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 2eb869a605..7e180635c2 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -15,6 +15,7 @@ #include "cpu.h" #include "hw/arm/pxa.h" #include "hw/sysbus.h" +#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qom/object.h" #include "target/arm/cpregs.h" @@ -288,7 +289,8 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) DeviceState *dev = qdev_new(TYPE_PXA2XX_PIC); PXA2xxPICState *s = PXA2XX_PIC(dev); - s->cpu = cpu; + object_property_set_link(OBJECT(dev), "arm-cpu", + OBJECT(cpu), &error_abort); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); @@ -321,11 +323,18 @@ static const VMStateDescription vmstate_pxa2xx_pic_regs = { }, }; +static Property pxa2xx_pic_properties[] = { + DEFINE_PROP_LINK("arm-cpu", PXA2xxPICState, cpu, + TYPE_ARM_CPU, ARMCPU *), + DEFINE_PROP_END_OF_LIST(), +}; + static void pxa2xx_pic_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); ResettableClass *rc = RESETTABLE_CLASS(klass); + device_class_set_props(dc, pxa2xx_pic_properties); dc->desc = "PXA2xx PIC"; dc->vmsd = &vmstate_pxa2xx_pic_regs; rc->phases.hold = pxa2xx_pic_reset_hold; From patchwork Fri Oct 20 13:03:29 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: 736243 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp288484wrl; Fri, 20 Oct 2023 06:06:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFndml91psWY5fH08chTkpNiT0knhvquNqTrLwM4hirkcuOOsyu0rdkfcD2iTWsWbcsrYOs X-Received: by 2002:a05:6358:a084:b0:13c:a9c9:c04a with SMTP id u4-20020a056358a08400b0013ca9c9c04amr1606488rwn.20.1697807166395; Fri, 20 Oct 2023 06:06:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807166; cv=none; d=google.com; s=arc-20160816; b=p6Vm+n70JUjRl+9c/sa4BmoPSVap4d5Gr0OCQtT6NEkZKNKvf1g4XmVnOVNHS1HN8H xv8Cs6AiXLOkSrhK9irhSLD7PFwZvuc9NYs0TRxhsQuMLcYG0LwF7B797j4NVevq1EFM oT5PajuMNHAlbmpj/nNYyk9wdXHn/1SGILKWqJ4b/DNZe6OKAI0GdfTN+5euemjHbRSj db5azllA6ZxT/Hv0RWkRSBuGOStHKk9ig5dDE3StcGPgGhGLJRHfte8eCsgGpLwtVFQ9 NOSNIjW+ShiMGbOFMF/jqx2izviGwDCfJkW3w0PX7Wc+X9H4BPTTHGOx3Jw+V3Q33poD 1rTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jWeKlxu/1oSXjew02PYYb/4LgtdqaZA73Poob6GIouM=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=q8bTy8GY0Ai+Pd2Lih3kQIXh+v/zICxfTu5MNTN6WXtryXJ3n2YHq8eqHOXDk+arPn Pjhe/fzJpo/zi7+MG0yeGXfWheF2F7v8+kbjkGqRWUqy0bBRPll/XuIy2CMHUYvECuwP u3QaYgsp3/wP8JekDGv1E8ZhCuGtHSolkayIKiv2IBG3BLWNEaPLqfwZIG/QPFivx2Ny YZ4QMI78QVacBzgYnb2i9hDA74PiLlLvzmJefKsifK+71bgASWv1iiGcKwNZuiWmuRjG YuXswxLulCxQKzIsOoOzpbVO2TaJu/7wjE+BOiDrpGWODBAhLDXsmpcrXKlnNsswblKF di/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XIs5MwA9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v16-20020ac85790000000b0041cc4706f49si1226521qta.26.2023.10.20.06.06.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:06:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XIs5MwA9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpAz-0001td-Cu; Fri, 20 Oct 2023 09:04:29 -0400 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 1qtpAv-0001Tj-87 for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:25 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAt-0005O9-B9 for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:24 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-53e855d7dacso1197152a12.0 for ; Fri, 20 Oct 2023 06:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807061; x=1698411861; 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=jWeKlxu/1oSXjew02PYYb/4LgtdqaZA73Poob6GIouM=; b=XIs5MwA96Z1GkELKWrGRCGQIwtM5xqQMwBunRMxLHBh2vqPMO8dHjjDM87iGe7ejIe U6o7czKjElGfPjvAWxtXECaRFSu3JqB0bYck0LdQ/xI72WyJCPUKndNfdeDSY/Dqa5lB ZEc9AizjrrGQAG8StbKoLENga7zD7pOgcZ6XEPW0nSkzb8QHGCrKxegdNUD53KUHjjDZ zszwyjcCS35XsyyaebksYOTkn09cidtxEi9YH5XjnU6rYSxcQeGoJ0iglKZ2+WQrd2mU ycnqnhlQTsad0/AvA8P+nThOcweYrF78V6WrW+rZxMEvRUQZ52c0dvsTF5BvznyQHnLW pKww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807061; x=1698411861; 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=jWeKlxu/1oSXjew02PYYb/4LgtdqaZA73Poob6GIouM=; b=TyginWVURyyAhmyGII5QwuSaVVxa1xWflt492S1lQgT6hE1YFcIMcHHbS0svPWtVOU RKnLeyFqgIR1/tKgm5GjuE15QbK1gaddm26KgoLxy3KTlB05YbBKZR9voxstRtQDHAOC EZBVSuLWbx8yOQTfTfSSYciHbz+0poGerA/ITfWPayO6fKN6OufUEUjfqrQiKGYOpvBb 3ZEU4apzRo41fnWYiCrH5i58ZP3kk32+3+II5hxGRduySf9oZ44JuLkGkS2pB6CVt1OF tXCKAnZHdCiFsY9sWPMvwe9xLC2mVFoG6th7ZlljKH0YdYJxx9kiEPvuYpu5ZDIcVhd9 XiQg== X-Gm-Message-State: AOJu0YxBTg64sMFwZcPRNnZpSd44Gxt+gS1CjhUjDqsF5GWp0srpVJk7 uy1h+TdPaWUHV8k0DbyZXmIqYuibZlrjJAgbV08= X-Received: by 2002:a50:9519:0:b0:53e:2409:d6f3 with SMTP id u25-20020a509519000000b0053e2409d6f3mr1309839eda.6.1697807061542; Fri, 20 Oct 2023 06:04:21 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id q20-20020aa7da94000000b0053e9352643csm1404589eds.62.2023.10.20.06.04.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:04:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 8/9] hw/intc/pxa2xx: Factor pxa2xx_pic_realize() out of pxa2xx_pic_init() Date: Fri, 20 Oct 2023 15:03:29 +0200 Message-ID: <20231020130331.50048-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=philmd@linaro.org; helo=mail-ed1-x534.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/arm/pxa2xx_pic.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/arm/pxa2xx_pic.c b/hw/arm/pxa2xx_pic.c index 7e180635c2..1373a0d275 100644 --- a/hw/arm/pxa2xx_pic.c +++ b/hw/arm/pxa2xx_pic.c @@ -287,12 +287,18 @@ static void pxa2xx_pic_reset_hold(Object *obj) DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) { DeviceState *dev = qdev_new(TYPE_PXA2XX_PIC); - PXA2xxPICState *s = PXA2XX_PIC(dev); object_property_set_link(OBJECT(dev), "arm-cpu", OBJECT(cpu), &error_abort); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + + return dev; +} + +static void pxa2xx_pic_realize(DeviceState *dev, Error **errp) +{ + PXA2xxPICState *s = PXA2XX_PIC(dev); qdev_init_gpio_in(dev, pxa2xx_pic_set_irq, PXA2XX_PIC_SRCS); @@ -300,12 +306,9 @@ DeviceState *pxa2xx_pic_init(hwaddr base, ARMCPU *cpu) memory_region_init_io(&s->iomem, OBJECT(s), &pxa2xx_pic_ops, s, "pxa2xx-pic", 0x00100000); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); /* Enable IC coprocessor access. */ - define_arm_cp_regs_with_opaque(cpu, pxa_pic_cp_reginfo, s); - - return dev; + define_arm_cp_regs_with_opaque(s->cpu, pxa_pic_cp_reginfo, s); } static const VMStateDescription vmstate_pxa2xx_pic_regs = { @@ -335,6 +338,7 @@ static void pxa2xx_pic_class_init(ObjectClass *klass, void *data) ResettableClass *rc = RESETTABLE_CLASS(klass); device_class_set_props(dc, pxa2xx_pic_properties); + dc->realize = pxa2xx_pic_realize; dc->desc = "PXA2xx PIC"; dc->vmsd = &vmstate_pxa2xx_pic_regs; rc->phases.hold = pxa2xx_pic_reset_hold; From patchwork Fri Oct 20 13:03:30 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: 736242 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp288141wrl; Fri, 20 Oct 2023 06:05:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfDn4YHSNqcayLBiEN6p9l7PzXYImHggxzmc3Z6DxibUs18vwUmrMWnX5l178YKSZCZSwU X-Received: by 2002:a9d:74ca:0:b0:6c4:d7e4:94d2 with SMTP id a10-20020a9d74ca000000b006c4d7e494d2mr1692935otl.33.1697807137283; Fri, 20 Oct 2023 06:05:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697807137; cv=none; d=google.com; s=arc-20160816; b=xdDj+mkNjEoyq5qaIDmiPmAFjKioUtyVOeLZ76ZgLmC68zKix6RMpK/VSNPyHtXvCY VIRNWLiM2C9yI8k8liqC66wSwtPX15TmI5CdcETsVMC7ozmpzILSWS/B6PSltRo2ewLp /8N023ULqINZYc4j1L/pE1vf/UAFizK6eHmmSpQQFNlQeOYUh1i+NobfWBI6KIGm6itN P+JD7r7BwflFnlM9meUdGm0TpAo8XG8UG1l8HZO7AiFThtdoTqX3RQ9WVWFx8l5UYnNj rZi3XORQUU+IoD+uzSxQvLhLgTObdVi3UyNe9Lp7Dddfn9JGUumN5w03rjMznP0eDvvA AJnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7XHyEIGArD78mgw8R7PN08IB8dbr9alKW/qdS4/dSAc=; fh=QWGggua+3ufs1S3QlzhTWcDhlhc7bBCtXi/Y+/UuB8A=; b=TsQZivxBUvCe+YzsnsLE0/4vx9cJC0c2LD6gmcE47Yogfai8NSvwG0QPhLQFe2xCQF fr9Ax9FGn0EDiDNsw3o0CRytZURm1YWLrjTjhjriIa56P6bXYDONiita+42vdA7ClFRb 6q8MsVqBHQj2BCOYB4RRpYK+z3oyTEzlGoL5+mDm003VJG5Bgn3+DpmOQJgp8SwDSTvO YZIlCoMvPF3ERz2Vk4jec/cGvewUngn9ywb7GiMyzwq1ukThX8/wpQcsZa4HoQyt4pWv sRe3KukgJRcvykJ2KQgvjEmpNoH9LVBAWxj14gDFUqVb7yPAhtOTRyizHp3KUleAAzYU T9MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZgqvH+q5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id kv9-20020a056214534900b0066d121fdf87si1361468qvb.206.2023.10.20.06.05.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 06:05:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZgqvH+q5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtpBc-00039j-Nw; Fri, 20 Oct 2023 09:05:08 -0400 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 1qtpB3-0002Ag-PE for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:38 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtpAz-0005PI-EE for qemu-devel@nongnu.org; Fri, 20 Oct 2023 09:04:32 -0400 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-53d8320f0easo1154518a12.3 for ; Fri, 20 Oct 2023 06:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697807067; x=1698411867; 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=7XHyEIGArD78mgw8R7PN08IB8dbr9alKW/qdS4/dSAc=; b=ZgqvH+q5IhCm/GI/MllifkiAU9j58GC1letSB0bXZ6+Y7QUCEmzNL18JxmnqmpTZWJ L9mYVh3ddM7g42KieZDQ/lxIfLV0klP1L9XoXCL1SwsrIQM/ZI9X+/P61nSqZSBer/Lw ++wvCqq2Tl0/mBPdD2qBlVWQOim8IKy4mEyJEE3jVvy9x7FozDugYUTA/kOMx0HF27NN 0w8D28MrEusbZRxYss0FRw+c39vcd/8OFpMc8nhIaUv8P8L64jV4kcGjdMcNhJGxpCOE Yj9Eh0OgK8WwW/GNqWZnZOTJqCau4+ffGLJEgZ4bQ7lkHs1eTS/C6jwRQo1EH+LV+nE+ p8AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697807067; x=1698411867; 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=7XHyEIGArD78mgw8R7PN08IB8dbr9alKW/qdS4/dSAc=; b=ZjPV/olK+bJf9YcwzevKYaXiMMsLKkYtftpCkVqV08LFn7Hj0/H6AyCq6NwJvcwfL9 3I6DPcG4EMq/AyrtB4m0sLq0yLGUfgxNL8JsvPc2QdPyP3qTf05jW7mQEXphbV4DpO5z V6RHmBT/1gi0H2KU5v1AP1hH2ERv3tbn7Rkb5Hq4jsjIWEFSoI5D1mgu3ZfdTcHV65d5 TRiizGlFuZDmmdzbdLHHSyTk/oYXYZJWrufWbcntP26DR+H+xBKVMQiTKcnt071Sawar giO/xI7V537fxeSp1c9pXzue3nx7OPXsfnVCEVgxDDhrLwn423+KwPXd7WLDZVnTNvb4 r2rg== X-Gm-Message-State: AOJu0Yxy4YKSwOz8h2dzOhKl4LAgGxVYzErbz8/dCEciN21NaeaghtW4 0vmzT5fMa7ZyluBUBQqFFcf+qLW+Ql42/Z19WZc= X-Received: by 2002:a17:907:36cc:b0:9ae:5523:3f84 with SMTP id bj12-20020a17090736cc00b009ae55233f84mr1194335ejc.72.1697807067597; Fri, 20 Oct 2023 06:04:27 -0700 (PDT) Received: from m1x-phil.lan (tbo33-h01-176-171-212-97.dsl.sta.abo.bbox.fr. [176.171.212.97]) by smtp.gmail.com with ESMTPSA id h13-20020a1709062dcd00b009ae54585aebsm1473536eji.89.2023.10.20.06.04.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Oct 2023 06:04:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 9/9] hw/arm/pxa2xx: Realize PXA2XX_I2C device before accessing it Date: Fri, 20 Oct 2023 15:03:30 +0200 Message-ID: <20231020130331.50048-10-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231020130331.50048-1-philmd@linaro.org> References: <20231020130331.50048-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=philmd@linaro.org; helo=mail-ed1-x534.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=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org qbus_new(), called in i2c_init_bus(), should not be called on unrealized device. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/arm/pxa2xx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 601ddd8766..f0bf407e66 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -1513,14 +1513,15 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base, qdev_prop_set_uint32(dev, "size", region_size + 1); qdev_prop_set_uint32(dev, "offset", base & region_size); + /* FIXME: Should the slave device really be on a separate bus? */ + i2cbus = i2c_init_bus(dev, "dummy"); + i2c_dev = SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(i2c_dev, &error_fatal); sysbus_mmio_map(i2c_dev, 0, base & ~region_size); sysbus_connect_irq(i2c_dev, 0, irq); s = PXA2XX_I2C(i2c_dev); - /* FIXME: Should the slave device really be on a separate bus? */ - i2cbus = i2c_init_bus(dev, "dummy"); s->slave = PXA2XX_I2C_SLAVE(i2c_slave_create_simple(i2cbus, TYPE_PXA2XX_I2C_SLAVE, 0));