- Linux-stable-mirror - lists.linaro.org

[PATCH] perf/x86/uncore: Remove unnecessary check for uncore_pmu

by kan.liang＠linux.intel.com

From: Kan Liang <kan.liang(a)linux.intel.com> The uncore_pmu pointer in uncore_pmu_enable/disable() is from container_of, which never be NULL. Remove the unnecessary check for uncore_pmu. Fixes: 75be6f703a14 ("perf/x86/uncore: Fix event group support") Reported-by: Pavel Machek <pavel(a)denx.de> Signed-off-by: Kan Liang <kan.liang(a)linux.intel.com> Cc: stable(a)vger.kernel.org --- arch/x86/events/intel/uncore.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 86467f8..81eed07 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -780,9 +780,6 @@ static void uncore_pmu_enable(struct pmu *pmu) struct intel_uncore_box *box; uncore_pmu = container_of(pmu, struct intel_uncore_pmu, pmu); - if (!uncore_pmu) - return; - box = uncore_pmu_to_box(uncore_pmu, smp_processor_id()); if (!box) return; @@ -797,9 +794,6 @@ static void uncore_pmu_disable(struct pmu *pmu) struct intel_uncore_box *box; uncore_pmu = container_of(pmu, struct intel_uncore_pmu, pmu); - if (!uncore_pmu) - return; - box = uncore_pmu_to_box(uncore_pmu, smp_processor_id()); if (!box) return; -- 2.7.4

5 years, 11 months

2
2
0 0

