From patchwork Fri Mar 31 08:13:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 77639 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp414836vqo; Fri, 31 Mar 2023 01:53:18 -0700 (PDT) X-Google-Smtp-Source: AKy350bT+mGt2Gg5pHzN7Whm9Zk2S78xqGvOPXblTY/IPcyqmWq6ehbLAQU9JGe5ly95dTE/aGB5 X-Received: by 2002:aa7:cac5:0:b0:500:4a5d:af3f with SMTP id l5-20020aa7cac5000000b005004a5daf3fmr26339463edt.34.1680252797966; Fri, 31 Mar 2023 01:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680252797; cv=none; d=google.com; s=arc-20160816; b=YxhcWSyK2iHjsa4uOZEJ+7EL13cnvgj8kX7JA7GUsOSXDyxy7vT4qYMAp6K1ft1/n8 ZowOpClfiHCWHc2Jd+Xnfsd63oyBUk5QUcUepvqpIc+5wkEGCyQNyl4BCgVRop1VmzOL oQO1kS6kuBtPUDri5MGQn4Mu06Z/4aqUKxg50GOHlAod3rrVWu4qArUfrmtwra5ARD4s 1pUuZ4EMwjh+A+Ge0cbiJISPAftNO4pnGXAQgjPuMEssTIgl8CfeQrZzoRaa66QC8AQa GeAaTlsuzU1uQQ4jjowx2jegD8EFeiNpcNw0sKs5qh1HGzPt0+HvOnC8PnA8cp0p1ieo C4eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=bLRau4h9iBqcxKOLKJeBgVzrNek61vWkQDREiWjFOro=; b=rCcoFH0ankh7ZaAXrtKqJPIWbfFuoj0cRw4aENPRjUwZK+vk7bSZTWOQj2XbyfN74O jfiE/G0q9BX0YESUxQwT7w0nrM3liSXPBscBa8tnhXJG7psNUf7HvkYSiKVaOF9xST7H dozzHPW0JDEgb8A55SHGFVnu0KENxVRGSBfsTXRMpwRXeo+c3zz2f4Cnq6iRGVuVUXRM 2ijyNUNKHGa2ubOEoFGO7DTl4RsFXcZ2rkFmjgpoRtFdnwUC1rJP6A6p9AG6r0ZIHZ03 OZQoXm3Xia9hkmYsSPyarrdvCwrdGMCUc7ntgVX8IMOoZ08bTSsAfBJ2mvfiDWotZH6b 0eqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t8-20020aa7d708000000b004c4a3295106si1495158edq.17.2023.03.31.01.52.54; Fri, 31 Mar 2023 01:53:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231232AbjCaIQM (ORCPT + 99 others); Fri, 31 Mar 2023 04:16:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231548AbjCaIQJ (ORCPT ); Fri, 31 Mar 2023 04:16:09 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 71CF118F for ; Fri, 31 Mar 2023 01:16:07 -0700 (PDT) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8DxUOWiliZkDuEUAA--.32107S3; Fri, 31 Mar 2023 16:15:30 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Axmr1FliZkPusRAA--.12839S2; Fri, 31 Mar 2023 16:13:58 +0800 (CST) From: Tiezhu Yang To: Huacai Chen , WANG Xuerui Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, loongson-kernel@lists.loongnix.cn Subject: [PATCH] LoongArch: Clean up plat_swiotlb_setup() related code Date: Fri, 31 Mar 2023 16:13:52 +0800 Message-Id: <1680250432-9396-1-git-send-email-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.1.0 X-CM-TRANSID: AQAAf8Axmr1FliZkPusRAA--.12839S2 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBjvJXoW7KFWDAF1UCw18AryDWr1rWFg_yoW8WrW3pF 9rZrykJF48Gr97Za4DAw1kuFy5Jw1kGw12ga17uas5ArnrWr1DXr1vqr9xZF10qayrJF4F ga4rKasIv3WUJ3DanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU b3kYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW5JVW7JwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4 x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4UJVWxJr1l n4kS14v26r1Y6r17M2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6x ACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1Y6r17McIj6I8E 87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82 IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l4IxYO2xFxVAFwI0_Jrv_JF1lx2Iq xVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r 126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY 6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67 AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x 07jepB-UUUUU= X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761872758222527570?= X-GMAIL-MSGID: =?utf-8?q?1761872758222527570?= After commit c78c43fe7d42 ("LoongArch: Use acpi_arch_dma_setup() and remove ARCH_HAS_PHYS_TO_DMA"), plat_swiotlb_setup() has been deleted, clean up the related code. Signed-off-by: Tiezhu Yang --- arch/loongarch/include/asm/bootinfo.h | 1 - arch/loongarch/kernel/setup.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/include/asm/bootinfo.h b/arch/loongarch/include/asm/bootinfo.h index 0051b52..c607968 100644 --- a/arch/loongarch/include/asm/bootinfo.h +++ b/arch/loongarch/include/asm/bootinfo.h @@ -13,7 +13,6 @@ const char *get_system_type(void); extern void init_environ(void); extern void memblock_init(void); extern void platform_init(void); -extern void plat_swiotlb_setup(void); extern int __init init_numa_memory(void); struct loongson_board_info { diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 27f71f9..4444b13 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -389,8 +389,8 @@ static void __init arch_mem_init(char **cmdline_p) /* * In order to reduce the possibility of kernel panic when failed to * get IO TLB memory under CONFIG_SWIOTLB, it is better to allocate - * low memory as small as possible before plat_swiotlb_setup(), so - * make sparse_init() using top-down allocation. + * low memory as small as possible before swiotlb_init(), so make + * sparse_init() using top-down allocation. */ memblock_set_bottom_up(false); sparse_init();