Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1014345pxb; Thu, 4 Mar 2021 00:32:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEJOS0KkKtmwIJDHKlF0aNvmcmg2Nv1VcFL1UKhc54pKgS/e8tJuS9MaNi+RCF1yVo/QYZ X-Received: by 2002:a17:906:5a8f:: with SMTP id l15mr3000762ejq.462.1614846777391; Thu, 04 Mar 2021 00:32:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614846777; cv=none; d=google.com; s=arc-20160816; b=WxdnDkk7ZNnimFGgAGS1gS//0/gNNRUhvovJNmApUuTXyFZoAC/VZU29/AwbskCrQd KleNJK6ZADNQ/DlRbUQAVOjxx17m4T+8OztPbBOic6DQ0PT0FhVHmIkem9pA1xbPc/fO SNZq7kScRtPsdmyBBWt292fUBmbbNy3buxLONPJw7OOzN4fxnnZEiaAPj353VGWqhfb3 W7CpNdL9nwqAspcRvTIixy6deidbrjXr4NT8nzrVMNHS8B9a7w/T7wAaPW+IPdMe4eUH VqSlUvvDXOXaTcD0quooEkretX6uxco40MSvzai7oHgCjw8yuSrrUWgp4vcoaUQaYd+N PIJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QWCqDwphQ4lBXlPi3udsipY7YBxPU/O3tJ67gQM6Tes=; b=i0YwS7JmaYzBAGZ0kofPSreqJIdRib39zOjxarEXz4tzxUy2bIGK5k+XNyH+xrLrWA geQaEdSauWpPFZFAF7mKYVXX8ZIcAzujiYyB3aq7RN7jzCkzGph8X069xPDihwSmRUwc 6Ba3qpwC5tBVvfk/XWG++3P+DCaRah9R8ifrBF4CZqpDsUrq/L4UsDG/33cgQ89Bjdfv XZTlyKbix2+fb/llUypza57QHRzoDq0eKv2T3GVjQLNdGtYJzICSKIlq5fk/e9GAtiSY CsJE/nPKCgHMSEj3Omtf4rbJAq3MPerUoMUC9wHGe/hM6kqCa9OsB3ukCLHNCbOHk9yB bJyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c26si17371515edx.566.2021.03.04.00.32.35; Thu, 04 Mar 2021 00:32:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443483AbhCCMHL (ORCPT + 99 others); Wed, 3 Mar 2021 07:07:11 -0500 Received: from mail.loongson.cn ([114.242.206.163]:47246 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1353388AbhCCG0G (ORCPT ); Wed, 3 Mar 2021 01:26:06 -0500 Received: from localhost.localdomain (unknown [113.200.148.30]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9AxOdSiKz9gd7ATAA--.25147S6; Wed, 03 Mar 2021 14:24:42 +0800 (CST) From: Qing Zhang To: Rob Herring , Thomas Bogendoerfer , Huacai Chen , Jiaxun Yang , Thomas Gleixner , Marc Zyngier Cc: devicetree@vger.kernel.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, Xingxing Su Subject: [PATCH v2 4/7] MIPS: Loongson64: Add 2K1000 early_printk_port Date: Wed, 3 Mar 2021 14:24:31 +0800 Message-Id: <20210303062434.22280-5-zhangqing@loongson.cn> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210303062434.22280-1-zhangqing@loongson.cn> References: <20210303062434.22280-1-zhangqing@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: AQAAf9AxOdSiKz9gd7ATAA--.25147S6 X-Coremail-Antispam: 1UD129KBjvdXoWrurWUtF4rXr13GryfKr15urg_yoWDuFcE9F WSyw1kCrW5Ar1xC3yrZr4fGFWUua4j9F15uF1DAr1Fva4Yyr93WFWDJanxJFnxArnYvF13 Cw4kJFyfCrnF9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbk8FF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2 IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28E F7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr 1UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUAVWUtwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2 kIc2xKxwCY02Avz4vE14v_GF1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_ Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17 CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0 I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I 8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73 UjIFyTuYvjfU1LvKUUUUU X-CM-SenderInfo: x2kd0wptlqwqxorr0wxvrqhubq/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Distinguish between 3A series CPU and 2K1000 CPU UART0. Signed-off-by: Jiaxun Yang Signed-off-by: Qing Zhang Signed-off-by: Xingxing Su --- v2: - No changes arch/mips/loongson64/init.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c index ed280b73bf89..d5a1eddb8202 100644 --- a/arch/mips/loongson64/init.c +++ b/arch/mips/loongson64/init.c @@ -120,7 +120,10 @@ void __init prom_init(void) #endif /* Hardcode to CPU UART 0 */ - setup_8250_early_printk_port(TO_UNCAC(LOONGSON_REG_BASE + 0x1e0), 0, 1024); + if ((read_c0_prid() & PRID_IMP_MASK) == PRID_IMP_LOONGSON_64R) + setup_8250_early_printk_port(TO_UNCAC(LOONGSON_REG_BASE), 0, 1024); + else + setup_8250_early_printk_port(TO_UNCAC(LOONGSON_REG_BASE + 0x1e0), 0, 1024); register_smp_ops(&loongson3_smp_ops); board_nmi_handler_setup = mips_nmi_setup; -- 2.20.1