513 lines
17 KiB
Diff
513 lines
17 KiB
Diff
|
diff --git a/Makefile b/Makefile
|
||
|
index ed6e7ec60eff6..ffcc7eadc44b8 100644
|
||
|
--- a/Makefile
|
||
|
+++ b/Makefile
|
||
|
@@ -1,7 +1,7 @@
|
||
|
# SPDX-License-Identifier: GPL-2.0
|
||
|
VERSION = 5
|
||
|
PATCHLEVEL = 15
|
||
|
-SUBLEVEL = 0
|
||
|
+SUBLEVEL = 1
|
||
|
EXTRAVERSION =
|
||
|
NAME = Trick or Treat
|
||
|
|
||
|
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
|
||
|
index 962041148482c..6c0f7f4f7d1de 100644
|
||
|
--- a/drivers/amba/bus.c
|
||
|
+++ b/drivers/amba/bus.c
|
||
|
@@ -377,9 +377,6 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
|
||
|
void __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;
|
||
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
|
||
|
index 269437b013280..289c7dc053634 100644
|
||
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
|
||
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
|
||
|
@@ -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;
|
||
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
|
||
|
index 463b9c0283f7e..ec30d81586a79 100644
|
||
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
|
||
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
|
||
|
@@ -27,7 +27,6 @@
|
||
|
#include <linux/pci.h>
|
||
|
#include <linux/uaccess.h>
|
||
|
#include <linux/pm_runtime.h>
|
||
|
-#include <linux/poll.h>
|
||
|
|
||
|
#include "amdgpu.h"
|
||
|
#include "amdgpu_pm.h"
|
||
|
@@ -37,85 +36,7 @@
|
||
|
#include "amdgpu_securedisplay.h"
|
||
|
#include "amdgpu_fw_attestation.h"
|
||
|
|
||
|
-int amdgpu_debugfs_wait_dump(struct amdgpu_device *adev)
|
||
|
-{
|
||
|
#if defined(CONFIG_DEBUG_FS)
|
||
|
- unsigned long timeout = 600 * HZ;
|
||
|
- int ret;
|
||
|
-
|
||
|
- wake_up_interruptible(&adev->autodump.gpu_hang);
|
||
|
-
|
||
|
- ret = wait_for_completion_interruptible_timeout(&adev->autodump.dumping, timeout);
|
||
|
- if (ret == 0) {
|
||
|
- pr_err("autodump: timeout, move on to gpu recovery\n");
|
||
|
- return -ETIMEDOUT;
|
||
|
- }
|
||
|
-#endif
|
||
|
- return 0;
|
||
|
-}
|
||
|
-
|
||
|
-#if defined(CONFIG_DEBUG_FS)
|
||
|
-
|
||
|
-static int amdgpu_debugfs_autodump_open(struct inode *inode, struct file *file)
|
||
|
-{
|
||
|
- struct amdgpu_device *adev = inode->i_private;
|
||
|
- int ret;
|
||
|
-
|
||
|
- file->private_data = adev;
|
||
|
-
|
||
|
- ret = down_read_killable(&adev->reset_sem);
|
||
|
- if (ret)
|
||
|
- return ret;
|
||
|
-
|
||
|
- if (adev->autodump.dumping.done) {
|
||
|
- reinit_completion(&adev->autodump.dumping);
|
||
|
- ret = 0;
|
||
|
- } else {
|
||
|
- ret = -EBUSY;
|
||
|
- }
|
||
|
-
|
||
|
- up_read(&adev->reset_sem);
|
||
|
-
|
||
|
- return ret;
|
||
|
-}
|
||
|
-
|
||
|
-static int amdgpu_debugfs_autodump_release(struct inode *inode, struct file *file)
|
||
|
-{
|
||
|
- struct amdgpu_device *adev = file->private_data;
|
||
|
-
|
||
|
- complete_all(&adev->autodump.dumping);
|
||
|
- return 0;
|
||
|
-}
|
||
|
-
|
||
|
-static unsigned int amdgpu_debugfs_autodump_poll(struct file *file, struct poll_table_struct *poll_table)
|
||
|
-{
|
||
|
- struct amdgpu_device *adev = file->private_data;
|
||
|
-
|
||
|
- poll_wait(file, &adev->autodump.gpu_hang, poll_table);
|
||
|
-
|
||
|
- if (amdgpu_in_reset(adev))
|
||
|
- return POLLIN | POLLRDNORM | POLLWRNORM;
|
||
|
-
|
||
|
- return 0;
|
||
|
-}
|
||
|
-
|
||
|
-static const struct file_operations autodump_debug_fops = {
|
||
|
- .owner = THIS_MODULE,
|
||
|
- .open = amdgpu_debugfs_autodump_open,
|
||
|
- .poll = amdgpu_debugfs_autodump_poll,
|
||
|
- .release = amdgpu_debugfs_autodump_release,
|
||
|
-};
|
||
|
-
|
||
|
-static void amdgpu_debugfs_autodump_init(struct amdgpu_device *adev)
|
||
|
-{
|
||
|
- init_completion(&adev->autodump.dumping);
|
||
|
- complete_all(&adev->autodump.dumping);
|
||
|
- init_waitqueue_head(&adev->autodump.gpu_hang);
|
||
|
-
|
||
|
- debugfs_create_file("amdgpu_autodump", 0600,
|
||
|
- adev_to_drm(adev)->primary->debugfs_root,
|
||
|
- adev, &autodump_debug_fops);
|
||
|
-}
|
||
|
|
||
|
/**
|
||
|
* amdgpu_debugfs_process_reg_op - Handle MMIO register reads/writes
|
||
|
@@ -1588,7 +1509,6 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
|
||
|
}
|
||
|
|
||
|
amdgpu_ras_debugfs_create_all(adev);
|
||
|
- amdgpu_debugfs_autodump_init(adev);
|
||
|
amdgpu_rap_debugfs_init(adev);
|
||
|
amdgpu_securedisplay_debugfs_init(adev);
|
||
|
amdgpu_fw_attestation_debugfs_init(adev);
|
||
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
|
||
|
index 141a8474e24f2..8b641f40fdf66 100644
|
||
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
|
||
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h
|
||
|
@@ -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_device *adev);
|
||
|
void 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);
|
||
|
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||
|
index af9bdf16eefd4..b8d9004fb1635 100644
|
||
|
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||
|
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||
|
@@ -2432,10 +2432,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev)
|
||
|
if (!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:
|
||
|
@@ -4466,10 +4462,6 @@ int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,
|
||
|
if (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);
|
||
|
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
|
||
|
index 4a416231b24c8..a6afacc3b10cd 100644
|
||
|
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
|
||
|
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
|
||
|
@@ -924,6 +924,9 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,
|
||
|
|
||
|
svm_migrate_init((struct amdgpu_device *)kfd->kgd);
|
||
|
|
||
|
+ if(kgd2kfd_resume_iommu(kfd))
|
||
|
+ goto device_iommu_error;
|
||
|
+
|
||
|
if (kfd_resume(kfd))
|
||
|
goto kfd_resume_error;
|
||
|
|
||
|
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
|
||
|
index 8080bba5b7a76..de9ec5ddb6c72 100644
|
||
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
|
||
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
|
||
|
@@ -247,6 +247,7 @@ static ssize_t dp_link_settings_write(struct file *f, const char __user *buf,
|
||
|
{
|
||
|
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(struct file *f, const char __user *buf,
|
||
|
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;
|
||
|
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
|
||
|
index de5f9c86b9a44..cafb0608ffb46 100644
|
||
|
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
|
||
|
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
|
||
|
@@ -2140,10 +2140,6 @@ static void __execlists_unhold(struct i915_request *rq)
|
||
|
if (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;
|
||
|
|
||
|
diff --git a/drivers/media/firewire/firedtv-avc.c b/drivers/media/firewire/firedtv-avc.c
|
||
|
index 2bf9467b917d1..71991f8638e6b 100644
|
||
|
--- a/drivers/media/firewire/firedtv-avc.c
|
||
|
+++ b/drivers/media/firewire/firedtv-avc.c
|
||
|
@@ -1165,7 +1165,11 @@ int avc_ca_pmt(struct firedtv *fdtv, char *msg, int length)
|
||
|
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, char *msg, int length)
|
||
|
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;
|
||
|
}
|
||
|
diff --git a/drivers/media/firewire/firedtv-ci.c b/drivers/media/firewire/firedtv-ci.c
|
||
|
index 9363d005e2b61..e0d57e09dab0c 100644
|
||
|
--- a/drivers/media/firewire/firedtv-ci.c
|
||
|
+++ b/drivers/media/firewire/firedtv-ci.c
|
||
|
@@ -134,6 +134,8 @@ static int fdtv_ca_pmt(struct firedtv *fdtv, void *arg)
|
||
|
} 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);
|
||
|
}
|
||
|
diff --git a/drivers/net/ethernet/sfc/ethtool_common.c b/drivers/net/ethernet/sfc/ethtool_common.c
|
||
|
index bf1443539a1a4..bd552c7dffcb1 100644
|
||
|
--- a/drivers/net/ethernet/sfc/ethtool_common.c
|
||
|
+++ b/drivers/net/ethernet/sfc/ethtool_common.c
|
||
|
@@ -563,20 +563,14 @@ int efx_ethtool_get_link_ksettings(struct net_device *net_dev,
|
||
|
{
|
||
|
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;
|
||
|
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
|
||
|
index ec913ec991f3f..6e91bdb2e08d4 100644
|
||
|
--- a/drivers/net/wireless/ath/wcn36xx/main.c
|
||
|
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
|
||
|
@@ -604,15 +604,6 @@ static int wcn36xx_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
|
||
|
}
|
||
|
}
|
||
|
}
|
||
|
- /* 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(struct ieee80211_hw *hw,
|
||
|
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,
|
||
|
diff --git a/drivers/net/wireless/ath/wcn36xx/pmc.c b/drivers/net/wireless/ath/wcn36xx/pmc.c
|
||
|
index 2d0780fefd477..2936aaf532738 100644
|
||
|
--- a/drivers/net/wireless/ath/wcn36xx/pmc.c
|
||
|
+++ b/drivers/net/wireless/ath/wcn36xx/pmc.c
|
||
|
@@ -23,10 +23,7 @@ int wcn36xx_pmc_enter_bmps_state(struct wcn36xx *wcn,
|
||
|
{
|
||
|
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");
|
||
|
diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
|
||
|
index add6e527e8330..e9560f35e9bcf 100644
|
||
|
--- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
|
||
|
+++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
|
||
|
@@ -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;
|
||
|
diff --git a/drivers/soc/imx/gpcv2.c b/drivers/soc/imx/gpcv2.c
|
||
|
index 34a9ac1f2b9b1..8b7a01773aec2 100644
|
||
|
--- a/drivers/soc/imx/gpcv2.c
|
||
|
+++ b/drivers/soc/imx/gpcv2.c
|
||
|
@@ -244,6 +244,8 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd)
|
||
|
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 generic_pm_domain *genpd)
|
||
|
GPC_PGC_CTRL_PCR);
|
||
|
}
|
||
|
|
||
|
- reset_control_assert(domain->reset);
|
||
|
-
|
||
|
/* delay for reset to propagate */
|
||
|
udelay(5);
|
||
|
|
||
|
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
|
||
|
index 7ee6e4cc0d89e..00d35fe1fef0b 100644
|
||
|
--- a/drivers/usb/core/hcd.c
|
||
|
+++ b/drivers/usb/core/hcd.c
|
||
|
@@ -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);
|
||
|
|
||
|
/*
|
||
|
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
|
||
|
index 541fe4dcc43a2..902f410874e8e 100644
|
||
|
--- a/drivers/usb/host/xhci.c
|
||
|
+++ b/drivers/usb/host/xhci.c
|
||
|
@@ -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");
|
||
|
|
||
|
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
|
||
|
index 2c1fc9212cf28..548a028f2dabb 100644
|
||
|
--- a/include/linux/usb/hcd.h
|
||
|
+++ b/include/linux/usb/hcd.h
|
||
|
@@ -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
|
||
|
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
|
||
|
index 8929d9abe8aa8..74e5bd2cc9329 100644
|
||
|
--- a/sound/usb/quirks.c
|
||
|
+++ b/sound/usb/quirks.c
|
||
|
@@ -1887,6 +1887,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
|
||
|
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 */
|