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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 63410C25B74 for ; Mon, 27 May 2024 04:39:56 +0000 (UTC) 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YpwQbTV9sLOhzlrXCF187g1TzPeRdvI/8XT6AmPsSdM=; b=ts8NSftWx5gA89 duCEe1meBEpGzXyuPmt76umhv66LRz2n0ziG8L9WZ/poCoa7H9xCYqqjCzvL3qweMGZRWvUkgyh6o VTndX2LjNCw16098weSiRTj6AxLT9CLt6lyhUW1SDJcS8oLRf8urpfo56rAzZR8SP471bElYyKoRN eHJBTEs4r5/XSZy+DiTb/Ushnqko39R5Pt2UW7gNf/ZrC/vtdWQvoTRwW2EFHyYcPCYkLe4JX7R/W 8t/A0hdLEbxT/dOZdKf2rtfGAfF52ve71mz2pf4K0PExwpLBglrMU+119J5XL2Vm3rPU2lhLh4E1k w9zA2m0p7O2RM/0Ibp+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sBS9A-0000000Dln5-2BrI; Mon, 27 May 2024 04:39:44 +0000 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sBS97-0000000Dllz-0cdK for linux-arm-kernel@lists.infradead.org; Mon, 27 May 2024 04:39:42 +0000 Received: by mail-pg1-x536.google.com with SMTP id 41be03b00d2f7-681a4427816so2129573a12.3 for ; Sun, 26 May 2024 21:39:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1716784779; x=1717389579; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=+6YXrviCLcyxXmmDXMgEBXPU7+X84327YvIUqwBQ/Tg=; b=hu2irHgCFHsXj0spGq+GvH5rGa6bgsk9pdo8sFi90vP/FVV379+KMuPNAN38Pu1ovs rk1rlaj/t8TIivvkWo1Xiac9gCm+FYA3Di4TOd7d9+V5b9t5gWbSZd6nEHr1+ccLN5qh vDzYUL9fWhxw9xpVLS5NsX+MgOG0PtKwSw2531FDO70a14DYqak/HGN7+q0S4lX6otKh /74vvMLeuxuRJLJOKozwLRawOQAGzZZIXgs56My1eNOsztRBUVsnawWx0xd6jdq6wia1 DMx/tIx6v4ExPYZ9c//iCgJBfvGCoiMMXEBR6963tpSUFrqjLwDzn7G8EF+RkcZpv/3i lR0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716784779; x=1717389579; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+6YXrviCLcyxXmmDXMgEBXPU7+X84327YvIUqwBQ/Tg=; b=QGtXY1alnGrND5tE4fmSOa8w3knXu7iGzcJ5r87uZUx9bfI67vASFIKmhZbc3KpELQ E+IFGJMQiXAJwi391laoNKCUw55TLRUsJlgAa8RSfUXTTa/0w4k5S7OYLcfJIA3WSVRH 959/TX/O5jRywhglYMGnAv+QuCCSLOSjSain+6UIwVKlaV6hrP9hf8LLOESkxdpG8x+D J28Ysi4ZhdbykRpcA7qflYJvo5z1x+W/zbESuG2iPQMRn/nG2uf+IxeEF0DHZXed2c9c 7cxeWZnI55W0o514/BpZBNhtljOlKgC8YIfw6UZ7fQahuz3YChSntaRJL0Ed8E274Pf0 tLaQ== X-Gm-Message-State: AOJu0YyLPfAV3aCskz9vKOvhuvo3CyHdb0fXt685JPg5ONST09oUcLDI GAhWXPz98oSmwai7KZ5mrME4GpI5TizUCwFC6WHKN0XuCOiiKcLsAQ66oZqrFBY= X-Google-Smtp-Source: AGHT+IE9JvCAMKXsid9Oup9PtkMG3gbKLCIeVIPVgCCtq14j1hr2UK2tj9TrDVbVzYBOJhbbgWrYoQ== X-Received: by 2002:a17:903:188:b0:1f3:900:8f83 with SMTP id d9443c01a7336-1f4498ec4ecmr99852385ad.52.1716784778805; Sun, 26 May 2024 21:39:38 -0700 (PDT) Received: from sunil-laptop ([106.51.188.31]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f44c9903b5sm50879945ad.189.2024.05.26.21.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 May 2024 21:39:38 -0700 (PDT) Date: Mon, 27 May 2024 10:09:26 +0530 From: Sunil V L To: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-serial@vger.kernel.org, acpica-devel@lists.linux.dev, Catalin Marinas , Will Deacon , Paul Walmsley , Albert Ou , "Rafael J . Wysocki" , Len Brown , Bjorn Helgaas , Anup Patel , Samuel Holland , Greg Kroah-Hartman , Jiri Slaby , Robert Moore , Conor Dooley , Andrew Jones , Andy Shevchenko , Marc Zyngier , Atish Kumar Patra , Andrei Warkentin , Haibo1 Xu , =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= Subject: Re: [PATCH v5 13/17] irqchip/riscv-intc: Add ACPI support for AIA Message-ID: References: <20240501121742.1215792-1-sunilvl@ventanamicro.com> <20240501121742.1215792-14-sunilvl@ventanamicro.com> <874jaofbfp.ffs@tglx> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <874jaofbfp.ffs@tglx> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240526_213941_308286_29658A36 X-CRM114-Status: GOOD ( 36.40 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Thomas, On Thu, May 23, 2024 at 11:47:06PM +0200, Thomas Gleixner wrote: > On Wed, May 01 2024 at 17:47, Sunil V L wrote: > > diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c > > index 9e71c4428814..af7a2f78f0ee 100644 > > --- a/drivers/irqchip/irq-riscv-intc.c > > +++ b/drivers/irqchip/irq-riscv-intc.c > > @@ -249,14 +249,105 @@ IRQCHIP_DECLARE(riscv, "riscv,cpu-intc", riscv_intc_init); > > IRQCHIP_DECLARE(andes, "andestech,cpu-intc", riscv_intc_init); > > > > #ifdef CONFIG_ACPI > > +struct rintc_data { > > + u32 ext_intc_id; > > + unsigned long hart_id; > > + u64 imsic_addr; > > + u32 imsic_size; > > https://www.kernel.org/doc/html/latest/process/maintainer-tip.html#struct-declarations-and-initializers > Sure, thanks! > > +}; > > + > > +static u32 nr_rintc; > > +static struct rintc_data *rintc_acpi_data[NR_CPUS]; > > + > > +int acpi_get_intc_index_hartid(u32 index, unsigned long *hartid) > > Why int? All of these functions have strictly boolean return values: > success = true, fail = false, no? > > Either bool or get rid of the pointer and let the function return > either the real hart id or an invalid one. > Sure. I just tried to keep it similar to the parent function. But let me go with your suggestion in the next revision. > > +{ > > + if (index >= nr_rintc) > > + return -1; > > + > > + *hartid = rintc_acpi_data[index]->hart_id; > > + return 0; > > I.e. > > return index >= nr_rintc ? rintc_acpi_data[index]->hart_id : INVALID_HART_ID; > Sure. > > +int acpi_get_ext_intc_parent_hartid(u8 id, u32 idx, unsigned long *hartid) > > +{ > > + int i, j = 0; > > + > > + for (i = 0; i < nr_rintc; i++) { > > + if (APLIC_PLIC_ID(rintc_acpi_data[i]->ext_intc_id) == id) { > > + if (idx == j) { > > + *hartid = rintc_acpi_data[i]->hart_id; > > + return 0; > > + } > > + j++; > > + } > > + } > > + > > + return -1; > > +} > > + > > +void acpi_get_plic_nr_contexts(u8 id, int *nr_contexts) > > +{ > > + int i, j = 0; > > + > > + for (i = 0; i < nr_rintc; i++) { > > + if (APLIC_PLIC_ID(rintc_acpi_data[i]->ext_intc_id) == id) > > + j++; > > + } > > + > > + *nr_contexts = j; > > +} > > + > > +int acpi_get_plic_context(u8 id, u32 idx, int *context_id) > > +{ > > + int i, j = 0; > > + > > + for (i = 0; i < nr_rintc; i++) { > > + if (APLIC_PLIC_ID(rintc_acpi_data[i]->ext_intc_id) == id) { > > + if (idx == j) { > > + *context_id = IDC_CONTEXT_ID(rintc_acpi_data[i]->ext_intc_id); > > + return 0; > > + } > > + > > + j++; > > + } > > + } > > So that's the third incarnation of the same loop with the truly self > explaining variable and argument names. > > j is actually the index of the context which is associated to a > given PLIC ID. > > idx is the context index to search for > > Right? So why can't these things be named in a way which makes the > intent of the code clear? > > Also why are all the arguments u8/u32? There is no hardware > involved. Simple 'unsigned int' is just fine and the u8/u32 is not bying > you anything here. > > Aside of that these ugly macros can be completely avoided and the code > can be written without a copy & pasta orgy. > > struct rintc_data { > union { > u32 ext_intc_id; > struct { > u32 context_id : 16, > : 8, > aplic_plic_id : 8; > } > }; > unsigned long hart_id; > u64 imsic_addr; > u32 imsic_size; > }; > > #define for_each_matching_plic(_plic, _plic_id) \ > for (_plic = 0; _plic < nr_rintc; _plict++) \ > if (rintc_acpi_data[_plic]->aplic_plic_id != _plic_id) \ > continue; \ > else > > unsigned int acpi_get_plic_nr_contexts(unsigned int plic_id) > { > unsigned int nctx = 0; > > for_each_matching_plic(plic, plic_id) > nctx++; > > return nctx; > } > > static struct rintc_data *get_plic_context(unsigned int plic_id, unsigned int ctxt_idx) > { > unsigned int ctxt = 0; > > for_each_matching_plic(plic, plic_id) { > if (ctxt == ctxt_idx) > return rintc_acpi_data + plic; > } > return NULL; > } > > unsigned long acpi_get_ext_intc_parent_hartid(unsigned int plic_id, unsigned int ctxt_idx) > { > struct rintc_data *data = get_plic_context(plic_id, ctxt_idx); > > return data ? data->hart_id : INVALID_HART_ID; > } > > unsigned int acpi_get_plic_context(unsigned int plic_id, unsigned int ctxt_idx) > { > struct rintc_data *data = get_plic_context(plic_id, ctxt_idx); > > return data ? data->context_id : INVALID_CONTEXT; > } > > Or something like that. Hmm? > Nice!. Yes, this is better. Thanks a lot for the suggestion. Let me update in the next revision. > > +int acpi_get_imsic_mmio_info(u32 index, struct resource *res) > > +{ > > + if (index >= nr_rintc) > > + return -1; > > + > > + res->start = rintc_acpi_data[index]->imsic_addr; > > + res->end = res->start + rintc_acpi_data[index]->imsic_size - 1; > > + res->flags = IORESOURCE_MEM; > > + return 0; > > +} > > + > > +static struct fwnode_handle *ext_entc_get_gsi_domain_id(u32 gsi) > > +{ > > + return riscv_acpi_get_gsi_domain_id(gsi); > > +} > > This wrapper is required because using riscv_acpi_get_gsi_domain_id() > directly is too obvious, right? > :-). Let me remove it. > > static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header, > > const unsigned long end) > > { > > - struct fwnode_handle *fn; > > struct acpi_madt_rintc *rintc; > > + struct fwnode_handle *fn; > > + int rc; > > > > rintc = (struct acpi_madt_rintc *)header; > > + rintc_acpi_data[nr_rintc] = kzalloc(sizeof(*rintc_acpi_data[0]), GFP_KERNEL); > > + if (!rintc_acpi_data[nr_rintc]) > > + return -ENOMEM; > > + > > + rintc_acpi_data[nr_rintc]->ext_intc_id = rintc->ext_intc_id; > > + rintc_acpi_data[nr_rintc]->hart_id = rintc->hart_id; > > + rintc_acpi_data[nr_rintc]->imsic_addr = rintc->imsic_addr; > > + rintc_acpi_data[nr_rintc]->imsic_size = rintc->imsic_size; > > + nr_rintc++; > > > > /* > > * The ACPI MADT will have one INTC for each CPU (or HART) > > @@ -273,7 +364,14 @@ static int __init riscv_intc_acpi_init(union acpi_subtable_headers *header, > > return -ENOMEM; > > } > > > > - return riscv_intc_init_common(fn, &riscv_intc_chip); > > + rc = riscv_intc_init_common(fn, &riscv_intc_chip); > > + if (rc) { > > + irq_domain_free_fwnode(fn); > > + return rc; > > + } > > This looks like a completely unrelated bug fix. Please don't mix functional > changes and fixes. > Makes sense. Let me create separate patch. Thanks a lot for the review! Sunil _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel