Re: [PATCH v2 22/36] irqchip/gic-v4.1: Advertise support v4.1 to KVM

2019-12-18 Thread Marc Zyngier 

On 2019-11-01 12:55, Zenghui Yu wrote:

Hi Marc,

On 2019/10/27 22:42, Marc Zyngier wrote:

Tell KVM that we support v4.1. Nothing uses this information so far.
Signed-off-by: Marc Zyngier 
---
  drivers/irqchip/irq-gic-v3-its.c   | 9 -
  drivers/irqchip/irq-gic-v3.c   | 1 +
  include/linux/irqchip/arm-gic-common.h | 2 ++
  3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-gic-v3-its.c 
b/drivers/irqchip/irq-gic-v3-its.c

index df259e202482..6483f8051b3e 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -4580,6 +4580,7 @@ int __init its_init(struct fwnode_handle 
*handle, struct rdists *rdists,

struct device_node *of_node;
struct its_node *its;
bool has_v4 = false;
+   bool has_v4_1 = false;
int err;

gic_rdists = rdists;
@@ -4600,8 +4601,14 @@ int __init its_init(struct fwnode_handle 
*handle, struct rdists *rdists,

if (err)
return err;
  - list_for_each_entry(its, _nodes, entry)
+   list_for_each_entry(its, _nodes, entry) {
has_v4 |= is_v4(its);
+   has_v4_1 |= is_v4_1(its);
+   }
+
+   /* Don't bother with inconsistent systems */
+   if (WARN_ON(!has_v4_1 && rdists->has_rvpeid))
+   rdists->has_rvpeid = false;

if (has_v4 & rdists->has_vlpis) {
if (its_init_vpe_domain() ||
diff --git a/drivers/irqchip/irq-gic-v3.c 
b/drivers/irqchip/irq-gic-v3.c

index f0d33ac64a99..94dddfb21076 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1758,6 +1758,7 @@ static void __init 
gic_of_setup_kvm_info(struct device_node *node)

gic_v3_kvm_info.vcpu = r;

gic_v3_kvm_info.has_v4 = gic_data.rdists.has_vlpis;
+   gic_v3_kvm_info.has_v4_1 = gic_data.rdists.has_rvpeid;


Also set gic_v3_kvm_info.has_v4_1 in gic_acpi_setup_kvm_info().


Indeed. Now fixed.

Thanks,

M.
--
Jazz is not dead. It just smells funny...
___
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

Re: [PATCH v2 22/36] irqchip/gic-v4.1: Advertise support v4.1 to KVM

2019-11-01 Thread Zenghui Yu 

Hi Marc,

On 2019/10/27 22:42, Marc Zyngier wrote:

Tell KVM that we support v4.1. Nothing uses this information so far.

Signed-off-by: Marc Zyngier 
---
  drivers/irqchip/irq-gic-v3-its.c   | 9 -
  drivers/irqchip/irq-gic-v3.c   | 1 +
  include/linux/irqchip/arm-gic-common.h | 2 ++
  3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index df259e202482..6483f8051b3e 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -4580,6 +4580,7 @@ int __init its_init(struct fwnode_handle *handle, struct 
rdists *rdists,
struct device_node *of_node;
struct its_node *its;
bool has_v4 = false;
+   bool has_v4_1 = false;
int err;
  
  	gic_rdists = rdists;

@@ -4600,8 +4601,14 @@ int __init its_init(struct fwnode_handle *handle, struct 
rdists *rdists,
if (err)
return err;
  
-	list_for_each_entry(its, _nodes, entry)

+   list_for_each_entry(its, _nodes, entry) {
has_v4 |= is_v4(its);
+   has_v4_1 |= is_v4_1(its);
+   }
+
+   /* Don't bother with inconsistent systems */
+   if (WARN_ON(!has_v4_1 && rdists->has_rvpeid))
+   rdists->has_rvpeid = false;
  
  	if (has_v4 & rdists->has_vlpis) {

if (its_init_vpe_domain() ||
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index f0d33ac64a99..94dddfb21076 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1758,6 +1758,7 @@ static void __init gic_of_setup_kvm_info(struct 
device_node *node)
gic_v3_kvm_info.vcpu = r;
  
  	gic_v3_kvm_info.has_v4 = gic_data.rdists.has_vlpis;

+   gic_v3_kvm_info.has_v4_1 = gic_data.rdists.has_rvpeid;


Also set gic_v3_kvm_info.has_v4_1 in gic_acpi_setup_kvm_info().


Thanks,
Zenghui


gic_set_kvm_info(_v3_kvm_info);
  }
  
diff --git a/include/linux/irqchip/arm-gic-common.h b/include/linux/irqchip/arm-gic-common.h

index b9850f5f1906..fa8c0455c352 100644
--- a/include/linux/irqchip/arm-gic-common.h
+++ b/include/linux/irqchip/arm-gic-common.h
@@ -32,6 +32,8 @@ struct gic_kvm_info {
struct resource vctrl;
/* vlpi support */
boolhas_v4;
+   /* rvpeid support */
+   boolhas_v4_1;
  };
  
  const struct gic_kvm_info *gic_get_kvm_info(void);




___
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

[PATCH v2 22/36] irqchip/gic-v4.1: Advertise support v4.1 to KVM

2019-10-27 Thread Marc Zyngier 
Tell KVM that we support v4.1. Nothing uses this information so far.

Signed-off-by: Marc Zyngier 
---
 drivers/irqchip/irq-gic-v3-its.c   | 9 -
 drivers/irqchip/irq-gic-v3.c   | 1 +
 include/linux/irqchip/arm-gic-common.h | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index df259e202482..6483f8051b3e 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -4580,6 +4580,7 @@ int __init its_init(struct fwnode_handle *handle, struct 
rdists *rdists,
struct device_node *of_node;
struct its_node *its;
bool has_v4 = false;
+   bool has_v4_1 = false;
int err;
 
gic_rdists = rdists;
@@ -4600,8 +4601,14 @@ int __init its_init(struct fwnode_handle *handle, struct 
rdists *rdists,
if (err)
return err;
 
-   list_for_each_entry(its, _nodes, entry)
+   list_for_each_entry(its, _nodes, entry) {
has_v4 |= is_v4(its);
+   has_v4_1 |= is_v4_1(its);
+   }
+
+   /* Don't bother with inconsistent systems */
+   if (WARN_ON(!has_v4_1 && rdists->has_rvpeid))
+   rdists->has_rvpeid = false;
 
if (has_v4 & rdists->has_vlpis) {
if (its_init_vpe_domain() ||
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index f0d33ac64a99..94dddfb21076 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1758,6 +1758,7 @@ static void __init gic_of_setup_kvm_info(struct 
device_node *node)
gic_v3_kvm_info.vcpu = r;
 
gic_v3_kvm_info.has_v4 = gic_data.rdists.has_vlpis;
+   gic_v3_kvm_info.has_v4_1 = gic_data.rdists.has_rvpeid;
gic_set_kvm_info(_v3_kvm_info);
 }
 
diff --git a/include/linux/irqchip/arm-gic-common.h 
b/include/linux/irqchip/arm-gic-common.h
index b9850f5f1906..fa8c0455c352 100644
--- a/include/linux/irqchip/arm-gic-common.h
+++ b/include/linux/irqchip/arm-gic-common.h
@@ -32,6 +32,8 @@ struct gic_kvm_info {
struct resource vctrl;
/* vlpi support */
boolhas_v4;
+   /* rvpeid support */
+   boolhas_v4_1;
 };
 
 const struct gic_kvm_info *gic_get_kvm_info(void);
-- 
2.20.1

___
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm