commit: 57a4132eae68a941350a6387cdc669f3ef2557ac Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Sun Sep 10 14:38:33 2017 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sun Sep 10 14:38:33 2017 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=57a4132e
Linux patch 4.9.49 0000_README | 4 + 1048_linux-4.9.49.patch | 889 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 893 insertions(+) diff --git a/0000_README b/0000_README index da58adf..e403e79 100644 --- a/0000_README +++ b/0000_README @@ -235,6 +235,10 @@ Patch: 1047_linux-4.9.48.patch From: http://www.kernel.org Desc: Linux 4.9.48 +Patch: 1048_linux-4.9.49.patch +From: http://www.kernel.org +Desc: Linux 4.9.49 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1048_linux-4.9.49.patch b/1048_linux-4.9.49.patch new file mode 100644 index 0000000..01d99cd --- /dev/null +++ b/1048_linux-4.9.49.patch @@ -0,0 +1,889 @@ +diff --git a/Makefile b/Makefile +index cfa188b427b1..1ebc553f5464 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 4 + PATCHLEVEL = 9 +-SUBLEVEL = 48 ++SUBLEVEL = 49 + EXTRAVERSION = + NAME = Roaring Lionus + +diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h +index 0cea7026e4ff..d33f245af5e9 100644 +--- a/arch/s390/include/asm/pgtable.h ++++ b/arch/s390/include/asm/pgtable.h +@@ -480,7 +480,7 @@ static inline int mm_alloc_pgste(struct mm_struct *mm) + * In the case that a guest uses storage keys + * faults should no longer be backed by zero pages + */ +-#define mm_forbids_zeropage mm_use_skey ++#define mm_forbids_zeropage mm_has_pgste + static inline int mm_use_skey(struct mm_struct *mm) + { + #ifdef CONFIG_PGSTE +diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c +index 3ba622702ce4..cb2cd04e6698 100644 +--- a/arch/s390/mm/gmap.c ++++ b/arch/s390/mm/gmap.c +@@ -2124,6 +2124,37 @@ static inline void thp_split_mm(struct mm_struct *mm) + #endif + } + ++/* ++ * Remove all empty zero pages from the mapping for lazy refaulting ++ * - This must be called after mm->context.has_pgste is set, to avoid ++ * future creation of zero pages ++ * - This must be called after THP was enabled ++ */ ++static int __zap_zero_pages(pmd_t *pmd, unsigned long start, ++ unsigned long end, struct mm_walk *walk) ++{ ++ unsigned long addr; ++ ++ for (addr = start; addr != end; addr += PAGE_SIZE) { ++ pte_t *ptep; ++ spinlock_t *ptl; ++ ++ ptep = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); ++ if (is_zero_pfn(pte_pfn(*ptep))) ++ ptep_xchg_direct(walk->mm, addr, ptep, __pte(_PAGE_INVALID)); ++ pte_unmap_unlock(ptep, ptl); ++ } ++ return 0; ++} ++ ++static inline void zap_zero_pages(struct mm_struct *mm) ++{ ++ struct mm_walk walk = { .pmd_entry = __zap_zero_pages }; ++ ++ walk.mm = mm; ++ walk_page_range(0, TASK_SIZE, &walk); ++} ++ + /* + * switch on pgstes for its userspace process (for kvm) + */ +@@ -2141,6 +2172,7 @@ int s390_enable_sie(void) + mm->context.has_pgste = 1; + /* split thp mappings and disable thp for future mappings */ + thp_split_mm(mm); ++ zap_zero_pages(mm); + up_write(&mm->mmap_sem); + return 0; + } +@@ -2153,13 +2185,6 @@ EXPORT_SYMBOL_GPL(s390_enable_sie); + static int __s390_enable_skey(pte_t *pte, unsigned long addr, + unsigned long next, struct mm_walk *walk) + { +- /* +- * Remove all zero page mappings, +- * after establishing a policy to forbid zero page mappings +- * following faults for that page will get fresh anonymous pages +- */ +- if (is_zero_pfn(pte_pfn(*pte))) +- ptep_xchg_direct(walk->mm, addr, pte, __pte(_PAGE_INVALID)); + /* Clear storage key */ + ptep_zap_key(walk->mm, addr, pte); + return 0; +diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c +index 8d4d959a821c..8706533db57b 100644 +--- a/drivers/ata/pata_amd.c ++++ b/drivers/ata/pata_amd.c +@@ -616,6 +616,7 @@ static const struct pci_device_id amd[] = { + { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE), 8 }, + { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE), 8 }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), 9 }, ++ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), 9 }, + + { }, + }; +diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c +index 6c15a554efbe..dc1255294628 100644 +--- a/drivers/ata/pata_cs5536.c ++++ b/drivers/ata/pata_cs5536.c +@@ -289,6 +289,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id) + + static const struct pci_device_id cs5536[] = { + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_IDE), }, ++ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CS5536_DEV_IDE), }, + { }, + }; + +diff --git a/drivers/base/bus.c b/drivers/base/bus.c +index 6470eb8088f4..e32a74eb28a3 100644 +--- a/drivers/base/bus.c ++++ b/drivers/base/bus.c +@@ -736,7 +736,7 @@ int bus_add_driver(struct device_driver *drv) + + out_unregister: + kobject_put(&priv->kobj); +- kfree(drv->p); ++ /* drv->p is freed in driver_release() */ + drv->p = NULL; + out_put_bus: + bus_put(bus); +diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c +index dd220fad366c..74e677ac8e37 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -342,6 +342,7 @@ static const struct usb_device_id blacklist_table[] = { + { USB_DEVICE(0x13d3, 0x3410), .driver_info = BTUSB_REALTEK }, + { USB_DEVICE(0x13d3, 0x3416), .driver_info = BTUSB_REALTEK }, + { USB_DEVICE(0x13d3, 0x3459), .driver_info = BTUSB_REALTEK }, ++ { USB_DEVICE(0x13d3, 0x3494), .driver_info = BTUSB_REALTEK }, + + /* Additional Realtek 8821AE Bluetooth devices */ + { USB_DEVICE(0x0b05, 0x17dc), .driver_info = BTUSB_REALTEK }, +diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h +index 161c923d6162..3e74e1a6584c 100644 +--- a/drivers/gpu/drm/bridge/adv7511/adv7511.h ++++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h +@@ -315,6 +315,8 @@ struct adv7511 { + bool edid_read; + + wait_queue_head_t wq; ++ struct work_struct hpd_work; ++ + struct drm_bridge bridge; + struct drm_connector connector; + +diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +index 8ed3906dd411..213d892b6fa3 100644 +--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c ++++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +@@ -402,6 +402,27 @@ static bool adv7511_hpd(struct adv7511 *adv7511) + return false; + } + ++static void adv7511_hpd_work(struct work_struct *work) ++{ ++ struct adv7511 *adv7511 = container_of(work, struct adv7511, hpd_work); ++ enum drm_connector_status status; ++ unsigned int val; ++ int ret; ++ ++ ret = regmap_read(adv7511->regmap, ADV7511_REG_STATUS, &val); ++ if (ret < 0) ++ status = connector_status_disconnected; ++ else if (val & ADV7511_STATUS_HPD) ++ status = connector_status_connected; ++ else ++ status = connector_status_disconnected; ++ ++ if (adv7511->connector.status != status) { ++ adv7511->connector.status = status; ++ drm_kms_helper_hotplug_event(adv7511->connector.dev); ++ } ++} ++ + static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) + { + unsigned int irq0, irq1; +@@ -419,7 +440,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd) + regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1); + + if (process_hpd && irq0 & ADV7511_INT0_HPD && adv7511->bridge.encoder) +- drm_helper_hpd_irq_event(adv7511->connector.dev); ++ schedule_work(&adv7511->hpd_work); + + if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) { + adv7511->edid_read = true; +@@ -1006,6 +1027,8 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) + goto err_i2c_unregister_edid; + } + ++ INIT_WORK(&adv7511->hpd_work, adv7511_hpd_work); ++ + if (i2c->irq) { + init_waitqueue_head(&adv7511->wq); + +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c +index eb9b278198b2..a4cb82495cee 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c +@@ -192,6 +192,10 @@ nvkm_pci_new_(const struct nvkm_pci_func *func, struct nvkm_device *device, + } + } + ++#ifdef __BIG_ENDIAN ++ pci->msi = false; ++#endif ++ + pci->msi = nvkm_boolopt(device->cfgopt, "NvMSI", pci->msi); + if (pci->msi && func->msi_rearm) { + pci->msi = pci_enable_msi(pci->pdev) == 0; +diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c +index 0bba3842336e..63b5db4e4070 100644 +--- a/drivers/hwtracing/intel_th/pci.c ++++ b/drivers/hwtracing/intel_th/pci.c +@@ -85,6 +85,16 @@ static const struct pci_device_id intel_th_pci_id_table[] = { + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa2a6), + .driver_data = (kernel_ulong_t)0, + }, ++ { ++ /* Cannon Lake H */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa326), ++ .driver_data = (kernel_ulong_t)0, ++ }, ++ { ++ /* Cannon Lake LP */ ++ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9da6), ++ .driver_data = (kernel_ulong_t)0, ++ }, + { 0 }, + }; + +diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c +index cde6f130a99a..472641fc890c 100644 +--- a/drivers/iio/adc/ti-ads1015.c ++++ b/drivers/iio/adc/ti-ads1015.c +@@ -80,18 +80,12 @@ static const unsigned int ads1115_data_rate[] = { + 8, 16, 32, 64, 128, 250, 475, 860 + }; + +-static const struct { +- int scale; +- int uscale; +-} ads1015_scale[] = { +- {3, 0}, +- {2, 0}, +- {1, 0}, +- {0, 500000}, +- {0, 250000}, +- {0, 125000}, +- {0, 125000}, +- {0, 125000}, ++/* ++ * Translation from PGA bits to full-scale positive and negative input voltage ++ * range in mV ++ */ ++static int ads1015_fullscale_range[] = { ++ 6144, 4096, 2048, 1024, 512, 256, 256, 256 + }; + + #define ADS1015_V_CHAN(_chan, _addr) { \ +@@ -182,6 +176,12 @@ struct ads1015_data { + struct ads1015_channel_data channel_data[ADS1015_CHANNELS]; + + unsigned int *data_rate; ++ /* ++ * Set to true when the ADC is switched to the continuous-conversion ++ * mode and exits from a power-down state. This flag is used to avoid ++ * getting the stale result from the conversion register. ++ */ ++ bool conv_invalid; + }; + + static bool ads1015_is_writeable_reg(struct device *dev, unsigned int reg) +@@ -234,33 +234,43 @@ static int ads1015_set_power_state(struct ads1015_data *data, bool on) + ret = pm_runtime_put_autosuspend(dev); + } + +- return ret; ++ return ret < 0 ? ret : 0; + } + + static + int ads1015_get_adc_result(struct ads1015_data *data, int chan, int *val) + { + int ret, pga, dr, conv_time; +- bool change; ++ unsigned int old, mask, cfg; + + if (chan < 0 || chan >= ADS1015_CHANNELS) + return -EINVAL; + ++ ret = regmap_read(data->regmap, ADS1015_CFG_REG, &old); ++ if (ret) ++ return ret; ++ + pga = data->channel_data[chan].pga; + dr = data->channel_data[chan].data_rate; ++ mask = ADS1015_CFG_MUX_MASK | ADS1015_CFG_PGA_MASK | ++ ADS1015_CFG_DR_MASK; ++ cfg = chan << ADS1015_CFG_MUX_SHIFT | pga << ADS1015_CFG_PGA_SHIFT | ++ dr << ADS1015_CFG_DR_SHIFT; + +- ret = regmap_update_bits_check(data->regmap, ADS1015_CFG_REG, +- ADS1015_CFG_MUX_MASK | +- ADS1015_CFG_PGA_MASK, +- chan << ADS1015_CFG_MUX_SHIFT | +- pga << ADS1015_CFG_PGA_SHIFT, +- &change); +- if (ret < 0) ++ cfg = (old & ~mask) | (cfg & mask); ++ ++ ret = regmap_write(data->regmap, ADS1015_CFG_REG, cfg); ++ if (ret) + return ret; + +- if (change) { +- conv_time = DIV_ROUND_UP(USEC_PER_SEC, data->data_rate[dr]); ++ if (old != cfg || data->conv_invalid) { ++ int dr_old = (old & ADS1015_CFG_DR_MASK) >> ++ ADS1015_CFG_DR_SHIFT; ++ ++ conv_time = DIV_ROUND_UP(USEC_PER_SEC, data->data_rate[dr_old]); ++ conv_time += DIV_ROUND_UP(USEC_PER_SEC, data->data_rate[dr]); + usleep_range(conv_time, conv_time + 1); ++ data->conv_invalid = false; + } + + return regmap_read(data->regmap, ADS1015_CONV_REG, val); +@@ -297,17 +307,20 @@ static irqreturn_t ads1015_trigger_handler(int irq, void *p) + return IRQ_HANDLED; + } + +-static int ads1015_set_scale(struct ads1015_data *data, int chan, ++static int ads1015_set_scale(struct ads1015_data *data, ++ struct iio_chan_spec const *chan, + int scale, int uscale) + { + int i, ret, rindex = -1; ++ int fullscale = div_s64((scale * 1000000LL + uscale) << ++ (chan->scan_type.realbits - 1), 1000000); + +- for (i = 0; i < ARRAY_SIZE(ads1015_scale); i++) +- if (ads1015_scale[i].scale == scale && +- ads1015_scale[i].uscale == uscale) { ++ for (i = 0; i < ARRAY_SIZE(ads1015_fullscale_range); i++) { ++ if (ads1015_fullscale_range[i] == fullscale) { + rindex = i; + break; + } ++ } + if (rindex < 0) + return -EINVAL; + +@@ -317,32 +330,23 @@ static int ads1015_set_scale(struct ads1015_data *data, int chan, + if (ret < 0) + return ret; + +- data->channel_data[chan].pga = rindex; ++ data->channel_data[chan->address].pga = rindex; + + return 0; + } + + static int ads1015_set_data_rate(struct ads1015_data *data, int chan, int rate) + { +- int i, ret, rindex = -1; ++ int i; + +- for (i = 0; i < ARRAY_SIZE(ads1015_data_rate); i++) ++ for (i = 0; i < ARRAY_SIZE(ads1015_data_rate); i++) { + if (data->data_rate[i] == rate) { +- rindex = i; +- break; ++ data->channel_data[chan].data_rate = i; ++ return 0; + } +- if (rindex < 0) +- return -EINVAL; +- +- ret = regmap_update_bits(data->regmap, ADS1015_CFG_REG, +- ADS1015_CFG_DR_MASK, +- rindex << ADS1015_CFG_DR_SHIFT); +- if (ret < 0) +- return ret; +- +- data->channel_data[chan].data_rate = rindex; ++ } + +- return 0; ++ return -EINVAL; + } + + static int ads1015_read_raw(struct iio_dev *indio_dev, +@@ -384,9 +388,9 @@ static int ads1015_read_raw(struct iio_dev *indio_dev, + } + case IIO_CHAN_INFO_SCALE: + idx = data->channel_data[chan->address].pga; +- *val = ads1015_scale[idx].scale; +- *val2 = ads1015_scale[idx].uscale; +- ret = IIO_VAL_INT_PLUS_MICRO; ++ *val = ads1015_fullscale_range[idx]; ++ *val2 = chan->scan_type.realbits - 1; ++ ret = IIO_VAL_FRACTIONAL_LOG2; + break; + case IIO_CHAN_INFO_SAMP_FREQ: + idx = data->channel_data[chan->address].data_rate; +@@ -413,7 +417,7 @@ static int ads1015_write_raw(struct iio_dev *indio_dev, + mutex_lock(&data->lock); + switch (mask) { + case IIO_CHAN_INFO_SCALE: +- ret = ads1015_set_scale(data, chan->address, val, val2); ++ ret = ads1015_set_scale(data, chan, val, val2); + break; + case IIO_CHAN_INFO_SAMP_FREQ: + ret = ads1015_set_data_rate(data, chan->address, val); +@@ -445,7 +449,10 @@ static const struct iio_buffer_setup_ops ads1015_buffer_setup_ops = { + .validate_scan_mask = &iio_validate_scan_mask_onehot, + }; + +-static IIO_CONST_ATTR(scale_available, "3 2 1 0.5 0.25 0.125"); ++static IIO_CONST_ATTR_NAMED(ads1015_scale_available, scale_available, ++ "3 2 1 0.5 0.25 0.125"); ++static IIO_CONST_ATTR_NAMED(ads1115_scale_available, scale_available, ++ "0.1875 0.125 0.0625 0.03125 0.015625 0.007813"); + + static IIO_CONST_ATTR_NAMED(ads1015_sampling_frequency_available, + sampling_frequency_available, "128 250 490 920 1600 2400 3300"); +@@ -453,7 +460,7 @@ static IIO_CONST_ATTR_NAMED(ads1115_sampling_frequency_available, + sampling_frequency_available, "8 16 32 64 128 250 475 860"); + + static struct attribute *ads1015_attributes[] = { +- &iio_const_attr_scale_available.dev_attr.attr, ++ &iio_const_attr_ads1015_scale_available.dev_attr.attr, + &iio_const_attr_ads1015_sampling_frequency_available.dev_attr.attr, + NULL, + }; +@@ -463,7 +470,7 @@ static const struct attribute_group ads1015_attribute_group = { + }; + + static struct attribute *ads1115_attributes[] = { +- &iio_const_attr_scale_available.dev_attr.attr, ++ &iio_const_attr_ads1115_scale_available.dev_attr.attr, + &iio_const_attr_ads1115_sampling_frequency_available.dev_attr.attr, + NULL, + }; +@@ -624,6 +631,15 @@ static int ads1015_probe(struct i2c_client *client, + dev_err(&client->dev, "iio triggered buffer setup failed\n"); + return ret; + } ++ ++ ret = regmap_update_bits(data->regmap, ADS1015_CFG_REG, ++ ADS1015_CFG_MOD_MASK, ++ ADS1015_CONTINUOUS << ADS1015_CFG_MOD_SHIFT); ++ if (ret) ++ return ret; ++ ++ data->conv_invalid = true; ++ + ret = pm_runtime_set_active(&client->dev); + if (ret) + goto err_buffer_cleanup; +@@ -679,10 +695,15 @@ static int ads1015_runtime_resume(struct device *dev) + { + struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev)); + struct ads1015_data *data = iio_priv(indio_dev); ++ int ret; + +- return regmap_update_bits(data->regmap, ADS1015_CFG_REG, ++ ret = regmap_update_bits(data->regmap, ADS1015_CFG_REG, + ADS1015_CFG_MOD_MASK, + ADS1015_CONTINUOUS << ADS1015_CFG_MOD_SHIFT); ++ if (!ret) ++ data->conv_invalid = true; ++ ++ return ret; + } + #endif + +diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c +index ce6ff9b301bb..7e2dc5e56632 100644 +--- a/drivers/input/mouse/trackpoint.c ++++ b/drivers/input/mouse/trackpoint.c +@@ -381,8 +381,8 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) + return 0; + + if (trackpoint_read(&psmouse->ps2dev, TP_EXT_BTN, &button_info)) { +- psmouse_warn(psmouse, "failed to get extended button data\n"); +- button_info = 0; ++ psmouse_warn(psmouse, "failed to get extended button data, assuming 3 buttons\n"); ++ button_info = 0x33; + } + + psmouse->private = kzalloc(sizeof(struct trackpoint_data), GFP_KERNEL); +diff --git a/drivers/mcb/mcb-lpc.c b/drivers/mcb/mcb-lpc.c +index d072c088ce73..945091a88354 100644 +--- a/drivers/mcb/mcb-lpc.c ++++ b/drivers/mcb/mcb-lpc.c +@@ -114,6 +114,12 @@ static struct resource sc24_fpga_resource = { + .flags = IORESOURCE_MEM, + }; + ++static struct resource sc31_fpga_resource = { ++ .start = 0xf000e000, ++ .end = 0xf000e000 + CHAM_HEADER_SIZE, ++ .flags = IORESOURCE_MEM, ++}; ++ + static struct platform_driver mcb_lpc_driver = { + .driver = { + .name = "mcb-lpc", +@@ -132,6 +138,15 @@ static const struct dmi_system_id mcb_lpc_dmi_table[] = { + .driver_data = (void *)&sc24_fpga_resource, + .callback = mcb_lpc_create_platform_device, + }, ++ { ++ .ident = "SC31", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "MEN"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "14SC31"), ++ }, ++ .driver_data = (void *)&sc31_fpga_resource, ++ .callback = mcb_lpc_create_platform_device, ++ }, + {} + }; + MODULE_DEVICE_TABLE(dmi, mcb_lpc_dmi_table); +diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c +index 972b5e224d5d..366d3dcb8e9d 100644 +--- a/drivers/net/wireless/ath/ath10k/core.c ++++ b/drivers/net/wireless/ath/ath10k/core.c +@@ -1852,6 +1852,12 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, + goto err_wmi_detach; + } + ++ /* If firmware indicates Full Rx Reorder support it must be used in a ++ * slightly different manner. Let HTT code know. ++ */ ++ ar->htt.rx_ring.in_ord_rx = !!(test_bit(WMI_SERVICE_RX_FULL_REORDER, ++ ar->wmi.svc_map)); ++ + status = ath10k_htt_rx_alloc(&ar->htt); + if (status) { + ath10k_err(ar, "failed to alloc htt rx: %d\n", status); +@@ -1964,12 +1970,6 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, + } + } + +- /* If firmware indicates Full Rx Reorder support it must be used in a +- * slightly different manner. Let HTT code know. +- */ +- ar->htt.rx_ring.in_ord_rx = !!(test_bit(WMI_SERVICE_RX_FULL_REORDER, +- ar->wmi.svc_map)); +- + status = ath10k_htt_rx_ring_refill(ar); + if (status) { + ath10k_err(ar, "failed to refill htt rx ring: %d\n", status); +diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +index 2f8134b2a504..177fd5be2811 100644 +--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +@@ -429,6 +429,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { + {IWL_PCI_DEVICE(0x095B, 0x520A, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095A, 0x9000, iwl7265_2ac_cfg)}, + {IWL_PCI_DEVICE(0x095A, 0x9400, iwl7265_2ac_cfg)}, ++ {IWL_PCI_DEVICE(0x095A, 0x9E10, iwl7265_2ac_cfg)}, + + /* 8000 Series */ + {IWL_PCI_DEVICE(0x24F3, 0x0010, iwl8260_2ac_cfg)}, +diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c +index afdbbf59a278..8677a53ef725 100644 +--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c ++++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c +@@ -4188,7 +4188,7 @@ int mwifiex_init_channel_scan_gap(struct mwifiex_adapter *adapter) + if (adapter->config_bands & BAND_A) + n_channels_a = mwifiex_band_5ghz.n_channels; + +- adapter->num_in_chan_stats = max_t(u32, n_channels_bg, n_channels_a); ++ adapter->num_in_chan_stats = n_channels_bg + n_channels_a; + adapter->chan_stats = vmalloc(sizeof(*adapter->chan_stats) * + adapter->num_in_chan_stats); + +diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c +index 97c9765b5bc6..78d59a67f7e1 100644 +--- a/drivers/net/wireless/marvell/mwifiex/scan.c ++++ b/drivers/net/wireless/marvell/mwifiex/scan.c +@@ -2479,6 +2479,12 @@ mwifiex_update_chan_statistics(struct mwifiex_private *priv, + sizeof(struct mwifiex_chan_stats); + + for (i = 0 ; i < num_chan; i++) { ++ if (adapter->survey_idx >= adapter->num_in_chan_stats) { ++ mwifiex_dbg(adapter, WARN, ++ "FW reported too many channel results (max %d)\n", ++ adapter->num_in_chan_stats); ++ return; ++ } + chan_stats.chan_num = fw_chan_stats->chan_num; + chan_stats.bandcfg = fw_chan_stats->bandcfg; + chan_stats.flags = fw_chan_stats->flags; +diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c +index 5be4fc96002d..75ffeaa54ed8 100644 +--- a/drivers/net/wireless/realtek/rtlwifi/pci.c ++++ b/drivers/net/wireless/realtek/rtlwifi/pci.c +@@ -2269,7 +2269,7 @@ int rtl_pci_probe(struct pci_dev *pdev, + /* find adapter */ + if (!_rtl_pci_find_adapter(pdev, hw)) { + err = -ENODEV; +- goto fail3; ++ goto fail2; + } + + /* Init IO handler */ +@@ -2339,10 +2339,10 @@ int rtl_pci_probe(struct pci_dev *pdev, + pci_set_drvdata(pdev, NULL); + rtl_deinit_core(hw); + ++fail2: + if (rtlpriv->io.pci_mem_start != 0) + pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start); + +-fail2: + pci_release_regions(pdev); + complete(&rtlpriv->firmware_loading_complete); + +diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c +index fed37aabf828..9236a13d5d2a 100644 +--- a/drivers/scsi/sg.c ++++ b/drivers/scsi/sg.c +@@ -1244,6 +1244,7 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma) + unsigned long req_sz, len, sa; + Sg_scatter_hold *rsv_schp; + int k, length; ++ int ret = 0; + + if ((!filp) || (!vma) || (!(sfp = (Sg_fd *) filp->private_data))) + return -ENXIO; +@@ -1254,8 +1255,11 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma) + if (vma->vm_pgoff) + return -EINVAL; /* want no offset */ + rsv_schp = &sfp->reserve; +- if (req_sz > rsv_schp->bufflen) +- return -ENOMEM; /* cannot map more than reserved buffer */ ++ mutex_lock(&sfp->f_mutex); ++ if (req_sz > rsv_schp->bufflen) { ++ ret = -ENOMEM; /* cannot map more than reserved buffer */ ++ goto out; ++ } + + sa = vma->vm_start; + length = 1 << (PAGE_SHIFT + rsv_schp->page_order); +@@ -1269,7 +1273,9 @@ sg_mmap(struct file *filp, struct vm_area_struct *vma) + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + vma->vm_private_data = sfp; + vma->vm_ops = &sg_mmap_vm_ops; +- return 0; ++out: ++ mutex_unlock(&sfp->f_mutex); ++ return ret; + } + + static void +@@ -1741,9 +1747,12 @@ sg_start_req(Sg_request *srp, unsigned char *cmd) + !sfp->res_in_use) { + sfp->res_in_use = 1; + sg_link_reserve(sfp, srp, dxfer_len); +- } else if ((hp->flags & SG_FLAG_MMAP_IO) && sfp->res_in_use) { ++ } else if (hp->flags & SG_FLAG_MMAP_IO) { ++ res = -EBUSY; /* sfp->res_in_use == 1 */ ++ if (dxfer_len > rsv_schp->bufflen) ++ res = -ENOMEM; + mutex_unlock(&sfp->f_mutex); +- return -EBUSY; ++ return res; + } else { + res = sg_build_indirect(req_schp, sfp, dxfer_len); + if (res) { +diff --git a/drivers/staging/rts5208/rtsx_scsi.c b/drivers/staging/rts5208/rtsx_scsi.c +index becb4bba166c..b3790334fd3f 100644 +--- a/drivers/staging/rts5208/rtsx_scsi.c ++++ b/drivers/staging/rts5208/rtsx_scsi.c +@@ -414,7 +414,7 @@ void set_sense_data(struct rtsx_chip *chip, unsigned int lun, u8 err_code, + sense->ascq = ascq; + if (sns_key_info0 != 0) { + sense->sns_key_info[0] = SKSV | sns_key_info0; +- sense->sns_key_info[1] = (sns_key_info1 & 0xf0) >> 8; ++ sense->sns_key_info[1] = (sns_key_info1 & 0xf0) >> 4; + sense->sns_key_info[2] = sns_key_info1 & 0x0f; + } + } +diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c +index 840930b014f6..c8075eb3db26 100644 +--- a/drivers/usb/core/devio.c ++++ b/drivers/usb/core/devio.c +@@ -629,6 +629,8 @@ static void async_completed(struct urb *urb) + if (as->status < 0 && as->bulk_addr && as->status != -ECONNRESET && + as->status != -ENOENT) + cancel_bulk_urbs(ps, as->bulk_addr); ++ ++ wake_up(&ps->wait); + spin_unlock(&ps->lock); + + if (signr) { +@@ -636,8 +638,6 @@ static void async_completed(struct urb *urb) + put_pid(pid); + put_cred(cred); + } +- +- wake_up(&ps->wait); + } + + static void destroy_async(struct usb_dev_state *ps, struct list_head *list) +diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c +index 574da2b4529c..82806e311202 100644 +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -57,8 +57,9 @@ static const struct usb_device_id usb_quirk_list[] = { + /* Microsoft LifeCam-VX700 v2.0 */ + { USB_DEVICE(0x045e, 0x0770), .driver_info = USB_QUIRK_RESET_RESUME }, + +- /* Logitech HD Pro Webcams C920 and C930e */ ++ /* Logitech HD Pro Webcams C920, C920-C and C930e */ + { USB_DEVICE(0x046d, 0x082d), .driver_info = USB_QUIRK_DELAY_INIT }, ++ { USB_DEVICE(0x046d, 0x0841), .driver_info = USB_QUIRK_DELAY_INIT }, + { USB_DEVICE(0x046d, 0x0843), .driver_info = USB_QUIRK_DELAY_INIT }, + + /* Logitech ConferenceCam CC3000e */ +@@ -217,6 +218,9 @@ static const struct usb_device_id usb_quirk_list[] = { + { USB_DEVICE(0x1a0a, 0x0200), .driver_info = + USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, + ++ /* Corsair Strafe RGB */ ++ { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT }, ++ + /* Acer C120 LED Projector */ + { USB_DEVICE(0x1de1, 0xc102), .driver_info = USB_QUIRK_NO_LPM }, + +diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c +index 5f4ca7890435..58b9685eb21f 100644 +--- a/drivers/usb/host/pci-quirks.c ++++ b/drivers/usb/host/pci-quirks.c +@@ -142,29 +142,30 @@ static int amd_chipset_sb_type_init(struct amd_chipset_info *pinfo) + pinfo->sb_type.gen = AMD_CHIPSET_SB700; + else if (rev >= 0x40 && rev <= 0x4f) + pinfo->sb_type.gen = AMD_CHIPSET_SB800; +- } +- pinfo->smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD, +- 0x145c, NULL); +- if (pinfo->smbus_dev) { +- pinfo->sb_type.gen = AMD_CHIPSET_TAISHAN; + } else { + pinfo->smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD, + PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, NULL); + +- if (!pinfo->smbus_dev) { +- pinfo->sb_type.gen = NOT_AMD_CHIPSET; +- return 0; ++ if (pinfo->smbus_dev) { ++ rev = pinfo->smbus_dev->revision; ++ if (rev >= 0x11 && rev <= 0x14) ++ pinfo->sb_type.gen = AMD_CHIPSET_HUDSON2; ++ else if (rev >= 0x15 && rev <= 0x18) ++ pinfo->sb_type.gen = AMD_CHIPSET_BOLTON; ++ else if (rev >= 0x39 && rev <= 0x3a) ++ pinfo->sb_type.gen = AMD_CHIPSET_YANGTZE; ++ } else { ++ pinfo->smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD, ++ 0x145c, NULL); ++ if (pinfo->smbus_dev) { ++ rev = pinfo->smbus_dev->revision; ++ pinfo->sb_type.gen = AMD_CHIPSET_TAISHAN; ++ } else { ++ pinfo->sb_type.gen = NOT_AMD_CHIPSET; ++ return 0; ++ } + } +- +- rev = pinfo->smbus_dev->revision; +- if (rev >= 0x11 && rev <= 0x14) +- pinfo->sb_type.gen = AMD_CHIPSET_HUDSON2; +- else if (rev >= 0x15 && rev <= 0x18) +- pinfo->sb_type.gen = AMD_CHIPSET_BOLTON; +- else if (rev >= 0x39 && rev <= 0x3a) +- pinfo->sb_type.gen = AMD_CHIPSET_YANGTZE; + } +- + pinfo->sb_type.rev = rev; + return 1; + } +diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c +index 261ed2ca28f9..a6b6b1cf1317 100644 +--- a/drivers/usb/musb/musb_core.c ++++ b/drivers/usb/musb/musb_core.c +@@ -2655,6 +2655,13 @@ static int musb_suspend(struct device *dev) + { + struct musb *musb = dev_to_musb(dev); + unsigned long flags; ++ int ret; ++ ++ ret = pm_runtime_get_sync(dev); ++ if (ret < 0) { ++ pm_runtime_put_noidle(dev); ++ return ret; ++ } + + musb_platform_disable(musb); + musb_generic_disable(musb); +@@ -2703,14 +2710,6 @@ static int musb_resume(struct device *dev) + if ((devctl & mask) != (musb->context.devctl & mask)) + musb->port1_status = 0; + +- /* +- * The USB HUB code expects the device to be in RPM_ACTIVE once it came +- * out of suspend +- */ +- pm_runtime_disable(dev); +- pm_runtime_set_active(dev); +- pm_runtime_enable(dev); +- + musb_start(musb); + + spin_lock_irqsave(&musb->lock, flags); +@@ -2720,6 +2719,9 @@ static int musb_resume(struct device *dev) + error); + spin_unlock_irqrestore(&musb->lock, flags); + ++ pm_runtime_mark_last_busy(dev); ++ pm_runtime_put_autosuspend(dev); ++ + return 0; + } + +diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c +index fe123153b1a5..2a9944326210 100644 +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -2023,6 +2023,7 @@ static const struct usb_device_id option_ids[] = { + { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x02, 0x01) }, + { USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x7d03, 0xff, 0x00, 0x00) }, + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) }, /* D-Link DWM-158 */ ++ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d0e, 0xff) }, /* D-Link DWM-157 C1 */ + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff), /* D-Link DWM-221 B1 */ + .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ +diff --git a/fs/dlm/user.c b/fs/dlm/user.c +index 58c2f4a21b7f..9ac65914ab5b 100644 +--- a/fs/dlm/user.c ++++ b/fs/dlm/user.c +@@ -355,6 +355,10 @@ static int dlm_device_register(struct dlm_ls *ls, char *name) + error = misc_register(&ls->ls_device); + if (error) { + kfree(ls->ls_device.name); ++ /* this has to be set to NULL ++ * to avoid a double-free in dlm_device_deregister ++ */ ++ ls->ls_device.name = NULL; + } + fail: + return error; +diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h +index 3e5dbbe75f70..43082049baf2 100644 +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -574,6 +574,7 @@ + #define PCI_DEVICE_ID_AMD_CS5536_EHC 0x2095 + #define PCI_DEVICE_ID_AMD_CS5536_UDC 0x2096 + #define PCI_DEVICE_ID_AMD_CS5536_UOC 0x2097 ++#define PCI_DEVICE_ID_AMD_CS5536_DEV_IDE 0x2092 + #define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A + #define PCI_DEVICE_ID_AMD_LX_VIDEO 0x2081 + #define PCI_DEVICE_ID_AMD_LX_AES 0x2082 +diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h +index 733a21ef8da4..1061add575d2 100644 +--- a/include/linux/workqueue.h ++++ b/include/linux/workqueue.h +@@ -311,8 +311,8 @@ enum { + + __WQ_DRAINING = 1 << 16, /* internal: workqueue is draining */ + __WQ_ORDERED = 1 << 17, /* internal: workqueue is ordered */ +- __WQ_ORDERED_EXPLICIT = 1 << 18, /* internal: alloc_ordered_workqueue() */ + __WQ_LEGACY = 1 << 18, /* internal: create*_workqueue() */ ++ __WQ_ORDERED_EXPLICIT = 1 << 19, /* internal: alloc_ordered_workqueue() */ + + WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */ + WQ_MAX_UNBOUND_PER_CPU = 4, /* 4 * #cpus for unbound wq */
