History

Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata updates from Tejun Heo: - Adam added opt-in ATA command priority support. - There are machines which hide multiple nvme devices behind an ahci BAR. Dan Williams proposed a solution to force-switch the mode but deemed too hackishd. People are gonna discuss the proper way to handle the situation in nvme standard meetings. For now, detect and warn about the situation. - Low level driver specific changes. Christoph Hellwig pipes in about the hidden nvme warning: "I wish that was the case. We've pretty much agreed that we'll want to implement it as a virtual PCIe root bridge, similar to Intels other 'innovation' VMD that we work around that way. But Intel management has apparently decided that they don't want to spend more cycles on this now that Lenovo has an optional BIOS that doesn't force this broken mode anymore, and no one outside of Intel has enough information to implement something like this. So for now I guess this warning is it, until Intel reconsideres and spends resources on fixing up the damage their Chipset people caused" * 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: ahci: warn about remapped NVMe devices ahci-remap.h: add ahci remapping definitions nvme: move NVMe class code to pci_ids.h pata: imx: support controller modes up to PIO4 pata: imx: add support of setting timings for PIO modes pata: imx: set controller PIO mode with .set_piomode callback pata: imx: sort headers out ata: set ncq_prio_enabled iff device has support ata: ATA Command Priority Disabled By Default ata: Enabling ATA Command Priorities block: Add iocontext priority to request ahci: qoriq: added ls1046a platform support

Linus Torvalds committed 9 years ago

Commit b92e09b2 parents c11a6cf aecec8b14 files · +282 −35Browse files

Showing the changes to include/linux/blkdev.h (1 of 14 files). Show all

Unified · Split

include/linux/blkdev.h+14−0
@@ -1058,6 +1058,20 @@ static inline unsigned int blk_rq_count_bios(struct request *rq) · 1057 unmodified lines
1058 return nr_bios;1058 return nr_bios;
1059}1059}
1060 1060
1061/*
1062 * blk_rq_set_prio - associate a request with prio from ioc
1063 * @rq: request of interest
1064 * @ioc: target iocontext
1065 *
1066 * Assocate request prio with ioc prio so request based drivers
1067 * can leverage priority information.
1068 */
1069static inline void blk_rq_set_prio(struct request *rq, struct io_context *ioc)
1070{
1071 if (ioc)
1072 rq->ioprio = ioc->ioprio;
1073}
1074
1061/*1075/*
1062 * Request issue related functions.1076 * Request issue related functions.
1063 */1077 */