5.15.1-rc1 review
Greg Kroah-Hartman
maintainercover 5.15.1-rc1 review
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +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/v5.x/stable-review/patch-5.15.1-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.15.1-rc1
Takashi Iwai <[email protected]>
ALSA: usb-audio: Add quirk for Audient iD14
Matthew Brost <[email protected]>
Revert "drm/i915/gt: Propagate change in error status to children on unhold"
Anson Jacob <[email protected]>
drm/amd/display: Revert "Directly retrain link from debugfs"
Christian König <[email protected]>
drm/amdgpu: revert "Add autodump debugfs node for gpu reset v8"
Bryan O'Donoghue <[email protected]>
Revert "wcn36xx: Disable bmps when encryption is disabled"
Wang Kefeng <[email protected]>
ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
Lucas Stach <[email protected]>
Revert "soc: imx: gpcv2: move reset assert after requesting domain power up"
Yifan Zhang <[email protected]>
drm/amdkfd: fix boot failure when iommu is disabled in Picasso.
Greg Kroah-Hartman <[email protected]>
Revert "usb: core: hcd: Add support for deferring roothub registration"
Greg Kroah-Hartman <[email protected]>
Revert "xhci: Set HCD flag to defer primary roothub registration"
Dan Carpenter <[email protected]>
media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt()
Erik Ekman <[email protected]>
sfc: Fix reading non-legacy supported link modes
-------------
Diffstat:
Makefile | 4 +- drivers/amba/bus.c | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 80 ---------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 5 -- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 --- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 3 +- .../gpu/drm/i915/gt/intel_execlists_submission.c | 4 -- drivers/media/firewire/firedtv-avc.c | 14 +++- drivers/media/firewire/firedtv-ci.c | 2 + drivers/net/ethernet/sfc/ethtool_common.c | 10 +-- drivers/net/wireless/ath/wcn36xx/main.c | 10 --- drivers/net/wireless/ath/wcn36xx/pmc.c | 5 +- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 - drivers/soc/imx/gpcv2.c | 4 +- drivers/usb/core/hcd.c | 29 ++------ drivers/usb/host/xhci.c | 1 - include/linux/usb/hcd.h | 2 - sound/usb/quirks.c | 2 + 20 files changed, 33 insertions(+), 159 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/12 sfc: Fix reading non-legacy supported link modes
From: Erik Ekman <[email protected]>
commit 041c61488236a5a84789083e3d9f0a51139b6edf upstream.
Everything except the first 32 bits was lost when the pause flags were added. This makes the 50000baseCR2 mode flag (bit 34) not appear.
I have tested this with a 10G card (SFN5122F-R7) by modifying it to return a non-legacy link mode (10000baseCR).
--- drivers/net/ethernet/sfc/ethtool_common.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/net/ethernet/sfc/ethtool_common.c +2 -8
@@ -563,20 +563,14 @@ int efx_ethtool_get_link_ksettings(struc {struct efx_nic *efx =netdev_priv (net_dev);struct efx_link_state *link_state = &efx->link_state; -u32 supported;mutex_lock (&efx->mac_lock);efx_mcdi_phy_get_link_ksettings (efx, cmd);mutex_unlock (&efx->mac_lock);/* Both MACs support pause frames (bidirectional and respond-only) */ -ethtool_convert_link_mode_to_legacy_u32 (&supported, - cmd->link_modes.supported); - - supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause; - -ethtool_convert_legacy_u32_to_link_mode (cmd->link_modes.supported, - supported); +ethtool_link_ksettings_add_link_mode (cmd, supported, Pause); +ethtool_link_ksettings_add_link_mode (cmd, supported, Asym_Pause);if (LOOPBACK_INTERNAL (efx)) { cmd->base.speed = link_state->speed;
Greg Kroah-Hartman
maintainerPATCH 2/12 media: firewire: firedtv-avc: fix a buffer overflow in avc_ca_pmt()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
commit 35d2969ea3c7d32aee78066b1f3cf61a0d935a4e upstream.
The bounds checking in avc_ca_pmt() is not strict enough. It should be checking "read_pos + 4" because it's reading 5 bytes. If the "es_info_length" is non-zero then it reads a 6th byte so there needs to be an additional check for that.
I also added checks for the "write_pos". I don't think these are required because "read_pos" and "write_pos" are tied together so checking one ought to be enough. But they make the code easier to understand for me. The check on write_pos is:
if (write_pos + 4 >= sizeof(c->operand) - 4) {The first "+ 4" is because we're writing 5 bytes and the last " - 4" is to leave space for the CRC.
The other problem is that "length" can be invalid. It comes from "data_length" in fdtv_ca_pmt().
--- drivers/media/firewire/firedtv-avc.c | 14 +++++++++++--- drivers/media/firewire/firedtv-ci.c | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-)
drivers/media/firewire/firedtv-avc.c +11 -3
@@ -1165,7 +1165,11 @@ int avc_ca_pmt(struct firedtv *fdtv, cha read_pos += program_info_length; write_pos += program_info_length; } -while (read_pos < length) { +while (read_pos +4 < length) { +if (write_pos +4 >=sizeof (c->operand) -4 ) { + ret = -EINVAL ; + goto out; + } c->operand[write_pos++] = msg[read_pos++]; c->operand[write_pos++] = msg[read_pos++]; c->operand[write_pos++] = msg[read_pos++];
@@ -1177,13 +1181,17 @@ int avc_ca_pmt(struct firedtv *fdtv, cha c->operand[write_pos++] = es_info_length >>8 ; c->operand[write_pos++] = es_info_length &0xff ;if (es_info_length >0 ) { +if (read_pos >= length) { + ret = -EINVAL ; + goto out; + } pmt_cmd_id = msg[read_pos++];if (pmt_cmd_id !=1 && pmt_cmd_id !=4 )dev_err (fdtv->device,"invalid pmt_cmd_id %d at stream level\n" , pmt_cmd_id); -if (es_info_length >sizeof (c->operand) -4 - - write_pos) { +if (es_info_length >sizeof (c->operand) -4 - write_pos || + es_info_length > length - read_pos) { ret = -EINVAL ; goto out; }
drivers/media/firewire/firedtv-ci.c +2 -0
@@ -134,6 +134,8 @@ static int fdtv_ca_pmt(struct firedtv *f }else { data_length = msg->msg[3 ]; } +if (data_length >sizeof (msg->msg) - data_pos) +return -EINVAL ;return avc_ca_pmt (fdtv, &msg->msg[data_pos], data_length); }
Greg Kroah-Hartman
maintainerPATCH 3/12 Revert "xhci: Set HCD flag to defer primary roothub registration"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
This reverts commit b7a0a792f864583207c593b50fd1b752ed89f4c1.
It has been reported to be causing problems in Arch and Fedora bug reports.
--- drivers/usb/host/xhci.c | 1 - 1 file changed, 1 deletion(-)
drivers/usb/host/xhci.c +0 -1
@@ -692,7 +692,6 @@ int xhci_run(struct usb_hcd *hcd)if (ret)xhci_free_command (xhci, command); } -set_bit (HCD_FLAG_DEFER_RH_REGISTER , &hcd->flags);xhci_dbg_trace (xhci, trace_xhci_dbg_init,"Finished xhci_run for USB2 roothub" );
Greg Kroah-Hartman
maintainerPATCH 4/12 Revert "usb: core: hcd: Add support for deferring roothub registration"
In reply to Greg Kroah-HartmanFrom: Greg Kroah-Hartman <[email protected]>
This reverts commit 58877b0824da15698bd85a0a9dbfa8c354e6ecb7.
It has been reported to be causing problems in Arch and Fedora bug reports.
--- drivers/usb/core/hcd.c | 29 ++++++----------------------- include/linux/usb/hcd.h | 2 -- 2 files changed, 6 insertions(+), 25 deletions(-)
drivers/usb/core/hcd.c +6 -23
@@ -2795,7 +2795,6 @@ int usb_add_hcd(struct usb_hcd *hcd, {int retval;struct usb_device *rhdev; -struct usb_hcd *shared_hcd;if (!hcd->skip_phy_initialization &&usb_hcd_is_primary_hcd (hcd)) { hcd->phy_roothub =usb_phy_roothub_alloc (hcd->self.sysdev);
@@ -2956,26 +2955,13 @@ int usb_add_hcd(struct usb_hcd *hcd, goto err_hcd_driver_start; } -/* starting here, usbcore will pay attention to the shared HCD roothub */ - shared_hcd = hcd->shared_hcd; -if (!usb_hcd_is_primary_hcd (hcd) && shared_hcd &&HCD_DEFER_RH_REGISTER (shared_hcd)) { - retval =register_root_hub (shared_hcd); -if (retval !=0 ) - goto err_register_root_hub; - -if (shared_hcd->uses_new_polling &&HCD_POLL_RH (shared_hcd)) -usb_hcd_poll_rh_status (shared_hcd); - } -/* starting here, usbcore will pay attention to this root hub */ -if (!HCD_DEFER_RH_REGISTER (hcd)) { - retval =register_root_hub (hcd); -if (retval !=0 ) - goto err_register_root_hub; + retval =register_root_hub (hcd); +if (retval !=0 ) + goto err_register_root_hub; -if (hcd->uses_new_polling &&HCD_POLL_RH (hcd)) -usb_hcd_poll_rh_status (hcd); - } +if (hcd->uses_new_polling &&HCD_POLL_RH (hcd)) +usb_hcd_poll_rh_status (hcd);return retval;
@@ -3013,7 +2999,6 @@ EXPORT_SYMBOL_GPL(usb_add_hcd);void usb_remove_hcd (struct usb_hcd *hcd) {struct usb_device *rhdev = hcd->self.root_hub; -bool rh_registered;dev_info (hcd->self.controller,"remove, state %x\n" , hcd->state);
@@ -3024,7 +3009,6 @@ void usb_remove_hcd(struct usb_hcd *hcd)dev_dbg (hcd->self.controller,"roothub graceful disconnect\n" );spin_lock_irq (&hcd_root_hub_lock); - rh_registered = hcd->rh_registered; hcd->rh_registered =0 ;spin_unlock_irq (&hcd_root_hub_lock);
@@ -3034,8 +3018,7 @@ void usb_remove_hcd(struct usb_hcd *hcd)cancel_work_sync (&hcd->died_work);mutex_lock (&usb_bus_idr_lock); -if (rh_registered) -usb_disconnect (&rhdev);/* Sets rhdev to NULL */ +usb_disconnect (&rhdev);/* Sets rhdev to NULL */ mutex_unlock (&usb_bus_idr_lock);/*
include/linux/usb/hcd.h +0 -2
@@ -124,7 +124,6 @@ struct usb_hcd {#define HCD_FLAG_RH_RUNNING 5/* root hub is running? */ #define HCD_FLAG_DEAD 6/* controller has died? */ #define HCD_FLAG_INTF_AUTHORIZED 7/* authorize interfaces? */ -#define HCD_FLAG_DEFER_RH_REGISTER 8/* Defer roothub registration */ /* The flags can be tested using these macros; they are likely to * be slightly faster than test_bit().
@@ -135,7 +134,6 @@ struct usb_hcd {#define HCD_WAKEUP_PENDING (hcd) ((hcd)->flags & (1U << HCD_FLAG_WAKEUP_PENDING))#define HCD_RH_RUNNING (hcd) ((hcd)->flags & (1U << HCD_FLAG_RH_RUNNING))#define HCD_DEAD (hcd) ((hcd)->flags & (1U << HCD_FLAG_DEAD)) -#define HCD_DEFER_RH_REGISTER (hcd) ((hcd)->flags & (1U << HCD_FLAG_DEFER_RH_REGISTER))/* * Specifies if interfaces are authorized by default
Greg Kroah-Hartman
maintainerPATCH 5/12 drm/amdkfd: fix boot failure when iommu is disabled in Picasso.
In reply to Greg Kroah-HartmanFrom: Yifan Zhang <[email protected]>
commit afd18180c07026f94a80ff024acef5f4159084a4 upstream.
When IOMMU disabled in sbios and kfd in iommuv2 path, iommuv2 init will fail. But this failure should not block amdgpu driver init.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ---- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -4
@@ -2432,10 +2432,6 @@ static int amdgpu_device_ip_init(structif (!adev->gmc.xgmi.pending_reset)amdgpu_amdkfd_device_init (adev); - r =amdgpu_amdkfd_resume_iommu (adev); -if (r) - goto init_failed; -amdgpu_fru_get_product_info (adev); init_failed:
drivers/gpu/drm/amd/amdkfd/kfd_device.c +3 -0
@@ -924,6 +924,9 @@ bool kgd2kfd_device_init(struct kfd_devsvm_migrate_init ((struct amdgpu_device *)kfd->kgd); +if (kgd2kfd_resume_iommu (kfd)) + goto device_iommu_error; +if (kfd_resume (kfd)) goto kfd_resume_error;
Greg Kroah-Hartman
maintainerPATCH 6/12 Revert "soc: imx: gpcv2: move reset assert after requesting domain power up"
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
commit 2b2f106eb55276a60a89ac27a52d0d738b57a546 upstream.
This reverts commit a77ebdd9f553. It turns out that the VPU domain has no different requirements, even though the downstream ATF implementation seems to suggest otherwise. Powering on the domain with the reset asserted works fine. As the changed sequence has caused sporadic issues with the GPU domains, just revert the change to go back to the working sequence.
--- drivers/soc/imx/gpcv2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/imx/gpcv2.c +2 -2
@@ -244,6 +244,8 @@ static int imx_pgc_power_up(struct gener goto out_regulator_disable; } +reset_control_assert (domain->reset); +if (domain->bits.pxx) {/* request the domain to power up */ regmap_update_bits(domain->regmap, GPC_PU_PGC_SW_PUP_REQ,
@@ -266,8 +268,6 @@ static int imx_pgc_power_up(struct gener GPC_PGC_CTRL_PCR); } -reset_control_assert (domain->reset); -/* delay for reset to propagate */ udelay (5 );
Greg Kroah-Hartman
maintainerPATCH 7/12 ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
In reply to Greg Kroah-HartmanFrom: Wang Kefeng <[email protected]>
commit eb4f756915875b0ea0757751cd29841f0504d547 upstream.
After commit 77a7300abad7 ("of/irq: Get rid of NO_IRQ usage"), no irq case has been removed, irq_of_parse_and_map() will return 0 in all cases when get error from parse and map an interrupt into linux virq space.
amba_device_register() is only used on no-DT initialization, see
s3c64xx_pl080_init() arch/arm/mach-s3c/pl080.c
ep93xx_init_devices() arch/arm/mach-ep93xx/core.c
They won't set -1 to irq[0], so no need the warn.
This reverts commit 2eac58d5026e4ec8b17ff8b62877fea9e1d2f1b3.
--- drivers/amba/bus.c | 3 --- 1 file changed, 3 deletions(-)
drivers/amba/bus.c +0 -3
@@ -377,9 +377,6 @@ static int amba_device_try_add(struct amvoid __iomem *tmp;int i, ret; -WARN_ON (dev->irq[0 ] == (unsigned int )-1 ); -WARN_ON (dev->irq[1 ] == (unsigned int )-1 ); - ret =request_resource (parent, &dev->res);if (ret) goto err_out;
Greg Kroah-Hartman
maintainerPATCH 8/12 Revert "wcn36xx: Disable bmps when encryption is disabled"
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
commit 285bb1738e196507bf985574d0bc1e9dd72d46b1 upstream.
This reverts commit c6522a5076e1a65877c51cfee313a74ef61cabf8.
Testing on tip-of-tree shows that this is working now. Revert this and re-enable BMPS for Open APs.
--- drivers/net/wireless/ath/wcn36xx/main.c | 10 ---------- drivers/net/wireless/ath/wcn36xx/pmc.c | 5 +---- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 - 3 files changed, 1 insertion(+), 15 deletions(-)
drivers/net/wireless/ath/wcn36xx/main.c +0 -10
@@ -604,15 +604,6 @@ static int wcn36xx_set_key(struct ieee80 } } } -/* FIXME: Only enable bmps support when encryption is enabled. -* For any reasons, when connected to open/no-security BSS, -* the wcn36xx controller in bmps mode does not forward -* 'wake-up' beacons despite AP sends DTIM with station AID. -* It could be due to a firmware issue or to the way driver -* configure the station. -*/ -if (vif->type ==NL80211_IFTYPE_STATION ) - vif_priv->allow_bmps = true;break ;case DISABLE_KEY :if (!(IEEE80211_KEY_FLAG_PAIRWISE & key_conf->flags)) {
@@ -913,7 +904,6 @@ static void wcn36xx_bss_info_changed(str vif->addr, bss_conf->aid); vif_priv->sta_assoc = false; - vif_priv->allow_bmps = false; wcn36xx_smd_set_link_st(wcn, bss_conf->bssid, vif->addr,
drivers/net/wireless/ath/wcn36xx/pmc.c +1 -4
@@ -23,10 +23,7 @@ int wcn36xx_pmc_enter_bmps_state(struct {int ret =0 ;struct wcn36xx_vif *vif_priv =wcn36xx_vif_to_priv (vif); - -if (!vif_priv->allow_bmps) -return -ENOTSUPP ; - +/* TODO: Make sure the TX chain clean */ ret =wcn36xx_smd_enter_bmps (wcn, vif);if (!ret) {wcn36xx_dbg (WCN36XX_DBG_PMC ,"Entered BMPS\n" );
drivers/net/wireless/ath/wcn36xx/wcn36xx.h +0 -1
@@ -128,7 +128,6 @@ struct wcn36xx_vif {enum wcn36xx_hal_bss_type bss_type;/* Power management */ -bool allow_bmps;enum wcn36xx_power_state pw_state;u8 bss_index;
Greg Kroah-Hartman
maintainerPATCH 9/12 drm/amdgpu: revert "Add autodump debugfs node for gpu reset v8"
In reply to Greg Kroah-HartmanFrom: Christian König <[email protected]>
commit c8365dbda056578eebe164bf110816b1a39b4b7f upstream.
This reverts commit 728e7e0cd61899208e924472b9e641dbeb0775c4.
Further discussion reveals that this feature is severely broken and needs to be reverted ASAP.
GPU reset can never be delayed by userspace even for debugging or otherwise we can run into in kernel deadlocks.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 80 ---------------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 5 - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 - 4 files changed, 91 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
@@ -1078,8 +1078,6 @@ struct amdgpu_device {char product_name[32 ];char serial[20 ]; -struct amdgpu_autodump autodump; -atomic_t throttling_logging_enabled;struct ratelimit_state throttling_logging_rs;uint32_t ras_hw_enabled;
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +0 -80
100 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h +0 -5
@@ -26,10 +26,6 @@/* * Debugfs */ -struct amdgpu_autodump { -struct completion dumping; -struct wait_queue_head gpu_hang; -};int amdgpu_debugfs_regs_init (struct amdgpu_device *adev);int amdgpu_debugfs_init (struct amdgpu_device *adev);
@@ -37,4 +33,3 @@ void amdgpu_debugfs_fini(struct amdgpu_dvoid amdgpu_debugfs_fence_init (struct amdgpu_device *adev);void amdgpu_debugfs_firmware_init (struct amdgpu_device *adev);void amdgpu_debugfs_gem_init (struct amdgpu_device *adev); -int amdgpu_debugfs_wait_dump (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 -4
@@ -4462,10 +4462,6 @@ int amdgpu_device_pre_asic_reset(structif (reset_context->reset_req_dev == adev) job = reset_context->job; -/* no need to dump if device is not in good state during probe period */ -if (!adev->gmc.xgmi.pending_reset) -amdgpu_debugfs_wait_dump (adev); -if (amdgpu_sriov_vf (adev)) {/* stop the data exchange thread */ amdgpu_virt_fini_data_exchange (adev);
Greg Kroah-Hartman
maintainerPATCH 10/12 drm/amd/display: Revert "Directly retrain link from debugfs"
In reply to Greg Kroah-HartmanFrom: Anson Jacob <[email protected]>
commit 1131cadfd7563975f3a4efcc6f7c1fdc872db38b upstream.
This reverts commit f5b6a20c7ef40599095c796b0500d842ffdbc639.
This patch broke new settings from taking effect. Hotplug is required for new settings to take effect.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +2 -1
@@ -247,6 +247,7 @@ static ssize_t dp_link_settings_write(st {struct amdgpu_dm_connector *connector =file_inode (f)->i_private;struct dc_link *link = connector->dc_link; +struct dc *dc = (struct dc *)link->dc;struct dc_link_settings prefer_link_settings;char *wr_buf =NULL ;const uint32_t wr_buf_size =40 ;
@@ -313,7 +314,7 @@ static ssize_t dp_link_settings_write(st prefer_link_settings.lane_count = param[0 ]; prefer_link_settings.link_rate = param[1 ]; -dp_retrain_link_dp_test (link, &prefer_link_settings, false); +dc_link_set_preferred_training_settings (dc, &prefer_link_settings,NULL , link, true);kfree (wr_buf);return size;
Greg Kroah-Hartman
maintainerPATCH 11/12 Revert "drm/i915/gt: Propagate change in error status to children on unhold"
In reply to Greg Kroah-HartmanFrom: Matthew Brost <[email protected]>
commit ac653dd7996edf1770959e11a078312928bd7315 upstream.
Propagating errors to dependent fences is broken and can lead to errors from one client ending up in another. In commit 3761baae908a ("Revert "drm/i915: Propagate errors on awaiting already signaled fences""), we attempted to get rid of fence error propagation but missed the case added in commit 8e9f84cf5cac ("drm/i915/gt: Propagate change in error status to children on unhold"). Revert that one too. This error was found by an up-and-coming selftest which triggers a reset during request cancellation and verifies that subsequent requests complete successfully.
v2:
(Daniel Vetter)
- Use revert
v3:
(Jason)
- Update commit message
v4 (Daniele):
- fix checkpatch error in commit message.
--- drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +0 -4
@@ -2140,10 +2140,6 @@ static void __execlists_unhold(struct i9if (p->flags &I915_DEPENDENCY_WEAK )continue ; -/* Propagate any change in error status */ -if (rq->fence.error) -i915_request_set_error_once (w, rq->fence.error); -if (w->engine != rq->engine)continue ;
Greg Kroah-Hartman
maintainerPATCH 12/12 ALSA: usb-audio: Add quirk for Audient iD14
In reply to Greg Kroah-HartmanFrom: Takashi Iwai <[email protected]>
commit df0380b9539b04c1ae8854a984098da06d5f1e67 upstream.
Audient iD14 (2708:0002) may get a control message error that interferes the operation e.g. with alsactl. Add the quirk to ignore such errors like other devices.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -1887,6 +1887,8 @@ static const struct usb_audio_quirk_flag QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),DEVICE_FLG (0x21b4 ,0x0081 ,/* AudioQuest DragonFly */ QUIRK_FLAG_GET_SAMPLE_RATE ), +DEVICE_FLG (0x2708 ,0x0002 ,/* Audient iD14 */ +QUIRK_FLAG_IGNORE_CTL_ERROR ),DEVICE_FLG (0x2912 ,0x30c8 ,/* Audioengine D1 */ QUIRK_FLAG_GET_SAMPLE_RATE ), DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB, using 32-bit and 64-bit ARM kernels:
Signature · 1 line
Florian
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro's test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 5.15.1-rc1
* git: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
* git branch: linux-5.15.y
* git commit: feb80b14f66dd9b7c828d80089ab163ed5478840
* git describe: v5.15-13-gfeb80b14f66d
* test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-5.15.y/build/v5.15-13-gfeb80b14f66d
## No regressions (compared to v5.15)
## No fixes (compared to v5.15)
## Test result summary
total: 91819, pass: 78019, fail: 1416, skip: 12384, xfail: 0
## Build Summary
* arc: 10 total, 10 passed, 0 failed
* arm: 291 total, 269 passed, 22 failed
* arm64: 45 total, 42 passed, 3 failed
* dragonboard-410c: 1 total, 1 passed, 0 failed
* hi6220-hikey: 1 total, 1 passed, 0 failed
* i386: 43 total, 40 passed, 3 failed
* juno-r2: 1 total, 1 passed, 0 failed
* mips: 40 total, 38 passed, 2 failed
* parisc: 14 total, 14 passed, 0 failed
* powerpc: 40 total, 38 passed, 2 failed
* riscv: 27 total, 25 passed, 2 failed
* s390: 22 total, 20 passed, 2 failed
* sh: 26 total, 24 passed, 2 failed
* sparc: 14 total, 14 passed, 0 failed
* x15: 1 total, 1 passed, 0 failed
* x86: 1 total, 1 passed, 0 failed
* x86_64: 45 total, 43 passed, 2 failed
## Test suites summary
* fwts
* igt-gpu-tools
* kselftest-android
* kselftest-arm64
* kselftest-bpf
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-lkdtm
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kunit
* kvm-unit-tests
* libgpiod
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* perf
* rcutorture
* ssuite
* v4l2-compliance
Greetings!
Daniel Díaz
[email protected]
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +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/v5.x/stable-review/patch-5.15.1-rc1.gz
or in the git tree and branch at:git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
linux-5.15.y and the diffstat can be found below.
Quoted 4 lines
thanks,
greg k-h
Tested on my AMD Picasso, I confirm that the xorg problems I saw in 5.15.0 are solved by this.
Signature · 3 lines
Vetinari smiled. "Can you keep a secret, Mister Lipwig?" "Oh, yes, sir. I've kept lots." "Capital. And the point is, so can I. You do not need to know.”
Hi Greg,
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.15.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
greg k-h
Commit c045ceb5a145 ("reset: tegra-bpmp: Handle errors in BPMP response") was pulled in late for v5.15 and this unfortunately broke HDA audio support for Tegra194. We are working on a fix for this and so the below failure is expected. For now we can ignore the below failures and I will figure out how we fix this.
Test results for stable-v5.15:
10 builds: 10 pass, 0 fail
28 boots: 28 pass, 0 fail
114 tests: 108 pass, 6 failLinux version: 5.15.1-rc1-gfeb80b14f66d
Boards tested: tegra124-jetson-tk1, tegra186-p2771-0000,
tegra194-p2972-0000, tegra194-p3509-0000+p3668-0000,
tegra20-ventana, tegra210-p2371-2180,
tegra210-p3450-0000, tegra30-cardhu-a04Test failures: tegra194-p2972-0000: boot.py
tegra194-p2972-0000: tegra-audio-boot-sanity.sh
tegra194-p2972-0000: tegra-audio-hda-playback.sh
tegra194-p3509-0000+p3668-0000: devices
tegra194-p3509-0000+p3668-0000: tegra-audio-boot-sanity.sh
tegra194-p3509-0000+p3668-0000: tegra-audio-hda-playback.shCheers
Jon
Signature · 1 line
nvpublic
Greg Kroah-Hartman
maintainerQuoted 19 lines · Jon Hunter
Hi Greg,
Quoted 16 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +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/v5.x/stable-review/patch-5.15.1-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-5.15.y
and the diffstat can be found below.thanks,
Quoted 8 lines
Quoted 1 line
greg k-h
Commit
c045ceb5a145("reset: tegra-bpmp: Handle errors in BPMP response") was pulled in late for v5.15 and this unfortunately broke HDA audio support for Tegra194. We are working on a fix for this and so the below failure is expected. For now we can ignore the below failures and I will figure out how we fix this.
Should that commit just be reverted? Wouldn't that be the "correct" thing to do right now and then work on fixing this properly later?
Is this being discussed anywhere so that the regression bot can track it?
thanks,
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 5.15.1 release. There are 12 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 Sat, 06 Nov 2021 14:11:51 +0000. Anything received after that time might be too late.
Build results:
total: 154 pass: 154 fail: 0 Qemu test results: total: 482 pass: 482 fail: 0
Guenter