| Message ID | 20230111142440.24771-4-Jonathan.Cameron@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/cxl: CXL emulation cleanups and minor fixes for upstream | expand |
On Wed, Jan 11, 2023 at 02:24:35PM +0000, Jonathan Cameron wrote: > From: Gregory Price <gourry.memverge@gmail.com> > > Current code sets to STORAGE_EXPRESS and then overrides it. > > Signed-off-by: Gregory Price <gregory.price@memverge.com> > Reviewed-by: Davidlohr Bueso <dave@stgolabs.net> Reviewed-by: Ira Weiny <ira.weiny@intel.com> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > hw/mem/cxl_type3.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c > index 252822bd82..217a5e639b 100644 > --- a/hw/mem/cxl_type3.c > +++ b/hw/mem/cxl_type3.c > @@ -408,7 +408,6 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp) > } > > pci_config_set_prog_interface(pci_conf, 0x10); > - pci_config_set_class(pci_conf, PCI_CLASS_MEMORY_CXL); > > pcie_endpoint_cap_init(pci_dev, 0x80); > if (ct3d->sn != UI64_NULL) { > @@ -627,7 +626,7 @@ static void ct3_class_init(ObjectClass *oc, void *data) > > pc->realize = ct3_realize; > pc->exit = ct3_exit; > - pc->class_id = PCI_CLASS_STORAGE_EXPRESS; > + pc->class_id = PCI_CLASS_MEMORY_CXL; > pc->vendor_id = PCI_VENDOR_ID_INTEL; > pc->device_id = 0xd93; /* LVF for now */ > pc->revision = 1; > -- > 2.37.2 >
diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 252822bd82..217a5e639b 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -408,7 +408,6 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp) } pci_config_set_prog_interface(pci_conf, 0x10); - pci_config_set_class(pci_conf, PCI_CLASS_MEMORY_CXL); pcie_endpoint_cap_init(pci_dev, 0x80); if (ct3d->sn != UI64_NULL) { @@ -627,7 +626,7 @@ static void ct3_class_init(ObjectClass *oc, void *data) pc->realize = ct3_realize; pc->exit = ct3_exit; - pc->class_id = PCI_CLASS_STORAGE_EXPRESS; + pc->class_id = PCI_CLASS_MEMORY_CXL; pc->vendor_id = PCI_VENDOR_ID_INTEL; pc->device_id = 0xd93; /* LVF for now */ pc->revision = 1;