From nobody Fri Dec 19 04:28:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1568390357; cv=none; d=zoho.com; s=zohoarc; b=htcdqAm+0STE4vuFyn9l2XRD3CMNUYQTNCEPqptIjnNk0DGkYHY1PQS6rBMVcYGXU56OTR7vB4wurKzOHFAfo/IlgFVcs5bvCXVtANSvOzGC6H3Hba5zmI7dn+j+vpEx3HZr+es6U9LCdG3dh5H4PimiakiHahIrrpokyGc3SGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568390357; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=x9pAvs1vBwT98tToIZ3WwAg5y5izTGLjnHfR9GCnGxg=; b=Ypoy7wdT9RgSvermTHOAzXNtkI38wUapU5Ic2fui9CSQ2gdgWerMSawVMb4icqrndhyiCCv2VPF9JaZa/nXOU8xdKPHm/l38sKef2jAY1uNfuODd3qwpqWGuQGF8FSZuNLFmdrkRVK3r3cqilV/C2VZoPrDy7GkgiqTaNcJgdFg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568390357237403.1604072486557; Fri, 13 Sep 2019 08:59:17 -0700 (PDT) Received: from localhost ([::1]:45680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8nyd-0000MS-F4 for importer@patchew.org; Fri, 13 Sep 2019 11:59:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57096) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8npk-0007bM-Ud for qemu-devel@nongnu.org; Fri, 13 Sep 2019 11:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8npj-0000rs-Ju for qemu-devel@nongnu.org; Fri, 13 Sep 2019 11:50:04 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i8npj-0000pz-Ds for qemu-devel@nongnu.org; Fri, 13 Sep 2019 11:50:03 -0400 Received: by mail-wr1-x444.google.com with SMTP id l3so9862157wru.7 for ; Fri, 13 Sep 2019 08:50:03 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id c132sm3562207wme.27.2019.09.13.08.50.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2019 08:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=x9pAvs1vBwT98tToIZ3WwAg5y5izTGLjnHfR9GCnGxg=; b=xf96vk9dQKmtzzbaJ78VvErD+rfA6O8xgELgF9a5lKSDHg/Cf3IseMjOT1k3MQ4zjG 5U6J1ncnRzJwuZaHbjwqHadpw17Kzmt2tTEFdBzIc/WyG+YRuxeltCSDSUDjKztCUMyp l2TfnEIND0hGr95tK7yJJ2iBVjd4DkkZNG4ivcnnyOIaOGQJa87rk5+no9Q0iGmSdF8T +iiFcnzrSNJ28E0eMvJCAtbBLzGqgkHPLciMWIGP2Pdl7ofyS57ikcU1qThNQfrBi0+W 1mAaXo3wr4YLBicTNnQfrogTtVkdljjJQdEtdcdh4Jt9UrP70CjZkDjg7LYfalNQ1Yi2 QCBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x9pAvs1vBwT98tToIZ3WwAg5y5izTGLjnHfR9GCnGxg=; b=YM1x1ildSF5gyAsaVdujND9PoBbjq4GsrgW1I196gKDd21DZw+5eqo6gVEZNbBpgm6 Pycq2TbEQ1/Wp0ZPe12lwkv97wfpH91IuIfNvAYxIhrrLGuRmEL5ZpmE6VvFuTLF8Ztn CalIrZm+g/KIEoK86EuPmMHsUMxG/xg1P5oIq+XM79nCn0UOadnGbd2Rzl+sfPh9Tizj MK+Hm0VO1/9CIpwaWb5QFO4W338n4Lpvddb+uWlJEYOTpfTbCfLSUI+meDVuKaf1SqJ/ zP4w5WGjqGA42N4spAEuD62kgAFkaf6NqzLGWIn3xFSvBVnb4+RrlOrLktOdMW7iqV70 5UvQ== X-Gm-Message-State: APjAAAU3FVSSP7P78oiHFsGluAvKA1WOa679TV/wbJpV8WfYrUcNT+Qy 3w/Apehe7UhsUkIFywJMNxv9Bgvmi0k/Mg== X-Google-Smtp-Source: APXvYqwOrbaH7yvjzxqBdp7SSDXeQL6SZVj1/3+RF4EvTKLu94Zexwm6RVvzT5M8vD6bZXdBBLi/bA== X-Received: by 2002:a5d:61ca:: with SMTP id q10mr20644606wrv.274.1568389802174; Fri, 13 Sep 2019 08:50:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 13 Sep 2019 16:49:46 +0100 Message-Id: <20190913154952.27724-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190913154952.27724-1-peter.maydell@linaro.org> References: <20190913154952.27724-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PULL 06/12] aspeed/smc: Add DMA calibration settings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: C=C3=A9dric Le Goater When doing calibration, the SPI clock rate in the CE0 Control Register and the read delay cycles in the Read Timing Compensation Register are set using bit[11:4] of the DMA Control Register. Signed-off-by: C=C3=A9dric Le Goater Acked-by: Joel Stanley Reviewed-by: Peter Maydell Message-id: 20190904070506.1052-7-clg@kaod.org Signed-off-by: Peter Maydell --- hw/ssi/aspeed_smc.c | 64 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index c1a45c10dc1..7a0cd7607fd 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -77,6 +77,10 @@ #define CTRL_CMD_MASK 0xff #define CTRL_DUMMY_HIGH_SHIFT 14 #define CTRL_AST2400_SPI_4BYTE (1 << 13) +#define CE_CTRL_CLOCK_FREQ_SHIFT 8 +#define CE_CTRL_CLOCK_FREQ_MASK 0xf +#define CE_CTRL_CLOCK_FREQ(div) \ + (((div) & CE_CTRL_CLOCK_FREQ_MASK) << CE_CTRL_CLOCK_FREQ_SHIFT) #define CTRL_DUMMY_LOW_SHIFT 6 /* 2 bits [7:6] */ #define CTRL_CE_STOP_ACTIVE (1 << 2) #define CTRL_CMD_MODE_MASK 0x3 @@ -112,7 +116,7 @@ #define DMA_CTRL_DELAY_SHIFT 8 #define DMA_CTRL_FREQ_MASK 0xf #define DMA_CTRL_FREQ_SHIFT 4 -#define DMA_CTRL_MODE (1 << 3) +#define DMA_CTRL_CALIB (1 << 3) #define DMA_CTRL_CKSUM (1 << 2) #define DMA_CTRL_WRITE (1 << 1) #define DMA_CTRL_ENABLE (1 << 0) @@ -811,6 +815,60 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr a= ddr, unsigned int size) } } =20 +static uint8_t aspeed_smc_hclk_divisor(uint8_t hclk_mask) +{ + /* HCLK/1 .. HCLK/16 */ + const uint8_t hclk_divisors[] =3D { + 15, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 0 + }; + int i; + + for (i =3D 0; i < ARRAY_SIZE(hclk_divisors); i++) { + if (hclk_mask =3D=3D hclk_divisors[i]) { + return i + 1; + } + } + + qemu_log_mask(LOG_GUEST_ERROR, "invalid HCLK mask %x", hclk_mask); + return 0; +} + +/* + * When doing calibration, the SPI clock rate in the CE0 Control + * Register and the read delay cycles in the Read Timing Compensation + * Register are set using bit[11:4] of the DMA Control Register. + */ +static void aspeed_smc_dma_calibration(AspeedSMCState *s) +{ + uint8_t delay =3D + (s->regs[R_DMA_CTRL] >> DMA_CTRL_DELAY_SHIFT) & DMA_CTRL_DELAY_MAS= K; + uint8_t hclk_mask =3D + (s->regs[R_DMA_CTRL] >> DMA_CTRL_FREQ_SHIFT) & DMA_CTRL_FREQ_MASK; + uint8_t hclk_div =3D aspeed_smc_hclk_divisor(hclk_mask); + uint32_t hclk_shift =3D (hclk_div - 1) << 2; + uint8_t cs; + + /* + * The Read Timing Compensation Register values apply to all CS on + * the SPI bus and only HCLK/1 - HCLK/5 can have tunable delays + */ + if (hclk_div && hclk_div < 6) { + s->regs[s->r_timings] &=3D ~(0xf << hclk_shift); + s->regs[s->r_timings] |=3D delay << hclk_shift; + } + + /* + * TODO: compute the CS from the DMA address and the segment + * registers. This is not really a problem for now because the + * Timing Register values apply to all CS and software uses CS0 to + * do calibration. + */ + cs =3D 0; + s->regs[s->r_ctrl0 + cs] &=3D + ~(CE_CTRL_CLOCK_FREQ_MASK << CE_CTRL_CLOCK_FREQ_SHIFT); + s->regs[s->r_ctrl0 + cs] |=3D CE_CTRL_CLOCK_FREQ(hclk_div); +} + /* * Accumulate the result of the reads to provide a checksum that will * be used to validate the read timing settings. @@ -826,6 +884,10 @@ static void aspeed_smc_dma_checksum(AspeedSMCState *s) return; } =20 + if (s->regs[R_DMA_CTRL] & DMA_CTRL_CALIB) { + aspeed_smc_dma_calibration(s); + } + while (s->regs[R_DMA_LEN]) { data =3D address_space_ldl_le(&s->flash_as, s->regs[R_DMA_FLASH_AD= DR], MEMTXATTRS_UNSPECIFIED, &result); --=20 2.20.1