irqchip/gic-v3-its: Allow use of indirect VCPU tables

The VCPU tables can be quite sparse as well, and it makes sense
to use indirect tables as well if possible.

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

+17 -8
+17 -8
drivers/irqchip/irq-gic-v3-its.c
··· 1077 1077 return 0; 1078 1078 } 1079 1079 1080 - static bool its_parse_baser_device(struct its_node *its, struct its_baser *baser, 1081 - u32 psz, u32 *order) 1080 + static bool its_parse_indirect_baser(struct its_node *its, 1081 + struct its_baser *baser, 1082 + u32 psz, u32 *order) 1082 1083 { 1083 - u64 esz = GITS_BASER_ENTRY_SIZE(its_read_baser(its, baser)); 1084 + u64 tmp = its_read_baser(its, baser); 1085 + u64 type = GITS_BASER_TYPE(tmp); 1086 + u64 esz = GITS_BASER_ENTRY_SIZE(tmp); 1084 1087 u64 val = GITS_BASER_InnerShareable | GITS_BASER_RaWaWb; 1085 1088 u32 ids = its->device_ids; 1086 1089 u32 new_order = *order; ··· 1122 1119 if (new_order >= MAX_ORDER) { 1123 1120 new_order = MAX_ORDER - 1; 1124 1121 ids = ilog2(PAGE_ORDER_TO_SIZE(new_order) / (int)esz); 1125 - pr_warn("ITS@%pa: Device Table too large, reduce ids %u->%u\n", 1126 - &its->phys_base, its->device_ids, ids); 1122 + pr_warn("ITS@%pa: %s Table too large, reduce ids %u->%u\n", 1123 + &its->phys_base, its_base_type_string[type], 1124 + its->device_ids, ids); 1127 1125 } 1128 1126 1129 1127 *order = new_order; ··· 1172 1168 u32 order = get_order(psz); 1173 1169 bool indirect = false; 1174 1170 1175 - if (type == GITS_BASER_TYPE_NONE) 1171 + switch (type) { 1172 + case GITS_BASER_TYPE_NONE: 1176 1173 continue; 1177 1174 1178 - if (type == GITS_BASER_TYPE_DEVICE) 1179 - indirect = its_parse_baser_device(its, baser, psz, &order); 1175 + case GITS_BASER_TYPE_DEVICE: 1176 + case GITS_BASER_TYPE_VCPU: 1177 + indirect = its_parse_indirect_baser(its, baser, 1178 + psz, &order); 1179 + break; 1180 + } 1180 1181 1181 1182 err = its_setup_baser(its, baser, cache, shr, psz, order, indirect); 1182 1183 if (err < 0) {