From nobody Mon Feb 9 22:43:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.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=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1616465865; cv=none; d=zohomail.com; s=zohoarc; b=L0MzsiP66iCWTnHNJgbDgt9M+z+OJycs2KI2xF1N1CPIVBcV22dU5F4sjOPO+uKBGNccf5SEJRqIiYfYgTPx0GciP6JBpzjrmvx4/2FsNOngUGBTjeVNpV9IVyvHHtjyJMtjU+afbz0koLwD7W9cM/veg6zXicnM7nwCcs1RKh4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616465865; h=Content-Transfer-Encoding:Cc: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; bh=Pg4MlXCqqmOr2q3JPvJFNGjXWhgoxgp7gxcKJYolEa0=; b=cQ78E3oKGmda9il/vhD7yod0LCipwj4UHINOzRUyXddOvhqRHuOhwNIyzXILVu/0doLyOK1d370QSQkbepeXyTbNvZ0DmQhAvjYONW1bv6AUV0T5DZjRRcbEhnysrL46eCET/yueIypO16lvdkATmbayoz2VW5AugpiFxLsGjr8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zohomail.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 1616465865670582.0586458481284; Mon, 22 Mar 2021 19:17:45 -0700 (PDT) Received: from localhost ([::1]:45516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOWc4-0002vM-JV for importer@patchew.org; Mon, 22 Mar 2021 22:17:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOWL0-0003Bt-LD for qemu-devel@nongnu.org; Mon, 22 Mar 2021 22:00:06 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:2065) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOWKy-0006tH-Mg for qemu-devel@nongnu.org; Mon, 22 Mar 2021 22:00:06 -0400 Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 23 Mar 2021 09:59:41 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2021 18:41:49 -0700 Received: from cn6ntbqq2.ad.shared (HELO alistair-risc6-laptop.hgst.com) ([10.86.49.5]) by uls-op-cesaip01.wdc.com with ESMTP; 22 Mar 2021 18:59:41 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1616464804; x=1648000804; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mXSaw2aL0sxPF+xu4Mg8aZKNjLty8M+Q4NARUvJlxh8=; b=Xby+/rR7AYQzdS85OoQbIOgJ8uRJO3JBFjw2uLuEQRB3KrQHm9w47UjJ +yIpjE7YNqQVbfo40sXppSYbm7PJn+M8OA5xAaRyWg7iJwrUOLvQArZ7G i5LAY6tgQ9yqMBwsogAlXwALxRmD3GVBlW9rN1JdXE0TKUgfWdVMxFjok V2UGS2TskIQL5Pxein0kofn9iATB25k1m+WwdKmsh+t5tuiKhEBKOGzYe qKrrEAN0SH8cb+tkLOP2ERUzNazCrHELyQhbqWAgPd33IkLUQT9/z+lOf ePPgvqIXO+OtA1fQ4HD0tNSgv1qdYlrOb9m3ZXcnNpzlnS3X1m2KSM8dT A==; IronPort-SDR: A/5eb2w/Vh6ocFZ8cHY2cAa3UTYrGogSKFx2Kk79e5BVB2rxjsRqxoWgdWItdl7Ay6Sicbxcy2 ucj//pRNIdTRPO1mUr1g9Z+TYQN1KuGc1pXTibYP0qOt9bmR6QVb/PhQX8Ftem1zczxj1UUqLm bPA1wLpttRMwlPq4bx5upuk7HLEqHFnsu9Do/cuoYNLyn5PBY4gj16uvGGFrSayhLFw7zPHNCL 0PfYN4ySIKosqnfKTSJHPbn+lZbAYr9Ns/BrESj+TMAkhUZbKuFGcp+X8uTy2xkOPErzCscZHf G0k= X-IronPort-AV: E=Sophos;i="5.81,270,1610380800"; d="scan'208";a="162707648" IronPort-SDR: Z44toVkR9c0qHw9/Nbl+6KhCiWjOWefkg6wc80z2ZG7zWBGHuOAfytYXXaoBMw3Epgcr65IIWb MVaRStOAatQo/2IKF4SBeX8xjNbUfcxOiZv6etnljl6DevNKYaU254odRIW4v+o9KIlU15G4Jl L11tmqD3YEGtCCMTS/TtmP3flB2Q3/Z9aEPlumFEoUURbb+A5okj4z08mLPMdvj2OW5Dqch60v qQkkYy7TRXhhwHLCUVwoUr5z1FYSAAlsp+rRXnQSVGpJA9MPhzvZQola02Gpo8ZgFdVm2L/+4b rUtI0kqICY7HBrAY30/3CBoL IronPort-SDR: uU8EqSWiT5pSXY4wKIgdIaTHXhsFORyN5XL2vapNpwvE5Fruqd/pGiifPLuksUmeUrA5Snxn8h bvsbiBEWGBnipC7yIv8dA07u++Gadr3OdNVDCUdG1Y12zBl9YjBWC4JG1hT/aTKHeZLT+bpP/9 S0bHTVDAn8p2JRfMucKffID+VrFUNb7279+IcV2WubTC49+6jULeq0zwb9hwxu8R+z0wP0VzBT qoJv345Jucc5hcGkn+B34KVBBBgzrRjDUm/wiUFdh2DR9rpgCK2p+wxKvLbOknt5xX+ggx4Q+0 EXY= WDCIronportException: Internal From: Alistair Francis To: peter.maydell@linaro.org Subject: [PULL 14/16] hw/riscv: microchip_pfsoc: Map EMMC/SD mux register Date: Mon, 22 Mar 2021 21:57:54 -0400 Message-Id: <20210323015756.3168650-15-alistair.francis@wdc.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210323015756.3168650-1-alistair.francis@wdc.com> References: <20210323015756.3168650-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=709ee912d=alistair.francis@wdc.com; helo=esa4.hgst.iphmx.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: alistair23@gmail.com, Bin Meng , Alistair Francis , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Bin Meng Since HSS commit c20a89f8dcac, the Icicle Kit reference design has been updated to use a register mapped at 0x4f000000 instead of a GPIO to control whether eMMC or SD card is to be used. With this support the same HSS image can be used for both eMMC and SD card boot flow, while previously two different board configurations were used. This is undocumented but one can take a look at the HSS code HSS_MMCInit() in services/mmc/mmc_api.c. With this commit, HSS image built from 2020.12 release boots again. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Message-id: 20210322075248.136255-1-bmeng.cn@gmail.com Signed-off-by: Alistair Francis --- include/hw/riscv/microchip_pfsoc.h | 1 + hw/riscv/microchip_pfsoc.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/hw/riscv/microchip_pfsoc.h b/include/hw/riscv/microchi= p_pfsoc.h index d0c666aae0..d30916f45d 100644 --- a/include/hw/riscv/microchip_pfsoc.h +++ b/include/hw/riscv/microchip_pfsoc.h @@ -109,6 +109,7 @@ enum { MICROCHIP_PFSOC_ENVM_DATA, MICROCHIP_PFSOC_QSPI_XIP, MICROCHIP_PFSOC_IOSCB, + MICROCHIP_PFSOC_EMMC_SD_MUX, MICROCHIP_PFSOC_DRAM_LO, MICROCHIP_PFSOC_DRAM_LO_ALIAS, MICROCHIP_PFSOC_DRAM_HI, diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index 266f1c3342..c4146b7a6b 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -122,6 +122,7 @@ static const MemMapEntry microchip_pfsoc_memmap[] =3D { [MICROCHIP_PFSOC_ENVM_DATA] =3D { 0x20220000, 0x20000 }, [MICROCHIP_PFSOC_QSPI_XIP] =3D { 0x21000000, 0x1000000 }, [MICROCHIP_PFSOC_IOSCB] =3D { 0x30000000, 0x10000000 }, + [MICROCHIP_PFSOC_EMMC_SD_MUX] =3D { 0x4f000000, 0x4 }, [MICROCHIP_PFSOC_DRAM_LO] =3D { 0x80000000, 0x40000000 }, [MICROCHIP_PFSOC_DRAM_LO_ALIAS] =3D { 0xc0000000, 0x40000000 }, [MICROCHIP_PFSOC_DRAM_HI] =3D { 0x1000000000, 0x0 }, @@ -411,6 +412,11 @@ static void microchip_pfsoc_soc_realize(DeviceState *d= ev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->ioscb), 0, memmap[MICROCHIP_PFSOC_IOSCB].base); =20 + /* eMMC/SD mux */ + create_unimplemented_device("microchip.pfsoc.emmc_sd_mux", + memmap[MICROCHIP_PFSOC_EMMC_SD_MUX].base, + memmap[MICROCHIP_PFSOC_EMMC_SD_MUX].size); + /* QSPI Flash */ memory_region_init_rom(qspi_xip_mem, OBJECT(dev), "microchip.pfsoc.qspi_xip", --=20 2.30.1