OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfit: update block I/O path to use PMEM API
[uclinux-h8/linux.git]
/
drivers
/
acpi
/
nfit.h
diff --git
a/drivers/acpi/nfit.h
b/drivers/acpi/nfit.h
index
81f2e8c
..
815cb56
100644
(file)
--- a/
drivers/acpi/nfit.h
+++ b/
drivers/acpi/nfit.h
@@
-60,6
+60,11
@@
struct nfit_idt {
struct list_head list;
};
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;
struct nfit_memdev {
struct acpi_nfit_memory_map *memdev;
struct list_head list;
@@
-77,6
+82,7
@@
struct nfit_mem {
struct acpi_nfit_system_address *spa_bdw;
struct acpi_nfit_interleave *idt_dcr;
struct acpi_nfit_interleave *idt_bdw;
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 list_head list;
struct acpi_device *adev;
unsigned long dsm_mask;
@@
-88,6
+94,7
@@
struct acpi_nfit_desc {
struct mutex spa_map_mutex;
struct list_head spa_maps;
struct list_head memdevs;
struct mutex spa_map_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 dimms;
struct list_head spas;
struct list_head dcrs;
@@
-109,7
+116,7
@@
struct nfit_blk {
struct nfit_blk_mmio {
union {
void __iomem *base;
struct nfit_blk_mmio {
union {
void __iomem *base;
- void *aperture;
+ void
__pmem
*aperture;
};
u64 size;
u64 base_offset;
};
u64 size;
u64 base_offset;
@@
-123,6
+130,12
@@
struct nfit_blk {
u64 bdw_offset; /* post interleave offset */
u64 stat_offset;
u64 cmd_offset;
u64 bdw_offset; /* post interleave offset */
u64 stat_offset;
u64 cmd_offset;
+ void __iomem *nvdimm_flush;
+};
+
+enum spa_map_type {
+ SPA_MAP_CONTROL,
+ SPA_MAP_APERTURE,
};
struct nfit_spa_mapping {
};
struct nfit_spa_mapping {