From patchwork Mon Oct 14 16:03:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 176301 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4745326ill; Mon, 14 Oct 2019 09:41:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqwaNUlraX8BWRos9NN+sYgOgooqJaK5xemmFDsJVVvYV+vUVe57HzkqBTZjbRXVCtrTk914 X-Received: by 2002:a17:906:2410:: with SMTP id z16mr29857800eja.120.1571071274899; Mon, 14 Oct 2019 09:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571071274; cv=none; d=google.com; s=arc-20160816; b=D3yFn/KPsoCccf4p0zIrd3FrbanCJL/EZGUZhIHwYVcA8FDM+sdSq72/aPmfpCrUIl IQFBj2cjnsHDzNpCq8TZ+kn8dJmX055LfO15ziB4fexVTOMnUWmTCC781EE032GOOrmq tpMWXv51k++/6GICyuRBUwq0soWuO/CvBlbpSBzY7Ty0PaXfInzd9hSly1Nju8ScHsyf ydJjRuKzLsNPzzOzu9qTr0rDN/4kOnXn8N03HBCbMUmFi4ZSs2lw4qxbrefYKEUh2e+S RNciLqM5v1aqD9HtKMZkIRtEmfEkDRFiDdZ+LL5tu+iE8HWBZf6tgEY23STSEeGYhIWt sLBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=dxXU4mpzkxcQwcn/SZR487jhjpUk6sYg7UJhmpV7TT4=; b=02eKjgWNelNSL7srGfPM75YtqYFSEWRLeqdyvh4M9PQg+txl4qKIcv//YRhSPH0tsE uV9MwQnQA/wQU4A2v8OFr+lQAVkgIMvaLsuZaTBnZa1YbZ1aPUt5cmWPkJnATxSBuuj9 O7dz4U96T5P+L7RW+1QsR1XjHlMirHbEqNqYiRvXTqIYwokHy4NDcCidAg47atzaQ1AQ buMKSFaoJbaqy5+e69uOkF057zhoRfYh6cWWXH0Otr5KiOZJnMuZMaqLO0vu/y3D0GAA wAoQE67j9bh+5VITXAX4HHwYh4WurpXpo+jQsuvndae8KGJukOWRL6ud5J1FD55B2NOv FC1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="y/6VbhgK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j11si12786870edj.43.2019.10.14.09.41.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 09:41:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="y/6VbhgK"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK3PF-0008P0-1C for patch@linaro.org; Mon, 14 Oct 2019 12:41:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37323) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK2qc-00053N-OA for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK2qb-00084n-9G for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:26 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:38063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iK2qb-00084D-2V for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:25 -0400 Received: by mail-wr1-x42e.google.com with SMTP id y18so10928108wrn.5 for ; Mon, 14 Oct 2019 09:05:25 -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=dxXU4mpzkxcQwcn/SZR487jhjpUk6sYg7UJhmpV7TT4=; b=y/6VbhgKZ+kBx3TdLojOW9FX/0guzq9J6n+8Fg6D7e5VxhV1/VFuRTETHfM9sDmPcr gortuSkRJCflkrZck3fI5P4aOMiCHm8CS0Ant3UMen/vSmeaH6e6Y169B3BCne2qJc+D AsAG9EDE6kquOGPYLxa1a1a0AmxZfQ+PP8ZVqWYlPytzOf8rPr2P5i3q66hl+mY/rRPJ /2dZRRJzvnKsvf2R1JHgTZuO3w40BIOALMDcp6RFLRWuwSIJPue8o5vdwrEU82rbfnA/ yQ7hpkCWGC7uwBEXZlTbLx3c6khKKGgWjwlTOkTe2ZuDtm3fgk3liumqUAtNQUPjvQZ9 m0Yg== 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=dxXU4mpzkxcQwcn/SZR487jhjpUk6sYg7UJhmpV7TT4=; b=ZnjClMT28UzSEKdxpDjscs1eqtnk13fnvP/SnkNs2/frPynU0K+cMPNBzOLL8GHK7c 17GiW7VFNhh7D8d1j3IWDnPz6pU4w/cny8kxBSbgigHz9mCa82tLNCRGNUr1lizvlcuz Wl4f+R7cLiYE7t/NL9U2jnsVBIw6l/k49UnXPCrAmg0TRoA5bl46draI9htL+U7UyK7Y effMUsRu6tGg/Kn6NddyhHyYm/D5oDY0FWr6htHGsk8xH3OHjNXj7AjteDVn6F3xLUum kQrraccSkhny6ZRYGaxyUW5aSHhDRwPGvdMBPmGqvM/KcizDb5m57oT755j6m4n28F2K IFpA== X-Gm-Message-State: APjAAAUp86/RkiVeJe3EBi91UKUJ8SPUIrl7KZbQ77leCzjf/4xfAJ0U 89K3sMb5yZSkzuq1UwIbGtViV6F+onvJ0A== X-Received: by 2002:adf:f188:: with SMTP id h8mr26235574wro.38.1571069123766; Mon, 14 Oct 2019 09:05:23 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 5sm18029779wrk.86.2019.10.14.09.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 09:05:23 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 48/68] aspeed/sdmc: Add AST2600 support Date: Mon, 14 Oct 2019 17:03:44 +0100 Message-Id: <20191014160404.19553-49-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191014160404.19553-1-peter.maydell@linaro.org> References: <20191014160404.19553-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Joel Stanley The AST2600 SDMC controller is slightly different from its predecessor (DRAM training). Max memory is now 2G on the AST2600. Signed-off-by: Joel Stanley Signed-off-by: Cédric Le Goater Message-id: 20190925143248.10000-10-clg@kaod.org [clg: - improved commit log - reworked model integration into new object class ] Signed-off-by: Cédric Le Goater Signed-off-by: Peter Maydell --- include/hw/misc/aspeed_sdmc.h | 1 + hw/misc/aspeed_scu.c | 2 + hw/misc/aspeed_sdmc.c | 82 +++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) -- 2.20.1 diff --git a/include/hw/misc/aspeed_sdmc.h b/include/hw/misc/aspeed_sdmc.h index 81156320c49..5dbde59fe77 100644 --- a/include/hw/misc/aspeed_sdmc.h +++ b/include/hw/misc/aspeed_sdmc.h @@ -15,6 +15,7 @@ #define ASPEED_SDMC(obj) OBJECT_CHECK(AspeedSDMCState, (obj), TYPE_ASPEED_SDMC) #define TYPE_ASPEED_2400_SDMC TYPE_ASPEED_SDMC "-ast2400" #define TYPE_ASPEED_2500_SDMC TYPE_ASPEED_SDMC "-ast2500" +#define TYPE_ASPEED_2600_SDMC TYPE_ASPEED_SDMC "-ast2600" #define ASPEED_SDMC_NR_REGS (0x174 >> 2) diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index 84699b78d4c..717509bc546 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -99,6 +99,7 @@ #define AST2600_CLK_STOP_CTRL_CLR TO_REG(0x84) #define AST2600_CLK_STOP_CTRL2 TO_REG(0x90) #define AST2600_CLK_STOP_CTR2L_CLR TO_REG(0x94) +#define AST2600_SDRAM_HANDSHAKE TO_REG(0x100) #define AST2600_HPLL_PARAM TO_REG(0x200) #define AST2600_HPLL_EXT TO_REG(0x204) #define AST2600_MPLL_EXT TO_REG(0x224) @@ -602,6 +603,7 @@ static const uint32_t ast2600_a0_resets[ASPEED_AST2600_SCU_NR_REGS] = { [AST2600_SYS_RST_CTRL2] = 0xFFFFFFFC, [AST2600_CLK_STOP_CTRL] = 0xEFF43E8B, [AST2600_CLK_STOP_CTRL2] = 0xFFF0FFF0, + [AST2600_SDRAM_HANDSHAKE] = 0x00000040, /* SoC completed DRAM init */ [AST2600_HPLL_PARAM] = 0x1000405F, }; diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index 60c99e77348..f3a63a2e01d 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -28,6 +28,7 @@ /* Control/Status Register #1 (ast2500) */ #define R_STATUS1 (0x60 / 4) #define PHY_BUSY_STATE BIT(0) +#define PHY_PLL_LOCK_STATUS BIT(4) #define R_ECC_TEST_CTRL (0x70 / 4) #define ECC_TEST_FINISHED BIT(12) @@ -85,6 +86,11 @@ #define ASPEED_SDMC_AST2500_512MB 0x2 #define ASPEED_SDMC_AST2500_1024MB 0x3 +#define ASPEED_SDMC_AST2600_256MB 0x0 +#define ASPEED_SDMC_AST2600_512MB 0x1 +#define ASPEED_SDMC_AST2600_1024MB 0x2 +#define ASPEED_SDMC_AST2600_2048MB 0x3 + #define ASPEED_SDMC_AST2500_READONLY_MASK \ (ASPEED_SDMC_HW_VERSION(0xf) | ASPEED_SDMC_CACHE_INITIAL_DONE | \ ASPEED_SDMC_AST2500_RESERVED | ASPEED_SDMC_VGA_COMPAT | \ @@ -186,6 +192,28 @@ static int ast2500_rambits(AspeedSDMCState *s) return ASPEED_SDMC_AST2500_512MB; } +static int ast2600_rambits(AspeedSDMCState *s) +{ + switch (s->ram_size >> 20) { + case 256: + return ASPEED_SDMC_AST2600_256MB; + case 512: + return ASPEED_SDMC_AST2600_512MB; + case 1024: + return ASPEED_SDMC_AST2600_1024MB; + case 2048: + return ASPEED_SDMC_AST2600_2048MB; + default: + break; + } + + /* use a common default */ + warn_report("Invalid RAM size 0x%" PRIx64 ". Using default 512M", + s->ram_size); + s->ram_size = 512 << 20; + return ASPEED_SDMC_AST2600_512MB; +} + static void aspeed_sdmc_reset(DeviceState *dev) { AspeedSDMCState *s = ASPEED_SDMC(dev); @@ -340,11 +368,65 @@ static const TypeInfo aspeed_2500_sdmc_info = { .class_init = aspeed_2500_sdmc_class_init, }; +static uint32_t aspeed_2600_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data) +{ + uint32_t fixed_conf = ASPEED_SDMC_HW_VERSION(3) | + ASPEED_SDMC_VGA_APERTURE(ASPEED_SDMC_VGA_64MB) | + ASPEED_SDMC_DRAM_SIZE(ast2600_rambits(s)); + + /* Make sure readonly bits are kept (use ast2500 mask) */ + data &= ~ASPEED_SDMC_AST2500_READONLY_MASK; + + return data | fixed_conf; +} + +static void aspeed_2600_sdmc_write(AspeedSDMCState *s, uint32_t reg, + uint32_t data) +{ + switch (reg) { + case R_CONF: + data = aspeed_2600_sdmc_compute_conf(s, data); + break; + case R_STATUS1: + /* Will never return 'busy'. 'lock status' is always set */ + data &= ~PHY_BUSY_STATE; + data |= PHY_PLL_LOCK_STATUS; + break; + case R_ECC_TEST_CTRL: + /* Always done, always happy */ + data |= ECC_TEST_FINISHED; + data &= ~ECC_TEST_FAIL; + break; + default: + break; + } + + s->regs[reg] = data; +} + +static void aspeed_2600_sdmc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + AspeedSDMCClass *asc = ASPEED_SDMC_CLASS(klass); + + dc->desc = "ASPEED 2600 SDRAM Memory Controller"; + asc->max_ram_size = 2048 << 20; + asc->compute_conf = aspeed_2600_sdmc_compute_conf; + asc->write = aspeed_2600_sdmc_write; +} + +static const TypeInfo aspeed_2600_sdmc_info = { + .name = TYPE_ASPEED_2600_SDMC, + .parent = TYPE_ASPEED_SDMC, + .class_init = aspeed_2600_sdmc_class_init, +}; + static void aspeed_sdmc_register_types(void) { type_register_static(&aspeed_sdmc_info); type_register_static(&aspeed_2400_sdmc_info); type_register_static(&aspeed_2500_sdmc_info); + type_register_static(&aspeed_2600_sdmc_info); } type_init(aspeed_sdmc_register_types);