History

Merge tag 'cxl-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl

Pull cxl updates from Dan Williams: "More preparation and plumbing work in the CXL subsystem. From an end user perspective the highlight here is lighting up the CXL Persistent Memory related commands (label read / write) with the generic ioctl() front-end in LIBNVDIMM. Otherwise, the ability to instantiate new persistent and volatile memory regions is still on track for v5.17. Summary: - Fix support for platforms that do not enumerate every ACPI0016 (CXL Host Bridge) in the CHBS (ACPI Host Bridge Structure). - Introduce a common pci_find_dvsec_capability() helper, clean up open coded implementations in various drivers. - Add 'cxl_test' for regression testing CXL subsystem ABIs. 'cxl_test' is a module built from tools/testing/cxl/ that mocks up a CXL topology to augment the nascent support for emulation of CXL devices in QEMU. - Convert libnvdimm to use the uuid API. - Complete the definition of CXL namespace labels in libnvdimm. - Tunnel libnvdimm label operations from nd_ioctl() back to the CXL mailbox driver. Enable 'ndctl {read,write}-labels' for CXL. - Continue to sort and refactor functionality into distinct driver and core-infrastructure buckets. For example, mailbox handling is now a generic core capability consumed by the PCI and cxl_test drivers" * tag 'cxl-for-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl: (34 commits) ocxl: Use pci core's DVSEC functionality cxl/pci: Use pci core's DVSEC functionality PCI: Add pci_find_dvsec_capability to find designated VSEC cxl/pci: Split cxl_pci_setup_regs() cxl/pci: Add @base to cxl_register_map cxl/pci: Make more use of cxl_register_map cxl/pci: Remove pci request/release regions cxl/pci: Fix NULL vs ERR_PTR confusion cxl/pci: Remove dev_dbg for unknown register blocks cxl/pci: Convert register block identifiers to an enum cxl/acpi: Do not fail cxl_acpi_probe() based on a missing CHBS cxl/pci: Disambiguate cxl_pci further from cxl_mem Documentation/cxl: Add bus internal docs cxl/core: Split decoder setup into alloc + add tools/testing/cxl: Introduce a mock memory device + driver cxl/mbox: Move command definitions to common location cxl/bus: Populate the target list at decoder create tools/testing/cxl: Introduce a mocked-up CXL port hierarchy cxl/pmem: Add support for multiple nvdimm-bridge objects cxl/pmem: Translate NVDIMM label commands to CXL label commands ...

Linus Torvalds committed 5 years ago

Commit dd729452 parents dab334c c6d7e1336 files · +3269 −1490Browse files

Showing the changes to include (2 of 36 files). Show all

Unified · Split

2 files
  1. include/linux/nd.h +2 −2
  2. include/linux/pci.h +1 −0
include/linux/nd.h+2−2
@@ -88,7 +88,7 @@ struct nd_namespace_pmem { · 87 unmodified lines
88 struct nd_namespace_io nsio;88 struct nd_namespace_io nsio;
89 unsigned long lbasize;89 unsigned long lbasize;
90 char *alt_name;90 char *alt_name;
91 u8 *uuid;91 uuid_t *uuid;
92 int id;92 int id;
93};93};
94 94
@@ -105,7 +105,7 @@ struct nd_namespace_pmem { · 10 unmodified lines
105struct nd_namespace_blk {105struct nd_namespace_blk {
106 struct nd_namespace_common common;106 struct nd_namespace_common common;
107 char *alt_name;107 char *alt_name;
108 u8 *uuid;108 uuid_t *uuid;
109 int id;109 int id;
110 unsigned long lbasize;110 unsigned long lbasize;
111 resource_size_t size;111 resource_size_t size;
include/linux/pci.h+1−0
@@ -1132,6 +1132,7 @@ u16 pci_find_ext_capability(struct pci_dev *dev, int cap); · 1131 unmodified lines
1132u16 pci_find_next_ext_capability(struct pci_dev *dev, u16 pos, int cap);1132u16 pci_find_next_ext_capability(struct pci_dev *dev, u16 pos, int cap);
1133struct pci_bus *pci_find_next_bus(const struct pci_bus *from);1133struct pci_bus *pci_find_next_bus(const struct pci_bus *from);
1134u16 pci_find_vsec_capability(struct pci_dev *dev, u16 vendor, int cap);1134u16 pci_find_vsec_capability(struct pci_dev *dev, u16 vendor, int cap);
1135u16 pci_find_dvsec_capability(struct pci_dev *dev, u16 vendor, u16 dvsec);
1135 1136
1136u64 pci_get_dsn(struct pci_dev *dev);1137u64 pci_get_dsn(struct pci_dev *dev);
1137 1138

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t