Linux-ACPI Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v5] ACPI/IORT: Fix PMCG node single ID mapping handling
@ 2020-05-20 17:13 Tuan Phan
  2020-05-20 17:27 ` Lorenzo Pieralisi
  2020-05-20 17:54 ` Will Deacon
  0 siblings, 2 replies; 4+ messages in thread
From: Tuan Phan @ 2020-05-20 17:13 UTC (permalink / raw)
  Cc: patches, Lorenzo Pieralisi, Hanjun Guo, Sudeep Holla,
	Rafael J. Wysocki, Len Brown, Will Deacon, Robin Murphy,
	Shameer Kolothum, linux-acpi, linux-arm-kernel, linux-kernel

An IORT PMCG node can have no ID mapping if its overflow interrupt is
wire based therefore the code that parses the PMCG node can not assume
the node will always have a single mapping present at index 0.

Fix iort_get_id_mapping_index() by checking for an overflow interrupt
and mapping count.

Fixes: 24e516049360 ("ACPI/IORT: Add support for PMCG")

Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Hanjun Guo <guoahanjun@huawei.com>
Signed-off-by: Tuan Phan <tuanphan@os.amperecomputing.com>
---
v1 -> v2:
- Use pmcg node to detect wired base overflow interrupt.

v2 -> v3:
- Address Hanjun and Robin's comments.

v3 -> v4:
- Update the title and description as mentioned by Lorenzo.

v4 -> v5:
- Remove period in the title and commit references.

 drivers/acpi/arm64/iort.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index ed3d2d1..12bb70e 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -414,6 +414,7 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
 static int iort_get_id_mapping_index(struct acpi_iort_node *node)
 {
 	struct acpi_iort_smmu_v3 *smmu;
+	struct acpi_iort_pmcg *pmcg;
 
 	switch (node->type) {
 	case ACPI_IORT_NODE_SMMU_V3:
@@ -441,6 +442,10 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node)
 
 		return smmu->id_mapping_index;
 	case ACPI_IORT_NODE_PMCG:
+		pmcg = (struct acpi_iort_pmcg *)node->node_data;
+		if (pmcg->overflow_gsiv || node->mapping_count == 0)
+			return -EINVAL;
+
 		return 0;
 	default:
 		return -EINVAL;
-- 
2.7.4


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v5] ACPI/IORT: Fix PMCG node single ID mapping handling
  2020-05-20 17:13 [PATCH v5] ACPI/IORT: Fix PMCG node single ID mapping handling Tuan Phan
@ 2020-05-20 17:27 ` Lorenzo Pieralisi
  2020-05-20 17:43   ` Will Deacon
  2020-05-20 17:54 ` Will Deacon
  1 sibling, 1 reply; 4+ messages in thread
From: Lorenzo Pieralisi @ 2020-05-20 17:27 UTC (permalink / raw)
  To: Tuan Phan, will
  Cc: patches, Hanjun Guo, Sudeep Holla, Rafael J. Wysocki, Len Brown,
	Robin Murphy, Shameer Kolothum, linux-acpi, linux-arm-kernel,
	linux-kernel

On Wed, May 20, 2020 at 10:13:07AM -0700, Tuan Phan wrote:
> An IORT PMCG node can have no ID mapping if its overflow interrupt is
> wire based therefore the code that parses the PMCG node can not assume
> the node will always have a single mapping present at index 0.
> 
> Fix iort_get_id_mapping_index() by checking for an overflow interrupt
> and mapping count.
> 
> Fixes: 24e516049360 ("ACPI/IORT: Add support for PMCG")
> 
> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Reviewed-by: Hanjun Guo <guoahanjun@huawei.com>
> Signed-off-by: Tuan Phan <tuanphan@os.amperecomputing.com>
> ---
> v1 -> v2:
> - Use pmcg node to detect wired base overflow interrupt.
> 
> v2 -> v3:
> - Address Hanjun and Robin's comments.
> 
> v3 -> v4:
> - Update the title and description as mentioned by Lorenzo.
> 
> v4 -> v5:
> - Remove period in the title and commit references.
> 
>  drivers/acpi/arm64/iort.c | 5 +++++

Hi Will,

is there a chance we can get this patch into v5.8 ? I understand
we are very late in the cycle but I wanted to ask (it applies cleanly
to for-next/acpi).

Thanks !
Lorenzo

>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> index ed3d2d1..12bb70e 100644
> --- a/drivers/acpi/arm64/iort.c
> +++ b/drivers/acpi/arm64/iort.c
> @@ -414,6 +414,7 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
>  static int iort_get_id_mapping_index(struct acpi_iort_node *node)
>  {
>  	struct acpi_iort_smmu_v3 *smmu;
> +	struct acpi_iort_pmcg *pmcg;
>  
>  	switch (node->type) {
>  	case ACPI_IORT_NODE_SMMU_V3:
> @@ -441,6 +442,10 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node)
>  
>  		return smmu->id_mapping_index;
>  	case ACPI_IORT_NODE_PMCG:
> +		pmcg = (struct acpi_iort_pmcg *)node->node_data;
> +		if (pmcg->overflow_gsiv || node->mapping_count == 0)
> +			return -EINVAL;
> +
>  		return 0;
>  	default:
>  		return -EINVAL;
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v5] ACPI/IORT: Fix PMCG node single ID mapping handling
  2020-05-20 17:27 ` Lorenzo Pieralisi
