From patchwork Wed Oct 20 18:48:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12573091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCFA6C433EF for ; Wed, 20 Oct 2021 18:53:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8458A61038 for ; Wed, 20 Oct 2021 18:53:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8458A61038 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cbXc//a3QKMZb5S6hDJlArxbGE2QXmiK2nSjyVtT4AY=; b=3yyo0fXw8MrBx+ IUJYEVKMSdr+A2Vqji7BgYBsm3sjSCNDTOeuQApX32A6kGUEJBz6b9rsg+S4MNV5qm+8magaKcmU5 XInSbd91S+/BSqn9oDQTW2IrJXE/gSTj/g9adyi+EVZaH3dPGwRuqVPBjOX8NJQ31ORWi5Yhhw6Cr RQoKiGKZlEKUurtsbrYEWBM8I8iWl7btJSEybZDD96RaUFInXgP9L78PBSyNTLsYF1JCbscRuC6K5 QqXCcS5YPg8AUTgxCcHeDjLXa7MoaDL9cnX0E05Dy+QOqKkaihbALOMgOhbuKndsUWbpEYtGKIBhF nszgXdiCIrRUckV6visw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mdGge-005WQE-Bk; Wed, 20 Oct 2021 18:51:40 +0000 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mdGfa-005Vvz-Ud for linux-arm-kernel@lists.infradead.org; Wed, 20 Oct 2021 18:50:36 +0000 Received: by mail-pf1-x431.google.com with SMTP id c29so3740810pfp.2 for ; Wed, 20 Oct 2021 11:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G1RiT4GRKPcXSkOjyrks/jOWZL3DTQpMJtRhCsgVjY8=; b=hEsPXiTNsHEKrv7LrTxImma40UBastHpzRHkCpg1UyvZaIZUem+ieQzNA9xZ4dh7Yl bTBNV8ixGN9/BjYTtrdhRxfCu/4LZAczT1Kixt1lWMUtF//kUIZ+lYJIu9x73XGL6Ma+ wN92PvdzevimIS28e6BanTaolgM4RuwDPLbENV/WcYm8zhdj0OD95KUSlKarCrVxVXPE 9FrGXJTua/ydZn9xrhej+AsMzNnn1B6+bAnHKUKVpdxYIyT778CWElDRkj+8S+6gT6ef cvomTzR5OjtuqDbTHYem5Mm0IB7+TNjBwu5LW2QZ4R6DyrsERCSiHhb08EdwueYOcFeY U49w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G1RiT4GRKPcXSkOjyrks/jOWZL3DTQpMJtRhCsgVjY8=; b=EeIOt6NVueAtzUsh5jRpec9SDF//oOXTpUNYe/WpSpy8bvw9/xwQO/uTaeh0zFuN7f 3zV248tP1YIKFEcf5Hb761ZkDw2boklA54JQmL2Z0QMU96YoQfqQeVffaBlpz58YNttg hxgbt0q3+Qz424CGQ+bfKVrtd6fXMKH2bt7u9tL2+ERvYL/r4TV9jEsAvxy5oF+6CisT hchN4cimDA0SzXQHryjTmFkf20CYNGnRz2u1HfrPWZ8PiVOkrPZlOl99tugBQ7bt4P7A 86w7ugM/HsjIAeJr0Cz1iUipTZcUUPDvHpW9IoZgnS6dn4mfjnxT2G9iFZGu129qdr22 4lHg== X-Gm-Message-State: AOAM530hgkqu53azoiBsHEU/MhsaEGAekfaeHADBhp9pRl59jNEesV/q BZCSrYPp3VdCfSs1OnIJlT4= X-Google-Smtp-Source: ABdhPJwbzWHKin126tbJWWzQImBYaNKIeFtG9nT98+ylY4/8HfKntmcN0jXAbn859i8BkSEAZ414gA== X-Received: by 2002:a63:b909:: with SMTP id z9mr809070pge.140.1634755834115; Wed, 20 Oct 2021 11:50:34 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id o127sm3267863pfb.216.2021.10.20.11.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 11:50:33 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v6 04/13] irqchip/irq-bcm7038-l1: Gate use of CPU logical map to MIPS Date: Wed, 20 Oct 2021 11:48:50 -0700 Message-Id: <20211020184859.2705451-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211020184859.2705451-1-f.fainelli@gmail.com> References: <20211020184859.2705451-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211020_115035_005131_EA202FD9 X-CRM114-Status: GOOD ( 18.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The use of the cpu_logical_map[] array is only relevant for MIPS based platform where this driver is used as a first level interrupt controller and contains multiple register groups to map with an associated CPU. On ARM/ARM64 based systems this interrupt controller is present and used as a second level interrupt controller hanging off the ARM GIC. That copy of the interrupt controller contains a single group, resulting in the intc->cpus[] array to be of size 1. Things happened to work in that case because we install that interrupt controller as a chained handler which does not allow it to be affine to any CPU but the boot CPU which happens to be 0, therefore we never de-reference past intc->cpus[] but with the current code in place, we do leave a chance of de-referencing the array past its bounds. Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-bcm7038-l1.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index 14caf32dc23e..3c4e348c661e 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c @@ -28,9 +28,6 @@ #include #include #include -#ifdef CONFIG_ARM -#include -#endif #define IRQS_PER_WORD 32 #define REG_BYTES_PER_IRQ_WORD (sizeof(u32) * 4) @@ -127,7 +124,7 @@ static void bcm7038_l1_irq_handle(struct irq_desc *desc) struct irq_chip *chip = irq_desc_get_chip(desc); unsigned int idx; -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && defined(CONFIG_MIPS) cpu = intc->cpus[cpu_logical_map(smp_processor_id())]; #else cpu = intc->cpus[0]; @@ -301,7 +298,7 @@ static int bcm7038_l1_suspend(void) u32 val; /* Wakeup interrupt should only come from the boot cpu */ -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && defined(CONFIG_MIPS) boot_cpu = cpu_logical_map(0); #else boot_cpu = 0; @@ -325,7 +322,7 @@ static void bcm7038_l1_resume(void) struct bcm7038_l1_chip *intc; int boot_cpu, word; -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && defined(CONFIG_MIPS) boot_cpu = cpu_logical_map(0); #else boot_cpu = 0;