mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
1/ Add support for the ACPI 6.0 NFIT hot add mechanism to process updates of the NFIT at runtime. 2/ Teach the coredump implementation how to filter out DAX mappings. 3/ Introduce NUMA hints for allocations made by the pmem driver, and as a side effect all devm allocations now hint their NUMA node by default. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWQX2sAAoJEB7SkWpmfYgCWsEQAK7w/xM9zClVY/DDlFJxFtYq DZJ4faPj+E3FMTiJIEDzjtRgQvOFE+wmJtntYsCqKH/QZmpnyk9jeT/CbJzEEL2k WsAk+qHGLcVUlSb36blwN1RFzYqC+IDYThewJqUvxDbOwL1AbiibbX7gplzZHLhW +rj3ScVlSNOPRDgGGpkAeLNNsttuKvsGo7nB/JZopm0tV6g14rSK09wQbVhv6S6T Lu7VGYqnJlkteL9YlzRiROf9hW2ZFCMGJz1YZydPTy3aX3hGTBX4w2qvmsPwBIKP kW/gCNisVJGk1cZCk4joSJ8i/b3x3fE0zdZ5waivJ5jDvYbUUfyk0KtJkfw207Rl 14yWitUC6aeVuCeOqXHgsjRi+1QVN9Pg7i49xgGiUN1igQiUYRTgQPWZxDv6Zo/s USrLFQBaRd+hJw+dl7A47lJ3mUF96tPCoQb4LCQ7DVsg5U4J2TvqXLH9Gek/CCZ4 QsMkZDTQlZw4+JEDlzBgg/L7xVty8DadplTADMdjaRhFU3y8zKNJ85Ileokt7KVt IsBT4+S5HeZLvinZY95932DwAmFp1DtsyENd1BUXL06ddyvlQrFJ6NQaXji4fuDc EVQmMoTAqDujZFupMAux9vkUBDFj/hmaVD5F7j3+MWP87OCritw/IZn+2LgTaKoX EmttaYrDr2jJwIaGyw+H =a2/L -----END PGP SIGNATURE----- Merge tag 'libnvdimm-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm Pull libnvdimm updates from Dan Williams: "Outside of the new ACPI-NFIT hot-add support this pull request is more notable for what it does not contain, than what it does. There were a handful of development topics this cycle, dax get_user_pages, dax fsync, and raw block dax, that need more more iteration and will wait for 4.5. The patches to make devm and the pmem driver NUMA aware have been in -next for several weeks. The hot-add support has not, but is contained to the NFIT driver and is passing unit tests. The coredump support is straightforward and was looked over by Jeff. All of it has received a 0day build success notification across 107 configs. Summary: - Add support for the ACPI 6.0 NFIT hot add mechanism to process updates of the NFIT at runtime. - Teach the coredump implementation how to filter out DAX mappings. - Introduce NUMA hints for allocations made by the pmem driver, and as a side effect all devm allocations now hint their NUMA node by default" * tag 'libnvdimm-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: coredump: add DAX filtering for FDPIC ELF coredumps coredump: add DAX filtering for ELF coredumps acpi: nfit: Add support for hot-add nfit: in acpi_nfit_init, break on a 0-length table pmem, memremap: convert to numa aware allocations devm_memremap_pages: use numa_mem_id devm: make allocations numa aware by default devm_memremap: convert to return ERR_PTR devm_memunmap: use devres_release() pmem: kill memremap_pmem() x86, mm: quiet arch_add_memory()
185 lines
4.3 KiB
C
185 lines
4.3 KiB
C
/*
|
|
* NVDIMM Firmware Interface Table - NFIT
|
|
*
|
|
* Copyright(c) 2013-2015 Intel Corporation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
#ifndef __NFIT_H__
|
|
#define __NFIT_H__
|
|
#include <linux/libnvdimm.h>
|
|
#include <linux/types.h>
|
|
#include <linux/uuid.h>
|
|
#include <linux/acpi.h>
|
|
#include <acpi/acuuid.h>
|
|
|
|
#define UUID_NFIT_BUS "2f10e7a4-9e91-11e4-89d3-123b93f75cba"
|
|
#define UUID_NFIT_DIMM "4309ac30-0d11-11e4-9191-0800200c9a66"
|
|
#define ACPI_NFIT_MEM_FAILED_MASK (ACPI_NFIT_MEM_SAVE_FAILED \
|
|
| ACPI_NFIT_MEM_RESTORE_FAILED | ACPI_NFIT_MEM_FLUSH_FAILED \
|
|
| ACPI_NFIT_MEM_NOT_ARMED)
|
|
|
|
enum nfit_uuids {
|
|
NFIT_SPA_VOLATILE,
|
|
NFIT_SPA_PM,
|
|
NFIT_SPA_DCR,
|
|
NFIT_SPA_BDW,
|
|
NFIT_SPA_VDISK,
|
|
NFIT_SPA_VCD,
|
|
NFIT_SPA_PDISK,
|
|
NFIT_SPA_PCD,
|
|
NFIT_DEV_BUS,
|
|
NFIT_DEV_DIMM,
|
|
NFIT_UUID_MAX,
|
|
};
|
|
|
|
enum {
|
|
ND_BLK_READ_FLUSH = 1,
|
|
ND_BLK_DCR_LATCH = 2,
|
|
};
|
|
|
|
struct nfit_spa {
|
|
struct acpi_nfit_system_address *spa;
|
|
struct list_head list;
|
|
int is_registered;
|
|
};
|
|
|
|
struct nfit_dcr {
|
|
struct acpi_nfit_control_region *dcr;
|
|
struct list_head list;
|
|
};
|
|
|
|
struct nfit_bdw {
|
|
struct acpi_nfit_data_region *bdw;
|
|
struct list_head list;
|
|
};
|
|
|
|
struct nfit_idt {
|
|
struct acpi_nfit_interleave *idt;
|
|
struct list_head list;
|
|
};
|
|
|
|
struct nfit_flush {
|
|
struct acpi_nfit_flush_address *flush;
|
|
struct list_head list;
|
|
};
|
|
|
|
struct nfit_memdev {
|
|
struct acpi_nfit_memory_map *memdev;
|
|
struct list_head list;
|
|
};
|
|
|
|
/* assembled tables for a given dimm/memory-device */
|
|
struct nfit_mem {
|
|
struct nvdimm *nvdimm;
|
|
struct acpi_nfit_memory_map *memdev_dcr;
|
|
struct acpi_nfit_memory_map *memdev_pmem;
|
|
struct acpi_nfit_memory_map *memdev_bdw;
|
|
struct acpi_nfit_control_region *dcr;
|
|
struct acpi_nfit_data_region *bdw;
|
|
struct acpi_nfit_system_address *spa_dcr;
|
|
struct acpi_nfit_system_address *spa_bdw;
|
|
struct acpi_nfit_interleave *idt_dcr;
|
|
struct acpi_nfit_interleave *idt_bdw;
|
|
struct nfit_flush *nfit_flush;
|
|
struct list_head list;
|
|
struct acpi_device *adev;
|
|
unsigned long dsm_mask;
|
|
};
|
|
|
|
struct acpi_nfit_desc {
|
|
struct nvdimm_bus_descriptor nd_desc;
|
|
struct acpi_table_nfit *nfit;
|
|
struct mutex spa_map_mutex;
|
|
struct mutex init_mutex;
|
|
struct list_head spa_maps;
|
|
struct list_head memdevs;
|
|
struct list_head flushes;
|
|
struct list_head dimms;
|
|
struct list_head spas;
|
|
struct list_head dcrs;
|
|
struct list_head bdws;
|
|
struct list_head idts;
|
|
struct nvdimm_bus *nvdimm_bus;
|
|
struct device *dev;
|
|
unsigned long dimm_dsm_force_en;
|
|
unsigned long bus_dsm_force_en;
|
|
int (*blk_do_io)(struct nd_blk_region *ndbr, resource_size_t dpa,
|
|
void *iobuf, u64 len, int rw);
|
|
};
|
|
|
|
enum nd_blk_mmio_selector {
|
|
BDW,
|
|
DCR,
|
|
};
|
|
|
|
struct nd_blk_addr {
|
|
union {
|
|
void __iomem *base;
|
|
void __pmem *aperture;
|
|
};
|
|
};
|
|
|
|
struct nfit_blk {
|
|
struct nfit_blk_mmio {
|
|
struct nd_blk_addr addr;
|
|
u64 size;
|
|
u64 base_offset;
|
|
u32 line_size;
|
|
u32 num_lines;
|
|
u32 table_size;
|
|
struct acpi_nfit_interleave *idt;
|
|
struct acpi_nfit_system_address *spa;
|
|
} mmio[2];
|
|
struct nd_region *nd_region;
|
|
u64 bdw_offset; /* post interleave offset */
|
|
u64 stat_offset;
|
|
u64 cmd_offset;
|
|
void __iomem *nvdimm_flush;
|
|
u32 dimm_flags;
|
|
};
|
|
|
|
enum spa_map_type {
|
|
SPA_MAP_CONTROL,
|
|
SPA_MAP_APERTURE,
|
|
};
|
|
|
|
struct nfit_spa_mapping {
|
|
struct acpi_nfit_desc *acpi_desc;
|
|
struct acpi_nfit_system_address *spa;
|
|
struct list_head list;
|
|
struct kref kref;
|
|
enum spa_map_type type;
|
|
struct nd_blk_addr addr;
|
|
};
|
|
|
|
static inline struct nfit_spa_mapping *to_spa_map(struct kref *kref)
|
|
{
|
|
return container_of(kref, struct nfit_spa_mapping, kref);
|
|
}
|
|
|
|
static inline struct acpi_nfit_memory_map *__to_nfit_memdev(
|
|
struct nfit_mem *nfit_mem)
|
|
{
|
|
if (nfit_mem->memdev_dcr)
|
|
return nfit_mem->memdev_dcr;
|
|
return nfit_mem->memdev_pmem;
|
|
}
|
|
|
|
static inline struct acpi_nfit_desc *to_acpi_desc(
|
|
struct nvdimm_bus_descriptor *nd_desc)
|
|
{
|
|
return container_of(nd_desc, struct acpi_nfit_desc, nd_desc);
|
|
}
|
|
|
|
const u8 *to_nfit_uuid(enum nfit_uuids id);
|
|
int acpi_nfit_init(struct acpi_nfit_desc *nfit, acpi_size sz);
|
|
extern const struct attribute_group *acpi_nfit_attribute_groups[];
|
|
#endif /* __NFIT_H__ */
|