Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1197468/?format=api
{ "id": 1197468, "url": "http://patchwork.ozlabs.org/api/patches/1197468/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20191119141211.25716-11-clg@kaod.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20191119141211.25716-11-clg@kaod.org>", "list_archive_url": null, "date": "2019-11-19T14:12:04", "name": "[10/17] aspeed/smc: Restore default AHB window mapping at reset", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "fe3a2d7f94c59744ff280257077522c6486506ed", "submitter": { "id": 68548, "url": "http://patchwork.ozlabs.org/api/people/68548/?format=api", "name": "Cédric Le Goater", "email": "clg@kaod.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20191119141211.25716-11-clg@kaod.org/mbox/", "series": [ { "id": 143789, "url": "http://patchwork.ozlabs.org/api/series/143789/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=143789", "date": "2019-11-19T14:11:54", "name": "aspeed: extensions and fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/143789/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1197468/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1197468/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=nongnu.org (client-ip=209.51.188.17;\n\thelo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=kaod.org" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 47HSYJ6h8yz9sPf\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Nov 2019 01:16:20 +1100 (AEDT)", "from localhost ([::1]:45956 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1iX4Ij-0000Tl-Cy\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Nov 2019 09:16:17 -0500", "from eggs.gnu.org ([2001:470:142:3::10]:42112)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <clg@kaod.org>) id 1iX4GJ-0006wu-JC\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:13:48 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <clg@kaod.org>) id 1iX4GI-0005bZ-AW\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:13:47 -0500", "from 9.mo178.mail-out.ovh.net ([46.105.75.45]:54973)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <clg@kaod.org>) id 1iX4GI-0005b8-4I\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:13:46 -0500", "from player795.ha.ovh.net (unknown [10.109.159.7])\n\tby mo178.mail-out.ovh.net (Postfix) with ESMTP id 5A42F823E3\n\tfor <qemu-devel@nongnu.org>; Tue, 19 Nov 2019 15:13:44 +0100 (CET)", "from kaod.org (deibp9eh1--blueice1n4.emea.ibm.com [195.212.29.166])\n\t(Authenticated sender: clg@kaod.org)\n\tby player795.ha.ovh.net (Postfix) with ESMTPSA id 45A4EC18ACC4;\n\tTue, 19 Nov 2019 14:13:37 +0000 (UTC)" ], "From": "=?utf-8?q?C=C3=A9dric_Le_Goater?= <clg@kaod.org>", "To": "Peter Maydell <peter.maydell@linaro.org>", "Subject": "[PATCH 10/17] aspeed/smc: Restore default AHB window mapping at\n\treset", "Date": "Tue, 19 Nov 2019 15:12:04 +0100", "Message-Id": "<20191119141211.25716-11-clg@kaod.org>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20191119141211.25716-1-clg@kaod.org>", "References": "<20191119141211.25716-1-clg@kaod.org>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "X-Ovh-Tracer-Id": "17913067520693668625", "X-VR-SPAMSTATE": "OK", "X-VR-SPAMSCORE": "-100", "X-VR-SPAMCAUSE": "gggruggvucftvghtrhhoucdtuddrgedufedrudegkedgiedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdqfffguegfifdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepveorughrihgtucfnvgcuifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucfkpheptddrtddrtddrtddpudelhedrvdduvddrvdelrdduieeinecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejleehrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheptghlgheskhgrohgurdhorhhgpdhrtghpthhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpeeh", "Content-Transfer-Encoding": "quoted-printable", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "46.105.75.45", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Andrew Jeffery <andrew@aj.id.au>, =?utf-8?q?C=C3=A9dric_Le_Goater?=\n\t<clg@kaod.org>, qemu-arm@nongnu.org, Joel Stanley <joel@jms.id.au>,\n\tqemu-devel@nongnu.org", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "The current model only restores the Segment Register values but leaves\nthe previous CS mapping behind. Introduce a helper setting the\nregister value and mapping the region at the requested address. Use\nthis helper when a Segment register is set and at reset.\n\nSigned-off-by: Cédric Le Goater <clg@kaod.org>\nReviewed-by: Joel Stanley <joel@jms.id.au>\nSigned-off-by: Cédric Le Goater <clg@kaod.org>\n---\n hw/ssi/aspeed_smc.c | 32 +++++++++++++++++++++-----------\n 1 file changed, 21 insertions(+), 11 deletions(-)", "diff": "diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c\nindex f0c7bbbad302..955ec21852ac 100644\n--- a/hw/ssi/aspeed_smc.c\n+++ b/hw/ssi/aspeed_smc.c\n@@ -475,10 +475,26 @@ static bool aspeed_smc_flash_overlap(const AspeedSMCState *s,\n return false;\n }\n \n+static void aspeed_smc_flash_set_segment_region(AspeedSMCState *s, int cs,\n+ uint64_t regval)\n+{\n+ AspeedSMCFlash *fl = &s->flashes[cs];\n+ AspeedSegments seg;\n+\n+ s->ctrl->reg_to_segment(s, regval, &seg);\n+\n+ memory_region_transaction_begin();\n+ memory_region_set_size(&fl->mmio, seg.size);\n+ memory_region_set_address(&fl->mmio, seg.addr - s->ctrl->flash_window_base);\n+ memory_region_set_enabled(&fl->mmio, true);\n+ memory_region_transaction_commit();\n+\n+ s->regs[R_SEG_ADDR0 + cs] = regval;\n+}\n+\n static void aspeed_smc_flash_set_segment(AspeedSMCState *s, int cs,\n uint64_t new)\n {\n- AspeedSMCFlash *fl = &s->flashes[cs];\n AspeedSegments seg;\n \n s->ctrl->reg_to_segment(s, new, &seg);\n@@ -529,13 +545,7 @@ static void aspeed_smc_flash_set_segment(AspeedSMCState *s, int cs,\n aspeed_smc_flash_overlap(s, &seg, cs);\n \n /* All should be fine now to move the region */\n- memory_region_transaction_begin();\n- memory_region_set_size(&fl->mmio, seg.size);\n- memory_region_set_address(&fl->mmio, seg.addr - s->ctrl->flash_window_base);\n- memory_region_set_enabled(&fl->mmio, true);\n- memory_region_transaction_commit();\n-\n- s->regs[R_SEG_ADDR0 + cs] = new;\n+ aspeed_smc_flash_set_segment_region(s, cs, new);\n }\n \n static uint64_t aspeed_smc_flash_default_read(void *opaque, hwaddr addr,\n@@ -897,10 +907,10 @@ static void aspeed_smc_reset(DeviceState *d)\n qemu_set_irq(s->cs_lines[i], true);\n }\n \n- /* setup default segment register values for all */\n+ /* setup the default segment register values and regions for all */\n for (i = 0; i < s->ctrl->max_slaves; ++i) {\n- s->regs[R_SEG_ADDR0 + i] =\n- s->ctrl->segment_to_reg(s, &s->ctrl->segments[i]);\n+ aspeed_smc_flash_set_segment_region(s, i,\n+ s->ctrl->segment_to_reg(s, &s->ctrl->segments[i]));\n }\n \n /* HW strapping flash type for the AST2600 controllers */\n", "prefixes": [ "10/17" ] }