[PATCH 4.19 000/125] 4.19.84-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.19.84 release. There are 125 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 13 Nov 2019 18:08:44 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.84-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.19.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.19.84-rc1 Tejun Heo <tj(a)kernel.org> cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> mm/filemap.c: don't initiate writeback if mapping has no dirty pages Jean-Baptiste Maneyrol <JManeyrol(a)invensense.com> iio: imu: inv_mpu6050: fix no data on MPU6050 Randolph Maaßen <gaireg(a)gaireg.de> iio: imu: mpu6050: Add support for the ICM 20602 IMU Tejun Heo <tj(a)kernel.org> blkcg: make blkcg_print_stat() print stats only for online blkgs Hans de Goede <hdegoede(a)redhat.com> pinctrl: cherryview: Fix irq_valid_mask calculation Shuning Zhang <sunny.s.zhang(a)oracle.com> ocfs2: protect extent tree in ocfs2_prepare_inode_for_write() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: intel: Avoid potential glitches if pin is in GPIO mode Wenwen Wang <wenwen(a)cs.uga.edu> e1000: fix memory leaks Manfred Rudigier <manfred.rudigier(a)omicronenergy.com> igb: Fix constant media auto sense switching when no cable is connected Chuhong Yuan <hslester96(a)gmail.com> net: ethernet: arc: add the missed clk_disable_unprepare Trond Myklebust <trondmy(a)gmail.com> NFSv4: Don't allow a cached open with a revoked delegation Felipe Balbi <felipe.balbi(a)linux.intel.com> usb: dwc3: gadget: fix race when disabling ep with cancelled xfers Haiyang Zhang <haiyangz(a)microsoft.com> hv_netvsc: Fix error handling in netvsc_attach() Michael Strauss <michael.strauss(a)amd.com> drm/amd/display: Passive DP->HDMI dongle detection fix Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/amdgpu: If amdgpu_ib_schedule fails return back the error. Takashi Iwai <tiwai(a)suse.de> iommu/amd: Apply the same IVRS IOAPIC workaround to Acer Aspire A315-41 Vladimir Oltean <olteanv(a)gmail.com> net: mscc: ocelot: refuse to overwrite the port's native vlan Vladimir Oltean <olteanv(a)gmail.com> net: mscc: ocelot: fix vlan_filtering when enslaving to bridge before link is up Jiangfeng Xiao <xiaojiangfeng(a)huawei.com> net: hisilicon: Fix "Trying to free already-free IRQ" Will Deacon <will(a)kernel.org> fjes: Handle workqueue allocation failure Anton Eidelman <anton(a)lightbitslabs.com> nvme-multipath: fix possible io hang after ctrl reconnect Nicholas Piggin <npiggin(a)gmail.com> scsi: qla2xxx: stop timer in shutdown path Lijun Ou <oulijun(a)huawei.com> RDMA/hns: Prevent memory leaks of eq->buf_list Potnuri Bharat Teja <bharat(a)chelsio.com> RDMA/iw_cxgb4: Avoid freeing skb twice in arp failure case GwanYeong Kim <gy741.kim(a)gmail.com> usbip: tools: Fix read_usb_vudc_device() error path handling Johan Hovold <johan(a)kernel.org> USB: ldusb: use unsigned size format specifiers Alan Stern <stern(a)rowland.harvard.edu> USB: Skip endpoints with 0 maxpacket length Kan Liang <kan.liang(a)linux.intel.com> perf/x86/uncore: Fix event group support Kim Phillips <kim.phillips(a)amd.com> perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h) Kim Phillips <kim.phillips(a)amd.com> perf/x86/amd/ibs: Fix reading of the IBS OpData register and thus precise RIP validity Yinbo Zhu <yinbo.zhu(a)nxp.com> usb: dwc3: remove the call trace of USBx_GFLADJ Peter Chen <peter.chen(a)nxp.com> usb: gadget: configfs: fix concurrent issue between composite APIs Navid Emamdoost <navid.emamdoost(a)gmail.com> usb: dwc3: pci: prevent memory leak in dwc3_pci_probe Chandana Kishori Chiluveru <cchiluve(a)codeaurora.org> usb: gadget: composite: Fix possible double free memory bug Cristian Birsan <cristian.birsan(a)microchip.com> usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode. Nikhil Badola <nikhil.badola(a)freescale.com> usb: fsl: Check memory resource before releasing it Taehee Yoo <ap420073(a)gmail.com> macsec: fix refcnt leak in module exit routine Taehee Yoo <ap420073(a)gmail.com> bonding: fix unexpected IFF_BONDING bit unset Eric Dumazet <edumazet(a)google.com> ipvs: move old_secure_tcp into struct netns_ipvs Davide Caratti <dcaratti(a)redhat.com> ipvs: don't ignore errors in case refcounting ip_vs module fails Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_flow_table: set timeout before insertion into hashes Himanshu Madhani <hmadhani(a)marvell.com> scsi: qla2xxx: Initialized mailbox to prevent driver load failure Daniel Wagner <dwagner(a)suse.de> scsi: lpfc: Honor module parameter lpfc_use_adisc Hillf Danton <hdanton(a)sina.com> net: openvswitch: free vport unless register_netdevice() succeeds Dan Carpenter <dan.carpenter(a)oracle.com> RDMA/uverbs: Prevent potential underflow Hannes Reinecke <hare(a)suse.com> scsi: qla2xxx: fixup incorrect usage of host_byte Navid Emamdoost <navid.emamdoost(a)gmail.com> net/mlx5: prevent memory leak in mlx5_fpga_conn_create_cq Tariq Toukan <tariqt(a)mellanox.com> net/mlx5e: TX, Fix consumer index of error cqe dump Kamal Heib <kamalheib1(a)gmail.com> RDMA/qedr: Fix reported firmware version Potnuri Bharat Teja <bharat(a)chelsio.com> iw_cxgb4: fix ECN check on the passive accept Rafi Wiener <rafiw(a)mellanox.com> RDMA/mlx5: Clear old rate limit when closing QP Zhang Lixu <lixu.zhang(a)intel.com> HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() Baolin Wang <baolin.wang(a)linaro.org> dmaengine: sprd: Fix the possible memory leak issue Radhey Shyam Pandey <radhey.shyam.pandey(a)xilinx.com> dmaengine: xilinx_dma: Fix control reg update in vdma_channel_set_config Nicolas Boichat <drinkcat(a)chromium.org> HID: google: add magnemite/masterball USB ids Vidya Sagar <vidyas(a)nvidia.com> PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 Suwan Kim <suwan.kim027(a)gmail.com> usbip: Implement SG support to vhci-hcd and stub driver Shuah Khan <shuah(a)kernel.org> usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path Qian Cai <cai(a)lca.pw> sched/fair: Fix -Wunused-but-set-variable warnings Dave Chiluk <chiluk+linux(a)indeed.com> sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix copy&paste error in the validator Dan Carpenter <dan.carpenter(a)oracle.com> ALSA: usb-audio: remove some dead code Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Clean up check_input_term() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Remove superfluous bLength checks Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Simplify parse_audio_unit() Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: More validations of descriptor units Al Viro <viro(a)zeniv.linux.org.uk> configfs: fix a deadlock in configfs_symlink() Al Viro <viro(a)zeniv.linux.org.uk> configfs: provide exclusion between IO and removals Al Viro <viro(a)zeniv.linux.org.uk> configfs: new object reprsenting tree fragments Al Viro <viro(a)zeniv.linux.org.uk> configfs_register_group() shouldn't be (and isn't) called in rmdirable parts Al Viro <viro(a)zeniv.linux.org.uk> configfs: stash the data we need into configfs_buffer at open time Johan Hovold <johan(a)kernel.org> can: peak_usb: fix slab info leak Johan Hovold <johan(a)kernel.org> can: mcba_usb: fix use-after-free on disconnect Wen Yang <wenyang(a)linux.alibaba.com> can: dev: add missing of_node_put() after calling of_get_child_by_name() Navid Emamdoost <navid.emamdoost(a)gmail.com> can: gs_usb: gs_can_open(): prevent memory leak Marc Kleine-Budde <mkl(a)pengutronix.de> can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak Stephane Grosjean <s.grosjean(a)peak-system.com> can: peak_usb: fix a potential out-of-sync while decoding packets Kurt Van Dijck <dev.kurt(a)vandijck-laurijssen.be> can: c_can: c_can_poll(): only read status register after status IRQ Joakim Zhang <qiangqing.zhang(a)nxp.com> can: flexcan: disable completely the ECC mechanism Johan Hovold <johan(a)kernel.org> can: usb_8dev: fix use-after-free on disconnect Pavel Shilovsky <pshilov(a)microsoft.com> SMB3: Fix persistent handles reconnect Jan Beulich <jbeulich(a)suse.com> x86/apic/32: Avoid bogus LDR warnings Alexander Shishkin <alexander.shishkin(a)linux.intel.com> intel_th: pci: Add Jasper Lake PCH support Alexander Shishkin <alexander.shishkin(a)linux.intel.com> intel_th: pci: Add Comet Lake PCH support Dan Carpenter <dan.carpenter(a)oracle.com> netfilter: ipset: Fix an error code in ip_set_sockfn_get() Lukas Wunner <lukas(a)wunner.de> netfilter: nf_tables: Align nft_expr private data to 64-bit Ondrej Jirman <megous(a)megous.com> ARM: sunxi: Fix CPU powerdown on A83T Andreas Klinger <ak(a)it-klinger.de> iio: srf04: fix wrong limitation in distance measuring Alexandru Ardelean <alexandru.ardelean(a)analog.com> iio: imu: adis16480: make sure provided frequency is positive Fabrice Gasnier <fabrice.gasnier(a)st.com> iio: adc: stm32-adc: fix stopping dma Al Viro <viro(a)zeniv.linux.org.uk> ceph: add missing check in d_revalidate snapdir handling Luis Henriques <lhenriques(a)suse.com> ceph: fix use-after-free in __ceph_remove_cap() Catalin Marinas <catalin.marinas(a)arm.com> arm64: Do not mask out PTE_RDONLY in pte_same() Bard Liao <yung-chuan.liao(a)linux.intel.com> soundwire: bus: set initial value to port_status Michal Suchanek <msuchanek(a)suse.de> soundwire: depend on ACPI Jason Gerecke <killertofu(a)gmail.com> HID: wacom: generic: Treat serial number and related fields as unsigned Alex Deucher <alexander.deucher(a)amd.com> drm/radeon: fix si_enable_smc_cac() failed issue Jiri Olsa <jolsa(a)kernel.org> perf tools: Fix time sorting Shuah Khan <skhan(a)linuxfoundation.org> tools: gpio: Use !building_out_of_srctree to determine srctree Kevin Hao <haokexin(a)gmail.com> dump_stack: avoid the livelock of the dump_lock Michal Hocko <mhocko(a)suse.com> mm, vmstat: hide /proc/pagetypeinfo from normal users Yang Shi <yang.shi(a)linux.alibaba.com> mm: thp: handle page cache THP correctly in PageTransCompoundMap Mel Gorman <mgorman(a)techsingularity.net> mm, meminit: recalculate pcpu batch and high limits after init completes Johannes Weiner <hannes(a)cmpxchg.org> mm: memcontrol: fix network errors from failing __GFP_ATOMIC charges Takashi Iwai <tiwai(a)suse.de> ALSA: hda/ca0132 - Fix possible workqueue stall Takashi Sakamoto <o-takashi(a)sakamocchi.jp> ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series Takashi Iwai <tiwai(a)suse.de> ALSA: timer: Fix incorrectly assigned timer instance Salil Mehta <salil.mehta(a)huawei.com> net: hns: Fix the stray netpoll locks causing deadlock in NAPI path Eric Dumazet <edumazet(a)google.com> ipv6: fixes rt6_probe() and fib6_nh->last_probe init Claudiu Manoil <claudiu.manoil(a)nxp.com> net: mscc: ocelot: fix NULL pointer on LAG slave removal Claudiu Manoil <claudiu.manoil(a)nxp.com> net: mscc: ocelot: don't handle netdev events for other netdevs Manish Chopra <manishc(a)marvell.com> qede: fix NULL pointer deref in __qede_remove() Pan Bian <bianpan2016(a)163.com> NFC: st21nfca: fix double free Pan Bian <bianpan2016(a)163.com> nfc: netlink: fix double device reference drop Pan Bian <bianpan2016(a)163.com> NFC: fdp: fix incorrect free object Aleksander Morgado <aleksander(a)aleksander.es> net: usb: qmi_wwan: add support for DW5821e with eSIM support Sean Tranchetti <stranche(a)codeaurora.org> net: qualcomm: rmnet: Fix potential UAF when unregistering Eric Dumazet <edumazet(a)google.com> net: fix data-race in neigh_event_send() Alexander Sverdlin <alexander.sverdlin(a)nokia.com> net: ethernet: octeon_mgmt: Account for second possible VLAN header David Ahern <dsahern(a)kernel.org> ipv4: Fix table id reference in fib_sync_down_addr Oliver Neukum <oneukum(a)suse.com> CDC-NCM: handle incomplete transfer of MTU Jay Vosburgh <jay.vosburgh(a)canonical.com> bonding: fix state transition issue in link monitoring ------------- Diffstat: Documentation/scheduler/sched-bwc.txt | 45 ++ Makefile | 4 +- arch/arm/mach-sunxi/mc_smp.c | 6 +- arch/arm64/include/asm/pgtable.h | 17 - arch/x86/events/amd/ibs.c | 8 +- arch/x86/events/intel/uncore.c | 44 +- arch/x86/events/intel/uncore.h | 12 - arch/x86/kernel/apic/apic.c | 28 +- block/blk-cgroup.c | 13 +- drivers/dma/sprd-dma.c | 15 + drivers/dma/xilinx/xilinx_dma.c | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 24 +- drivers/gpu/drm/radeon/si_dpm.c | 1 + drivers/hid/hid-google-hammer.c | 4 + drivers/hid/hid-ids.h | 2 + drivers/hid/intel-ish-hid/ishtp/client-buffers.c | 2 +- drivers/hid/wacom.h | 15 + drivers/hid/wacom_wac.c | 10 +- drivers/hwtracing/intel_th/pci.c | 10 + drivers/iio/adc/stm32-adc.c | 4 +- drivers/iio/imu/adis16480.c | 5 +- drivers/iio/imu/inv_mpu6050/Kconfig | 8 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 40 ++ drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 10 + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 15 +- drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 12 +- drivers/iio/proximity/srf04.c | 29 +- drivers/infiniband/core/uverbs.h | 2 +- drivers/infiniband/hw/cxgb4/cm.c | 30 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 6 +- drivers/infiniband/hw/mlx5/qp.c | 8 +- drivers/infiniband/hw/qedr/main.c | 2 +- drivers/iommu/amd_iommu_quirks.c | 13 + drivers/net/bonding/bond_main.c | 47 +- drivers/net/can/c_can/c_can.c | 25 +- drivers/net/can/c_can/c_can.h | 1 + drivers/net/can/dev.c | 1 + drivers/net/can/flexcan.c | 1 + drivers/net/can/rx-offload.c | 6 +- drivers/net/can/usb/gs_usb.c | 1 + drivers/net/can/usb/mcba_usb.c | 3 +- drivers/net/can/usb/peak_usb/pcan_usb.c | 17 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/can/usb/usb_8dev.c | 3 +- drivers/net/ethernet/arc/emac_rockchip.c | 3 + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 1 - drivers/net/ethernet/hisilicon/hns/hnae.c | 1 - drivers/net/ethernet/hisilicon/hns/hnae.h | 3 - drivers/net/ethernet/hisilicon/hns/hns_enet.c | 22 +- drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 7 +- drivers/net/ethernet/intel/igb/igb_main.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 5 +- .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 4 +- drivers/net/ethernet/mscc/ocelot.c | 20 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 12 +- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 4 +- drivers/net/fjes/fjes_main.c | 15 +- drivers/net/hyperv/netvsc_drv.c | 9 +- drivers/net/macsec.c | 4 - drivers/net/usb/cdc_ncm.c | 6 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/nfc/fdp/i2c.c | 2 +- drivers/nfc/st21nfca/core.c | 1 + drivers/nvme/host/multipath.c | 2 +- drivers/pci/controller/pci-tegra.c | 7 +- drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- drivers/pinctrl/intel/pinctrl-intel.c | 21 +- drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- drivers/scsi/qla2xxx/qla_bsg.c | 6 +- drivers/scsi/qla2xxx/qla_mbx.c | 3 +- drivers/scsi/qla2xxx/qla_os.c | 4 + drivers/soundwire/Kconfig | 1 + drivers/soundwire/bus.c | 2 +- drivers/usb/core/config.c | 5 + drivers/usb/dwc3/core.c | 3 +- drivers/usb/dwc3/dwc3-pci.c | 2 +- drivers/usb/dwc3/gadget.c | 6 + drivers/usb/gadget/composite.c | 4 + drivers/usb/gadget/configfs.c | 110 +++- drivers/usb/gadget/udc/atmel_usba_udc.c | 6 +- drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- drivers/usb/misc/ldusb.c | 7 +- drivers/usb/usbip/stub.h | 7 +- drivers/usb/usbip/stub_main.c | 57 +- drivers/usb/usbip/stub_rx.c | 204 +++++-- drivers/usb/usbip/stub_tx.c | 99 +++- drivers/usb/usbip/usbip_common.c | 59 +- drivers/usb/usbip/vhci_hcd.c | 16 +- drivers/usb/usbip/vhci_rx.c | 3 + drivers/usb/usbip/vhci_tx.c | 66 ++- fs/ceph/caps.c | 10 +- fs/ceph/inode.c | 1 + fs/cifs/smb2pdu.h | 1 + fs/configfs/configfs_internal.h | 15 +- fs/configfs/dir.c | 137 +++-- fs/configfs/file.c | 280 ++++----- fs/configfs/symlink.c | 33 +- fs/fs-writeback.c | 9 +- fs/nfs/delegation.c | 10 + fs/nfs/delegation.h | 1 + fs/nfs/nfs4proc.c | 7 +- fs/ocfs2/file.c | 134 +++-- include/linux/mm.h | 5 - include/linux/mm_types.h | 5 + include/linux/page-flags.h | 20 +- include/net/bonding.h | 3 +- include/net/ip_vs.h | 1 + include/net/neighbour.h | 4 +- include/net/netfilter/nf_tables.h | 3 +- include/rdma/ib_verbs.h | 2 +- kernel/sched/fair.c | 91 +-- kernel/sched/sched.h | 4 - lib/dump_stack.c | 7 +- mm/filemap.c | 3 +- mm/memcontrol.c | 9 + mm/page_alloc.c | 10 +- mm/vmstat.c | 2 +- net/ipv4/fib_semantics.c | 2 +- net/ipv6/route.c | 13 +- net/netfilter/ipset/ip_set_core.c | 8 +- net/netfilter/ipvs/ip_vs_app.c | 12 +- net/netfilter/ipvs/ip_vs_ctl.c | 29 +- net/netfilter/ipvs/ip_vs_pe.c | 3 +- net/netfilter/ipvs/ip_vs_sched.c | 3 +- net/netfilter/ipvs/ip_vs_sync.c | 13 +- net/netfilter/nf_flow_table_core.c | 3 +- net/nfc/netlink.c | 2 - net/openvswitch/vport-internal_dev.c | 11 +- sound/core/timer.c | 6 +- sound/firewire/bebob/bebob_focusrite.c | 3 + sound/pci/hda/patch_ca0132.c | 2 +- sound/usb/Makefile | 3 +- sound/usb/clock.c | 14 +- sound/usb/helper.h | 4 + sound/usb/mixer.c | 633 +++++++++------------ sound/usb/power.c | 2 + sound/usb/quirks.c | 3 + sound/usb/stream.c | 25 +- sound/usb/validate.c | 332 +++++++++++ tools/gpio/Makefile | 6 +- tools/perf/util/hist.c | 2 +- tools/usb/usbip/libsrc/usbip_device_driver.c | 6 +- 145 files changed, 2224 insertions(+), 1124 deletions(-)

5 years, 11 months

12
141
0 0

[PATCH 1/3] drm/nouveau/kms/nv50-: Call outp_atomic_check_view() before handling PBN

by Lyude Paul

Since nv50_outp_atomic_check_view() can set crtc_state->mode_changed, we probably should be calling it before handling any PBN changes. Just a precaution. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 232c9eec417a ("drm/nouveau: Use atomic VCPI helpers for MST") Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: David Airlie <airlied(a)redhat.com> Cc: Jerry Zuo <Jerry.Zuo(a)amd.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Juston Li <juston.li(a)intel.com> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: <stable(a)vger.kernel.org> # v5.1+ --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 44 ++++++++++++++----------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 549486f1d937..6327aaf37c08 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -770,32 +770,36 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, struct nv50_mstm *mstm = mstc->mstm; struct nv50_head_atom *asyh = nv50_head_atom(crtc_state); int slots; + int ret; - if (crtc_state->mode_changed || crtc_state->connectors_changed) { - /* - * When restoring duplicated states, we need to make sure that - * the bw remains the same and avoid recalculating it, as the - * connector's bpc may have changed after the state was - * duplicated - */ - if (!state->duplicated) { - const int bpp = connector->display_info.bpc * 3; - const int clock = crtc_state->adjusted_mode.clock; + ret = nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, + mstc->native); + if (ret) + return ret; - asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp); - } + if (!crtc_state->mode_changed && !crtc_state->connectors_changed) + return 0; - slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, - mstc->port, - asyh->dp.pbn); - if (slots < 0) - return slots; + /* + * When restoring duplicated states, we need to make sure that the bw + * remains the same and avoid recalculating it, as the connector's bpc + * may have changed after the state was duplicated + */ + if (!state->duplicated) { + const int bpp = connector->display_info.bpc * 3; + const int clock = crtc_state->adjusted_mode.clock; - asyh->dp.tu = slots; + asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp); } - return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, - mstc->native); + slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, mstc->port, + asyh->dp.pbn); + if (slots < 0) + return slots; + + asyh->dp.tu = slots; + + return 0; } static void -- 2.21.0

5 years, 11 months

2
1
0 0

[PATCH 3/3] drm/nouveau/kms/nv50-: Limit MST BPC to 8

by Lyude Paul

Noticed this while working on some unrelated CRC stuff. Currently, userspace has very little support for BPCs higher than 8. While this doesn't matter for most things, on MST topologies we need to be careful about ensuring that we do our best to make any given display configuration fit within the bandwidth restraints of the topology, since otherwise less people's monitor configurations will work. Allowing for BPC settings higher than 8 dramatically increases the required bandwidth for displays in most configurations, and consequently makes it a lot less likely that said display configurations will pass the atomic check. In the future we want to fix this correctly by making it so that we adjust the bpp for each display in a topology to be as high as possible, while making sure to lower the bpp of each display in the event that we run out of bandwidth and need to rerun our atomic check. But for now, follow the behavior that both i915 and amdgpu are sticking to. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 232c9eec417a ("drm/nouveau: Use atomic VCPI helpers for MST") Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: David Airlie <airlied(a)redhat.com> Cc: Jerry Zuo <Jerry.Zuo(a)amd.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Juston Li <juston.li(a)intel.com> Cc: Sam Ravnborg <sam(a)ravnborg.org> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: <stable(a)vger.kernel.org> # v5.1+ --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 93665aecce57..9ac47fe519f8 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -798,7 +798,14 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, if (!state->duplicated) { const int clock = crtc_state->adjusted_mode.clock; - asyh->or.bpc = connector->display_info.bpc; + /* + * XXX: Since we don't use HDR in userspace quite yet, limit + * the bpc to 8 to save bandwidth on the topology. In the + * future, we'll want to properly fix this by dynamically + * selecting the highest possible bpc that would fit in the + * topology + */ + asyh->or.bpc = min(connector->display_info.bpc, 8U); asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, asyh->or.bpc * 3); } -- 2.21.0

5 years, 11 months

2
1
0 0

[PATCH 2/3] drm/nouveau/kms/nv50-: Store the bpc we're using in nv50_head_atom

by Lyude Paul

In order to be able to use bpc values that are different from what the connector reports, we want to be able to store the bpc value we decide on using for an atomic state in nv50_head_atom and refer to that instead of simply using the value that the connector reports throughout the whole atomic check phase and commit phase. This will let us (eventually) implement the max bpc connector property, and will also be needed for limiting the bpc we use on MST displays to 8 in the next commit. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 232c9eec417a ("drm/nouveau: Use atomic VCPI helpers for MST") Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: David Airlie <airlied(a)redhat.com> Cc: Jerry Zuo <Jerry.Zuo(a)amd.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Juston Li <juston.li(a)intel.com> Cc: Sean Paul <seanpaul(a)chromium.org> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: <stable(a)vger.kernel.org> # v5.1+ --- drivers/gpu/drm/nouveau/dispnv50/atom.h | 1 + drivers/gpu/drm/nouveau/dispnv50/disp.c | 57 ++++++++++++++----------- drivers/gpu/drm/nouveau/dispnv50/head.c | 5 +-- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/atom.h b/drivers/gpu/drm/nouveau/dispnv50/atom.h index 43df86c38f58..24f7700768da 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/atom.h +++ b/drivers/gpu/drm/nouveau/dispnv50/atom.h @@ -114,6 +114,7 @@ struct nv50_head_atom { u8 nhsync:1; u8 nvsync:1; u8 depth:4; + u8 bpc; } or; /* Currently only used for MST */ diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 6327aaf37c08..93665aecce57 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -353,10 +353,20 @@ nv50_outp_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) { - struct nouveau_connector *nv_connector = - nouveau_connector(conn_state->connector); - return nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, - nv_connector->native_mode); + struct drm_connector *connector = conn_state->connector; + struct nouveau_connector *nv_connector = nouveau_connector(connector); + struct nv50_head_atom *asyh = nv50_head_atom(crtc_state); + int ret; + + ret = nv50_outp_atomic_check_view(encoder, crtc_state, conn_state, + nv_connector->native_mode); + if (ret) + return ret; + + if (crtc_state->mode_changed || crtc_state->connectors_changed) + asyh->or.bpc = connector->display_info.bpc; + + return 0; } /****************************************************************************** @@ -786,10 +796,10 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, * may have changed after the state was duplicated */ if (!state->duplicated) { - const int bpp = connector->display_info.bpc * 3; const int clock = crtc_state->adjusted_mode.clock; - asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, bpp); + asyh->or.bpc = connector->display_info.bpc; + asyh->dp.pbn = drm_dp_calc_pbn_mode(clock, asyh->or.bpc * 3); } slots = drm_dp_atomic_find_vcpi_slots(state, &mstm->mgr, mstc->port, @@ -802,6 +812,17 @@ nv50_msto_atomic_check(struct drm_encoder *encoder, return 0; } +static u8 +nv50_dp_bpc_to_depth(unsigned int bpc) +{ + switch (bpc) { + case 6: return 0x2; + case 8: return 0x5; + case 10: /* fall-through */ + default: return 0x6; + } +} + static void nv50_msto_enable(struct drm_encoder *encoder) { @@ -812,7 +833,7 @@ nv50_msto_enable(struct drm_encoder *encoder) struct nv50_mstm *mstm = NULL; struct drm_connector *connector; struct drm_connector_list_iter conn_iter; - u8 proto, depth; + u8 proto; bool r; drm_connector_list_iter_begin(encoder->dev, &conn_iter); @@ -841,14 +862,8 @@ nv50_msto_enable(struct drm_encoder *encoder) else proto = 0x9; - switch (mstc->connector.display_info.bpc) { - case 6: depth = 0x2; break; - case 8: depth = 0x5; break; - case 10: - default: depth = 0x6; break; - } - - mstm->outp->update(mstm->outp, head->base.index, armh, proto, depth); + mstm->outp->update(mstm->outp, head->base.index, armh, proto, + nv50_dp_bpc_to_depth(armh->or.bpc)); msto->head = head; msto->mstc = mstc; @@ -1502,20 +1517,14 @@ nv50_sor_enable(struct drm_encoder *encoder) lvds.lvds.script |= 0x0200; } - if (nv_connector->base.display_info.bpc == 8) + if (asyh->or.bpc == 8) lvds.lvds.script |= 0x0200; } nvif_mthd(&disp->disp->object, 0, &lvds, sizeof(lvds)); break; case DCB_OUTPUT_DP: - if (nv_connector->base.display_info.bpc == 6) - depth = 0x2; - else - if (nv_connector->base.display_info.bpc == 8) - depth = 0x5; - else - depth = 0x6; + depth = nv50_dp_bpc_to_depth(asyh->or.bpc); if (nv_encoder->link & 1) proto = 0x8; @@ -1666,7 +1675,7 @@ nv50_pior_enable(struct drm_encoder *encoder) nv50_outp_acquire(nv_encoder); nv_connector = nouveau_encoder_connector_get(nv_encoder); - switch (nv_connector->base.display_info.bpc) { + switch (asyh->or.bpc) { case 10: asyh->or.depth = 0x6; break; case 8: asyh->or.depth = 0x5; break; case 6: asyh->or.depth = 0x2; break; diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c index 71c23bf1fe25..c9692df2b76c 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.c +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c @@ -81,18 +81,17 @@ nv50_head_atomic_check_dither(struct nv50_head_atom *armh, struct nv50_head_atom *asyh, struct nouveau_conn_atom *asyc) { - struct drm_connector *connector = asyc->state.connector; u32 mode = 0x00; if (asyc->dither.mode == DITHERING_MODE_AUTO) { - if (asyh->base.depth > connector->display_info.bpc * 3) + if (asyh->base.depth > asyh->or.bpc * 3) mode = DITHERING_MODE_DYNAMIC2X2; } else { mode = asyc->dither.mode; } if (asyc->dither.depth == DITHERING_DEPTH_AUTO) { - if (connector->display_info.bpc >= 8) + if (asyh->or.bpc >= 8) mode |= DITHERING_DEPTH_8BPC; } else { mode |= asyc->dither.depth; -- 2.21.0

5 years, 11 months

2
1
0 0

[PATCH 4.14] memfd: Use radix_tree_deref_slot_protected to avoid the warning.

by zhong jiang

The commit 391d4ee568b5 ("memfd: Fix locking when tagging pins") introduces the following warning messages. *WARNING: suspicious RCU usage in memfd_wait_for_pins* It is because we still use radix_tree_deref_slot without read_rcu_lock. We should use radix_tree_deref_slot_protected instead in the case. Cc: stable(a)vger.kernel.org Fixes: 391d4ee568b5 ("memfd: Fix locking when tagging pins") Signed-off-by: zhong jiang <zhongjiang(a)huawei.com> --- mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/shmem.c b/mm/shmem.c index 5b2cc9f9b1f1..e55aa460a2c0 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2664,7 +2664,7 @@ static void shmem_tag_pins(struct address_space *mapping) spin_lock_irq(&mapping->tree_lock); radix_tree_for_each_slot(slot, &mapping->page_tree, &iter, start) { - page = radix_tree_deref_slot(slot); + page = radix_tree_deref_slot_protected(slot, &mapping->tree_lock); if (!page || radix_tree_exception(page)) { if (radix_tree_deref_retry(page)) { slot = radix_tree_iter_retry(&iter); -- 2.20.1

5 years, 11 months

2
7
0 0

patch "serial: ifx6x60: add missed pm_runtime_disable" added to tty-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled serial: ifx6x60: add missed pm_runtime_disable to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the tty-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 50b2b571c5f3df721fc81bf9a12c521dfbe019ba Mon Sep 17 00:00:00 2001 From: Chuhong Yuan <hslester96(a)gmail.com> Date: Mon, 18 Nov 2019 10:48:33 +0800 Subject: serial: ifx6x60: add missed pm_runtime_disable The driver forgets to call pm_runtime_disable in remove. Add the missed calls to fix it. Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20191118024833.21587-1-hslester96@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/ifx6x60.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index ffefd218761e..31033d517e82 100644 --- a/drivers/tty/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c @@ -1230,6 +1230,9 @@ static int ifx_spi_spi_remove(struct spi_device *spi) struct ifx_spi_device *ifx_dev = spi_get_drvdata(spi); /* stop activity */ tasklet_kill(&ifx_dev->io_work_tasklet); + + pm_runtime_disable(&spi->dev); + /* free irq */ free_irq(gpio_to_irq(ifx_dev->gpio.reset_out), ifx_dev); free_irq(gpio_to_irq(ifx_dev->gpio.srdy), ifx_dev); -- 2.24.0

5 years, 11 months

1
0
0 0

patch "serial: pl011: Fix DMA ->flush_buffer()" added to tty-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled serial: pl011: Fix DMA ->flush_buffer() to my tty git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git in the tty-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the tty-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From f6a196477184b99a31d16366a8e826558aa11f6d Mon Sep 17 00:00:00 2001 From: Vincent Whitchurch <vincent.whitchurch(a)axis.com> Date: Mon, 18 Nov 2019 10:25:47 +0100 Subject: serial: pl011: Fix DMA ->flush_buffer() PL011's ->flush_buffer() implementation releases and reacquires the port lock. Due to a race condition here, data can end up being added to the circular buffer but neither being discarded nor being sent out. This leads to, for example, tcdrain(2) waiting indefinitely. Process A Process B uart_flush_buffer() - acquire lock - circ_clear - pl011_flush_buffer() -- release lock -- dmaengine_terminate_all() uart_write() - acquire lock - add chars to circ buffer - start_tx() -- start DMA - release lock -- acquire lock -- turn off DMA -- release lock // Data in circ buffer but DMA is off According to the comment in the code, the releasing of the lock around dmaengine_terminate_all() is to avoid a deadlock with the DMA engine callback. However, since the time this code was written, the DMA engine API documentation seems to have been clarified to say that dmaengine_terminate_all() (in the identically implemented but differently named dmaengine_terminate_async() variant) does not wait for any running complete callback to be completed and can even be called from a complete callback. So there is no possibility of deadlock if the DMA engine driver implements this API correctly. So we should be able to just remove this release and reacquire of the lock to prevent the aforementioned race condition. Signed-off-by: Vincent Whitchurch <vincent.whitchurch(a)axis.com> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20191118092547.32135-1-vincent.whitchurch@axis.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/tty/serial/amba-pl011.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 38e2d25f7e23..4b28134d596a 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -813,10 +813,8 @@ __acquires(&uap->port.lock) if (!uap->using_tx_dma) return; - /* Avoid deadlock with the DMA engine callback */ - spin_unlock(&uap->port.lock); - dmaengine_terminate_all(uap->dmatx.chan); - spin_lock(&uap->port.lock); + dmaengine_terminate_async(uap->dmatx.chan); + if (uap->dmatx.queued) { dma_unmap_sg(uap->dmatx.chan->device->dev, &uap->dmatx.sg, 1, DMA_TO_DEVICE); -- 2.24.0

5 years, 11 months

1
0
0 0

patch "USB: documentation: flags on usb-storage versus UAS" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: documentation: flags on usb-storage versus UAS to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 65cc8bf99349f651a0a2cee69333525fe581f306 Mon Sep 17 00:00:00 2001 From: Oliver Neukum <oneukum(a)suse.com> Date: Thu, 14 Nov 2019 12:27:58 +0100 Subject: USB: documentation: flags on usb-storage versus UAS Document which flags work storage, UAS or both Signed-off-by: Oliver Neukum <oneukum(a)suse.com> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20191114112758.32747-4-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- .../admin-guide/kernel-parameters.txt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a84a83f8881e..a02b1799a756 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4998,13 +4998,13 @@ Flags is a set of characters, each corresponding to a common usb-storage quirk flag as follows: a = SANE_SENSE (collect more than 18 bytes - of sense data); + of sense data, not on uas); b = BAD_SENSE (don't collect more than 18 - bytes of sense data); + bytes of sense data, not on uas); c = FIX_CAPACITY (decrease the reported device capacity by one sector); d = NO_READ_DISC_INFO (don't use - READ_DISC_INFO command); + READ_DISC_INFO command, not on uas); e = NO_READ_CAPACITY_16 (don't use READ_CAPACITY_16 command); f = NO_REPORT_OPCODES (don't use report opcodes @@ -5019,17 +5019,18 @@ j = NO_REPORT_LUNS (don't use report luns command, uas only); l = NOT_LOCKABLE (don't try to lock and - unlock ejectable media); + unlock ejectable media, not on uas); m = MAX_SECTORS_64 (don't transfer more - than 64 sectors = 32 KB at a time); + than 64 sectors = 32 KB at a time, + not on uas); n = INITIAL_READ10 (force a retry of the - initial READ(10) command); + initial READ(10) command, not on uas); o = CAPACITY_OK (accept the capacity - reported by the device); + reported by the device, not on uas); p = WRITE_CACHE (the device cache is ON - by default); + by default, not on uas); r = IGNORE_RESIDUE (the device reports - bogus residue values); + bogus residue values, not on uas); s = SINGLE_LUN (the device has only one Logical Unit); t = NO_ATA_1X (don't allow ATA(12) and ATA(16) @@ -5038,7 +5039,8 @@ w = NO_WP_DETECT (don't test whether the medium is write-protected). y = ALWAYS_SYNC (issue a SYNCHRONIZE_CACHE - even if the device claims no cache) + even if the device claims no cache, + not on uas) Example: quirks=0419:aaf5:rl,0421:0433:rc user_debug= [KNL,ARM] -- 2.24.0

5 years, 11 months

1
0
0 0

patch "USB: uas: heed CAPACITY_HEURISTICS" added to usb-testing

by gregkh＠linuxfoundation.org

This is a note to let you know that I've just added the patch titled USB: uas: heed CAPACITY_HEURISTICS to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f Mon Sep 17 00:00:00 2001 From: Oliver Neukum <oneukum(a)suse.com> Date: Thu, 14 Nov 2019 12:27:57 +0100 Subject: USB: uas: heed CAPACITY_HEURISTICS There is no need to ignore this flag. We should be as close to storage in that regard as makes sense, so honor flags whose cost is tiny. Signed-off-by: Oliver Neukum <oneukum(a)suse.com> Cc: stable <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/20191114112758.32747-3-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/usb/storage/uas.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index def2d4aba549..475b9c692827 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -837,6 +837,12 @@ static int uas_slave_configure(struct scsi_device *sdev) if (devinfo->flags & US_FL_FIX_CAPACITY) sdev->fix_capacity = 1; + /* + * in some cases we have to guess + */ + if (devinfo->flags & US_FL_CAPACITY_HEURISTICS) + sdev->guess_capacity = 1; + /* * Some devices don't like MODE SENSE with page=0x3f, * which is the command used for checking if a device -- 2.24.0

5 years, 11 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror