Re: [PATCH] acpi/apei/einj: Add extensions to EINJ from rev 5.0 ofacpi spec

From: Chen Gong
Date: Sun Feb 12 2012 - 21:24:40 EST


ä 2012/2/12 17:33, Jiang Liu åé:
Hi Tony and Gong,
Should we remove the target memory address from the resource list of
ACPI5 trigger too? Otherwise we may also encounter resource conflict with ACPI5
trigger table.

@@ -365,7 +365,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
* This will cause resource conflict with regular memory. So
* remove it from trigger table resources.
*/
- if (param_extension&& (type& 0x0038)&& param2) {
+ if ((param_extension || acpi5)&& (type& 0x0038)&& param2) {
struct apei_resources addr_resources;
apei_resources_init(&addr_resources);
trigger_param_region = einj_get_trigger_parameter_region(

On 01/18/2012 04:10 AM, Tony Luck wrote:
@@ -293,12 +386,56 @@ static int __einj_error_inject(u32 type, u64 param1, u64 param2)
if (rc)
return rc;
apei_exec_ctx_set_input(&ctx, type);
- rc = apei_exec_run(&ctx, ACPI_EINJ_SET_ERROR_TYPE);
- if (rc)
- return rc;
- if (einj_param) {
- writeq(param1,&einj_param->param1);
- writeq(param2,&einj_param->param2);
+ if (acpi5) {
+ struct set_error_type_with_address *v5param = einj_param;
+
+ writel(type,&v5param->type);
+ if (type& 0x80000000) {
+ switch (vendor_flags) {
+ case SETWA_FLAGS_APICID:
+ writel(param1,&v5param->apicid);
+ break;
+ case SETWA_FLAGS_MEM:
+ writeq(param1,&v5param->memory_address);
+ writeq(param2,&v5param->memory_address_range);
+ break;
+ case SETWA_FLAGS_PCIE_SBDF:
+ writel(param1,&v5param->pcie_sbdf);
+ break;
+ }
+ writel(vendor_flags,&v5param->flags);
+ } else {
+ switch (type) {
+ case ACPI_EINJ_PROCESSOR_CORRECTABLE:
+ case ACPI_EINJ_PROCESSOR_UNCORRECTABLE:
+ case ACPI_EINJ_PROCESSOR_FATAL:
+ writel(param1,&v5param->apicid);
+ writel(SETWA_FLAGS_APICID,&v5param->flags);
+ break;
+ case ACPI_EINJ_MEMORY_CORRECTABLE:
+ case ACPI_EINJ_MEMORY_UNCORRECTABLE:
+ case ACPI_EINJ_MEMORY_FATAL:
+ writeq(param1,&v5param->memory_address);
+ writeq(param2,&v5param->memory_address_range);
+ writel(SETWA_FLAGS_MEM,&v5param->flags);
+ break;
+ case ACPI_EINJ_PCIX_CORRECTABLE:
+ case ACPI_EINJ_PCIX_UNCORRECTABLE:
+ case ACPI_EINJ_PCIX_FATAL:
+ writel(param1,&v5param->pcie_sbdf);
+ writel(SETWA_FLAGS_PCIE_SBDF,&v5param->flags);
+ break;
+ }
+ }
I'm a little confused about the ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS command in ACPI5.
The above code seems like a hard-coded version of
apei_exec_run(&ctx, ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS).
Hi Gong, could you please share the ACPI5 version of EINJ table with me? So I could
get better understanding of the ACPI_EINJ_SET_ERROR_TYPE_WITH_ADDRESS command.


You can check ACPI5.0 spec 18.6 for detail. We have internal BIOS to support
ACPI5 and I'm not sure if there is external product to support ACPI5 formally.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/