From nobody Tue Nov 18 10:38:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609454980; cv=none; d=zohomail.com; s=zohoarc; b=Lx0nftSIiAf1fqpE8E2RPRYZioEYEgXrUi7mb5L3603zASPLO4LHac28f0U7clNPRHDW0M4+aKz9xW85404f8HtSAGjA/DG0QSbpBHELPPMYgKCLf0tdMROOLUfm/Oh0ENqDwx52DfxM3/4ueRR5/sqEfmHWSKTSP8ZfqVDZ4kU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609454980; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9dbQcqp+ljH9dixNyANVfZXDH8+4pVph9oe3JUeTn5w=; b=lTW0+GPF/Qiwr5KP80sR5Z1KwPOjjjlEuDQyb9JL25Z1/4d2g3zvMyHkN56SVIJrOyp3MReTWCN93s3rdhdDO4TwZHuPp+uNdPym+uEB4qB8drnOOduAoeBK5ImknplV64jLYSbD2Nblv1s7yxJnKSkNdh8+aIwqS+NZkBRDRUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1609454980765783.4559977463424; Thu, 31 Dec 2020 14:49:40 -0800 (PST) Received: by mail-wr1-f52.google.com with SMTP id d26so20997401wrb.12 for ; Thu, 31 Dec 2020 14:49:40 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (239.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.239]) by smtp.gmail.com with ESMTPSA id f14sm14235284wme.14.2020.12.31.14.49.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:49:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9dbQcqp+ljH9dixNyANVfZXDH8+4pVph9oe3JUeTn5w=; b=KTkMcdaLQ+M+6Ujn+w8NnLe6S5cMiDheHSv5aKm6zbRR4jXPap3Aks7r2G383Y/PXa 4LGFww/mf7y96WMTwJXDMoe/iz2LfAIlu/ty5PSiF5EgY49r8MWFVRPhRlf2YlvOeKxw SAZhQcU9Dtzyeiv/xzhO1ACYq/iugoh5QP32MIZpDyVf2vPRWNHiaB7XxU9x+1E9Ok39 2kEKchFOMTC6YxuzpBg3TIkbV3VQoGO6J3JchDFerNW4e5Y/BBDrsDhSD4VzYcPGzG28 Yhh8XkBcjt/9f4KtMKUaOA8ZEaBXVQfTu/YYM8lS4iW2fLseOecllO1xo3hbnlonHCQg 4dLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9dbQcqp+ljH9dixNyANVfZXDH8+4pVph9oe3JUeTn5w=; b=jn3Ve3n0kut8qc1uaqcRKD98TUTfWzCvAdgNKQ5XKhsJNgKoHYVuDnnuWv74rdYwXT 8sMfQzsmwA0nxPl0LZ36H0SrXUTlJ6MvRNJ7BxN4c1FVS4aqll5k9AAs/AoYjx/o3EJK WqWtC919SAVVRP+J9JGoHqzRBgAbrvSSgFAj7lB9QSNLm9zlDfl5Hffc6FmmfIyogV83 II76RFlimd9Bo0GRuOmNudpW4CptvyfMENljs1D5fmg4rp3tu77mKXMF4nZKBs2f4ms0 22o8vWC3B2NR4KDXr67yuM7LaVkCVB7L0bpRd2YFiWSvafaFM640jpxcEXF4NU+Zx4mm 07Vw== X-Gm-Message-State: AOAM530tHv8bayxV4Pc40xyy6sp88Ik4kQbOQziy8JYNme6QOAhQ6tfm eO40aGc4DlA5FXy1NGe1ka0= X-Google-Smtp-Source: ABdhPJz2XQ//XEm+IRLh1Rvisu6ftnBMqMOTpVRXTV/2Ql2zgghbFzJkvhvddkkYz5IjAIKtbtrYFQ== X-Received: by 2002:a5d:540f:: with SMTP id g15mr66744461wrv.397.1609454978926; Thu, 31 Dec 2020 14:49:38 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Rikalo , Aurelien Jarno , Huacai Chen Subject: [PATCH 05/18] hw/pci-host/bonito: Simplify soft reset using FIELD_EX32() Date: Thu, 31 Dec 2020 23:48:58 +0100 Message-Id: <20201231224911.1467352-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201231224911.1467352-1-f4bug@amsat.org> References: <20201231224911.1467352-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index fe94e6740b5..104c58331d0 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -244,7 +244,6 @@ static void bonito_writel(void *opaque, hwaddr addr, { PCIBonitoState *s =3D opaque; uint32_t saddr; - int reset =3D 0; =20 saddr =3D addr >> 2; =20 @@ -277,13 +276,12 @@ static void bonito_writel(void *opaque, hwaddr addr, s->regs[saddr] =3D val; break; case BONITO_BONGENCFG: - if (!(s->regs[saddr] & 0x04) && (val & 0x04)) { - reset =3D 1; /* bit 2 jump from 0 to 1 cause reset */ - } - s->regs[saddr] =3D val; - if (reset) { + if (!FIELD_EX32(s->regs[saddr], BONGENCFG, CPUSELFRESET) + && FIELD_EX32(val, BONGENCFG, CPUSELFRESET)) { + /* bit 2 jump from 0 to 1 cause reset */ qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); } + s->regs[saddr] =3D val; break; case BONITO_INTENSET: s->regs[BONITO_INTENSET] =3D val; --=20 2.26.2