From patchwork Thu Jan 30 12:06:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1231399 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=kzv4L0iI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 487fGv1VQTz9sP6 for ; Thu, 30 Jan 2020 23:06:59 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2A76081BCA; Thu, 30 Jan 2020 13:06:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="kzv4L0iI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E768F81BCB; Thu, 30 Jan 2020 13:06:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FORGED_SPF_HELO, SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2071d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::71d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 992C581B4A for ; Thu, 30 Jan 2020 13:06:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FNZSYqeLIYjkUpCvc8U3T0X4GoTyMqaV/LGwxSfd4595oHt/LrMQk7KcT2AJzhmqY2NvOMsJGKz8VC6uFxU1lcX9B3H7zzdQsofk7F19JxGKh8NZ+UubiY6XV+DbC4ahLLZ49TlmhUgE7XsdS4UYZn0eB17pvnx64U3ega6VfwbbMwHC1ImAOErI3kSWfW04X0a5PMI6iUFSYb0rIoXRDeqUNIgFKSYyLTjxgPCBV5y6EIVS6Xtc2mko4UGOaqOU0+2YaXo5W77yFLDwjM33HGi8D1319g1tv+npoAkwkpPUnfbdVbcxN84V5/HLBpRcgV2XvFR47Kdju2V0K1LNnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=os8jPAPHB+y9oICC/VXdhmUoSV3fDPVitWC1enPy8WA=; b=WCHMDumk4lrk8zpeYHtagdSp0bYyrvZfC5JTNnu00iZ1eWd1NC21hZ4tWbrL4BxTC/u6wKJAWgbtgtw/vk6Y/yQnxM9wPsqy3sS7NEM3qlt2rMmRR+DI5HSCGRPsYJnva0pgpJlP5YKCyO3hx7/gGk2QUzHX5pu+i0q9LkUytbKaZQByHvEK06p1+EMmrhejF8y08M8of3zD8eSsMQAHxlEWB2yxkKDNWO/wSz3loJQ2mwT/fa1AO+QEj3kmJ/CA9eJkEr+k4lqOgtm72yZFLltTUWdMbmzpmaJaJq9mEeOR5/h7R3LeIznqaVPzdPxlQAjWl8T1JS3nbS2Mxo7GCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=os8jPAPHB+y9oICC/VXdhmUoSV3fDPVitWC1enPy8WA=; b=kzv4L0iId5doTumjw5D5VKW0iYxHAZ1BPYjT2GvAPR03iv6SlZWgyHfsjX2PsSdVYNX/bk34bqN1k4CL1/uTGm7ANw0zZoio4VVFjfMu1nObOLdBP6LgqKxx4CAm/WhZgdcfZ6gwW/RU+G4h8gUhsgSjVUTgbEWNAjGK40CNYbo= Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (20.178.126.85) by VI1PR10MB1646.EURPRD10.PROD.OUTLOOK.COM (10.165.196.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.27; Thu, 30 Jan 2020 12:06:47 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::8175:5aa2:2870:766d]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::8175:5aa2:2870:766d%6]) with mapi id 15.20.2665.027; Thu, 30 Jan 2020 12:06:46 +0000 Received: from prevas-ravi.prevas.se (81.216.59.226) by HE1PR0401CA0072.eurprd04.prod.outlook.com (2603:10a6:3:19::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.27 via Frontend Transport; Thu, 30 Jan 2020 12:06:45 +0000 From: Rasmus Villemoes To: "u-boot@lists.denx.de" Subject: [PATCH] mmc: fsl_esdhc: actually enable cache snooping on mpc830x Thread-Topic: [PATCH] mmc: fsl_esdhc: actually enable cache snooping on mpc830x Thread-Index: AQHV12W+YFACf1b3OU2+GrXl5M4cSw== Date: Thu, 30 Jan 2020 12:06:45 +0000 Message-ID: <20200130120634.23079-1-rasmus.villemoes@prevas.dk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR0401CA0072.eurprd04.prod.outlook.com (2603:10a6:3:19::40) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) x-mailer: git-send-email 2.23.0 authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasmus.villemoes@prevas.dk; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [81.216.59.226] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2121a826-4067-41ac-f25d-08d7a57ce08f x-ms-traffictypediagnostic: VI1PR10MB1646: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-forefront-prvs: 02981BE340 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(39850400004)(396003)(366004)(136003)(199004)(189003)(478600001)(8676002)(2906002)(2616005)(956004)(52116002)(316002)(5660300002)(44832011)(6506007)(81166006)(186003)(107886003)(81156014)(6916009)(36756003)(16526019)(8936002)(6512007)(1076003)(64756008)(66446008)(71200400001)(66946007)(86362001)(66556008)(66476007)(54906003)(8976002)(4326008)(6486002)(26005); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR10MB1646; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: prevas.dk does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OPIQ9DG8wSTrcmwDJ2mbJIZuVCVVuPLQRX8+OdVwVxXaRYsYmPmliSpF+/racvsPiJvf9KKpQSQ6RXrf/WXJO40VLLFxlV/y1AW2FEVswscHtoLwnrdA6jkfB0tpmkDxIkZaldSKGLEBcz5xoUjMRlhPq1mzmWadVZKanZfoXA8wN7dLwPKAXNbbwHrV1svOf66jQJh3qk7/kGDZhyCR61A8+PvweSe6p4US1Oe2aeFPQGKsshhN+V9e8KCDD69oRN7TCqH3UBB5j4+G9eJiijAR4k2h4J1AoXrlDBuRy5zJqa6QMdB6GNCCAc7XM7GjF2UchJV/3DccU/DjqM8seOyzfZ9Mfai9GWIVwLmb1zuAcgAT9UDhVITRyoRr2TGKD1EXYO78bruEpakf/drOX7vDnwsb3p9w4B2KmHrKbJTOvx/hz1AeOopSkpNnPH1T x-ms-exchange-antispam-messagedata: 2INt5eFsF0O11gWNguylPClKDWjAao1GttcGbls66S2J+LoJZlC9MWAxZK3lx3y4Gcs+sj6I0xz1JH+/Sb3puoVs78TDisU7ILGUtuBaKmKtvfpjXc6mLe/bbAO6vYMc37i+/gKLnu8SXPOPRaYlQg== MIME-Version: 1.0 X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 2121a826-4067-41ac-f25d-08d7a57ce08f X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2020 12:06:46.6867 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: S6et2TJjYuskaRex5AdBlxAMiSXZt6iBx+68XkfSJNqkmcEzcfFoAu4/ScM3h6tKfjKhS8IaQ3M6ItypW71XhheE+hXPcInGau5aag2QvZA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB1646 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean The reference manuals for MPC8308 and MPC8309 both say that the esdhcctl aka DMA Control Register "is implemented as SDHCCR" in the System configuration registers. Unfortunately, that doesn't mean that the registers are just mirrors of each other - any write to esdhcctl is simply ignored. So to actually enable cache snooping, we unfortunately have to add a little ifdeffery. There is, naturally, no description of the bit fields of esdhcctl in the MPC8309 manual, but comparing the description of esdhcctl from the LS1021A reference manual to the description of the sdhccr in MPC8309, one also finds that the fields are bit-reversed, so the bit to set is 0x02000000 rather than 0x00000040 - this is also what board_mmc_init() uses in the two gdsys/mpc8308/ boards. Signed-off-by: Rasmus Villemoes Reviewed-by: Yangbo Lu --- drivers/mmc/fsl_esdhc.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 1e7d606cd8..34e5bd270f 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -577,6 +577,18 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) return 0; } +static void esdhc_enable_cache_snooping(struct fsl_esdhc *regs) +{ +#ifdef CONFIG_ARCH_MPC830X + immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; + sysconf83xx_t *sysconf = &immr->sysconf; + + setbits_be32(&sysconf->sdhccr, 0x02000000); +#else + esdhc_write32(®s->esdhcctl, 0x00000040); +#endif +} + static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) { struct fsl_esdhc *regs = priv->esdhc_regs; @@ -592,8 +604,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc) return -ETIMEDOUT; } - /* Enable cache snooping */ - esdhc_write32(®s->esdhcctl, 0x00000040); + esdhc_enable_cache_snooping(regs); esdhc_setbits32(®s->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN);