Linux 4.9.109
Greg KH
maintainerI'm announcing the release of the 4.9.109 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/x86/crypto/crc32c-intel_glue.c | 5 - arch/x86/include/asm/cpufeatures.h | 2 arch/x86/include/asm/fpu/internal.h | 2 arch/x86/include/asm/kvm_emulate.h | 6 +- arch/x86/kernel/fpu/init.c | 91 +------------------------------ arch/x86/kvm/emulate.c | 72 ++++++++++++------------ arch/x86/kvm/vmx.c | 23 +++---- arch/x86/kvm/x86.c | 51 ++++++++++++----- arch/x86/kvm/x86.h | 4 - drivers/crypto/omap-sham.c | 2 drivers/crypto/vmx/aes.c | 2 drivers/crypto/vmx/aes_cbc.c | 2 drivers/crypto/vmx/aes_ctr.c | 2 drivers/crypto/vmx/ghash.c | 2 drivers/gpio/gpiolib.c | 9 ++- drivers/input/mouse/elan_i2c_core.c | 1 drivers/input/touchscreen/goodix.c | 1 drivers/misc/vmw_balloon.c | 23 ++----- drivers/net/bonding/bond_main.c | 22 ++++--- drivers/nvme/host/pci.c | 4 - drivers/nvme/target/admin-cmd.c | 22 ++++--- drivers/nvme/target/core.c | 5 - drivers/nvme/target/nvmet.h | 2 drivers/staging/android/ion/ion.c | 5 + drivers/tty/serial/8250/8250_omap.c | 16 +++++ drivers/tty/serial/amba-pl011.c | 16 +++++ drivers/tty/serial/atmel_serial.c | 5 - drivers/tty/serial/samsung.c | 7 -- drivers/tty/serial/sh-sci.c | 4 - drivers/usb/gadget/udc/renesas_usb3.c | 7 ++ drivers/usb/storage/uas.c | 6 ++ drivers/usb/storage/unusual_devs.h | 9 +++ drivers/usb/storage/unusual_uas.h | 9 +++ drivers/usb/usbip/vhci_sysfs.c | 24 +++++--- include/net/bonding.h | 5 + net/key/af_key.c | 45 +++++++++++---- tools/arch/x86/include/asm/cpufeatures.h | 2 38 files changed, 273 insertions(+), 244 deletions(-)
Alexander Kappner (2):
usb-storage: Add support for FL_ALWAYS_SYNC flag in the UAS driver
usb-storage: Add compatibility quirk flags for G-Technologies G-Drive
Andreas Born (1):
bonding: require speed/duplex only for 802.3ad, alb and tlb
Andy Lutomirski (2):
x86/fpu: Hard-disable lazy FPU mode
x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code
Bin Liu (1):
crypto: omap-sham - fix memleak
Dave Martin (1):
tty: pl011: Avoid spuriously stuck-off interrupts
Ethan Lee (1):
Input: goodix - add new ACPI id for GPD Win 2 touch screen
Geert Uytterhoeven (1):
serial: sh-sci: Stop using printk format %pCr
Gil Kupfer (1):
vmw_balloon: fixing double free when batching mode is off
Greg Kroah-Hartman (2):
perf: sync up x86/.../cpufeatures.h
Linux 4.9.109Gustavo A. R. Silva (1):
usbip: vhci_sysfs: fix potential Spectre v1
Johannes Thumshirn (1):
nvmet: Move serial number from controller to subsystem
Johannes Wienke (1):
Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID
Keith Busch (1):
nvme-pci: initialize queue memory before interrupts
Kevin Easton (1):
af_key: Always verify length of provided sadb_key
Laura Abbott (1):
staging: android: ion: Switch to pr_warn_once in ion_buffer_destroy
Linus Walleij (1):
gpio: No NULL owner
Mahesh Bandewar (2):
bonding: correctly update link status during mii-commit phase
bonding: fix active-backup transition
Marek Szyprowski (1):
serial: samsung: fix maxburst parameter for DMA transactions
Martin Wilck (2):
nvmet: don't report 0-bytes in serial number
nvmet: don't overwrite identify sn/fr with 0-bytes
Michael Ellerman (1):
crypto: vmx - Remove overly verbose printk from AES init routines
Paolo Bonzini (3):
KVM: x86: introduce linear_{read,write}_system
KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system
kvm: x86: use correct privilege level for sgdt/sidt/fxsave/fxrstor access
Sebastian Andrzej Siewior (1):
tty/serial: atmel: use port->name as name in request_irq()
Tony Lindgren (1):
serial: 8250: omap: Fix idling of clocks for unused uarts
Yoshihiro Shimoda (1):
usb: gadget: udc: renesas_usb3: disable the controller's irqs for reconnecting
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 108 +SUBLEVEL = 109 EXTRAVERSION = NAME = Roaring Lionus
arch/x86/crypto/crc32c-intel_glue.c +0 -5
@@ -58,16 +58,11 @@ asmlinkage unsigned int crc_pcl(const u8 *buffer, int len,unsigned int crc_init);static int crc32c_pcl_breakeven =CRC32C_PCL_BREAKEVEN_EAGERFPU ; -#if defined(X86_FEATURE_EAGER_FPU )#define set_pcl_breakeven_point () \ do { \ if (!use_eager_fpu()) \ crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU; \ } while (0) -#else -#define set_pcl_breakeven_point () \ - (crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU) -#endif #endif /* CONFIG_X86_64 */ static u32 crc32c_intel_le_hw_byte (u32 crc,unsigned char const *data,size_t length)
arch/x86/include/asm/cpufeatures.h +1 -1
@@ -104,7 +104,7 @@#define X86_FEATURE_EXTD_APICID ( 3*32+26)/* has extended APICID (8 bits) */ #define X86_FEATURE_AMD_DCM ( 3*32+27)/* multi-node processor */ #define X86_FEATURE_APERFMPERF ( 3*32+28)/* APERFMPERF */ -#define X86_FEATURE_EAGER_FPU ( 3*32+29)/* "eagerfpu" Non lazy FPU restore */ +/* free, was #define X86_FEATURE_EAGER_FPU ( 3*32+29) * "eagerfpu" Non lazy FPU restore */ #define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30)/* TSC doesn't stop in S3 state */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
arch/x86/include/asm/fpu/internal.h +1 -1
@@ -62,7 +62,7 @@ extern u64 fpu__get_supported_xfeatures_mask(void);*/ static __always_inline __pure bool use_eager_fpu(void) { -return static_cpu_has (X86_FEATURE_EAGER_FPU ); +return true; } static __always_inline __pure bool use_xsaveopt(void)
arch/x86/include/asm/kvm_emulate.h +4 -2
@@ -105,11 +105,12 @@ struct x86_emulate_ops {* @addr: [IN ] Linear address from which to read. * @val: [OUT] Value read from memory, zero-extended to 'u_long'. * @bytes: [IN ] Number of bytes to read from memory. +* @system:[IN ] Whether the access is forced to be at CPL0. */ int (*read_std)(struct x86_emulate_ctxt *ctxt,unsigned long addr,void *val,unsigned int bytes, -struct x86_exception *fault); +struct x86_exception *fault,bool system);/* * read_phys: Read bytes of standard (non-emulated/special) memory.
@@ -127,10 +128,11 @@ struct x86_emulate_ops {* @addr: [IN ] Linear address to which to write. * @val: [OUT] Value write to memory, zero-extended to 'u_long'. * @bytes: [IN ] Number of bytes to write to memory. +* @system:[IN ] Whether the access is forced to be at CPL0. */ int (*write_std)(struct x86_emulate_ctxt *ctxt,unsigned long addr,void *val,unsigned int bytes, -struct x86_exception *fault); +struct x86_exception *fault,bool system);/* * fetch: Read bytes of standard (non-emulated/special) memory. * Used for instruction fetch.
arch/x86/kernel/fpu/init.c +3 -88
123 lines not on this page · raw message
arch/x86/kvm/emulate.c +36 -36
184 lines not on this page · raw message
arch/x86/kvm/vmx.c +10 -13
@@ -6928,8 +6928,7 @@ static int nested_vmx_check_vmptr(struct kvm_vcpu *vcpu, int exit_reason, vmcs_read32(VMX_INSTRUCTION_INFO), false, &gva))return 1 ; -if (kvm_read_guest_virt (&vcpu->arch.emulate_ctxt, gva, &vmptr, -sizeof (vmptr), &e)) { +if (kvm_read_guest_virt (vcpu, gva, &vmptr,sizeof (vmptr), &e)) {kvm_inject_page_fault (vcpu, &e);return 1 ; }
@@ -7469,8 +7468,8 @@ static int handle_vmread(struct kvm_vcpu *vcpu) vmx_instruction_info, true, &gva))return 1 ;/* _system ok, as nested_vmx_check_permission verified cpl=0 */ -kvm_write_guest_virt_system (&vcpu->arch.emulate_ctxt, gva, - &field_value, (is_long_mode (vcpu) ?8 :4 ),NULL ); +kvm_write_guest_virt_system (vcpu, gva, &field_value, + (is_long_mode (vcpu) ?8 :4 ),NULL ); }nested_vmx_succeed (vcpu);
@@ -7505,8 +7504,8 @@ static int handle_vmwrite(struct kvm_vcpu *vcpu)if (get_vmx_mem_address (vcpu, exit_qualification, vmx_instruction_info, false, &gva))return 1 ; -if (kvm_read_guest_virt (&vcpu->arch.emulate_ctxt, gva, - &field_value, (is_64_bit_mode (vcpu) ?8 :4 ), &e)) { +if (kvm_read_guest_virt (vcpu, gva, &field_value, + (is_64_bit_mode (vcpu) ?8 :4 ), &e)) {kvm_inject_page_fault (vcpu, &e);return 1 ; }
@@ -7603,9 +7602,9 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu) vmx_instruction_info, true, &vmcs_gva))return 1 ;/* ok to use *_system, as nested_vmx_check_permission verified cpl=0 */ -if (kvm_write_guest_virt_system (&vcpu->arch.emulate_ctxt, vmcs_gva, - (void *)&to_vmx (vcpu)->nested.current_vmptr, -sizeof (u64), &e)) { +if (kvm_write_guest_virt_system (vcpu, vmcs_gva, + (void *)&to_vmx (vcpu)->nested.current_vmptr, +sizeof (u64), &e)) {kvm_inject_page_fault (vcpu, &e);return 1 ; }
@@ -7659,8 +7658,7 @@ static int handle_invept(struct kvm_vcpu *vcpu)if (get_vmx_mem_address (vcpu,vmcs_readl (EXIT_QUALIFICATION ), vmx_instruction_info, false, &gva))return 1 ; -if (kvm_read_guest_virt (&vcpu->arch.emulate_ctxt, gva, &operand, -sizeof (operand), &e)) { +if (kvm_read_guest_virt (vcpu, gva, &operand,sizeof (operand), &e)) {kvm_inject_page_fault (vcpu, &e);return 1 ; }
@@ -7723,8 +7721,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu)if (get_vmx_mem_address (vcpu,vmcs_readl (EXIT_QUALIFICATION ), vmx_instruction_info, false, &gva))return 1 ; -if (kvm_read_guest_virt (&vcpu->arch.emulate_ctxt, gva, &vpid, -sizeof (u32), &e)) { +if (kvm_read_guest_virt (vcpu, gva, &vpid,sizeof (u32), &e)) {kvm_inject_page_fault (vcpu, &e);return 1 ; }
arch/x86/kvm/x86.c +37 -14
92 lines not on this page · raw message
arch/x86/kvm/x86.h +2 -2
@@ -161,11 +161,11 @@ int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip);void kvm_write_tsc (struct kvm_vcpu *vcpu,struct msr_data *msr);u64 get_kvmclock_ns (struct kvm *kvm); -int kvm_read_guest_virt (struct x86_emulate_ctxt *ctxt, +int kvm_read_guest_virt (struct kvm_vcpu *vcpu,gva_t addr,void *val,unsigned int bytes,struct x86_exception *exception); -int kvm_write_guest_virt_system (struct x86_emulate_ctxt *ctxt, +int kvm_write_guest_virt_system (struct kvm_vcpu *vcpu,gva_t addr,void *val,unsigned int bytes,struct x86_exception *exception);
drivers/crypto/omap-sham.c +1 -1
@@ -1081,7 +1081,7 @@ static void omap_sham_finish_req(struct ahash_request *req, int err)if (test_bit (FLAGS_SGS_COPIED , &dd->flags))free_pages ((unsigned long )sg_virt (ctx->sg), -get_order (ctx->sg->length)); +get_order (ctx->sg->length + ctx->bufcnt));if (test_bit (FLAGS_SGS_ALLOCED , &dd->flags))kfree (ctx->sg);
drivers/crypto/vmx/aes.c +0 -2
@@ -53,8 +53,6 @@ static int p8_aes_init(struct crypto_tfm *tfm) alg, PTR_ERR(fallback));return PTR_ERR (fallback); } -printk (KERN_INFO "Using '%s' as fallback implementation.\n" , -crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback)); crypto_cipher_set_flags(fallback, crypto_cipher_get_flags((struct
drivers/crypto/vmx/aes_cbc.c +0 -2
@@ -55,8 +55,6 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) alg, PTR_ERR(fallback));return PTR_ERR (fallback); } -printk (KERN_INFO "Using '%s' as fallback implementation.\n" , -crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback)); crypto_blkcipher_set_flags( fallback,
drivers/crypto/vmx/aes_ctr.c +0 -2
@@ -53,8 +53,6 @@ static int p8_aes_ctr_init(struct crypto_tfm *tfm) alg, PTR_ERR(fallback));return PTR_ERR (fallback); } -printk (KERN_INFO "Using '%s' as fallback implementation.\n" , -crypto_tfm_alg_driver_name ((struct crypto_tfm *) fallback)); crypto_blkcipher_set_flags( fallback,
drivers/crypto/vmx/ghash.c +0 -2
@@ -64,8 +64,6 @@ static int p8_ghash_init_tfm(struct crypto_tfm *tfm) alg, PTR_ERR(fallback));return PTR_ERR (fallback); } -printk (KERN_INFO "Using '%s' as fallback implementation.\n" , -crypto_tfm_alg_driver_name (crypto_shash_tfm (fallback))); crypto_shash_set_flags(fallback, crypto_shash_get_flags((struct crypto_shash
drivers/gpio/gpiolib.c +7 -2
@@ -3204,6 +3204,8 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,struct gpio_desc *desc =NULL ;int status;enum gpio_lookup_flags lookupflags =0 ; +/* Maybe we have a device name, maybe not */ +const char *devname = dev ?dev_name (dev) :"?" ;dev_dbg (dev,"GPIO lookup for consumer %s\n" , con_id);
@@ -3232,8 +3234,11 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,return desc; } -/* If a connection label was passed use that, else use the device name as label */ - status =gpiod_request (desc, con_id ? con_id :dev_name (dev)); +/* +* If a connection label was passed use that, else attempt to use +* the device name as label +*/ + status =gpiod_request (desc, con_id ? con_id : devname);if (status <0 )return ERR_PTR (status);
drivers/input/mouse/elan_i2c_core.c +1 -0
@@ -1249,6 +1249,7 @@ static const struct acpi_device_id elan_acpi_id[] = { { "ELAN060B", 0 }, { "ELAN060C", 0 }, { "ELAN0611", 0 }, + { "ELAN0612", 0 }, { "ELAN1000", 0 }, { } };
drivers/input/touchscreen/goodix.c +1 -0
@@ -858,6 +858,7 @@ MODULE_DEVICE_TABLE(i2c, goodix_ts_id);#ifdef CONFIG_ACPI static const struct acpi_device_id goodix_acpi_match[] = { {"GDIX1001" ,0 }, + {"GDIX1002" ,0 }, { } };MODULE_DEVICE_TABLE (acpi, goodix_acpi_match);
drivers/misc/vmw_balloon.c +7 -16
@@ -576,15 +576,9 @@ static void vmballoon_pop(struct vmballoon *b) } } -if (b->batch_page) { -vunmap (b->batch_page); - b->batch_page =NULL ; - } - -if (b->page) { -__free_page (b->page); - b->page =NULL ; - } +/* Clearing the batch_page unconditionally has no adverse effect */ +free_page ((unsigned long )b->batch_page); + b->batch_page =NULL ; }/*
@@ -991,16 +985,13 @@ static const struct vmballoon_ops vmballoon_batched_ops = {static bool vmballoon_init_batching (struct vmballoon *b) { - b->page =alloc_page (VMW_PAGE_ALLOC_NOSLEEP ); -if (!b->page) -return false; +struct page *page; - b->batch_page =vmap (&b->page,1 ,VM_MAP ,PAGE_KERNEL ); -if (!b->batch_page) { -__free_page (b->page); + page =alloc_page (GFP_KERNEL | __GFP_ZERO); +if (!page)return false; - } + b->batch_page =page_address (page);return true; }
drivers/net/bonding/bond_main.c +13 -9
@@ -384,20 +384,15 @@ static int bond_update_speed_duplex(struct slave *slave) slave->duplex =DUPLEX_UNKNOWN ; res =__ethtool_get_link_ksettings (slave_dev, &ecmd); -if (res <0 ) { - slave->link =BOND_LINK_DOWN ; +if (res <0 )return 1 ; - } -if (ecmd.base.speed ==0 || ecmd.base.speed == ((__u32)-1 )) { - slave->link =BOND_LINK_DOWN ; +if (ecmd.base.speed ==0 || ecmd.base.speed == ((__u32)-1 ))return 1 ; - }switch (ecmd.base.duplex) {case DUPLEX_FULL :case DUPLEX_HALF :break ;default : - slave->link =BOND_LINK_DOWN ;return 1 ; }
@@ -1536,7 +1531,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) new_slave->delay =0 ; new_slave->link_failure_count =0 ; -bond_update_speed_duplex (new_slave); +if (bond_update_speed_duplex (new_slave) && +bond_needs_speed_duplex (bond)) + new_slave->link =BOND_LINK_DOWN ; new_slave->last_rx = jiffies - (msecs_to_jiffies (bond->params.arp_interval) +1 );
@@ -2140,7 +2137,14 @@ static void bond_miimon_commit(struct bonding *bond)continue ;case BOND_LINK_UP : -bond_update_speed_duplex (slave); +if (bond_update_speed_duplex (slave) && +bond_needs_speed_duplex (bond)) { + slave->link =BOND_LINK_DOWN ; +netdev_warn (bond->dev, +"failed to get link speed/duplex for %s\n" , + slave->dev->name); +continue ; + }bond_set_slave_link_state (slave,BOND_LINK_UP ,BOND_SLAVE_NOTIFY_NOW ); slave->last_link_up = jiffies;
drivers/nvme/host/pci.c +2 -2
@@ -1126,11 +1126,11 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)if (result <0 ) goto release_cq; +nvme_init_queue (nvmeq, qid); result =queue_request_irq (nvmeq);if (result <0 ) goto release_sq; -nvme_init_queue (nvmeq, qid);return result; release_sq:
@@ -1248,6 +1248,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)return result; nvmeq->cq_vector =0 ; +nvme_init_queue (nvmeq,0 ); result =queue_request_irq (nvmeq);if (result) { nvmeq->cq_vector =-1 ;
@@ -1776,7 +1777,6 @@ static void nvme_reset_work(struct work_struct *work)if (result) goto out; -nvme_init_queue (dev->queues[0 ],0 ); result =nvme_alloc_admin_tags (dev);if (result) goto out;
drivers/nvme/target/admin-cmd.c +14 -8
@@ -166,11 +166,21 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)nvmet_req_complete (req, status); } +static void copy_and_pad (char *dst,int dst_len,const char *src,int src_len) +{ +int len =min (src_len, dst_len); + +memcpy (dst, src, len); +if (dst_len > len) +memset (dst + len,' ' , dst_len - len); +} +static void nvmet_execute_identify_ctrl (struct nvmet_req *req) {struct nvmet_ctrl *ctrl = req->sq->ctrl;struct nvme_id_ctrl *id;u16 status =0 ; +const char model[] ="Linux" ; id =kzalloc (sizeof (*id),GFP_KERNEL );if (!id) {
@@ -182,14 +192,10 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) id->vid =0 ; id->ssvid =0 ; -memset (id->sn,' ' ,sizeof (id->sn)); -snprintf (id->sn,sizeof (id->sn),"%llx" , ctrl->serial); - -memset (id->mn,' ' ,sizeof (id->mn)); -strncpy ((char *)id->mn,"Linux" ,sizeof (id->mn)); - -memset (id->fr,' ' ,sizeof (id->fr)); -strncpy ((char *)id->fr,UTS_RELEASE ,sizeof (id->fr)); +bin2hex (id->sn, &ctrl->subsys->serial, +min (sizeof (ctrl->subsys->serial),sizeof (id->sn) /2 )); +copy_and_pad (id->mn,sizeof (id->mn), model,sizeof (model) -1 ); +copy_and_pad (id->fr,sizeof (id->fr),UTS_RELEASE ,strlen (UTS_RELEASE )); id->rab =6 ;
drivers/nvme/target/core.c +2 -3
@@ -743,9 +743,6 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,memcpy (ctrl->subsysnqn, subsysnqn,NVMF_NQN_SIZE );memcpy (ctrl->hostnqn, hostnqn,NVMF_NQN_SIZE ); -/* generate a random serial number as our controllers are ephemeral: */ -get_random_bytes (&ctrl->serial,sizeof (ctrl->serial)); -kref_init (&ctrl->ref); ctrl->subsys = subsys;
@@ -904,6 +901,8 @@ struct nvmet_subsys *nvmet_subsys_alloc(const char *subsysnqn,return NULL ; subsys->ver =NVME_VS (1 ,2 ,1 );/* NVMe 1.2.1 */ +/* generate a random serial number as our controllers are ephemeral: */ +get_random_bytes (&subsys->serial,sizeof (subsys->serial));switch (type) {case NVME_NQN_NVME :
drivers/nvme/target/nvmet.h +1 -1
@@ -110,7 +110,6 @@ struct nvmet_ctrl {struct mutex lock;u64 cap; -u64 serial;u32 cc;u32 csts;
@@ -151,6 +150,7 @@ struct nvmet_subsys {u16 max_qid;u64 ver; +u64 serial;char *subsysnqn;struct config_group group;
drivers/staging/android/ion/ion.c +4 -1
@@ -192,8 +192,11 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,void ion_buffer_destroy (struct ion_buffer *buffer) { -if (WARN_ON (buffer->kmap_cnt >0 )) +if (buffer->kmap_cnt >0 ) { +pr_warn_once ("%s: buffer still mapped in the kernel\n" , + __func__); buffer->heap->ops->unmap_kernel (buffer->heap, buffer); + } buffer->heap->ops->free (buffer);vfree (buffer->pages);kfree (buffer);
drivers/tty/serial/8250/8250_omap.c +15 -1
@@ -1078,13 +1078,14 @@ static int omap8250_no_handle_irq(struct uart_port *port)return 0 ; } +static const u8 omap4_habit =UART_ERRATA_CLOCK_DISABLE ;static const u8 am3352_habit =OMAP_DMA_TX_KICK |UART_ERRATA_CLOCK_DISABLE ;static const u8 dra742_habit =UART_ERRATA_CLOCK_DISABLE ;static const struct of_device_id omap8250_dt_ids[] = { { .compatible ="ti,omap2-uart" }, { .compatible ="ti,omap3-uart" }, - { .compatible ="ti,omap4-uart" }, + { .compatible ="ti,omap4-uart" , .data = &omap4_habit, }, { .compatible ="ti,am3352-uart" , .data = &am3352_habit, }, { .compatible ="ti,am4372-uart" , .data = &am3352_habit, }, { .compatible ="ti,dra742-uart" , .data = &dra742_habit, },
@@ -1326,6 +1327,19 @@ static int omap8250_soft_reset(struct device *dev)int sysc;int syss; +/* +* At least on omap4, unused uarts may not idle after reset without +* a basic scr dma configuration even with no dma in use. The +* module clkctrl status bits will be 1 instead of 3 blocking idle +* for the whole clockdomain. The softreset below will clear scr, +* and we restore it on resume so this is safe to do on all SoCs +* needing omap8250_soft_reset() quirk. Do it in two writes as +* recommended in the comment for omap8250_update_scr(). +*/ +serial_out (up,UART_OMAP_SCR ,OMAP_UART_SCR_DMAMODE_1 ); +serial_out (up,UART_OMAP_SCR , +OMAP_UART_SCR_DMAMODE_1 |OMAP_UART_SCR_DMAMODE_CTL ); + sysc =serial_in (up,UART_OMAP_SYSC );/* softreset the UART */
drivers/tty/serial/amba-pl011.c +16 -0
@@ -1726,10 +1726,26 @@ static int pl011_allocate_irq(struct uart_amba_port *uap)*/ static void pl011_enable_interrupts (struct uart_amba_port *uap) { +unsigned int i; +spin_lock_irq (&uap->port.lock);/* Clear out any spuriously appearing RX interrupts */ pl011_write (UART011_RTIS |UART011_RXIS , uap,REG_ICR ); + +/* +* RXIS is asserted only when the RX FIFO transitions from below +* to above the trigger threshold. If the RX FIFO is already +* full to the threshold this can't happen and RXIS will now be +* stuck off. Drain the RX FIFO explicitly to fix this: +*/ +for (i =0 ; i < uap->fifosize *2 ; ++i) { +if (pl011_read (uap,REG_FR ) & UART01x_FR_RXFE) +break ; + +pl011_read (uap,REG_DR ); + } + uap->im =UART011_RTIM ;if (!pl011_dma_rx_running (uap)) uap->im |=UART011_RXIM ;
drivers/tty/serial/atmel_serial.c +2 -3
@@ -1803,7 +1803,6 @@ static int atmel_startup(struct uart_port *port) {struct platform_device *pdev =to_platform_device (port->dev);struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); -struct tty_struct *tty = port->state->port.tty;int retval;/*
@@ -1818,8 +1817,8 @@ static int atmel_startup(struct uart_port *port)* Allocate the IRQ */ retval =request_irq (port->irq, atmel_interrupt, -IRQF_SHARED |IRQF_COND_SUSPEND , - tty ? tty->name :"atmel_serial" , port); +IRQF_SHARED |IRQF_COND_SUSPEND , +dev_name (&pdev->dev), port);if (retval) {dev_err (port->dev,"atmel_startup - Can't get irq\n" );return retval;
drivers/tty/serial/samsung.c +2 -5
@@ -866,15 +866,12 @@ static int s3c24xx_serial_request_dma(struct s3c24xx_uart_port *p) dma->rx_conf.direction =DMA_DEV_TO_MEM ; dma->rx_conf.src_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; dma->rx_conf.src_addr = p->port.mapbase +S3C2410_URXH ; - dma->rx_conf.src_maxburst =16 ; + dma->rx_conf.src_maxburst =1 ; dma->tx_conf.direction =DMA_MEM_TO_DEV ; dma->tx_conf.dst_addr_width =DMA_SLAVE_BUSWIDTH_1_BYTE ; dma->tx_conf.dst_addr = p->port.mapbase +S3C2410_UTXH ; -if (dma_get_cache_alignment () >=16 ) - dma->tx_conf.dst_maxburst =16 ; -else - dma->tx_conf.dst_maxburst =1 ; + dma->tx_conf.dst_maxburst =1 ;dma_cap_zero (mask);dma_cap_set (DMA_SLAVE , mask);
drivers/tty/serial/sh-sci.c +2 -2
@@ -2626,8 +2626,8 @@ static int sci_init_clocks(struct sci_port *sci_port, struct device *dev)dev_dbg (dev,"failed to get %s (%ld)\n" , clk_names[i],PTR_ERR (clk)); else - dev_dbg(dev, "clk %s is %pC rate %pCr\n", clk_names[i], - clk, clk); + dev_dbg(dev, "clk %s is %pC rate %lu\n", clk_names[i], + clk, clk_get_rate(clk)); sci_port->clks[i] =IS_ERR (clk) ?NULL : clk; }return 0 ;
drivers/usb/gadget/udc/renesas_usb3.c +7 -0
@@ -521,6 +521,13 @@ static void usb3_disconnect(struct renesas_usb3 *usb3)usb3_usb2_pullup (usb3,0 );usb3_clear_bit (usb3,USB30_CON_B3_CONNECT ,USB3_USB30_CON );usb3_reset_epc (usb3); +usb3_disable_irq_1 (usb3,USB_INT_1_B2_RSUM |USB_INT_1_B3_PLLWKUP | +USB_INT_1_B3_LUPSUCS |USB_INT_1_B3_DISABLE | +USB_INT_1_SPEED |USB_INT_1_B3_WRMRST | +USB_INT_1_B3_HOTRST |USB_INT_1_B2_SPND | +USB_INT_1_B2_L1SPND |USB_INT_1_B2_USBRST ); +usb3_clear_bit (usb3,USB_COM_CON_SPD_MODE ,USB3_USB_COM_CON ); +usb3_init_epc_registers (usb3);if (usb3->driver) usb3->driver->disconnect (&usb3->gadget);
drivers/usb/storage/uas.c +6 -0
@@ -836,6 +836,12 @@ static int uas_slave_configure(struct scsi_device *sdev)if (devinfo->flags &US_FL_BROKEN_FUA ) sdev->broken_fua =1 ; +/* UAS also needs to support FL_ALWAYS_SYNC */ +if (devinfo->flags &US_FL_ALWAYS_SYNC ) { + sdev->skip_ms_page_3f =1 ; + sdev->skip_ms_page_8 =1 ; + sdev->wce_default_on =1 ; + }scsi_change_queue_depth (sdev, devinfo->qdepth -2 );return 0 ; }
drivers/usb/storage/unusual_devs.h +9 -0
@@ -2340,6 +2340,15 @@ UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, "Micro Mini 1GB", USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), +/* "G-DRIVE" external HDD hangs on write without these. +* Patch submitted by Alexander Kappner <[email protected]> +*/ +UNUSUAL_DEV (0x4971 ,0x8024 ,0x0000 ,0x9999 , +"SimpleTech" , +"External HDD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , + US_FL_ALWAYS_SYNC), +/* * Nick Bowler <[email protected]> * SCSI stack spams (otherwise harmless) error messages.
drivers/usb/storage/unusual_uas.h +9 -0
@@ -183,3 +183,12 @@ UNUSUAL_DEV(0x4971, 0x8017, 0x0000, 0x9999, "External HDD", USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_OPCODES), + +/* "G-DRIVE" external HDD hangs on write without these. +* Patch submitted by Alexander Kappner <[email protected]> +*/ +UNUSUAL_DEV (0x4971 ,0x8024 ,0x0000 ,0x9999 , +"SimpleTech" , +"External HDD" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , + US_FL_ALWAYS_SYNC),
drivers/usb/usbip/vhci_sysfs.c +16 -8
@@ -24,6 +24,9 @@#include <linux/platform_device.h> #include <linux/slab.h> +/* Hardening for Spectre-v1 */ +#include <linux/nospec.h> +#include "usbip_common.h" #include "vhci.h"
@@ -181,16 +184,20 @@ static int vhci_port_disconnect(struct vhci_hcd *vhci, __u32 rhport)return 0 ; } -static int valid_port (__u32 pdev_nr,__u32 rhport) +static int valid_port (__u32 *pdev_nr,__u32 *rhport) { -if (pdev_nr >= vhci_num_controllers) { -pr_err ("pdev %u\n" , pdev_nr); +if (*pdev_nr >= vhci_num_controllers) { +pr_err ("pdev %u\n" , *pdev_nr);return 0 ; } -if (rhport >=VHCI_HC_PORTS ) { -pr_err ("rhport %u\n" , rhport); + *pdev_nr =array_index_nospec (*pdev_nr, vhci_num_controllers); + +if (*rhport >=VHCI_HC_PORTS ) { +pr_err ("rhport %u\n" , *rhport);return 0 ; } + *rhport =array_index_nospec (*rhport,VHCI_HC_PORTS ); +return 1 ; }
@@ -207,7 +214,7 @@ static ssize_t store_detach(struct device *dev, struct device_attribute *attr, pdev_nr =port_to_pdev_nr (port); rhport =port_to_rhport (port); -if (!valid_port (pdev_nr, rhport)) +if (!valid_port (&pdev_nr, &rhport))return -EINVAL ; hcd =platform_get_drvdata (*(vhci_pdevs + pdev_nr));
@@ -226,7 +233,8 @@ static ssize_t store_detach(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR(detach, S_IWUSR, NULL, store_detach); -static int valid_args (__u32 pdev_nr,__u32 rhport,enum usb_device_speed speed) +static int valid_args (__u32 *pdev_nr,__u32 *rhport, +enum usb_device_speed speed) {if (!valid_port (pdev_nr, rhport)) {return 0 ;
@@ -288,7 +296,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr, sockfd, devid, speed);/* check received parameters */ -if (!valid_args (pdev_nr, rhport, speed)) +if (!valid_args (&pdev_nr, &rhport, speed))return -EINVAL ; hcd =platform_get_drvdata (*(vhci_pdevs + pdev_nr));
include/net/bonding.h +5 -0
@@ -277,6 +277,11 @@ static inline bool bond_is_lb(const struct bonding *bond)BOND_MODE (bond) ==BOND_MODE_ALB ; } +static inline bool bond_needs_speed_duplex (const struct bonding *bond) +{ +return BOND_MODE (bond) ==BOND_MODE_8023AD ||bond_is_lb (bond); +} +static inline bool bond_is_nondyn_tlb (const struct bonding *bond) { return (BOND_MODE(bond) == BOND_MODE_TLB) &&
net/key/af_key.c +35 -10
71 lines not on this page · raw message
tools/arch/x86/include/asm/cpufeatures.h +1 -1
@@ -104,7 +104,7 @@#define X86_FEATURE_EXTD_APICID ( 3*32+26)/* has extended APICID (8 bits) */ #define X86_FEATURE_AMD_DCM ( 3*32+27)/* multi-node processor */ #define X86_FEATURE_APERFMPERF ( 3*32+28)/* APERFMPERF */ -#define X86_FEATURE_EAGER_FPU ( 3*32+29)/* "eagerfpu" Non lazy FPU restore */ +/* free, was #define X86_FEATURE_EAGER_FPU ( 3*32+29) * "eagerfpu" Non lazy FPU restore */ #define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30)/* TSC doesn't stop in S3 state */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */