From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EFCA548E0 for ; Mon, 29 Jul 2024 16:08:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.176.79.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722269327; cv=none; b=GXwUg1tfFX5B6GxQ8DZ+qcJRnZ+eiyXj6KPQ4TpCkP5zjgOpy0tXMFMr4DaQGKTPbgsdsHT0XRaHypRBaA67i73WcpIoy/dnsfalOLBKIuTSD9gQLcrRz+kSJPyRsBKQHr75zRUhosK7XRsWSoNzAjxY5CR7V88kT7Q/V/pdE8c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722269327; c=relaxed/simple; bh=tLrXFYOATZ1thmtPkCzHgKfw+l7XhpAACkAFRp1adUc=; h=Date:From:To:CC:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NDtlOAVgE/qO2/8cQnueT2bxIWgDcFmySWF0f/G0sULD+bXfHa3XunodKkV1JYMUX1zxQFm/E0ZHaz4OolZMofP3zjlfCNvYaaDIZ2kH/oygTH2zmdZ9JZX3jgrJji54iGG6n0PFzasWiow2+TAteZPlHIrNmbMPrDf7X4JYyWk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=Huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=185.176.79.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=Huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4WXjry00lKz6K9ht; Tue, 30 Jul 2024 00:06:10 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id C4DBC140B2F; Tue, 30 Jul 2024 00:08:41 +0800 (CST) Received: from localhost (10.203.177.66) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 29 Jul 2024 17:08:41 +0100 Date: Mon, 29 Jul 2024 17:08:40 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: Shiju Jose , "Michael S. Tsirkin" , Philippe =?ISO-8859-1?Q?Mathieu-Daud=E9?= , Ani Sinha , Eduardo Habkost , Igor Mammedov , "Marcel Apfelbaum" , Peter Maydell , Shannon Zhao , "Yanan Wang" , Zhao Liu , , , Subject: Re: [PATCH v4 2/6] arm/virt: Wire up GPIO error source for ACPI / GHES Message-ID: <20240729170840.00004763@Huawei.com> In-Reply-To: References: Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: lhrpeml100005.china.huawei.com (7.191.160.25) To lhrpeml500005.china.huawei.com (7.191.163.240) On Mon, 29 Jul 2024 15:21:06 +0200 Mauro Carvalho Chehab wrote: > From: Jonathan Cameron > > Creates a Generic Event Device (GED) as specified at I wrote this a while back and wasn't aware of the naming mess around GED in the ACPI spec. This one is just referred to as 'error device' whereas there is also a Generic Event Device. Linux solved this clash by going with Hardware Error Device I think we should do the same here. > ACPI 6.5 specification at 18.3.2.7.2: > https://uefi.org/specs/ACPI/6.5/18_Platform_Error_Interfaces.html#event-notification-for-generic-error-sources > with HID PNP0C33. > > The PNP0C33 device is used to report hardware errors to > the bios via ACPI APEI Generic Hardware Error Source (GHES). > > It is aligned with Linux Kernel patch: > https://lore.kernel.org/lkml/1272350481-27951-8-git-send-email-ying.huang@intel.com/ > > [mchehab: use a define for the generic event pin number and do some cleanups] > Signed-off-by: Jonathan Cameron > Signed-off-by: Mauro Carvalho Chehab > --- > hw/arm/virt-acpi-build.c | 30 ++++++++++++++++++++++++++---- > hw/arm/virt.c | 14 ++++++++++++-- > include/hw/arm/virt.h | 1 + > include/hw/boards.h | 1 + > 4 files changed, 40 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index f76fb117adff..c502ccf40909 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -63,6 +63,7 @@ > > #define ARM_SPI_BASE 32 > > +#define ACPI_GENERIC_EVENT_DEVICE "GEDD" Ah. My mistake. This is the confusing named GENERIC_ERROR_DEVICE or HARDWARE_ERROR_DEVICE (which is what Linux called it because in the ACPI Spec it is just (all lower case) error device). > #define ACPI_BUILD_TABLE_SIZE 0x20000 > /* DSDT */ > static void > build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > @@ -841,10 +863,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > HOTPLUG_HANDLER(vms->acpi_dev), > irqmap[VIRT_ACPI_GED] + ARM_SPI_BASE, AML_SYSTEM_MEMORY, > memmap[VIRT_ACPI_GED].base); > - } else { > - acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO], > - (irqmap[VIRT_GPIO] + ARM_SPI_BASE)); > } > + acpi_dsdt_add_gpio(scope, &memmap[VIRT_GPIO], > + (irqmap[VIRT_GPIO] + ARM_SPI_BASE)); Arguably excess brackets, but obviously this is just a code move so fine to keep it the same. > > if (vms->acpi_dev) { > uint32_t event = object_property_get_uint(OBJECT(vms->acpi_dev), > @@ -858,6 +879,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) > } > > acpi_dsdt_add_power_button(scope); > + acpi_dsdt_add_generic_event_device(scope); > #ifdef CONFIG_TPM > acpi_dsdt_add_tpm(scope, vms); > #endif