@ 2020-05-20 17:43   ` Will Deacon
  0 siblings, 0 replies; 4+ messages in thread
From: Will Deacon @ 2020-05-20 17:43 UTC (permalink / raw)
  To: Lorenzo Pieralisi
  Cc: Tuan Phan, patches, Hanjun Guo, Sudeep Holla, Rafael J. Wysocki,
	Len Brown, Robin Murphy, Shameer Kolothum, linux-acpi,
	linux-arm-kernel, linux-kernel

On Wed, May 20, 2020 at 06:27:36PM +0100, Lorenzo Pieralisi wrote:
> On Wed, May 20, 2020 at 10:13:07AM -0700, Tuan Phan wrote:
> > An IORT PMCG node can have no ID mapping if its overflow interrupt is
> > wire based therefore the code that parses the PMCG node can not assume
> > the node will always have a single mapping present at index 0.
> > 
> > Fix iort_get_id_mapping_index() by checking for an overflow interrupt
> > and mapping count.
> > 
> > Fixes: 24e516049360 ("ACPI/IORT: Add support for PMCG")
> > 
> > Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> > Reviewed-by: Hanjun Guo <guoahanjun@huawei.com>
> > Signed-off-by: Tuan Phan <tuanphan@os.amperecomputing.com>
> > ---
> > v1 -> v2:
> > - Use pmcg node to detect wired base overflow interrupt.
> > 
> > v2 -> v3:
> > - Address Hanjun and Robin's comments.
> > 
> > v3 -> v4:
> > - Update the title and description as mentioned by Lorenzo.
> > 
> > v4 -> v5:
> > - Remove period in the title and commit references.
> > 
> >  drivers/acpi/arm64/iort.c | 5 +++++
> 
> Hi Will,
> 
> is there a chance we can get this patch into v5.8 ? I understand
> we are very late in the cycle but I wanted to ask (it applies cleanly
> to for-next/acpi).

Sorry, Lorenzo -- I didn't notice that this had been Acked already. I was
waiting for somebody to chime in! I'll queue it ASAP for 5.8.

Will

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH v5] ACPI/IORT: Fix PMCG node single ID mapping handling
  2020-05-20 17:13 [PATCH v5] ACPI/IORT: Fix PMCG node single ID mapping handling Tuan Phan
  2020-05-20 17:27 ` Lorenzo Pieralisi
@ 2020-05-20 17:54 ` Will Deacon
  1 sibling, 0 replies; 4+ messages in thread
From: Will Deacon @ 2020-05-20 17:54 UTC (permalink / raw)
  To: Tuan Phan
  Cc: catalin.marinas, Will Deacon, patches, Robin Murphy, Len Brown,
	Shameer Kolothum, linux-kernel, linux-arm-kernel,
	Rafael J. Wysocki, linux-acpi, Hanjun Guo, Sudeep Holla,
	Lorenzo Pieralisi

On Wed, 20 May 2020 10:13:07 -0700, Tuan Phan wrote:
> An IORT PMCG node can have no ID mapping if its overflow interrupt is
> wire based therefore the code that parses the PMCG node can not assume
> the node will always have a single mapping present at index 0.
> 
> Fix iort_get_id_mapping_index() by checking for an overflow interrupt
> and mapping count.
> 
> [...]

Applied to arm64 (for-next/acpi), thanks!

[1/1] ACPI/IORT: Fix PMCG node single ID mapping handling
      https://git.kernel.org/arm64/c/50c8ab8d9fbf

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, back to index

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 17:13 [PATCH v5] ACPI/IORT: Fix PMCG node single ID mapping handling Tuan Phan
2020-05-20 17:27 ` Lorenzo Pieralisi
2020-05-20 17:43   ` Will Deacon
2020-05-20 17:54 ` Will Deacon

Linux-ACPI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-acpi/0 linux-acpi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-acpi linux-acpi/ https://lore.kernel.org/linux-acpi \
		linux-acpi@vger.kernel.org
	public-inbox-index linux-acpi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-acpi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git