[PATCH 0/2][SRU Bionic] Support MSI control interrupts for SMMUv3

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/2][SRU Bionic] Support MSI control interrupts for SMMUv3

dann frazier-4
BugLink: https://bugs.launchpad.net/bugs/1785282

Clean cherry-picks from upstream.

Hanjun Guo (1):
  ACPICA: iasl: Add SMMUv3 device ID mapping index support

Lorenzo Pieralisi (1):
  ACPI/IORT: Remove temporary iort_get_id_mapping_index() ACPICA guard

 drivers/acpi/arm64/iort.c | 7 -------
 include/acpi/actbl2.h     | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

--
2.18.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2][SRU Bionic] ACPICA: iasl: Add SMMUv3 device ID mapping index support

dann frazier-4
From: Hanjun Guo <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1785282

ACPICA commit 5c371879e035122c5807752f42247fd091d107d6

SMMUv3 device ID mapping index is used for SMMUv3
MSI which is introduced in IORT spec revision c,
add its support for iasl.

Tested with iasl -t IORT then get the right SMMUv3
node in iort.asl.

Link: https://github.com/acpica/acpica/commit/5c371879
Signed-off-by: Hanjun Guo <[hidden email]>
Signed-off-by: Bob Moore <[hidden email]>
Signed-off-by: Erik Schmauss <[hidden email]>
Signed-off-by: Rafael J. Wysocki <[hidden email]>
(cherry picked from commit 4c106aa411ee7c1919589f283a4f17888dfee387)
Signed-off-by: dann frazier <[hidden email]>
---
 include/acpi/actbl2.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 686b6f8c09dc7..d90277eb24547 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -810,6 +810,7 @@ struct acpi_iort_smmu_v3 {
  u8 pxm;
  u8 reserved1;
  u16 reserved2;
+ u32 id_mapping_index;
 };
 
 /* Values for Model field above */
--
2.18.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2][SRU Bionic] ACPI/IORT: Remove temporary iort_get_id_mapping_index() ACPICA guard

dann frazier-4
In reply to this post by dann frazier-4
From: Lorenzo Pieralisi <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1785282

In IORT issue C SMMUv3 IORT nodes gained an additional field (DeviceID
mapping index) so that the SMMUv3 can describe its MSI interrupts.

Referring to it in the kernel requires ACPICA changes and in order
to prevent kernel<->ACPICA dependencies kernel code depending on the
SMMUv3 DeviceID mapping index field was guarded with an ACPICA version
conditional.

ACPICA changes introducing DeviceID mapping index in the IORT structs
were integrated in the kernel with:

commit 4c106aa411ee ("ACPICA: iasl: Add SMMUv3 device ID mapping index
support")

so the temporary ACPICA guard has become stale and can be removed.

Signed-off-by: Lorenzo Pieralisi <[hidden email]>
Acked-by: Hanjun Guo <[hidden email]>
Cc: Will Deacon <[hidden email]>
Cc: Hanjun Guo <[hidden email]>
Cc: Sudeep Holla <[hidden email]>
Cc: Catalin Marinas <[hidden email]>
Cc: "Rafael J. Wysocki" <[hidden email]>
(cherry picked from commit 6c47506361ecd9591813bbaaca518f8a76162a3d)
Signed-off-by: dann frazier <[hidden email]>
---
 drivers/acpi/arm64/iort.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
index 95255ecfae7c7..a84a5787bbd2d 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@ -366,7 +366,6 @@ static struct acpi_iort_node *iort_node_get_id(struct acpi_iort_node *node,
  return NULL;
 }
 
-#if (ACPI_CA_VERSION > 0x20170929)
 static int iort_get_id_mapping_index(struct acpi_iort_node *node)
 {
  struct acpi_iort_smmu_v3 *smmu;
@@ -400,12 +399,6 @@ static int iort_get_id_mapping_index(struct acpi_iort_node *node)
  return -EINVAL;
  }
 }
-#else
-static inline int iort_get_id_mapping_index(struct acpi_iort_node *node)
-{
- return -EINVAL;
-}
-#endif
 
 static struct acpi_iort_node *iort_node_map_id(struct acpi_iort_node *node,
        u32 id_in, u32 *id_out,
--
2.18.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH 0/2][SRU Bionic] Support MSI control interrupts for SMMUv3

Stefan Bader-2
In reply to this post by dann frazier-4
On 03.08.2018 18:52, dann frazier wrote:

> BugLink: https://bugs.launchpad.net/bugs/1785282
>
> Clean cherry-picks from upstream.
>
> Hanjun Guo (1):
>   ACPICA: iasl: Add SMMUv3 device ID mapping index support
>
> Lorenzo Pieralisi (1):
>   ACPI/IORT: Remove temporary iort_get_id_mapping_index() ACPICA guard
>
>  drivers/acpi/arm64/iort.c | 7 -------
>  include/acpi/actbl2.h     | 1 +
>  2 files changed, 1 insertion(+), 7 deletions(-)
>
Acked-by: Stefan Bader <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment