Linux 5.6.6
Greg KH
maintainerI'm announcing the release of the 5.6.6 kernel.
All users of the 5.6 kernel series must upgrade.
The updated 5.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.6.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/dts/imx7-colibri.dtsi | 9 + arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts | 1 arch/arm64/kernel/vdso.c | 13 -- arch/x86/include/asm/microcode_amd.h | 2 arch/x86/kernel/cpu/resctrl/core.c | 2 arch/x86/kernel/cpu/resctrl/internal.h | 1 arch/x86/kernel/cpu/resctrl/rdtgroup.c | 16 ++ drivers/acpi/ec.c | 6 drivers/acpi/nfit/core.c | 10 - drivers/acpi/nfit/nfit.h | 1 drivers/clk/at91/clk-usb.c | 2 drivers/clk/at91/sam9x60.c | 5 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 drivers/gpu/drm/i915/i915_perf.c | 65 +--------- drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c | 3 drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c | 16 ++ drivers/hid/hid-lg-g15.c | 6 drivers/i2c/busses/i2c-designware-platdrv.c | 14 +- drivers/irqchip/irq-ti-sci-inta.c | 3 drivers/net/dsa/mt7530.c | 103 +--------------- drivers/net/dsa/mt7530.h | 17 +- drivers/net/dsa/ocelot/felix.c | 5 drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 +++ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 8 + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 drivers/net/ethernet/mellanox/mlx5/core/en.h | 7 - drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 10 - drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 49 +++++-- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 drivers/net/ethernet/mscc/ocelot.c | 84 ++++++------- drivers/net/ethernet/mscc/ocelot.h | 2 drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 11 + drivers/net/macsec.c | 2 drivers/net/phy/marvell.c | 46 +++---- drivers/net/phy/micrel.c | 2 drivers/net/tun.c | 3 drivers/net/wireless/mac80211_hwsim.c | 12 - drivers/platform/chrome/cros_ec_rpmsg.c | 16 ++ drivers/pwm/pwm-pca9685.c | 85 +++++++------ drivers/scsi/ufs/ufshcd.c | 5 drivers/target/iscsi/iscsi_target.c | 3 drivers/usb/dwc3/gadget.c | 4 fs/btrfs/relocation.c | 4 fs/ext4/extents.c | 8 - fs/ext4/super.c | 6 fs/jbd2/commit.c | 7 - fs/overlayfs/inode.c | 4 fs/proc/base.c | 14 ++ include/net/ip6_route.h | 1 include/soc/mscc/ocelot.h | 4 kernel/rcu/tree.c | 2 kernel/time/namespace.c | 15 ++ kernel/trace/trace_events_trigger.c | 10 - net/bpfilter/main.c | 1 net/core/dev.c | 3 net/hsr/hsr_netlink.c | 10 + net/ipv4/devinet.c | 13 +- net/ipv6/icmp.c | 21 +++ net/l2tp/l2tp_netlink.c | 16 +- net/mac80211/main.c | 24 ++- net/qrtr/qrtr.c | 7 - net/wireless/nl80211.c | 6 security/keys/proc.c | 2 sound/hda/Kconfig | 7 - sound/pci/hda/patch_realtek.c | 1 sound/soc/intel/atom/sst-atom-controls.c | 2 sound/soc/intel/atom/sst/sst_pci.c | 2 sound/usb/mixer.c | 31 ++-- sound/usb/mixer_maps.c | 4 tools/perf/builtin-report.c | 9 - 77 files changed, 512 insertions(+), 431 deletions(-)
Adam Barber (1):
ALSA: hda/realtek - Enable the headset mic on Asus FX505DT
Alex Deucher (1):
drm/amdgpu/gfx9: add gfxoff quirk
Amir Goldstein (1):
ovl: fix value of i_ino for lower hardlink corner case
Andrei Vagin (1):
proc, time/namespace: Show clock symbolic names in /proc/pid/timens_offsets
Angus Ainslie (Purism) (1):
arm64: dts: librem5-devkit: add a vbus supply to usb0
Ashutosh Dixit (1):
drm/i915/perf: Do not clear pollin for small user read buffers
Atsushi Nemoto (1):
net: phy: micrel: use genphy_read_status for KSZ9131
Ben Skeggs (1):
drm/nouveau/sec2/gv100-: add missing MODULE_FIRMWARE()
Bruno Meneguele (1):
net/bpfilter: remove superfluous testing message
Can Guo (1):
scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
Claudiu Beznea (2):
clk: at91: sam9x60: fix usb clock parents
clk: at91: usb: use proper usbs_mask
Clemens Gruber (1):
net: phy: marvell: Fix pause frame negotiation
Colin Ian King (2):
ASoC: Intel: mrfld: fix incorrect check on p->sink
ASoC: Intel: mrfld: return error codes when an error occurs
DENG Qingfang (1):
net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
Dan Carpenter (1):
acpi/nfit: improve bounds checking for 'func'
Dmytro Linkin (1):
net/mlx5e: Fix nest_level for vlan pop action
Eran Ben Elisha (1):
net/mlx5e: Add missing release firmware call
Florian Fainelli (1):
net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes
Gilberto Bertin (1):
net: tun: record RX queue in skb before do_xdp_generic()
Greg Kroah-Hartman (2):
Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()" Linux 5.6.6
Grygorii Strashko (1):
irqchip/ti-sci-inta: Fix processing of masked irqs
Hans de Goede (2):
HID: lg-g15: Do not fail the probe when we fail to disable F# emulation
i2c: designware: platdrv: Remove DPM_FLAG_SMART_SUSPEND flag on BYT and CHT
James Morse (1):
x86/resctrl: Preserve CDP enable over CPU hotplug
Jan Kara (1):
ext4: do not zeroout extents beyond i_disksize
Jin Yao (1):
perf report: Fix no branch type statistics report issue
Johannes Berg (1):
nl80211: fix NL80211_ATTR_FTM_RESPONDER policy
John Allen (1):
x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE
Jose Abreu (1):
net: stmmac: xgmac: Fix VLAN register handling
Josef Bacik (1):
btrfs: check commit root generation in should_ignore_root
Josh Triplett (2):
ext4: fix incorrect group count in ext4_fill_super error message
ext4: fix incorrect inodes per group in error message
Konstantin Khlebnikov (1):
net: revert default NAPI poll timeout to 2 jiffies
Mark Rutland (1):
arm64: vdso: don't free unallocated pages
Maurizio Lombardi (1):
scsi: target: iscsi: calling iscsit_stop_session() inside iscsit_close_session() has no effect
Maxim Mikityanskiy (3):
net/mlx5e: Encapsulate updating netdev queues into a function net/mlx5e: Rename hw_modify to preactivate net/mlx5e: Use preactivate hook to set the indirection table
Michael Weiß (1):
l2tp: Allow management of tunnels and session in user namespace
Moshe Shemesh (1):
net/mlx5: Fix frequent ioread PCI access during recovery
Oleksandr Suvorov (1):
ARM: dts: imx7-colibri: fix muxing of usbc_det pin
Parav Pandit (1):
net/mlx5e: Fix pfnum in devlink port attribute
Paul E. McKenney (1):
rcu: Don't acquire lock in NMI handler in rcu_nmi_enter_common()
Pi-Hsun Shih (1):
platform/chrome: cros_ec_rpmsg: Fix race with host event
Prike Liang (1):
drm/amdgpu: fix the hw hang during perform system reboot and reset
Reinette Chatre (1):
x86/resctrl: Fix invalid attempt at removing the default resource group
René van Dorst (2):
net: dsa: mt7530: move mt7623 settings out off the mt7530
net: ethernet: mediatek: move mt7623 settings out off the mt7530
Sebastian Andrzej Siewior (1):
amd-xgbe: Use __napi_schedule() in BH context
Sergei Lopatin (1):
drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled
Sumit Garg (1):
mac80211: fix race in ieee80211_register_hw()
Sven Van Asbroeck (1):
pwm: pca9685: Fix PWM/GPIO inter-operation
Taehee Yoo (2):
hsr: check protocol version in hsr_newlink()
net: macsec: fix using wrong structure in macsec_changelink()
Takashi Iwai (5):
ALSA: hda: Allow setting preallocation again for x86
ALSA: usb-audio: Filter error from connector kctl ops, too
ALSA: usb-audio: Don't override ignore_ctl_error value from the map
ALSA: usb-audio: Don't create jack controls for PCM terminals
ALSA: usb-audio: Check mapping at creating connector controls, too
Taras Chornyi (1):
net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin
Thinh Nguyen (1):
usb: dwc3: gadget: Don't clear flags before transfer ended
Tim Stallard (2):
net: ipv6: do not consider routes via gateways for anycast address check
net: icmp6: do not select saddr from iif when route has prefsrc set
Tuomas Tynkkynen (1):
mac80211_hwsim: Use kstrndup() in place of kasprintf()
Vasily Averin (1):
keys: Fix proc_keys_next to increase position index
Vladimir Oltean (1):
net: mscc: ocelot: fix untagged packet drops when enslaving to vlan aware bridge
Wang Wenhu (1):
net: qrtr: send msgs from local of same id as broadcast
Xiao Yang (1):
tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation
zhangyi (F) (1):
jbd2: improve comments about freeing data buffers whose page mapping is NULL
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 6 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = NAME = Kleptomaniac Octopus
arch/arm/boot/dts/imx7-colibri.dtsi +7 -2
@@ -345,7 +345,7 @@ &usdhc3 { &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4 - &pinctrl_gpio7>; + &pinctrl_gpio7 &pinctrl_usbc_det>; pinctrl_gpio1: gpio1-grp { fsl,pins = <
@@ -450,7 +450,6 @@ MX7D_PAD_SD1_RESET_B__GPIO5_IO2 0X14 /* SODIMM 73 */ pinctrl_enet1: enet1grp { fsl,pins = < - MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14 MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x73 MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 0x73 MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 0x73
@@ -648,6 +647,12 @@ MX7D_PAD_UART3_RX_DATA__UART3_DTE_TX 0x79 >; }; + pinctrl_usbc_det: gpio-usbc-det { + fsl,pins = < + MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14 + >; + }; + pinctrl_usbh_reg: gpio-usbh-vbus { fsl,pins = < MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */
arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dts +1 -0
@@ -750,6 +750,7 @@ &uart4 { /* BT */ }; &usb3_phy0 { + vbus-supply = <®_5v_p>; status = "okay"; };
arch/arm64/kernel/vdso.c +1 -12
@@ -260,18 +260,7 @@ static int __aarch32_alloc_vdso_pages(void)if (ret)return ret; - ret =aarch32_alloc_kuser_vdso_page (); -if (ret) { -unsigned long c_vvar = - (unsigned long )page_to_virt (aarch32_vdso_pages[C_VVAR ]); -unsigned long c_vdso = - (unsigned long )page_to_virt (aarch32_vdso_pages[C_VDSO ]); - -free_page (c_vvar); -free_page (c_vdso); - } - - return ret; + return aarch32_alloc_kuser_vdso_page(); }#else static int __aarch32_alloc_vdso_pages (void )
arch/x86/include/asm/microcode_amd.h +1 -1
@@ -41,7 +41,7 @@ struct microcode_amd {unsigned int mpb[0 ]; }; -#define PATCH_MAX_SIZE PAGE_SIZE +#define PATCH_MAX_SIZE (3 * PAGE_SIZE)#ifdef CONFIG_MICROCODE_AMD extern void __init load_ucode_amd_bsp (unsigned int family);
arch/x86/kernel/cpu/resctrl/core.c +2 -0
@@ -578,6 +578,8 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) d->id = id;cpumask_set_cpu (cpu, &d->cpu_mask); +rdt_domain_reconfigure_cdp (r); +if (r->alloc_capable &&domain_setup_ctrlval (r, d)) {kfree (d);return ;
arch/x86/kernel/cpu/resctrl/internal.h +1 -0
@@ -601,5 +601,6 @@ bool has_busy_rmid(struct rdt_resource *r, struct rdt_domain *d);void __check_limbo (struct rdt_domain *d,bool force_free);bool cbm_validate_intel (char *buf,u32 *data,struct rdt_resource *r);bool cbm_validate_amd (char *buf,u32 *data,struct rdt_resource *r); +void rdt_domain_reconfigure_cdp (struct rdt_resource *r);#endif /* _ASM_X86_RESCTRL_INTERNAL_H */
arch/x86/kernel/cpu/resctrl/rdtgroup.c +15 -1
@@ -1859,6 +1859,19 @@ static int set_cache_qos_cfg(int level, bool enable)return 0 ; } +/* Restore the qos cfg state when a domain comes online */ +void rdt_domain_reconfigure_cdp (struct rdt_resource *r) +{ +if (!r->alloc_capable) +return ; + +if (r == &rdt_resources_all[RDT_RESOURCE_L2DATA ]) +l2_qos_cfg_update (&r->alloc_enabled); + +if (r == &rdt_resources_all[RDT_RESOURCE_L3DATA ]) +l3_qos_cfg_update (&r->alloc_enabled); +} +/* * Enable or disable the MBA software controller * which helps user specify bandwidth in MBps.
@@ -3072,7 +3085,8 @@ static int rdtgroup_rmdir(struct kernfs_node *kn)* If the rdtgroup is a mon group and parent directory * is a valid "mon_groups" directory, remove the mon group. */ -if (rdtgrp->type ==RDTCTRL_GROUP && parent_kn == rdtgroup_default.kn) { +if (rdtgrp->type ==RDTCTRL_GROUP && parent_kn == rdtgroup_default.kn && + rdtgrp != &rdtgroup_default) {if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { ret =rdtgroup_ctrl_remove (kn, rdtgrp);
drivers/acpi/ec.c +2 -4
@@ -1646,6 +1646,7 @@ static int acpi_ec_add(struct acpi_device *device)if (boot_ec && ec->command_addr == boot_ec->command_addr && ec->data_addr == boot_ec->data_addr) { + boot_ec_is_ecdt = false;/* * Trust PNP0C09 namespace location rather than * ECDT ID. But trust ECDT GPE rather than _GPE
@@ -1665,12 +1666,9 @@ static int acpi_ec_add(struct acpi_device *device)if (ec == boot_ec)acpi_handle_info (boot_ec->handle, -"Boot %s EC initialization complete\n" , +"Boot %s EC used to handle transactions and events\n" , boot_ec_is_ecdt ?"ECDT" :"DSDT" ); -acpi_handle_info (ec->handle, -"EC: Used to handle transactions and events\n" ); - device->driver_data = ec; ret = !!request_region (ec->data_addr,1 ,"EC data" );
drivers/acpi/nfit/core.c +6 -4
@@ -360,7 +360,7 @@ static union acpi_object *acpi_label_info(acpi_handle handle)static u8 nfit_dsm_revid (unsigned family,unsigned func) { -static const u8 revid_table[NVDIMM_FAMILY_MAX +1 ][32 ] = { +static const u8 revid_table[NVDIMM_FAMILY_MAX +1 ][NVDIMM_CMD_MAX +1 ] = { [NVDIMM_FAMILY_INTEL ] = { [NVDIMM_INTEL_GET_MODES ] =2 , [NVDIMM_INTEL_GET_FWINFO ] =2 ,
@@ -386,7 +386,7 @@ static u8 nfit_dsm_revid(unsigned family, unsigned func)if (family >NVDIMM_FAMILY_MAX )return 0 ; -if (func >31 ) +if (func >NVDIMM_CMD_MAX )return 0 ; id = revid_table[family][func];if (id ==0 )
@@ -492,7 +492,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc, struct nvdimm *nvdimm,* Check for a valid command. For ND_CMD_CALL, we also have to * make sure that the DSM function is supported. */ -if (cmd ==ND_CMD_CALL && !test_bit (func, &dsm_mask)) +if (cmd ==ND_CMD_CALL && + (func >NVDIMM_CMD_MAX || !test_bit (func, &dsm_mask)))return -ENOTTY ;else if (!test_bit (cmd, &cmd_mask))return -ENOTTY ;
@@ -3492,7 +3493,8 @@ static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,if (nvdimm && cmd ==ND_CMD_CALL && call_pkg->nd_family ==NVDIMM_FAMILY_INTEL ) { func = call_pkg->nd_command; -if ((1 << func) &NVDIMM_INTEL_SECURITY_CMDMASK ) +if (func >NVDIMM_CMD_MAX || + (1 << func) &NVDIMM_INTEL_SECURITY_CMDMASK )return -EOPNOTSUPP ; }
drivers/acpi/nfit/nfit.h +1 -0
@@ -34,6 +34,7 @@ | ACPI_NFIT_MEM_NOT_ARMED | ACPI_NFIT_MEM_MAP_FAILED)#define NVDIMM_FAMILY_MAX NVDIMM_FAMILY_HYPERV +#define NVDIMM_CMD_MAX 31#define NVDIMM_STANDARD_CMDMASK \ (1 << ND_CMD_SMART | 1 << ND_CMD_SMART_THRESHOLD | 1 << ND_CMD_DIMM_FLAGS \
drivers/clk/at91/clk-usb.c +1 -1
@@ -211,7 +211,7 @@ _at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name, usb->hw.init = &init; usb->regmap = regmap; - usb->usbs_mask =SAM9X5_USBS_MASK ; + usb->usbs_mask = usbs_mask; hw = &usb->hw; ret =clk_hw_register (NULL , &usb->hw);
drivers/clk/at91/sam9x60.c +2 -3
@@ -237,9 +237,8 @@ static void __init sam9x60_pmc_setup(struct device_node *np) parent_names[0 ] ="pllack" ; parent_names[1 ] ="upllck" ; - parent_names[2 ] ="mainck" ; - parent_names[3 ] ="mainck" ; - hw =sam9x60_clk_register_usb (regmap,"usbck" , parent_names,4 ); + parent_names[2 ] ="main_osc" ; + hw =sam9x60_clk_register_usb (regmap,"usbck" , parent_names,3 );if (IS_ERR (hw)) goto err_free;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2 -0
@@ -2285,6 +2285,8 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) {int i, r; +amdgpu_device_set_pg_state (adev,AMD_PG_STATE_UNGATE ); +amdgpu_device_set_cg_state (adev,AMD_CG_STATE_UNGATE );for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) {if (!adev->ip_blocks[i].status.valid)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -0
@@ -1175,6 +1175,8 @@ struct amdgpu_gfxoff_quirk {static const struct amdgpu_gfxoff_quirk amdgpu_gfxoff_quirk_list[] = {/* https://bugzilla.kernel.org/show_bug.cgi?id=204689 */ {0x1002 ,0x15dd ,0x1002 ,0x15dd ,0xc8 }, +/* https://bugzilla.kernel.org/show_bug.cgi?id=207171 */ + {0x1002 ,0x15dd ,0x103c ,0x83e7 ,0xd3 }, {0 ,0 ,0 ,0 ,0 }, };
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +4 -1
@@ -3804,9 +3804,12 @@ static int smu7_trim_single_dpm_states(struct pp_hwmgr *hwmgr, {uint32_t i; +/* force the trim if mclk_switching is disabled to prevent flicker */ +bool force_trim = (low_limit == high_limit);for (i =0 ; i < dpm_table->count; i++) {/*skip the trim if od is enabled*/ -if (!hwmgr->od_enabled && (dpm_table->dpm_levels[i].value < low_limit +if ((!hwmgr->od_enabled || force_trim) + && (dpm_table->dpm_levels[i].value < low_limit || dpm_table->dpm_levels[i].value > high_limit)) dpm_table->dpm_levels[i].enabled = false;else
drivers/gpu/drm/i915/i915_perf.c +11 -54
95 lines not on this page · raw message
drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c +3 -0
@@ -25,6 +25,9 @@MODULE_FIRMWARE ("nvidia/gp108/sec2/desc.bin" );MODULE_FIRMWARE ("nvidia/gp108/sec2/image.bin" );MODULE_FIRMWARE ("nvidia/gp108/sec2/sig.bin" ); +MODULE_FIRMWARE ("nvidia/gv100/sec2/desc.bin" ); +MODULE_FIRMWARE ("nvidia/gv100/sec2/image.bin" ); +MODULE_FIRMWARE ("nvidia/gv100/sec2/sig.bin" );static const struct nvkm_sec2_fwif gp108_sec2_fwif[] = {
drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c +16 -0
@@ -56,6 +56,22 @@ tu102_sec2_nofw(struct nvkm_sec2 *sec2, int ver,return 0 ; } +MODULE_FIRMWARE ("nvidia/tu102/sec2/desc.bin" ); +MODULE_FIRMWARE ("nvidia/tu102/sec2/image.bin" ); +MODULE_FIRMWARE ("nvidia/tu102/sec2/sig.bin" ); +MODULE_FIRMWARE ("nvidia/tu104/sec2/desc.bin" ); +MODULE_FIRMWARE ("nvidia/tu104/sec2/image.bin" ); +MODULE_FIRMWARE ("nvidia/tu104/sec2/sig.bin" ); +MODULE_FIRMWARE ("nvidia/tu106/sec2/desc.bin" ); +MODULE_FIRMWARE ("nvidia/tu106/sec2/image.bin" ); +MODULE_FIRMWARE ("nvidia/tu106/sec2/sig.bin" ); +MODULE_FIRMWARE ("nvidia/tu116/sec2/desc.bin" ); +MODULE_FIRMWARE ("nvidia/tu116/sec2/image.bin" ); +MODULE_FIRMWARE ("nvidia/tu116/sec2/sig.bin" ); +MODULE_FIRMWARE ("nvidia/tu117/sec2/desc.bin" ); +MODULE_FIRMWARE ("nvidia/tu117/sec2/image.bin" ); +MODULE_FIRMWARE ("nvidia/tu117/sec2/sig.bin" ); +static const struct nvkm_sec2_fwif tu102_sec2_fwif[] = { {0 , gp102_sec2_load, &tu102_sec2, &gp102_sec2_acr_1 },
drivers/hid/hid-lg-g15.c +4 -2
@@ -803,8 +803,10 @@ static int lg_g15_probe(struct hid_device *hdev, const struct hid_device_id *id) }if (ret <0 ) { -hid_err (hdev,"Error disabling keyboard emulation for the G-keys\n" ); - goto error_hw_stop; +hid_err (hdev,"Error %d disabling keyboard emulation for the G-keys, falling back to generic hid-input driver\n" , + ret); +hid_set_drvdata (hdev,NULL ); +return 0 ; }/* Get initial brightness levels */
drivers/i2c/busses/i2c-designware-platdrv.c +10 -4
@@ -371,10 +371,16 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) adap->dev.of_node = pdev->dev.of_node; adap->nr =-1 ; -dev_pm_set_driver_flags (&pdev->dev, -DPM_FLAG_SMART_PREPARE | -DPM_FLAG_SMART_SUSPEND | -DPM_FLAG_LEAVE_SUSPENDED ); +if (dev->flags &ACCESS_NO_IRQ_SUSPEND ) { +dev_pm_set_driver_flags (&pdev->dev, +DPM_FLAG_SMART_PREPARE | +DPM_FLAG_LEAVE_SUSPENDED ); + }else { +dev_pm_set_driver_flags (&pdev->dev, +DPM_FLAG_SMART_PREPARE | +DPM_FLAG_SMART_SUSPEND | +DPM_FLAG_LEAVE_SUSPENDED ); + }/* The code below assumes runtime PM to be disabled. */ WARN_ON (pm_runtime_enabled (&pdev->dev));
drivers/irqchip/irq-ti-sci-inta.c +2 -1
@@ -37,6 +37,7 @@#define VINT_ENABLE_SET_OFFSET 0x0#define VINT_ENABLE_CLR_OFFSET 0x8#define VINT_STATUS_OFFSET 0x18 +#define VINT_STATUS_MASKED_OFFSET 0x20/** * struct ti_sci_inta_event_desc - Description of an event coming to
@@ -116,7 +117,7 @@ static void ti_sci_inta_irq_handler(struct irq_desc *desc)chained_irq_enter (irq_desc_get_chip (desc), desc); val =readq_relaxed (inta->base + vint_desc->vint_id *0x1000 + -VINT_STATUS_OFFSET ); +VINT_STATUS_MASKED_OFFSET );for_each_set_bit (bit, &val,MAX_EVENTS_PER_VINT ) { virq =irq_find_mapping (domain, vint_desc->events[bit].hwirq);
drivers/net/dsa/mt7530.c +12 -91
151 lines not on this page · raw message
drivers/net/dsa/mt7530.h +7 -10
@@ -167,9 +167,16 @@ enum mt7530_port_mode {/* Register for port vlan control */ #define MT7530_PVC_P (x) (0x2010 + ((x) * 0x100))#define PORT_SPEC_TAG BIT(5) +#define PVC_EG_TAG (x) (((x) & 0x7) << 8) +#define PVC_EG_TAG_MASK PVC_EG_TAG(7)#define VLAN_ATTR (x) (((x) & 0x3) << 6)#define VLAN_ATTR_MASK VLAN_ATTR(3) +enum mt7530_vlan_port_eg_tag { +MT7530_VLAN_EG_DISABLED =0 , +MT7530_VLAN_EG_CONSISTENT =1 , +}; +enum mt7530_vlan_port_attr {MT7530_VLAN_USER =0 ,MT7530_VLAN_TRANSPARENT =3 ,
@@ -268,7 +275,6 @@ enum mt7530_vlan_port_attr {/* Registers for TRGMII on the both side */ #define MT7530_TRGMII_RCK_CTRL 0x7a00 -#define GSW_TRGMII_RCK_CTRL 0x300#define RX_RST BIT(31)#define RXC_DQSISEL BIT(30)#define DQSI1_TAP_MASK (0x7f << 8)
@@ -277,31 +283,24 @@ enum mt7530_vlan_port_attr {#define DQSI0_TAP (x) ((x) & 0x7f)#define MT7530_TRGMII_RCK_RTT 0x7a04 -#define GSW_TRGMII_RCK_RTT 0x304#define DQS1_GATE BIT(31)#define DQS0_GATE BIT(30)#define MT7530_TRGMII_RD (x) (0x7a10 + (x) * 8) -#define GSW_TRGMII_RD (x) (0x310 + (x) * 8)#define BSLIP_EN BIT(31)#define EDGE_CHK BIT(30)#define RD_TAP_MASK 0x7f#define RD_TAP (x) ((x) & 0x7f) -#define GSW_TRGMII_TXCTRL 0x340#define MT7530_TRGMII_TXCTRL 0x7a40#define TRAIN_TXEN BIT(31)#define TXC_INV BIT(30)#define TX_RST BIT(28)#define MT7530_TRGMII_TD_ODT (i) (0x7a54 + 8 * (i)) -#define GSW_TRGMII_TD_ODT (i) (0x354 + 8 * (i))#define TD_DM_DRVP (x) ((x) & 0xf)#define TD_DM_DRVN (x) (((x) & 0xf) << 4) -#define GSW_INTF_MODE 0x390 -#define INTF_MODE_TRGMII BIT(1) -#define MT7530_TRGMII_TCK_CTRL 0x7a78#define TCK_TAP (x) (((x) & 0xf) << 8)
@@ -434,7 +433,6 @@ static const char *p5_intf_modes(unsigned int p5_interface)* @ds: The pointer to the dsa core structure * @bus: The bus used for the device and built-in PHY * @rstc: The pointer to reset control used by MCM -* @ethernet: The regmap used for access TRGMII-based registers * @core_pwr: The power supplied into the core * @io_pwr: The power supplied into the I/O * @reset: The descriptor for GPIO line tied to its reset pin
@@ -451,7 +449,6 @@ struct mt7530_priv {struct dsa_switch *ds;struct mii_bus *bus;struct reset_control *rstc; -struct regmap *ethernet;struct regulator *core_pwr;struct regulator *io_pwr;struct gpio_desc *reset;
drivers/net/dsa/ocelot/felix.c +1 -4
@@ -44,11 +44,8 @@ static int felix_fdb_add(struct dsa_switch *ds, int port, const unsigned char *addr, u16 vid) {struct ocelot *ocelot = ds->priv; -bool vlan_aware; - vlan_aware =dsa_port_is_vlan_filtering (dsa_to_port (ds, port)); - -return ocelot_fdb_add (ocelot, port, addr, vid, vlan_aware); +return ocelot_fdb_add (ocelot, port, addr, vid); } static int felix_fdb_del(struct dsa_switch *ds, int port,
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1 -1
@@ -514,7 +514,7 @@ static void xgbe_isr_task(unsigned long data)xgbe_disable_rx_tx_ints (pdata);/* Turn on polling */ -__napi_schedule_irqoff (&pdata->napi); +__napi_schedule (&pdata->napi); } }else {/* Don't clear Rx/Tx status if doing per channel DMA
drivers/net/ethernet/mediatek/mtk_eth_soc.c +23 -1
@@ -65,6 +65,17 @@ u32 mtk_r32(struct mtk_eth *eth, unsigned reg)return __raw_readl (eth->base + reg); } +u32 mtk_m32 (struct mtk_eth *eth,u32 mask,u32 set,unsigned reg) +{ +u32 val; + + val =mtk_r32 (eth, reg); + val &= ~mask; + val |= set; +mtk_w32 (eth, val, reg); +return reg; +} +static int mtk_mdio_busy_wait (struct mtk_eth *eth) {unsigned long t_start = jiffies;
@@ -193,7 +204,7 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode, struct mtk_mac *mac = container_of(config, struct mtk_mac, phylink_config);struct mtk_eth *eth = mac->hw; -u32 mcr_cur, mcr_new, sid; +u32 mcr_cur, mcr_new, sid, i;int val, ge_mode, err;/* MT76x8 has no hardware settings between for the MAC */
@@ -255,6 +266,17 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode, PHY_INTERFACE_MODE_TRGMII) mtk_gmac0_rgmii_adjust(mac->hw, state->speed); + +/* mt7623_pad_clk_setup */ +for (i =0 ; i <NUM_TRGMII_CTRL ; i++) +mtk_w32 (mac->hw, +TD_DM_DRVP (8 ) |TD_DM_DRVN (8 ), +TRGMII_TD_ODT (i)); + +/* Assert/release MT7623 RXC reset */ +mtk_m32 (mac->hw,0 ,RXC_RST |RXC_DQSISEL , +TRGMII_RCK_CTRL ); +mtk_m32 (mac->hw,RXC_RST ,0 ,TRGMII_RCK_CTRL ); } }
drivers/net/ethernet/mediatek/mtk_eth_soc.h +8 -0
@@ -352,10 +352,13 @@#define DQSI0 (x) ((x << 0) & GENMASK(6, 0))#define DQSI1 (x) ((x << 8) & GENMASK(14, 8))#define RXCTL_DMWTLAT (x) ((x << 16) & GENMASK(18, 16)) +#define RXC_RST BIT(31)#define RXC_DQSISEL BIT(30)#define RCK_CTRL_RGMII_1000 (RXC_DQSISEL | RXCTL_DMWTLAT(2) | DQSI1(16))#define RCK_CTRL_RGMII_10_100 RXCTL_DMWTLAT(2) +#define NUM_TRGMII_CTRL 5 +/* TRGMII RXC control register */ #define TRGMII_TCK_CTRL 0x10340#define TXCTL_DMWTLAT (x) ((x << 16) & GENMASK(18, 16))
@@ -363,6 +366,11 @@#define TCK_CTRL_RGMII_1000 TXCTL_DMWTLAT(2)#define TCK_CTRL_RGMII_10_100 (TXC_INV | TXCTL_DMWTLAT(2)) +/* TRGMII TX Drive Strength */ +#define TRGMII_TD_ODT (i) (0x10354 + 8 * (i)) +#define TD_DM_DRVP (x) ((x) & 0xf) +#define TD_DM_DRVN (x) (((x) & 0xf) << 4) +/* TRGMII Interface mode register */ #define INTF_MODE 0x10390#define TRGMII_INTF_DIS BIT(0)
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +4 -1
@@ -23,7 +23,10 @@ static int mlx5_devlink_flash_update(struct devlink *devlink,if (err)return err; -return mlx5_firmware_flash (dev, fw, extack); + err =mlx5_firmware_flash (dev, fw, extack); +release_firmware (fw); + +return err; }static u8 mlx5_fw_ver_major (u32 version)
drivers/net/ethernet/mellanox/mlx5/core/en.h +4 -3
@@ -1036,14 +1036,15 @@ int mlx5e_open_channels(struct mlx5e_priv *priv, struct mlx5e_channels *chs);void mlx5e_close_channels (struct mlx5e_channels *chs); -/* Function pointer to be used to modify WH settings while +/* Function pointer to be used to modify HW or kernel settings while * switching channels */ -typedef int (*mlx5e_fp_hw_modify )(struct mlx5e_priv *priv); +typedef int (*mlx5e_fp_preactivate )(struct mlx5e_priv *priv);int mlx5e_safe_reopen_channels (struct mlx5e_priv *priv);int mlx5e_safe_switch_channels (struct mlx5e_priv *priv,struct mlx5e_channels *new_chs, -mlx5e_fp_hw_modify hw_modify); +mlx5e_fp_preactivate preactivate); +int mlx5e_num_channels_changed (struct mlx5e_priv *priv);void mlx5e_activate_priv_channels (struct mlx5e_priv *priv);void mlx5e_deactivate_priv_channels (struct mlx5e_priv *priv);
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +2 -8
@@ -432,9 +432,7 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,if (!test_bit (MLX5E_STATE_OPENED , &priv->state)) { *cur_params = new_channels.params; -if (!netif_is_rxfh_configured (priv->netdev)) -mlx5e_build_default_indir_rqt (priv->rss_params.indirection_rqt, -MLX5E_INDIR_RQT_SIZE , count); +mlx5e_num_channels_changed (priv); goto out; }
@@ -442,12 +440,8 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,if (arfs_enabled)mlx5e_arfs_disable (priv); -if (!netif_is_rxfh_configured (priv->netdev)) -mlx5e_build_default_indir_rqt (priv->rss_params.indirection_rqt, -MLX5E_INDIR_RQT_SIZE , count); -/* Switch to new channels, set new parameters and close old ones */ - err =mlx5e_safe_switch_channels (priv, &new_channels,NULL ); + err =mlx5e_safe_switch_channels (priv, &new_channels, mlx5e_num_channels_changed);if (arfs_enabled) {int err2 =mlx5e_arfs_enable (priv);
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +34 -15
92 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +5 -4
@@ -1969,29 +1969,30 @@ static int register_devlink_port(struct mlx5_core_dev *dev,struct mlx5_eswitch_rep *rep = rpriv->rep;struct netdev_phys_item_id ppid = {};unsigned int dl_port_index =0 ; +u16 pfnum;if (!is_devlink_port_supported (dev, rpriv))return 0 ;mlx5e_rep_get_port_parent_id (rpriv->netdev, &ppid); + pfnum =PCI_FUNC (dev->pdev->devfn);if (rep->vport ==MLX5_VPORT_UPLINK ) {devlink_port_attrs_set (&rpriv->dl_port,DEVLINK_PORT_FLAVOUR_PHYSICAL , -PCI_FUNC (dev->pdev->devfn), false,0 , + pfnum, false,0 , &ppid.id[0 ], ppid.id_len); dl_port_index =vport_to_devlink_port_index (dev, rep->vport); }else if (rep->vport ==MLX5_VPORT_PF ) {devlink_port_attrs_pci_pf_set (&rpriv->dl_port, &ppid.id[0 ], ppid.id_len, - dev->pdev->devfn); + pfnum); dl_port_index = rep->vport; }else if (mlx5_eswitch_is_vf_vport (dev->priv.eswitch, rpriv->rep->vport)) {devlink_port_attrs_pci_vf_set (&rpriv->dl_port, &ppid.id[0 ], ppid.id_len, - dev->pdev->devfn, - rep->vport -1 ); + pfnum, rep->vport -1 ); dl_port_index =vport_to_devlink_port_index (dev, rep->vport); }
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +3 -2
@@ -3269,12 +3269,13 @@ static int add_vlan_pop_action(struct mlx5e_priv *priv,struct mlx5_esw_flow_attr *attr, u32 *action) { - int nest_level = attr->parse_attr->filter_dev->lower_level; struct flow_action_entry vlan_act = { .id =FLOW_ACTION_VLAN_POP , }; -int err =0 ; +int nest_level, err =0 ; + nest_level = attr->parse_attr->filter_dev->lower_level - + priv->netdev->lower_level;while (nest_level--) { err =parse_tc_vlan_action (priv, &vlan_act, attr, action);if (err)
drivers/net/ethernet/mellanox/mlx5/core/health.c +1 -1
@@ -243,7 +243,7 @@ void mlx5_error_sw_reset(struct mlx5_core_dev *dev)if (mlx5_get_nic_state (dev) ==MLX5_NIC_IFC_DISABLED )break ; -cond_resched (); +msleep (20 ); }while (!time_after (jiffies, end));if (mlx5_get_nic_state (dev) !=MLX5_NIC_IFC_DISABLED ) {
drivers/net/ethernet/mscc/ocelot.c +43 -41
152 lines not on this page · raw message
drivers/net/ethernet/mscc/ocelot.h +0 -2
@@ -66,8 +66,6 @@ struct ocelot_port_private {struct phy_device *phy;u8 chip_port; -u8 vlan_aware; -struct phy *serdes;struct ocelot_port_tc tc;
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c +2 -0
@@ -150,6 +150,8 @@ static int sun7i_gmac_probe(struct platform_device *pdev) plat_dat->init = sun7i_gmac_init; plat_dat->exit = sun7i_gmac_exit; plat_dat->fix_mac_speed = sun7i_fix_speed; + plat_dat->tx_fifo_size =4096 ; + plat_dat->rx_fifo_size =16384 ; ret =sun7i_gmac_init (pdev, plat_dat->bsp_priv);if (ret)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +11 -0
@@ -576,8 +576,13 @@ static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash, value |=XGMAC_VLAN_EDVLP ; value |=XGMAC_VLAN_ESVL ; value |=XGMAC_VLAN_DOVLTC ; + }else { + value &= ~XGMAC_VLAN_EDVLP ; + value &= ~XGMAC_VLAN_ESVL ; + value &= ~XGMAC_VLAN_DOVLTC ; } + value &= ~XGMAC_VLAN_VID ;writel (value, ioaddr +XGMAC_VLAN_TAG ); }else if (perfect_match) {u32 value =readl (ioaddr +XGMAC_PACKET_FILTER );
@@ -588,13 +593,19 @@ static void dwxgmac2_update_vlan_hash(struct mac_device_info *hw, u32 hash, value =readl (ioaddr +XGMAC_VLAN_TAG ); + value &= ~XGMAC_VLAN_VTHM ; value |=XGMAC_VLAN_ETV ;if (is_double) { value |=XGMAC_VLAN_EDVLP ; value |=XGMAC_VLAN_ESVL ; value |=XGMAC_VLAN_DOVLTC ; + }else { + value &= ~XGMAC_VLAN_EDVLP ; + value &= ~XGMAC_VLAN_ESVL ; + value &= ~XGMAC_VLAN_DOVLTC ; } + value &= ~XGMAC_VLAN_VID ;writel (value | perfect_match, ioaddr +XGMAC_VLAN_TAG ); }else {u32 value =readl (ioaddr +XGMAC_PACKET_FILTER );
drivers/net/macsec.c +1 -1
@@ -3463,7 +3463,7 @@ static int macsec_changelink(struct net_device *dev, struct nlattr *tb[], struct netlink_ext_ack *extack) {struct macsec_dev *macsec =macsec_priv (dev); -struct macsec_tx_sa tx_sc; +struct macsec_tx_sc tx_sc;struct macsec_secy secy;int ret;
drivers/net/phy/marvell.c +24 -22
58 lines not on this page · raw message
drivers/net/phy/micrel.c +1 -1
@@ -1154,7 +1154,7 @@ static struct phy_driver ksphy_driver[] = { .driver_data = &ksz9021_type, .probe = kszphy_probe, .config_init = ksz9131_config_init, - .read_status = ksz9031_read_status, + .read_status = genphy_read_status, .ack_interrupt = kszphy_ack_interrupt, .config_intr = kszphy_config_intr, .get_sset_count = kszphy_get_sset_count,
drivers/net/tun.c +2 -1
@@ -1925,6 +1925,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,skb_reset_network_header (skb);skb_probe_transport_header (skb); +skb_record_rx_queue (skb, tfile->queue_index);if (skb_xdp) {struct bpf_prog *xdp_prog;
@@ -2498,6 +2499,7 @@ static int tun_xdp_one(struct tun_struct *tun, skb->protocol =eth_type_trans (skb, tun->dev);skb_reset_network_header (skb);skb_probe_transport_header (skb); +skb_record_rx_queue (skb, tfile->queue_index);if (skb_xdp) { err =do_xdp_generic (xdp_prog, skb);
@@ -2509,7 +2511,6 @@ static int tun_xdp_one(struct tun_struct *tun, !tfile->detached) rxhash =__skb_get_hash_symmetric (skb); -skb_record_rx_queue (skb, tfile->queue_index);netif_receive_skb (skb);/* No need for get_cpu_ptr() here since this function is
drivers/net/wireless/mac80211_hwsim.c +6 -6
@@ -3600,9 +3600,9 @@ static int hwsim_new_radio_nl(struct sk_buff *msg, struct genl_info *info) }if (info->attrs[HWSIM_ATTR_RADIO_NAME ]) { - hwname =kasprintf (GFP_KERNEL ,"%.*s" , -nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), - (char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ])); + hwname =kstrndup ((char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +GFP_KERNEL );if (!hwname)return -ENOMEM ; param.hwname = hwname;
@@ -3622,9 +3622,9 @@ static int hwsim_del_radio_nl(struct sk_buff *msg, struct genl_info *info)if (info->attrs[HWSIM_ATTR_RADIO_ID ]) { idx =nla_get_u32 (info->attrs[HWSIM_ATTR_RADIO_ID ]); }else if (info->attrs[HWSIM_ATTR_RADIO_NAME ]) { - hwname =kasprintf (GFP_KERNEL ,"%.*s" , -nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), - (char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ])); + hwname =kstrndup ((char *)nla_data (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +nla_len (info->attrs[HWSIM_ATTR_RADIO_NAME ]), +GFP_KERNEL );if (!hwname)return -ENOMEM ; }else
drivers/platform/chrome/cros_ec_rpmsg.c +15 -1
@@ -44,6 +44,8 @@ struct cros_ec_rpmsg {struct completion xfer_ack;struct work_struct host_event_work;struct rpmsg_endpoint *ept; +bool has_pending_host_event; +bool probe_done; };/**
@@ -177,7 +179,14 @@ static int cros_ec_rpmsg_callback(struct rpmsg_device *rpdev, void *data,memcpy (ec_dev->din, resp->data, len);complete (&ec_rpmsg->xfer_ack); }else if (resp->type ==HOST_EVENT_MARK ) { -schedule_work (&ec_rpmsg->host_event_work); +/* +* If the host event is sent before cros_ec_register is +* finished, queue the host event. +*/ +if (ec_rpmsg->probe_done) +schedule_work (&ec_rpmsg->host_event_work); +else + ec_rpmsg->has_pending_host_event = true; }else {dev_warn (ec_dev->dev,"rpmsg received invalid type = %d" , resp->type);
@@ -240,6 +249,11 @@ static int cros_ec_rpmsg_probe(struct rpmsg_device *rpdev)return ret; } + ec_rpmsg->probe_done = true; + +if (ec_rpmsg->has_pending_host_event) +schedule_work (&ec_rpmsg->host_event_work); +return 0 ; }
drivers/pwm/pwm-pca9685.c +48 -37
144 lines not on this page · raw message
drivers/scsi/ufs/ufshcd.c +5 -0
@@ -1518,6 +1518,11 @@ int ufshcd_hold(struct ufs_hba *hba, bool async)*/ if (ufshcd_can_hibern8_during_gating (hba) &&ufshcd_is_link_hibern8 (hba)) { +if (async) { + rc = -EAGAIN ; + hba->clk_gating.active_reqs--; +break ; + }spin_unlock_irqrestore (hba->host->host_lock, flags);flush_work (&hba->clk_gating.ungate_work);spin_lock_irqsave (hba->host->host_lock, flags);
drivers/target/iscsi/iscsi_target.c +1 -2
@@ -4368,8 +4368,7 @@ int iscsit_close_session(struct iscsi_session *sess)* restart the timer and exit. */ if (!in_interrupt ()) { -if (iscsit_check_session_usage_count (sess) ==1 ) -iscsit_stop_session (sess,1 ,1 ); +iscsit_check_session_usage_count (sess); }else {if (iscsit_check_session_usage_count (sess) ==2 ) {atomic_set (&sess->session_logout,0 );
drivers/usb/dwc3/gadget.c +1 -3
@@ -2570,10 +2570,8 @@ static void dwc3_gadget_endpoint_transfer_in_progress(struct dwc3_ep *dep,dwc3_gadget_ep_cleanup_completed_requests (dep, event, status); -if (stop) { +if (stop)dwc3_stop_active_transfer (dep, true, true); - dep->flags =DWC3_EP_ENABLED ; - }/* * WORKAROUND: This is the 2nd half of U1/U2 -> U0 workaround.
fs/btrfs/relocation.c +2 -2
@@ -561,8 +561,8 @@ static int should_ignore_root(struct btrfs_root *root)if (!reloc_root)return 0 ; -if (btrfs_root_last_snapshot (&reloc_root->root_item) == - root->fs_info->running_transaction->transid -1 ) +if (btrfs_header_generation (reloc_root->commit_root) == + root->fs_info->running_transaction->transid)return 0 ;/* * if there is reloc tree and it was created in previous
fs/ext4/extents.c +4 -4
@@ -3532,8 +3532,8 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, (unsigned long long)map->m_lblk, map_len); sbi =EXT4_SB (inode->i_sb); - eof_block = (inode->i_size + inode->i_sb->s_blocksize -1 ) >> - inode->i_sb->s_blocksize_bits; + eof_block = (EXT4_I (inode)->i_disksize + inode->i_sb->s_blocksize -1 ) + >> inode->i_sb->s_blocksize_bits;if (eof_block < map->m_lblk + map_len) eof_block = map->m_lblk + map_len;
@@ -3785,8 +3785,8 @@ static int ext4_split_convert_extents(handle_t *handle, __func__, inode->i_ino, (unsigned long long)map->m_lblk, map->m_len); - eof_block = (inode->i_size + inode->i_sb->s_blocksize -1 ) >> - inode->i_sb->s_blocksize_bits; + eof_block = (EXT4_I (inode)->i_disksize + inode->i_sb->s_blocksize -1 ) + >> inode->i_sb->s_blocksize_bits;if (eof_block < map->m_lblk + map->m_len) eof_block = map->m_lblk + map->m_len;/*
fs/ext4/super.c +3 -3
@@ -4157,7 +4157,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)if (sbi->s_inodes_per_group < sbi->s_inodes_per_block || sbi->s_inodes_per_group > blocksize *8 ) {ext4_msg (sb,KERN_ERR ,"invalid inodes per group: %lu\n" , - sbi->s_blocks_per_group); + sbi->s_inodes_per_group); goto failed_mount; } sbi->s_itb_per_group = sbi->s_inodes_per_group /
@@ -4286,9 +4286,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) EXT4_BLOCKS_PER_GROUP(sb) - 1);do_div (blocks_count,EXT4_BLOCKS_PER_GROUP (sb));if (blocks_count > ((uint64_t )1 <<32 ) -EXT4_DESC_PER_BLOCK (sb)) { -ext4_msg (sb,KERN_WARNING ,"groups count too large: %u " +ext4_msg (sb,KERN_WARNING ,"groups count too large: %llu " "(block count %llu, first data block %u, " -"blocks per group %lu)" , sbi->s_groups_count, +"blocks per group %lu)" , blocks_count,ext4_blocks_count (es),le32_to_cpu (es->s_first_data_block),EXT4_BLOCKS_PER_GROUP (sb));
fs/jbd2/commit.c +4 -3
@@ -997,9 +997,10 @@ void jbd2_journal_commit_transaction(journal_t *journal)* journalled data) we need to unmap buffer and clear * more bits. We also need to be careful about the check * because the data page mapping can get cleared under -* out hands, which alse need not to clear more bits -* because the page and buffers will be freed and can -* never be reused once we are done with them. +* our hands. Note that if mapping == NULL, we don't +* need to make buffer unmapped because the page is +* already detached from the mapping and buffers cannot +* get reused. */ mapping =READ_ONCE (bh->b_page->mapping);if (mapping && !sb_is_blkdev_sb (mapping->host->i_sb)) {
fs/overlayfs/inode.c +3 -1
@@ -891,7 +891,7 @@ struct inode *ovl_get_inode(struct super_block *sb,struct dentry *lowerdentry = lowerpath ? lowerpath->dentry :NULL ;bool bylower =ovl_hash_bylower (sb, upperdentry, lowerdentry, oip->index); -int fsid = bylower ? oip->lowerpath->layer->fsid :0 ; +int fsid = bylower ? lowerpath->layer->fsid :0 ;bool is_dir, metacopy = false;unsigned long ino =0 ;int err = oip->newinode ? -EEXIST : -ENOMEM ;
@@ -941,6 +941,8 @@ struct inode *ovl_get_inode(struct super_block *sb, err = -ENOMEM ; goto out_err; } + ino = realinode->i_ino; + fsid = lowerpath->layer->fsid; }ovl_fill_inode (inode, realinode->i_mode, realinode->i_rdev, ino, fsid);ovl_inode_init (inode, upperdentry, lowerdentry, oip->lowerdata);
fs/proc/base.c +13 -1
@@ -1573,6 +1573,7 @@ static ssize_t timens_offsets_write(struct file *file, const char __user *buf, noffsets =0 ;for (pos = kbuf; pos; pos = next_line) {struct proc_timens_offset *off = &offsets[noffsets]; +char clock[10 ];int err;/* Find the end of line and ensure we don't look past it */
@@ -1584,10 +1585,21 @@ static ssize_t timens_offsets_write(struct file *file, const char __user *buf, next_line =NULL ; } - err =sscanf (pos,"%u %lld %lu" , &off->clockid, + err =sscanf (pos,"%9s %lld %lu" , clock, &off->val.tv_sec, &off->val.tv_nsec);if (err !=3 || off->val.tv_nsec >=NSEC_PER_SEC ) goto out; + + clock[sizeof (clock) -1 ] =0 ; +if (strcmp (clock,"monotonic" ) ==0 || +strcmp (clock,__stringify (CLOCK_MONOTONIC )) ==0 ) + off->clockid =CLOCK_MONOTONIC ; +else if (strcmp (clock,"boottime" ) ==0 || +strcmp (clock,__stringify (CLOCK_BOOTTIME )) ==0 ) + off->clockid =CLOCK_BOOTTIME ; +else + goto out; + noffsets++;if (noffsets ==ARRAY_SIZE (offsets)) {if (next_line)
include/net/ip6_route.h +1 -0
@@ -254,6 +254,7 @@ static inline bool ipv6_anycast_destination(const struct dst_entry *dst,return rt->rt6i_flags &RTF_ANYCAST || (rt->rt6i_dst.plen <127 && + !(rt->rt6i_flags & (RTF_GATEWAY |RTF_NONEXTHOP )) &&ipv6_addr_equal (&rt->rt6i_dst.addr, daddr)); }
include/soc/mscc/ocelot.h +3 -1
@@ -411,6 +411,8 @@ struct ocelot_port {void __iomem *regs; +bool vlan_aware; +/* Ingress default VLAN (pvid) */ u16 pvid;
@@ -529,7 +531,7 @@ int ocelot_port_bridge_leave(struct ocelot *ocelot, int port,int ocelot_fdb_dump (struct ocelot *ocelot,int port,dsa_fdb_dump_cb_t *cb,void *data);int ocelot_fdb_add (struct ocelot *ocelot,int port, -const unsigned char *addr,u16 vid,bool vlan_aware); +const unsigned char *addr,u16 vid);int ocelot_fdb_del (struct ocelot *ocelot,int port,const unsigned char *addr,u16 vid); int ocelot_vlan_add(struct ocelot *ocelot, int port, u16 vid, bool pvid,
kernel/rcu/tree.c +1 -1
@@ -816,7 +816,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq)rcu_cleanup_after_idle (); incby =1 ; - }else if (tick_nohz_full_cpu (rdp->cpu) && + }else if (irq &&tick_nohz_full_cpu (rdp->cpu) && rdp->dynticks_nmi_nesting ==DYNTICK_IRQ_NONIDLE &&READ_ONCE (rdp->rcu_urgent_qs) && !rdp->rcu_forced_tick) {raw_spin_lock_rcu_node (rdp->mynode);
kernel/time/namespace.c +14 -1
@@ -337,7 +337,20 @@ static struct user_namespace *timens_owner(struct ns_common *ns)static void show_offset (struct seq_file *m,int clockid,struct timespec64 *ts) { -seq_printf (m,"%d %lld %ld\n" , clockid, ts->tv_sec, ts->tv_nsec); +char *clock; + +switch (clockid) { +case CLOCK_BOOTTIME : + clock ="boottime" ; +break ; +case CLOCK_MONOTONIC : + clock ="monotonic" ; +break ; +default : + clock ="unknown" ; +break ; + } +seq_printf (m,"%-10s %10lld %9ld\n" , clock, ts->tv_sec, ts->tv_nsec); }void proc_timens_show_offsets (struct task_struct *p,struct seq_file *m)
kernel/trace/trace_events_trigger.c +3 -7
@@ -1088,14 +1088,10 @@ register_snapshot_trigger(char *glob, struct event_trigger_ops *ops, struct event_trigger_data *data, struct trace_event_file *file) { - int ret = register_trigger(glob, ops, data, file); - -if (ret >0 &&tracing_alloc_snapshot_instance (file->tr) !=0 ) { -unregister_trigger (glob, ops, data, file); - ret =0 ; - } + if (tracing_alloc_snapshot_instance(file->tr) != 0) + return 0; -return ret; + return register_trigger(glob, ops, data, file); } static int
net/bpfilter/main.c +0 -1
@@ -35,7 +35,6 @@ static void loop(void)struct mbox_reply reply;int n; -fprintf (debug_f,"testing the buffer\n" ); n =read (0 , &req,sizeof (req));if (n !=sizeof (req)) {fprintf (debug_f,"invalid request %d\n" , n);
net/core/dev.c +2 -1
@@ -4140,7 +4140,8 @@ EXPORT_SYMBOL(netdev_max_backlog);int netdev_tstamp_prequeue__read_mostly =1 ;int netdev_budget__read_mostly =300 ; -unsigned int __read_mostly netdev_budget_usecs =2000 ; +/* Must be at least 2 jiffes to guarantee 1 jiffy timeout */ +unsigned int __read_mostly netdev_budget_usecs =2 *USEC_PER_SEC /HZ ;int weight_p__read_mostly =64 ;/* old backlog weight */ int dev_weight_rx_bias__read_mostly =1 ;/* bias for backlog weight */ int dev_weight_tx_bias__read_mostly =1 ;/* bias for output_queue quota */
net/hsr/hsr_netlink.c +8 -2
@@ -61,10 +61,16 @@ static int hsr_newlink(struct net *src_net, struct net_device *dev,else multicast_spec =nla_get_u8 (data[IFLA_HSR_MULTICAST_SPEC ]); -if (!data[IFLA_HSR_VERSION ]) +if (!data[IFLA_HSR_VERSION ]) { hsr_version =0 ; -else + }else { hsr_version =nla_get_u8 (data[IFLA_HSR_VERSION ]); +if (hsr_version >1 ) { +NL_SET_ERR_MSG_MOD (extack, +"Only versions 0..1 are supported" ); +return -EINVAL ; + } + }return hsr_dev_finalize (dev, link, multicast_spec, hsr_version); }
net/ipv4/devinet.c +9 -4
@@ -614,12 +614,15 @@ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix,return NULL ; } -static int ip_mc_config (struct sock *sk,bool join,const struct in_ifaddr *ifa) +static int ip_mc_autojoin_config (struct net *net,bool join, +const struct in_ifaddr *ifa) { +#if defined(CONFIG_IP_MULTICAST )struct ip_mreqn mreq = { .imr_multiaddr.s_addr = ifa->ifa_address, .imr_ifindex = ifa->ifa_dev->dev->ifindex, }; +struct sock *sk = net->ipv4.mc_autojoin_sk;int ret;ASSERT_RTNL ();
@@ -632,6 +635,9 @@ static int ip_mc_config(struct sock *sk, bool join, const struct in_ifaddr *ifa)release_sock (sk);return ret; +#else +return -EOPNOTSUPP ; +#endif } static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -675,7 +681,7 @@ static int inet_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh,continue ;if (ipv4_is_multicast (ifa->ifa_address)) -ip_mc_config (net->ipv4.mc_autojoin_sk, false, ifa); +ip_mc_autojoin_config (net, false, ifa);__inet_del_ifa (in_dev, ifap,1 , nlh,NETLINK_CB (skb).portid);return 0 ; }
@@ -940,8 +946,7 @@ static int inet_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh,*/ set_ifa_lifetime (ifa, valid_lft, prefered_lft);if (ifa->ifa_flags &IFA_F_MCAUTOJOIN ) { -int ret =ip_mc_config (net->ipv4.mc_autojoin_sk, - true, ifa); +int ret =ip_mc_autojoin_config (net, true, ifa);if (ret <0 ) {inet_free_ifa (ifa);
net/ipv6/icmp.c +20 -1
@@ -229,6 +229,25 @@ static bool icmpv6_xrlim_allow(struct sock *sk, u8 type,return res; } +static bool icmpv6_rt_has_prefsrc (struct sock *sk,u8 type, +struct flowi6 *fl6) +{ +struct net *net =sock_net (sk); +struct dst_entry *dst; +bool res = false; + + dst =ip6_route_output (net, sk, fl6); +if (!dst->error) { +struct rt6_info *rt = (struct rt6_info *)dst; +struct in6_addr prefsrc; + +rt6_get_prefsrc (rt, &prefsrc); + res = !ipv6_addr_any (&prefsrc); + } +dst_release (dst); +return res; +} +/* * an inline helper for the "simple" if statement below * checks if parameter problem report is caused by an
@@ -527,7 +546,7 @@ static void icmp6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info, saddr = force_saddr;if (saddr) { fl6.saddr = *saddr; - }else { + }else if (!icmpv6_rt_has_prefsrc (sk, type, &fl6)) {/* select a more meaningful saddr from input if */ struct net_device *in_netdev;
net/l2tp/l2tp_netlink.c +8 -8
@@ -920,51 +920,51 @@ static const struct genl_ops l2tp_nl_ops[] = { .cmd = L2TP_CMD_TUNNEL_CREATE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_tunnel_create, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, { .cmd = L2TP_CMD_TUNNEL_DELETE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_tunnel_delete, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, { .cmd = L2TP_CMD_TUNNEL_MODIFY, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_tunnel_modify, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, { .cmd = L2TP_CMD_TUNNEL_GET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_tunnel_get, .dumpit = l2tp_nl_cmd_tunnel_dump, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, { .cmd = L2TP_CMD_SESSION_CREATE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_session_create, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, { .cmd = L2TP_CMD_SESSION_DELETE, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_session_delete, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, { .cmd = L2TP_CMD_SESSION_MODIFY, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_session_modify, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, { .cmd = L2TP_CMD_SESSION_GET, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = l2tp_nl_cmd_session_get, .dumpit = l2tp_nl_cmd_session_dump, - .flags = GENL_ADMIN_PERM, + .flags = GENL_UNS_ADMIN_PERM, }, };
net/mac80211/main.c +13 -11
@@ -1051,7 +1051,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) local->hw.wiphy->signal_type =CFG80211_SIGNAL_TYPE_UNSPEC ;if (hw->max_signal <=0 ) { result = -EINVAL ; - goto fail_wiphy_register; + goto fail_workqueue; } }
@@ -1113,7 +1113,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) result =ieee80211_init_cipher_suites (local);if (result <0 ) - goto fail_wiphy_register; + goto fail_workqueue;if (!local->ops->remain_on_channel) local->hw.wiphy->max_remain_on_channel_duration =5000 ;
@@ -1139,10 +1139,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) local->hw.wiphy->max_num_csa_counters =IEEE80211_MAX_CSA_COUNTERS_NUM ; - result =wiphy_register (local->hw.wiphy); -if (result <0 ) - goto fail_wiphy_register; -/* * We use the number of queues for feature tests (QoS, HT) internally * so restrict them appropriately.
@@ -1198,9 +1194,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) goto fail_flows;rtnl_lock (); - result =ieee80211_init_rate_ctrl_alg (local, hw->rate_control_algorithm); +rtnl_unlock ();if (result <0 ) {wiphy_debug (local->hw.wiphy,"Failed to initialize rate control algorithm\n" );
@@ -1254,6 +1250,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) local->sband_allocated |=BIT (band); } + result =wiphy_register (local->hw.wiphy); +if (result <0 ) + goto fail_wiphy_register; + +rtnl_lock (); +/* add one default STA interface if supported */ if (local->hw.wiphy->interface_modes &BIT (NL80211_IFTYPE_STATION ) && !ieee80211_hw_check (hw,NO_AUTO_VIF )) {
@@ -1293,17 +1295,17 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)#if defined(CONFIG_INET ) || defined(CONFIG_IPV6 ) fail_ifa:#endif +wiphy_unregister (local->hw.wiphy); + fail_wiphy_register:rtnl_lock ();rate_control_deinitialize (local);ieee80211_remove_interfaces (local); - fail_rate:rtnl_unlock (); + fail_rate: fail_flows:ieee80211_led_exit (local);destroy_workqueue (local->workqueue); fail_workqueue: -wiphy_unregister (local->hw.wiphy); - fail_wiphy_register:if (local->wiphy_ciphers_allocated)kfree (local->hw.wiphy->cipher_suites);kfree (local->int_scan_req);
@@ -1353,8 +1355,8 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)skb_queue_purge (&local->skb_queue_unreliable);skb_queue_purge (&local->skb_queue_tdls_chsw); -destroy_workqueue (local->workqueue);wiphy_unregister (local->hw.wiphy); +destroy_workqueue (local->workqueue);ieee80211_led_exit (local);kfree (local->int_scan_req); }
net/qrtr/qrtr.c +4 -3
@@ -907,20 +907,21 @@ static int qrtr_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) node =NULL ;if (addr->sq_node ==QRTR_NODE_BCAST ) { - enqueue_fn = qrtr_bcast_enqueue; -if (addr->sq_port !=QRTR_PORT_CTRL ) { +if (addr->sq_port !=QRTR_PORT_CTRL && + qrtr_local_nid !=QRTR_NODE_BCAST ) {release_sock (sk);return -ENOTCONN ; } + enqueue_fn = qrtr_bcast_enqueue; }else if (addr->sq_node == ipc->us.sq_node) { enqueue_fn = qrtr_local_enqueue; }else { - enqueue_fn = qrtr_node_enqueue; node =qrtr_node_lookup (addr->sq_node);if (!node) {release_sock (sk);return -ECONNRESET ; } + enqueue_fn = qrtr_node_enqueue; } plen = (len +3 ) & ~3 ;
net/wireless/nl80211.c +2 -4
@@ -619,10 +619,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { [NL80211_ATTR_HE_CAPABILITY] = { .type = NLA_BINARY, .len = NL80211_HE_MAX_CAPABILITY_LEN }, - [NL80211_ATTR_FTM_RESPONDER] = { - .type = NLA_NESTED, - .validation_data = nl80211_ftm_responder_policy, - }, + [NL80211_ATTR_FTM_RESPONDER ] = + NLA_POLICY_NESTED(nl80211_ftm_responder_policy), [NL80211_ATTR_TIMEOUT] = NLA_POLICY_MIN(NLA_U32, 1), [NL80211_ATTR_PEER_MEASUREMENTS ] = NLA_POLICY_NESTED(nl80211_pmsr_attr_policy),
security/keys/proc.c +2 -0
@@ -139,6 +139,8 @@ static void *proc_keys_next(struct seq_file *p, void *v, loff_t *_pos) n =key_serial_next (p, v);if (n) *_pos =key_node_serial (n); +else + (*_pos)++;return n; }
sound/hda/Kconfig +4 -3
@@ -21,16 +21,17 @@ config SND_HDA_EXT_CORE select SND_HDA_CORE config SND_HDA_PREALLOC_SIZE - int "Pre-allocated buffer size for HD-audio driver" if !SND_DMA_SGBUF + int "Pre-allocated buffer size for HD-audio driver" range 0 32768 - default 0 if SND_DMA_SGBUF + default 2048 if SND_DMA_SGBUF default 64 if !SND_DMA_SGBUF help Specifies the default pre-allocated buffer-size in kB for the HD-audio driver. A larger buffer (e.g. 2048) is preferred for systems using PulseAudio. The default 64 is chosen just for compatibility reasons. - On x86 systems, the default is zero as we need no preallocation. + On x86 systems, the default is 2048 as a reasonable value for + most of modern systems. Note that the pre-allocation size can be changed dynamically via a proc file (/proc/asound/card*/pcm*/sub*/prealloc), too.
sound/pci/hda/patch_realtek.c +1 -0
@@ -7253,6 +7253,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1043 ,0x16e3 ,"ASUS UX50" ,ALC269_FIXUP_STEREO_DMIC ),SND_PCI_QUIRK (0x1043 ,0x17d1 ,"ASUS UX431FL" ,ALC294_FIXUP_ASUS_DUAL_SPK ),SND_PCI_QUIRK (0x1043 ,0x18b1 ,"Asus MJ401TA" ,ALC256_FIXUP_ASUS_HEADSET_MIC ), +SND_PCI_QUIRK (0x1043 ,0x18f1 ,"Asus FX505DT" ,ALC256_FIXUP_ASUS_HEADSET_MIC ),SND_PCI_QUIRK (0x1043 ,0x19ce ,"ASUS B9450FA" ,ALC294_FIXUP_ASUS_HPE ),SND_PCI_QUIRK (0x1043 ,0x1a13 ,"Asus G73Jw" ,ALC269_FIXUP_ASUS_G73JW ), SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),
sound/soc/intel/atom/sst-atom-controls.c +1 -1
@@ -1333,7 +1333,7 @@ int sst_send_pipe_gains(struct snd_soc_dai *dai, int stream, int mute) dai->capture_widget->name); w = dai->capture_widget;snd_soc_dapm_widget_for_each_source_path (w, p) { -if (p->connected && !p->connected (w, p->sink)) +if (p->connected && !p->connected (w, p->source))continue ; if (p->connect && p->source->power &&
sound/soc/intel/atom/sst/sst_pci.c +1 -1
@@ -99,7 +99,7 @@ static int sst_platform_get_resources(struct intel_sst_drv *ctx)dev_dbg (ctx->dev,"DRAM Ptr %p\n" , ctx->dram); do_release_regions:pci_release_regions (pci); -return 0 ; +return ret; }/*
sound/usb/mixer.c +19 -12
@@ -1446,7 +1446,7 @@ static int mixer_ctl_connector_get(struct snd_kcontrol *kcontrol,usb_audio_err (chip,"cannot get connectors status: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n" ,UAC_GET_CUR , validx, idx, cval->val_type); -return ret; +return filter_error (cval, ret); } ucontrol->value.integer.value[0 ] = val;
@@ -1750,11 +1750,15 @@ static void get_connector_control_name(struct usb_mixer_interface *mixer,/* Build a mixer control for a UAC connector control (jack-detect) */ static void build_connector_control (struct usb_mixer_interface *mixer, +const struct usbmix_name_map *imap,struct usb_audio_term *term,bool is_input) {struct snd_kcontrol *kctl;struct usb_mixer_elem_info *cval; +if (check_ignored_ctl (find_map (imap, term->id,0 ))) +return ; + cval =kzalloc (sizeof (*cval),GFP_KERNEL );if (!cval)return ;
@@ -2088,8 +2092,9 @@ static int parse_audio_input_terminal(struct mixer_build *state, int unitid,check_input_term (state, term_id, &iterm);/* Check for jack detection. */ -if (uac_v2v3_control_is_readable (bmctls, control)) -build_connector_control (state->mixer, &iterm, true); +if ((iterm.type &0xff00 ) !=0x0100 && +uac_v2v3_control_is_readable (bmctls, control)) +build_connector_control (state->mixer, state->map, &iterm, true);return 0 ; }
@@ -3050,13 +3055,13 @@ static int snd_usb_mixer_controls_badd(struct usb_mixer_interface *mixer,memset (&iterm,0 ,sizeof (iterm)); iterm.id =UAC3_BADD_IT_ID4 ; iterm.type =UAC_BIDIR_TERMINAL_HEADSET ; -build_connector_control (mixer, &iterm, true); +build_connector_control (mixer, map->map, &iterm, true);/* Output Term - Insertion control */ memset (&oterm,0 ,sizeof (oterm)); oterm.id =UAC3_BADD_OT_ID3 ; oterm.type =UAC_BIDIR_TERMINAL_HEADSET ; -build_connector_control (mixer, &oterm, false); +build_connector_control (mixer, map->map, &oterm, false); }return 0 ;
@@ -3085,7 +3090,7 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if (map->id == state.chip->usb_id) { state.map = map->map; state.selector_map = map->selector_map; - mixer->ignore_ctl_error = map->ignore_ctl_error; + mixer->ignore_ctl_error |= map->ignore_ctl_error;break ; } }
@@ -3128,10 +3133,11 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if (err <0 && err != -EINVAL )return err; -if (uac_v2v3_control_is_readable (le16_to_cpu (desc->bmControls), +if ((state.oterm.type &0xff00 ) !=0x0100 && +uac_v2v3_control_is_readable (le16_to_cpu (desc->bmControls),UAC2_TE_CONNECTOR )) { -build_connector_control (state.mixer, &state.oterm, - false); +build_connector_control (state.mixer, state.map, + &state.oterm, false); } }else {/* UAC_VERSION_3 */ struct uac3_output_terminal_descriptor *desc = p;
@@ -3153,10 +3159,11 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)if (err <0 && err != -EINVAL )return err; -if (uac_v2v3_control_is_readable (le32_to_cpu (desc->bmControls), +if ((state.oterm.type &0xff00 ) !=0x0100 && +uac_v2v3_control_is_readable (le32_to_cpu (desc->bmControls),UAC3_TE_INSERTION )) { -build_connector_control (state.mixer, &state.oterm, - false); +build_connector_control (state.mixer, state.map, + &state.oterm, false); } } }
sound/usb/mixer_maps.c +3 -1
@@ -360,9 +360,11 @@ static const struct usbmix_name_map corsair_virtuoso_map[] = { };/* Some mobos shipped with a dummy HD-audio show the invalid GET_MIN/GET_MAX -* response for Input Gain Pad (id=19, control=12). Skip it. +* response for Input Gain Pad (id=19, control=12) and the connector status +* for SPDIF terminal (id=18). Skip them. */ static const struct usbmix_name_map asus_rog_map[] = { + {18 ,NULL },/* OT, connector control */ {19 ,NULL ,12 },/* FU, Input Gain Pad */ {} };
tools/perf/builtin-report.c +4 -5
@@ -185,24 +185,23 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter, {struct hist_entry *he = iter->he;struct report *rep = arg; -struct branch_info *bi; +struct branch_info *bi = he->branch_info;struct perf_sample *sample = iter->sample;struct evsel *evsel = iter->evsel;int err; +branch_type_count (&rep->brtype_stat, &bi->flags, + bi->from.addr, bi->to.addr); +if (!ui__has_annotation () && !rep->symbol_ipc)return 0 ; - bi = he->branch_info; err =addr_map_symbol__inc_samples (&bi->from, sample, evsel);if (err) goto out; err =addr_map_symbol__inc_samples (&bi->to, sample, evsel); -branch_type_count (&rep->brtype_stat, &bi->flags, - bi->from.addr, bi->to.addr); - out:return err; }