From patchwork Thu Jul 13 03:22:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: maobibo X-Patchwork-Id: 119502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1569075vqm; Wed, 12 Jul 2023 20:46:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlEfFil6qEOipxhoTWic0mb4jBWbM/ygISG8BmIz/89HrkNQTyXDiytzc5DTIxf78SqllVhl X-Received: by 2002:a17:906:73cf:b0:988:57b4:2853 with SMTP id n15-20020a17090673cf00b0098857b42853mr328980ejl.25.1689219966793; Wed, 12 Jul 2023 20:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689219966; cv=none; d=google.com; s=arc-20160816; b=ZGd1BHersDi5zz4okXP8XlJYDJZ+eP5zVDmwFm08yQJXqHh8A4cfBMa5aKIu6NQ64J 2UKi1LjD50k/tOcvMDbYsyZeuQC9/18QLh50SeI75tQFUL/gURDhdUyBcVPU9io4Xsn+ 6lzUTPXw/xXemS2L07w14XeoSP87E6WK94CfEeXn/xBTM/bXLHmge0CJOu8TZhXS7R+E /Tebt7cjPW3I/6f937OTCZOFQsJ9NPjo+3aom77PZO66+F6SorRsQ+cWhT5hJ1EgJb28 tzZ3e3QbiloPl+KJKfnxr0lmB3SL8FlV0XadjW94wZboczRWGh5zD7ASklRoZLHGF1U5 H5sA== 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=chjcn51OJ3EN7pOX/BdWVwa5bmrkM1TE6sVVPhnbIr4=; fh=qZLgqBrA0TDTemqgHICeSNHVLsTK7kq22SqPqkiag9M=; b=Kg9inu6b9EwoP8tYB9a/K5V7fbYM/cCkz+tQs/1ktnC70xxcdS/kUd1oCf6YnIrz4C CtQIO3VaA7YVCX9DTsCeFA1OIUqCEGl4ZaV5qgvzyLNN2Wgfpju1KJY7aiDm7WAvqCCc R+feMxkivw119FnXwmNgvYuC8grMOMMW4fL9fm3TtMDx07xb501QhbvpVD2MrlqSDPaQ wNdQgV5HyR7ItJD8VafEW1Lutgs5ry7k+7FDSIVMWQ8+ME6wZowKtGteaknFPzLOzF/c vxpjAtmWmu9lMwxaBM8zEeVjsQ0b4WiJFQsxWytCmBTJ3nIbT24ifYSJdjGAyt5Mf2Fx qHbw== 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 a17-20020a170906469100b00992a9c402cbsi6230623ejr.20.2023.07.12.20.45.42; Wed, 12 Jul 2023 20:46:06 -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 S233562AbjGMDXW (ORCPT + 99 others); Wed, 12 Jul 2023 23:23:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233593AbjGMDXG (ORCPT ); Wed, 12 Jul 2023 23:23:06 -0400 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 73E352127; Wed, 12 Jul 2023 20:22:52 -0700 (PDT) Received: from loongson.cn (unknown [10.2.9.158]) by gateway (Coremail) with SMTP id _____8Cx2eoLbq9kYkQEAA--.6680S3; Thu, 13 Jul 2023 11:22:51 +0800 (CST) Received: from kvm-1-158.loongson.cn (unknown [10.2.9.158]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxbSMDbq9kz6MrAA--.8174S3; Thu, 13 Jul 2023 11:22:50 +0800 (CST) From: Bibo Mao To: Huacai Chen , Jiaxun Yang , Marc Zyngier Cc: Jianmin Lv , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/2] irqchip/loongson-eiointc: Fix return value checking of eiointc_index Date: Thu, 13 Jul 2023 11:22:42 +0800 Message-Id: <20230713032243.2046205-2-maobibo@loongson.cn> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230713032243.2046205-1-maobibo@loongson.cn> References: <20230713032243.2046205-1-maobibo@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8CxbSMDbq9kz6MrAA--.8174S3 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoW7uw4Duw48Zr45tw4rAF1DurX_yoW8Ww1rpF W2ka9I9r15Gay8u392kF18J34Yyrn3J3y7K3yxGay7XF98Jr1DJr4Fy3Z0vr1Ik3y7CF12 9F4rXFWUC3Z8AwcCm3ZEXasCq-sJn29KB7ZKAUJUUUUr529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUU9Fb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07 AIYIkI8VC2zVCFFI0UMc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWU AVWUtwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7V AKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMxCIbckI1I0E14v2 6r1Y6r17MI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17 CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF 0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIx AIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2 KfnxnUUI43ZEXa7IU8q2NtUUUUU== X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: INBOX X-GMAIL-THRID: 1771275516026473427 X-GMAIL-MSGID: 1771275516026473427 Return value of function eiointc_index is int, however it is converted into uint32_t and then compared smaller than zero. This causes logic problem. There is eiointc initialization problem on qemu virt-machine where there is only one eiointc node and more than 4 vcpus. Nodemap of eiointc is 1, and external device intr can only be routed to vcpu 0-3, the other vcpus can not response any external device interrupts and only local processor interrupts like ipi/timer can work. Fixes: dd281e1a1a93 ("irqchip: Add Loongson Extended I/O interrupt controller support") Signed-off-by: Bibo Mao Reviewed-by: Philippe Mathieu-Daudé --- drivers/irqchip/irq-loongson-eiointc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c index 92d8aa28bdf5..603d323b8f8b 100644 --- a/drivers/irqchip/irq-loongson-eiointc.c +++ b/drivers/irqchip/irq-loongson-eiointc.c @@ -144,12 +144,15 @@ static int eiointc_router_init(unsigned int cpu) int i, bit; uint32_t data; uint32_t node = cpu_to_eio_node(cpu); - uint32_t index = eiointc_index(node); + int index = eiointc_index(node); - if (index < 0) { - pr_err("Error: invalid nodemap!\n"); - return -1; - } + /* + * Qemu virt-machine has only one eiointc and more than four cpus. + * Irq from eiointc can only be routed to cpu 0-3, cpus except 0-3 + * need not initialize eiointc on virt-machine + */ + if (index < 0) + return 0; if ((cpu_logical_map(cpu) % CORES_PER_EIO_NODE) == 0) { eiointc_enable();