From patchwork Thu Jan 17 10:35:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1026592 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="iXEVguFm"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="GaWRxe86"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43gNTJ3M2bz9rxp for ; Thu, 17 Jan 2019 23:20:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E5A25C21E75; Thu, 17 Jan 2019 12:20:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3A7CFC21E63; Thu, 17 Jan 2019 12:20:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B92BC21E75; Thu, 17 Jan 2019 10:35:12 +0000 (UTC) Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by lists.denx.de (Postfix) with ESMTPS id 09F32C21D4A for ; Thu, 17 Jan 2019 10:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547721311; x=1579257311; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=auurU12NS1maaas1mLWJhujZVECMUYSyMKlLhVVNbwY=; b=iXEVguFmNhruvc7p5XuB4C5LiFQ3Hkf9C2Ahcy8TU5YSYSywA7j+2EcF dmqUM6ZMoHbH1+TRk+7+ViDF8XHaAYBpojlTFAHCbfbKnqUSzIr8y1lHb UsYPSajwGwer2CXnXxnLWhY0UOdIwkbZqjLLpSifndG0E3AhJuuQwSwqH joqOe5HfyZEPl+mcG2jHPQ+I4iSq7qvWyYK7KULPfBLLlnDVLfASz/vGu KAAg+7rrBd6MftzN7FVCWeMynCE6fmzKj6VUalCo9Dtb1ooe1M3dEGsnG /H/l24L4Z0WOb2PKZpCJMXCJuWBNOMTP/OeTSBAqGXzl7DjuMZ2GRCBw3 g==; X-IronPort-AV: E=Sophos;i="5.56,488,1539619200"; d="scan'208";a="100261317" Received: from mail-dm3nam05lp2053.outbound.protection.outlook.com (HELO NAM05-DM3-obe.outbound.protection.outlook.com) ([104.47.49.53]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2019 18:35:06 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=49pZaw41ADwu7SWbErcOrggwkcik05tNY6qzlN+PZvs=; b=GaWRxe86OLNH7utJIQnhE8VHnxzPFwa5+2ykEx3PSlaJRwgQ3ZIic3sbhqRxn0z9R8ouj1k1UTrEdNJ/M+2uwnbp3eXIH9Wt4uMT3C28Pq8dCMhSi4CN/zHEmy2n55UXv0PUq1mM17wGWgIdbyKt911wX/q77CGyxY6jZp4xtsg= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB5557.namprd04.prod.outlook.com (20.178.232.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.24; Thu, 17 Jan 2019 10:35:04 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.018; Thu, 17 Jan 2019 10:35:04 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Joe Hershberger , Lukas Auer , Masahiro Yamada , Simon Glass Thread-Topic: [PATCH 01/11] riscv: Rename cpu/qemu to cpu/generic Thread-Index: AQHUrlBOsIjM/auyIEa5didDDQixwQ== Date: Thu, 17 Jan 2019 10:35:04 +0000 Message-ID: <20190117103435.36564-2-anup.patel@wdc.com> References: <20190117103435.36564-1-anup.patel@wdc.com> In-Reply-To: <20190117103435.36564-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [106.51.16.164] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB5557; 6:8Rs1roKjE0bxvCwcArzqqSnB2NA+tNpNEa3el4AC9f8o6yIJ3vBrqSo2f5H4TOCpoqsMhQRcAzsspHHmYwpg3qwQirmQ6EoKyGpif+fNolISOe3zR60smeya3PG/QwtuLnpgP13NBUqItVOLmfgOfEzsuBX308zU0QZZDUMM0nufo0mD9y76InHgiVID/zAPbx3811cBBUeCpVP5wdF/34lo72JnilCEzkdvSmXtPPm38RWSc0uS1GqfGl3+r39k/gws8RwvYAw9B5I0I6Ea8uXSBe3W4EhxaMBCoQfZcqilaGG6cAboa+m6LkeBAYeyWXCLWhbvKscxmFraMe5WGU0TFFYXL7yHiXftcnvxT7VexpWP0BpBscvSRu4vD6RL40zQEqk6+ZdLnKXvabPwpiePBU4bDhUs2Fr15tZZYQEVgkSk7oO2XORVeECTnoXgqVGdUjGBpPaGKokJzBhwWA==; 5:Klk69vet492qDqzHhjXJgphNGyRT36fqP+jqMUTpBLdY7FgQ4lCINmIMRKoCjTXjjWPhs33guLssEFYfEGZIgpPLOT68nfV1ov1vWWHzKnFeIvaA0JrFAoETTW/W+055JbI1vgfLQXGLXER3nWS7LdG8rp5tvqhMmkFI3oAqPNu58fXdlo6WtxVTCAAlYcJ+Dll52mkgaHUTBsQIMPieYQ==; 7:4akpj3sOiSv/NNjZqvlhfmsbHLv+tjIjiAAW6Ta2TbU84hUNvVm2uPbqTyIwM/gqjBNN6jRQg+NHJUeYE6Kq9W86sL7K/1efjIyURvACqDucQrR0mCcenyhbdRaT5BjL+bvcNbqSZfOEFDHpXeHBfw== x-ms-office365-filtering-correlation-id: f3fa8e18-d5b1-4b2e-da0e-08d67c677111 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5557; x-ms-traffictypediagnostic: BYAPR04MB5557: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0920602B08 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(136003)(346002)(39860400002)(366004)(376002)(189003)(199004)(7736002)(106356001)(9456002)(3846002)(6116002)(52116002)(105586002)(50226002)(6486002)(6436002)(110136005)(54906003)(71200400001)(71190400001)(99286004)(8676002)(8936002)(81166006)(81156014)(1076003)(305945005)(76176011)(102836004)(68736007)(186003)(55236004)(26005)(6506007)(386003)(316002)(78486014)(11346002)(446003)(66066001)(6512007)(5660300001)(44832011)(86362001)(486006)(478600001)(97736004)(14454004)(72206003)(36756003)(256004)(25786009)(2906002)(476003)(53936002)(2616005)(7416002)(39060400002)(4326008)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5557; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: iGm7Px6TeAiZ0cx5WXJRJRUvMz/uZeA4zwmva5jp+forpVlT/Em6SZrOEQw0w/LvC6HyLHovUm/cKc2IehhkbA7GvbWaVlB6O8D0cdVzBSu/XU7/mzgXPcSjHfsnx2mHdH2TGBhheUXIrSIwTgNcS7pzqbFKND0iBWQy5XuwH7GlTB/bILK2ViLT5MvvEw8Sqr8VI3ZJtK8Sj/MjPX7MKQzTIDGsfIVd+3cEtrloXvCOKWI82MErIkqZlgeaLRKHvaHYQe6a5CviUvyy817hWTXHxk4NLffAAnF6WEeNtWFtpX/lqWkWDpnMkm6Y+TblXWJdP0gST8JUEH4DxlHPMYuJzov6Tg0IQ8ewbLA2emhnfctMQ9YWs44KHunSbA2v3/WWYK1dBH9/mN8IZ0kU6Vpw9NqGKFukWFXMfd9Pb9M= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3fa8e18-d5b1-4b2e-da0e-08d67c677111 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2019 10:35:00.6849 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB5557 X-Mailman-Approved-At: Thu, 17 Jan 2019 12:20:42 +0000 Cc: Palmer Dabbelt , U-Boot Mailing List , Alexander Graf , Christoph Hellwig , Paul Walmsley Subject: [U-Boot] [PATCH 01/11] riscv: Rename cpu/qemu to cpu/generic X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The QEMU CPU support under arch/riscv is pretty much generic and works fine for SiFive Unleashed as well. In fact, there will be quite a few RISC-V SOCs for which QEMU CPU support will work fine. This patch renames cpu/qemu to cpu/generic to indicate the above fact. If there are SOC specific errata workarounds required in cpu/generic then those can be done at runtime in cpu/generic based on CPU vendor specific DT compatible string. Signed-off-by: Anup Patel --- arch/riscv/Kconfig | 2 +- arch/riscv/cpu/{qemu => generic}/Kconfig | 2 +- arch/riscv/cpu/{qemu => generic}/Makefile | 0 arch/riscv/cpu/{qemu => generic}/cpu.c | 0 arch/riscv/cpu/{qemu => generic}/dram.c | 0 board/emulation/qemu-riscv/Kconfig | 4 ++-- 6 files changed, 4 insertions(+), 4 deletions(-) rename arch/riscv/cpu/{qemu => generic}/Kconfig (91%) rename arch/riscv/cpu/{qemu => generic}/Makefile (100%) rename arch/riscv/cpu/{qemu => generic}/cpu.c (100%) rename arch/riscv/cpu/{qemu => generic}/dram.c (100%) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index c45e4d73a8..6879047ff7 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -22,7 +22,7 @@ source "board/emulation/qemu-riscv/Kconfig" # platform-specific options below source "arch/riscv/cpu/ax25/Kconfig" -source "arch/riscv/cpu/qemu/Kconfig" +source "arch/riscv/cpu/generic/Kconfig" # architecture-specific options below diff --git a/arch/riscv/cpu/qemu/Kconfig b/arch/riscv/cpu/generic/Kconfig similarity index 91% rename from arch/riscv/cpu/qemu/Kconfig rename to arch/riscv/cpu/generic/Kconfig index f48751e6de..1d6ab5032d 100644 --- a/arch/riscv/cpu/qemu/Kconfig +++ b/arch/riscv/cpu/generic/Kconfig @@ -2,7 +2,7 @@ # # Copyright (C) 2018, Bin Meng -config QEMU_RISCV +config GENERIC_RISCV bool select ARCH_EARLY_INIT_R imply CPU diff --git a/arch/riscv/cpu/qemu/Makefile b/arch/riscv/cpu/generic/Makefile similarity index 100% rename from arch/riscv/cpu/qemu/Makefile rename to arch/riscv/cpu/generic/Makefile diff --git a/arch/riscv/cpu/qemu/cpu.c b/arch/riscv/cpu/generic/cpu.c similarity index 100% rename from arch/riscv/cpu/qemu/cpu.c rename to arch/riscv/cpu/generic/cpu.c diff --git a/arch/riscv/cpu/qemu/dram.c b/arch/riscv/cpu/generic/dram.c similarity index 100% rename from arch/riscv/cpu/qemu/dram.c rename to arch/riscv/cpu/generic/dram.c diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig index 0d865acf10..88d07d568e 100644 --- a/board/emulation/qemu-riscv/Kconfig +++ b/board/emulation/qemu-riscv/Kconfig @@ -7,7 +7,7 @@ config SYS_VENDOR default "emulation" config SYS_CPU - default "qemu" + default "generic" config SYS_CONFIG_NAME default "qemu-riscv" @@ -18,7 +18,7 @@ config SYS_TEXT_BASE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select QEMU_RISCV + select GENERIC_RISCV imply SYS_NS16550 imply VIRTIO_MMIO imply VIRTIO_NET From patchwork Thu Jan 17 10:35:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1026594 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="f7us7JB6"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="P+4MEL2/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43gNVM6ByTz9rxp for ; Thu, 17 Jan 2019 23:21:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5D458C22112; Thu, 17 Jan 2019 12:21:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 98553C2209D; Thu, 17 Jan 2019 12:20:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 542A8C21D8A; Thu, 17 Jan 2019 10:35:13 +0000 (UTC) Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by lists.denx.de (Postfix) with ESMTPS id 95293C21D4A for ; Thu, 17 Jan 2019 10:35:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547721332; x=1579257332; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=H9Xa9aOq/AdBCfV+7yHKZRC8SwG2AaQUoNpZmRX+PB0=; b=f7us7JB6/+4EvSlfBCsBWvXiQ3Zd8UAU5oeYF0E+FqXAdGGRD9bmieZv y0ztiQoUjX5NZwpESFDvBoYuhm3ESANR4DZXgyVnkJeO5SV7eu0GE0d6Z fc+176FtjOf6EYNKgEaY2bJxLZhHXZ81S8odFpXWXo2OyfpJ2vfCKzFmJ w1BzVzmIAD7j5FVzDOFhFC8gLrTxUrr9AobLlgViDd+AS2/TjtV4bXjzQ tweIx9s+6nK0FiEQERa8kyNOaPqc06i0vNa1II/fAVb8T79R5wpDCbH0E 79t0h7e9da5zJqSR4fuLyvXVpxj8XwFcywCN2THzsgutuuqTA30Xbe+Kv w==; X-IronPort-AV: E=Sophos;i="5.56,488,1539619200"; d="scan'208";a="197089405" Received: from mail-by2nam03lp2058.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) ([104.47.42.58]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2019 18:35:30 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V/nVETTlGKqG3AhOJ9naldYMzWVhLamAEY6DOi7UQQ4=; b=P+4MEL2/jMkTCKK7EBADrmo1PHr+yNqJm4pJTiCZbTedkvjuqbPKf7iTmSSp+wsyVxoOFqCTUshwVinEWvW+Wen/RmaSeBlJGFf/AzNRrborfAeZPAf2fT0aDwtvgW+VdSosEuFEEd9XmEZY3dgwQkdVv7u2FN9THWshSxDFdpM= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB5557.namprd04.prod.outlook.com (20.178.232.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.24; Thu, 17 Jan 2019 10:35:09 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.018; Thu, 17 Jan 2019 10:35:09 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Joe Hershberger , Lukas Auer , Masahiro Yamada , Simon Glass Thread-Topic: [PATCH 02/11] riscv: Add asm/dma-mapping.h for DMA mappings Thread-Index: AQHUrlBRgpYlkBNErUy8QpU0X0GoCg== Date: Thu, 17 Jan 2019 10:35:09 +0000 Message-ID: <20190117103435.36564-3-anup.patel@wdc.com> References: <20190117103435.36564-1-anup.patel@wdc.com> In-Reply-To: <20190117103435.36564-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [106.51.16.164] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB5557; 6:ma6u7vSsRbKUhfUEAL3zV/+8WPPplpiOuKErzP+Ck7YdrWyTInxvGAcJC0uHv+hZ3MPvNKRtOtF2G9EGqa5I5suwi27X07j09y/XvZzUOgoZYkpKR1ERLNPwMNGIVKOvYOsHo2LiyXYDrP9x42vdAmB6HD0FR/h1wG+/26ceGaPmwGQR49AVD2F3qVCp1RuU0oYRY9epKg3b8MQQbYJ6/6BaCFR3LusE4qNMBnFwYSfbnaHtdWFE9oUioA60la/kZRr7jGp6WC6Z+ENRQtyNaTivyye1MF3c7lpREYC3LLFRKyOPE9jtOl4LsKZ6MD5GOBW96V8/t8hGHgQu57Ee0JcJ7KZzIn7udsy50G/tTv9e1qAJ+3Pa5/yeQLG1QRg5u8homc5XnynECTD/ML217LUvdOQwDMGZYjxbftJiovPLb9tqp+amygosdt/ujRKVUZdq2c8TxAn1yRUxOX6dUQ==; 5:zVwKkZOc8UeU6Q6Swvg6+B4Q0kBytwFT42b3dDWsxaGj6oFsR3SKuKCHcOKupkpeaJd4cK9o5UVrwwgCfOXiufd2jZG+7SfB/waMxAgAoJZ7vSUjCmG2g9IFqjIx1/ReM3r6RgXUZtabfWMmkJYheAkw0s+DdXyLqN3/GwTCggo8e+iltm13GWSi5Mn27qdBktMbP42hzA5lov3RrRsMcQ==; 7:gqHcTWKPdACBke2ZqMwUHsxsp+yMwUPfTT18gVx6FJca9un7585OCqWi1ebcR3pEgrRovN6RoFXbzlRRRiPgeA+IV0mekBl1O/16xqN+uSnvwCPidYwwbz3E223SVMCp0P9gBbgC90q8Ga2QaAZAbQ== x-ms-office365-filtering-correlation-id: 1e79329c-5301-4c55-a4a4-08d67c677424 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5557; x-ms-traffictypediagnostic: BYAPR04MB5557: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0920602B08 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(136003)(346002)(39860400002)(366004)(376002)(189003)(199004)(7736002)(106356001)(9456002)(3846002)(6116002)(52116002)(105586002)(50226002)(6486002)(6436002)(110136005)(54906003)(71200400001)(71190400001)(99286004)(8676002)(8936002)(81166006)(81156014)(1076003)(305945005)(76176011)(102836004)(68736007)(186003)(55236004)(26005)(6506007)(386003)(316002)(78486014)(11346002)(446003)(66066001)(6512007)(5660300001)(44832011)(86362001)(486006)(478600001)(97736004)(14454004)(72206003)(36756003)(256004)(25786009)(2906002)(476003)(53936002)(2616005)(7416002)(39060400002)(4326008); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5557; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: q5nt0cGGDn1xGPINZhRVMc/cYyl5iMrNPk6gDuCBoUCw4n9/mlRv4f8x7WcNV2Px2N9pmjwClLAQ3+Bfp9hwhyIzdbn5d+za/naH8LwovCXjrH0xGAUxZiw7JTwl+6YGHWbbKlZDS0/UXycKF8wafKeEvKn/GzJvzXvSvK5rx31KP68zZ+d4C391u8fxRLZ1Gc0VFTdToG4pBnqVX802B3YuQeyg5aO3sQLmfitJtaaqh5y2hmWHfMfa8C4pEYBN4+yStafzdTgTsWBk91QrQBDOdren7eZPJc8a2WIvDKwpcX/H9tWAU6HMzLps2qfKSyKROaYrIdXpEVB6JJK7Zbb1LIrEwTt+KsrF7aL0K5QMFBd3489A4zDb7Vn56VyBaF4jymeASV+thTPnzS7NyuuHSvQXpMKs0MA68SS8Vq4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e79329c-5301-4c55-a4a4-08d67c677424 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2019 10:35:05.8256 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB5557 X-Mailman-Approved-At: Thu, 17 Jan 2019 12:20:42 +0000 Cc: Palmer Dabbelt , U-Boot Mailing List , Alexander Graf , Christoph Hellwig , Paul Walmsley Subject: [U-Boot] [PATCH 02/11] riscv: Add asm/dma-mapping.h for DMA mappings X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch adds asm/dma-mapping.h for Linux-like DMA mappings APIs required by some of the drivers (such as, Cadance MACB Ethernet driver). Signed-off-by: Anup Patel Reviewed-by: Bin Meng --- arch/riscv/include/asm/dma-mapping.h | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 arch/riscv/include/asm/dma-mapping.h diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h new file mode 100644 index 0000000000..3d930c90ec --- /dev/null +++ b/arch/riscv/include/asm/dma-mapping.h @@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2018 Western Digital Corporation or its affiliates. + * + * Authors: + * Anup Patel + */ + +#ifndef __ASM_RISCV_DMA_MAPPING_H +#define __ASM_RISCV_DMA_MAPPING_H + +#include + +#define dma_mapping_error(x, y) 0 + +static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) +{ + *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len); + return (void *)*handle; +} + +static inline void dma_free_coherent(void *addr) +{ + free(addr); +} + +static inline unsigned long dma_map_single(volatile void *vaddr, size_t len, + enum dma_data_direction dir) +{ + return (unsigned long)vaddr; +} + +static inline void dma_unmap_single(volatile void *vaddr, size_t len, + unsigned long paddr) +{ +} + +#endif /* __ASM_RISCV_DMA_MAPPING_H */ From patchwork Thu Jan 17 10:35:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1026598 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="iaToGKQs"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="BBYI2pFk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43gNYB4HtBz9rxp for ; Thu, 17 Jan 2019 23:24:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 35CBEC220AE; Thu, 17 Jan 2019 12:21:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6A31EC220C4; Thu, 17 Jan 2019 12:20:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 44ACCC21D8A; Thu, 17 Jan 2019 10:35:23 +0000 (UTC) Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by lists.denx.de (Postfix) with ESMTPS id 82E91C21D4A for ; Thu, 17 Jan 2019 10:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547721347; x=1579257347; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=6S++E/bzQCRf1h3J0kkjgPeRfzXvJYczcZ4ny1i2B+Y=; b=iaToGKQsWB8pnDVahTxpcXeKYwV6w+0oSvVxnZ7IrT0lf8d0IxJxAPBr jxlzO1lUO/+9y6QeZEap8Z0mAZK3g04yGYGBCvVpV2KVPYwfv25hDteGU v7Tn/peHe1RUMVcCulsvPU2D3vhtd9vsleA7HLX9kBBrY5FkASpbjPL7V hqbgDi2samsrsTaPBehmqGY7o2hqlzDok+kBVuwwPoLPB+Hlsyl6At+1N VIi9ffOTPrn7JUGLCIzR7eVpxpYYHspGrdgCtN0hP59aVrZm/12mDWCvj xEGwxzFp0HWZcddOYqBx6Aso3zrMhNIH2M0f8CtmFz7fbbABqSRcrONSq A==; X-IronPort-AV: E=Sophos;i="5.56,488,1539619200"; d="scan'208";a="197089414" Received: from mail-bn3nam01lp2053.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([104.47.33.53]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2019 18:35:43 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K/o7vOwFO726/obQG6WwpXcAg7lAe06K1ZvI5EqVqmM=; b=BBYI2pFkeqFZB4wFDz1FyC6AG8nsOvaZhIM/MmRmRCdCWtQhcLWvmgKvSKDqEXX5vqa0KCoQPV66xgnwZzQ4nqIx17meZdxwytPUJamC/4LcxMeuoYvOO6zbxyOLTVypL2Q1+OQYhFB3J882LuDZ8tCgDYPGki2wK0WjRbFTpps= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB6167.namprd04.prod.outlook.com (20.178.235.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Thu, 17 Jan 2019 10:35:14 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.018; Thu, 17 Jan 2019 10:35:14 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Joe Hershberger , Lukas Auer , Masahiro Yamada , Simon Glass Thread-Topic: [PATCH 03/11] riscv: generic: Ensure that U-Boot runs within 4GB for 64bit systems Thread-Index: AQHUrlBU/LgO0Xkva0KaPLbKVF+23g== Date: Thu, 17 Jan 2019 10:35:14 +0000 Message-ID: <20190117103435.36564-4-anup.patel@wdc.com> References: <20190117103435.36564-1-anup.patel@wdc.com> In-Reply-To: <20190117103435.36564-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [106.51.16.164] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB6167; 6:k0vGeikX+3KiNeARGKChFVAeokRtU17tFLoLKT06WyeeoVebL9fUtTKRb0IgeZvLF8AQX0OCyTuxKKHjDT4PBQYo9TCg0h7lQlkLsRXj9/LB+n8/Va8V81Vnpk5P6JhQbqXynt/cIHwjTo2TZS/g7sur2b0OrV/StH36SLyCB+0L427gwOwU1wd/uP5gqPLhZ/zN4I5P1aQnoftuuhaAmmUpfgy7RSlhg+4vZZec+b9GcrAW1QwBFKEl3k3gpQJ6a2ueBN5pDC8q8PAwBgdhuIcX1+1IMLXfv7ilE7s2oG3QNLGjiH60hCGaqtD6z0GmqHfPjNqHY+GWIlTBQvDhXfA9oz8DqCqwQSOLQMfIfmeHKju3huEXoXjgyZRe4mBCBYapBfOuXFC6wmDGZpwVL2TfXC9AIDgOm2x6mLaFr99XR5EDWr/hgAD52DG2YXbfT8NmUIK0RUvaXq2B+eN3tQ==; 5:WgQPpaWnSDfPkvpPt0RBV+gFgwCO3iyu9RBx/V8q6jmim4ZuDRXoG170OkEmj1JjTvvKI9w1J00XtTzih4He8GInlq6kBHly5hRu6R+k/icCIveInM/pnjBV3LwmCLX3KxcSH926a/Pw20aFHikeNypB/57DS9SSBlaEn6jO/V4dZCjNLM8BX9OHS1z16+cjj212YUYk5Q9KK17hVJnuFg==; 7:G0QPtzPb8tVVjH2Jqi91k+UTGI1eKy5Kx5vNO7Y0LaBoPshrfiYGVXdZxuGKfScEB0rhdJwzkkN0xJZE/gVaTlNRNk5JhhtVBULJZB7UIJxiF3NChpNHKg1D8JaJeZI41Z/drNQDpsjTvzDWM9H0cg== x-ms-office365-filtering-correlation-id: ac3df134-e736-411b-2146-08d67c677729 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600109)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB6167; x-ms-traffictypediagnostic: BYAPR04MB6167: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0920602B08 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(366004)(136003)(39860400002)(396003)(199004)(189003)(78486014)(14454004)(256004)(1076003)(72206003)(478600001)(66066001)(36756003)(86362001)(44832011)(6116002)(105586002)(7416002)(106356001)(3846002)(5660300001)(99286004)(476003)(2616005)(26005)(110136005)(11346002)(446003)(2906002)(316002)(25786009)(52116002)(305945005)(6486002)(6436002)(102836004)(53936002)(6506007)(486006)(54906003)(186003)(386003)(68736007)(39060400002)(9456002)(50226002)(4326008)(71190400001)(6512007)(97736004)(81156014)(81166006)(8936002)(76176011)(7736002)(55236004)(8676002)(71200400001)(41533002); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB6167; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: od0vdWCcVb+2eCfVD7Xef8NV/r1WwV0h8QfupjuuV1Mts5wNKW9G82wyamLPduDwk4iWVcCvHZc5s/8DaKbzhLxdTJhI9CPTKa9XPkRGFxu2L8ctlwtMqOoksU837pBaB8vstnGzcOhfsbs+HbiQtG3XIodSCruPfeMVLpeMk+CxaTW3PAfhOVt6xg7ttJUjALUs/nSz4ZbDYYxOW4IPV3FJZahw14PBuCwyRoYLpQ6Aay/nHh604FikP4wS/VnJsCSkBELoPl45EgaSwp4Yt7ms36aVALtozqUD9p6C0W6mgLKp2f+qHkBKTyPFu2bu7ad7IgC2XhcdTXu0y2bL2jP96b1r2qlbtOiEcua7OqEiqjM/zvdiY9TijFo5mi4Be3Cx4/vTjNQ0ZWHK5p+GYrEADpH369PX69apd63xRVo= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac3df134-e736-411b-2146-08d67c677729 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2019 10:35:10.9194 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB6167 X-Mailman-Approved-At: Thu, 17 Jan 2019 12:20:42 +0000 Cc: Palmer Dabbelt , U-Boot Mailing List , Alexander Graf , Christoph Hellwig , Paul Walmsley Subject: [U-Boot] [PATCH 03/11] riscv: generic: Ensure that U-Boot runs within 4GB for 64bit systems X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" On 64bit systems, the DRAM top can be easily beyond 4GB and U-Boot DMA mapping APIs will generate DMA addresses beyond 4GB. This breaks DMA programming in 32bit DMA capable devices (such as Cadence MACB ethernet). For example, If DRAM is more then 2GB on QEMU sifive_u machine then Cadence MACB ethernet stops working for U-Boot because it is a 32bit DMA capable device. To handle 32bit DMA capable devices on 64bit systems, we provide custom implementation of board_get_usable_ram_top() which ensures that usable ram top is not more then 4GB. This in-turn ensures that U-Boot always runs within 4GB hence DMA addresses generated by DMA mapping APIs will be within 4GB too. Signed-off-by: Anup Patel Signed-off-by: Atish Patra --- arch/riscv/cpu/generic/dram.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/riscv/cpu/generic/dram.c b/arch/riscv/cpu/generic/dram.c index 84d87d2a7f..dea2d3701d 100644 --- a/arch/riscv/cpu/generic/dram.c +++ b/arch/riscv/cpu/generic/dram.c @@ -6,6 +6,8 @@ #include #include +DECLARE_GLOBAL_DATA_PTR; + int dram_init(void) { return fdtdec_setup_mem_size_base(); @@ -15,3 +17,23 @@ int dram_init_banksize(void) { return fdtdec_setup_memory_banksize(); } + +ulong board_get_usable_ram_top(ulong total_size) +{ +#ifdef CONFIG_64BIT + /* + * Ensure that we run from first 4GB so that all + * addresses used by U-Boot are 32bit addresses. + * + * This in-turn ensures that 32bit DMA capabale + * devices work fine because DMA mapping APIs will + * provide 32bit DMA addresses only. + */ + if (gd->ram_top > 0x100000000UL) + return 0x100000000UL; + else + return gd->ram_top; +#else + return gd->ram_top; +#endif +} From patchwork Thu Jan 17 10:35:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1026601 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="AJfdwD6y"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="cY4isYsV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43gNc7455Vz9sBQ for ; Thu, 17 Jan 2019 23:26:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 22250C22077; Thu, 17 Jan 2019 12:22:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 48222C220DC; Thu, 17 Jan 2019 12:20:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 41026C21D8A; Thu, 17 Jan 2019 10:35:26 +0000 (UTC) Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by lists.denx.de (Postfix) with ESMTPS id 66E8EC21D4A for ; Thu, 17 Jan 2019 10:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547721352; x=1579257352; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=kRcPLFAsU2o2yMzuXb0YnwAk9QvygLqiUMAD8N23fPw=; b=AJfdwD6yaVtuDQREN72L2ROxexYU2PlTCyTdLmp3K9OCGOjwdIg6slzI jAJJiPC+pGQaGayj2lhQ+fwZ/tPYAhzWg2eUR/cYmwPIHu1qNHiH0FMvo ZbfdNkxtndEDCDYCma9PUYNgR5u2FzXgmsYie9MHfsMXgbfdpUgYylFCg Hn/j2PIMYo3YaNVqQMNPHmgk/YwlahylJkDYIR263orauAcsManzEGlpc L3ulb9Rbt7AIEvgPzEY80XK42YeCIbImzeacCMMDY8XV2gYaBsfMbQvEh M12JWrAk11rQdTPuKupUqacUgNNkDFQRouS9ew5oFI2/TY3+8hKNuxTzC A==; X-IronPort-AV: E=Sophos;i="5.56,488,1539619200"; d="scan'208";a="197089420" Received: from mail-bn3nam01lp2056.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([104.47.33.56]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2019 18:35:48 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o4KeDLVqkO48Ddjegvmc2e7FwpMq7mnJBXPVMJxU9yc=; b=cY4isYsVHsoeDP0T8edxlgygToKrFZPBOEJbX8LH8Rq/AM3kfttHPLYpq1XJRRCEvZSiHvah5cj06VxL7rIVU6E1nVGETy1H/HkJez4WF2p15sU/CipWYfBH0a97uG/ee0ZRq7FRbzaqht5wq/LpUiF6BdflS/nuFCOcmD+nyG0= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB6167.namprd04.prod.outlook.com (20.178.235.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Thu, 17 Jan 2019 10:35:21 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.018; Thu, 17 Jan 2019 10:35:21 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Joe Hershberger , Lukas Auer , Masahiro Yamada , Simon Glass Thread-Topic: [PATCH 04/11] net: macb: Fix clk API usage for RISC-V systems Thread-Index: AQHUrlBYGXplA6m+1UeWSC1e6PWOrA== Date: Thu, 17 Jan 2019 10:35:20 +0000 Message-ID: <20190117103435.36564-5-anup.patel@wdc.com> References: <20190117103435.36564-1-anup.patel@wdc.com> In-Reply-To: <20190117103435.36564-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [106.51.16.164] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB6167; 6:u/KlPkWshzV8tiQQRey6uf3GTj68jd8TqyD02X7NMpR6BQ1uIOHUFyQ3qOOB4DeoJ3Nk0Jsm8/Xy5HXDeOvUHFyb5Rul7hI6YRTGNfONUj8qheoBun4vxLdHPAY170AnaOvGZdzA2/1b1wuAuq8krGbbmt02eZoIAW5qzBWtFKfOHd+wqKjt/ZZnCs7NIZy5apzNZVW222VmsQiWklWM/1bG9t7dNLIE3JjjxHKE6gHV57jpPDDWtZ42sj11CtUbtST9VWiRh299MBwzrH/5G73fMdX7JBIYKtrmRZBsk5FFvyvyk9NzfbtsDRw5wQJsT27dLfW4QHlAoZsDZ+hdgVExxsSRX2V17TlBEW+2pifpeSQLTt80wFNorZ/TCUB1qB440jLSGTfGTbtvyRGWrngaheps4chDhZpznuYJs/0KbJ2NTMCnTR0/K2KeM9dfjvswytVbjRxEj1cdo8G0gA==; 5:2aN+pjVgYttL0xW6/6YrAY8vdaBha6fS6KCMP0nZUOzZOrExyQY3TQ+aeufs5NsXn+CogRzDj1puwx5LUY0jml6oFFVTwUJ+gIiJ2abNw/fNGSGa3QuTjzMiq7tEpbwnXZvZm4LktWkEM/cDDD5UxrTD5k57hQkrLvTf/zr8Y3/S2gcv1St8ulngBDaxVIs8bmuwWynkgIa9UZmQwrCNeg==; 7:FQL5yr5SU2EN2YLtSs1qoyR7ZqKSDHva0JL+azPTGGC4ZBornDC1zTTSn1zNkxthyQbORpGMs18Gs7RN4lyVdaYjOYh98c3JLnlpSE+nLKRpVLH7aH2Af1fc6f7hLOxSUOR4AWnULCVd1gH+I7C4LA== x-ms-office365-filtering-correlation-id: e7d52fbe-b643-44fe-336f-08d67c677ae5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600109)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB6167; x-ms-traffictypediagnostic: BYAPR04MB6167: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0920602B08 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(366004)(136003)(39860400002)(396003)(199004)(189003)(78486014)(14454004)(256004)(14444005)(1076003)(72206003)(478600001)(66066001)(36756003)(86362001)(44832011)(6116002)(105586002)(7416002)(106356001)(3846002)(5660300001)(99286004)(476003)(2616005)(26005)(110136005)(11346002)(446003)(2906002)(316002)(25786009)(52116002)(305945005)(6486002)(6436002)(102836004)(53936002)(6506007)(486006)(54906003)(186003)(386003)(68736007)(39060400002)(9456002)(50226002)(4326008)(71190400001)(6512007)(97736004)(81156014)(81166006)(8936002)(76176011)(7736002)(4744005)(55236004)(8676002)(71200400001); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB6167; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: nDaidqof05xluguifhUYfQqar1KFuEeczgD179FgCuRuEBle2DUGmmrJUeiDDo79IkwQUmJglvXz5xEEWTG4RN4wELhonMDgQFFtBBg76NZvPnTkEfrlT2T6qq8kmN/8htcSWrrgDVDMAuImFqSVbeKGRRIAluEarX1tAHrTF2+lpPAJDxk5Soo81Lzva2Kbp9dt+ysKZTZI8PpDhKRHSrB1dbfOg9t+afwtzd6nJA4T3ec6J6jgDfwPcfonDAJVNkND6+1BPE4rr/Ei3Npq9/f6HWbTrg6PY4qczf77ITNksoQvQj7bkUfqwjwPthOxD+7N3K3KZfJI4tvlwSb09JqHTPjvpd6J2Ab6FFdkUti6dRCGAPTRG+Q+vhU6QFwrfKqiN4E70Lc7be8WJgN6ggRZKT1jsZSyfPnppjGxgFA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7d52fbe-b643-44fe-336f-08d67c677ae5 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2019 10:35:17.1539 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB6167 X-Mailman-Approved-At: Thu, 17 Jan 2019 12:20:42 +0000 Cc: Palmer Dabbelt , U-Boot Mailing List , Alexander Graf , Christoph Hellwig , Paul Walmsley Subject: [U-Boot] [PATCH 04/11] net: macb: Fix clk API usage for RISC-V systems X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch does following fixes in MACB ethernet driver for using it on RISC-V systems (particularly QEMU sifive_u machine): 1. asm/arch/clk.h is not available on RISC-V port so include it only for non-RISC-V systems. 2. Don't fail in macb_enable_clk() if clk_enable() returns -ENOSYS because we get -ENOSYS for fixed-rate clocks. Signed-off-by: Anup Patel Reviewed-by: Bin Meng --- drivers/net/macb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 94c89c762b..9a06b523cc 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -38,7 +38,9 @@ #include #include #include +#ifndef CONFIG_RISCV #include +#endif #include #include "macb.h" @@ -1066,7 +1068,7 @@ static int macb_enable_clk(struct udevice *dev) */ #ifndef CONFIG_MACB_ZYNQ ret = clk_enable(&clk); - if (ret) + if (ret && ret != -ENOSYS) return ret; #endif From patchwork Thu Jan 17 10:35:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 1026596 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="l0XstIIY"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="IH/1mg/F"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43gNWj406tz9rxp for ; Thu, 17 Jan 2019 23:22:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2F6E4C22077; Thu, 17 Jan 2019 12:22:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=KHOP_BIG_TO_CC, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 20683C220E6; Thu, 17 Jan 2019 12:20:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4FDA1C21D4A; Thu, 17 Jan 2019 10:35:32 +0000 (UTC) Received: from esa2.hgst.iphmx.com (esa2.hgst.iphmx.com [68.232.143.124]) by lists.denx.de (Postfix) with ESMTPS id 9CC97C21D8A for ; Thu, 17 Jan 2019 10:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1547721361; x=1579257361; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+/yR43QNlbmFxhPsq1LECIHSE8eP3WC/aLvgdzY+f28=; b=l0XstIIYN77aF3dA0uScrmS8tr22g8BjD3yE6M+sHuWDJwVYuF4kLzgX Ca4mrl7pRl3T5uvp+td0oDu4qnRTYmEOtIBGghkzK8isWr5+InrGXpD8q 7UszHKEDp5J2WY7uJi61R9FdpN19eLsL3g7BQqVp/5TelVNFhrbSqXTN3 bFzXIQMhuODZahH9pqx+cRxx6K158KmfiUDcZPA/RFlW5PMG1M0uSRX49 d6y4L4UeWso+s9WBQKWHaqlsX7GkmTR3iOqco3m0G1F5J/7s5TazjYNZf ezwHKzzr/bJVr3ROzXLR/DpAA4gXqbZuva2khzZ5LgTKEgZhSPdUrTQrw g==; X-IronPort-AV: E=Sophos;i="5.56,488,1539619200"; d="scan'208";a="197089431" Received: from mail-bn3nam01lp2056.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([104.47.33.56]) by ob1.hgst.iphmx.com with ESMTP; 17 Jan 2019 18:35:56 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pL2aqw6EruZk1eFb/EyJxdJ36HHjMHLmIr5lmoInTkA=; b=IH/1mg/FibKf7LkrzReQqB6AZlmjQ1J4Tok/v7fMbRZnZdTG1SRPh5apt5c+wZRApsHhm95+RH6j3bGdgdH5J+eyaBeWfExsUHP1F9hjnv+4N7DPlE7DYp8RcHj4pPR41wCK6I8DX0JttfbeYGFVcOLsKEMDKXpPY7TaoBcEV3A= Received: from BYAPR04MB5303.namprd04.prod.outlook.com (20.178.49.148) by BYAPR04MB6167.namprd04.prod.outlook.com (20.178.235.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1537.26; Thu, 17 Jan 2019 10:35:26 +0000 Received: from BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94]) by BYAPR04MB5303.namprd04.prod.outlook.com ([fe80::add1:92cc:65d7:5d94%2]) with mapi id 15.20.1537.018; Thu, 17 Jan 2019 10:35:26 +0000 From: Anup Patel To: Rick Chen , Bin Meng , Joe Hershberger , Lukas Auer , Masahiro Yamada , Simon Glass Thread-Topic: [PATCH 05/11] net: macb: Fix GEM hardware detection Thread-Index: AQHUrlBbJWxLOTsrQEygVIjilY1Kxg== Date: Thu, 17 Jan 2019 10:35:26 +0000 Message-ID: <20190117103435.36564-6-anup.patel@wdc.com> References: <20190117103435.36564-1-anup.patel@wdc.com> In-Reply-To: <20190117103435.36564-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0017.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:21::27) To BYAPR04MB5303.namprd04.prod.outlook.com (2603:10b6:a03:c8::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [106.51.16.164] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR04MB6167; 6:wSSoAWHYK0afjV8wv8zimGnO4TZMlHEwyczEKa3Knj96TXSczk7MxXg6O23EvzmjuuKtF+kFP9Y5HoFbrtCOHY9s9fmwspqgKESnKNgdAkS8S/BEkNLIIymvLmW2y86LUouF8Ii55ylCFGcqLLg5ZyEeDSGQOaEz+Bij/R0R63BJwciZ6Xri5jD5g6r5ECqpRLwZ7LFpcPDjRE3REw2LPWUm4pDdeAYHfD122GbQegX+OD/dWKC5x/8V92FjoxyPZeMwQUSAqWS+7T6zpFwA8IzoXtszrXy+YKDfd9QixRBbvKVlEVlfMzaqP/7nUqYBesxm47bkIelS8oyM6DJHHCoFo62JvPtVZ8HBJ6vUNvodlccX0hq7hLzZguX7qmdztodU4B8p52EeYOVQC3rTQ83WroJE8ysNqxDl+eUA0OY7QGdKdZyudO7HPpoRjDXe5hlcOvt/HVeICxRoJTQMNg==; 5:VdYgWFARA5rcU63vzpC1MTMITaqQz4QWOH+y1espb6aUPl0p2LDiY1vVN982dm4Woxf2VPxCOPyqIlJWvut54IVQaModEYZhQ3JaxvuSkAQsERtLEQs9SX6p4LVGmvIayW4EiX1mLkGCRZSOngyFdpyIuTKj4W3q+pImbGxwB0ApTvHyIyqpM/EOSZyebZRQF+bWPZmaBM5BPvr5i56VqA==; 7:xJ/oU6/NFMwc3V2ivj94by1NukV5C5/SWb5rEaAXLseYBanvmLGIgtQAhw+/jtB1hZDUVaQ9zy24OIQ6Yt+rXOfAkaSm7JlX6bkOfXCbqjatB+AXqGcqm8f/dN8pyfdd4oadY8xr7SUXyJXyibMy/w== x-ms-office365-filtering-correlation-id: f01054f8-104a-4ed9-7372-08d67c677e0d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600109)(711020)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB6167; x-ms-traffictypediagnostic: BYAPR04MB6167: wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 0920602B08 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(366004)(136003)(39860400002)(396003)(199004)(189003)(78486014)(14454004)(256004)(14444005)(1076003)(72206003)(478600001)(66066001)(36756003)(86362001)(44832011)(6116002)(105586002)(7416002)(106356001)(3846002)(5660300001)(99286004)(476003)(2616005)(26005)(110136005)(11346002)(446003)(2906002)(316002)(25786009)(52116002)(305945005)(6486002)(6436002)(102836004)(53936002)(6506007)(486006)(54906003)(186003)(386003)(68736007)(39060400002)(9456002)(50226002)(4326008)(71190400001)(6512007)(97736004)(81156014)(81166006)(8936002)(76176011)(7736002)(4744005)(55236004)(8676002)(71200400001); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB6167; H:BYAPR04MB5303.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 7WITNvi11TNB8fFG34oIkeSh6WPR2y+kPzFygp160M1DS390/8+Hss9CkN9l1zvd6q0GUnSozzVSTqJ631HkA3lH9Otztkzd5jkgE5bgV+FoI0bmkihWG0Kf5J9sZ31739SogGX5u9PeURfPnj/vMs0DmWT2HpOemEg3QRoBCont1+NY+8RvdnQtQMvWJOO+ysFxjvl9oov0vhrcJnH92Clc0cxpW25NICHpD/BID18GX5S4sICzdtuVs1+MMoAnDpruExIMo/bvEcZ9iVu4iiBgFiECNs4RVIcAWRDcJHMi0A7r0Sf1+V0H6KRz26mO81RX4A75Xp5XTUvCIRehw/YUBwdQOYDbm39lFig3k5QF2uxNln3w0adJCCYt1G09BjXnCiSkQyqJB2P5UpOReK/WcdwGb7u7zJ3uis8wOhs= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: f01054f8-104a-4ed9-7372-08d67c677e0d X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2019 10:35:22.4821 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB6167 X-Mailman-Approved-At: Thu, 17 Jan 2019 12:20:42 +0000 Cc: Palmer Dabbelt , U-Boot Mailing List , Alexander Graf , Christoph Hellwig , Paul Walmsley Subject: [U-Boot] [PATCH 05/11] net: macb: Fix GEM hardware detection X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Atish Patra Fix MID bit field check to correctly identify all GEM hardwares. The check is updated as per macb driver in Linux location: /drivers/net/ethernet/cadence/macb_main.c:259 Signed-off-by: Atish Patra --- drivers/net/macb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 9a06b523cc..e04ec9a0a3 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -145,7 +145,7 @@ struct macb_device { static int macb_is_gem(struct macb_device *macb) { - return MACB_BFEXT(IDNUM, macb_readl(macb, MID)) == 0x2; + return MACB_BFEXT(IDNUM, macb_readl(macb, MID)) >= 0x2; } #ifndef cpu_is_sama5d2