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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 67C1DC432C3 for ; Wed, 27 Nov 2019 17:26:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4681020684 for ; Wed, 27 Nov 2019 17:26:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727117AbfK0RZ7 convert rfc822-to-8bit (ORCPT ); Wed, 27 Nov 2019 12:25:59 -0500 Received: from mail-yw1-f65.google.com ([209.85.161.65]:37376 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726292AbfK0RZ7 (ORCPT ); Wed, 27 Nov 2019 12:25:59 -0500 Received: by mail-yw1-f65.google.com with SMTP id 4so8239113ywx.4; Wed, 27 Nov 2019 09:25:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=JRvuKyuIOQvF9AQSNTrj3uSPTaDg8FtRv0pACDML4ic=; b=Ue553OTEDOmSKdKj13BlQ3Z69lqQ2WBe8thKchHE/+AwSLE3G+5Yz55kzDOX4tZ+dm fKOOBIeCAuBX88pZXzmIfX0++hc/8qyAxkpZISKb65SpxEeDr7bO4MgNherMmlRooIoB +95Die/3SWUGyaPPAs1wEboSw6k4ahBBuHx6JXCDD/D84l/2d8AT3oOvsxv2e15M/rGy 9C+CtpsD8VuSkQHFAmYbVDePS+AuofnV907BvJrdfOel0pAFC2QGGpUvWfs7HklYfxIM 2DNcS8JVbsspnA4Fq6+LGVGtyy2UpxbIwN2bwU02zQ3MgaTk1TjpzMCCkXb+nhwPpYDR SMrw== X-Gm-Message-State: APjAAAV0CNh2TpBdxSSUdkucz/U2EQHl9pHFP3/SgjUpXhdSMTz+gPGS w4ws/eCuk5U+nCMhsSP+o1GtgjgdvA4883tRISrbff72 X-Google-Smtp-Source: APXvYqwmBHGxI5HEzDr+oN8T1Z4DLvRjLlJfDPqNUvL4LMPBhAs+G2Kng5SnQHBaBpEa8Ye8EpeV+KjxhxoJE1ANwZc= X-Received: by 2002:a81:c609:: with SMTP id l9mr3661232ywi.37.1574875558029; Wed, 27 Nov 2019 09:25:58 -0800 (PST) MIME-Version: 1.0 References: <20191127152612.21945-1-linux@roeck-us.net> In-Reply-To: <20191127152612.21945-1-linux@roeck-us.net> From: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Date: Wed, 27 Nov 2019 18:25:47 +0100 Message-ID: Subject: Re: [PATCH] MIPS: Fix boot on Fuloong2 systems To: Guenter Roeck Cc: Paul Burton , Ralf Baechle , James Hogan , "open list:BROADCOM NVRAM DRIVER" , open list , Jiaxun Yang Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 27, 2019 at 4:28 PM Guenter Roeck wrote: > Commit 268a2d60013049 ("MIPS: Loongson64: Rename CPU TYPES") changed > Kconfig symbols as follows: > CPU_LOONGSON2 to CPU_LOONGSON2EF > CPU_LOONGSON3 to CPU_LOONGSON64 > SYS_HAS_CPU_LOONGSON3 to SYS_HAS_CPU_LOONGSON64 > > It did not touch SYS_HAS_CPU_LOONGSON2E or SYS_HAS_CPU_LOONGSON2F. > However, the patch changed a conditional from > > #if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \ > defined(CONFIG_SYS_HAS_CPU_LOONGSON2F) > > to > > #if defined(CONFIG_SYS_HAS_CPU_LOONGSON2EF) > > SYS_HAS_CPU_LOONGSON2EF does not exist, resulting in boot failures > with the qemu fulong2e emulation. Revert to the original code. Thanks Guenter for running your test suite and catching this! Reviewed-by: Philippe Mathieu-Daudé > Fixes: 268a2d60013049 ("MIPS: Loongson64: Rename CPU TYPES") > Cc: Jiaxun Yang > Signed-off-by: Guenter Roeck > --- > arch/mips/include/asm/cpu-type.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h > index c46c59b0f1b4..49f0061a6051 100644 > --- a/arch/mips/include/asm/cpu-type.h > +++ b/arch/mips/include/asm/cpu-type.h > @@ -15,7 +15,8 @@ > static inline int __pure __get_cpu_type(const int cpu_type) > { > switch (cpu_type) { > -#if defined(CONFIG_SYS_HAS_CPU_LOONGSON2EF) > +#if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \ > + defined(CONFIG_SYS_HAS_CPU_LOONGSON2F) > case CPU_LOONGSON2EF: > #endif > > -- > 2.17.1 >