Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp3294357pxb; Tue, 12 Jan 2021 10:55:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXrQfgBLu65JmqtDeCunrpIBjqLNvpRV553qnnD7QlE35HOdK5ZtrGG2COVF5zRkk9LLxK X-Received: by 2002:aa7:c2d8:: with SMTP id m24mr435938edp.300.1610477711806; Tue, 12 Jan 2021 10:55:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610477711; cv=none; d=google.com; s=arc-20160816; b=T2eGA4yr0uhCqwgy+Lq/AF3W+8hJlZWmvtAdCvtqcunMcTtXYcijjRmVU/YWFxYJed o4+hZpabyOT5ryDw9sjj38ce03p+hHeCo9mxpmoG46aTlKAxqrIewK8DZ6ndlVi7hhQy RCpoujTphVaeGGovAdrfbeIgLEw/yN0sX0KPa1FklhgPZEoFTGmFX9Zx9xLmbvvf+fhv +u2oHIo2dYeqTudimRVjcVepvZbQr3dsPFtp9fRKLuxTExWnlXEU47wkecXyJv8GEm4e 4X3f0QkEfbNwYmhqCtmvi/sCfiWA7TGduSJJIFrCrxRa52zlT82B3XTVOzP5OjJ1kA2l eU1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=OnOM/5B1wZi2O2p6snn3RCO71/v1/Bv7IDnqPYSPXrs=; b=yvSp+xaSTj+LXllC2t0uEqETM5hB9mHSVqAquBpsZx9T9oRVHdgjOsHEr5bxEm8udN SZlfgk/w3FKUtIgbYaKDclfW0dzC4vMEgdqidxasvTV9T5f1YEyBfu0YuFzqhlLG2os0 PD33w+/Rod8z8e3YhAnozXoTinLbgcWPmactw/b+7vz/VfxYqTJbqPcTHIOtCXdLq/fF FqdZNX3sKjIz228NQ8frd7d4wlmGfAGUrciQq+WFQVktd/5ioWAe9agvnMEOYlhDfwdI vb9QMpAAYthgkmK/KVRSGDyfaHdp3V25Su696fY8dsIye/ZnicjOMldeoLsV7I76fV49 6mGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z14si1668549edr.470.2021.01.12.10.54.46; Tue, 12 Jan 2021 10:55:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392346AbhALSuC (ORCPT + 99 others); Tue, 12 Jan 2021 13:50:02 -0500 Received: from frasgout.his.huawei.com ([185.176.79.56]:2324 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727673AbhALSuC (ORCPT ); Tue, 12 Jan 2021 13:50:02 -0500 Received: from fraeml705-chm.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4DFfcY48dpz67QFM; Wed, 13 Jan 2021 02:44:13 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml705-chm.china.huawei.com (10.206.15.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2106.2; Tue, 12 Jan 2021 19:49:19 +0100 Received: from localhost (10.47.65.219) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 12 Jan 2021 18:49:18 +0000 Date: Tue, 12 Jan 2021 18:48:40 +0000 From: Jonathan Cameron To: Ben Widawsky CC: , Vishal Verma , , , "linux-acpi@vger.kernel.org, Ira Weiny" , Dan Williams , "Kelley, Sean V" , Rafael Wysocki , Bjorn Helgaas , Jon Masters , Chris Browy , Randy Dunlap , "Christoph Hellwig" , Subject: Re: [RFC PATCH v3 03/16] cxl/acpi: add OSC support Message-ID: <20210112184840.00002195@Huawei.com> In-Reply-To: <20210111225121.820014-4-ben.widawsky@intel.com> References: <20210111225121.820014-1-ben.widawsky@intel.com> <20210111225121.820014-4-ben.widawsky@intel.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.47.65.219] X-ClientProxiedBy: lhreml752-chm.china.huawei.com (10.201.108.202) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 11 Jan 2021 14:51:07 -0800 Ben Widawsky wrote: > From: Vishal Verma > > Add support to advertise OS capabilities, and request OS control for CXL > features using the ACPI _OSC mechanism. Advertise support for all > possible CXL features, and attempt to request control for all possible > features. > > Based on a patch by Sean Kelley. > > Signed-off-by: Vishal Verma > Signed-off-by: Ben Widawsky Whilst I understand the reasoning behind not just sharing this code with PCI, it might be worth adding a comment to the code somewhere on that. Otherwise, I suspect you'll very rapidly see patches cleaning up this duplication :) Otherwise LGTM. J > --- > Documentation/cxl/memory-devices.rst | 15 ++ > drivers/cxl/acpi.c | 260 ++++++++++++++++++++++++++- > drivers/cxl/acpi.h | 20 +++ > 3 files changed, 292 insertions(+), 3 deletions(-) > > diff --git a/Documentation/cxl/memory-devices.rst b/Documentation/cxl/memory-devices.rst > index aa4262280c67..6ce88f9d5f4f 100644 > --- a/Documentation/cxl/memory-devices.rst > +++ b/Documentation/cxl/memory-devices.rst > @@ -13,3 +13,18 @@ Driver Infrastructure > ===================== > > This sections covers the driver infrastructure for a CXL memory device. > + > +ACPI CXL > +-------- > + > +.. kernel-doc:: drivers/cxl/acpi.c > + :doc: cxl acpi > + > +.. kernel-doc:: drivers/cxl/acpi.c > + :internal: > + > +External Interfaces > +=================== > + > +.. kernel-doc:: drivers/cxl/acpi.c > + :export: > diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c > index 0f1ba9b3f1ed..af9c0dfdee20 100644 > --- a/drivers/cxl/acpi.c > +++ b/drivers/cxl/acpi.c > @@ -11,7 +11,258 @@ > #include > #include "acpi.h" > > -/* > +/** > + * DOC: cxl acpi > + * > + * ACPI _OSC setup: The exported function cxl_bus_acquire() sets up ACPI > + * Operating System Capabilities (_OSC) for the CXL bus. It declares support > + * for all CXL capabilities, and attempts to request control for all possible > + * capabilities. The resulting support and control sets are saved in global > + * variables cxl_osc_support_set and cxl_osc_control_set. The internal > + * functions cxl_osc_declare_support(), and cxl_osc_request_control() can be > + * used to update the support and control sets in accordance with the ACPI > + * rules for _OSC evaluation - most importantly, capabilities already granted > + * should not be rescinded by either the OS or firmware. > + */ > + > +static u32 cxl_osc_support_set; > +static u32 cxl_osc_control_set; > +static DEFINE_MUTEX(acpi_desc_lock); > + > +struct pci_osc_bit_struct { > + u32 bit; > + char *desc; > +}; > + > +static struct pci_osc_bit_struct cxl_osc_support_bit[] = { > + { CXL_OSC_PORT_REG_ACCESS_SUPPORT, "CXLPortRegAccess" }, > + { CXL_OSC_PORT_DEV_REG_ACCESS_SUPPORT, "CXLPortDevRegAccess" }, > + { CXL_OSC_PER_SUPPORT, "CXLProtocolErrorReporting" }, > + { CXL_OSC_NATIVE_HP_SUPPORT, "CXLNativeHotPlug" }, > +}; > + > +static struct pci_osc_bit_struct cxl_osc_control_bit[] = { > + { CXL_OSC_MEM_ERROR_CONTROL, "CXLMemErrorReporting" }, > +}; > + > +static u8 cxl_osc_uuid_str[] = "68F2D50B-C469-4d8A-BD3D-941A103FD3FC"; > + > +static void decode_osc_bits(struct device *dev, char *msg, u32 word, > + struct pci_osc_bit_struct *table, int size) > +{ > + char buf[80]; > + int i, len = 0; > + struct pci_osc_bit_struct *entry; > + > + buf[0] = '\0'; > + for (i = 0, entry = table; i < size; i++, entry++) > + if (word & entry->bit) > + len += scnprintf(buf + len, sizeof(buf) - len, "%s%s", > + len ? " " : "", entry->desc); > + > + dev_info(dev, "_OSC: %s [%s]\n", msg, buf); > +} > + > +static void decode_cxl_osc_support(struct device *dev, char *msg, u32 word) > +{ > + decode_osc_bits(dev, msg, word, cxl_osc_support_bit, > + ARRAY_SIZE(cxl_osc_support_bit)); > +} > + > +static void decode_cxl_osc_control(struct device *dev, char *msg, u32 word) > +{ > + decode_osc_bits(dev, msg, word, cxl_osc_control_bit, > + ARRAY_SIZE(cxl_osc_control_bit)); > +} > + > +static acpi_status acpi_cap_run_osc(acpi_handle handle, const u32 *capbuf, > + u8 *uuid_str, u32 *retval) > +{ > + struct acpi_osc_context context = { > + .uuid_str = uuid_str, > + .rev = 1, > + .cap.length = 20, > + .cap.pointer = (void *)capbuf, > + }; > + acpi_status status; > + > + status = acpi_run_osc(handle, &context); > + if (ACPI_SUCCESS(status)) { > + /* pointer + offset to DWORD 5 */ > + *retval = *((u32 *)(context.ret.pointer + 16)); > + kfree(context.ret.pointer); > + } > + return status; > +} > + > +static acpi_status cxl_query_osc(acpi_handle handle, u32 support, u32 *control) > +{ > + struct acpi_pci_root *root; > + acpi_status status; > + u32 result, capbuf[5]; > + > + root = acpi_pci_find_root(handle); > + if (!root) > + return -ENXIO; > + > + support &= CXL_OSC_SUPPORT_VALID_MASK; > + support |= cxl_osc_support_set; > + > + capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE; > + capbuf[PCI_OSC_SUPPORT_DWORD] = root->osc_support_set; > + capbuf[PCI_OSC_CONTROL_DWORD] = root->osc_control_set; > + capbuf[CXL_OSC_SUPPORT_DWORD] = support; > + if (control) { > + *control &= CXL_OSC_CONTROL_VALID_MASK; > + capbuf[CXL_OSC_CONTROL_DWORD] = *control | cxl_osc_control_set; > + } else { > + /* Run _OSC query only with existing controls. */ > + capbuf[CXL_OSC_CONTROL_DWORD] = cxl_osc_control_set; > + } > + > + status = acpi_cap_run_osc(handle, capbuf, cxl_osc_uuid_str, &result); > + if (ACPI_SUCCESS(status)) { > + cxl_osc_support_set = support; > + if (control) > + *control = result; > + } > + return status; > +} > + > +/** > + * cxl_osc_declare_support - Declare support for CXL root _OSC features. > + * @handle: ACPI device handle for the PCI root bridge (or PCIe Root Complex). > + * @flags: The _OSC bits to declare support for. > + * > + * The PCI specific DWORDS are obtained from the pci root port device, and > + * used as-is. The resulting CXL support set is saved in cxl_osc_support_set. > + * Any future calls to this are forced to be strictly incremental from the > + * existing cxl_osc_support_set. > + */ > +static acpi_status cxl_osc_declare_support(acpi_handle handle, u32 flags) > +{ > + acpi_status status; > + > + mutex_lock(&acpi_desc_lock); > + status = cxl_query_osc(handle, flags, NULL); > + mutex_unlock(&acpi_desc_lock); > + return status; > +} > + > +/** > + * cxl_osc_request_control - Request control of CXL root _OSC features. > + * @adev: ACPI device for the PCI root bridge (or PCIe Root Complex). > + * @mask: Mask of _OSC bits to request control of, place to store control mask. > + * @req: Mask of _OSC bits the control of is essential to the caller. > + * > + * The PCI specific DWORDS are obtained from the pci root port device, and > + * used as-is. The resulting CXL control set is saved in cxl_osc_control_set. > + * Any future calls to this are forced to be strictly incremental from the > + * existing cxl_osc_control_set. > + */ > +static acpi_status cxl_osc_request_control(struct acpi_device *adev, u32 *mask, > + u32 req) > +{ > + acpi_handle handle = adev->handle; > + struct device *dev = &adev->dev; > + struct acpi_pci_root *root; > + acpi_status status = AE_OK; > + u32 ctrl, capbuf[5]; > + > + if (!mask) > + return AE_BAD_PARAMETER; > + > + ctrl = *mask & CXL_OSC_MEM_ERROR_CONTROL; > + if ((ctrl & req) != req) > + return AE_TYPE; > + > + root = acpi_pci_find_root(handle); > + if (!root) > + return -ENXIO; > + > + mutex_lock(&acpi_desc_lock); > + > + *mask = ctrl | cxl_osc_control_set; > + /* No need to evaluate _OSC if the control was already granted. */ > + if ((cxl_osc_control_set & ctrl) == ctrl) > + goto out; > + > + /* Need to check the available controls bits before requesting them. */ > + while (*mask) { > + status = cxl_query_osc(handle, cxl_osc_support_set, mask); > + if (ACPI_FAILURE(status)) > + goto out; > + if (ctrl == *mask) > + break; > + decode_cxl_osc_control(dev, "platform does not support", > + ctrl & ~(*mask)); > + ctrl = *mask; > + } > + > + if ((ctrl & req) != req) { > + decode_cxl_osc_control(dev, > + "not requesting control; platform does not support", > + req & ~(ctrl)); > + status = AE_SUPPORT; > + goto out; > + } > + > + capbuf[OSC_QUERY_DWORD] = 0; > + capbuf[PCI_OSC_SUPPORT_DWORD] = root->osc_support_set; > + capbuf[PCI_OSC_CONTROL_DWORD] = root->osc_control_set; > + capbuf[CXL_OSC_SUPPORT_DWORD] = cxl_osc_support_set; > + capbuf[CXL_OSC_CONTROL_DWORD] = ctrl; > + status = acpi_cap_run_osc(handle, capbuf, cxl_osc_uuid_str, mask); > + if (ACPI_SUCCESS(status)) > + cxl_osc_control_set = *mask; > +out: > + mutex_unlock(&acpi_desc_lock); > + return status; > +} > + > +static int cxl_negotiate_osc(struct acpi_device *adev) > +{ > + u32 cxl_support, cxl_control, requested; > + acpi_handle handle = adev->handle; > + struct device *dev = &adev->dev; > + acpi_status status; > + > + /* Declare support for everything */ > + cxl_support = CXL_OSC_SUPPORT_VALID_MASK; > + decode_cxl_osc_support(dev, "OS supports", cxl_support); > + status = cxl_osc_declare_support(handle, cxl_support); > + if (ACPI_FAILURE(status)) { > + dev_info(dev, "CXL_OSC failed (%s)\n", > + acpi_format_exception(status)); > + return -ENXIO; > + } > + > + /* Request control for everything */ > + cxl_control = CXL_OSC_CONTROL_VALID_MASK; > + requested = cxl_control; > + status = cxl_osc_request_control(adev, &cxl_control, > + CXL_OSC_MEM_ERROR_CONTROL); > + if (ACPI_SUCCESS(status)) { > + decode_cxl_osc_control(dev, "OS now controls", cxl_control); > + } else { > + decode_cxl_osc_control(dev, "OS requested", requested); > + decode_cxl_osc_control(dev, "platform willing to grant", > + cxl_control); > + dev_info(dev, "_OSC failed (%s)\n", > + acpi_format_exception(status)); > + } > + return 0; > +} > + > +/** > + * cxl_bus_acquire - Perform platform-specific bus operations > + * @pdev: pci_dev associated with the CXL device > + * > + * This performs bus-specific operations such as ACPI _OSC to ensure that > + * the bus is 'prepared'. Since the CXL definition of _OSC depends on the > + * existing PCI _OSC DWORDS in 'Arg3', pull those in from the pci root port > + * device, and merge those into the new CXL-augmented _OSC calls. > + * > * If/when CXL support is defined by other platform firmware the kernel > * will need a mechanism to select between the platform specific version > * of this routine, until then, hard-code ACPI assumptions > @@ -21,6 +272,7 @@ int cxl_bus_acquire(struct pci_dev *pdev) > struct acpi_device *adev; > struct pci_dev *root_port; > struct device *root; > + int rc; > > root_port = pcie_find_root_port(pdev); > if (!root_port) > @@ -34,9 +286,11 @@ int cxl_bus_acquire(struct pci_dev *pdev) > if (!adev) > return -ENXIO; > > - /* TODO: OSC enabling */ > + rc = cxl_negotiate_osc(adev); > + if (rc) > + dev_err(&pdev->dev, "Failed to negotiate OSC\n"); > > - return 0; > + return rc; > } > EXPORT_SYMBOL_GPL(cxl_bus_acquire); > > diff --git a/drivers/cxl/acpi.h b/drivers/cxl/acpi.h > index d638f8886ab7..6ef154021745 100644 > --- a/drivers/cxl/acpi.h > +++ b/drivers/cxl/acpi.h > @@ -12,4 +12,24 @@ struct cxl_acpi_desc { > > int cxl_bus_acquire(struct pci_dev *pci_dev); > > +/* Indexes into _OSC Capabilities Buffer */ > +#define PCI_OSC_SUPPORT_DWORD 1 /* DWORD 2 */ > +#define PCI_OSC_CONTROL_DWORD 2 /* DWORD 3 */ > +#define CXL_OSC_SUPPORT_DWORD 3 /* DWORD 4 */ > +#define CXL_OSC_CONTROL_DWORD 4 /* DWORD 5 */ > + > +/* CXL Host Bridge _OSC: Capabilities DWORD 4: Support Field */ > +#define CXL_OSC_PORT_REG_ACCESS_SUPPORT 0x00000001 > +#define CXL_OSC_PORT_DEV_REG_ACCESS_SUPPORT 0x00000002 > +#define CXL_OSC_PER_SUPPORT 0x00000004 > +#define CXL_OSC_NATIVE_HP_SUPPORT 0x00000008 > +#define CXL_OSC_SUPPORT_VALID_MASK (CXL_OSC_PORT_REG_ACCESS_SUPPORT | \ > + CXL_OSC_PORT_DEV_REG_ACCESS_SUPPORT | \ > + CXL_OSC_PER_SUPPORT | \ > + CXL_OSC_NATIVE_HP_SUPPORT) > + > +/* CXL Host Bridge _OSC: Capabilities DWORD 5: Control Field */ > +#define CXL_OSC_MEM_ERROR_CONTROL 0x00000001 > +#define CXL_OSC_CONTROL_VALID_MASK (CXL_OSC_MEM_ERROR_CONTROL) > + > #endif /* __CXL_ACPI_H__ */