Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp1373160rda; Mon, 23 Oct 2023 10:28:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRy3tk8buQcCbmQETojTfqRWiEronznWU30aoZsLHMiIM3qPrZsiM2BtsdrS6q/o1M9K81 X-Received: by 2002:a05:6a20:e11a:b0:149:f82a:2640 with SMTP id kr26-20020a056a20e11a00b00149f82a2640mr296417pzb.30.1698082133548; Mon, 23 Oct 2023 10:28:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698082133; cv=none; d=google.com; s=arc-20160816; b=wg02pzpC8BsVZrmRFGDzlkkvBbJsQP/xDldCMT/clEFRGPJhlc1BB5A9wpjMUOkKBJ isqATBbLgySRusy7iHB+o6AQMPFCbx21VoJkbPOpgG9z76BYVUi0/4fk8l2CTgVpRCYv 7XYkvMNWuV2d3nBx0NLmIpFGug6nSDOEoFLjv+78SJL0/OetCHFBomJZLN2zNhXcIQJ5 cnwhfiZIEvmuZsZJ/hiBbwvGNN3EBv8shiM6/Zd3GbM5tQUo4jb60HwFnX3BQhAkM4Su kRMB9kHeRnmG8oFiAWKW1PtzAJfTk6RyI/FYX4LqnIJKtq2YJFjF4mY13ZwWzMsfEYve 2Zyg== 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 :dkim-signature; bh=SYhetJOGeGWONv0pBZCT4Mywf3EBvVtv+lOqGOUogJM=; fh=m1Lue3hOKuAjq0ymKgEzpKcRpx7LIjE4A6DoDL4VDoo=; b=xLZIDhgjNPgEqZRmCMdnv7iTd/FsGUB3o1jqYHQpIzTnycIYLsdgqjtzPEY2ydX7SX CWFVOAE4GabJGJczkjvpWnSc2wwHvGyBSxhgf6H4WzjxpJ1w74ljHVhHbkH6ae4SK6pt +dVqp2Hik1YtSi1iC47XgwLmoUEUVPZLCc4I1rKMWRQeguq/4tFgXFwqdROtIk//5v0z Hk99KV6mejEtm3VbZKdRvYOwigM8FTuiWFoqBGWbS+yBquYYjCiL4PWpWGOndedaGqVf 9d2dRFG0wlmAfpFPW/i7YB7C+Hz0aU3/DuM4IOWFrEiOSv6GNGjU7P+hz0HWSBtCH5W1 ixSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Y3P9zZQg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id co20-20020a17090afe9400b0027749a98349si9310029pjb.4.2023.10.23.10.28.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 10:28:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Y3P9zZQg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 3E7708056A2A; Mon, 23 Oct 2023 10:28:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233264AbjJWR2Y (ORCPT + 99 others); Mon, 23 Oct 2023 13:28:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233024AbjJWR2V (ORCPT ); Mon, 23 Oct 2023 13:28:21 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF68A10A for ; Mon, 23 Oct 2023 10:28:15 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6ba172c5f3dso2876097b3a.0 for ; Mon, 23 Oct 2023 10:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1698082095; x=1698686895; darn=vger.kernel.org; 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=SYhetJOGeGWONv0pBZCT4Mywf3EBvVtv+lOqGOUogJM=; b=Y3P9zZQge6Shvk4IfBExdqFHq3Zv9iYUhBdmxzNAc3jURzuxoD30dw/JXK8uywOYjq 8gmO4fUXPcDONlMvUj55EGYpAgR6q0vFP9YKQzxmam6ULYMuygYyqUp60CsSNqENYsKl 765MU/TZHgRHQRxIofTpr8vcPuRAvPQq20l6iDOPlKrkftrk/mxsgB3iMoVVFCsKmgku G2aJMZRSMBlVZghMdch1UKnE9syiwn5AKt44Nh/sYqqgIYk05PsTHX+/JoJUM3pEDQCw EJeHtvL3FrBK3nGHQ03JBqEBcLOxAXsuXfCZQpm0S3htF9yFCRjejtuQcWjCCVboR5C4 va0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698082095; x=1698686895; 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=SYhetJOGeGWONv0pBZCT4Mywf3EBvVtv+lOqGOUogJM=; b=FdsZrvaupwfvgqk0eyFne1QWbDeKTW2IX023E0KO3cA3bqTPlCbrDPe6V1ANBQqgeA mfg0tN5caZmKRxKB8tWgzik6z6FufxYGs4KXtfj0Wkz5YMs4nuDtGSZLKZ04u4LV2m99 4wND7FMqhpGWP+3Wr8hBe8K5fqPy+qLWFSKUt5R/KFsqQ5mPhnIYRcMzsvflDNsRFWln dYMcaFk8SAw+Mu7dSQg7Tz/nsZ+TiAdlCs1h5ySC8CfapixagzBEZbmNZl9pnFeUcNl+ gmLzIA6So+bWQEonrw4LBPPAUOwXwta8CbUx2lXNtvFoiNPTCczG/DckdmU5G1DUn7ot pBlw== X-Gm-Message-State: AOJu0YwliqUMq51RpngrZJfaExVQpz0MRDHWhMdoPdwrLwqdWo38e0Wa 62p6WiQICtD48LXiNAXLHqij6Q== X-Received: by 2002:a05:6a00:248a:b0:68f:ece2:ac2a with SMTP id c10-20020a056a00248a00b0068fece2ac2amr7867812pfv.27.1698082094881; Mon, 23 Oct 2023 10:28:14 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([171.76.86.9]) by smtp.gmail.com with ESMTPSA id g5-20020aa79f05000000b006be055ab117sm6473194pfr.92.2023.10.23.10.28.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 10:28:14 -0700 (PDT) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Thomas Gleixner , Rob Herring , Krzysztof Kozlowski , Frank Rowand , Conor Dooley Cc: Marc Zyngier , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Atish Patra , Andrew Jones , Sunil V L , Saravana Kannan , Anup Patel , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Anup Patel , Atish Patra Subject: [PATCH v11 01/14] RISC-V: Don't fail in riscv_of_parent_hartid() for disabled HARTs Date: Mon, 23 Oct 2023 22:57:47 +0530 Message-Id: <20231023172800.315343-2-apatel@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023172800.315343-1-apatel@ventanamicro.com> References: <20231023172800.315343-1-apatel@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SORBS_WEB,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 23 Oct 2023 10:28:51 -0700 (PDT) The riscv_of_processor_hartid() used by riscv_of_parent_hartid() fails for HARTs disabled in the DT. This results in the following warning thrown by the RISC-V INTC driver for the E-core on SiFive boards: [ 0.000000] riscv-intc: unable to find hart id for /cpus/cpu@0/interrupt-controller The riscv_of_parent_hartid() is only expected to read the hartid from the DT so we should directly call of_get_cpu_hwid() instead of calling riscv_of_processor_hartid(). Fixes: ad635e723e17 ("riscv: cpu: Add 64bit hartid support on RV64") Signed-off-by: Anup Patel Reviewed-by: Atish Patra --- arch/riscv/kernel/cpu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/riscv/kernel/cpu.c b/arch/riscv/kernel/cpu.c index c17dacb1141c..157ace8b262c 100644 --- a/arch/riscv/kernel/cpu.c +++ b/arch/riscv/kernel/cpu.c @@ -125,13 +125,14 @@ int __init riscv_early_of_processor_hartid(struct device_node *node, unsigned lo */ int riscv_of_parent_hartid(struct device_node *node, unsigned long *hartid) { - int rc; - for (; node; node = node->parent) { if (of_device_is_compatible(node, "riscv")) { - rc = riscv_of_processor_hartid(node, hartid); - if (!rc) - return 0; + *hartid = (unsigned long)of_get_cpu_hwid(node, 0); + if (*hartid == ~0UL) { + pr_warn("Found CPU without hart ID\n"); + return -ENODEV; + } + return 0; } } -- 2.34.1