From patchwork Sun Feb 5 10:04:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C6E7BC636CD for ; Sun, 5 Feb 2023 10:07:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObu2-00016d-Ck; Sun, 05 Feb 2023 05:05:42 -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 1pObtQ-0000yg-8L; Sun, 05 Feb 2023 05:05:15 -0500 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtL-00057b-Bt; Sun, 05 Feb 2023 05:05:00 -0500 Received: by mail-oi1-x236.google.com with SMTP id r28so7619739oiw.3; Sun, 05 Feb 2023 02:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=NpoNX2dxcyKhglstuvdHrDSP+68EMHvHibawEKNZWnc=; b=g99hmpu5Eji509+nWil6NIL6E8wnf3/+SYLzvYJG8JsqQ32Y33AG4FrwMokkgax6g7 px2sWM2yhEL1gAHV7nLKOLYRjXfx3HFC3aLx176AEsInlWcM2x5TbtCWI/vhsqi7+1/r KSwX1LBYjRZDSySlmHH3DES3BLg7iDYa6cACX6tBq24VE6CIiIrDN3sWCINCsZOI/oBU 3s2OxnmX4IaPNX45voC52GV4IuBTwygTjD6oDV2cfy9TiRVTSRnKL0zzn+SjSmDv41hY 5ro8LdtxdmJnfLJTHvkYGpiXTOdKPS34QPzPTaOktsyHdpzFGHzxpK3zDfX+hNHnIK4h ofog== 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=NpoNX2dxcyKhglstuvdHrDSP+68EMHvHibawEKNZWnc=; b=0o/taz/2Li59U30edEdGsbnFIjZSRG5+CkChlBoeun3bk6zhYgPD6p3Fh5GsdDRn8R QDGfAXW0P0d27PaKOwDDTiesRNAbXKhmAFc0o0UK1zs2q7PBr6WwhamQmaKG9jnpONEp woZ+lnDoaDPtTjtSDQcfkqtNLfFL4ySNAU22Zg2aC8mjZRbXnw9YEe3ed93NCHtKlSz7 YKwPI6F2EzB8YiOzijVz2WgR5uYQv9PVwRGKnBkRNCmGSAtgHI0Krvat3P9YigoE/xr4 9JN4ZwYYUa+ZO4IYwzFFox+J6WZtnUfhFkX/dqPWwIysvWEqtq3XjT3hLC7qG7sXzbe2 mbRw== X-Gm-Message-State: AO0yUKXvCYOGkUNP5opnKC3UvszkEAoCM0pi7NdHNue2x0WxqOP72vC9 GzNaULo5R2fmlkXkm9ILc6C20j9DxAU= X-Google-Smtp-Source: AK7set/2D/a/3RpKLH4/hxoDogr2WpJY3fsD7twE/Oww8zjOruRClYwZ0zqUKpeQEi0A024xPO6YiA== X-Received: by 2002:a05:6808:68a:b0:378:51b3:e0c1 with SMTP id k10-20020a056808068a00b0037851b3e0c1mr7575109oig.4.1675591496761; Sun, 05 Feb 2023 02:04:56 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:04:56 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Murilo Opsfelder Araujo , Juan Quintela Subject: [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary Date: Sun, 5 Feb 2023 07:04:34 -0300 Message-Id: <20230205100449.2352781-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x236.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Murilo Opsfelder Araujo `make tests/migration/stress` fails with: FAILED: tests/migration/stress cc -m64 -mlittle-endian -o tests/migration/stress tests/migration/stress.p/stress.c.o -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -fstack-protector-strong -static -pthread -Wl,--start-group -lgthread-2.0 -lglib-2.0 -Wl,--end-group /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gutils.c.o): in function `.annobin_gutils.c': (.text+0x3b4): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /usr/bin/ld: (.text+0x178): warning: Using 'getpwnam_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /usr/bin/ld: (.text+0x1bc): warning: Using 'getpwuid_r' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gthread.c.o):(.toc+0x0): undefined reference to `sysprof_clock' /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `.annobin_gtrace.c': (.text+0x24): undefined reference to `sysprof_collector_mark_vprintf' /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_define_int64_counter': (.text+0x8c): undefined reference to `sysprof_collector_request_counters' /usr/bin/ld: (.text+0x108): undefined reference to `sysprof_collector_define_counters' /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gtrace.c.o): in function `g_trace_set_int64_counter': (.text+0x23c): undefined reference to `sysprof_collector_set_counters' /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gspawn.c.o):(.toc+0x0): undefined reference to `sysprof_clock' /usr/bin/ld: /usr/lib/gcc/ppc64le-redhat-linux/11/../../../../lib64/libglib-2.0.a(gmain.c.o):(.toc+0x0): undefined reference to `sysprof_clock' collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. make: *** [Makefile:162: run-ninja] Error 1 Add sysprof-capture-4 as dependency for stress binary. Tested on: - CentOS Stream 9 ppc64le - Fedora 36 x86_64 Signed-off-by: Murilo Opsfelder Araujo Reviewed-by: Daniel Henrique Barboza Reviewed-by: Juan Quintela Message-Id: <20220809002451.91541-2-muriloo@linux.ibm.com> Signed-off-by: Daniel Henrique Barboza --- tests/migration/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/migration/meson.build b/tests/migration/meson.build index f215ee7d3a..dd562355a1 100644 --- a/tests/migration/meson.build +++ b/tests/migration/meson.build @@ -1,7 +1,9 @@ +sysprof = dependency('sysprof-capture-4', required: false) + stress = executable( 'stress', files('stress.c'), - dependencies: [glib], + dependencies: [glib, sysprof], link_args: ['-static'], build_by_default: false, ) From patchwork Sun Feb 5 10:04:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129018 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6946CC636CD for ; Sun, 5 Feb 2023 10:07:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObu6-0001Jg-LD; Sun, 05 Feb 2023 05:05:46 -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 1pObtR-0000ys-OW; Sun, 05 Feb 2023 05:05:15 -0500 Received: from mail-oi1-x22b.google.com ([2607:f8b0:4864:20::22b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtM-00057i-CR; Sun, 05 Feb 2023 05:05:04 -0500 Received: by mail-oi1-x22b.google.com with SMTP id r28so7619772oiw.3; Sun, 05 Feb 2023 02:04:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=OdSpoWp1d2D6wf8OPpLeL41Q4sIU+AkIIxFkfG4flxk=; b=lDpW8+qvIRAsf8EmXR85FymKXuM6/I+8r2UrnjoQo5ftQe/p89Ih/EUpZEG7BUU1Ap ow/SF1jiW8lO4yocKpRreP5LD4gSn+N+lMMKg4tP03dSnuIAJzh8dCX/VnawY7CuHxC1 s6rAX+Xp9tGsFeC0X0wCcfPm3jWkuemRcVhMkdluRErreHc/jE1yNe9r3k7Asjmk51bc g1tpbifzR4YkmZQoR6wyE2koDTMS53Butw+FyV5K3+cvKtwZvckGsT9mJYIGCceDrOCF dq9tv7goaa2mOSYw+HGBfEHF8jgr4ij+aFaRhTBFtCkHacp5EE2Ut9Wp23m/3Zzm9KnD 9fYw== 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=OdSpoWp1d2D6wf8OPpLeL41Q4sIU+AkIIxFkfG4flxk=; b=O1Rknr5Ia2S0/nxUNg4Fqm+1Ati70xAqLghSq7TLnt7gwInsTDliWxEiFZXZE+om8d zzlETNbECtt0eQAFwfngdNgfxhjdS9EqPUUaEe+GgpkNQ/ROf9ul4ga2e0+C8PtOqOZH FAm5Jb07e04F/sY3Hul/ECc9H3nxjHbpYu9+JcyI6PrIQSBAmTWG6ZgDhst0vMJQ4Goh 2pfmTYPe3jM+z06b03Y/t/9Tto4LjFCs8uP5xYmQaVHARC5nuLTEjv55f0VjQbAs4fD2 KqDvUaK8MOYMFRpYJQ3gyJUBy34RftBaXaJaQhmN094Y2OjgVk0ZTKMuXQFXzUm+wWOV rTSQ== X-Gm-Message-State: AO0yUKVgPjIkez5xmHEvVcpPznDSEX9Sdh7XQvsaIoZAjj7T4OwNM8Sw mnOVaWyaIMxDUwpMKWOWRfVG0QPA3tA= X-Google-Smtp-Source: AK7set9yhbqqs3c2tWCKuPI//QOvrnMzXD5twQR6qV9XSi80gmhwsr2DDBiSgUlbsaay7P4qVrHReA== X-Received: by 2002:a05:6808:54d:b0:36a:8422:d962 with SMTP id i13-20020a056808054d00b0036a8422d962mr7877495oig.2.1675591498863; Sun, 05 Feb 2023 02:04:58 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:04:58 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Murilo Opsfelder Araujo , Juan Quintela Subject: [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py Date: Sun, 5 Feb 2023 07:04:35 -0300 Message-Id: <20230205100449.2352781-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22b.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Murilo Opsfelder Araujo Add support for ppc64le for guestperf.py. On ppc, console is usually hvc0 and serial device for pseries machine is spapr-vty. Signed-off-by: Murilo Opsfelder Araujo Reviewed-by: Daniel Henrique Barboza Reviewed-by: Juan Quintela Message-Id: <20220809002451.91541-3-muriloo@linux.ibm.com> Signed-off-by: Daniel Henrique Barboza --- tests/migration/guestperf/engine.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index 59fca2c70b..cc06fac592 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -281,6 +281,26 @@ def _migrate(self, hardware, scenario, src, dst, connect_uri): resp = src.command("stop") paused = True + def _is_ppc64le(self): + _, _, _, _, machine = os.uname() + if machine == "ppc64le": + return True + return False + + def _get_guest_console_args(self): + if self._is_ppc64le(): + return "console=hvc0" + else: + return "console=ttyS0" + + def _get_qemu_serial_args(self): + if self._is_ppc64le(): + return ["-chardev", "stdio,id=cdev0", + "-device", "spapr-vty,chardev=cdev0"] + else: + return ["-chardev", "stdio,id=cdev0", + "-device", "isa-serial,chardev=cdev0"] + def _get_common_args(self, hardware, tunnelled=False): args = [ "noapic", @@ -289,8 +309,10 @@ def _get_common_args(self, hardware, tunnelled=False): "noreplace-smp", "cgroup_disable=memory", "pci=noearly", - "console=ttyS0", ] + + args.append(self._get_guest_console_args()) + if self._debug: args.append("debug") else: @@ -308,12 +330,12 @@ def _get_common_args(self, hardware, tunnelled=False): "-kernel", self._kernel, "-initrd", self._initrd, "-append", cmdline, - "-chardev", "stdio,id=cdev0", - "-device", "isa-serial,chardev=cdev0", "-m", str((hardware._mem * 1024) + 512), "-smp", str(hardware._cpus), ] + argv.extend(self._get_qemu_serial_args()) + if self._debug: argv.extend(["-device", "sga"]) From patchwork Sun Feb 5 10:04:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 12382C636CD for ; Sun, 5 Feb 2023 10:06:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObtg-00011c-IK; Sun, 05 Feb 2023 05:05:21 -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 1pObtR-0000yt-Tf; Sun, 05 Feb 2023 05:05:15 -0500 Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtQ-00057p-0D; Sun, 05 Feb 2023 05:05:05 -0500 Received: by mail-oi1-x22f.google.com with SMTP id t5so87131oiw.1; Sun, 05 Feb 2023 02:05:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=A5Q9l9r/b6kQ91x4NbnE0QX6N3wOGcLvxWVDOgH26Vo=; b=n78Zr2CGHojJihr5jFdKqpfa1mjk4FJYxpJZGeaYDLtoPoRZhrG1iGV136f0KBSiWR ybjMHu1QYxZDuVMKWSddpmjY57wOcEzrlv5qw7d/xdWzrnnFKU8ilbv5kQHpW0ffI+zK rp63zQLcmZArugFpbjKWbQ3vqi7adkRUYuan2Bthc3iCTLDO6mWaZQyu69XI5qq8k1oP RtDvG7OUHJH+opLZr+jQCtUROVXM4UBARUk9lB7wTxcUggzQFrFX7SKp8SXHhj8PNjRJ ttmX1tP7k2MYt4Ap5pulhXJgOQ91cB1zAYI+ogZJiTRsAZQhBQ1KAjcmPSC7dftNstDp dQoA== 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=A5Q9l9r/b6kQ91x4NbnE0QX6N3wOGcLvxWVDOgH26Vo=; b=1SIrg/VDetN6cxbh6Z37Yiz21gzBCplaO+xGj81ITwfuVoGz3vtR1j8NJkTTYsVQSw bqwwdBVWpYRxqrIOZxBNT27xPzpchhIZnY4LPxdnmH1Kh7T8h5SVvPlScq/qQWpXLIKM jsLc6icn01F5QpmapYxW3nIkIdKuPamiib+ILRbUXi2pyZH/+/HHlrq5UhvYqhA50SWX wy7GuhrlwnrUOs5ZbOQIZyPjC3yqHNByBlvlunDSxzxpGG3tq91ciHnuNWA4a8az6lrs ZFhwVMv5aJbcBiqZ47UNixpdeJNkElBKLlM1j34rmcQaaTEVjiktMGPSpHyCQGwqWB7/ /+kQ== X-Gm-Message-State: AO0yUKW1WdmQXHZGOOe9OVYSyIngOtR5rq2i23jjS2k03Pm+2PjUDBrb VuD+NTZqd6SYNkT+8CRjvL5kda5kFlo= X-Google-Smtp-Source: AK7set88t1Yf42l4PbHsipccIi5Pj+UGdxm7Lk941OeQeezbiEs/Yu27M0OCEI6vgQaoGe8OF5lsDw== X-Received: by 2002:a05:6808:18c:b0:378:4785:7a2e with SMTP id w12-20020a056808018c00b0037847857a2emr9303169oic.28.1675591501131; Sun, 05 Feb 2023 02:05:01 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.04.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:00 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation Date: Sun, 5 Feb 2023 07:04:36 -0300 Message-Id: <20230205100449.2352781-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22f; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: BALATON Zoltan Slightly improve readability of creating the south btidge by cnamging type of a local variable to avoid some casts within function arguments which makes some lines shorter and easier to read. Also remove an unneded line break. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230117214545.5E191746369@zero.eik.bme.hu> Signed-off-by: Daniel Henrique Barboza --- hw/ppc/pegasos2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index f46d4bf51d..1a13632ba6 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -102,7 +102,8 @@ static void pegasos2_init(MachineState *machine) CPUPPCState *env; MemoryRegion *rom = g_new(MemoryRegion, 1); PCIBus *pci_bus; - PCIDevice *dev, *via; + Object *via; + PCIDevice *dev; I2CBus *i2c_bus; const char *fwname = machine->firmware ?: PROM_FILENAME; char *filename; @@ -159,19 +160,18 @@ static void pegasos2_init(MachineState *machine) pci_bus = mv64361_get_pci_bus(pm->mv, 1); /* VIA VT8231 South Bridge (multifunction PCI device) */ - via = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), true, - TYPE_VT8231_ISA); + via = OBJECT(pci_create_simple_multifunction(pci_bus, PCI_DEVFN(12, 0), + true, TYPE_VT8231_ISA)); object_property_add_alias(OBJECT(machine), "rtc-time", - object_resolve_path_component(OBJECT(via), - "rtc"), + object_resolve_path_component(via, "rtc"), "date"); qdev_connect_gpio_out(DEVICE(via), 0, qdev_get_gpio_in_named(pm->mv, "gpp", 31)); - dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide")); + dev = PCI_DEVICE(object_resolve_path_component(via, "ide")); pci_ide_create_devs(dev); - dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "pm")); + dev = PCI_DEVICE(object_resolve_path_component(via, "pm")); i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c")); spd_data = spd_data_generate(DDR, machine->ram_size); smbus_eeprom_init_one(i2c_bus, 0x57, spd_data); From patchwork Sun Feb 5 10:04:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1EBE8C636CC for ; Sun, 5 Feb 2023 10:05:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObti-00015E-Af; Sun, 05 Feb 2023 05:05:23 -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 1pObtT-0000yv-0q; Sun, 05 Feb 2023 05:05:15 -0500 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtQ-00057b-Nl; Sun, 05 Feb 2023 05:05:06 -0500 Received: by mail-oi1-x236.google.com with SMTP id r28so7619852oiw.3; Sun, 05 Feb 2023 02:05:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=oFLXQSIkaNrU/k0/AGC5VeAmUpsRZSfIo69ujVvNr00=; b=pxXVbr1O/fOjMWaIDcPvbCuXeJ8Vhv7y3FA90dc/MSKD8lv2/gXgZ/zZU/8lDVBAlh gjde5zb/tnkQa68C98Ek36rAg0yjBu8fYVQF2JXSCtjS+KM63Bau7F9UGrNTGle5TJK8 ar3Jp+qQLXD+7w4Byqb6hjQJU91LiaHs4EmKKCISEXQ6L92MFpLw9AJ8+JX0P5jtspRx bmltfp/fp0jRO2ipn4yjA68xxX1TzxtEal2zlp4FiAQyLIjmXiuCgG0DVUZLBk0wD/my tocWKKNZa4g7rvBQoKuKqVvkFexGXAYopwid91aRMOUZuCjU+3dkqIZ4w4PyfmoHL849 IneQ== 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=oFLXQSIkaNrU/k0/AGC5VeAmUpsRZSfIo69ujVvNr00=; b=Qsu5VeaSBR5TruQebcbNRT47Duuqe7Jlzs3zsXAguZgOuOq8PiBBPMEtWEnA6MruDf hWxeoisN0GyqQQZXofGlsC64bPXqOpVIcHJhbp+ifSK2mX5KxH4u3jfSy0edf4nRLOgF h4L0Q9GiER69rXD4R/+7wY3iNI9itKxkCSQhBqJ0+vFuYN+eRnfTxciTwvY5wcCypRNY x6yGI6EAKBCUXW6woDfGqkqufjaafd1KZ1Fhpyb5Ber4ga6cZmh86gqBWcdqfTdw4DUs z2cnc7PO0rfwOVvTczOiIoa/XVRevAJtBF5i5leDuD7JxdVczpKx1h0ECdMgu5Qbx/ZV upXw== X-Gm-Message-State: AO0yUKXgXUMfAipF5U57OFBVy08yykeQWMAxDqBc6RMnpaLOCsszQxEm mHkTlvC+MHXcwpvYQWcRoySbkz+d/CQ= X-Google-Smtp-Source: AK7set9Thc86AEsEMEZOpxx01QztsINiWo4ifsd8y7fQt9pLV3Ueha6eBkpHWdlW2+hLXjHn9IsVhw== X-Received: by 2002:aca:a993:0:b0:378:5763:7631 with SMTP id s141-20020acaa993000000b0037857637631mr8218450oie.26.1675591503404; Sun, 05 Feb 2023 02:05:03 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:03 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , BALATON Zoltan Subject: [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn Date: Sun, 5 Feb 2023 07:04:37 -0300 Message-Id: <20230205100449.2352781-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x236.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bernhard Beschow mv64361_pcihost_map_irq() is a reimplementation of pci_swizzle_map_irq_fn(). Resolve this redundancy. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: BALATON Zoltan Message-Id: <20230106113927.8603-1-shentey@gmail.com> Signed-off-by: Daniel Henrique Barboza --- hw/pci-host/mv64361.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c index 015b92bd5f..f43f33fbd9 100644 --- a/hw/pci-host/mv64361.c +++ b/hw/pci-host/mv64361.c @@ -72,11 +72,6 @@ struct MV64361PCIState { uint64_t remap[5]; }; -static int mv64361_pcihost_map_irq(PCIDevice *pci_dev, int n) -{ - return (n + PCI_SLOT(pci_dev->devfn)) % PCI_NUM_PINS; -} - static void mv64361_pcihost_set_irq(void *opaque, int n, int level) { MV64361PCIState *s = opaque; @@ -97,7 +92,7 @@ static void mv64361_pcihost_realize(DeviceState *dev, Error **errp) g_free(name); name = g_strdup_printf("pci.%d", s->index); h->bus = pci_register_root_bus(dev, name, mv64361_pcihost_set_irq, - mv64361_pcihost_map_irq, dev, + pci_swizzle_map_irq_fn, dev, &s->mem, &s->io, 0, 4, TYPE_PCI_BUS); g_free(name); pci_create_simple(h->bus, 0, TYPE_MV64361_PCI_BRIDGE); From patchwork Sun Feb 5 10:04:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129017 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B487DC636CD for ; Sun, 5 Feb 2023 10:07:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObu3-0001BW-Mj; Sun, 05 Feb 2023 05:05:43 -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 1pObtU-0000yx-R7; Sun, 05 Feb 2023 05:05:15 -0500 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtT-0005Ip-5m; Sun, 05 Feb 2023 05:05:08 -0500 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-16332831ed0so11902281fac.10; Sun, 05 Feb 2023 02:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=1Nuf0VHcX1ggZGxGk6xB4grHnqoZN1Uy+s0FlANDBEE=; b=NMhmx7nT9vLQIZoGBybfoOMlzvyFeCIOP9UuyvclRLCKfY4Kxn3Y1rB+G3WR59rJsr L8S9LQCyoKiHjRZIXwadN7r309QQIC9SmUqTh85cmhEMT9ayOPPKfPbob2Prgbf/iGiK k/xsapGN02VkPoaK9278nvN9hrVpOgVGNTvKSwkCjl09agfeRevia0oEskq1BqDV58mZ +OaorkODRFIriMfon+3kMgAWjHTGkEl3HXYtGnQqMykKkFUooBL5ZLD5w+28F8MLeKlB TV0gYw/hBo/AonMGikqpnda8u32qwXuaqptZOJNOVv35e2LWxDb647m2mKh/m0D9GbQO bUGQ== 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=1Nuf0VHcX1ggZGxGk6xB4grHnqoZN1Uy+s0FlANDBEE=; b=uCZvaFke3X0qjYGxRLT3jomKwm3UWPv22Tt//9FcO9VSg/SKGdByMMch0eRTUWwp9r 894Bg0B/UVNsCE2jhEOCPMA/FknPXlcLmQv23MlYBOHW1cI1V52x0SXZm1ObsM8NnkY0 Fj3Q5BqI2IvdSnW4r40ZzXD5cHxPMTFie5B/Dc2ma0D1Dx+KKEilEL0oRcs4PCwm3axZ bS6mGAAAjTgJKqwUz4w1XqSKG0jTIkSeff3sX5ZcAzoKB0oWv8rSMhNztdPf4JcYk8YI l1hUHF+rzJAmx7gEyW8v+qYbN4ERLiPMAzVxYyAmRKSDiMUHkFNBKu+6ZpNQHTqiZjQb 9+Dw== X-Gm-Message-State: AO0yUKU724wp+JVt7se53HaOfVgc2g0xuQrA0B+1Bpkf5MWGKYDrOYQb 7tpfP0fypR/y+TIvey4l7AZmMHF76+4= X-Google-Smtp-Source: AK7set84KKPAzaMIowEH6NZYXyRUtyXac8hYQmZHyrSQmIPkLkR0PBRGDk8NGFVBMQQV3s9YbIXdCw== X-Received: by 2002:a05:6871:a8:b0:163:c555:24e0 with SMTP id u40-20020a05687100a800b00163c55524e0mr9842640oaa.18.1675591505343; Sun, 05 Feb 2023 02:05:05 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:05 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Bernhard Beschow Subject: [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines Date: Sun, 5 Feb 2023 07:04:38 -0300 Message-Id: <20230205100449.2352781-6-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=danielhb413@gmail.com; helo=mail-oa1-x32.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bernhard Beschow This enables support for the 'dumpdtb' QMP/HMP command for all e500 machines. Signed-off-by: Bernhard Beschow Reviewed-by: Daniel Henrique Barboza Message-Id: <20230125130024.158721-2-shentey@gmail.com> Signed-off-by: Daniel Henrique Barboza --- hw/ppc/e500.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 9fa1f8e6cf..7239993acc 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -659,9 +659,14 @@ done: if (!dry_run) { qemu_fdt_dumpdtb(fdt, fdt_size); cpu_physical_memory_write(addr, fdt, fdt_size); + + /* Set machine->fdt for 'dumpdtb' QMP/HMP command */ + g_free(machine->fdt); + machine->fdt = fdt; + } else { + g_free(fdt); } ret = fdt_size; - g_free(fdt); out: g_free(pci_map); From patchwork Sun Feb 5 10:04:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3D66DC636CC for ; Sun, 5 Feb 2023 10:09:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObu7-0001KR-8k; Sun, 05 Feb 2023 05:05:47 -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 1pObtX-0000zE-M9; Sun, 05 Feb 2023 05:05:15 -0500 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtU-0005JB-VE; Sun, 05 Feb 2023 05:05:11 -0500 Received: by mail-oi1-x22e.google.com with SMTP id s17so7599577ois.10; Sun, 05 Feb 2023 02:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=xiCleTy8543Mmcc9cjgIqcXCXs8OIrvQc5QWbgPOzFM=; b=Wf4Z+oTEnFNGKKrc9ijb6qQB0xZbMjWXUnQftWtpbW/Zyi6CAVERrQMjSvAzhDY7di UPm+t4i+SBY1W/pfty6iucjeLdMfewmQDD8K8AFlhSc2xd0xg6cwsuINiGYD6dg15GE2 0pODhQoEfHeXVCFAleCWyYfctyI7VGs3DsIDULQ8DMWn51V2+BTyMtABu6zmXbrth2qn T1B/FjEHMwxxQU4rXj3dj04XdkYdvN0g+rPdMj6tE6JpONq4jnFYdcneGmkaYBQf5u+1 mjfzvOHpHG7AsR7yiYjXWeMVlodnjSo8WDDlCo6K2pGFS/N3I9fBsemNX62aebrnVlO+ vk0g== 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=xiCleTy8543Mmcc9cjgIqcXCXs8OIrvQc5QWbgPOzFM=; b=LCyKYndF4rqTCOKu90/3F5oHQH4z6LU7Ojj6OrfU8NDIDlZqxXn6jD0F8c9yw34Afl Ilo+iAyNl5z3eMgUojBefZQ40MQTtRkGCUQEi/5U3WGbB+NONNbSnC6fyw/qHcevrFbk J2wZEUL0CkGVeRH5hLsfZWUVu/13jbXdj7kPBZRFLcmKCBqzOZCteEOHiq7VlgAsopY9 sX5zg0xuXoZh5W3RNkhYifRNB5nk+UvQ9nwH86eMSTZOSS7GPlVJxuoKBQsUPaPKbW9o VYKv0k+N06cyQNydRGHiHDJKPvW/Ud5LGVB5oSmEHaoK0qc+/uHZv6JlBVlsz+gQS/W+ ugqg== X-Gm-Message-State: AO0yUKWxT2zX0LIsvvKJEcYTX/IUrtSHzPKnOeL8ad5m1FF34nl7Bc+O fc6wWoHKRtkpP0u61l8/4tU6U50WAdw= X-Google-Smtp-Source: AK7set9ERYhFtF4Vg7mvwUOz/0uI8IuY3HBXo7F2VDXElKgI+sL3LoAW5WgQ/wTKwCHdc7jnoDShjA== X-Received: by 2002:a05:6808:3ae:b0:360:fd4c:11ab with SMTP id n14-20020a05680803ae00b00360fd4c11abmr7332137oie.1.1675591507305; Sun, 05 Feb 2023 02:05:07 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:07 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Bernhard Beschow Subject: [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus Date: Sun, 5 Feb 2023 07:04:39 -0300 Message-Id: <20230205100449.2352781-7-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bernhard Beschow This is a follow-up on commit 47a0b1dff7e9 'hw/ppc/mpc8544ds: Add platform bus': Both mpc85xx boards now have a platform bus unconditionally. Signed-off-by: Bernhard Beschow Reviewed-by: Daniel Henrique Barboza Message-Id: <20230125130024.158721-3-shentey@gmail.com> Signed-off-by: Daniel Henrique Barboza --- hw/ppc/e500.c | 5 ++--- hw/ppc/e500plat.c | 9 +++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7239993acc..48288c0b41 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -643,9 +643,8 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms, } g_free(soc); - if (pms->pbus_dev) { - platform_bus_create_devtree(pms, fdt, mpic); - } + platform_bus_create_devtree(pms, fdt, mpic); + g_free(mpic); pmc->fixup_devtree(fdt); diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 44bf874b0f..3032bd3f6d 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -46,13 +46,10 @@ static void e500plat_machine_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { PPCE500MachineState *pms = PPCE500_MACHINE(hotplug_dev); + MachineClass *mc = MACHINE_GET_CLASS(pms); - if (pms->pbus_dev) { - MachineClass *mc = MACHINE_GET_CLASS(pms); - - if (device_is_dynamic_sysbus(mc, dev)) { - platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev)); - } + if (device_is_dynamic_sysbus(mc, dev)) { + platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev)); } } From patchwork Sun Feb 5 10:04:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E2388C636CD for ; Sun, 5 Feb 2023 10:05:55 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObte-00013J-Do; Sun, 05 Feb 2023 05:05:20 -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 1pObtZ-0000zH-Jh; Sun, 05 Feb 2023 05:05:15 -0500 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtW-0005JZ-O1; Sun, 05 Feb 2023 05:05:12 -0500 Received: by mail-oi1-x22e.google.com with SMTP id 20so6837280oix.5; Sun, 05 Feb 2023 02:05:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=0ydv4l9MXYHhhRfYq339RkzWonxTEWGRRNNHRsKfZbQ=; b=Qk0ywl9QH59qikEcyGtuTCH+6WfsBMSG5F4l896BWcx3zOoXqB6dDgnPK3ZYlSFlnD pscr1Zrh7Jygzw2RFK2HbsJFLYv6Kf3JsM8seSMbl+wTG7J8vhYqhbhATxId6FS0abx3 rjD7jlEOlbZpWe/H2OIr0GdGTYOIhcsPfjWJKBeDLZx/yaxL/00Mj/Smvq4lSgif4rtz U/xxHz9ZvpJ+XlZiOXLn34DXTJ2XWv4k9QDt4p9pRdkXLy7x9C5dBbrnMnCbsI+aoI08 CG81/XQg80OEICl+lq0lDUyBQRWDdh6GX5dl2tuevFtsF43A3lAZwsngedMnIehCf7XA nxcA== 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=0ydv4l9MXYHhhRfYq339RkzWonxTEWGRRNNHRsKfZbQ=; b=2Z/2VRyIWL0LtpTx0TZhv5gRqr0qlpLZ1Apx69ng0D/auw8goxH45ANenI6gvb/WPA 0tgx5p0VpGM81G85QuBXkjpMhfWKuRcGt6Xof72yeHkWjEGJrRm3xCrHxl7hPZQYp2GO Hmb8v/YnYIuxD/eihBfYGqhJ/tBAbAZ2CuCEtJx09qonDdvl9Un0DTsyg48EKGl3/zlW sIzip0vdgDAyEXleupcpmsQCCtiLJ2OsGHpQnTv/LxgB3FEwjKnP7tiWcgoyA4EV5X9R KADCK/m25NxNbovNmok8e12SvByOYiL2ji8x4CFEaMW1Lar6vh5Hgm0YTXrYtg3TNKjF nkag== X-Gm-Message-State: AO0yUKXJUkWxzDk5fsqfQCZFHXSUtlPBMOX1eZAY5x5esHBKZrkTQd8J UzRs6YcqJ5UZTD3nxYE+byC9tMxWcx0= X-Google-Smtp-Source: AK7set8WPJUY6nz44PeRPD1KZj0cCNsUPxP/iJLjD6JiPv5oa5/+3EqWLqHV21u168RuSiIF7Emt6w== X-Received: by 2002:a05:6808:190f:b0:360:e80e:26a9 with SMTP id bf15-20020a056808190f00b00360e80e26a9mr9277091oib.12.1675591509353; Sun, 05 Feb 2023 02:05:09 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:09 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Bernhard Beschow Subject: [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec() Date: Sun, 5 Feb 2023 07:04:40 -0300 Message-Id: <20230205100449.2352781-8-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bernhard Beschow The "platform" node is available through data->node, so use that instead of making assumptions about the parent device. Signed-off-by: Bernhard Beschow Reviewed-by: Daniel Henrique Barboza Message-Id: <20230125130024.158721-4-shentey@gmail.com> Signed-off-by: Daniel Henrique Barboza --- hw/ppc/e500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 48288c0b41..e3b29d1d97 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -241,7 +241,7 @@ static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *data) int irq0 = platform_bus_get_irqn(pbus, sbdev, 0); int irq1 = platform_bus_get_irqn(pbus, sbdev, 1); int irq2 = platform_bus_get_irqn(pbus, sbdev, 2); - gchar *node = g_strdup_printf("/platform/ethernet@%"PRIx64, mmio0); + gchar *node = g_strdup_printf("%s/ethernet@%"PRIx64, data->node, mmio0); gchar *group = g_strdup_printf("%s/queue-group", node); void *fdt = data->fdt; From patchwork Sun Feb 5 10:04:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 677C2C636CD for ; Sun, 5 Feb 2023 10:09:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuE-0001pt-Q0; Sun, 05 Feb 2023 05:05:54 -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 1pObtd-00011Z-0d; Sun, 05 Feb 2023 05:05:17 -0500 Received: from mail-oi1-x229.google.com ([2607:f8b0:4864:20::229]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtZ-0005Jz-K2; Sun, 05 Feb 2023 05:05:14 -0500 Received: by mail-oi1-x229.google.com with SMTP id r9so7588720oig.12; Sun, 05 Feb 2023 02:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=J/l5LLpkPmSWg3Y06zvVCIhudPj7GpVJB1dY94JYcyA=; b=kJqe/dNTDEwpW/riQSoodu+YFkc6Vy8zDbizucv0YXWMCqDRY75tQHPKUHd1mv3Ruw kd/UapXFeSTDq7CM40fh7e1GP+CHSYbETFU0o7iLUptFcRCXBK5ja0EtEzV6fB92ChuZ yT0rKwRzbkDOiJKGg7dbyd82H/pLBztbRNgKiFx0YMFhvacZQK3spcYEFiVULFOoD3CK N4RpHBwtADq2L4yC45sG8d4LpUiyswoWuL0kcFFeoWIDZl13nVMP8tMwfEWxzWsTKx70 q9FHRYbxqN4rM4RXCAvANp6hgQk81AMEpyiglkOmqHNifanmUOJnK3ZdI+snMnMjht5V vwww== 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=J/l5LLpkPmSWg3Y06zvVCIhudPj7GpVJB1dY94JYcyA=; b=F8E0I0f3AxYAY7tbq9574jgpgC3rOFic1OuzNxBNJC9QVJAEUn7MnDrxnXMmg+fhq+ Of70yMUnwa7c71VVR9OAL3nHpcc8o/FG7idnj9/hoY/QQYgzvEq8MEsrk6JM5jj8PzEY qSYbreKraQd8J+mK4bbmoSzL9tgy4APSF8DyjdqpuoxgVOoz091cpWFRfpdeAfOmAhnE 7IUbaQrkXNFPH7uxQ+EtQc4fJEbCzxx7gdQRRdajOt4mhWWniwMXPn6tx2HgRL7xTTkD 0AXKLVKK0zfi8NT+lbnOWY6DLIBHK+rGnOiFzNL5woCIL0hMMBOEs7doIGxnKC2ifYaG UPBQ== X-Gm-Message-State: AO0yUKUoppAb3Ye1XUumux7OvYU2Alb0qOfW4XZ33RH+Gm873fX6fIno KUDVwFtDHqeJedrbYPvGRPJJWL85lIM= X-Google-Smtp-Source: AK7set/5akKL2SnMQXq4RagWClilvE15Yppfo4LhVZLWsZl9Lyyyj6hwkbTVIwrUEwL03LDGeZMNvg== X-Received: by 2002:a54:4196:0:b0:37b:1c79:1adc with SMTP id 22-20020a544196000000b0037b1c791adcmr359349oiy.59.1675591511453; Sun, 05 Feb 2023 02:05:11 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:11 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space Date: Sun, 5 Feb 2023 07:04:41 -0300 Message-Id: <20230205100449.2352781-9-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::229; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x229.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bernhard Beschow Makes the unimplemented region move together with the CCSR address space if moved by a bootloader. Moving the CCSR address space isn't implemented yet but this patch is a preparation for it. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230125130024.158721-5-shentey@gmail.com> Signed-off-by: Daniel Henrique Barboza --- hw/ppc/e500.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index e3b29d1d97..117c9c08ed 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1022,9 +1022,13 @@ void ppce500_init(MachineState *machine) /* eSDHC */ if (pmc->has_esdhc) { - create_unimplemented_device("esdhc", - pmc->ccsrbar_base + MPC85XX_ESDHC_REGS_OFFSET, - MPC85XX_ESDHC_REGS_SIZE); + dev = qdev_new(TYPE_UNIMPLEMENTED_DEVICE); + qdev_prop_set_string(dev, "name", "esdhc"); + qdev_prop_set_uint64(dev, "size", MPC85XX_ESDHC_REGS_SIZE); + s = SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); + memory_region_add_subregion(ccsr_addr_space, MPC85XX_ESDHC_REGS_OFFSET, + sysbus_mmio_get_region(s, 0)); /* * Compatible with: From patchwork Sun Feb 5 10:04:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129023 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 93C98C636CD for ; Sun, 5 Feb 2023 10:09:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuC-0001gO-NA; Sun, 05 Feb 2023 05:05:52 -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 1pObte-00013L-7s; Sun, 05 Feb 2023 05:05:18 -0500 Received: from mail-oi1-x232.google.com ([2607:f8b0:4864:20::232]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtb-0005KN-9f; Sun, 05 Feb 2023 05:05:17 -0500 Received: by mail-oi1-x232.google.com with SMTP id j21so7619265oie.4; Sun, 05 Feb 2023 02:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=79IGtA6DQyNywTYzy/kQ6iBsuz9L/1nryFMneINAXEU=; b=Y0F9rBunc7BU7XRtMshIfen/4ttTmIg3UY6uET/Vwl3sGSHM9GAaTdcZunbVrSOCJ8 dDCSiAZHWrlfsHZyjO/HxFGu5yuBkM+Al22EcZs2RJw7yF8thpgmw0WtBMr2LU4HIu2g EoDLFuN+HC3Tsa9300jE6m40Pa1E8jjKE5VgGHWVurOWz3QYtAXFXeMSuQN4TXyG62mq fNUR0Mj/eC20zDwRcf+radp5kZvEtkgKM7XGcuG3aQqmKfkJYfwuq0pI95Gvy8iPG2PA X05kxVhtg64fDDuDk7FQZaay6QB/AjlYN7d9rP5KjWDHRppCC7K8GW8wjDEgoYg3eNng g4aA== 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=79IGtA6DQyNywTYzy/kQ6iBsuz9L/1nryFMneINAXEU=; b=XOLUuTByNCEhRR38v9qs857/xEF98PQ9R/7sxp2OEoQfqajdIAVRrJDjblwcYaRfub w2KIlmlnhmQ346X3Fj6BIDMDbDvCms16e2jNVlmWTCPLcooJOO+80eEg/oR4K9yI2opq aa6MK1PNhX+E3tIvhZFsJ/OPay0ut1nU8nj5bXSpPc3FpmpWZTrsehW/9RCvm29FRFHe tgp99XRnRGPgV6LYeTa8Y/BvVpQMzSH2ZuJdMjOURSCqXau7+RYLL5fkWoZJqMIs91NA bgdIAebmgFdyxKMHZLGu56IONKQt58Ei18CvfF0Pgpk7B7+7k8gWHt7A0c+YhEfcuQRP nBTg== X-Gm-Message-State: AO0yUKU/D0Cd+asmfGoXcclYE6pZirRnR7t9LRivZx6fQviubZW7Wuay f7Y7B73GKhfeEjtinI6RlPxttmke1Bc= X-Google-Smtp-Source: AK7set+vFu/XcFR1xnhA0zZJE8GfLJcSB9/D3XCVYhY+CafyIdPQ5nD4rPpaVxzAkyIz34ovRQuueg== X-Received: by 2002:a05:6808:1b07:b0:36e:cc57:33a3 with SMTP id bx7-20020a0568081b0700b0036ecc5733a3mr9368592oib.22.1675591513662; Sun, 05 Feb 2023 02:05:13 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:13 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Frederic Barrat , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure Date: Sun, 5 Feb 2023 07:04:42 -0300 Message-Id: <20230205100449.2352781-10-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::232; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x232.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Frederic Barrat Remove unused structure member 'system_memory'. Signed-off-by: Frederic Barrat Reviewed-by: Cédric Le Goater Message-Id: <20230127122848.550083-2-fbarrat@linux.ibm.com> Signed-off-by: Daniel Henrique Barboza --- include/hw/pci-host/pnv_phb4.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h index 1f3237c9d5..17aef08f91 100644 --- a/include/hw/pci-host/pnv_phb4.h +++ b/include/hw/pci-host/pnv_phb4.h @@ -173,8 +173,6 @@ struct PnvPhb4PecState { uint32_t index; uint32_t chip_id; - MemoryRegion *system_memory; - /* Nest registers, excuding per-stack */ #define PHB4_PEC_NEST_REGS_COUNT 0xf uint64_t nest_regs[PHB4_PEC_NEST_REGS_COUNT]; From patchwork Sun Feb 5 10:04:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6AC24C636CD for ; Sun, 5 Feb 2023 10:09:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuH-0001ya-0V; Sun, 05 Feb 2023 05:05:57 -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 1pObte-00013q-M6; Sun, 05 Feb 2023 05:05:20 -0500 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtd-0005Kk-7E; Sun, 05 Feb 2023 05:05:18 -0500 Received: by mail-oi1-x230.google.com with SMTP id c15so7453937oic.8; Sun, 05 Feb 2023 02:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=bYC5ezcKQ8Ug4r49X6lfdepBziknoUgrqqLq88u/tJk=; b=T1Ape8A2dor5soh+Tfh06RG4TAzJO7whajPYceAnlPweiO8exqJ0Pejfb0oZ+caqAM ZSgm06a1n8RCkW1Ifkoufec976KVW51qhSIxnhF/kYHWJ902gyA3vP9hJccNhgTH3cG2 VjayTozSpzxapN+/uqwnYYP9mrcZOd5VoYs/oziQ4iJY77HaY67O8aUkvM6V5hM4g8XG yYoONaY5oesizVDA+X9uZA/xchJ/qdadBZvQpA1Q4QwCFLPrvq+naadtwDdsHpkYklAN LFw1auEkeRngVzvZ1ycpVmSL9XNwJoiz25+U6tJ8KuUwGX/UpeUdAkswzqgo/oyokdtz YsfQ== 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=bYC5ezcKQ8Ug4r49X6lfdepBziknoUgrqqLq88u/tJk=; b=IvbOlxfbRisQqkdt8PpCUiSQqj5l+G+9KDQtZAAr1G7ZtjEGC+F69gsXW6RcD4xLbX AdfiQEe95VCNlQt7I3tLq4inyJOPzMey5SmOy5RSjRHRPcxFZrfGyNgRORYZpMQ7COLA 99KPrSqvhrB+H0FA8YEpm0NWtky20YY5wtIHzB2W/GrKgKnqWG9TAiIZd1V5YHBlBCTc qiA3OvflgZvMT/fvjHdWXiwAvk1WslcRtE1WOFC7To2e6IoROMGaIgOsKcrFYFVvyU4g zHj6Yy2lH5BZyE8fbDHzj8R6JObM+WoQYAQkF/msFSccOtSQzNmT3/Ab6JDqE1DFNaBD nZ3Q== X-Gm-Message-State: AO0yUKXKt7FS0NsB/8MymAa7sTGK+T2mF/V7pwzWNuOsWaiBhLv0UEhi xnz55VYvsBNnRAWdlqKngPYTIo+j138= X-Google-Smtp-Source: AK7set8Qtcd3lbZEsmfTPkOuTx1YjvJCem5k/rR8n5dtAaMLWhvnA0cj+wcq0SzIloI3sdzgML+vTg== X-Received: by 2002:a05:6808:ecb:b0:364:d6be:a442 with SMTP id q11-20020a0568080ecb00b00364d6bea442mr8923219oiv.57.1675591515735; Sun, 05 Feb 2023 02:05:15 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:15 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Frederic Barrat , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 10/16] ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID Date: Sun, 5 Feb 2023 07:04:43 -0300 Message-Id: <20230205100449.2352781-11-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::230; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x230.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Frederic Barrat PNV_PHB5_DEVICE_ID is defined in two different headers. The definition in hw/pci-host/pnv_phb4.h was left out in a previous rework. Remaining definition is in hw/pci-host/pnv_phb.h. Signed-off-by: Frederic Barrat Reviewed-by: Cédric Le Goater Message-Id: <20230127122848.550083-3-fbarrat@linux.ibm.com> Signed-off-by: Daniel Henrique Barboza --- include/hw/pci-host/pnv_phb4.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h index 17aef08f91..761525686e 100644 --- a/include/hw/pci-host/pnv_phb4.h +++ b/include/hw/pci-host/pnv_phb4.h @@ -215,7 +215,6 @@ struct PnvPhb4PecClass { OBJECT_CHECK(PnvPhb4, (obj), TYPE_PNV_PHB5) #define PNV_PHB5_VERSION 0x000000a500000001ull -#define PNV_PHB5_DEVICE_ID 0x0652 #define TYPE_PNV_PHB5_PEC "pnv-phb5-pec" #define PNV_PHB5_PEC(obj) \ From patchwork Sun Feb 5 10:04:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129014 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 5AA6FC63797 for ; Sun, 5 Feb 2023 10:06:57 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuF-0001rj-Hw; Sun, 05 Feb 2023 05:05:55 -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 1pObtg-000143-Co; Sun, 05 Feb 2023 05:05:20 -0500 Received: from mail-oi1-x22b.google.com ([2607:f8b0:4864:20::22b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObte-00057i-VF; Sun, 05 Feb 2023 05:05:20 -0500 Received: by mail-oi1-x22b.google.com with SMTP id r28so7620036oiw.3; Sun, 05 Feb 2023 02:05:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=ZUkjxFctZTc2l6rAO74466Igw8QaYm6+knXc6Rb2k4g=; b=h8O24DC1xfZC8m6HsHg6vKjHnveoQNWk25z0x5TWJ6YZc0tb+ezKGGCRs+Tuzfhr9a lUF2zwFvoOUH2So8afy4HVFyctn1cL7hZVTqbQ4KPXBIPJGma8aAcWyU3Eni+UTMf1T1 2tj7ppxh1PWlFCkl5cfZtfPub+yNqL+WC20tdQzcr1pwt8WTtxnyD9gLjam8Y6MRlLQZ Tozkq86jkbclNRazcLEfOnlP+QCQFhCTt111Z+qpRC92vykdT/Lj1A1K9PEu73xBjIin kg7NAIC3ValAIoumHyWCSbPzySGOM+uOI/6gnghQwygk1VPB0rukLnqWFRGp++tCmB82 sBLg== 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=ZUkjxFctZTc2l6rAO74466Igw8QaYm6+knXc6Rb2k4g=; b=zgtrRdsHT3rgu98mHzqK0Z+elaf0l23iaHRdIGU9xOXU5mUEn7LXSXG60l74Bjj9E1 8SWNCrpcqiVXM8HRi9eeef/PMiDuLIR3+wsOauevPcTFjAhekocWBViAAJqTlvuY5vVz ukaSqCMLqpANDAgw3NDBXyWDE3DZupEjKbkMeA7HBMnqpCDWUQsr+npTSqX+bpy1rcSt l7ip/hgHsVJcEFwC/eMljEhXBPnVp9/v5y0ajBSUhEIV9cFjPdbDUAzn+CRuldHXqiMK KjlBQjfYOK/64/bCwIX+MSncgPJv3KT1P021150rkncNxwj+hLBMYemHBDxS9Yai2isy M5Fw== X-Gm-Message-State: AO0yUKXvhYrv6wzaq2Er36vo941u6EqlVIXGu9TumJqHk4i0uBXkTJgc k14/UVK41amkZHL34Z5Sc05irQn94bw= X-Google-Smtp-Source: AK7set8Aowwnk4aSI9A3TWk9rCdJ5I9FliirhED/lrIMmjWYnXie7DDIoCu+lXAYlUeKqUnl3pP1Ow== X-Received: by 2002:a54:4509:0:b0:378:57fc:c63e with SMTP id l9-20020a544509000000b0037857fcc63emr7482216oil.17.1675591517807; Sun, 05 Feb 2023 02:05:17 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:17 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Frederic Barrat , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 11/16] ppc/pnv/pci: Update PHB5 version register Date: Sun, 5 Feb 2023 07:04:44 -0300 Message-Id: <20230205100449.2352781-12-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22b.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Frederic Barrat Update register value per its P10 DD2 definition. Signed-off-by: Frederic Barrat Reviewed-by: Cédric Le Goater Message-Id: <20230127122848.550083-4-fbarrat@linux.ibm.com> Signed-off-by: Daniel Henrique Barboza --- include/hw/pci-host/pnv_phb4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h index 761525686e..28d61b96c7 100644 --- a/include/hw/pci-host/pnv_phb4.h +++ b/include/hw/pci-host/pnv_phb4.h @@ -214,7 +214,7 @@ struct PnvPhb4PecClass { #define PNV_PHB5(obj) \ OBJECT_CHECK(PnvPhb4, (obj), TYPE_PNV_PHB5) -#define PNV_PHB5_VERSION 0x000000a500000001ull +#define PNV_PHB5_VERSION 0x000000a500000002ull #define TYPE_PNV_PHB5_PEC "pnv-phb5-pec" #define PNV_PHB5_PEC(obj) \ From patchwork Sun Feb 5 10:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129013 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4836DC636D3 for ; Sun, 5 Feb 2023 10:06:57 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuB-0001bu-6T; Sun, 05 Feb 2023 05:05:51 -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 1pObtk-00016R-Hx; Sun, 05 Feb 2023 05:05:34 -0500 Received: from mail-oi1-x235.google.com ([2607:f8b0:4864:20::235]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObti-0005Nm-IL; Sun, 05 Feb 2023 05:05:23 -0500 Received: by mail-oi1-x235.google.com with SMTP id s66so7609823oib.7; Sun, 05 Feb 2023 02:05:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=sxuS5pblADF2zAslUcqpRrTAA9fU7BxkRz9/gcJGFo4=; b=Gk2JKQI3UptqtYfxuzkkV/o9ps7PcQot9uqwz6saDKvVwtUpnnmzFgxY9kD6RPQDdJ YPZvGHQOw7ntesINPy+t1QoQLnY32QUsNsiV+XQp9aJyc3u7CaRDwtDy5OwSO+3VSAii vAn4DvpkQqm/wqP8zlbncwMSbek/uOKgh7SHzeH84I++4jUxv6vKhb9Mgyplf/stiAFs vW/TZk+FJ80eU/f3EnQqGWiRhhDzgUS0TzypCYdhzL9JU6eao+OCBvhhRRQi5TNd6ob3 u/XalkN4ZWJsBLXUQ9nSlzrPsiSW2v+vCrTsv8z0ACaYZIqK4bG1fMTS6/HN6pDM0ANT 8T8A== 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=sxuS5pblADF2zAslUcqpRrTAA9fU7BxkRz9/gcJGFo4=; b=RnSb0YMgZ5T0MzKx4l+ZttBiHLXh6/7yIz1EEPAZTzgWT0oaZniN8L/Fq5wGv5r+P7 UReJp1sWQtuvylWakv93MYzQWIviR/bi8csKKMYO2dYt4GcMaig8gTzWsM5B/aCOZyBv 5zC8x78XksIpbGF/uFxYUAwws8Xv1uiQfqEuJ5dzK9cipgh2oDR68/y5gtAGsf8kuqUr lqei6vt98f838ClRTZA8NfJoCnhtb1Fog1uRfsacA/t+n4afXYjRavHM/chNk40+9h+q zsnEERDygdd7Pz/SGmCvV7tVdfAoUzvmaORxee1M7thNvtJhU+IdYgJmC4nqcT4BSQU+ uCtQ== X-Gm-Message-State: AO0yUKXbF+zqcFflPR0/zq5CC5uBAUj+0nOtyXNoGoUJXrJ0hI1mw/r5 Mtd826WqmndrzCmWZz/7L4MTVf02EFs= X-Google-Smtp-Source: AK7set8b4kx1RGRIFZAtOffIsuEBf26vAmTi3HfV2de0xau+gZZXSS5SmpgxW2XgNMQ/BV3kO7X2zw== X-Received: by 2002:a05:6808:1307:b0:378:84aa:1c20 with SMTP id y7-20020a056808130700b0037884aa1c20mr10348154oiv.45.1675591520011; Sun, 05 Feb 2023 02:05:20 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:19 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, Frederic Barrat , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name Date: Sun, 5 Feb 2023 07:04:45 -0300 Message-Id: <20230205100449.2352781-13-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::235; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x235.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Frederic Barrat The name is for the region mapping the PHB xscom registers. It was apparently a bad cut-and-paste from the per-stack pci xscom area just above, so we had two regions with the same name. Signed-off-by: Frederic Barrat Reviewed-by: Cédric Le Goater Message-Id: <20230127122848.550083-5-fbarrat@linux.ibm.com> Signed-off-by: Daniel Henrique Barboza --- hw/pci-host/pnv_phb4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c index ccbde841fc..542f9e2932 100644 --- a/hw/pci-host/pnv_phb4.c +++ b/hw/pci-host/pnv_phb4.c @@ -1497,7 +1497,7 @@ static void pnv_phb4_xscom_realize(PnvPHB4 *phb) PHB4_PEC_PCI_STK_REGS_COUNT); /* PHB pass-through */ - snprintf(name, sizeof(name), "xscom-pec-%d.%d-pci-phb-%d", + snprintf(name, sizeof(name), "xscom-pec-%d.%d-phb-%d", pec->chip_id, pec->index, stack_no); pnv_xscom_region_init(&phb->phb_regs_mr, OBJECT(phb), &pnv_phb4_xscom_ops, phb, name, 0x40); From patchwork Sun Feb 5 10:04:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8EF69C636CC for ; Sun, 5 Feb 2023 10:06:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObu9-0001SZ-9S; Sun, 05 Feb 2023 05:05:49 -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 1pObtm-00016n-62; Sun, 05 Feb 2023 05:05:34 -0500 Received: from mail-oi1-x236.google.com ([2607:f8b0:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtk-00057T-K9; Sun, 05 Feb 2023 05:05:25 -0500 Received: by mail-oi1-x236.google.com with SMTP id t5so87463oiw.1; Sun, 05 Feb 2023 02:05:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=xZn7pB0RqnoyOz/E+AIEjOi8jAKEYAUvIieETqATAJU=; b=e2dzG9GzecEjuaIO3chmFukBUSB6sVxEPB5YwXSDffEvT2449JUnwuWSwFzzURFc2L LXguCmHZ7Ff7JyjE9+66ZoY08i6GrpEUeyRXcbIYHFVNe34z16+iXgFkTfrM27gPQhBl EsJSBnDv0yKXl8X9uKyE1B8tBzmqYmJfDI0PVioOneaffngTMJo2ErukBWej7iQ9QDsa mO/LLhSBsGZQTcagD843YKYaRy8SgJZOc9QGc8t6hFMx7rt5cVlTjiuwax9OF8jz6ZTk aR62Ol0RN0Oq+BaHck1vdUFz5cyZUKAzSokn+JzCjOoSWCBuHjIvy6S0C2eioiHKnFDq LBzw== 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=xZn7pB0RqnoyOz/E+AIEjOi8jAKEYAUvIieETqATAJU=; b=Bkrm1koMHbxESAbJ7P0Qaoctme2lNmsza5zU2GkzPwzkLVHGEysf36pFJ/VYv2M5sl nZ0mcM6e4ztoBYMYxkNmb++61wvjTqiFyW+bdI9VeJO/OicGwAd/FtCwAyuPe4h/a8Ev rpp+DEd4hNFXZaqZwlGN0GrehSIL0VWTmsHNrGBNh6J47tWp4Z+h94hI6dC+DPYpIE59 Lz2caMY+o2e43dA3BhOrjr/l6c8GI5jrDuM2H90Wkj69OC8OOPgWeez8Dw98MDJbZ/hB YqBFW2topnzUAOywIWLv3JEDhHqnOXF/3d9HCK35B+wvyZ1uN+xMepWYwl3Za+y1t9iR ehRw== X-Gm-Message-State: AO0yUKU0dytJk7ATKXyS/Fv+AlrH59ggDh/R1YEfc2NtU3GBdUEy2g0U f90lHN7GiKBgIxOgl6M7+w5cGmWgiN4= X-Google-Smtp-Source: AK7set89NqzsEekf6XpGGvlVfGDA0Usl2tHP7DNxsZeTT4rKfgPdyqiZdvuVGDmnEgM75D/vx0GBfg== X-Received: by 2002:a05:6808:19a4:b0:378:3c84:9db2 with SMTP id bj36-20020a05680819a400b003783c849db2mr9914829oib.13.1675591522402; Sun, 05 Feb 2023 02:05:22 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:22 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, BALATON Zoltan , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment Date: Sun, 5 Feb 2023 07:04:46 -0300 Message-Id: <20230205100449.2352781-14-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::236; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x236.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: BALATON Zoltan Reported-by: Stefan Weil Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230203194312.33834745712@zero.eik.bme.hu> Signed-off-by: Daniel Henrique Barboza --- hw/ppc/pegasos2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 1a13632ba6..a9563f4fb2 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -564,7 +564,7 @@ static void dt_isa(PCIBus *bus, PCIDevice *d, FDTInfo *fi) qemu_fdt_setprop_string(fi->fdt, fi->path, "device_type", "isa"); qemu_fdt_setprop_string(fi->fdt, fi->path, "name", "isa"); - /* addional devices */ + /* additional devices */ g_string_printf(name, "%s/lpt@i3bc", fi->path); qemu_fdt_add_subnode(fi->fdt, name->str); qemu_fdt_setprop_cell(fi->fdt, name->str, "clock-frequency", 0); From patchwork Sun Feb 5 10:04:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129020 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 468C9C636CC for ; Sun, 5 Feb 2023 10:09:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuC-0001go-Rm; Sun, 05 Feb 2023 05:05:52 -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 1pObtp-00017j-Sb; Sun, 05 Feb 2023 05:05:36 -0500 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtm-0005JZ-9R; Sun, 05 Feb 2023 05:05:28 -0500 Received: by mail-oi1-x22e.google.com with SMTP id 20so6837503oix.5; Sun, 05 Feb 2023 02:05:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=c1R9zr0q+uRKbES0pn4fKFWQfEEy/QYGMZ5oIYwsvzk=; b=pFUEKO34HpwBHOWBA4+lDlOAJDNWQuYtHtnpA5aVsh8ulc9Ombamxwdp67z7CD1hsO WKmYZ3GKV0oycXgwy74xgrsqOqUJLKYEpUaANYwkxp4Cr8pCAIi4m1BtJf/mcNy1lmQV CMIlqOyHU4lMDr8K0admwNL1kLDjMqeAc4UYPhMvKE+Fj0+ZhI9VyKXkJlAILarAsQdu E1QFjAOAdDlHmb+pOYW0jypoRB8PRdrrKUUZMhierUh4WyVVc7Gq2inPptK2mcX33U+Z +w61ayh++DH6soU+84d4MD0u5p3BHDeL0lWzQjRfmSIeRhJgshAfD0i6U6XE5BGV2Z7j 6JDA== 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=c1R9zr0q+uRKbES0pn4fKFWQfEEy/QYGMZ5oIYwsvzk=; b=M5t2V5oCXO+/ttKrpfam+B/zRJobcixKFFs7MBILNN13VkdLvj/I9ZAa1OK0A+WHpv EO0wDbHiPABcTyphKCI2fX4+S3wPN9Fp/eESE6wIEoYCkvsCtjQCfYoBIjMIVMz+fVnI YOp4f5lWFUYpF1wWT6B3SxBI/s6KPWwTVxZevxPTjPTfhvMtPRDxi8lywqN2CH2x+ZCS YWbdtP7gNLLhsG1VO7sYS7XNpIeK3/e3tEqcwjVknut49Zf3+S6F5IkdHVkdmk5MwRnk YmAYciBYcguipohRVg+1ZdpJtb02ASHuGI3ywhxK7dMx9DKKgdwg4DiaHylEM0lcAZQg MdKw== X-Gm-Message-State: AO0yUKVndOIMOL1cy68+GHYEgsJbxBCNurSXCFeAAjzNanO86xKU9nDV CqSxLD/M9QlJcbDBaSAosERA2Y90Bjg= X-Google-Smtp-Source: AK7set8/30tagWF8SS8v2Kl/skWyLLpQsvYWsqwuJiX4Ux4PzL/EAz8t8krbkg46x0EWR6+jXJjrtw== X-Received: by 2002:aca:916:0:b0:36d:e19d:158 with SMTP id 22-20020aca0916000000b0036de19d0158mr6732262oij.59.1675591524533; Sun, 05 Feb 2023 02:05:24 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:24 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions Date: Sun, 5 Feb 2023 07:04:47 -0300 Message-Id: <20230205100449.2352781-15-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: BALATON Zoltan No need to wrap constants in parenthesis. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-Id: <9194546b73b05e7098761ec62b2dfd0699b97b65.1674333199.git.balaton@eik.bme.hu> Signed-off-by: Daniel Henrique Barboza --- hw/display/sm501.c | 394 ++++++++++++++++++++++----------------------- 1 file changed, 197 insertions(+), 197 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 52e42585af..0cbd1fecd5 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -50,10 +50,10 @@ /* System Configuration area */ /* System config base */ -#define SM501_SYS_CONFIG (0x000000) +#define SM501_SYS_CONFIG 0x000000 /* config 1 */ -#define SM501_SYSTEM_CONTROL (0x000000) +#define SM501_SYSTEM_CONTROL 0x000000 #define SM501_SYSCTRL_PANEL_TRISTATE (1 << 0) #define SM501_SYSCTRL_MEM_TRISTATE (1 << 1) @@ -72,13 +72,13 @@ /* miscellaneous control */ -#define SM501_MISC_CONTROL (0x000004) +#define SM501_MISC_CONTROL 0x000004 -#define SM501_MISC_BUS_SH (0x0) -#define SM501_MISC_BUS_PCI (0x1) -#define SM501_MISC_BUS_XSCALE (0x2) -#define SM501_MISC_BUS_NEC (0x6) -#define SM501_MISC_BUS_MASK (0x7) +#define SM501_MISC_BUS_SH 0x0 +#define SM501_MISC_BUS_PCI 0x1 +#define SM501_MISC_BUS_XSCALE 0x2 +#define SM501_MISC_BUS_NEC 0x6 +#define SM501_MISC_BUS_MASK 0x7 #define SM501_MISC_VR_62MB (1 << 3) #define SM501_MISC_CDR_RESET (1 << 7) @@ -103,22 +103,22 @@ -#define SM501_GPIO31_0_CONTROL (0x000008) -#define SM501_GPIO63_32_CONTROL (0x00000C) -#define SM501_DRAM_CONTROL (0x000010) +#define SM501_GPIO31_0_CONTROL 0x000008 +#define SM501_GPIO63_32_CONTROL 0x00000C +#define SM501_DRAM_CONTROL 0x000010 /* command list */ -#define SM501_ARBTRTN_CONTROL (0x000014) +#define SM501_ARBTRTN_CONTROL 0x000014 /* command list */ -#define SM501_COMMAND_LIST_STATUS (0x000024) +#define SM501_COMMAND_LIST_STATUS 0x000024 /* interrupt debug */ -#define SM501_RAW_IRQ_STATUS (0x000028) -#define SM501_RAW_IRQ_CLEAR (0x000028) -#define SM501_IRQ_STATUS (0x00002C) -#define SM501_IRQ_MASK (0x000030) -#define SM501_DEBUG_CONTROL (0x000034) +#define SM501_RAW_IRQ_STATUS 0x000028 +#define SM501_RAW_IRQ_CLEAR 0x000028 +#define SM501_IRQ_STATUS 0x00002C +#define SM501_IRQ_MASK 0x000030 +#define SM501_DEBUG_CONTROL 0x000034 /* power management */ #define SM501_POWERMODE_P2X_SRC (1 << 29) @@ -126,74 +126,74 @@ #define SM501_POWERMODE_M_SRC (1 << 12) #define SM501_POWERMODE_M1_SRC (1 << 4) -#define SM501_CURRENT_GATE (0x000038) -#define SM501_CURRENT_CLOCK (0x00003C) -#define SM501_POWER_MODE_0_GATE (0x000040) -#define SM501_POWER_MODE_0_CLOCK (0x000044) -#define SM501_POWER_MODE_1_GATE (0x000048) -#define SM501_POWER_MODE_1_CLOCK (0x00004C) -#define SM501_SLEEP_MODE_GATE (0x000050) -#define SM501_POWER_MODE_CONTROL (0x000054) +#define SM501_CURRENT_GATE 0x000038 +#define SM501_CURRENT_CLOCK 0x00003C +#define SM501_POWER_MODE_0_GATE 0x000040 +#define SM501_POWER_MODE_0_CLOCK 0x000044 +#define SM501_POWER_MODE_1_GATE 0x000048 +#define SM501_POWER_MODE_1_CLOCK 0x00004C +#define SM501_SLEEP_MODE_GATE 0x000050 +#define SM501_POWER_MODE_CONTROL 0x000054 /* power gates for units within the 501 */ -#define SM501_GATE_HOST (0) -#define SM501_GATE_MEMORY (1) -#define SM501_GATE_DISPLAY (2) -#define SM501_GATE_2D_ENGINE (3) -#define SM501_GATE_CSC (4) -#define SM501_GATE_ZVPORT (5) -#define SM501_GATE_GPIO (6) -#define SM501_GATE_UART0 (7) -#define SM501_GATE_UART1 (8) -#define SM501_GATE_SSP (10) -#define SM501_GATE_USB_HOST (11) -#define SM501_GATE_USB_GADGET (12) -#define SM501_GATE_UCONTROLLER (17) -#define SM501_GATE_AC97 (18) +#define SM501_GATE_HOST 0 +#define SM501_GATE_MEMORY 1 +#define SM501_GATE_DISPLAY 2 +#define SM501_GATE_2D_ENGINE 3 +#define SM501_GATE_CSC 4 +#define SM501_GATE_ZVPORT 5 +#define SM501_GATE_GPIO 6 +#define SM501_GATE_UART0 7 +#define SM501_GATE_UART1 8 +#define SM501_GATE_SSP 10 +#define SM501_GATE_USB_HOST 11 +#define SM501_GATE_USB_GADGET 12 +#define SM501_GATE_UCONTROLLER 17 +#define SM501_GATE_AC97 18 /* panel clock */ -#define SM501_CLOCK_P2XCLK (24) +#define SM501_CLOCK_P2XCLK 24 /* crt clock */ -#define SM501_CLOCK_V2XCLK (16) +#define SM501_CLOCK_V2XCLK 16 /* main clock */ -#define SM501_CLOCK_MCLK (8) +#define SM501_CLOCK_MCLK 8 /* SDRAM controller clock */ -#define SM501_CLOCK_M1XCLK (0) +#define SM501_CLOCK_M1XCLK 0 /* config 2 */ -#define SM501_PCI_MASTER_BASE (0x000058) -#define SM501_ENDIAN_CONTROL (0x00005C) -#define SM501_DEVICEID (0x000060) +#define SM501_PCI_MASTER_BASE 0x000058 +#define SM501_ENDIAN_CONTROL 0x00005C +#define SM501_DEVICEID 0x000060 /* 0x050100A0 */ -#define SM501_DEVICEID_SM501 (0x05010000) -#define SM501_DEVICEID_IDMASK (0xffff0000) -#define SM501_DEVICEID_REVMASK (0x000000ff) +#define SM501_DEVICEID_SM501 0x05010000 +#define SM501_DEVICEID_IDMASK 0xffff0000 +#define SM501_DEVICEID_REVMASK 0x000000ff -#define SM501_PLLCLOCK_COUNT (0x000064) -#define SM501_MISC_TIMING (0x000068) -#define SM501_CURRENT_SDRAM_CLOCK (0x00006C) +#define SM501_PLLCLOCK_COUNT 0x000064 +#define SM501_MISC_TIMING 0x000068 +#define SM501_CURRENT_SDRAM_CLOCK 0x00006C -#define SM501_PROGRAMMABLE_PLL_CONTROL (0x000074) +#define SM501_PROGRAMMABLE_PLL_CONTROL 0x000074 /* GPIO base */ -#define SM501_GPIO (0x010000) -#define SM501_GPIO_DATA_LOW (0x00) -#define SM501_GPIO_DATA_HIGH (0x04) -#define SM501_GPIO_DDR_LOW (0x08) -#define SM501_GPIO_DDR_HIGH (0x0C) -#define SM501_GPIO_IRQ_SETUP (0x10) -#define SM501_GPIO_IRQ_STATUS (0x14) -#define SM501_GPIO_IRQ_RESET (0x14) +#define SM501_GPIO 0x010000 +#define SM501_GPIO_DATA_LOW 0x00 +#define SM501_GPIO_DATA_HIGH 0x04 +#define SM501_GPIO_DDR_LOW 0x08 +#define SM501_GPIO_DDR_HIGH 0x0C +#define SM501_GPIO_IRQ_SETUP 0x10 +#define SM501_GPIO_IRQ_STATUS 0x14 +#define SM501_GPIO_IRQ_RESET 0x14 /* I2C controller base */ -#define SM501_I2C (0x010040) -#define SM501_I2C_BYTE_COUNT (0x00) -#define SM501_I2C_CONTROL (0x01) -#define SM501_I2C_STATUS (0x02) -#define SM501_I2C_RESET (0x02) -#define SM501_I2C_SLAVE_ADDRESS (0x03) -#define SM501_I2C_DATA (0x04) +#define SM501_I2C 0x010040 +#define SM501_I2C_BYTE_COUNT 0x00 +#define SM501_I2C_CONTROL 0x01 +#define SM501_I2C_STATUS 0x02 +#define SM501_I2C_RESET 0x02 +#define SM501_I2C_SLAVE_ADDRESS 0x03 +#define SM501_I2C_DATA 0x04 #define SM501_I2C_CONTROL_START (1 << 2) #define SM501_I2C_CONTROL_ENABLE (1 << 0) @@ -204,25 +204,25 @@ #define SM501_I2C_RESET_ERROR (1 << 2) /* SSP base */ -#define SM501_SSP (0x020000) +#define SM501_SSP 0x020000 /* Uart 0 base */ -#define SM501_UART0 (0x030000) +#define SM501_UART0 0x030000 /* Uart 1 base */ -#define SM501_UART1 (0x030020) +#define SM501_UART1 0x030020 /* USB host port base */ -#define SM501_USB_HOST (0x040000) +#define SM501_USB_HOST 0x040000 /* USB slave/gadget base */ -#define SM501_USB_GADGET (0x060000) +#define SM501_USB_GADGET 0x060000 /* USB slave/gadget data port base */ -#define SM501_USB_GADGET_DATA (0x070000) +#define SM501_USB_GADGET_DATA 0x070000 /* Display controller/video engine base */ -#define SM501_DC (0x080000) +#define SM501_DC 0x080000 /* common defines for the SM501 address registers */ #define SM501_ADDR_FLIP (1 << 31) @@ -237,12 +237,12 @@ #define SM501_FIFO_11 (0x3 << 16) /* common registers for panel and the crt */ -#define SM501_OFF_DC_H_TOT (0x000) -#define SM501_OFF_DC_V_TOT (0x008) -#define SM501_OFF_DC_H_SYNC (0x004) -#define SM501_OFF_DC_V_SYNC (0x00C) +#define SM501_OFF_DC_H_TOT 0x000 +#define SM501_OFF_DC_V_TOT 0x008 +#define SM501_OFF_DC_H_SYNC 0x004 +#define SM501_OFF_DC_V_SYNC 0x00C -#define SM501_DC_PANEL_CONTROL (0x000) +#define SM501_DC_PANEL_CONTROL 0x000 #define SM501_DC_PANEL_CONTROL_FPEN (1 << 27) #define SM501_DC_PANEL_CONTROL_BIAS (1 << 26) @@ -277,65 +277,65 @@ #define SM501_DC_PANEL_CONTROL_32BPP (2 << 0) -#define SM501_DC_PANEL_PANNING_CONTROL (0x004) -#define SM501_DC_PANEL_COLOR_KEY (0x008) -#define SM501_DC_PANEL_FB_ADDR (0x00C) -#define SM501_DC_PANEL_FB_OFFSET (0x010) -#define SM501_DC_PANEL_FB_WIDTH (0x014) -#define SM501_DC_PANEL_FB_HEIGHT (0x018) -#define SM501_DC_PANEL_TL_LOC (0x01C) -#define SM501_DC_PANEL_BR_LOC (0x020) -#define SM501_DC_PANEL_H_TOT (0x024) -#define SM501_DC_PANEL_H_SYNC (0x028) -#define SM501_DC_PANEL_V_TOT (0x02C) -#define SM501_DC_PANEL_V_SYNC (0x030) -#define SM501_DC_PANEL_CUR_LINE (0x034) - -#define SM501_DC_VIDEO_CONTROL (0x040) -#define SM501_DC_VIDEO_FB0_ADDR (0x044) -#define SM501_DC_VIDEO_FB_WIDTH (0x048) -#define SM501_DC_VIDEO_FB0_LAST_ADDR (0x04C) -#define SM501_DC_VIDEO_TL_LOC (0x050) -#define SM501_DC_VIDEO_BR_LOC (0x054) -#define SM501_DC_VIDEO_SCALE (0x058) -#define SM501_DC_VIDEO_INIT_SCALE (0x05C) -#define SM501_DC_VIDEO_YUV_CONSTANTS (0x060) -#define SM501_DC_VIDEO_FB1_ADDR (0x064) -#define SM501_DC_VIDEO_FB1_LAST_ADDR (0x068) - -#define SM501_DC_VIDEO_ALPHA_CONTROL (0x080) -#define SM501_DC_VIDEO_ALPHA_FB_ADDR (0x084) -#define SM501_DC_VIDEO_ALPHA_FB_OFFSET (0x088) -#define SM501_DC_VIDEO_ALPHA_FB_LAST_ADDR (0x08C) -#define SM501_DC_VIDEO_ALPHA_TL_LOC (0x090) -#define SM501_DC_VIDEO_ALPHA_BR_LOC (0x094) -#define SM501_DC_VIDEO_ALPHA_SCALE (0x098) -#define SM501_DC_VIDEO_ALPHA_INIT_SCALE (0x09C) -#define SM501_DC_VIDEO_ALPHA_CHROMA_KEY (0x0A0) -#define SM501_DC_VIDEO_ALPHA_COLOR_LOOKUP (0x0A4) - -#define SM501_DC_PANEL_HWC_BASE (0x0F0) -#define SM501_DC_PANEL_HWC_ADDR (0x0F0) -#define SM501_DC_PANEL_HWC_LOC (0x0F4) -#define SM501_DC_PANEL_HWC_COLOR_1_2 (0x0F8) -#define SM501_DC_PANEL_HWC_COLOR_3 (0x0FC) +#define SM501_DC_PANEL_PANNING_CONTROL 0x004 +#define SM501_DC_PANEL_COLOR_KEY 0x008 +#define SM501_DC_PANEL_FB_ADDR 0x00C +#define SM501_DC_PANEL_FB_OFFSET 0x010 +#define SM501_DC_PANEL_FB_WIDTH 0x014 +#define SM501_DC_PANEL_FB_HEIGHT 0x018 +#define SM501_DC_PANEL_TL_LOC 0x01C +#define SM501_DC_PANEL_BR_LOC 0x020 +#define SM501_DC_PANEL_H_TOT 0x024 +#define SM501_DC_PANEL_H_SYNC 0x028 +#define SM501_DC_PANEL_V_TOT 0x02C +#define SM501_DC_PANEL_V_SYNC 0x030 +#define SM501_DC_PANEL_CUR_LINE 0x034 + +#define SM501_DC_VIDEO_CONTROL 0x040 +#define SM501_DC_VIDEO_FB0_ADDR 0x044 +#define SM501_DC_VIDEO_FB_WIDTH 0x048 +#define SM501_DC_VIDEO_FB0_LAST_ADDR 0x04C +#define SM501_DC_VIDEO_TL_LOC 0x050 +#define SM501_DC_VIDEO_BR_LOC 0x054 +#define SM501_DC_VIDEO_SCALE 0x058 +#define SM501_DC_VIDEO_INIT_SCALE 0x05C +#define SM501_DC_VIDEO_YUV_CONSTANTS 0x060 +#define SM501_DC_VIDEO_FB1_ADDR 0x064 +#define SM501_DC_VIDEO_FB1_LAST_ADDR 0x068 + +#define SM501_DC_VIDEO_ALPHA_CONTROL 0x080 +#define SM501_DC_VIDEO_ALPHA_FB_ADDR 0x084 +#define SM501_DC_VIDEO_ALPHA_FB_OFFSET 0x088 +#define SM501_DC_VIDEO_ALPHA_FB_LAST_ADDR 0x08C +#define SM501_DC_VIDEO_ALPHA_TL_LOC 0x090 +#define SM501_DC_VIDEO_ALPHA_BR_LOC 0x094 +#define SM501_DC_VIDEO_ALPHA_SCALE 0x098 +#define SM501_DC_VIDEO_ALPHA_INIT_SCALE 0x09C +#define SM501_DC_VIDEO_ALPHA_CHROMA_KEY 0x0A0 +#define SM501_DC_VIDEO_ALPHA_COLOR_LOOKUP 0x0A4 + +#define SM501_DC_PANEL_HWC_BASE 0x0F0 +#define SM501_DC_PANEL_HWC_ADDR 0x0F0 +#define SM501_DC_PANEL_HWC_LOC 0x0F4 +#define SM501_DC_PANEL_HWC_COLOR_1_2 0x0F8 +#define SM501_DC_PANEL_HWC_COLOR_3 0x0FC #define SM501_HWC_EN (1 << 31) -#define SM501_OFF_HWC_ADDR (0x00) -#define SM501_OFF_HWC_LOC (0x04) -#define SM501_OFF_HWC_COLOR_1_2 (0x08) -#define SM501_OFF_HWC_COLOR_3 (0x0C) +#define SM501_OFF_HWC_ADDR 0x00 +#define SM501_OFF_HWC_LOC 0x04 +#define SM501_OFF_HWC_COLOR_1_2 0x08 +#define SM501_OFF_HWC_COLOR_3 0x0C -#define SM501_DC_ALPHA_CONTROL (0x100) -#define SM501_DC_ALPHA_FB_ADDR (0x104) -#define SM501_DC_ALPHA_FB_OFFSET (0x108) -#define SM501_DC_ALPHA_TL_LOC (0x10C) -#define SM501_DC_ALPHA_BR_LOC (0x110) -#define SM501_DC_ALPHA_CHROMA_KEY (0x114) -#define SM501_DC_ALPHA_COLOR_LOOKUP (0x118) +#define SM501_DC_ALPHA_CONTROL 0x100 +#define SM501_DC_ALPHA_FB_ADDR 0x104 +#define SM501_DC_ALPHA_FB_OFFSET 0x108 +#define SM501_DC_ALPHA_TL_LOC 0x10C +#define SM501_DC_ALPHA_BR_LOC 0x110 +#define SM501_DC_ALPHA_CHROMA_KEY 0x114 +#define SM501_DC_ALPHA_COLOR_LOOKUP 0x118 -#define SM501_DC_CRT_CONTROL (0x200) +#define SM501_DC_CRT_CONTROL 0x200 #define SM501_DC_CRT_CONTROL_TVP (1 << 15) #define SM501_DC_CRT_CONTROL_CP (1 << 14) @@ -353,89 +353,89 @@ #define SM501_DC_CRT_CONTROL_16BPP (1 << 0) #define SM501_DC_CRT_CONTROL_32BPP (2 << 0) -#define SM501_DC_CRT_FB_ADDR (0x204) -#define SM501_DC_CRT_FB_OFFSET (0x208) -#define SM501_DC_CRT_H_TOT (0x20C) -#define SM501_DC_CRT_H_SYNC (0x210) -#define SM501_DC_CRT_V_TOT (0x214) -#define SM501_DC_CRT_V_SYNC (0x218) -#define SM501_DC_CRT_SIGNATURE_ANALYZER (0x21C) -#define SM501_DC_CRT_CUR_LINE (0x220) -#define SM501_DC_CRT_MONITOR_DETECT (0x224) +#define SM501_DC_CRT_FB_ADDR 0x204 +#define SM501_DC_CRT_FB_OFFSET 0x208 +#define SM501_DC_CRT_H_TOT 0x20C +#define SM501_DC_CRT_H_SYNC 0x210 +#define SM501_DC_CRT_V_TOT 0x214 +#define SM501_DC_CRT_V_SYNC 0x218 +#define SM501_DC_CRT_SIGNATURE_ANALYZER 0x21C +#define SM501_DC_CRT_CUR_LINE 0x220 +#define SM501_DC_CRT_MONITOR_DETECT 0x224 -#define SM501_DC_CRT_HWC_BASE (0x230) -#define SM501_DC_CRT_HWC_ADDR (0x230) -#define SM501_DC_CRT_HWC_LOC (0x234) -#define SM501_DC_CRT_HWC_COLOR_1_2 (0x238) -#define SM501_DC_CRT_HWC_COLOR_3 (0x23C) +#define SM501_DC_CRT_HWC_BASE 0x230 +#define SM501_DC_CRT_HWC_ADDR 0x230 +#define SM501_DC_CRT_HWC_LOC 0x234 +#define SM501_DC_CRT_HWC_COLOR_1_2 0x238 +#define SM501_DC_CRT_HWC_COLOR_3 0x23C -#define SM501_DC_PANEL_PALETTE (0x400) +#define SM501_DC_PANEL_PALETTE 0x400 -#define SM501_DC_VIDEO_PALETTE (0x800) +#define SM501_DC_VIDEO_PALETTE 0x800 -#define SM501_DC_CRT_PALETTE (0xC00) +#define SM501_DC_CRT_PALETTE 0xC00 /* Zoom Video port base */ -#define SM501_ZVPORT (0x090000) +#define SM501_ZVPORT 0x090000 /* AC97/I2S base */ -#define SM501_AC97 (0x0A0000) +#define SM501_AC97 0x0A0000 /* 8051 micro controller base */ -#define SM501_UCONTROLLER (0x0B0000) +#define SM501_UCONTROLLER 0x0B0000 /* 8051 micro controller SRAM base */ -#define SM501_UCONTROLLER_SRAM (0x0C0000) +#define SM501_UCONTROLLER_SRAM 0x0C0000 /* DMA base */ -#define SM501_DMA (0x0D0000) +#define SM501_DMA 0x0D0000 /* 2d engine base */ -#define SM501_2D_ENGINE (0x100000) -#define SM501_2D_SOURCE (0x00) -#define SM501_2D_DESTINATION (0x04) -#define SM501_2D_DIMENSION (0x08) -#define SM501_2D_CONTROL (0x0C) -#define SM501_2D_PITCH (0x10) -#define SM501_2D_FOREGROUND (0x14) -#define SM501_2D_BACKGROUND (0x18) -#define SM501_2D_STRETCH (0x1C) -#define SM501_2D_COLOR_COMPARE (0x20) -#define SM501_2D_COLOR_COMPARE_MASK (0x24) -#define SM501_2D_MASK (0x28) -#define SM501_2D_CLIP_TL (0x2C) -#define SM501_2D_CLIP_BR (0x30) -#define SM501_2D_MONO_PATTERN_LOW (0x34) -#define SM501_2D_MONO_PATTERN_HIGH (0x38) -#define SM501_2D_WINDOW_WIDTH (0x3C) -#define SM501_2D_SOURCE_BASE (0x40) -#define SM501_2D_DESTINATION_BASE (0x44) -#define SM501_2D_ALPHA (0x48) -#define SM501_2D_WRAP (0x4C) -#define SM501_2D_STATUS (0x50) - -#define SM501_CSC_Y_SOURCE_BASE (0xC8) -#define SM501_CSC_CONSTANTS (0xCC) -#define SM501_CSC_Y_SOURCE_X (0xD0) -#define SM501_CSC_Y_SOURCE_Y (0xD4) -#define SM501_CSC_U_SOURCE_BASE (0xD8) -#define SM501_CSC_V_SOURCE_BASE (0xDC) -#define SM501_CSC_SOURCE_DIMENSION (0xE0) -#define SM501_CSC_SOURCE_PITCH (0xE4) -#define SM501_CSC_DESTINATION (0xE8) -#define SM501_CSC_DESTINATION_DIMENSION (0xEC) -#define SM501_CSC_DESTINATION_PITCH (0xF0) -#define SM501_CSC_SCALE_FACTOR (0xF4) -#define SM501_CSC_DESTINATION_BASE (0xF8) -#define SM501_CSC_CONTROL (0xFC) +#define SM501_2D_ENGINE 0x100000 +#define SM501_2D_SOURCE 0x00 +#define SM501_2D_DESTINATION 0x04 +#define SM501_2D_DIMENSION 0x08 +#define SM501_2D_CONTROL 0x0C +#define SM501_2D_PITCH 0x10 +#define SM501_2D_FOREGROUND 0x14 +#define SM501_2D_BACKGROUND 0x18 +#define SM501_2D_STRETCH 0x1C +#define SM501_2D_COLOR_COMPARE 0x20 +#define SM501_2D_COLOR_COMPARE_MASK 0x24 +#define SM501_2D_MASK 0x28 +#define SM501_2D_CLIP_TL 0x2C +#define SM501_2D_CLIP_BR 0x30 +#define SM501_2D_MONO_PATTERN_LOW 0x34 +#define SM501_2D_MONO_PATTERN_HIGH 0x38 +#define SM501_2D_WINDOW_WIDTH 0x3C +#define SM501_2D_SOURCE_BASE 0x40 +#define SM501_2D_DESTINATION_BASE 0x44 +#define SM501_2D_ALPHA 0x48 +#define SM501_2D_WRAP 0x4C +#define SM501_2D_STATUS 0x50 + +#define SM501_CSC_Y_SOURCE_BASE 0xC8 +#define SM501_CSC_CONSTANTS 0xCC +#define SM501_CSC_Y_SOURCE_X 0xD0 +#define SM501_CSC_Y_SOURCE_Y 0xD4 +#define SM501_CSC_U_SOURCE_BASE 0xD8 +#define SM501_CSC_V_SOURCE_BASE 0xDC +#define SM501_CSC_SOURCE_DIMENSION 0xE0 +#define SM501_CSC_SOURCE_PITCH 0xE4 +#define SM501_CSC_DESTINATION 0xE8 +#define SM501_CSC_DESTINATION_DIMENSION 0xEC +#define SM501_CSC_DESTINATION_PITCH 0xF0 +#define SM501_CSC_SCALE_FACTOR 0xF4 +#define SM501_CSC_DESTINATION_BASE 0xF8 +#define SM501_CSC_CONTROL 0xFC /* 2d engine data port base */ -#define SM501_2D_ENGINE_DATA (0x110000) +#define SM501_2D_ENGINE_DATA 0x110000 /* end of register definitions */ -#define SM501_HWC_WIDTH (64) -#define SM501_HWC_HEIGHT (64) +#define SM501_HWC_WIDTH 64 +#define SM501_HWC_HEIGHT 64 /* SM501 local memory size taken from "linux/drivers/mfd/sm501.c" */ static const uint32_t sm501_mem_local_size[] = { From patchwork Sun Feb 5 10:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129016 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id BA7EBC636CC for ; Sun, 5 Feb 2023 10:07:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuC-0001hq-VR; Sun, 05 Feb 2023 05:05:53 -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 1pObtr-00017o-9H; Sun, 05 Feb 2023 05:05:36 -0500 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtp-0005Kk-9n; Sun, 05 Feb 2023 05:05:30 -0500 Received: by mail-oi1-x230.google.com with SMTP id c15so7454085oic.8; Sun, 05 Feb 2023 02:05:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=7ZK40hW+ej+3krgMzPgquYQLQLED2GYWToj+30Unhk0=; b=eRJ++PblueVtxXFu6FL1rJj3ccMrohi4DtPF5Dftgn6ec8VkuqE1l4z0HS66+gLBRx 767q4JKZ0sFxMAP7uZvsazXJQr5owvrpFbDcMjQC3PBqExBT7NMZBBTFVWF+RMFXWB1O y8zh+VA4Qg7ViugFuywjH6ERx3FE86xmCNUn28I1wC4DZnpnaFnlEDkEj2GIdJMderqY K5CQv6xS3h1tjfsqBXNxUL2/Vdsta18/CIQWFpHuxkx0BQiAYudWr+Pq1vKN0huw5VMO 8i5NyB495ThbpkfSsn6OVtyMv2YkMz4LvkRylxi3i5APk/gJflASOwP36jVkTNghFF0y xe2g== 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=7ZK40hW+ej+3krgMzPgquYQLQLED2GYWToj+30Unhk0=; b=YjNdM3l41Dks/Pmrz2vJsEMxK1IypDgMxiYh1QY2QGfmyQz+/Srnybw+KxuWFacHfh yFkfjpdq6agzxzy4e+uZ5JN1BE1KGMN/pZuJGSZR9ui9YKfyFElXsRcKgEaqZRTQFtzg JZ2aJ+E2BPEEA3OOWtIBh29lFPHOW+3lRl+WCDJGA5JNKyTYRePQNJtX5Lr6o8CqBgyP YfeTgBqSQTbn0hk4wCfvUdwWWb0otcsphCNoUd3/KA1FXPCzbpsN3OA30uXSml0B9pke NklQVW952jKkmROI5H0i5ooj4jzGQv+eKjBgJW2aERuxNbaPKm+RcPSl1f9mKsUQsg5Q 7Vtw== X-Gm-Message-State: AO0yUKUJtzXmwFRpFPhiS7Goc1dIW85Hl1ChzmHvkAdfLdSpBVVa/Na4 ta8RvxkDl/45ZY+gl0dcVnzXPdIrlvw= X-Google-Smtp-Source: AK7set8SrbHA+1tPbdaCmTsU+e5zi1pEDffooT7T9umKivSpZga2FxEib2xCkY0c5Iw5eGixs6EAmw== X-Received: by 2002:aca:2209:0:b0:37a:cef7:c9f3 with SMTP id b9-20020aca2209000000b0037acef7c9f3mr4942616oic.14.1675591526674; Sun, 05 Feb 2023 02:05:26 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:26 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer Date: Sun, 5 Feb 2023 07:04:48 -0300 Message-Id: <20230205100449.2352781-16-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::230; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x230.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: BALATON Zoltan This is not needed in C. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-Id: <58f599387dd0739ea1880bfb678872c0be26bf1b.1674333199.git.balaton@eik.bme.hu> Signed-off-by: Daniel Henrique Barboza --- hw/display/sm501.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 0cbd1fecd5..1e17072452 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -868,7 +868,7 @@ static void sm501_2d_operation(SM501State *s) static uint64_t sm501_system_config_read(void *opaque, hwaddr addr, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; uint32_t ret = 0; switch (addr) { @@ -928,7 +928,7 @@ static uint64_t sm501_system_config_read(void *opaque, hwaddr addr, static void sm501_system_config_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; trace_sm501_system_config_write((uint32_t)addr, (uint32_t)value); switch (addr) { @@ -996,7 +996,7 @@ static const MemoryRegionOps sm501_system_config_ops = { static uint64_t sm501_i2c_read(void *opaque, hwaddr addr, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; uint8_t ret = 0; switch (addr) { @@ -1023,7 +1023,7 @@ static uint64_t sm501_i2c_read(void *opaque, hwaddr addr, unsigned size) static void sm501_i2c_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; trace_sm501_i2c_write((uint32_t)addr, (uint32_t)value); switch (addr) { @@ -1092,7 +1092,7 @@ static const MemoryRegionOps sm501_i2c_ops = { static uint32_t sm501_palette_read(void *opaque, hwaddr addr) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; trace_sm501_palette_read((uint32_t)addr); @@ -1106,7 +1106,7 @@ static uint32_t sm501_palette_read(void *opaque, hwaddr addr) static void sm501_palette_write(void *opaque, hwaddr addr, uint32_t value) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; trace_sm501_palette_write((uint32_t)addr, value); @@ -1121,7 +1121,7 @@ static void sm501_palette_write(void *opaque, hwaddr addr, static uint64_t sm501_disp_ctrl_read(void *opaque, hwaddr addr, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; uint32_t ret = 0; switch (addr) { @@ -1234,7 +1234,7 @@ static uint64_t sm501_disp_ctrl_read(void *opaque, hwaddr addr, static void sm501_disp_ctrl_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; trace_sm501_disp_ctrl_write((uint32_t)addr, (uint32_t)value); switch (addr) { @@ -1379,7 +1379,7 @@ static const MemoryRegionOps sm501_disp_ctrl_ops = { static uint64_t sm501_2d_engine_read(void *opaque, hwaddr addr, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; uint32_t ret = 0; switch (addr) { @@ -1457,7 +1457,7 @@ static uint64_t sm501_2d_engine_read(void *opaque, hwaddr addr, static void sm501_2d_engine_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; trace_sm501_2d_engine_write((uint32_t)addr, (uint32_t)value); switch (addr) { @@ -1644,7 +1644,7 @@ static void draw_hwc_line_32(uint8_t *d, const uint8_t *s, int width, static void sm501_update_display(void *opaque) { - SM501State *s = (SM501State *)opaque; + SM501State *s = opaque; DisplaySurface *surface = qemu_console_surface(s->con); DirtyBitmapSnapshot *snap; int y, c_x = 0, c_y = 0; From patchwork Sun Feb 5 10:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13129025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 50699C636CD for ; Sun, 5 Feb 2023 10:09:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObuA-0001b4-FF; Sun, 05 Feb 2023 05:05:50 -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 1pObts-00017q-RU; Sun, 05 Feb 2023 05:05:36 -0500 Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pObtr-0005TT-Af; Sun, 05 Feb 2023 05:05:32 -0500 Received: by mail-oi1-x22f.google.com with SMTP id c15so7454117oic.8; Sun, 05 Feb 2023 02:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=M2kPo468f1r7zwyieHHLTlxuPu7VFL933QsJp5BPQVc=; b=Kt9srllQ6qSUe1eD0FEyn9Fx3wpJcWHMKiViW4KUXOF9XVuSjo/mN/JPcANur50jFk KIQxgs3YXiNDkadMWJo2ffhe0KQ/AfReoZUKH8xV02XS9EXqH1zoVBlL3CeCTbNS5YH4 CZIzXiGCW+84oYvCL9hOIvz+EhLzzzf8iuH7NKkjQvCquVgMBY4Gw1lf5p+293h/wY2b UVSJRyfZXmOKjL7JTBfBnezJcWft5ISyX+WlOfXEDmpss8pWJmCjSsYqWFvMXfjDaTur NYawR/ZaX3BrL0D/7IT729JarFtIP0u3LzmRA9dSBLJk1Zww3huiiHPR5O0R6LyOiMXE hqUQ== 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=M2kPo468f1r7zwyieHHLTlxuPu7VFL933QsJp5BPQVc=; b=HzEVPP1PeZa4blURArc7ZBGR+7hzmObjzlncv8djzltDxbf3mn9ctyiYiBEpqNuRhN Ro5mQZtH6Ry3ktMUiAy+A1zOhMOssJLklTCfAjXH1KL4dd2yh0B53k1Tbq70p9BDOOIn n6M6wQw+cRhcBty+vG4juBTo3J4bjC6ls2oa6qlzu0LyW9bOhgTtRMBDoV6VhlivJU6I GsvS3FYeKJ+xUkEl367kk/mkfrrJO5J8D+DPzqgdnFzVxuNSdTu8Y0HYR3qABLxGblwo icLn52nl0Wl2KWrzHV7Np9VlwRpLBKPncjSqc8t4PJwSqGs8V6WJHjdHGnnNRFE5mUHp SSOQ== X-Gm-Message-State: AO0yUKUJZ8e90V9LDS2IzZ/2QgIB+nnQIOIj/E/juaQRAWhhEJFzGps3 tjuWrVOKDv4RlnjGWE5SB2IYUoXM5l4= X-Google-Smtp-Source: AK7set/Rx54N8JidPlmD7AvbRIwkJvfHa2C6RNNfPZVTc1LAabJOKLLzkhe+a6tEY8fvl6yrBWpV1Q== X-Received: by 2002:a05:6808:1b24:b0:35e:92bc:9f72 with SMTP id bx36-20020a0568081b2400b0035e92bc9f72mr9266141oib.30.1675591528908; Sun, 05 Feb 2023 02:05:28 -0800 (PST) Received: from grind.. ([191.19.125.138]) by smtp.gmail.com with ESMTPSA id s191-20020acaa9c8000000b003631fe1810dsm2730924oie.47.2023.02.05.02.05.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 02:05:28 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com, peter.maydell@linaro.org, BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 16/16] hw/display/sm501: Code style fix Date: Sun, 5 Feb 2023 07:04:49 -0300 Message-Id: <20230205100449.2352781-17-danielhb413@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com> References: <20230205100449.2352781-1-danielhb413@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22f; envelope-from=danielhb413@gmail.com; helo=mail-oi1-x22f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: BALATON Zoltan Fix checkpatch warning about multi-line comment. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-Id: <8801292992a304609e1eac680fe36b515592b926.1674333199.git.balaton@eik.bme.hu> Signed-off-by: Daniel Henrique Barboza --- hw/display/sm501.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 1e17072452..e1d0591d36 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1768,7 +1768,8 @@ static const GraphicHwOps sm501_ops = { static void sm501_reset(SM501State *s) { s->system_control = 0x00100000; /* 2D engine FIFO empty */ - /* Bits 17 (SH), 7 (CDR), 6:5 (Test), 2:0 (Bus) are all supposed + /* + * Bits 17 (SH), 7 (CDR), 6:5 (Test), 2:0 (Bus) are all supposed * to be determined at reset by GPIO lines which set config bits. * We hardwire them: * SH = 0 : Hitachi Ready Polarity == Active Low