From patchwork Wed Jul 4 13:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10506881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE0D1601D7 for ; Wed, 4 Jul 2018 13:18:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE8BA28DA2 for ; Wed, 4 Jul 2018 13:18:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C300A28E27; Wed, 4 Jul 2018 13:18:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86E6428DA2 for ; Wed, 4 Jul 2018 13:18:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63FDA6B0272; Wed, 4 Jul 2018 09:18:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 54C0C6B0273; Wed, 4 Jul 2018 09:18:32 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 353066B0274; Wed, 4 Jul 2018 09:18:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f198.google.com (mail-wr0-f198.google.com [209.85.128.198]) by kanga.kvack.org (Postfix) with ESMTP id CAE2E6B0272 for ; Wed, 4 Jul 2018 09:18:31 -0400 (EDT) Received: by mail-wr0-f198.google.com with SMTP id v7-v6so2620586wrn.17 for ; Wed, 04 Jul 2018 06:18:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=r7vsV80ASFCrz5bhH/Ho1e8lEVhTXsYRZjjiPMyN7TE=; b=HvlgPiLqno/4NwGx9ABEslTFppg1uixbuUrxrXlYuZjOatr2uY3ziFCGN7w8XIF+Vj k1cEe7jAQ+tl+EepPzk1BCqee8FVxgd52yok0qeTEVwd8P1Pw+aspRPsl4uU5Ne5hTwy E/pnEoDRPAA7B6/5/AGqukHHyEcTFhwj9R/K5fg4R3ydrbmDMjg3Rp0PXyAp851QAP15 k1iKIU5zE71tk+gRBUAG02IslC6YkQTR/3XpQyh8Q09WcybFEQnYyZ/dB8LM3YiYtn7s MtG2ngMrq3ccen9qgCFtRFa4zCk0XbAzx3lDLMPfQYIH5qE9ZIIYI6tM2SAj0PAL2vn8 mM8g== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: APt69E3CVxgACMamitmm6oItBlpp8W3yplybl1dhC6we+BfxFRK7bNdJ UuN//rjNlF3xkB+1zj1XxpNy8n+XZiFrOp03pHCwb4A5kTiWMIc4T7woTlO7NESpYCp3L9B2Q8D wnHxZT9DZ2dyMnxgL7nHIvzfUpIh1HOLHw0+fOl57Htn0gguz8KZlPsR6m3SPtWI= X-Received: by 2002:adf:8062:: with SMTP id 89-v6mr1520119wrk.221.1530710311274; Wed, 04 Jul 2018 06:18:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfV/CXHCiJT+M3utKSodXzV+nEP3Eo8aSIGXDvLupKXsJBaWjw7NaPVu1rEMriwDqOBxVI+ X-Received: by 2002:adf:8062:: with SMTP id 89-v6mr1520081wrk.221.1530710310493; Wed, 04 Jul 2018 06:18:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530710310; cv=none; d=google.com; s=arc-20160816; b=h8BnR2s/D8V3Z5tgzkKxIeKmugvDbaxWHTO0v0X+D96u7c0LHLHawFhvHPCBzxqZED q9EDyj5zSg1w0dpvoaJbKiMFVNHjqzNfnrKvB1xemD//GADUngc+v3UjbelyoEsfjUf6 s1+pSwdI381wSbkPWFx2CuydtRxXyBCGqf5/DB3VpTdyHHnLhv9M2ni5G+Rj47g0+1Mc bqfltelJ3LoYLDvfWlghSvNungnvSQUmV88VsWC9YiQ7xdh42HC16U+XIN3mQB9kdGVg L0oSxBrEtUT45Jt7ocLdLvqJu4fQRESjagxRGxfWjWiMfh7iZtmWoOwixFKyrYw2pOQz bMbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=r7vsV80ASFCrz5bhH/Ho1e8lEVhTXsYRZjjiPMyN7TE=; b=zKvMcxmYOV2TV4+rHW3XW4XsHBuR7n9LGgXDWU0HL+rBZtKodXXopMjUs36BzTUlEW 7ebQ+NxEuPSTgQbsYvnh0XmJQiX1ecbboYOkm8Qy/NqTaf472hG1u4SscUS9HYYSvl/v j8hw2LROyDujQvMxPzYGVIIR8xyLd9vP9kgtBwIfsmWWVLe+ziE/FpM+hIeGnQ2+RLHi IdfHE1OwQShPsvsorcA4S8jU358v2Miw9Kw3AIIPZt6pSP1r56N7bkd8EMHRtPONeqHu 7QzD9wtNXwOMti7UR4C7Zfoi/Zzj0rwJsT2FyKnT+27AsfV8D/NIhoPZzMeUV0YYtFjU Xwfw== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id t197-v6si2709978wmt.220.2018.07.04.06.18.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jul 2018 06:18:30 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w64D9n9a042864 for ; Wed, 4 Jul 2018 09:18:29 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0b-001b2d01.pphosted.com with ESMTP id 2k0vm5e6u7-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 04 Jul 2018 09:18:28 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Jul 2018 14:18:27 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 4 Jul 2018 14:18:24 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w64DINiU43450380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 4 Jul 2018 13:18:23 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 293484C046; Wed, 4 Jul 2018 16:18:48 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 893AC4C040; Wed, 4 Jul 2018 16:18:46 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.160]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 4 Jul 2018 16:18:46 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 04 Jul 2018 16:18:20 +0300 From: Mike Rapoport To: Ley Foon Tan Cc: Rob Herring , Frank Rowand , Michal Hocko , nios2-dev@lists.rocketboards.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH 2/3] nios2: use generic early_init_dt_add_memory_arch Date: Wed, 4 Jul 2018 16:18:14 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530710295-10774-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1530710295-10774-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18070413-4275-0000-0000-000002951BD9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18070413-4276-0000-0000-0000379CA065 Message-Id: <1530710295-10774-3-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-04_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=815 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807040152 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP All we have to do is to enable memblock, the generic FDT code will take care of the rest. Signed-off-by: Mike Rapoport Acked-by: Ley Foon Tan --- arch/nios2/Kconfig | 1 + arch/nios2/kernel/prom.c | 10 ---------- arch/nios2/kernel/setup.c | 2 ++ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 3d4ec88..5db8fa1 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -19,6 +19,7 @@ config NIOS2 select SPARSE_IRQ select USB_ARCH_HAS_HCD if USB_SUPPORT select CPU_NO_EFFICIENT_FFS + select HAVE_MEMBLOCK config GENERIC_CSUM def_bool y diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index 8d7446a..ba96a49 100644 --- a/arch/nios2/kernel/prom.c +++ b/arch/nios2/kernel/prom.c @@ -32,16 +32,6 @@ #include -void __init early_init_dt_add_memory_arch(u64 base, u64 size) -{ - u64 kernel_start = (u64)virt_to_phys(_text); - - if (!memory_size && - (kernel_start >= base) && (kernel_start < (base + size))) - memory_size = size; - -} - int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 926a02b..0946840 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -147,6 +148,7 @@ void __init setup_arch(char **cmdline_p) console_verbose(); + memory_size = memblock_phys_mem_size(); memory_start = PAGE_ALIGN((unsigned long)__pa(_end)); memory_end = (unsigned long) CONFIG_NIOS2_MEM_BASE + memory_size;