From: Wei Huang <wei.huang2@amd.com>
To: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-doc@vger.kernel.org>, <netdev@vger.kernel.org>
Cc: <bhelgaas@google.com>, <corbet@lwn.net>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<alex.williamson@redhat.com>, <gospo@broadcom.com>,
<michael.chan@broadcom.com>, <ajit.khaparde@broadcom.com>,
<manoj.panicker2@amd.com>, <Eric.VanTassell@amd.com>,
<wei.huang2@amd.com>
Subject: [PATCH V1 6/9] PCI/TPH: Retrieve steering tag from ACPI _DSM
Date: Thu, 9 May 2024 11:27:38 -0500 [thread overview]
Message-ID: <20240509162741.1937586-7-wei.huang2@amd.com> (raw)
In-Reply-To: <20240509162741.1937586-1-wei.huang2@amd.com>
According to PCI SIG ECN, calling the _DSM firmware method for a given
CPU_UID returns the steering tags for different types of memory
(volatile, non-volatile). These tags are supposed to be used in ST
table entry for optimal results.
Co-developed-by: Eric Van Tassell <Eric.VanTassell@amd.com>
Signed-off-by: Eric Van Tassell <Eric.VanTassell@amd.com>
Reviewed-by: Andy Gospodarek <gospo@broadcom.com>
Signed-off-by: Wei Huang <wei.huang2@amd.com>
---
drivers/pci/pcie/tph.c | 103 +++++++++++++++++++++++++++++++++++++++-
include/linux/pci-tph.h | 34 +++++++++++++
2 files changed, 136 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/pcie/tph.c b/drivers/pci/pcie/tph.c
index 50451a0a32ff..b9d61e1cfd88 100644
--- a/drivers/pci/pcie/tph.c
+++ b/drivers/pci/pcie/tph.c
@@ -158,6 +158,98 @@ static int tph_get_table_location(struct pci_dev *dev, u8 *loc_out)
return 0;
}
+static u16 tph_extract_tag(enum tph_mem_type mem_type, u8 req_type,
+ union st_info *st_tag)
+{
+ switch (req_type) {
+ case PCI_TPH_REQ_TPH_ONLY: /* 8 bit tags */
+ switch (mem_type) {
+ case TPH_MEM_TYPE_VM:
+ if (st_tag->vm_st_valid)
+ return st_tag->vm_st;
+ break;
+ case TPH_MEM_TYPE_PM:
+ if (st_tag->pm_st_valid)
+ return st_tag->pm_st;
+ break;
+ }
+ break;
+ case PCI_TPH_REQ_EXT_TPH: /* 16 bit tags */
+ switch (mem_type) {
+ case TPH_MEM_TYPE_VM:
+ if (st_tag->vm_xst_valid)
+ return st_tag->vm_xst;
+ break;
+ case TPH_MEM_TYPE_PM:
+ if (st_tag->pm_xst_valid)
+ return st_tag->pm_xst;
+ break;
+ }
+ break;
+ default:
+ pr_err("invalid steering tag in ACPI _DSM\n");
+ return 0;
+ }
+
+ return 0;
+}
+
+#define MIN_ST_DSM_REV 7
+#define ST_DSM_FUNC_INDEX 0xf
+static bool invoke_dsm(acpi_handle handle, u32 cpu_uid, u8 ph,
+ u8 target_type, bool cache_ref_valid,
+ u64 cache_ref, union st_info *st_out)
+{
+ union acpi_object in_obj, in_buf[3], *out_obj;
+
+ in_buf[0].integer.type = ACPI_TYPE_INTEGER;
+ in_buf[0].integer.value = 0; /* 0 => processor cache steering tags */
+
+ in_buf[1].integer.type = ACPI_TYPE_INTEGER;
+ in_buf[1].integer.value = cpu_uid;
+
+ in_buf[2].integer.type = ACPI_TYPE_INTEGER;
+ in_buf[2].integer.value = ph & 3;
+ in_buf[2].integer.value |= (target_type & 1) << 2;
+ in_buf[2].integer.value |= (cache_ref_valid & 1) << 3;
+ in_buf[2].integer.value |= (cache_ref << 32);
+
+ in_obj.type = ACPI_TYPE_PACKAGE;
+ in_obj.package.count = ARRAY_SIZE(in_buf);
+ in_obj.package.elements = in_buf;
+
+ out_obj = acpi_evaluate_dsm(handle, &pci_acpi_dsm_guid, MIN_ST_DSM_REV,
+ ST_DSM_FUNC_INDEX, &in_obj);
+
+ if (!out_obj)
+ return false;
+
+ if (out_obj->type != ACPI_TYPE_BUFFER) {
+ pr_err("invalid return type %d from TPH _DSM\n",
+ out_obj->type);
+ ACPI_FREE(out_obj);
+ return false;
+ }
+
+ st_out->value = *((u64 *)(out_obj->buffer.pointer));
+
+ ACPI_FREE(out_obj);
+
+ return true;
+}
+
+static acpi_handle root_complex_acpi_handle(struct pci_dev *dev)
+{
+ struct pci_dev *root_port;
+
+ root_port = pcie_find_root_port(dev);
+
+ if (!root_port || !root_port->bus || !root_port->bus->bridge)
+ return NULL;
+
+ return ACPI_HANDLE(root_port->bus->bridge);
+}
+
static bool msix_nr_in_bounds(struct pci_dev *dev, int msix_nr)
{
u16 tbl_sz;
@@ -423,7 +515,16 @@ bool pcie_tph_get_st(struct pci_dev *dev, unsigned int cpu,
enum tph_mem_type mem_type, u8 req_type,
u16 *tag)
{
- *tag = 0;
+ union st_info info;
+
+ if (!invoke_dsm(root_complex_acpi_handle(dev), cpu, 0, 0, false, 0,
+ &info)) {
+ *tag = 0;
+ return false;
+ }
+
+ *tag = tph_extract_tag(mem_type, req_type, &info);
+ pr_debug("%s: cpu=%d tag=%d\n", __func__, cpu, *tag);
return true;
}
diff --git a/include/linux/pci-tph.h b/include/linux/pci-tph.h
index 42ecd6192e69..ed5299a831cb 100644
--- a/include/linux/pci-tph.h
+++ b/include/linux/pci-tph.h
@@ -14,6 +14,40 @@ enum tph_mem_type {
TPH_MEM_TYPE_PM /* persistent memory type */
};
+/*
+ * The st_info struct defines the steering tag returned by the firmware _DSM
+ * method defined in PCI SIG ECN. The specification is available at:
+ * https://members.pcisig.com/wg/PCI-SIG/document/15470.
+
+ * @vm_st_valid: 8 bit tag for volatile memory is valid
+ * @vm_xst_valid: 16 bit tag for volatile memory is valid
+ * @vm_ignore: 1 => was and will be ignored, 0 => ph should be supplied
+ * @vm_st: 8 bit steering tag for volatile mem
+ * @vm_xst: 16 bit steering tag for volatile mem
+ * @pm_st_valid: 8 bit tag for persistent memory is valid
+ * @pm_xst_valid: 16 bit tag for persistent memory is valid
+ * @pm_ignore: 1 => was and will be ignore, 0 => ph should be supplied
+ * @pm_st: 8 bit steering tag for persistent mem
+ * @pm_xst: 16 bit steering tag for persistent mem
+ */
+union st_info {
+ struct {
+ u64 vm_st_valid:1,
+ vm_xst_valid:1,
+ vm_ph_ignore:1,
+ rsvd1:5,
+ vm_st:8,
+ vm_xst:16,
+ pm_st_valid:1,
+ pm_xst_valid:1,
+ pm_ph_ignore:1,
+ rsvd2:5,
+ pm_st:8,
+ pm_xst:16;
+ };
+ u64 value;
+};
+
#ifdef CONFIG_PCIE_TPH
int pcie_tph_disable(struct pci_dev *dev);
int tph_set_dev_nostmode(struct pci_dev *dev);
--
2.44.0
next prev parent reply other threads:[~2024-05-09 16:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 16:27 [PATCH V1 0/9] PCIe TPH and cache direct injection support Wei Huang
2024-05-09 16:27 ` [PATCH V1 1/9] PCI: Introduce PCIe TPH support framework Wei Huang
2024-05-09 16:27 ` [PATCH V1 2/9] PCI: Add TPH related register definition Wei Huang
2024-05-09 16:27 ` [PATCH V1 3/9] PCI/TPH: Implement a command line option to disable TPH Wei Huang
2024-05-09 16:27 ` [PATCH V1 4/9] PCI/TPH: Implement a command line option to force No ST Mode Wei Huang
2024-05-09 16:27 ` [PATCH V1 5/9] PCI/TPH: Introduce API functions to get/set steering tags Wei Huang
2024-05-10 3:07 ` kernel test robot
2024-05-11 20:15 ` Simon Horman
2024-05-13 13:29 ` Wei Huang
2024-05-09 16:27 ` Wei Huang [this message]
2024-05-10 4:20 ` [PATCH V1 6/9] PCI/TPH: Retrieve steering tag from ACPI _DSM kernel test robot
2024-05-10 5:24 ` kernel test robot
2024-05-09 16:27 ` [PATCH V1 7/9] PCI/TPH: Add TPH documentation Wei Huang
2024-05-15 12:11 ` Bagas Sanjaya
2024-05-09 16:27 ` [PATCH V1 8/9] bnxt_en: Add TPH support in BNXT driver Wei Huang
2024-05-09 21:50 ` Vadim Fedorenko
2024-05-10 3:55 ` Ajit Khaparde
2024-05-10 10:35 ` Vadim Fedorenko
2024-05-10 15:23 ` Andy Gospodarek
2024-05-10 20:03 ` David Wei
2024-05-10 20:33 ` Andy Gospodarek
2024-05-10 20:33 ` Vadim Fedorenko
2024-05-10 20:37 ` Andy Gospodarek
2024-05-10 3:10 ` Somnath Kotur
2024-05-09 16:27 ` [PATCH V1 9/9] bnxt_en: Pass NQ ID to the FW when allocating RX/RX AGG rings Wei Huang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240509162741.1937586-7-wei.huang2@amd.com \
--to=wei.huang2@amd.com \
--cc=Eric.VanTassell@amd.com \
--cc=ajit.khaparde@broadcom.com \
--cc=alex.williamson@redhat.com \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gospo@broadcom.com \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=manoj.panicker2@amd.com \
--cc=michael.chan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).