Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1197486/?format=api
{ "id": 1197486, "url": "http://patchwork.ozlabs.org/api/patches/1197486/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20191119141211.25716-13-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-13-clg@kaod.org>", "list_archive_url": null, "date": "2019-11-19T14:12:06", "name": "[12/17] aspeed/smc: Add AST2600 timings registers", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "50cfe18c84d63fdd17ecb43ea77d3c94a330801c", "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-13-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/1197486/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1197486/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 47HSsf4KQyz9sPf\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Nov 2019 01:30:30 +1100 (AEDT)", "from localhost ([::1]:46120 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 1iX4WS-00008k-Bj\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Nov 2019 09:30:28 -0500", "from eggs.gnu.org ([2001:470:142:3::10]:42160)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <clg@kaod.org>) id 1iX4GY-0007KF-A6\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:07 -0500", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <clg@kaod.org>) id 1iX4GW-0005hL-SG\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:02 -0500", "from 2.mo2.mail-out.ovh.net ([188.165.53.149]:36518)\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 1iX4GW-0005gc-It\n\tfor qemu-devel@nongnu.org; Tue, 19 Nov 2019 09:14:00 -0500", "from player795.ha.ovh.net (unknown [10.109.159.69])\n\tby mo2.mail-out.ovh.net (Postfix) with ESMTP id E4FDB1B5A72\n\tfor <qemu-devel@nongnu.org>; Tue, 19 Nov 2019 15:13:58 +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 2BB40C18ADFF;\n\tTue, 19 Nov 2019 14:13:52 +0000 (UTC)" ], "From": "=?utf-8?q?C=C3=A9dric_Le_Goater?= <clg@kaod.org>", "To": "Peter Maydell <peter.maydell@linaro.org>", "Subject": "[PATCH 12/17] aspeed/smc: Add AST2600 timings registers", "Date": "Tue, 19 Nov 2019 15:12:06 +0100", "Message-Id": "<20191119141211.25716-13-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": "17917008169540487953", "X-VR-SPAMSTATE": "OK", "X-VR-SPAMSCORE": "-100", "X-VR-SPAMCAUSE": "gggruggvucftvghtrhhoucdtuddrgedufedrudegkedgiedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdqfffguegfifdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepveorughrihgtucfnvgcuifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucfkpheptddrtddrtddrtddpudelhedrvdduvddrvdelrdduieeinecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejleehrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheptghlgheskhgrohgurdhorhhgpdhrtghpthhtohepqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrghenucevlhhushhtvghrufhiiigvpeek", "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": "188.165.53.149", "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": "Each CS has its own Read Timing Compensation Register on newer SoCs.\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 include/hw/ssi/aspeed_smc.h | 1 +\n hw/ssi/aspeed_smc.c | 17 ++++++++++++++---\n 2 files changed, 15 insertions(+), 3 deletions(-)", "diff": "diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h\nindex 684d16e33613..6fbbb238f158 100644\n--- a/include/hw/ssi/aspeed_smc.h\n+++ b/include/hw/ssi/aspeed_smc.h\n@@ -40,6 +40,7 @@ typedef struct AspeedSMCController {\n uint8_t r_ce_ctrl;\n uint8_t r_ctrl0;\n uint8_t r_timings;\n+ uint8_t nregs_timings;\n uint8_t conf_enable_w0;\n uint8_t max_slaves;\n const AspeedSegments *segments;\ndiff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c\nindex 86cadbe4cc00..7755eca34976 100644\n--- a/hw/ssi/aspeed_smc.c\n+++ b/hw/ssi/aspeed_smc.c\n@@ -137,7 +137,7 @@\n /* Checksum Calculation Result */\n #define R_DMA_CHECKSUM (0x90 / 4)\n \n-/* Misc Control Register #2 */\n+/* Read Timing Compensation Register */\n #define R_TIMINGS (0x94 / 4)\n \n /* SPI controller registers and bits (AST2400) */\n@@ -256,6 +256,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 1,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 5,\n .segments = aspeed_segments_legacy,\n@@ -271,6 +272,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 1,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 5,\n .segments = aspeed_segments_fmc,\n@@ -288,6 +290,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = 0xff,\n .r_ctrl0 = R_SPI_CTRL0,\n .r_timings = R_SPI_TIMINGS,\n+ .nregs_timings = 1,\n .conf_enable_w0 = SPI_CONF_ENABLE_W0,\n .max_slaves = 1,\n .segments = aspeed_segments_spi,\n@@ -303,6 +306,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 1,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 3,\n .segments = aspeed_segments_ast2500_fmc,\n@@ -320,6 +324,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 1,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 2,\n .segments = aspeed_segments_ast2500_spi1,\n@@ -335,6 +340,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 1,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 2,\n .segments = aspeed_segments_ast2500_spi2,\n@@ -350,6 +356,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 1,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 3,\n .segments = aspeed_segments_ast2600_fmc,\n@@ -365,6 +372,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 2,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 2,\n .segments = aspeed_segments_ast2600_spi1,\n@@ -380,6 +388,7 @@ static const AspeedSMCController controllers[] = {\n .r_ce_ctrl = R_CE_CTRL,\n .r_ctrl0 = R_CTRL0,\n .r_timings = R_TIMINGS,\n+ .nregs_timings = 3,\n .conf_enable_w0 = CONF_ENABLE_W0,\n .max_slaves = 3,\n .segments = aspeed_segments_ast2600_spi2,\n@@ -951,7 +960,8 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size)\n addr >>= 2;\n \n if (addr == s->r_conf ||\n- addr == s->r_timings ||\n+ (addr >= s->r_timings &&\n+ addr < s->r_timings + s->ctrl->nregs_timings) ||\n addr == s->r_ce_ctrl ||\n addr == R_INTR_CTRL ||\n addr == R_DUMMY_DATA ||\n@@ -1216,7 +1226,8 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data,\n addr >>= 2;\n \n if (addr == s->r_conf ||\n- addr == s->r_timings ||\n+ (addr >= s->r_timings &&\n+ addr < s->r_timings + s->ctrl->nregs_timings) ||\n addr == s->r_ce_ctrl) {\n s->regs[addr] = value;\n } else if (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs) {\n", "prefixes": [ "12/17" ] }