mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
fa79baf4a6
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
114 lines
5.4 KiB
Diff
114 lines
5.4 KiB
Diff
From patchwork Thu Mar 16 19:28:33 2023
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 8bit
|
|
X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?=
|
|
<noltari@gmail.com>
|
|
X-Patchwork-Id: 13178238
|
|
Return-Path: <linux-mips-owner@vger.kernel.org>
|
|
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
|
|
aws-us-west-2-korg-lkml-1.web.codeaurora.org
|
|
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
|
|
by smtp.lore.kernel.org (Postfix) with ESMTP id 5EF2AC6FD19
|
|
for <linux-mips@archiver.kernel.org>; Thu, 16 Mar 2023 19:28:43 +0000 (UTC)
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
|
id S230076AbjCPT2l (ORCPT <rfc822;linux-mips@archiver.kernel.org>);
|
|
Thu, 16 Mar 2023 15:28:41 -0400
|
|
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56412 "EHLO
|
|
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
|
with ESMTP id S230039AbjCPT2k (ORCPT
|
|
<rfc822;linux-mips@vger.kernel.org>); Thu, 16 Mar 2023 15:28:40 -0400
|
|
Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com
|
|
[IPv6:2a00:1450:4864:20::42f])
|
|
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7259B7D9F;
|
|
Thu, 16 Mar 2023 12:28:38 -0700 (PDT)
|
|
Received: by mail-wr1-x42f.google.com with SMTP id y14so2539231wrq.4;
|
|
Thu, 16 Mar 2023 12:28:38 -0700 (PDT)
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
d=gmail.com; s=20210112; t=1678994917;
|
|
h=content-transfer-encoding:mime-version:references:in-reply-to
|
|
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
|
|
:message-id:reply-to;
|
|
bh=j8afldfRZftLeVmekmQfoh01jVdumsVP7nkKoPaU3Q0=;
|
|
b=FzMRr5ekh/fDiJqTlezNj6nLjzvn5z92FtYeB8MquVSMB8PuvarccnyqAzsXiccf+v
|
|
uwRFIomnTWNLGVjzc1xrB2hGiCKD3jBo5n1u8p/yEV6rpolbxVjfM7eTHXyAHXGXz7ZJ
|
|
TPeVbWfAlxiSD6+BPtXr/efehcdI64fIoL6G/U1WHNMo01Tzr/Obf3y5tug17N0fGcXg
|
|
CH6E5a2HguZUtwrm26LcK9IOV/7xEx5eIE1cOvTLMxPbGWaZwEjjP16HylJr06xRLhaf
|
|
RpiYBT3mXwwuOx0jLOhqavY/2kZ9GVbZRWMMwZrZv9xNO13SBwc1VUVgD4k3FntnSk7Z
|
|
AaOQ==
|
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
|
d=1e100.net; s=20210112; t=1678994917;
|
|
h=content-transfer-encoding:mime-version:references:in-reply-to
|
|
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
|
|
:subject:date:message-id:reply-to;
|
|
bh=j8afldfRZftLeVmekmQfoh01jVdumsVP7nkKoPaU3Q0=;
|
|
b=OaA5DMgqalrfqO5iOtmmxFPsH90MkN7l4EJpyVnzuiO1Wd6rSCpqPOR7xpxZno8OPP
|
|
tdfm4vzn9Ie4AUDbFKDTUlPG+tgkmIruo3K9C0VnY9DD2PRZMEYBbWaJKU1otqKt0NKu
|
|
IAAHNvxvQvCESKzbXFLYwWbRKFScOSMGmGBTDfgThz51A18Ff1hJy/BmnuZk7M2TLgHO
|
|
wQpy9t7oeB/Hkxl41y46emLc/nESsvwvAG/fx/zPzCe9UiaQLrdZq+BKeOwSBedktzK5
|
|
U/ZTfgzU2UGSI67aGRqqGnI0uXq+MAJMK18qzM0VByxj6W+AXJ6BJr5P0quljeQ8upSg
|
|
bEUg==
|
|
X-Gm-Message-State: AO0yUKWnqTlccBDnqwCSRdqOBGc2FyfiLy1Tg7EjPENlISpzXuDYwW/R
|
|
lJSI06rrfq+Vel/SigfpGJI=
|
|
X-Google-Smtp-Source:
|
|
AK7set/jYfYl9ttVzIXJO+ZQVfa6cE/yOsP8fx4teiTmGNNWyVlIJRzMAlF3IUGqRAXAmY3hAabIuQ==
|
|
X-Received: by 2002:a5d:40ce:0:b0:2cd:ceab:df1a with SMTP id
|
|
b14-20020a5d40ce000000b002cdceabdf1amr381006wrq.32.1678994916642;
|
|
Thu, 16 Mar 2023 12:28:36 -0700 (PDT)
|
|
Received: from atlantis.lan (255.red-79-146-124.dynamicip.rima-tde.net.
|
|
[79.146.124.255])
|
|
by smtp.gmail.com with ESMTPSA id
|
|
l10-20020a5d4bca000000b002cfea3c49d5sm180041wrt.52.2023.03.16.12.28.35
|
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
|
Thu, 16 Mar 2023 12:28:35 -0700 (PDT)
|
|
From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <noltari@gmail.com>
|
|
To: f.fainelli@gmail.com, jonas.gorski@gmail.com,
|
|
bcm-kernel-feedback-list@broadcom.com, tglx@linutronix.de,
|
|
maz@kernel.org, linux-mips@vger.kernel.org,
|
|
linux-kernel@vger.kernel.org
|
|
Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <noltari@gmail.com>
|
|
Subject: [PATCH v2] irqchip/bcm-6345-l1: request memory region
|
|
Date: Thu, 16 Mar 2023 20:28:33 +0100
|
|
Message-Id: <20230316192833.1603149-1-noltari@gmail.com>
|
|
X-Mailer: git-send-email 2.30.2
|
|
In-Reply-To: <20230316180701.783785-1-noltari@gmail.com>
|
|
References: <20230316180701.783785-1-noltari@gmail.com>
|
|
MIME-Version: 1.0
|
|
Precedence: bulk
|
|
List-ID: <linux-mips.vger.kernel.org>
|
|
X-Mailing-List: linux-mips@vger.kernel.org
|
|
|
|
Request memory region in order to display it in /proc/iomem.
|
|
Also stop printing the MMIO address since it just displays (ptrval).
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
v2: request memory region and stop displaying MMIO address.
|
|
|
|
drivers/irqchip/irq-bcm6345-l1.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/irqchip/irq-bcm6345-l1.c
|
|
+++ b/drivers/irqchip/irq-bcm6345-l1.c
|
|
@@ -261,6 +261,9 @@ static int __init bcm6345_l1_init_one(st
|
|
if (!cpu->map_base)
|
|
return -ENOMEM;
|
|
|
|
+ if (!request_mem_region(res.start, sz, res.name))
|
|
+ pr_err("failed to request intc memory");
|
|
+
|
|
for (i = 0; i < n_words; i++) {
|
|
cpu->enable_cache[i] = 0;
|
|
__raw_writel(0, cpu->map_base + reg_enable(intc, i));
|
|
@@ -339,8 +342,7 @@ static int __init bcm6345_l1_of_init(str
|
|
for_each_cpu(idx, &intc->cpumask) {
|
|
struct bcm6345_l1_cpu *cpu = intc->cpus[idx];
|
|
|
|
- pr_info(" CPU%u at MMIO 0x%p (irq = %d)\n", idx,
|
|
- cpu->map_base, cpu->parent_irq);
|
|
+ pr_info(" CPU%u (irq = %d)\n", idx, cpu->parent_irq);
|
|
}
|
|
|
|
return 0;
|