-Storing physical ports info during enumeration.
-Refactored changes using physical ports info for
Identify Switch Device (Opcode 5100h) & Get Physical Port State
(Opcode 5101h) physical switch FM-API command set.
Signed-off-by: Arpit Kumar <arpit1.kumar@samsung.com>
---
hw/cxl/cxl-mailbox-utils.c | 230 ++++++++++++----------
include/hw/cxl/cxl_device.h | 67 +++++++
include/hw/pci-bridge/cxl_upstream_port.h | 8 +
3 files changed, 198 insertions(+), 107 deletions(-)
diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
index c5177dfd92..cb36880f0b 100644
--- a/hw/cxl/cxl-mailbox-utils.c
+++ b/hw/cxl/cxl-mailbox-utils.c
@@ -435,16 +435,6 @@ static CXLRetCode cmd_set_response_msg_limit(const struct cxl_cmd *cmd,
return CXL_MBOX_SUCCESS;
}
-static void cxl_set_dsp_active_bm(PCIBus *b, PCIDevice *d,
- void *private)
-{
- uint8_t *bm = private;
- if (object_dynamic_cast(OBJECT(d), TYPE_CXL_DSP)) {
- uint8_t port = PCIE_PORT(d)->port;
- bm[port / 8] |= 1 << (port % 8);
- }
-}
-
/* CXL r3.1 Section 7.6.7.1.1: Identify Switch Device (Opcode 5100h) */
static CXLRetCode cmd_identify_switch_device(const struct cxl_cmd *cmd,
uint8_t *payload_in,
@@ -453,9 +443,8 @@ static CXLRetCode cmd_identify_switch_device(const struct cxl_cmd *cmd,
size_t *len_out,
CXLCCI *cci)
{
- PCIEPort *usp = PCIE_PORT(cci->d);
- PCIBus *bus = &PCI_BRIDGE(cci->d)->sec_bus;
- int num_phys_ports = pcie_count_ds_ports(bus);
+ CXLUpstreamPort *pp = CXL_USP(cci->d);
+ uint8_t num_phys_ports = pp->pports.num_ports;
struct cxl_fmapi_ident_switch_dev_resp_pl {
uint8_t ingress_port_id;
@@ -472,11 +461,11 @@ static CXLRetCode cmd_identify_switch_device(const struct cxl_cmd *cmd,
out = (struct cxl_fmapi_ident_switch_dev_resp_pl *)payload_out;
*out = (struct cxl_fmapi_ident_switch_dev_resp_pl) {
- .num_physical_ports = num_phys_ports + 1, /* 1 USP */
+ .num_physical_ports = num_phys_ports,
.num_vcss = 1, /* Not yet support multiple VCS - potentially tricky */
.active_vcs_bitmask[0] = 0x1,
- .total_vppbs = num_phys_ports + 1,
- .bound_vppbs = num_phys_ports + 1,
+ .total_vppbs = num_phys_ports,
+ .bound_vppbs = num_phys_ports,
.num_hdm_decoders_per_usp = 4,
};
@@ -488,16 +477,14 @@ static CXLRetCode cmd_identify_switch_device(const struct cxl_cmd *cmd,
out->ingress_port_id = 0;
}
- pci_for_each_device_under_bus(bus, cxl_set_dsp_active_bm,
- out->active_port_bitmask);
- out->active_port_bitmask[usp->port / 8] |= (1 << usp->port % 8);
-
+ memcpy(out->active_port_bitmask, pp->pports.active_port_bitmask,
+ sizeof(pp->pports.active_port_bitmask));
*len_out = sizeof(*out);
return CXL_MBOX_SUCCESS;
}
-/* CXL r3.1 Section 7.6.7.1.2: Get Physical Port State (Opcode 5101h) */
+/* CXL r3.2 Section 7.6.7.1.2: Get Physical Port State (Opcode 5101h) */
static CXLRetCode cmd_get_physical_port_state(const struct cxl_cmd *cmd,
uint8_t *payload_in,
size_t len_in,
@@ -505,44 +492,22 @@ static CXLRetCode cmd_get_physical_port_state(const struct cxl_cmd *cmd,
size_t *len_out,
CXLCCI *cci)
{
- /* CXL r3.1 Table 7-17: Get Physical Port State Request Payload */
+ CXLUpstreamPort *pp = CXL_USP(cci->d);
+ size_t pl_size;
+ int i;
+
+ /* CXL r3.2 Table 7-17: Get Physical Port State Request Payload */
struct cxl_fmapi_get_phys_port_state_req_pl {
uint8_t num_ports;
uint8_t ports[];
} QEMU_PACKED *in;
- /*
- * CXL r3.1 Table 7-19: Get Physical Port State Port Information Block
- * Format
- */
- struct cxl_fmapi_port_state_info_block {
- uint8_t port_id;
- uint8_t config_state;
- uint8_t connected_device_cxl_version;
- uint8_t rsv1;
- uint8_t connected_device_type;
- uint8_t port_cxl_version_bitmask;
- uint8_t max_link_width;
- uint8_t negotiated_link_width;
- uint8_t supported_link_speeds_vector;
- uint8_t max_link_speed;
- uint8_t current_link_speed;
- uint8_t ltssm_state;
- uint8_t first_lane_num;
- uint16_t link_state;
- uint8_t supported_ld_count;
- } QEMU_PACKED;
-
- /* CXL r3.1 Table 7-18: Get Physical Port State Response Payload */
+ /* CXL r3.2 Table 7-18: Get Physical Port State Response Payload */
struct cxl_fmapi_get_phys_port_state_resp_pl {
uint8_t num_ports;
uint8_t rsv1[3];
- struct cxl_fmapi_port_state_info_block ports[];
+ CXLPhyPortInfo ports[];
} QEMU_PACKED *out;
- PCIBus *bus = &PCI_BRIDGE(cci->d)->sec_bus;
- PCIEPort *usp = PCIE_PORT(cci->d);
- size_t pl_size;
- int i;
in = (struct cxl_fmapi_get_phys_port_state_req_pl *)payload_in;
out = (struct cxl_fmapi_get_phys_port_state_resp_pl *)payload_out;
@@ -555,69 +520,20 @@ static CXLRetCode cmd_get_physical_port_state(const struct cxl_cmd *cmd,
return CXL_MBOX_INVALID_INPUT;
}
- /* For success there should be a match for each requested */
- out->num_ports = in->num_ports;
+ if (in->num_ports > pp->pports.num_ports) {
+ return CXL_MBOX_INVALID_INPUT;
+ }
+ out->num_ports = in->num_ports;
for (i = 0; i < in->num_ports; i++) {
- struct cxl_fmapi_port_state_info_block *port;
- /* First try to match on downstream port */
- PCIDevice *port_dev;
- uint16_t lnkcap, lnkcap2, lnksta;
+ int pn = in->ports[i];
- port = &out->ports[i];
-
- port_dev = pcie_find_port_by_pn(bus, in->ports[i]);
- if (port_dev) { /* DSP */
- PCIDevice *ds_dev = pci_bridge_get_sec_bus(PCI_BRIDGE(port_dev))
- ->devices[0];
- port->config_state = 3;
- if (ds_dev) {
- if (object_dynamic_cast(OBJECT(ds_dev), TYPE_CXL_TYPE3)) {
- port->connected_device_type = 5; /* Assume MLD for now */
- } else {
- port->connected_device_type = 1;
- }
- } else {
- port->connected_device_type = 0;
- }
- port->supported_ld_count = 3;
- } else if (usp->port == in->ports[i]) { /* USP */
- port_dev = PCI_DEVICE(usp);
- port->config_state = 4;
- port->connected_device_type = 0;
- } else {
+ if (pp->pports.pport_info[pn].port_id != pn) {
return CXL_MBOX_INVALID_INPUT;
}
-
- port->port_id = in->ports[i];
- /* Information on status of this port in lnksta, lnkcap */
- if (!port_dev->exp.exp_cap) {
- return CXL_MBOX_INTERNAL_ERROR;
- }
- lnksta = port_dev->config_read(port_dev,
- port_dev->exp.exp_cap + PCI_EXP_LNKSTA,
- sizeof(lnksta));
- lnkcap = port_dev->config_read(port_dev,
- port_dev->exp.exp_cap + PCI_EXP_LNKCAP,
- sizeof(lnkcap));
- lnkcap2 = port_dev->config_read(port_dev,
- port_dev->exp.exp_cap + PCI_EXP_LNKCAP2,
- sizeof(lnkcap2));
-
- port->max_link_width = (lnkcap & PCI_EXP_LNKCAP_MLW) >> 4;
- port->negotiated_link_width = (lnksta & PCI_EXP_LNKSTA_NLW) >> 4;
- /* No definition for SLS field in linux/pci_regs.h */
- port->supported_link_speeds_vector = (lnkcap2 & 0xFE) >> 1;
- port->max_link_speed = lnkcap & PCI_EXP_LNKCAP_SLS;
- port->current_link_speed = lnksta & PCI_EXP_LNKSTA_CLS;
- /* TODO: Track down if we can get the rest of the info */
- port->ltssm_state = 0x7;
- port->first_lane_num = 0;
- port->link_state = 0;
- port->port_cxl_version_bitmask = 0x2;
- port->connected_device_cxl_version = 0x2;
+ memcpy(&out->ports[i], &(pp->pports.pport_info[pn]),
+ sizeof(CXLPhyPortInfo));
}
-
pl_size = sizeof(*out) + sizeof(*out->ports) * in->num_ports;
*len_out = pl_size;
@@ -4684,6 +4600,104 @@ void cxl_add_cci_commands(CXLCCI *cci, const struct cxl_cmd (*cxl_cmd_set)[256],
cxl_rebuild_cel(cci);
}
+static CXLRetCode cxl_set_port_type(CXLUpstreamPort *ports, int pnum,
+ CXLCCI *cci)
+{
+ uint8_t current_port_config_state;
+ uint8_t connected_device_type;
+ uint8_t supported_ld_count;
+ uint16_t lnkcap, lnkcap2, lnksta;
+ PCIBus *bus;
+ PCIDevice *port_dev;
+ PCIEPort *usp = PCIE_PORT(cci->d);
+
+ if (usp->port == pnum) {
+ port_dev = PCI_DEVICE(usp);
+ current_port_config_state = CXL_PORT_CONFIG_STATE_USP;
+ connected_device_type = NO_DEVICE_DETECTED;
+ supported_ld_count = 0;
+ } else {
+ bus = &PCI_BRIDGE(cci->d)->sec_bus;
+ port_dev = pcie_find_port_by_pn(bus, pnum);
+ if (port_dev) { /* DSP */
+ PCIDevice *ds_dev = pci_bridge_get_sec_bus(PCI_BRIDGE(port_dev))
+ ->devices[0];
+ current_port_config_state = CXL_PORT_CONFIG_STATE_DSP;
+ if (ds_dev) {
+ if (object_dynamic_cast(OBJECT(ds_dev), TYPE_CXL_TYPE3)) {
+ /* To-do: controllable */
+ connected_device_type = CXL_TYPE_3_SLD;
+ } else {
+ connected_device_type = PCIE_DEVICE;
+ }
+ } else {
+ connected_device_type = NO_DEVICE_DETECTED;
+ }
+ supported_ld_count = 3;
+ } else {
+ return CXL_MBOX_INVALID_INPUT;
+ }
+ }
+
+ if (!port_dev->exp.exp_cap) {
+ return CXL_MBOX_INTERNAL_ERROR;
+ }
+ lnksta = port_dev->config_read(port_dev,
+ port_dev->exp.exp_cap + PCI_EXP_LNKSTA,
+ sizeof(lnksta));
+ lnkcap = port_dev->config_read(port_dev,
+ port_dev->exp.exp_cap + PCI_EXP_LNKCAP,
+ sizeof(lnkcap));
+ lnkcap2 = port_dev->config_read(port_dev,
+ port_dev->exp.exp_cap + PCI_EXP_LNKCAP2,
+ sizeof(lnkcap2));
+
+ ports->pports.pport_info[pnum] = (CXLPhyPortInfo) {
+ .port_id = pnum,
+ .current_port_config_state = current_port_config_state,
+ .connected_device_mode = STANDARD_256B_FLIT_MODE,
+ .connected_device_type = connected_device_type,
+ .supported_cxl_modes = CXL_256B_FLIT_CAPABLE,
+ .max_link_width = (lnkcap & PCI_EXP_LNKCAP_MLW) >> 4,
+ .negotiated_link_width = (lnksta & PCI_EXP_LNKSTA_NLW) >> 4,
+ .supported_link_speeds_vector = (lnkcap2 & 0xFE) >> 1,
+ .max_link_speed = lnkcap & PCI_EXP_LNKCAP_SLS,
+ .current_link_speed = lnksta & PCI_EXP_LNKSTA_CLS,
+ .ltssm_state = CXL_LTSSM_L2,
+ .first_negotiated_lane_num = 0,
+ .link_state_flags = 0,
+ .supported_ld_count = supported_ld_count,
+ };
+ ports->pports.active_port_bitmask[pnum / 8] |= (1 << pnum % 8);
+
+ return CXL_MBOX_SUCCESS;
+}
+
+static void cxl_set_dsp_port(PCIBus *bus, PCIDevice *dev, void *opaque)
+{
+ CXLCCI *cci = (CXLCCI *)opaque;
+ CXLUpstreamPort *pp = CXL_USP(cci->d);
+
+ if (object_dynamic_cast(OBJECT(dev), TYPE_CXL_DSP)) {
+ cxl_set_port_type(pp, PCIE_PORT(dev)->port, cci);
+ }
+}
+
+static CXLRetCode cxl_set_phy_port_info(CXLCCI *cci)
+{
+ PCIEPort *usp = PCIE_PORT(cci->d);
+ PCIBus *bus = &PCI_BRIDGE(cci->d)->sec_bus;
+ CXLUpstreamPort *pp = CXL_USP(cci->d);
+ int num_phys_ports = pcie_count_ds_ports(bus) + 1;
+ pp->pports.num_ports = num_phys_ports;
+ uint8_t phy_port_num = usp->port;
+
+ cxl_set_port_type(pp, phy_port_num, cci); /* USP */
+ pci_for_each_device_under_bus(bus, cxl_set_dsp_port, cci); /* DSP */
+
+ return CXL_MBOX_SUCCESS;
+}
+
void cxl_initialize_mailbox_swcci(CXLCCI *cci, DeviceState *intf,
DeviceState *d, size_t payload_max)
{
@@ -4691,6 +4705,7 @@ void cxl_initialize_mailbox_swcci(CXLCCI *cci, DeviceState *intf,
cci->d = d;
cci->intf = intf;
cxl_init_cci(cci, payload_max);
+ cxl_set_phy_port_info(cci);
}
void cxl_initialize_mailbox_t3(CXLCCI *cci, DeviceState *d, size_t payload_max)
@@ -4777,4 +4792,5 @@ void cxl_initialize_usp_mctpcci(CXLCCI *cci, DeviceState *d, DeviceState *intf,
cci->d = d;
cci->intf = intf;
cxl_init_cci(cci, payload_max);
+ cxl_set_phy_port_info(cci);
}
diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
index 068c20d61e..9fc720ec10 100644
--- a/include/hw/cxl/cxl_device.h
+++ b/include/hw/cxl/cxl_device.h
@@ -129,6 +129,73 @@
CXL_NUM_CPMU_INSTANCES * (1 << 16), \
(1 << 16))
+#define CXL_MAX_PHY_PORTS 256
+
+/* physical port control info - CXL r3.2 table 7-19 */
+#define CXL_PORT_CONFIG_STATE_DISABLED 0x0
+#define CXL_PORT_CONFIG_STATE_BIND_IN_PROGRESS 0x1
+#define CXL_PORT_CONFIG_STATE_UNBIND_IN_PROGRESS 0x2
+#define CXL_PORT_CONFIG_STATE_DSP 0x3
+#define CXL_PORT_CONFIG_STATE_USP 0x4
+#define CXL_PORT_CONFIG_STATE_FABRIC_PORT 0x5
+#define CXL_PORT_CONFIG_STATE_INVALID_PORT_ID 0xF
+
+#define NOT_CXL_OR_DISCONNECTED 0x00
+#define RCD_MODE 0x01
+#define CXL_68B_FLIT_AND_VH_MODE 0x02
+#define STANDARD_256B_FLIT_MODE 0x03
+#define CXL_LATENCY_OPTIMIZED_256B_FLIT_MODE 0x04
+#define PBR_MODE 0x05
+
+#define NO_DEVICE_DETECTED 0
+#define PCIE_DEVICE 1
+#define CXL_TYPE_1_DEVICE 2
+#define CXL_TYPE_2_DEVICE_OR_HBR_SWITCH 3
+#define CXL_TYPE_3_SLD 4
+#define CXL_TYPE_3_MLD 5
+#define PBR_COMPONENT 6
+
+#define CXL_RCD_MODE 0x00
+#define CXL_68B_FLIT_AND_VH_CAPABLE 0x01
+#define CXL_256B_FLIT_CAPABLE 0x02
+#define CXL_LATENCY_OPTIMIZED_256B_FLIT 0x03
+#define CXL_PBR_CAPABLE 0x04
+
+#define CXL_LTSSM_DETECT 0x00
+#define CXL_LTSSM_POLLING 0x01
+#define CXL_LTSSM_CONFIGURATION 0x02
+#define CXL_LTSSM_RECOVERY 0x03
+#define CXL_LTSSM_L0 0x04
+#define CXL_LTSSM_L0S 0x05
+#define CXL_LTSSM_L1 0x06
+#define CXL_LTSSM_L2 0x07
+#define CXL_LTSSM_DISABLED 0x08
+#define CXL_LTSSM_LOOPBACK 0x09
+#define CXL_LTSSM_HOT_RESET 0x0A
+
+#define LINK_STATE_FLAG_LANE_REVERSED BIT(0)
+#define LINK_STATE_FLAG_PERST_ASSERTED BIT(1)
+#define LINK_STATE_FLAG_PRSNT BIT(2)
+#define LINK_STATE_FLAG_POWER_OFF BIT(3)
+
+typedef struct CXLPhyPortInfo {
+ uint8_t port_id;
+ uint8_t current_port_config_state;
+ uint8_t connected_device_mode;
+ uint8_t rsv1;
+ uint8_t connected_device_type;
+ uint8_t supported_cxl_modes;
+ uint8_t max_link_width;
+ uint8_t negotiated_link_width;
+ uint8_t supported_link_speeds_vector;
+ uint8_t max_link_speed;
+ uint8_t current_link_speed;
+ uint8_t ltssm_state;
+ uint8_t first_negotiated_lane_num;
+ uint16_t link_state_flags;
+ uint8_t supported_ld_count;
+} QEMU_PACKED CXLPhyPortInfo;
+
/* CXL r3.1 Table 8-34: Command Return Codes */
typedef enum {
CXL_MBOX_SUCCESS = 0x0,
diff --git a/include/hw/pci-bridge/cxl_upstream_port.h b/include/hw/pci-bridge/cxl_upstream_port.h
index db1dfb6afd..3b7e72bfe0 100644
--- a/include/hw/pci-bridge/cxl_upstream_port.h
+++ b/include/hw/pci-bridge/cxl_upstream_port.h
@@ -4,6 +4,7 @@
#include "hw/pci/pcie.h"
#include "hw/pci/pcie_port.h"
#include "hw/cxl/cxl.h"
+#include "include/hw/cxl/cxl_device.h"
typedef struct CXLUpstreamPort {
/*< private >*/
@@ -23,6 +24,13 @@ typedef struct CXLUpstreamPort {
DOECap doe_cdat;
uint64_t sn;
+
+ /*< physical ports information >*/
+ struct {
+ uint8_t num_ports;
+ uint8_t active_port_bitmask[CXL_MAX_PHY_PORTS / BITS_PER_BYTE];
+ CXLPhyPortInfo pport_info[CXL_MAX_PHY_PORTS];
+ } pports;
} CXLUpstreamPort;
#endif /* CXL_SUP_H */
--
2.34.1On Thu, 4 Sep 2025 18:49:03 +0530
Arpit Kumar <arpit1.kumar@samsung.com> wrote:
> -Storing physical ports info during enumeration.
> -Refactored changes using physical ports info for
> Identify Switch Device (Opcode 5100h) & Get Physical Port State
> (Opcode 5101h) physical switch FM-API command set.
>
> Signed-off-by: Arpit Kumar <arpit1.kumar@samsung.com>
Hi Arpit,
A few minor things inline. Biggest one is making sure
to namespace the defines which is quite challenging to do
here without a really long name.
Jonathan
> ---
> hw/cxl/cxl-mailbox-utils.c | 230 ++++++++++++----------
> include/hw/cxl/cxl_device.h | 67 +++++++
> include/hw/pci-bridge/cxl_upstream_port.h | 8 +
> 3 files changed, 198 insertions(+), 107 deletions(-)
>
> diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
> index c5177dfd92..cb36880f0b 100644
> --- a/hw/cxl/cxl-mailbox-utils.c
> +++ b/hw/cxl/cxl-mailbox-utils.c
> @@ -435,16 +435,6 @@ static CXLRetCode cmd_set_response_msg_limit(const struct cxl_cmd *cmd,
> return CXL_MBOX_SUCCESS;
> }
> @@ -555,69 +520,20 @@ static CXLRetCode cmd_get_physical_port_state(const struct cxl_cmd *cmd,
> return CXL_MBOX_INVALID_INPUT;
> }
>
> - /* For success there should be a match for each requested */
> - out->num_ports = in->num_ports;
> + if (in->num_ports > pp->pports.num_ports) {
> + return CXL_MBOX_INVALID_INPUT;
> + }
>
> + out->num_ports = in->num_ports;
> for (i = 0; i < in->num_ports; i++) {
> - struct cxl_fmapi_port_state_info_block *port;
> - /* First try to match on downstream port */
> - PCIDevice *port_dev;
> - uint16_t lnkcap, lnkcap2, lnksta;
> + int pn = in->ports[i];
>
> - port = &out->ports[i];
> -
> - port_dev = pcie_find_port_by_pn(bus, in->ports[i]);
> - if (port_dev) { /* DSP */
> - PCIDevice *ds_dev = pci_bridge_get_sec_bus(PCI_BRIDGE(port_dev))
> - ->devices[0];
> - port->config_state = 3;
> - if (ds_dev) {
> - if (object_dynamic_cast(OBJECT(ds_dev), TYPE_CXL_TYPE3)) {
> - port->connected_device_type = 5; /* Assume MLD for now */
> - } else {
> - port->connected_device_type = 1;
> - }
> - } else {
> - port->connected_device_type = 0;
> - }
> - port->supported_ld_count = 3;
> - } else if (usp->port == in->ports[i]) { /* USP */
> - port_dev = PCI_DEVICE(usp);
> - port->config_state = 4;
> - port->connected_device_type = 0;
> - } else {
> + if (pp->pports.pport_info[pn].port_id != pn) {
> return CXL_MBOX_INVALID_INPUT;
> }
> -
> - port->port_id = in->ports[i];
> - /* Information on status of this port in lnksta, lnkcap */
> - if (!port_dev->exp.exp_cap) {
> - return CXL_MBOX_INTERNAL_ERROR;
> - }
> - lnksta = port_dev->config_read(port_dev,
> - port_dev->exp.exp_cap + PCI_EXP_LNKSTA,
> - sizeof(lnksta));
> - lnkcap = port_dev->config_read(port_dev,
> - port_dev->exp.exp_cap + PCI_EXP_LNKCAP,
> - sizeof(lnkcap));
> - lnkcap2 = port_dev->config_read(port_dev,
> - port_dev->exp.exp_cap + PCI_EXP_LNKCAP2,
> - sizeof(lnkcap2));
> -
> - port->max_link_width = (lnkcap & PCI_EXP_LNKCAP_MLW) >> 4;
> - port->negotiated_link_width = (lnksta & PCI_EXP_LNKSTA_NLW) >> 4;
> - /* No definition for SLS field in linux/pci_regs.h */
> - port->supported_link_speeds_vector = (lnkcap2 & 0xFE) >> 1;
> - port->max_link_speed = lnkcap & PCI_EXP_LNKCAP_SLS;
> - port->current_link_speed = lnksta & PCI_EXP_LNKSTA_CLS;
> - /* TODO: Track down if we can get the rest of the info */
> - port->ltssm_state = 0x7;
> - port->first_lane_num = 0;
> - port->link_state = 0;
> - port->port_cxl_version_bitmask = 0x2;
> - port->connected_device_cxl_version = 0x2;
> + memcpy(&out->ports[i], &(pp->pports.pport_info[pn]),
> + sizeof(CXLPhyPortInfo));
> }
> -
That's a stray change that shouldn't be here.
> pl_size = sizeof(*out) + sizeof(*out->ports) * in->num_ports;
> *len_out = pl_size;
>
> +static void cxl_set_dsp_port(PCIBus *bus, PCIDevice *dev, void *opaque)
> +{
> + CXLCCI *cci = (CXLCCI *)opaque;
That cast isn't needed. You can always implicitly cast from a void *
to another pointer type (and the other way).
> + CXLUpstreamPort *pp = CXL_USP(cci->d);
> +
> + if (object_dynamic_cast(OBJECT(dev), TYPE_CXL_DSP)) {
> + cxl_set_port_type(pp, PCIE_PORT(dev)->port, cci);
> + }
> +}
> +
> +static CXLRetCode cxl_set_phy_port_info(CXLCCI *cci)
> +{
> + PCIEPort *usp = PCIE_PORT(cci->d);
> + PCIBus *bus = &PCI_BRIDGE(cci->d)->sec_bus;
> + CXLUpstreamPort *pp = CXL_USP(cci->d);
> + int num_phys_ports = pcie_count_ds_ports(bus) + 1;
> + pp->pports.num_ports = num_phys_ports;
Don't mix and match declarations and non declarations.
> + uint8_t phy_port_num = usp->port;
> +
> + cxl_set_port_type(pp, phy_port_num, cci); /* USP */
> + pci_for_each_device_under_bus(bus, cxl_set_dsp_port, cci); /* DSP */
> +
> + return CXL_MBOX_SUCCESS;
> +}
> diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h
> index 068c20d61e..9fc720ec10 100644
> --- a/include/hw/cxl/cxl_device.h
> +++ b/include/hw/cxl/cxl_device.h
> @@ -129,6 +129,73 @@
> CXL_NUM_CPMU_INSTANCES * (1 << 16), \
> (1 << 16))
>
> +#define CXL_MAX_PHY_PORTS 256
> +
> +/* physical port control info - CXL r3.2 table 7-19 */
Stick to local style. That makes this
/* CXL r3.2 Table 7-19: Get Physical Port State Port Information Block Format */
> +#define CXL_PORT_CONFIG_STATE_DISABLED 0x0
> +#define CXL_PORT_CONFIG_STATE_BIND_IN_PROGRESS 0x1
> +#define CXL_PORT_CONFIG_STATE_UNBIND_IN_PROGRESS 0x2
> +#define CXL_PORT_CONFIG_STATE_DSP 0x3
> +#define CXL_PORT_CONFIG_STATE_USP 0x4
> +#define CXL_PORT_CONFIG_STATE_FABRIC_PORT 0x5
> +#define CXL_PORT_CONFIG_STATE_INVALID_PORT_ID 0xF
> +
> +#define NOT_CXL_OR_DISCONNECTED 0x00
These need a clean prefix like the you have for CONFIG_STATE
Some of these names are tricky to put concisely.
#define CXL_PORT_CONNECTED_DEV_MODE_NOT_CXL_OR_DISCONN 0x0
#define CXL_PORT_CONNECTED_DEV_MODE_RCD 0x1
#define CXL_PORT_CONNECTED_DEV_MODE_68B_VH 0x2
#define CXL_PORT_CONNECTED_DEV_MODE_256B 0x3
#define CXL_PORT_CONNECTED_DEV_MODE_LO_256B 0x4
#define CXL_PORT_CONNECTED_DEV_MODE_PBR 0x5
Is about the shortest that covers what these are.
Kind of need to retain these are about the device down the
other end of the wires. Only one bibblee so can use just 1 character.
> +#define RCD_MODE 0x01
> +#define CXL_68B_FLIT_AND_VH_MODE 0x02
> +#define STANDARD_256B_FLIT_MODE 0x03
> +#define CXL_LATENCY_OPTIMIZED_256B_FLIT_MODE 0x04
> +#define PBR_MODE 0x05
> +
> +#define NO_DEVICE_DETECTED 0
Similar here - also keep to hex to match spec and 2 digits as this one is byte.
#define CXL_PORT_CONNECTED_DEV_TYPE_NONE 0x00
#define CXL_PORT_CONNECTED_DEV_TYPE_PCIE 0x01
etc
> +#define PCIE_DEVICE 1
> +#define CXL_TYPE_1_DEVICE 2
> +#define CXL_TYPE_2_DEVICE_OR_HBR_SWITCH 3
> +#define CXL_TYPE_3_SLD 4
> +#define CXL_TYPE_3_MLD 5
> +#define PBR_COMPONENT 6
> +
> +#define CXL_RCD_MODE 0x00
> +#define CXL_68B_FLIT_AND_VH_CAPABLE 0x01
> +#define CXL_256B_FLIT_CAPABLE 0x02
> +#define CXL_LATENCY_OPTIMIZED_256B_FLIT 0x03
> +#define CXL_PBR_CAPABLE 0x04
This lot are confusing as they are a bits in a bitmap. I'd express them as
#define CXL_PORT_SUPPORTS_RCD BIT(0)
#define CXL_PORT_SUPPORTS_68B_VH BIT(1)
etc, matching names with above suggestion on short forms.
> +
> +#define CXL_LTSSM_DETECT 0x00
I'd call out the PORT bit for these as they aren't generic
and that this is the current state.
CXL_PORT_LTSSM_STATE_DETECT etc
> +#define CXL_LTSSM_POLLING 0x01
> +#define CXL_LTSSM_CONFIGURATION 0x02
> +#define CXL_LTSSM_RECOVERY 0x03
> +#define CXL_LTSSM_L0 0x04
> +#define CXL_LTSSM_L0S 0x05
> +#define CXL_LTSSM_L1 0x06
> +#define CXL_LTSSM_L2 0x07
> +#define CXL_LTSSM_DISABLED 0x08
> +#define CXL_LTSSM_LOOPBACK 0x09
> +#define CXL_LTSSM_HOT_RESET 0x0A
> +
> +#define LINK_STATE_FLAG_LANE_REVERSED BIT(0)
Probably stick CXL_PORT_ as prefix for these as well.
> +#define LINK_STATE_FLAG_PERST_ASSERTED BIT(1)
> +#define LINK_STATE_FLAG_PRSNT BIT(2)
> +#define LINK_STATE_FLAG_POWER_OFF BIT(3)
> +
> +typedef struct CXLPhyPortInfo {
> + uint8_t port_id;
> + uint8_t current_port_config_state;
> + uint8_t connected_device_mode;
> + uint8_t rsv1;
> + uint8_t connected_device_type;
> + uint8_t supported_cxl_modes;
> + uint8_t max_link_width;
> + uint8_t negotiated_link_width;
> + uint8_t supported_link_speeds_vector;
> + uint8_t max_link_speed;
> + uint8_t current_link_speed;
> + uint8_t ltssm_state;
> + uint8_t first_negotiated_lane_num;
> + uint16_t link_state_flags;
> + uint8_t supported_ld_count;
> +} QEMU_PACKED CXLPhyPortInfo;
> +
> /* CXL r3.1 Table 8-34: Command Return Codes */
> typedef enum {
> CXL_MBOX_SUCCESS = 0x0,
> diff --git a/include/hw/pci-bridge/cxl_upstream_port.h b/include/hw/pci-bridge/cxl_upstream_port.h
> index db1dfb6afd..3b7e72bfe0 100644
> --- a/include/hw/pci-bridge/cxl_upstream_port.h
> +++ b/include/hw/pci-bridge/cxl_upstream_port.h
> @@ -4,6 +4,7 @@
> #include "hw/pci/pcie.h"
> #include "hw/pci/pcie_port.h"
> #include "hw/cxl/cxl.h"
> +#include "include/hw/cxl/cxl_device.h"
>
> typedef struct CXLUpstreamPort {
> /*< private >*/
> @@ -23,6 +24,13 @@ typedef struct CXLUpstreamPort {
>
> DOECap doe_cdat;
> uint64_t sn;
> +
> + /*< physical ports information >*/
I believe the magic /*< private >*/ syntax with the <> is special for public/private.
There are a few other comments marked like that in qemu, but very very few.
So this probably just wants to be
/* Physical ports information */
> + struct {
> + uint8_t num_ports;
> + uint8_t active_port_bitmask[CXL_MAX_PHY_PORTS / BITS_PER_BYTE];
> + CXLPhyPortInfo pport_info[CXL_MAX_PHY_PORTS];
> + } pports;
> } CXLUpstreamPort;
>
> #endif /* CXL_SUP_H */
© 2016 - 2025 Red Hat, Inc.