From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuCEO-0002VL-2I for qemu-devel@nongnu.org; Mon, 18 May 2015 00:00:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuCEK-0004g0-G4 for qemu-devel@nongnu.org; Mon, 18 May 2015 00:00:43 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:11725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuCEJ-0004ej-JA for qemu-devel@nongnu.org; Mon, 18 May 2015 00:00:40 -0400 Message-ID: <555963C9.7020204@huawei.com> Date: Mon, 18 May 2015 12:00:09 +0800 From: Shannon Zhao MIME-Version: 1.0 References: <1430990964-10528-1-git-send-email-zhaoshenglong@huawei.com> <1430990964-10528-6-git-send-email-zhaoshenglong@huawei.com> <20150515144504.26a874cc@nial.brq.redhat.com> In-Reply-To: <20150515144504.26a874cc@nial.brq.redhat.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 05/22] hw/acpi/aml-build: Add aml_interrupt() term List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: peter.maydell@linaro.org, hangaohuai@huawei.com, mst@redhat.com, a.spyridakis@virtualopensystems.com, claudio.fontana@huawei.com, qemu-devel@nongnu.org, peter.huangpeng@huawei.com, alex.bennee@linaro.org, hanjun.guo@linaro.org, pbonzini@redhat.com, lersek@redhat.com, christoffer.dall@linaro.org, shannon.zhao@linaro.org On 2015/5/15 20:45, Igor Mammedov wrote: > On Thu, 7 May 2015 17:29:07 +0800 > Shannon Zhao wrote: > >> From: Shannon Zhao >> >> Add aml_interrupt() for describing device interrupt in resource template. >> These can be used to generating DSDT table for ACPI on ARM. >> >> Signed-off-by: Shannon Zhao >> Signed-off-by: Shannon Zhao >> --- >> hw/acpi/aml-build.c | 28 +++++++++++++++++++++++++ >> include/hw/acpi/aml-build.h | 50 +++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 78 insertions(+) >> >> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c >> index 61407b7..babe4d6 100644 >> --- a/hw/acpi/aml-build.c >> +++ b/hw/acpi/aml-build.c >> @@ -532,6 +532,34 @@ Aml *aml_memory32_fixed(uint32_t addr, uint32_t size, >> return var; >> } >> >> +/* >> + * ACPI 1.0: 6.4.3.6 Interrupt (Interrupt Resource Descriptor Macro) >> + */ > I'm looking at 1.0b spec, respective chapter named as > "Extended Interrupt Descriptor (Type 1, Large Item Name 0x9)" > >> +Aml *aml_interrupt(AmlConsumerAndProducer con_and_pro, >> + AmlLevelAndEdge level_and_edge, >> + AmlActiveHighAndLow high_and_low, >> + AmlExclusiveAndShared exclusive_and_shared, >> + AmlWakeCap wake_capable, uint32_t irq) > there isn't wake_capable flag in 1.0b spec, > either fix above to spec where it was introduced or drop this flag > if it won't be not used and stay with 1.0 spec. > > if you choose a newer spec route than > > s/AmlExclusiveAndShared exclusive_and_shared/AmlShared shared/ > > and > > typedef enum { > aml_exclusive = 0, > aml_shared = 1, > aml_exclusive_and_wake = 2, > aml_shared_and_wake = 3 > } AmlShared; > > to be closer to the spec > Ok, thanks, I would choose a ACPI 5.0 spec for this as the wake firstly appears in this version. >> +{ >> + Aml *var = aml_alloc(); >> + uint8_t irq_flags = con_and_pro | (level_and_edge << 1) >> + | (high_and_low << 2) | (exclusive_and_shared << 3) >> + | (wake_capable << 4); >> + >> + build_append_byte(var->buf, 0x89); /* Extended irq descriptor */ >> + build_append_byte(var->buf, 6); /* Length, bits[7:0] minimum value = 6 */ >> + build_append_byte(var->buf, 0); /* Length, bits[15:8] minimum value = 0 */ >> + build_append_byte(var->buf, irq_flags); /* Interrupt Vector Information. */ >> + build_append_byte(var->buf, 0x01); /* Interrupt table length = 1 */ >> + >> + /* Interrupt Number */ >> + build_append_byte(var->buf, extract32(irq, 0, 8)); /* bits[7:0] */ >> + build_append_byte(var->buf, extract32(irq, 8, 8)); /* bits[15:8] */ >> + build_append_byte(var->buf, extract32(irq, 16, 8)); /* bits[23:16] */ >> + build_append_byte(var->buf, extract32(irq, 24, 8)); /* bits[31:24] */ >> + return var; >> +} >> + >> /* ACPI 1.0b: 6.4.2.5 I/O Port Descriptor */ >> Aml *aml_io(AmlIODecode dec, uint16_t min_base, uint16_t max_base, >> uint8_t aln, uint8_t len) >> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h >> index 154823b..5b60744 100644 >> --- a/include/hw/acpi/aml-build.h >> +++ b/include/hw/acpi/aml-build.h >> @@ -105,6 +105,51 @@ typedef enum { >> aml_ReadWrite = 1, >> } AmlReadAndWrite; >> >> +/* >> + * ACPI 1.0b: Table 6-28 Extended Interrupt Descriptor Definition >> + * Interrupt Vector Flags Bits[0] Consumer/Producer >> + */ >> +typedef enum { >> + aml_consumer_producer = 0, >> + aml_consumer = 1, >> +} AmlConsumerAndProducer; >> + >> +/* >> + * ACPI 1.0b: Table 6-28 Extended Interrupt Descriptor Definition >> + * _HE field definition >> + */ >> +typedef enum { >> + aml_level = 0, >> + aml_edge = 1, >> +} AmlLevelAndEdge; >> + >> +/* >> + * ACPI 1.0b: Table 6-28 Extended Interrupt Descriptor Definition >> + * _LL field definition >> + */ >> +typedef enum { >> + aml_active_high = 0, >> + aml_active_low = 1, >> +} AmlActiveHighAndLow; >> + >> +/* >> + * ACPI 1.0b: Table 6-28 Extended Interrupt Descriptor Definition >> + * _SHR field definition >> + */ >> +typedef enum { >> + aml_exclusive = 0, >> + aml_shared = 1, >> +} AmlExclusiveAndShared; >> + >> +/* >> + * ACPI 5.1: Table 6-203 Extended Interrupt Descriptor Definition >> + * _WKC field definition >> + */ >> +typedef enum { >> + aml_not_wake_capable = 0, >> + aml_wake_capable = 1, >> +} AmlWakeCap; >> + >> typedef >> struct AcpiBuildTables { >> GArray *table_data; >> @@ -164,6 +209,11 @@ Aml *aml_call3(const char *method, Aml *arg1, Aml *arg2, Aml *arg3); >> Aml *aml_call4(const char *method, Aml *arg1, Aml *arg2, Aml *arg3, Aml *arg4); >> Aml *aml_memory32_fixed(uint32_t addr, uint32_t size, >> AmlReadAndWrite read_and_write); >> +Aml *aml_interrupt(AmlConsumerAndProducer con_and_pro, >> + AmlLevelAndEdge level_and_edge, >> + AmlActiveHighAndLow high_and_low, >> + AmlExclusiveAndShared exclusive_and_shared, >> + AmlWakeCap wake_capable, uint32_t irq); >> Aml *aml_io(AmlIODecode dec, uint16_t min_base, uint16_t max_base, >> uint8_t aln, uint8_t len); >> Aml *aml_operation_region(const char *name, AmlRegionSpace rs, > > > . > -- Shannon