From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9730DC433E2 for ; Wed, 16 Sep 2020 07:22:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E06A20771 for ; Wed, 16 Sep 2020 07:22:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="QefXceX3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726210AbgIPHWP (ORCPT ); Wed, 16 Sep 2020 03:22:15 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:29791 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726196AbgIPHWO (ORCPT ); Wed, 16 Sep 2020 03:22:14 -0400 X-UUID: fea3a34fe0f34ebfaa90116f6a91b4b9-20200916 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=vdwmOxjXadac1jyLHZrPCTrO5x1Edd+RZbD6GV3fJf8=; b=QefXceX3i4jv/DdyqDskT86AqK5aXSRzqHyHgRZbkPN0/8T1KgaKw73W1fMgmEuUXJD5WXr5/tmA/R9yON3UBesSdxdGTuFt4yySoaISr85k6TDgxU0LJu+QrD1fS8blZcCGmvItnAjjkudWPNjDA2R/aMJwaqo4uag9lt50J8A=; X-UUID: fea3a34fe0f34ebfaa90116f6a91b4b9-20200916 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 672357538; Wed, 16 Sep 2020 15:22:10 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Sep 2020 15:22:09 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Sep 2020 15:22:07 +0800 From: Phil Chang To: CC: Jonathan Corbet , Catalin Marinas , Will Deacon , Mauro Carvalho Chehab , Mark Rutland , Anshuman Khandual , Phil Chang , YJ Chiang , Alix Wu , Mike Rapoport , , , Subject: [PATCH] [PATCH] ARM64: Setup DMA32 zone size by bootargs Date: Wed, 16 Sep 2020 15:22:06 +0800 Message-ID: <20200916072206.27499-1-phil.chang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200915150855.24825-1-phil.chang@mediatek.com> References: <20200915150855.24825-1-phil.chang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org dGhpcyBwYXRjaCBhbGxvd2luZyB0aGUgRE1BMzIgem9uZSBiZSBjb25maWd1cmFibGUgaW4gQVJN NjQuDQoNClNpZ25lZC1vZmYtYnk6IEFsaXggV3UgPGFsaXgud3VAbWVkaWF0ZWsuY29tPg0KU2ln bmVkLW9mZi1ieTogWUogQ2hpYW5nIDx5ai5jaGlhbmdAbWVkaWF0ZWsuY29tPg0KU2lnbmVkLW9m Zi1ieTogUGhpbCBDaGFuZyA8cGhpbC5jaGFuZ0BtZWRpYXRlay5jb20+DQotLS0NCkZvciBzb21l IGRldmljZXMsIHRoZSBtYWluIG1lbW9yeSBzcGxpdCBpbnRvIDIgcGFydCBkdWUgdG8gdGhlIG1l bW9yeQ0KYXJjaGl0ZWN0dXJlLCB0aGUgZWZmaWNpZW50IGFuZCBsZXNzIGluZWZmaWNpZW50IHBh cnQuDQpPbmUgb2YgdGhlIHVzZSBjYXNlIGlzIGZpbmUtdHVuZSB0aGUgZG1hMzIgc2l6ZSB0byBj b250YWluIGFsbCB0aGUNCmVmZmljaWVudCBwYXJ0IG9mIG1lbW9yeSBibG9jayBvbiB0aGlzIGtp bmQgb2YgYXJjaGl0ZWN0dXJlDQoNCiAuLi4vYWRtaW4tZ3VpZGUva2VybmVsLXBhcmFtZXRlcnMu dHh0ICAgICAgICAgfCAgMyArKysNCiBhcmNoL2FybTY0L2luY2x1ZGUvYXNtL21lbW9yeS5oICAg ICAgICAgICAgICAgfCAgMiArKw0KIGFyY2gvYXJtNjQvbW0vaW5pdC5jICAgICAgICAgICAgICAg ICAgICAgICAgICB8IDI2ICsrKysrKysrKysrKysrKysrKy0NCiAzIGZpbGVzIGNoYW5nZWQsIDMw IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkNCg0KZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRp b24vYWRtaW4tZ3VpZGUva2VybmVsLXBhcmFtZXRlcnMudHh0IGIvRG9jdW1lbnRhdGlvbi9hZG1p bi1ndWlkZS9rZXJuZWwtcGFyYW1ldGVycy50eHQNCmluZGV4IGJkYzFmMzNmZDNkMS4uZWYzYmMz ZDQ5MzFhIDEwMDY0NA0KLS0tIGEvRG9jdW1lbnRhdGlvbi9hZG1pbi1ndWlkZS9rZXJuZWwtcGFy YW1ldGVycy50eHQNCisrKyBiL0RvY3VtZW50YXRpb24vYWRtaW4tZ3VpZGUva2VybmVsLXBhcmFt ZXRlcnMudHh0DQpAQCAtOTgwLDYgKzk4MCw5IEBADQogCQkJVGhlIGZpbHRlciBjYW4gYmUgZGlz YWJsZWQgb3IgY2hhbmdlZCB0byBhbm90aGVyDQogCQkJZHJpdmVyIGxhdGVyIHVzaW5nIHN5c2Zz Lg0KIA0KKwlkbWEzMl9zaXplPW5uW0tNR10gIFtLTkwsQk9PVCxBUk02NF0NCisJCQlGb3JjZXMg dGhlIERNQTMyIHpvbmUgc2l6ZSBvZiA8bm4+IGluIE1CLg0KKw0KIAlkcml2ZXJfYXN5bmNfcHJv YmU9ICBbS05MXQ0KIAkJCUxpc3Qgb2YgZHJpdmVyIG5hbWVzIHRvIGJlIHByb2JlZCBhc3luY2hy b25vdXNseS4NCiAJCQlGb3JtYXQ6IDxkcml2ZXJfbmFtZTE+LDxkcml2ZXJfbmFtZTI+Li4uDQpk aWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9tZW1vcnkuaCBiL2FyY2gvYXJtNjQv aW5jbHVkZS9hc20vbWVtb3J5LmgNCmluZGV4IGFmYTcyMjUwNGJmZC4uNzEwZGUwOGFlOGFlIDEw MDY0NA0KLS0tIGEvYXJjaC9hcm02NC9pbmNsdWRlL2FzbS9tZW1vcnkuaA0KKysrIGIvYXJjaC9h cm02NC9pbmNsdWRlL2FzbS9tZW1vcnkuaA0KQEAgLTE3NSw2ICsxNzUsOCBAQCBleHRlcm4gdTY0 CQkJa2ltYWdlX3ZhZGRyOw0KIC8qIHRoZSBvZmZzZXQgYmV0d2VlbiB0aGUga2VybmVsIHZpcnR1 YWwgYW5kIHBoeXNpY2FsIG1hcHBpbmdzICovDQogZXh0ZXJuIHU2NAkJCWtpbWFnZV92b2Zmc2V0 Ow0KIA0KK2V4dGVybiBwaHlzX2FkZHJfdAkJZG1hMzJfem9uZV9zaXplOw0KKw0KIHN0YXRpYyBp bmxpbmUgdW5zaWduZWQgbG9uZyBrYXNscl9vZmZzZXQodm9pZCkNCiB7DQogCXJldHVybiBraW1h Z2VfdmFkZHIgLSBLSU1BR0VfVkFERFI7DQpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02NC9tbS9pbml0 LmMgYi9hcmNoL2FybTY0L21tL2luaXQuYw0KaW5kZXggNDgxZDIyYzMyYTJlLi5mZDFiODVlMTMx Y2MgMTAwNjQ0DQotLS0gYS9hcmNoL2FybTY0L21tL2luaXQuYw0KKysrIGIvYXJjaC9hcm02NC9t bS9pbml0LmMNCkBAIC02MCw2ICs2MCw5IEBAIEVYUE9SVF9TWU1CT0wocGh5c3ZpcnRfb2Zmc2V0 KTsNCiBzdHJ1Y3QgcGFnZSAqdm1lbW1hcCBfX3JvX2FmdGVyX2luaXQ7DQogRVhQT1JUX1NZTUJP TCh2bWVtbWFwKTsNCiANCitwaHlzX2FkZHJfdCBkbWEzMl96b25lX3NpemUgX19yb19hZnRlcl9p bml0Ow0KK0VYUE9SVF9TWU1CT0woZG1hMzJfem9uZV9zaXplKTsNCisNCiAvKg0KICAqIFdlIGNy ZWF0ZSBib3RoIFpPTkVfRE1BIGFuZCBaT05FX0RNQTMyLiBaT05FX0RNQSBjb3ZlcnMgdGhlIGZp cnN0IDFHIG9mDQogICogbWVtb3J5IGFzIHNvbWUgZGV2aWNlcywgbmFtZWx5IHRoZSBSYXNwYmVy cnkgUGkgNCwgaGF2ZSBwZXJpcGhlcmFscyB3aXRoDQpAQCAtMTg5LDcgKzE5MiwxMiBAQCBzdGF0 aWMgdm9pZCBfX2luaXQgcmVzZXJ2ZV9lbGZjb3JlaGRyKHZvaWQpDQogc3RhdGljIHBoeXNfYWRk cl90IF9faW5pdCBtYXhfem9uZV9waHlzKHVuc2lnbmVkIGludCB6b25lX2JpdHMpDQogew0KIAlw aHlzX2FkZHJfdCBvZmZzZXQgPSBtZW1ibG9ja19zdGFydF9vZl9EUkFNKCkgJiBHRU5NQVNLX1VM TCg2Mywgem9uZV9iaXRzKTsNCi0JcmV0dXJuIG1pbihvZmZzZXQgKyAoMVVMTCA8PCB6b25lX2Jp dHMpLCBtZW1ibG9ja19lbmRfb2ZfRFJBTSgpKTsNCisJcGh5c19hZGRyX3Qgem9uZV9zaXplID0g KDFVTEwgPDwgem9uZV9iaXRzKTsNCisNCisJaWYgKElTX0VOQUJMRUQoQ09ORklHX1pPTkVfRE1B MzIpICYmIHpvbmVfYml0cyA9PSAzMiAmJiBkbWEzMl96b25lX3NpemUpDQorCQl6b25lX3NpemUg PSBtaW4oem9uZV9zaXplLCBkbWEzMl96b25lX3NpemUpOw0KKw0KKwlyZXR1cm4gbWluKG9mZnNl dCArIHpvbmVfc2l6ZSwgbWVtYmxvY2tfZW5kX29mX0RSQU0oKSk7DQogfQ0KIA0KIHN0YXRpYyB2 b2lkIF9faW5pdCB6b25lX3NpemVzX2luaXQodW5zaWduZWQgbG9uZyBtaW4sIHVuc2lnbmVkIGxv bmcgbWF4KQ0KQEAgLTI0Miw2ICsyNTAsMjIgQEAgc3RhdGljIGludCBfX2luaXQgZWFybHlfbWVt KGNoYXIgKnApDQogfQ0KIGVhcmx5X3BhcmFtKCJtZW0iLCBlYXJseV9tZW0pOw0KIA0KK3N0YXRp YyBpbnQgX19pbml0IHNldHVwX2RtYTMyX3pvbmUoY2hhciAqcCkNCit7DQorCXVuc2lnbmVkIGxv bmcgbG9uZyBzaXplID0gbWVtcGFyc2UocCwgTlVMTCk7DQorDQorCS8qIERNQTMyIHpvbmUgc2l6 ZSBzaG91bGQgbmV2ZXIgZ3JhdGVyIHRoYW4gNEcgKi8NCisJaWYgKHNpemUgPiBTWl80RykNCisJ CXJldHVybiAtRUlOVkFMOw0KKw0KKwlwcl9ub3RpY2UoIlNldHVwIGRtYTMyIHpvbmUgc2l6ZSB0 byAlbGx1IE1iXG4iLCBzaXplID4+IDIwKTsNCisJZG1hMzJfem9uZV9zaXplID0gc2l6ZTsNCisN CisJcmV0dXJuIDA7DQorfQ0KKw0KK2Vhcmx5X3BhcmFtKCJkbWEzMl9zaXplIiwgc2V0dXBfZG1h MzJfem9uZSk7DQorDQogc3RhdGljIGludCBfX2luaXQgZWFybHlfaW5pdF9kdF9zY2FuX3VzYWJs ZW1lbSh1bnNpZ25lZCBsb25nIG5vZGUsDQogCQljb25zdCBjaGFyICp1bmFtZSwgaW50IGRlcHRo LCB2b2lkICpkYXRhKQ0KIHsNCi0tIA0KMi4xOC4wDQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25836C43461 for ; Wed, 16 Sep 2020 07:22:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B62F52076C for ; Wed, 16 Sep 2020 07:22:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mc9/6TK7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="s9CwiA9x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B62F52076C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zzcDqVRoxCEclf5mDkfq/2bOaJQ4gHgv34Khd1orEFI=; b=mc9/6TK7uO2IIynVjE7P4FIfo MbdlONluIQV6kUXqTnDX0xww6+XKTj3KvCm9meVi6YIuDwoBcrkUuTJ4ymNmTOgKWdUR40HUY+c5N uNdJUJrqTrzVbmauxyOnu3/YfVbOVYwjMDxqIKRkJqchAymBY7DP4sbhWms1xoZuW+Mxrlz7hwG3M dbjZeUocgkMkUpytUD3JErIdKosda/FJpVb9Uvz6uxZn2rw7JDmH80CAgILbHaJ3sYKIw3mR8Jw1z 0ldQR2JgBGKaTLHcGyFxSMwMogqISeKucu6n53RVGSGezStjYBec17jOfI08EKzBBWaWoo7UHw7ik 6pzLK59gg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIRlp-0007Ud-L2; Wed, 16 Sep 2020 07:22:25 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIRll-0007TE-GV; Wed, 16 Sep 2020 07:22:24 +0000 X-UUID: 396f014f978341eaaff4e3d6d12b8e0c-20200915 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=vdwmOxjXadac1jyLHZrPCTrO5x1Edd+RZbD6GV3fJf8=; b=s9CwiA9xkwEqaNfiWAc9u/TBsexRjof9hpqIPdHZ0O1kXTY1XMtl7tlUEnGzDS6OvKqHahnJTGKcmPGvX3/sglOcOiCvWyloTxrfr3BiOKRfft0wnfv2WwsHYI5Fnj5MeMifKpKvqW5gOH4YYLrmmWv4kNTkmmOwbp/LBKCVwwE=; X-UUID: 396f014f978341eaaff4e3d6d12b8e0c-20200915 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1239780873; Tue, 15 Sep 2020 23:22:12 -0800 Received: from MTKMBS06N1.mediatek.inc (172.21.101.129) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Sep 2020 00:22:10 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Sep 2020 15:22:09 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Sep 2020 15:22:07 +0800 From: Phil Chang To: Subject: [PATCH] [PATCH] ARM64: Setup DMA32 zone size by bootargs Date: Wed, 16 Sep 2020 15:22:06 +0800 Message-ID: <20200916072206.27499-1-phil.chang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200915150855.24825-1-phil.chang@mediatek.com> References: <20200915150855.24825-1-phil.chang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_032221_695148_FAD3705B X-CRM114-Status: GOOD ( 19.96 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Alix Wu , linux-doc@vger.kernel.org, Anshuman Khandual , Mauro Carvalho Chehab , Catalin Marinas , YJ Chiang , Jonathan Corbet , Phil Chang , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Will Deacon , Mike Rapoport Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org this patch allowing the DMA32 zone be configurable in ARM64. Signed-off-by: Alix Wu Signed-off-by: YJ Chiang Signed-off-by: Phil Chang --- For some devices, the main memory split into 2 part due to the memory architecture, the efficient and less inefficient part. One of the use case is fine-tune the dma32 size to contain all the efficient part of memory block on this kind of architecture .../admin-guide/kernel-parameters.txt | 3 +++ arch/arm64/include/asm/memory.h | 2 ++ arch/arm64/mm/init.c | 26 ++++++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index bdc1f33fd3d1..ef3bc3d4931a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -980,6 +980,9 @@ The filter can be disabled or changed to another driver later using sysfs. + dma32_size=nn[KMG] [KNL,BOOT,ARM64] + Forces the DMA32 zone size of in MB. + driver_async_probe= [KNL] List of driver names to be probed asynchronously. Format: ,... diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index afa722504bfd..710de08ae8ae 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -175,6 +175,8 @@ extern u64 kimage_vaddr; /* the offset between the kernel virtual and physical mappings */ extern u64 kimage_voffset; +extern phys_addr_t dma32_zone_size; + static inline unsigned long kaslr_offset(void) { return kimage_vaddr - KIMAGE_VADDR; diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 481d22c32a2e..fd1b85e131cc 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -60,6 +60,9 @@ EXPORT_SYMBOL(physvirt_offset); struct page *vmemmap __ro_after_init; EXPORT_SYMBOL(vmemmap); +phys_addr_t dma32_zone_size __ro_after_init; +EXPORT_SYMBOL(dma32_zone_size); + /* * We create both ZONE_DMA and ZONE_DMA32. ZONE_DMA covers the first 1G of * memory as some devices, namely the Raspberry Pi 4, have peripherals with @@ -189,7 +192,12 @@ static void __init reserve_elfcorehdr(void) static phys_addr_t __init max_zone_phys(unsigned int zone_bits) { phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, zone_bits); - return min(offset + (1ULL << zone_bits), memblock_end_of_DRAM()); + phys_addr_t zone_size = (1ULL << zone_bits); + + if (IS_ENABLED(CONFIG_ZONE_DMA32) && zone_bits == 32 && dma32_zone_size) + zone_size = min(zone_size, dma32_zone_size); + + return min(offset + zone_size, memblock_end_of_DRAM()); } static void __init zone_sizes_init(unsigned long min, unsigned long max) @@ -242,6 +250,22 @@ static int __init early_mem(char *p) } early_param("mem", early_mem); +static int __init setup_dma32_zone(char *p) +{ + unsigned long long size = memparse(p, NULL); + + /* DMA32 zone size should never grater than 4G */ + if (size > SZ_4G) + return -EINVAL; + + pr_notice("Setup dma32 zone size to %llu Mb\n", size >> 20); + dma32_zone_size = size; + + return 0; +} + +early_param("dma32_size", setup_dma32_zone); + static int __init early_init_dt_scan_usablemem(unsigned long node, const char *uname, int depth, void *data) { -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6117C43461 for ; Wed, 16 Sep 2020 07:23:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F3702076B for ; Wed, 16 Sep 2020 07:23:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kYUt8wX2"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="s9CwiA9x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F3702076B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=C4HnapacnJTMnYE5VeBLdpUPhcgBHWRRtNWWWd+woAs=; b=kYUt8wX29iBhVwfUSHZkLMCaj 3Sspq3UJNHN2+s4hAfh5tIBGXie47Jt0Zz8LxZt0snZzRcQb//KL4ZXUQ1Y6cZhCZ8mb3dUQiF64I UyxyoJFfO8hL9utJQ8yE3s88SVXsjvQSPyFhnDstPjpiFz5c4Gd+toEjG+T+oqi9Wh9BqXIJ3/0PO Qk9f876FG9Mp0rx/ckoo+hVNkmTErNw8qYz4oLqe+W5gQ2qvwW/0flMLT0W0Upc8DyZ/riv1HHe77 8m3hU2ph6tLP00ygWfB8FUVeGqZo4KxiB9IBuVlSzZB4QtYSzPBQ4snJanxOV6JMaUn2ID0NJ8G2R E4DtKSLhw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIRlq-0007Ul-Cp; Wed, 16 Sep 2020 07:22:26 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIRll-0007TE-GV; Wed, 16 Sep 2020 07:22:24 +0000 X-UUID: 396f014f978341eaaff4e3d6d12b8e0c-20200915 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=vdwmOxjXadac1jyLHZrPCTrO5x1Edd+RZbD6GV3fJf8=; b=s9CwiA9xkwEqaNfiWAc9u/TBsexRjof9hpqIPdHZ0O1kXTY1XMtl7tlUEnGzDS6OvKqHahnJTGKcmPGvX3/sglOcOiCvWyloTxrfr3BiOKRfft0wnfv2WwsHYI5Fnj5MeMifKpKvqW5gOH4YYLrmmWv4kNTkmmOwbp/LBKCVwwE=; X-UUID: 396f014f978341eaaff4e3d6d12b8e0c-20200915 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1239780873; Tue, 15 Sep 2020 23:22:12 -0800 Received: from MTKMBS06N1.mediatek.inc (172.21.101.129) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Sep 2020 00:22:10 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Sep 2020 15:22:09 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 16 Sep 2020 15:22:07 +0800 From: Phil Chang To: Subject: [PATCH] [PATCH] ARM64: Setup DMA32 zone size by bootargs Date: Wed, 16 Sep 2020 15:22:06 +0800 Message-ID: <20200916072206.27499-1-phil.chang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200915150855.24825-1-phil.chang@mediatek.com> References: <20200915150855.24825-1-phil.chang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_032221_695148_FAD3705B X-CRM114-Status: GOOD ( 19.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Alix Wu , linux-doc@vger.kernel.org, Anshuman Khandual , Mauro Carvalho Chehab , Catalin Marinas , YJ Chiang , Jonathan Corbet , Phil Chang , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Will Deacon , Mike Rapoport Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org this patch allowing the DMA32 zone be configurable in ARM64. Signed-off-by: Alix Wu Signed-off-by: YJ Chiang Signed-off-by: Phil Chang --- For some devices, the main memory split into 2 part due to the memory architecture, the efficient and less inefficient part. One of the use case is fine-tune the dma32 size to contain all the efficient part of memory block on this kind of architecture .../admin-guide/kernel-parameters.txt | 3 +++ arch/arm64/include/asm/memory.h | 2 ++ arch/arm64/mm/init.c | 26 ++++++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index bdc1f33fd3d1..ef3bc3d4931a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -980,6 +980,9 @@ The filter can be disabled or changed to another driver later using sysfs. + dma32_size=nn[KMG] [KNL,BOOT,ARM64] + Forces the DMA32 zone size of in MB. + driver_async_probe= [KNL] List of driver names to be probed asynchronously. Format: ,... diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index afa722504bfd..710de08ae8ae 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -175,6 +175,8 @@ extern u64 kimage_vaddr; /* the offset between the kernel virtual and physical mappings */ extern u64 kimage_voffset; +extern phys_addr_t dma32_zone_size; + static inline unsigned long kaslr_offset(void) { return kimage_vaddr - KIMAGE_VADDR; diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 481d22c32a2e..fd1b85e131cc 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -60,6 +60,9 @@ EXPORT_SYMBOL(physvirt_offset); struct page *vmemmap __ro_after_init; EXPORT_SYMBOL(vmemmap); +phys_addr_t dma32_zone_size __ro_after_init; +EXPORT_SYMBOL(dma32_zone_size); + /* * We create both ZONE_DMA and ZONE_DMA32. ZONE_DMA covers the first 1G of * memory as some devices, namely the Raspberry Pi 4, have peripherals with @@ -189,7 +192,12 @@ static void __init reserve_elfcorehdr(void) static phys_addr_t __init max_zone_phys(unsigned int zone_bits) { phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, zone_bits); - return min(offset + (1ULL << zone_bits), memblock_end_of_DRAM()); + phys_addr_t zone_size = (1ULL << zone_bits); + + if (IS_ENABLED(CONFIG_ZONE_DMA32) && zone_bits == 32 && dma32_zone_size) + zone_size = min(zone_size, dma32_zone_size); + + return min(offset + zone_size, memblock_end_of_DRAM()); } static void __init zone_sizes_init(unsigned long min, unsigned long max) @@ -242,6 +250,22 @@ static int __init early_mem(char *p) } early_param("mem", early_mem); +static int __init setup_dma32_zone(char *p) +{ + unsigned long long size = memparse(p, NULL); + + /* DMA32 zone size should never grater than 4G */ + if (size > SZ_4G) + return -EINVAL; + + pr_notice("Setup dma32 zone size to %llu Mb\n", size >> 20); + dma32_zone_size = size; + + return 0; +} + +early_param("dma32_size", setup_dma32_zone); + static int __init early_init_dt_scan_usablemem(unsigned long node, const char *uname, int depth, void *data) { -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel