From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753171AbbDGHsa (ORCPT ); Tue, 7 Apr 2015 03:48:30 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:27401 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751242AbbDGHs3 (ORCPT ); Tue, 7 Apr 2015 03:48:29 -0400 From: Zhen Lei To: Thomas Gleixner , Jason Cooper , Marc Zyngier , linux-kernel CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Kefeng Wang , "Yun Wu" , Zhen Lei Subject: [PATCH 3/3] irqchip/gicv3-its: treat type reserved as 0x0 Date: Tue, 7 Apr 2015 15:47:34 +0800 Message-ID: <1428392854-3228-3-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.8.4.msysgit.0 In-Reply-To: <1428392854-3228-1-git-send-email-thunder.leizhen@huawei.com> References: <1428392854-3228-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.27.142] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1. We don't known how many memory needed by type reserved. It's good to take no care about it. 2. Remove unused macro definition and name of type reserved. Signed-off-by: Zhen Lei --- drivers/irqchip/irq-gic-v3-its.c | 19 +++++++++++-------- include/linux/irqchip/arm-gic-v3.h | 4 ---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index bbf9504..d649910 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -777,11 +777,7 @@ static int __init its_alloc_lpi_tables(void) static const char *its_base_type_string[] = { [GITS_BASER_TYPE_DEVICE] = "Devices", [GITS_BASER_TYPE_VCPU] = "Virtual CPUs", - [GITS_BASER_TYPE_RESERVED3] = "Reserved (3)", [GITS_BASER_TYPE_COLLECTION] = "Interrupt Collections", - [GITS_BASER_TYPE_RESERVED5] = "Reserved (5)", - [GITS_BASER_TYPE_RESERVED6] = "Reserved (6)", - [GITS_BASER_TYPE_RESERVED7] = "Reserved (7)", }; static void its_free_tables(struct its_node *its) @@ -814,9 +810,6 @@ static int its_alloc_tables(struct its_node *its) void *base; switch (type) { - case GITS_BASER_TYPE_NONE: - continue; - /* * Allocate as many entries as required to fit the * range of device IDs that the ITS can grok... The ID @@ -833,9 +826,19 @@ static int its_alloc_tables(struct its_node *its) break; } - default: + case GITS_BASER_TYPE_VCPU: + case GITS_BASER_TYPE_COLLECTION: alloc_size = PAGE_SIZE; break; + + /* + * Here treat type Reserved as 0x0(NONE). If type reserved need + * memory, it should be allocated by BIOS/UEFI, OS take no care + * about it. + */ + case GITS_BASER_TYPE_NONE: + default: + continue; } psz = PAGE_SIZE; diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h index 67f5779..212df88 100644 --- a/include/linux/irqchip/arm-gic-v3.h +++ b/include/linux/irqchip/arm-gic-v3.h @@ -233,11 +233,7 @@ #define GITS_BASER_TYPE_NONE 0 #define GITS_BASER_TYPE_DEVICE 1 #define GITS_BASER_TYPE_VCPU 2 -#define GITS_BASER_TYPE_RESERVED3 3 #define GITS_BASER_TYPE_COLLECTION 4 -#define GITS_BASER_TYPE_RESERVED5 5 -#define GITS_BASER_TYPE_RESERVED6 6 -#define GITS_BASER_TYPE_RESERVED7 7 /* * ITS commands -- 1.8.0