From patchwork Mon Nov 23 07:33:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Baozi X-Patchwork-Id: 1404659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=phytium.com.cn Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cff6p0W8Hz9sTL for ; Mon, 23 Nov 2020 18:34:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728184AbgKWHeG (ORCPT ); Mon, 23 Nov 2020 02:34:06 -0500 Received: from fralinode-sdnproxy-1.icoremail.net ([172.104.134.221]:37134 "HELO fralinode-sdnproxy-1.icoremail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1725320AbgKWHeG (ORCPT ); Mon, 23 Nov 2020 02:34:06 -0500 Received: from localhost (unknown [218.77.105.7]) by c1app11 (Coremail) with SMTP id CwINCgD3GZTbZbtfBo8FAA--.5547S3; Mon, 23 Nov 2020 15:33:47 +0800 (CST) From: Chen Baozi To: Ard Biesheuvel , Marc Zyngier , Bjorn Helgaas Cc: linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hanjun Guo , Lorenzo Pieralisi , "Rafael J. Wysocki" , Jonathan Cameron Subject: [RFC PATCH v4 2/2] ACPI: Advertise Interrupt ResourceSource support Date: Mon, 23 Nov 2020 15:33:42 +0800 Message-Id: <20201123073342.3102-2-chenbaozi@phytium.com.cn> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201123073342.3102-1-chenbaozi@phytium.com.cn> References: <20201123073342.3102-1-chenbaozi@phytium.com.cn> MIME-Version: 1.0 X-CM-TRANSID: CwINCgD3GZTbZbtfBo8FAA--.5547S3 X-Coremail-Antispam: 1UD129KBjvJXoWxGrW8Cw1DZw45Wr1ktw4rGrg_yoW5uF48pF s293W5CrWkZa98Aa4kAw4rXFy5Ja1akFy2gr9rGa43Zay0kFn8Jr47tFy7Wa4q9F43GFWY qrn0qFZ8Kas8uaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvmb7Iv0xC_Zr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jrv_JF1lYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka 0xkIwI1lc2xSY4AK67AK6r4xMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r 4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF 67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2I x0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2 z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnU UI43ZEXa7IU8oq2tUUUUU== X-Originating-IP: [218.77.105.7] X-CM-SenderInfo: hfkh0updr2xqxsk13x1xpou0fpof0/1tbiCwLlP11SebitCAAAs4 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org As mentioned in ACPI v6.3, Table 6-200, the platform will indicate to the OS whether or not it supports usage of ResourceSource. If not set, the OS may choose to ignore the ResourceSource parameter in the extended interrupt descriptor. Since we support parsing ResoureSource field of interrupts both for platform devices and PCI Interrupt Link devices now, this patch sets the relevant OSC bit and checks the capability as described in ACPI specification. Signed-off-by: Chen Baozi Cc: Jonathan Cameron --- drivers/acpi/bus.c | 5 +++++ drivers/acpi/irq.c | 3 ++- include/linux/acpi.h | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 1682f8b454a2..a6af1270bea6 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -281,6 +281,8 @@ bool osc_sb_apei_support_acked; bool osc_pc_lpi_support_confirmed; EXPORT_SYMBOL_GPL(osc_pc_lpi_support_confirmed); +bool osc_sb_intr_ressrc_support_confirmed; + static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48"; static void acpi_bus_osc_support(void) { @@ -303,6 +305,7 @@ static void acpi_bus_osc_support(void) capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT; capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT; + capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_INTR_RESSRC_SUPPORT; #ifdef CONFIG_ARM64 capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GENERIC_INITIATOR_SUPPORT; #endif @@ -328,6 +331,8 @@ static void acpi_bus_osc_support(void) capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT; osc_pc_lpi_support_confirmed = capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_PCLPI_SUPPORT; + osc_sb_intr_ressrc_support_confirmed = + capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_INTR_RESSRC_SUPPORT; } kfree(context.ret.pointer); } diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c index 86336a89f73e..8f4d2dff5538 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -108,7 +108,8 @@ acpi_get_irq_source_fwhandle(const struct acpi_resource_source *source) acpi_handle handle; acpi_status status; - if (!source->string_length) + if (!osc_sb_intr_ressrc_support_confirmed || + !source->string_length) return acpi_gsi_domain_id; status = acpi_get_handle(NULL, source->string_ptr, &handle); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index b182a267fe66..f9ca8e117f31 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -555,10 +555,12 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); #define OSC_SB_PCLPI_SUPPORT 0x00000080 #define OSC_SB_OSLPI_SUPPORT 0x00000100 #define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT 0x00001000 -#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00002000 +#define OSC_SB_INTR_RESSRC_SUPPORT 0x00002000 +#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00020000 extern bool osc_sb_apei_support_acked; extern bool osc_pc_lpi_support_confirmed; +extern bool osc_sb_intr_ressrc_support_confirmed; /* PCI Host Bridge _OSC: Capabilities DWORD 2: Support Field */ #define OSC_PCI_EXT_CONFIG_SUPPORT 0x00000001