mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-27 04:54:41 +08:00
e0f3e8f14d
Pull s390 updates from Martin Schwidefsky:
"The bulk of the s390 patches for 4.13. Some new things but mostly bug
fixes and cleanups. Noteworthy changes:
- The SCM block driver is converted to blk-mq
- Switch s390 to 5 level page tables. The virtual address space for a
user space process can now have up to 16EB-4KB.
- Introduce a ELF phdr flag for qemu to avoid the global
vm.alloc_pgste which forces all processes to large page tables
- A couple of PCI improvements to improve error recovery
- Included is the merge of the base support for proper machine checks
for KVM"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (52 commits)
s390/dasd: Fix faulty ENODEV for RO sysfs attribute
s390/pci: recognize name clashes with uids
s390/pci: provide more debug information
s390/pci: fix handling of PEC 306
s390/pci: improve pci hotplug
s390/pci: introduce clp_get_state
s390/pci: improve error handling during fmb (de)registration
s390/pci: improve unreg_ioat error handling
s390/pci: improve error handling during interrupt deregistration
s390/pci: don't cleanup in arch_setup_msi_irqs
KVM: s390: Backup the guest's machine check info
s390/nmi: s390: New low level handling for machine check happening in guest
s390/fpu: export save_fpu_regs for all configs
s390/kvm: avoid global config of vm.alloc_pgste=1
s390: rename struct psw_bits members
s390: rename psw_bits enums
s390/mm: use correct address space when enabling DAT
s390/cio: introduce io_subchannel_type
s390/ipl: revert Load Normal semantics for LPAR CCW-type re-IPL
s390/dumpstack: remove raw stack dump
...
83 lines
1.8 KiB
C
83 lines
1.8 KiB
C
#ifndef SCM_BLK_H
|
|
#define SCM_BLK_H
|
|
|
|
#include <linux/interrupt.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/blk-mq.h>
|
|
#include <linux/genhd.h>
|
|
#include <linux/list.h>
|
|
|
|
#include <asm/debug.h>
|
|
#include <asm/eadm.h>
|
|
|
|
#define SCM_NR_PARTS 8
|
|
#define SCM_QUEUE_DELAY 5
|
|
|
|
struct scm_blk_dev {
|
|
struct request_queue *rq;
|
|
struct gendisk *gendisk;
|
|
struct blk_mq_tag_set tag_set;
|
|
struct scm_device *scmdev;
|
|
spinlock_t lock;
|
|
atomic_t queued_reqs;
|
|
enum {SCM_OPER, SCM_WR_PROHIBIT} state;
|
|
struct list_head finished_requests;
|
|
};
|
|
|
|
struct scm_request {
|
|
struct scm_blk_dev *bdev;
|
|
struct aidaw *next_aidaw;
|
|
struct request **request;
|
|
struct aob *aob;
|
|
struct list_head list;
|
|
u8 retries;
|
|
blk_status_t error;
|
|
};
|
|
|
|
#define to_aobrq(rq) container_of((void *) rq, struct aob_rq_header, data)
|
|
|
|
int scm_blk_dev_setup(struct scm_blk_dev *, struct scm_device *);
|
|
void scm_blk_dev_cleanup(struct scm_blk_dev *);
|
|
void scm_blk_set_available(struct scm_blk_dev *);
|
|
void scm_blk_irq(struct scm_device *, void *, blk_status_t);
|
|
|
|
struct aidaw *scm_aidaw_fetch(struct scm_request *scmrq, unsigned int bytes);
|
|
|
|
int scm_drv_init(void);
|
|
void scm_drv_cleanup(void);
|
|
|
|
extern debug_info_t *scm_debug;
|
|
|
|
#define SCM_LOG(imp, txt) do { \
|
|
debug_text_event(scm_debug, imp, txt); \
|
|
} while (0)
|
|
|
|
static inline void SCM_LOG_HEX(int level, void *data, int length)
|
|
{
|
|
if (!debug_level_enabled(scm_debug, level))
|
|
return;
|
|
while (length > 0) {
|
|
debug_event(scm_debug, level, data, length);
|
|
length -= scm_debug->buf_size;
|
|
data += scm_debug->buf_size;
|
|
}
|
|
}
|
|
|
|
static inline void SCM_LOG_STATE(int level, struct scm_device *scmdev)
|
|
{
|
|
struct {
|
|
u64 address;
|
|
u8 oper_state;
|
|
u8 rank;
|
|
} __packed data = {
|
|
.address = scmdev->address,
|
|
.oper_state = scmdev->attrs.oper_state,
|
|
.rank = scmdev->attrs.rank,
|
|
};
|
|
|
|
SCM_LOG_HEX(level, &data, sizeof(data));
|
|
}
|
|
|
|
#endif /* SCM_BLK_H */
|