5.19.2-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 587/1157 scsi: qla2xxx: edif: Add retry for ELS passthrough
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 0b3f3143d473b489a7aa0779c43bcdb344bd3014 ]
Relating to EDIF, when sending IKE message, updating key or deleting key, driver can encounter IOCB queue full. Add additional retries to reduce higher level recovery.
--- drivers/scsi/qla2xxx/qla_edif.c | 52 +++++++++++++++++++++++---------- drivers/scsi/qla2xxx/qla_os.c | 2 +- 2 files changed, 38 insertions(+), 16 deletions(-)
drivers/scsi/qla2xxx/qla_edif.c +37 -15
@@ -1467,6 +1467,8 @@ qla24xx_check_sadb_avail_slot(struct bsg_job *bsg_job, fc_port_t *fcport,#define QLA_SA_UPDATE_FLAGS_RX_KEY 0x0#define QLA_SA_UPDATE_FLAGS_TX_KEY 0x2 +#define EDIF_MSLEEP_INTERVAL 100 +#define EDIF_RETRY_COUNT 50int qla24xx_sadb_update (struct bsg_job *bsg_job)
@@ -1479,7 +1481,7 @@ qla24xx_sadb_update(struct bsg_job *bsg_job)struct edif_list_entry *edif_entry =NULL ;int found =0 ;int rval =0 ; -int result =0 ; +int result =0 , cnt;struct qla_sa_update_frame sa_frame;struct srb_iocb *iocb_cmd;port_id_t portid;
@@ -1720,11 +1722,23 @@ qla24xx_sadb_update(struct bsg_job *bsg_job) sp->done = qla2x00_bsg_job_done; iocb_cmd = &sp->u.iocb_cmd; iocb_cmd->u.sa_update.sa_frame = sa_frame; - + cnt =0 ; +retry: rval =qla2x00_start_sp (sp); -if (rval !=QLA_SUCCESS ) { +switch (rval) { +case QLA_SUCCESS : +break ; +case EAGAIN : +msleep (EDIF_MSLEEP_INTERVAL ); + cnt++; +if (cnt <EDIF_RETRY_COUNT ) + goto retry; + + fallthrough; +default :ql_log (ql_dbg_edif, vha,0x70e3 , -"qla2x00_start_sp failed=%d.\n" , rval); +"%s qla2x00_start_sp failed=%d.\n" , + __func__, rval);qla2x00_rel_sp (sp); rval = -EIO ;
@@ -2398,7 +2412,6 @@ qla24xx_issue_sa_replace_iocb(scsi_qla_host_t *vha, struct qla_work_evt *e) rval =qla2x00_start_sp (sp);if (rval !=QLA_SUCCESS ) { - rval =QLA_FUNCTION_FAILED ; goto done_free_sp; }
@@ -3530,7 +3543,7 @@ int qla_edif_process_els(scsi_qla_host_t *vha, struct bsg_job *bsg_job)fc_port_t *fcport =NULL ;struct qla_hw_data *ha = vha->hw;srb_t *sp; -int rval = (DID_ERROR <<16 ); +int rval = (DID_ERROR <<16 ), cnt;port_id_t d_id;struct qla_bsg_auth_els_request *p = (struct qla_bsg_auth_els_request *)bsg_job->request;
@@ -3625,17 +3638,26 @@ int qla_edif_process_els(scsi_qla_host_t *vha, struct bsg_job *bsg_job) sp->free = qla2x00_bsg_sp_free; sp->done = qla2x00_bsg_job_done; + cnt =0 ; +retry: rval =qla2x00_start_sp (sp); - -ql_dbg (ql_dbg_edif, vha,0x700a , -"%s %s %8phN xchg %x ctlflag %x hdl %x reqlen %xh bsg ptr %p\n" , - __func__,sc_to_str (p->e.sub_cmd), fcport->port_name, - p->e.extra_rx_xchg_address, p->e.extra_control_flags, - sp->handle, sp->remap.req.len, bsg_job); - -if (rval !=QLA_SUCCESS ) { +switch (rval) { +case QLA_SUCCESS : +ql_dbg (ql_dbg_edif, vha,0x700a , +"%s %s %8phN xchg %x ctlflag %x hdl %x reqlen %xh bsg ptr %p\n" , + __func__,sc_to_str (p->e.sub_cmd), fcport->port_name, + p->e.extra_rx_xchg_address, p->e.extra_control_flags, + sp->handle, sp->remap.req.len, bsg_job); +break ; +case EAGAIN : +msleep (EDIF_MSLEEP_INTERVAL ); + cnt++; +if (cnt <EDIF_RETRY_COUNT ) + goto retry; + fallthrough; +default :ql_log (ql_log_warn, vha,0x700e , -"qla2x00_start_sp failed = %d\n" , rval); +"%s qla2x00_start_sp failed = %d\n" , __func__, rval);SET_DID_STATUS (bsg_reply->result,DID_IMM_RETRY ); rval = -EIO ; goto done_free_remap_rsp;
drivers/scsi/qla2xxx/qla_os.c +1 -1
@@ -5472,7 +5472,7 @@ qla2x00_do_work(struct scsi_qla_host *vha) e->u.fcport.fcport, false);break ;case QLA_EVT_SA_REPLACE : -qla24xx_issue_sa_replace_iocb (vha, e); + rc =qla24xx_issue_sa_replace_iocb (vha, e);break ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 588/1157 scsi: qla2xxx: edif: Fix n2n discovery issue with secure target
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 789d54a4178634850e441f60c0326124138e7269 ]
User failed to see disk via n2n topology. Driver used up all login retries before authentication application started. When authentication application started, driver did not have enough login retries to connect securely. On app_start, driver will reset the login retry attempt count.
--- drivers/scsi/qla2xxx/qla_edif.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/qla2xxx/qla_edif.c +3 -0
@@ -515,6 +515,9 @@ qla_edif_app_start(scsi_qla_host_t *vha, struct bsg_job *bsg_job) }if (N2N_TOPO (vha->hw)) { +list_for_each_entry_safe (fcport, tf, &vha->vp_fcports, list) + fcport->n2n_link_reset_cnt =0 ; +if (vha->hw->flags.n2n_fw_acc_sec)set_bit (N2N_LINK_RESET , &vha->dpc_flags);else
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 589/1157 scsi: qla2xxx: edif: Fix n2n login retry for secure device
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit aec55325ddec975216119da000092cb8664a3399 ]
After initiator has burned up all login retries, target authentication application begins to run. This triggers a link bounce on target side. Initiator will attempt another login. Due to N2N, the PRLI [nvme | fcp] can fail because of the mode mismatch with target. This patch add a few more login retries to revive the connection.
--- drivers/scsi/qla2xxx/qla_init.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/scsi/qla2xxx/qla_init.c +7 -0
@@ -2123,6 +2123,13 @@ qla24xx_handle_prli_done_event(struct scsi_qla_host *vha, struct event_arg *ea) }if (N2N_TOPO (vha->hw)) { +if (ea->fcport->n2n_link_reset_cnt == + vha->hw->login_retry_count && + ea->fcport->flags &FCF_FCSP_DEVICE ) { +/* remote authentication app just started */ + ea->fcport->n2n_link_reset_cnt =0 ; + } +if (ea->fcport->n2n_link_reset_cnt < vha->hw->login_retry_count) { ea->fcport->n2n_link_reset_cnt++;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 590/1157 KVM: SVM: Unwind "speculative" RIP advancement if INTn injection "fails"
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit cd9e6da8048c5b40315ee2d929b6230ce1252c3c ]
Unwind the RIP advancement done by svm_queue_exception() when injecting an INT3 ultimately "fails" due to the CPU encountering a VM-Exit while vectoring the injected event, even if the exception reported by the CPU isn't the same event that was injected. If vectoring INT3 encounters an exception, e.g. #NP, and vectoring the #NP encounters an intercepted exception, e.g. #PF when KVM is using shadow paging, then the #NP will be reported as the event that was in-progress.
Note, this is still imperfect, as it will get a false positive if the INT3 is cleanly injected, no VM-Exit occurs before the IRET from the INT3 handler in the guest, the instruction following the INT3 generates an exception (directly or indirectly), _and_ vectoring that exception encounters an exception that is intercepted by KVM. The false positives could theoretically be solved by further analyzing the vectoring event, e.g. by comparing the error code against the expected error code were an exception to occur when vectoring the original injected exception, but SVM without NRIPS is a complete disaster, trying to make it 100% correct is a waste of time.
Message-Id: <450133cf0a026cb9825a2ff55d02cb136a1cb111.1651440202.git.maciej.szmigiero@oracle.com>
--- arch/x86/kvm/svm/svm.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
arch/x86/kvm/svm/svm.c +15 -8
@@ -3699,6 +3699,18 @@ static void svm_complete_interrupts(struct kvm_vcpu *vcpu) vector = exitintinfo &SVM_EXITINTINFO_VEC_MASK ; type = exitintinfo &SVM_EXITINTINFO_TYPE_MASK ; +/* +* If NextRIP isn't enabled, KVM must manually advance RIP prior to +* injecting the soft exception/interrupt. That advancement needs to +* be unwound if vectoring didn't complete. Note, the _new_ event may +* not be the injected event, e.g. if KVM injected an INTn, the INTn +* hit a #NP in the guest, and the #NP encountered a #PF, the #NP will +* be the reported vectored event, but RIP still needs to be unwound. +*/ +if (int3_injected && type ==SVM_EXITINTINFO_TYPE_EXEPT && +kvm_is_linear_rip (vcpu, svm->int3_rip)) +kvm_rip_write (vcpu,kvm_rip_read (vcpu) - int3_injected); +switch (type) {case SVM_EXITINTINFO_TYPE_NMI : vcpu->arch.nmi_injected = true;
@@ -3712,16 +3724,11 @@ static void svm_complete_interrupts(struct kvm_vcpu *vcpu)/* * In case of software exceptions, do not reinject the vector, -* but re-execute the instruction instead. Rewind RIP first -* if we emulated INT3 before. +* but re-execute the instruction instead. */ -if (kvm_exception_is_soft (vector)) { -if (vector ==BP_VECTOR && int3_injected && -kvm_is_linear_rip (vcpu, svm->int3_rip)) -kvm_rip_write (vcpu, -kvm_rip_read (vcpu) - int3_injected); +if (kvm_exception_is_soft (vector))break ; - } +if (exitintinfo &SVM_EXITINTINFO_VALID_ERR ) {u32 err = svm->vmcb->control.exit_int_info_err;kvm_requeue_exception_e (vcpu, vector, err);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 591/1157 KVM: SVM: Stuff next_rip on emulated INT3 injection if NRIPS is supported
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 3741aec4c38fa4123ab08ae552f05366d4fd05d8 ]
If NRIPS is supported in hardware but disabled in KVM, set next_rip to the next RIP when advancing RIP as part of emulating INT3 injection. There is no flag to tell the CPU that KVM isn't using next_rip, and so leaving next_rip is left as is will result in the CPU pushing garbage onto the stack when vectoring the injected event.
Message-Id: <cd328309a3b88604daa2359ad56f36cb565ce2d4.1651440202.git.maciej.szmigiero@oracle.com>
--- arch/x86/kvm/svm/svm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/kvm/svm/svm.c +5 -1
@@ -392,6 +392,10 @@ static void svm_queue_exception(struct kvm_vcpu *vcpu)*/ (void )svm_skip_emulated_instruction (vcpu); rip =kvm_rip_read (vcpu); + +if (boot_cpu_has (X86_FEATURE_NRIPS )) + svm->vmcb->control.next_rip = rip; + svm->int3_rip = rip + svm->vmcb->save.cs.base; svm->int3_injected = rip - old_rip; }
@@ -3702,7 +3706,7 @@ static void svm_complete_interrupts(struct kvm_vcpu *vcpu)/* * If NextRIP isn't enabled, KVM must manually advance RIP prior to * injecting the soft exception/interrupt. That advancement needs to -* be unwound if vectoring didn't complete. Note, the _new_ event may +* be unwound if vectoring didn't complete. Note, the new event may * not be the injected event, e.g. if KVM injected an INTn, the INTn * hit a #NP in the guest, and the #NP encountered a #PF, the #NP will * be the reported vectored event, but RIP still needs to be unwound.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 592/1157 KVM: x86/mmu: Drop RWX=0 SPTEs during ept_sync_page()
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 9fb3565743d58352f00964bf47213b88aff4bb82 ]
All of sync_page()'s existing checks filter out only !PRESENT gPTE, because without execute-only, all upper levels are guaranteed to be at least READABLE. However, if EPT with execute-only support is in use by L1, KVM can create an SPTE that is shadow-present but guest-inaccessible (RWX=0) if the upper level combined permissions are R (or RW) and the leaf EPTE is changed from R (or RW) to X. Because the EPTE is considered present when viewed in isolation, and no reserved bits are set, FNAME(prefetch_invalid_gpte) will consider the GPTE valid, and cause a not-present SPTE to be created.
The SPTE is "correct": the guest translation is inaccessible because the combined protections of all levels yield RWX=0, and KVM will just redirect any vmexits to the guest. If EPT A/D bits are disabled, KVM can mistake the SPTE for an access-tracked SPTE, but again such confusion isn't fatal, as the "saved" protections are also RWX=0. However, creating a useless SPTE in general means that KVM messed up something, even if this particular goof didn't manifest as a functional bug. So, drop SPTEs whose new protections will yield a RWX=0 SPTE, and add a WARN in make_spte() to detect creation of SPTEs that will result in RWX=0 protections.
Message-Id: <[email protected]>
--- arch/x86/kvm/mmu/paging_tmpl.h | 9 ++++++++- arch/x86/kvm/mmu/spte.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-)
arch/x86/kvm/mmu/paging_tmpl.h +8 -1
@@ -1053,7 +1053,14 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)if (sync_mmio_spte (vcpu, &sp->spt[i], gfn, pte_access))continue ; -if (gfn != sp->gfns[i]) { +/* +* Drop the SPTE if the new protections would result in a RWX=0 +* SPTE or if the gfn is changing. The RWX=0 case only affects +* EPT with execute-only support, i.e. EPT without an effective +* "present" bit, as all other paging modes will create a +* read-only SPTE if pte_access is zero. +*/ +if ((!pte_access && !shadow_present_mask) || gfn != sp->gfns[i]) {drop_spte (vcpu->kvm, &sp->spt[i]); flush = true;continue ;
arch/x86/kvm/mmu/spte.c +2 -0
@@ -143,6 +143,8 @@ bool make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,u64 spte =SPTE_MMU_PRESENT_MASK ;bool wrprot = false; +WARN_ON_ONCE (!pte_access && !shadow_present_mask); +if (sp->role.ad_disabled) spte |=SPTE_TDP_AD_DISABLED_MASK ;else if (kvm_mmu_page_ad_need_write_protect (sp))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 593/1157 phy: samsung: exynosautov9-ufs: correct TSRV register configurations
In reply to Greg Kroah-HartmanFrom: Chanho Park <[email protected]>
[ Upstream commit f7fdc4db071f7ee7d408ea3f083222a060c76623 ]
For exynos auto v9's UFS MPHY, We should use 0x50 offset of TSRV register configurations. So, it must be
s/PHY_TRSV_REG_CFG/PHY_TRSV_REG_CFG_AUTOV9/g
--- drivers/phy/samsung/phy-exynosautov9-ufs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/phy/samsung/phy-exynosautov9-ufs.c +9 -9
@@ -31,22 +31,22 @@ static const struct samsung_ufs_phy_cfg exynosautov9_pre_init_cfg[] = {PHY_COMN_REG_CFG (0x023 ,0xc0 ,PWR_MODE_ANY ),PHY_COMN_REG_CFG (0x023 ,0x00 ,PWR_MODE_ANY ), -PHY_TRSV_REG_CFG (0x042 ,0x5d ,PWR_MODE_ANY ), -PHY_TRSV_REG_CFG (0x043 ,0x80 ,PWR_MODE_ANY ), +PHY_TRSV_REG_CFG_AUTOV9 (0x042 ,0x5d ,PWR_MODE_ANY ), +PHY_TRSV_REG_CFG_AUTOV9 (0x043 ,0x80 ,PWR_MODE_ANY ), END_UFS_PHY_CFG, };/* Calibration for HS mode series A/B */ static const struct samsung_ufs_phy_cfg exynosautov9_pre_pwr_hs_cfg[] = { -PHY_TRSV_REG_CFG (0x032 ,0xbc ,PWR_MODE_HS_ANY ), -PHY_TRSV_REG_CFG (0x03c ,0x7f ,PWR_MODE_HS_ANY ), -PHY_TRSV_REG_CFG (0x048 ,0xc0 ,PWR_MODE_HS_ANY ), +PHY_TRSV_REG_CFG_AUTOV9 (0x032 ,0xbc ,PWR_MODE_HS_ANY ), +PHY_TRSV_REG_CFG_AUTOV9 (0x03c ,0x7f ,PWR_MODE_HS_ANY ), +PHY_TRSV_REG_CFG_AUTOV9 (0x048 ,0xc0 ,PWR_MODE_HS_ANY ), -PHY_TRSV_REG_CFG (0x04a ,0x00 ,PWR_MODE_HS_G3_SER_B ), -PHY_TRSV_REG_CFG (0x04b ,0x10 ,PWR_MODE_HS_G1_SER_B | -PWR_MODE_HS_G3_SER_B ), -PHY_TRSV_REG_CFG (0x04d ,0x63 ,PWR_MODE_HS_G3_SER_B ), +PHY_TRSV_REG_CFG_AUTOV9 (0x04a ,0x00 ,PWR_MODE_HS_G3_SER_B ), +PHY_TRSV_REG_CFG_AUTOV9 (0x04b ,0x10 ,PWR_MODE_HS_G1_SER_B | +PWR_MODE_HS_G3_SER_B ), +PHY_TRSV_REG_CFG_AUTOV9 (0x04d ,0x63 ,PWR_MODE_HS_G3_SER_B ),END_UFS_PHY_CFG , };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 594/1157 PCI: microchip: Fix refcount leak in mc_pcie_init_irq_domains()
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit f030304fdeb87ec8f1b518c73703214aec6cc24a ]
of_get_next_child() returns a node pointer with refcount incremented, so we should use of_node_put() on it when we don't need it anymore.
mc_pcie_init_irq_domains() only calls of_node_put() in the normal path, missing it in some error paths. Add missing of_node_put() to avoid refcount leak.
--- drivers/pci/controller/pcie-microchip-host.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/controller/pcie-microchip-host.c +2 -0
@@ -904,6 +904,7 @@ static int mc_pcie_init_irq_domains(struct mc_pcie *port) &event_domain_ops, port);if (!port->event_domain) {dev_err (dev,"failed to get event domain\n" ); +of_node_put (pcie_intc_node);return -ENOMEM ; }
@@ -913,6 +914,7 @@ static int mc_pcie_init_irq_domains(struct mc_pcie *port) &intx_domain_ops, port);if (!port->intx_domain) {dev_err (dev,"failed to get an INTx IRQ domain\n" ); +of_node_put (pcie_intc_node);return -ENOMEM ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 595/1157 PCI: tegra194: Fix PM error handling in tegra_pcie_config_ep()
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e8fbd344a5ea62663554b8546b6bf9f88b93785a ]
pm_runtime_enable() will increase power disable depth. If dw_pcie_ep_init() fails, we should use pm_runtime_disable() to balance it with pm_runtime_enable().
Add missing pm_runtime_disable() for tegra_pcie_config_ep().
--- drivers/pci/controller/dwc/pcie-tegra194.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/controller/dwc/pcie-tegra194.c +1 -0
@@ -1949,6 +1949,7 @@ static int tegra_pcie_config_ep(struct tegra194_pcie *pcie,if (ret) {dev_err (dev,"Failed to initialize DWC Endpoint subsystem: %d\n" , ret); +pm_runtime_disable (dev);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 596/1157 HID: cp2112: prevent a buffer overflow in cp2112_xfer()
In reply to Greg Kroah-HartmanFrom: Harshit Mogalapalli <[email protected]>
[ Upstream commit 381583845d19cb4bd21c8193449385f3fefa9caf ]
Smatch warnings:drivers/hid/hid-cp2112.c:793 cp2112_xfer() error: __memcpy() 'data->block[1]' too small (33 vs 255) drivers/hid/hid-cp2112.c:793 cp2112_xfer() error: __memcpy() 'buf' too small (64 vs 255)
The 'read_length' variable is provided by 'data->block[0]' which comes from user and it(read_length) can take a value between 0-255. Add an upper bound to 'read_length' variable to prevent a buffer overflow in memcpy().
--- drivers/hid/hid-cp2112.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hid/hid-cp2112.c +5 -0
@@ -790,6 +790,11 @@ static int cp2112_xfer(struct i2c_adapter *adap, u16 addr, data->word =le16_to_cpup ((__le16 *)buf);break ;case I2C_SMBUS_I2C_BLOCK_DATA : +if (read_length >I2C_SMBUS_BLOCK_MAX ) { + ret = -EINVAL ; + goto power_normal; + } +memcpy (data->block +1 , buf, read_length);break ;case I2C_SMBUS_BLOCK_DATA :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 597/1157 mtd: sm_ftl: Fix deadlock caused by cancel_work_sync in sm_release
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit a61528d997619a518ee8c51cf0ef0513021afaff ]
There is a deadlock between sm_release and sm_cache_flush_work which is a work item. The cancel_work_sync in sm_release will not return until sm_cache_flush_work is finished. If we hold mutex_lock and use cancel_work_sync to wait the work item to finish, the work item also requires mutex_lock. As a result, the sm_release will be blocked forever. The race condition is shown below:
(Thread 1) | (Thread 2)
sm_release |
mutex_lock(&ftl->mutex) | sm_cache_flush_work
| mutex_lock(&ftl->mutex)
cancel_work_sync | ...This patch moves del_timer_sync and cancel_work_sync out of mutex_lock in order to mitigate deadlock.
--- drivers/mtd/sm_ftl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/sm_ftl.c +1 -1
@@ -1111,9 +1111,9 @@ static void sm_release(struct mtd_blktrans_dev *dev) {struct sm_ftl *ftl = dev->priv; -mutex_lock (&ftl->mutex);del_timer_sync (&ftl->timer);cancel_work_sync (&ftl->flush_work); +mutex_lock (&ftl->mutex);sm_cache_flush (ftl);mutex_unlock (&ftl->mutex); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 598/1157 mtd: partitions: Fix refcount leak in parse_redboot_of
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 9f7e62815cf3cbbcb1b8cb21649fb4dfdb3aa016 ]
of_get_child_by_name() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.
--- drivers/mtd/parsers/redboot.c | 1 + 1 file changed, 1 insertion(+)
drivers/mtd/parsers/redboot.c +1 -0
@@ -58,6 +58,7 @@ static void parse_redboot_of(struct mtd_info *master)return ; ret =of_property_read_u32 (npart,"fis-index-block" , &dirblock); +of_node_put (npart);if (ret)return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 599/1157 mtd: parsers: ofpart: Fix refcount leak in bcm4908_partitions_fw_offset
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit e607879b0da18c451de5e91daf239cc2f2f8ff2d ]
of_find_node_by_path() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore.
Add missing of_node_put() to avoid refcount leak.
--- drivers/mtd/parsers/ofpart_bcm4908.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mtd/parsers/ofpart_bcm4908.c +3 -0
@@ -35,12 +35,15 @@ static long long bcm4908_partitions_fw_offset(void) err =kstrtoul (s + len +1 ,0 , &offset);if (err) {pr_err ("failed to parse %s\n" , s + len +1 ); +of_node_put (root);return err; } +of_node_put (root);return offset <<10 ; } +of_node_put (root);return -ENOENT ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 600/1157 mtd: spear_smi: Dont skip cleanup after mtd_device_unregister() failed
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 0057568b391488a5940635cbda562ea397bf4bdd ]
If mtd_device_unregister() fails (which it doesn't when used correctly), the resources bound by the nand chip should be freed anyhow as returning an error value doesn't prevent the device getting unbound.
Instead use WARN_ON on the return value similar to how other drivers do it.
This is a preparation for making platform remove callbacks return void.
--- drivers/mtd/devices/spear_smi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mtd/devices/spear_smi.c +2 -4
@@ -1045,7 +1045,7 @@ static int spear_smi_remove(struct platform_device *pdev) {struct spear_smi *dev;struct spear_snor_flash *flash; -int ret, i; +int i; dev =platform_get_drvdata (pdev);if (!dev) {
@@ -1060,9 +1060,7 @@ static int spear_smi_remove(struct platform_device *pdev)continue ;/* clean up mtd stuff */ - ret =mtd_device_unregister (&flash->mtd); -if (ret) -dev_err (&pdev->dev,"error removing mtd\n" ); +WARN_ON (mtd_device_unregister (&flash->mtd)); }clk_disable_unprepare (dev->clk);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 601/1157 mtd: st_spi_fsm: Add a clk_disable_unprepare() in .probe()s error path
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 28607b426c3d050714f250d0faeb99d2e9106e90 ]
For all but one error path clk_disable_unprepare() is already there. Add it to the one location where it's missing.
--- drivers/mtd/devices/st_spi_fsm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/mtd/devices/st_spi_fsm.c +5 -3
@@ -2115,10 +2115,12 @@ static int stfsm_probe(struct platform_device *pdev) (long long )fsm->mtd.size, (long long )(fsm->mtd.size >>20 ), fsm->mtd.erasesize, (fsm->mtd.erasesize >> 10)); -return mtd_device_register (&fsm->mtd,NULL ,0 ); - + ret =mtd_device_register (&fsm->mtd,NULL ,0 ); +if (ret) { err_clk_unprepare: -clk_disable_unprepare (fsm->clk); +clk_disable_unprepare (fsm->clk); + } +return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 602/1157 mtd: spear_smi: Drop if with an always false condition
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 279d719be39d8edb37c9178c15e167a94c7bc0a0 ]
The remove callback is only called after probe completed successfully. In this case platform_set_drvdata() was called with a non-NULL argument and so dev is never NULL.
This is a preparation for making platform remove callbacks return void.
--- drivers/mtd/devices/spear_smi.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/mtd/devices/spear_smi.c +0 -4
@@ -1048,10 +1048,6 @@ static int spear_smi_remove(struct platform_device *pdev)int i; dev =platform_get_drvdata (pdev); -if (!dev) { -dev_err (&pdev->dev,"dev is null\n" ); -return -ENODEV ; - }/* clean up for all nor flash */ for (i =0 ; i < dev->num_flashes; i++) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 603/1157 mtd: st_spi_fsm: Warn about failure to unregister mtd device
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit cfa7847f150c4343903d8ff2cd219418c1768205 ]
mtd_device_unregister() shouldn't fail. Wail loudly if it does anyhow.
This matches how other drivers (e.g. nand/raw/nandsim.c) use mtd_device_unregister().
By returning 0 in the platform remove callback a generic error message by the device core is suppressed, nothing else changes.
This is a preparation for making platform remove callbacks return void.
--- drivers/mtd/devices/st_spi_fsm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/devices/st_spi_fsm.c +3 -1
@@ -2130,7 +2130,9 @@ static int stfsm_remove(struct platform_device *pdev)clk_disable_unprepare (fsm->clk); -return mtd_device_unregister (&fsm->mtd); +WARN_ON (mtd_device_unregister (&fsm->mtd)); + +return 0 ; }#ifdef CONFIG_PM_SLEEP
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 604/1157 mtd: st_spi_fsm: Disable clock only after device was unregistered
In reply to Greg Kroah-HartmanFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit cd043c613e21bb6f039057043da759471706adf5 ]
Until mtd_device_unregister() returns the device is expected to be operational. So only disable the clock after the mtd is unregistered.
--- drivers/mtd/devices/st_spi_fsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/devices/st_spi_fsm.c +2 -2
@@ -2128,10 +2128,10 @@ static int stfsm_remove(struct platform_device *pdev) {struct stfsm *fsm =platform_get_drvdata (pdev); -clk_disable_unprepare (fsm->clk); -WARN_ON (mtd_device_unregister (&fsm->mtd)); +clk_disable_unprepare (fsm->clk); +return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 605/1157 PCI: mediatek-gen3: Fix refcount leak in mtk_pcie_init_irq_domains()
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit bf038503d5fe90189743124233fe7aeb0984e961 ]
of_get_child_by_name() returns a node pointer with refcount incremented, so we should use of_node_put() on it when we don't need it anymore.
Add missing of_node_put() to avoid refcount leak.
--- drivers/pci/controller/pcie-mediatek-gen3.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pci/controller/pcie-mediatek-gen3.c +5 -2
@@ -600,7 +600,8 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie) &intx_domain_ops, pcie);if (!pcie->intx_domain) {dev_err (dev,"failed to create INTx IRQ domain\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto out_put_node; }/* Setup MSI */
@@ -623,13 +624,15 @@ static int mtk_pcie_init_irq_domains(struct mtk_gen3_pcie *pcie) goto err_msi_domain; } +of_node_put (intc_node);return 0 ; err_msi_domain:irq_domain_remove (pcie->msi_bottom_domain); err_msi_bottom_domain:irq_domain_remove (pcie->intx_domain); - +out_put_node: +of_node_put (intc_node);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 606/1157 fpga: altera-pr-ip: fix unsigned comparison with less than zero
In reply to Greg Kroah-HartmanFrom: Marco Pagani <[email protected]>
[ Upstream commit 2df84a757d87fd62869fc401119d429735377ec5 ]
Fix the "comparison with less than zero" warning reported by cppcheck for the unsigned (size_t) parameter count of the alt_pr_fpga_write() function.
--- drivers/fpga/altera-pr-ip-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/altera-pr-ip-core.c +1 -1
@@ -108,7 +108,7 @@ static int alt_pr_fpga_write(struct fpga_manager *mgr, const char *buf,u32 *buffer_32 = (u32 *)buf;size_t i =0 ; -if (count <=0 ) +if (!count)return -EINVAL ;/* Write out the complete 32-bit chunks */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 607/1157 usb: host: Fix refcount leak in ehci_hcd_ppc_of_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit b5c5b13cb45e2c88181308186b0001992cb41954 ]
of_find_compatible_node() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.
--- drivers/usb/host/ehci-ppc-of.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/ehci-ppc-of.c +1 -0
@@ -148,6 +148,7 @@ static int ehci_hcd_ppc_of_probe(struct platform_device *op) }else { ehci->has_amcc_usb23 =1 ; } +of_node_put (np); }if (of_get_property (dn,"big-endian" ,NULL )) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 608/1157 usb: cdns3: fix random warning message when driver load
In reply to Greg Kroah-HartmanFrom: Frank Li <[email protected]>
[ Upstream commit 8659ab3d936fcf0084676f98b75b317017aa8f82 ]
Warning log:
[ 4.141392] Unexpected gfp: 0x4 (GFP_DMA32). Fixing up to gfp: 0xa20 (GFP_ATOMIC). Fix your code! [ 4.150340] CPU: 1 PID: 175 Comm: 1-0050 Not tainted 5.15.5-00039-g2fd9ae1b568c #20 [ 4.158010] Hardware name: Freescale i.MX8QXP MEK (DT) [ 4.163155] Call trace: [ 4.165600] dump_backtrace+0x0/0x1b0 [ 4.169286] show_stack+0x18/0x68 [ 4.172611] dump_stack_lvl+0x68/0x84 [ 4.176286] dump_stack+0x18/0x34 [ 4.179613] kmalloc_fix_flags+0x60/0x88 [ 4.183550] new_slab+0x334/0x370 [ 4.186878] ___slab_alloc.part.108+0x4d4/0x748 [ 4.191419] __slab_alloc.isra.109+0x30/0x78 [ 4.195702] kmem_cache_alloc+0x40c/0x420 [ 4.199725] dma_pool_alloc+0xac/0x1f8 [ 4.203486] cdns3_allocate_trb_pool+0xb4/0xd0
pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
{
...
page = kmalloc(sizeof(*page), mem_flags);
page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation,
&page->dma, mem_flags);
...
}kmalloc was called with mem_flags, which is passed down in cdns3_allocate_trb_pool() and have GFP_DMA32 flags. kmall_fix_flags() report warning.
GFP_DMA32 is not useful at all. dma_alloc_coherent() will handle DMA memory region correctly by pool->dev. GFP_DMA32 can be removed safely.
--- drivers/usb/cdns3/cdns3-gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/cdns3/cdns3-gadget.c +1 -1
@@ -220,7 +220,7 @@ int cdns3_allocate_trb_pool(struct cdns3_endpoint *priv_ep)if (!priv_ep->trb_pool) { priv_ep->trb_pool =dma_pool_alloc (priv_dev->eps_dma_pool, -GFP_DMA32 |GFP_ATOMIC , +GFP_ATOMIC , &priv_ep->trb_pool_dma);if (!priv_ep->trb_pool)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 609/1157 usb: gadget: uvc: Fix comment blocks style
In reply to Greg Kroah-HartmanFrom: Laurent Pinchart <[email protected]>
[ Upstream commit c5d337a358b3e41bb4f7abd99a79b68a28eafaa2 ]
The UVC gadget driver historically uses the
/* Comment
* style
*/
for multi-line block comments, which is frowned upon. Patches for the driver are required to use the more standard
/*
* Comment
* style
*/
style. This result in inconsistencies. Fix it by converting all remaining instances of the old style.
--- drivers/usb/gadget/function/f_uvc.c | 30 ++++++++++++++++--------- drivers/usb/gadget/function/uvc_queue.c | 6 +++-- drivers/usb/gadget/function/uvc_video.c | 12 ++++++---- 3 files changed, 31 insertions(+), 17 deletions(-)
drivers/usb/gadget/function/f_uvc.c +19 -11
@@ -141,7 +141,8 @@ static struct usb_endpoint_descriptor uvc_fs_streaming_ep = { .bEndpointAddress = USB_DIR_IN, .bmAttributes = USB_ENDPOINT_SYNC_ASYNC | USB_ENDPOINT_XFER_ISOC, -/* The wMaxPacketSize and bInterval values will be initialized from +/* +* The wMaxPacketSize and bInterval values will be initialized from * module parameters. */ };
@@ -152,7 +153,8 @@ static struct usb_endpoint_descriptor uvc_hs_streaming_ep = { .bEndpointAddress = USB_DIR_IN, .bmAttributes = USB_ENDPOINT_SYNC_ASYNC | USB_ENDPOINT_XFER_ISOC, -/* The wMaxPacketSize and bInterval values will be initialized from +/* +* The wMaxPacketSize and bInterval values will be initialized from * module parameters. */ };
@@ -164,7 +166,8 @@ static struct usb_endpoint_descriptor uvc_ss_streaming_ep = { .bEndpointAddress = USB_DIR_IN, .bmAttributes = USB_ENDPOINT_SYNC_ASYNC | USB_ENDPOINT_XFER_ISOC, -/* The wMaxPacketSize and bInterval values will be initialized from +/* +* The wMaxPacketSize and bInterval values will be initialized from * module parameters. */ };
@@ -172,7 +175,8 @@ static struct usb_endpoint_descriptor uvc_ss_streaming_ep = {static struct usb_ss_ep_comp_descriptor uvc_ss_streaming_comp = { .bLength =sizeof (uvc_ss_streaming_comp), .bDescriptorType =USB_DT_SS_ENDPOINT_COMP , -/* The bMaxBurst, bmAttributes and wBytesPerInterval values will be +/* +* The bMaxBurst, bmAttributes and wBytesPerInterval values will be * initialized from module parameters. */ };
@@ -234,7 +238,8 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)if (le16_to_cpu (ctrl->wLength) >UVC_MAX_REQUEST_SIZE )return -EINVAL ; -/* Tell the complete callback to generate an event for the next request +/* +* Tell the complete callback to generate an event for the next request * that will be enqueued by UVCIOC_SEND_RESPONSE. */ uvc->event_setup_out = !(ctrl->bRequestType &USB_DIR_IN );
@@ -500,7 +505,8 @@ uvc_copy_descriptors(struct uvc_device *uvc, enum usb_device_speed speed)if (!uvc_control_desc || !uvc_streaming_cls)return ERR_PTR (-ENODEV ); -/* Descriptors layout +/* +* Descriptors layout * * uvc_iad * uvc_control_intf
@@ -597,8 +603,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f)uvcg_info (f,"%s()\n" , __func__); opts =fi_to_f_uvc_opts (f->fi); -/* Sanity check the streaming endpoint module parameters. -*/ +/* Sanity check the streaming endpoint module parameters. */ opts->streaming_interval =clamp (opts->streaming_interval,1U ,16U ); opts->streaming_maxpacket =clamp (opts->streaming_maxpacket,1U ,3072U ); opts->streaming_maxburst =min (opts->streaming_maxburst,15U );
@@ -611,7 +616,8 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) opts->streaming_maxpacket); } -/* Fill in the FS/HS/SS Video Streaming specific descriptors from the +/* +* Fill in the FS/HS/SS Video Streaming specific descriptors from the * module parameters. * * NOTE: We assume that the user knows what they are doing and won't
@@ -895,7 +901,8 @@ static void uvc_function_unbind(struct usb_configuration *c,uvcg_info (f,"%s()\n" , __func__); -/* If we know we're connected via v4l2, then there should be a cleanup +/* +* If we know we're connected via v4l2, then there should be a cleanup * of the device from userspace either via UVC_EVENT_DISCONNECT or * though the video device removal uevent. Allow some time for the * application to close out before things get deleted.
@@ -912,7 +919,8 @@ static void uvc_function_unbind(struct usb_configuration *c,v4l2_device_unregister (&uvc->v4l2_dev);if (uvc->func_connected) { -/* Wait for the release to occur to ensure there are no longer any +/* +* Wait for the release to occur to ensure there are no longer any * pending operations that may cause panics when resources are cleaned * up. */
drivers/usb/gadget/function/uvc_queue.c +4 -2
@@ -104,7 +104,8 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)if (likely (!(queue->flags &UVC_QUEUE_DISCONNECTED ))) {list_add_tail (&buf->queue, &queue->irqqueue); }else { -/* If the device is disconnected return the buffer to userspace +/* +* If the device is disconnected return the buffer to userspace * directly. The next QBUF call will fail with -ENODEV. */ buf->state =UVC_BUF_STATE_ERROR ;
@@ -255,7 +256,8 @@ void uvcg_queue_cancel(struct uvc_video_queue *queue, int disconnect) } queue->buf_used =0 ; -/* This must be protected by the irqlock spinlock to avoid race +/* +* This must be protected by the irqlock spinlock to avoid race * conditions between uvc_queue_buffer and the disconnection event that * could result in an interruptible wait in uvc_dequeue_buffer. Do not * blindly replace this logic by checking for the UVC_DEV_DISCONNECTED
drivers/usb/gadget/function/uvc_video.c +8 -4
@@ -378,7 +378,8 @@ static void uvcg_video_pump(struct work_struct *work)int ret;while (video->ep->enabled) { -/* Retrieve the first available USB request, protected by the +/* +* Retrieve the first available USB request, protected by the * request lock. */ spin_lock_irqsave (&video->req_lock, flags);
@@ -391,7 +392,8 @@ static void uvcg_video_pump(struct work_struct *work)list_del (&req->list);spin_unlock_irqrestore (&video->req_lock, flags); -/* Retrieve the first available video buffer and fill the +/* +* Retrieve the first available video buffer and fill the * request, protected by the video queue irqlock. */ spin_lock_irqsave (&queue->irqlock, flags);
@@ -403,9 +405,11 @@ static void uvcg_video_pump(struct work_struct *work) video->encode (req, video, buf); -/* With usb3 we have more requests. This will decrease the +/* +* With usb3 we have more requests. This will decrease the * interrupt load to a quarter but also catches the corner -* cases, which needs to be handled */ +* cases, which needs to be handled. +*/ if (list_empty(&video->req_free) || buf->state == UVC_BUF_STATE_DONE || !(video->req_int_count %
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 610/1157 usb: ohci-nxp: Fix refcount leak in ohci_hcd_nxp_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 302970b4cad3ebfda2c05ce06c322ccdc447d17e ]
of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() to avoid refcount leak.
--- drivers/usb/host/ohci-nxp.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/ohci-nxp.c +1 -0
@@ -164,6 +164,7 @@ static int ohci_hcd_nxp_probe(struct platform_device *pdev) } isp1301_i2c_client =isp1301_get_client (isp1301_node); +of_node_put (isp1301_node);if (!isp1301_i2c_client)return -EPROBE_DEFER ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 611/1157 usb: gadget: tegra-xudc: Fix error check in tegra_xudc_powerdomain_init()
In reply to Greg Kroah-HartmanFrom: Tang Bin <[email protected]>
[ Upstream commit f08aa7c80dac27ee00fa6827f447597d2fba5465 ]
dev_pm_domain_attach_by_name() may return NULL in some cases, so IS_ERR() doesn't meet the requirements. Thus fix it.
--- drivers/usb/gadget/udc/tegra-xudc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/tegra-xudc.c +4 -4
@@ -3691,15 +3691,15 @@ static int tegra_xudc_powerdomain_init(struct tegra_xudc *xudc)int err; xudc->genpd_dev_device =dev_pm_domain_attach_by_name (dev,"dev" ); -if (IS_ERR (xudc->genpd_dev_device)) { - err =PTR_ERR (xudc->genpd_dev_device); +if (IS_ERR_OR_NULL (xudc->genpd_dev_device)) { + err =PTR_ERR (xudc->genpd_dev_device) ? : -ENODATA ;dev_err (dev,"failed to get device power domain: %d\n" , err);return err; } xudc->genpd_dev_ss =dev_pm_domain_attach_by_name (dev,"ss" ); -if (IS_ERR (xudc->genpd_dev_ss)) { - err =PTR_ERR (xudc->genpd_dev_ss); +if (IS_ERR_OR_NULL (xudc->genpd_dev_ss)) { + err =PTR_ERR (xudc->genpd_dev_ss) ? : -ENODATA ;dev_err (dev,"failed to get SuperSpeed power domain: %d\n" , err);return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 612/1157 usbip: vudc: Dont enable IRQs prematurely
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 62e4efe3375eb30292dabaec4481dc04550d3644 ]
This code does:
spin_unlock_irq(&udc->ud.lock); spin_unlock_irqrestore(&udc->lock, flags);
which does not make sense. In theory, the first unlock could enable IRQs and then the second _irqrestore could disable them again. There would be a brief momemt where IRQs were enabled improperly.
In real life, however, this function is always called with IRQs enabled and the bug does not affect runtime.
--- drivers/usb/usbip/vudc_sysfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/usb/usbip/vudc_sysfs.c +7 -7
@@ -128,7 +128,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, goto unlock; } -spin_lock_irq (&udc->ud.lock); +spin_lock (&udc->ud.lock);if (udc->ud.status !=SDEV_ST_AVAILABLE ) { ret = -EINVAL ;
@@ -150,7 +150,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, }/* unlock and create threads and get tasks */ -spin_unlock_irq (&udc->ud.lock); +spin_unlock (&udc->ud.lock);spin_unlock_irqrestore (&udc->lock, flags); tcp_rx =kthread_create (&v_rx_loop, &udc->ud,"vudc_rx" );
@@ -173,14 +173,14 @@ static ssize_t usbip_sockfd_store(struct device *dev,/* lock and update udc->ud state */ spin_lock_irqsave (&udc->lock, flags); -spin_lock_irq (&udc->ud.lock); +spin_lock (&udc->ud.lock); udc->ud.tcp_socket = socket; udc->ud.tcp_rx = tcp_rx; udc->ud.tcp_tx = tcp_tx; udc->ud.status =SDEV_ST_USED ; -spin_unlock_irq (&udc->ud.lock); +spin_unlock (&udc->ud.lock);ktime_get_ts64 (&udc->start_time);v_start_timer (udc);
@@ -201,12 +201,12 @@ static ssize_t usbip_sockfd_store(struct device *dev, goto unlock; } -spin_lock_irq (&udc->ud.lock); +spin_lock (&udc->ud.lock);if (udc->ud.status !=SDEV_ST_USED ) { ret = -EINVAL ; goto unlock_ud; } -spin_unlock_irq (&udc->ud.lock); +spin_unlock (&udc->ud.lock);usbip_event_add (&udc->ud,VUDC_EVENT_DOWN ); }
@@ -219,7 +219,7 @@ static ssize_t usbip_sockfd_store(struct device *dev, sock_err:sockfd_put (socket); unlock_ud: -spin_unlock_irq (&udc->ud.lock); +spin_unlock (&udc->ud.lock); unlock:spin_unlock_irqrestore (&udc->lock, flags);mutex_unlock (&udc->ud.sysfs_lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 613/1157 usb: host: ohci-at91: add support to enter suspend using SMC
In reply to Greg Kroah-HartmanFrom: Clément Léger <[email protected]>
[ Upstream commit 1e073e3ed9ff9ec14e7e360ed89a81256d895588 ]
When Linux is running under OP-TEE, the SFR is set as secured and thus the AT91_OHCIICR_USB_SUSPEND register isn't accessible. Add a SMC to do the appropriate call to suspend the controller.
The SMC id is fetched from the device-tree property "microchip,suspend-smc-id". if present, then the syscon regmap is not used to enter suspend and a SMC is issued.
--- drivers/usb/host/ohci-at91.c | 69 ++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 23 deletions(-)
drivers/usb/host/ohci-at91.c +46 -23
@@ -13,6 +13,7 @@* This file is licenced under the GPL. */ +#include <linux/arm-smccc.h> #include <linux/clk.h> #include <linux/dma-mapping.h> #include <linux/gpio/consumer.h>
@@ -55,6 +56,7 @@ struct ohci_at91_priv {bool clocked;bool wakeup;/* Saved wake-up state for resume */ struct regmap *sfr_regmap; +u32 suspend_smc_id; };/* interface and function clocks; sometimes also an AHB clock */
@@ -135,6 +137,19 @@ static void at91_stop_hc(struct platform_device *pdev)static void usb_hcd_at91_remove (struct usb_hcd *,struct platform_device *); +static u32 at91_dt_suspend_smc (struct device *dev) +{ +u32 suspend_smc_id; + +if (!dev->of_node) +return 0 ; + +if (of_property_read_u32 (dev->of_node,"microchip,suspend-smc-id" , &suspend_smc_id)) +return 0 ; + +return suspend_smc_id; +} +static struct regmap *at91_dt_syscon_sfr (void ) {struct regmap *regmap;
@@ -215,9 +230,13 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver, goto err; } - ohci_at91->sfr_regmap =at91_dt_syscon_sfr (); -if (!ohci_at91->sfr_regmap) -dev_dbg (dev,"failed to find sfr node\n" ); + ohci_at91->suspend_smc_id =at91_dt_suspend_smc (dev); +if (!ohci_at91->suspend_smc_id) { +dev_dbg (dev,"failed to find sfr suspend smc id, using regmap\n" ); + ohci_at91->sfr_regmap =at91_dt_syscon_sfr (); +if (!ohci_at91->sfr_regmap) +dev_dbg (dev,"failed to find sfr node\n" ); + } board = hcd->self.controller->platform_data; ohci =hcd_to_ohci (hcd);
@@ -303,24 +322,30 @@ static int ohci_at91_hub_status_data(struct usb_hcd *hcd, char *buf)return length; } -static int ohci_at91_port_suspend (struct regmap *regmap,u8 set) +static int ohci_at91_port_suspend (struct ohci_at91_priv *ohci_at91,u8 set) { +struct regmap *regmap = ohci_at91->sfr_regmap;u32 regval;int ret; -if (!regmap) -return 0 ; +if (ohci_at91->suspend_smc_id) { +struct arm_smccc_res res; - ret =regmap_read (regmap,AT91_SFR_OHCIICR , ®val); -if (ret) -return ret; +arm_smccc_smc (ohci_at91->suspend_smc_id, set,0 ,0 ,0 ,0 ,0 ,0 , &res); +if (res.a0) +return -EINVAL ; + }else if (regmap) { + ret =regmap_read (regmap,AT91_SFR_OHCIICR , ®val); +if (ret) +return ret; -if (set) - regval |=AT91_OHCIICR_USB_SUSPEND ; -else - regval &= ~AT91_OHCIICR_USB_SUSPEND ; +if (set) + regval |=AT91_OHCIICR_USB_SUSPEND ; +else + regval &= ~AT91_OHCIICR_USB_SUSPEND ; -regmap_write (regmap,AT91_SFR_OHCIICR , regval); +regmap_write (regmap,AT91_SFR_OHCIICR , regval); + }return 0 ; }
@@ -357,9 +382,8 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,case USB_PORT_FEAT_SUSPEND :dev_dbg (hcd->self.controller,"SetPortFeat: SUSPEND\n" ); -if (valid_port (wIndex) && ohci_at91->sfr_regmap) { -ohci_at91_port_suspend (ohci_at91->sfr_regmap, -1 ); +if (valid_port (wIndex)) { +ohci_at91_port_suspend (ohci_at91,1 );return 0 ; }break ;
@@ -400,9 +424,8 @@ static int ohci_at91_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,case USB_PORT_FEAT_SUSPEND :dev_dbg (hcd->self.controller,"ClearPortFeature: SUSPEND\n" ); -if (valid_port (wIndex) && ohci_at91->sfr_regmap) { -ohci_at91_port_suspend (ohci_at91->sfr_regmap, -0 ); +if (valid_port (wIndex)) { +ohci_at91_port_suspend (ohci_at91,0 );return 0 ; }break ;
@@ -630,10 +653,10 @@ ohci_hcd_at91_drv_suspend(struct device *dev)/* flush the writes */ (void )ohci_readl (ohci, &ohci->regs->control);msleep (1 ); -ohci_at91_port_suspend (ohci_at91->sfr_regmap,1 ); +ohci_at91_port_suspend (ohci_at91,1 );at91_stop_clock (ohci_at91); }else { -ohci_at91_port_suspend (ohci_at91->sfr_regmap,1 ); +ohci_at91_port_suspend (ohci_at91,1 ); }return ret;
@@ -645,7 +668,7 @@ ohci_hcd_at91_drv_resume(struct device *dev)struct usb_hcd *hcd =dev_get_drvdata (dev);struct ohci_at91_priv *ohci_at91 =hcd_to_ohci_at91_priv (hcd); -ohci_at91_port_suspend (ohci_at91->sfr_regmap,0 ); +ohci_at91_port_suspend (ohci_at91,0 );if (ohci_at91->wakeup)disable_irq_wake (hcd->irq);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 614/1157 usb: xhci: tegra: Fix error check
In reply to Greg Kroah-HartmanFrom: Tang Bin <[email protected]>
[ Upstream commit 18fc7c435be3f17ea26a21b2e2312fcb9088e01f ]
In the function tegra_xusb_powerdomain_init(), dev_pm_domain_attach_by_name() may return NULL in some cases, so IS_ERR() doesn't meet the requirements. Thus fix it.
--- drivers/usb/host/xhci-tegra.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-tegra.c +4 -4
@@ -1010,15 +1010,15 @@ static int tegra_xusb_powerdomain_init(struct device *dev,int err; tegra->genpd_dev_host =dev_pm_domain_attach_by_name (dev,"xusb_host" ); -if (IS_ERR (tegra->genpd_dev_host)) { - err =PTR_ERR (tegra->genpd_dev_host); +if (IS_ERR_OR_NULL (tegra->genpd_dev_host)) { + err =PTR_ERR (tegra->genpd_dev_host) ? : -ENODATA ;dev_err (dev,"failed to get host pm-domain: %d\n" , err);return err; } tegra->genpd_dev_ss =dev_pm_domain_attach_by_name (dev,"xusb_ss" ); -if (IS_ERR (tegra->genpd_dev_ss)) { - err =PTR_ERR (tegra->genpd_dev_ss); +if (IS_ERR_OR_NULL (tegra->genpd_dev_ss)) { + err =PTR_ERR (tegra->genpd_dev_ss) ? : -ENODATA ;dev_err (dev,"failed to get superspeed pm-domain: %d\n" , err);return err; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 615/1157 dmaengine: dw: dmamux: Export the module device table
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 2717d33841957a0f5fb65fd8b37f9c2321593864 ]
This is a tristate driver that can be built as a module, as a result, the OF match table should be exported with MODULE_DEVICE_TABLE().
--- drivers/dma/dw/rzn1-dmamux.c | 1 + 1 file changed, 1 insertion(+)
drivers/dma/dw/rzn1-dmamux.c +1 -0
@@ -140,6 +140,7 @@ static const struct of_device_id rzn1_dmamux_match[] = { { .compatible = "renesas,rzn1-dmamux" }, {} }; +MODULE_DEVICE_TABLE (of, rzn1_dmamux_match);static struct platform_driver rzn1_dmamux_driver = { .driver = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 616/1157 dmaengine: dw: dmamux: Fix build without CONFIG_OF
In reply to Greg Kroah-HartmanFrom: Miquel Raynal <[email protected]>
[ Upstream commit 7811f2e7fd6a30d96eaa1fccf57b07694a8cad27 ]
When built without OF support, of_match_node() expands to NULL, which produces the following output:
Quoted 1 line
Quoted 1 line
drivers/dma/dw/rzn1-dmamux.c:105:34: warning: unused variable 'rzn1_dmac_match' [-Wunused-const-variable]
static const struct of_device_id rzn1_dmac_match[] = {
One way to silence the warning is to enclose the structure definition with an #ifdef CONFIG_OF/#endif block.
--- drivers/dma/dw/rzn1-dmamux.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/dma/dw/rzn1-dmamux.c +2 -0
@@ -102,10 +102,12 @@ static void *rzn1_dmamux_route_allocate(struct of_phandle_args *dma_spec,return ERR_PTR (ret); } +#ifdef CONFIG_OF static const struct of_device_id rzn1_dmac_match[] = { { .compatible ="renesas,rzn1-dma" }, {} }; +#endif static int rzn1_dmamux_probe (struct platform_device *pdev) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 617/1157 netfilter: xtables: Bring SPDX identifier back
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
[ Upstream commit 20646f5b1e798bcc20044ae90ac3702f177bf254 ]
Commit e2be04c7f995 ("License cleanup: add SPDX license identifier to uapi header files with a license") added the correct SPDX identifier to include/uapi/linux/netfilter/xt_IDLETIMER.h.
A subsequent commit removed it for no reason and reintroduced the UAPI license incorrectness as the file is now missing the UAPI exception again.
Add it back and remove the GPLv2 boilerplate while at it.
--- include/uapi/linux/netfilter/xt_IDLETIMER.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
include/uapi/linux/netfilter/xt_IDLETIMER.h +1 -16
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* -* linux/include/linux/netfilter/xt_IDLETIMER.h -* * Header file for Xtables timer target module. * * Copyright (C) 2004, 2010 Nokia Corporation
@@ -10,20 +9,6 @@* by Luciano Coelho <[email protected]> * * Contact: Luciano Coelho <[email protected]> -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* version 2 as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA */ #ifndef _XT_IDLETIMER_H
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 618/1157 scsi: qla2xxx: edif: Send LOGO for unexpected IKE message
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 2b659ed67a12f39f56d8dcad9b5d5a74d67c01b3 ]
If the session is down and the local port continues to receive AUTH ELS messages, the driver needs to send back LOGO so that the remote device knows to tear down its session. Terminate and clean up the AUTH ELS exchange followed by a passthrough LOGO.
--- drivers/scsi/qla2xxx/qla_edif.c | 19 +++++++++++++++++-- drivers/scsi/qla2xxx/qla_fw.h | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_edif.c +17 -2
@@ -2643,8 +2643,7 @@ void qla24xx_auth_els(scsi_qla_host_t *vha, void **pkt, struct rsp_que **rsp) fcport =qla2x00_find_fcport_by_pid (host, &purex->pur_info.pur_sid); -if (DBELL_INACTIVE (vha) || - (fcport &&EDIF_SESSION_DOWN (fcport))) { +if (DBELL_INACTIVE (vha)) {ql_dbg (ql_dbg_edif, host,0x0910c ,"%s e_dbell.db_flags =%x %06x\n" , __func__, host->e_dbell.db_flags, fcport ? fcport->d_id.b24 :0 );
@@ -2654,6 +2653,22 @@ void qla24xx_auth_els(scsi_qla_host_t *vha, void **pkt, struct rsp_que **rsp)return ; } +if (fcport &&EDIF_SESSION_DOWN (fcport)) { +ql_dbg (ql_dbg_edif, host,0x13b6 , +"%s terminate exchange. Send logo to 0x%x\n" , + __func__, a.did.b24); + + a.tx_byte_count = a.tx_len =0 ; + a.tx_addr =0 ; + a.control_flags =EPD_RX_XCHG ;/* EPD_RX_XCHG = terminate cmd */ +qla_els_reject_iocb (host, (*rsp)->qpair, &a); +qla_enode_free (host, ptr); +/* send logo to let remote port knows to tear down session */ + fcport->send_els_logo =1 ; +qlt_schedule_sess_for_deletion (fcport); +return ; + } +/* add the local enode to the list */ qla_enode_add (host, ptr);
drivers/scsi/qla2xxx/qla_fw.h +1 -1
@@ -807,7 +807,7 @@ struct els_entry_24xx {#define EPD_ELS_COMMAND (0 << 13)#define EPD_ELS_ACC (1 << 13)#define EPD_ELS_RJT (2 << 13) -#define EPD_RX_XCHG (3 << 13) +#define EPD_RX_XCHG (3 << 13)/* terminate exchange */ #define ECF_CLR_PASSTHRU_PEND BIT_12#define ECF_INCL_FRAME_HDR BIT_11#define ECF_SEC_LOGIN BIT_3
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 619/1157 scsi: qla2xxx: edif: Reduce disruption due to multiple app start
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 0dbfce5255fe8d069a1a3b712a25b263264cfa58 ]
Multiple app start can trigger a session bounce. Make driver skip over session teardown if app start is seen more than once.
--- drivers/scsi/qla2xxx/qla_edif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_edif.c +2 -2
@@ -510,8 +510,7 @@ qla_edif_app_start(scsi_qla_host_t *vha, struct bsg_job *bsg_job)/* mark doorbell as active since an app is now present */ vha->e_dbell.db_flags |=EDB_ACTIVE ; }else { -ql_dbg (ql_dbg_edif, vha,0x911e ,"%s doorbell already active\n" , - __func__); + goto out; }if (N2N_TOPO (vha->hw)) {
@@ -578,6 +577,7 @@ qla_edif_app_start(scsi_qla_host_t *vha, struct bsg_job *bsg_job) __func__); } +out: appreply.host_support_edif = vha->hw->flags.edif_enabled; appreply.edif_enode_active = vha->pur_cinfo.enode_flags; appreply.edif_edb_active = vha->e_dbell.db_flags;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 620/1157 scsi: qla2xxx: edif: Fix no login after app start
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 24c796098f5395477f7f7ebf8e24f3f08a139f71 ]
The scenario is this: User loaded driver but has not started authentication app. All sessions to secure device will exhaust all login attempts, fail, and in stay in deleted state. Then some time later the app is started. The driver will replenish the login retry count, trigger delete to prepare for secure login. After deletion, relogin is triggered.
For the session that is already deleted, the delete trigger is a no-op. If none of the sessions trigger a relogin, no progress is made.
Add a relogin trigger.
--- drivers/scsi/qla2xxx/qla_edif.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_edif.c +1 -0
@@ -567,6 +567,7 @@ qla_edif_app_start(scsi_qla_host_t *vha, struct bsg_job *bsg_job)qlt_schedule_sess_for_deletion (fcport);qla_edif_sa_ctl_init (vha, fcport); } +set_bit (RELOGIN_NEEDED , &vha->dpc_flags); }if (vha->pur_cinfo.enode_flags !=ENODE_ACTIVE ) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 621/1157 scsi: qla2xxx: edif: Tear down session if keys have been removed
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit d7e2e4a68fc047a025afcd200e6b7e1fbc8b1999 ]
If all keys for a session have been deleted, trigger a session teardown.
--- drivers/scsi/qla2xxx/qla_def.h | 5 +++++ drivers/scsi/qla2xxx/qla_isr.c | 1 + 2 files changed, 6 insertions(+)
drivers/scsi/qla2xxx/qla_def.h +5 -0
@@ -2158,6 +2158,11 @@ typedef struct {#define CS_IOCB_ERROR 0x31/* Generic error for IOCB request failure */ #define CS_REJECT_RECEIVED 0x4E/* Reject received */ +#define CS_EDIF_AUTH_ERROR 0x63/* decrypt error */ +#define CS_EDIF_PAD_LEN_ERROR 0x65/* pad > frame size, not 4byte align */ +#define CS_EDIF_INV_REQ 0x66/* invalid request */ +#define CS_EDIF_SPI_ERROR 0x67/* rx frame unable to locate sa */ +#define CS_EDIF_HDR_ERROR 0x69/* data frame != expected len */ #define CS_BAD_PAYLOAD 0x80/* Driver defined */ #define CS_UNKNOWN 0x81/* Driver defined */ #define CS_RETRY 0x82/* Driver defined */
drivers/scsi/qla2xxx/qla_isr.c +1 -0
@@ -3424,6 +3424,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)case CS_PORT_UNAVAILABLE :case CS_TIMEOUT :case CS_RESET : +case CS_EDIF_INV_REQ :/* * We are going to have the fc class block the rport
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 622/1157 scsi: qla2xxx: edif: Fix session thrash
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit a8fdfb0b39c2b31722c70bdf2272b949d5af4b7b ]
Current code prematurely sends out PRLI before authentication application has given the OK to do so. This causes PRLI failure and session teardown.
Prevents PRLI from going out before authentication app gives the OK.
--- drivers/scsi/qla2xxx/qla_edif.c | 2 +- drivers/scsi/qla2xxx/qla_edif.h | 4 ++++ drivers/scsi/qla2xxx/qla_init.c | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_edif.c +1 -1
@@ -3588,7 +3588,7 @@ int qla_edif_process_els(scsi_qla_host_t *vha, struct bsg_job *bsg_job)if (qla_bsg_check (vha, bsg_job, fcport))return 0 ; -if (fcport->loop_id ==FC_NO_LOOP_ID ) { +if (EDIF_SESS_DELETE (fcport)) {ql_dbg (ql_dbg_edif, vha,0x910d ,"%s ELS code %x, no loop id.\n" , __func__, bsg_request->rqst_data.r_els.els_code);
drivers/scsi/qla2xxx/qla_edif.h +4 -0
@@ -141,4 +141,8 @@ struct enode { (DBELL_ACTIVE (_fcport->vha) && \ (_fcport->disc_state == DSC_LOGIN_AUTH_PEND)) +#define EDIF_SESS_DELETE (_s) \ + (qla_ini_mode_enabled(_s->vha) && (_s->disc_state == DSC_DELETE_PEND || \ + _s->disc_state == DSC_DELETED)) +#endif /* __QLA_EDIF_H */
drivers/scsi/qla2xxx/qla_init.c +9 -1
@@ -1762,8 +1762,16 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)break ;case DSC_LOGIN_PEND : -if (fcport->fw_login_state ==DSC_LS_PLOGI_COMP ) +if (vha->hw->flags.edif_enabled) +break ; + +if (fcport->fw_login_state ==DSC_LS_PLOGI_COMP ) { +ql_dbg (ql_dbg_disc, vha,0x2118 , +"%s %d %8phC post %s PRLI\n" , + __func__, __LINE__, fcport->port_name, +NVME_TARGET (vha->hw, fcport) ?"NVME" :"FC" );qla24xx_post_prli_work (vha, fcport); + }break ;case DSC_UPD_FCPORT :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 623/1157 scsi: qla2xxx: edif: Fix no logout on delete for N2N
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit ec538eb838f334453b10e7e9b260f0c358018a37 ]
The driver failed to send implicit logout on session delete. For edif, this failed to flush any lingering SA index in FW.
Set a flag to turn on implicit logout early in the session recovery to make sure the logout will go out in case of error.
--- drivers/scsi/qla2xxx/qla_iocb.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/qla2xxx/qla_iocb.c +3 -0
@@ -2882,6 +2882,9 @@ static void qla2x00_els_dcmd2_sp_done(srb_t *sp, int res) sp->name, res, sp->handle, fcport->d_id.b24, fcport->port_name); fcport->flags &= ~(FCF_ASYNC_SENT |FCF_ASYNC_ACTIVE ); +/* For edif, set logout on delete to ensure any residual key from FW is flushed.*/ + fcport->logout_on_delete =1 ; + fcport->chip_reset = vha->hw->base_qpair->chip_reset;if (sp->flags &SRB_WAKEUP_ON_COMP )complete (&lio->u.els_plogi.comp);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 624/1157 scsi: qla2xxx: edif: Reduce N2N thrashing at app_start time
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
[ Upstream commit 37be3f9d6993a721bc019f03c97ea0fe66319997 ]
For N2N + remote WWPN is bigger than local adapter, remote adapter will login to local adapter while authentication application is not running. When authentication application starts, the current session in FW needs to to be invalidated.
Make sure the old session is torn down before triggering a relogin.
--- drivers/scsi/qla2xxx/qla_edif.c | 47 ++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 13 deletions(-)
drivers/scsi/qla2xxx/qla_edif.c +34 -13
@@ -517,11 +517,28 @@ qla_edif_app_start(scsi_qla_host_t *vha, struct bsg_job *bsg_job)list_for_each_entry_safe (fcport, tf, &vha->vp_fcports, list) fcport->n2n_link_reset_cnt =0 ; -if (vha->hw->flags.n2n_fw_acc_sec) -set_bit (N2N_LINK_RESET , &vha->dpc_flags); -else +if (vha->hw->flags.n2n_fw_acc_sec) { +list_for_each_entry_safe (fcport, tf, &vha->vp_fcports, list) +qla_edif_sa_ctl_init (vha, fcport); + +/* +* While authentication app was not running, remote device +* could still try to login with this local port. Let's +* clear the state and try again. +*/ +qla2x00_wait_for_sess_deletion (vha); + +/* bounce the link to get the other guy to relogin */ +if (!vha->hw->flags.n2n_bigger) { +set_bit (N2N_LINK_RESET , &vha->dpc_flags); +qla2xxx_wake_dpc (vha); + } + }else { +qla2x00_wait_for_hba_online (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags); -qla2xxx_wake_dpc (vha); +qla2xxx_wake_dpc (vha); +qla2x00_wait_for_hba_online (vha); + } }else {list_for_each_entry_safe (fcport, tf, &vha->vp_fcports, list) { ql_dbg(ql_dbg_edif, vha, 0x2058,
@@ -920,17 +937,21 @@ qla_edif_app_getfcinfo(scsi_qla_host_t *vha, struct bsg_job *bsg_job)if (tdid.b24 !=0 && tdid.b24 != fcport->d_id.b24)continue ; -if (fcport->scan_state !=QLA_FCPORT_FOUND ) -continue ; +if (!N2N_TOPO (vha->hw)) { +if (fcport->scan_state !=QLA_FCPORT_FOUND ) +continue ; -if (fcport->port_type ==FCT_UNKNOWN && !fcport->fc4_features) - rval =qla24xx_async_gffid (vha, fcport, true); +if (fcport->port_type ==FCT_UNKNOWN && + !fcport->fc4_features) + rval =qla24xx_async_gffid (vha, fcport, + true); -if (!rval && - !(fcport->fc4_features &FC4_FF_TARGET || - fcport->port_type & - (FCT_TARGET |FCT_NVME_TARGET ))) -continue ; +if (!rval && + !(fcport->fc4_features &FC4_FF_TARGET || + fcport->port_type & + (FCT_TARGET |FCT_NVME_TARGET ))) +continue ; + } rval =0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 625/1157 iio: accel: bma400: Fix the scale min and max macro values
In reply to Greg Kroah-HartmanFrom: Jagath Jog J <[email protected]>
[ Upstream commit 747c7cf1592e226d40543231b26502b332d0ea2f ]
Changing the scale macro values to match the bma400 sensitivity for 1 LSB of all the available ranges.
--- drivers/iio/accel/bma400.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
drivers/iio/accel/bma400.h +21 -2
@@ -83,8 +83,27 @@#define BMA400_ACC_ODR_MIN_WHOLE_HZ 25#define BMA400_ACC_ODR_MIN_HZ 12 -#define BMA400_SCALE_MIN 38357 -#define BMA400_SCALE_MAX 306864 +/* +* BMA400_SCALE_MIN macro value represents m/s^2 for 1 LSB before +* converting to micro values for +-2g range. +* +* For +-2g - 1 LSB = 0.976562 milli g = 0.009576 m/s^2 +* For +-4g - 1 LSB = 1.953125 milli g = 0.019153 m/s^2 +* For +-16g - 1 LSB = 7.8125 milli g = 0.076614 m/s^2 +* +* The raw value which is used to select the different ranges is determined +* by the first bit set position from the scale value, so BMA400_SCALE_MIN +* should be odd. +* +* Scale values for +-2g, +-4g, +-8g and +-16g are populated into bma400_scales +* array by left shifting BMA400_SCALE_MIN. +* e.g.: +* To select +-2g = 9577 << 0 = raw value to write is 0. +* To select +-8g = 9577 << 2 = raw value to write is 2. +* To select +-16g = 9577 << 3 = raw value to write is 3. +*/ +#define BMA400_SCALE_MIN 9577 +#define BMA400_SCALE_MAX 76617#define BMA400_NUM_REGULATORS 2#define BMA400_VDD_REGULATOR 0
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 626/1157 platform/chrome: cros_ec: Always expose last resume result
In reply to Greg Kroah-HartmanFrom: Stephen Boyd <[email protected]>
[ Upstream commit 74bb746407bf0d7c7d126c7731dbcd66d467619b ]
The last resume result exposing logic in cros_ec_sleep_event() incorrectly requires S0ix support, which doesn't work on ARM based systems where S0ix doesn't exist. That's because cros_ec_sleep_event() only reports the last resume result when the EC indicates the last sleep event was an S0ix resume. On ARM systems, the last sleep event is always S3 resume, but the EC can still detect sleep hang events in case some other part of the AP is blocking sleep.
Always expose the last resume result if the EC supports it so that this works on all devices regardless of S0ix support. This fixes sleep hang detection on ARM based chromebooks like Trogdor.
--- drivers/platform/chrome/cros_ec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/platform/chrome/cros_ec.c +4 -4
@@ -135,16 +135,16 @@ static int cros_ec_sleep_event(struct cros_ec_device *ec_dev, u8 sleep_event) buf.msg.command =EC_CMD_HOST_SLEEP_EVENT ; ret =cros_ec_cmd_xfer_status (ec_dev, &buf.msg); - -/* For now, report failure to transition to S0ix with a warning. */ +/* Report failure to transition to system wide suspend with a warning. */ if (ret >=0 && ec_dev->host_sleep_v1 && - (sleep_event ==HOST_SLEEP_EVENT_S0IX_RESUME )) { + (sleep_event ==HOST_SLEEP_EVENT_S0IX_RESUME || + sleep_event ==HOST_SLEEP_EVENT_S3_RESUME )) { ec_dev->last_resume_result = buf.u.resp1.resume_response.sleep_transitions;WARN_ONCE (buf.u.resp1.resume_response.sleep_transitions &EC_HOST_RESUME_SLEEP_TIMEOUT , -"EC detected sleep transition timeout. Total slp_s0 transitions: %d" , +"EC detected sleep transition timeout. Total sleep transitions: %d" , buf.u.resp1.resume_response.sleep_transitions &EC_HOST_RESUME_SLEEP_TRANSITIONS_MASK ); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 627/1157 iio: sx9324: Fix register field spelling
In reply to Greg Kroah-HartmanFrom: Gwendal Grignou <[email protected]>
[ Upstream commit 0b24034c7ffa20bcfb4fdfece1df770ec5b0a634 ]
Field for PROX_CTRL4 should contain PROX_CTRL4.
--- drivers/iio/proximity/sx9324.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/proximity/sx9324.c +2 -2
@@ -93,7 +93,7 @@#define SX9324_REG_PROX_CTRL4_AVGNEGFILT_MASK GENMASK(5, 3)#define SX9324_REG_PROX_CTRL4_AVGNEG_FILT_2 0x08#define SX9324_REG_PROX_CTRL4_AVGPOSFILT_MASK GENMASK(2, 0) -#define SX9324_REG_PROX_CTRL3_AVGPOS_FILT_256 0x04 +#define SX9324_REG_PROX_CTRL4_AVGPOS_FILT_256 0x04#define SX9324_REG_PROX_CTRL5 0x35#define SX9324_REG_PROX_CTRL5_HYST_MASK GENMASK(5, 4)#define SX9324_REG_PROX_CTRL5_CLOSE_DEBOUNCE_MASK GENMASK(3, 2)
@@ -810,7 +810,7 @@ static const struct sx_common_reg_default sx9324_default_regs[] = { {SX9324_REG_PROX_CTRL3 ,SX9324_REG_PROX_CTRL3_AVGDEB_2SAMPLES | SX9324_REG_PROX_CTRL3_AVGPOS_THRESH_16K }, { SX9324_REG_PROX_CTRL4, SX9324_REG_PROX_CTRL4_AVGNEG_FILT_2 | - SX9324_REG_PROX_CTRL3_AVGPOS_FILT_256 }, + SX9324_REG_PROX_CTRL4_AVGPOS_FILT_256 }, { SX9324_REG_PROX_CTRL5, 0x00 }, { SX9324_REG_PROX_CTRL6, SX9324_REG_PROX_CTRL6_PROXTHRESH_32 }, { SX9324_REG_PROX_CTRL7, SX9324_REG_PROX_CTRL6_PROXTHRESH_32 },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 628/1157 iio: accel: bma400: Reordering of header files
In reply to Greg Kroah-HartmanFrom: Jagath Jog J <[email protected]>
[ Upstream commit 1bd2dc6ea863690aee5c45ebf09c9194c7a42c0d ]
Reordering of header files and removing the iio/sysfs.h since custom attributes are not being used in the driver.
--- drivers/iio/accel/bma400_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/accel/bma400_core.c +2 -2
@@ -13,14 +13,14 @@#include <linux/bitops.h> #include <linux/device.h> -#include <linux/iio/iio.h> -#include <linux/iio/sysfs.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> +#include <linux/iio/iio.h> +#include "bma400.h" /*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 629/1157 iio: accel: bma400: conversion to device-managed function
In reply to Greg Kroah-HartmanFrom: Jagath Jog J <[email protected]>
[ Upstream commit 12c99f859fd3da5fc8f8491826e7023001f54821 ]
This is a conversion to device-managed by using devm_iio_device_register() inside probe function. Previously the bma400 was not put into power down mode in some error paths in probe where it now is, but that should cause no harm.
The dev_set_drvdata() call, bma400_remove() function and hooks in the I2C and SPI driver struct is removed as devm_iio_device_register() function is used to automatically unregister on driver detach.
--- drivers/iio/accel/bma400.h | 2 - drivers/iio/accel/bma400_core.c | 77 ++++++++++++++++----------------- drivers/iio/accel/bma400_i2c.c | 8 ---- drivers/iio/accel/bma400_spi.c | 6 --- 4 files changed, 38 insertions(+), 55 deletions(-)
drivers/iio/accel/bma400.h +0 -2
@@ -113,6 +113,4 @@ extern const struct regmap_config bma400_regmap_config;int bma400_probe (struct device *dev,struct regmap *regmap,const char *name); -void bma400_remove (struct device *dev); -#endif
drivers/iio/accel/bma400_core.c +38 -39
147 lines not on this page · raw message
drivers/iio/accel/bma400_i2c.c +0 -8
@@ -27,13 +27,6 @@ static int bma400_i2c_probe(struct i2c_client *client,return bma400_probe (&client->dev, regmap, id->name); } -static int bma400_i2c_remove (struct i2c_client *client) -{ -bma400_remove (&client->dev); - -return 0 ; -} -static const struct i2c_device_id bma400_i2c_ids[] = { {"bma400" ,0 }, { }
@@ -52,7 +45,6 @@ static struct i2c_driver bma400_i2c_driver = { .of_match_table = bma400_of_i2c_match, }, .probe = bma400_i2c_probe, - .remove = bma400_i2c_remove, .id_table = bma400_i2c_ids, };
drivers/iio/accel/bma400_spi.c +0 -6
@@ -87,11 +87,6 @@ static int bma400_spi_probe(struct spi_device *spi)return bma400_probe (&spi->dev, regmap, id->name); } -static void bma400_spi_remove (struct spi_device *spi) -{ -bma400_remove (&spi->dev); -} -static const struct spi_device_id bma400_spi_ids[] = { {"bma400" ,0 }, { }
@@ -110,7 +105,6 @@ static struct spi_driver bma400_spi_driver = { .of_match_table = bma400_of_spi_match, }, .probe = bma400_spi_probe, - .remove = bma400_spi_remove, .id_table = bma400_spi_ids, };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 630/1157 iio: accel: bma400: Add triggered buffer support
In reply to Greg Kroah-HartmanFrom: Jagath Jog J <[email protected]>
[ Upstream commit ffe0ab6a96988daa8b316290c15e1c7bbb9d4211 ]
Added trigger buffer support to read continuous acceleration and temperature data from device with data ready interrupt which is mapped to INT1 pin.
--- drivers/iio/accel/Kconfig | 2 + drivers/iio/accel/bma400.h | 10 +- drivers/iio/accel/bma400_core.c | 177 +++++++++++++++++++++++++++++++- drivers/iio/accel/bma400_i2c.c | 2 +- drivers/iio/accel/bma400_spi.c | 2 +- 5 files changed, 185 insertions(+), 8 deletions(-)
drivers/iio/accel/Kconfig +2 -0
@@ -204,6 +204,8 @@ config BMA220 config BMA400 tristate "Bosch BMA400 3-Axis Accelerometer Driver" select REGMAP + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER select BMA400_I2C if I2C select BMA400_SPI if SPI help
drivers/iio/accel/bma400.h +9 -1
@@ -62,6 +62,13 @@#define BMA400_ACC_CONFIG2_REG 0x1b#define BMA400_CMD_REG 0x7e +/* Interrupt registers */ +#define BMA400_INT_CONFIG0_REG 0x1f +#define BMA400_INT_CONFIG1_REG 0x20 +#define BMA400_INT1_MAP_REG 0x21 +#define BMA400_INT_IO_CTRL_REG 0x24 +#define BMA400_INT_DRDY_MSK BIT(7) +/* Chip ID of BMA 400 devices found in the chip ID register. */ #define BMA400_ID_REG_VAL 0x90
@@ -111,6 +118,7 @@extern const struct regmap_config bma400_regmap_config; -int bma400_probe (struct device *dev,struct regmap *regmap,const char *name); +int bma400_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name);#endif
drivers/iio/accel/bma400_core.c +172 -5
247 lines not on this page · raw message
drivers/iio/accel/bma400_i2c.c +1 -1
@@ -24,7 +24,7 @@ static int bma400_i2c_probe(struct i2c_client *client,return PTR_ERR (regmap); } -return bma400_probe (&client->dev, regmap, id->name); +return bma400_probe (&client->dev, regmap, client->irq, id->name); }static const struct i2c_device_id bma400_i2c_ids[] = {
drivers/iio/accel/bma400_spi.c +1 -1
@@ -84,7 +84,7 @@ static int bma400_spi_probe(struct spi_device *spi)if (ret)dev_err (&spi->dev,"Failed to read chip id register\n" ); -return bma400_probe (&spi->dev, regmap, id->name); +return bma400_probe (&spi->dev, regmap, spi->irq, id->name); }static const struct spi_device_id bma400_spi_ids[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 631/1157 iio: core: Fix IIO_ALIGN and rename as it was not sufficiently large
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 12c4efe3509b8018e76ea3ebda8227cb53bf5887 ]
Discussion of the series:
https://lore.kernel.org/all/[email protected]/
mm, arm64: Reduce ARCH_KMALLOC_MINALIGN brought to my attention that our current IIO usage of L1CACHE_ALIGN is insufficient as their are Arm platforms out their with non coherent DMA and larger cache lines at at higher levels of their cache hierarchy.
Rename the define to make it's purpose more explicit. It will be used much more widely going forwards (to replace incorrect ____cacheline_aligned markings.
Note this patch will greatly reduce the padding on some architectures that have smaller requirements for DMA safe buffers.
The history of changing values of ARCH_KMALLOC_MINALIGN via ARCH_DMA_MINALIGN on arm64 is rather complex. I'm not tagging this as fixing a particular patch from that route as it's not clear what to tag.
Most recently a change to bring them back inline was reverted because of some Qualcomm Kryo cores with an L2 cache with 128-byte lines sitting above the point of coherency.
c1132702c71f Revert "arm64: cache: Lower ARCH_DMA_MINALIGN to 64 (L1_CACHE_BYTES)" That reverts:65688d2a05de arm64: cache: Lower ARCH_DMA_MINALIGN to 64 (L1_CACHE_BYTES) which refers to the change originally being motivated by Thunder x1 performance rather than correctness.
--- drivers/iio/accel/bma400_core.c | 2 +- drivers/iio/adc/adi-axi-adc.c | 7 ++++--- drivers/iio/industrialio-core.c | 4 ++-- include/linux/iio/iio.h | 10 ++++++++-- 4 files changed, 15 insertions(+), 8 deletions(-)
drivers/iio/accel/bma400_core.c +1 -1
@@ -79,7 +79,7 @@ struct bma400_data {__le16 buff[3 ];u8 temperature;s64 ts__aligned(8) ; - } buffer__aligned(IIO_ALIGN) ; + } buffer__aligned(IIO_DMA_MINALIGN) ;__le16 status; };
drivers/iio/adc/adi-axi-adc.c +4 -3
@@ -84,7 +84,8 @@ void *adi_axi_adc_conv_priv(struct adi_axi_adc_conv *conv) {struct adi_axi_adc_client *cl =conv_to_client (conv); -return (char *)cl +ALIGN (sizeof (struct adi_axi_adc_client ),IIO_ALIGN ); +return (char *)cl +ALIGN (sizeof (struct adi_axi_adc_client ), +IIO_DMA_MINALIGN ); }EXPORT_SYMBOL_GPL (adi_axi_adc_conv_priv);
@@ -169,9 +170,9 @@ static struct adi_axi_adc_conv *adi_axi_adc_conv_register(struct device *dev,struct adi_axi_adc_client *cl;size_t alloc_size; - alloc_size =ALIGN (sizeof (struct adi_axi_adc_client ),IIO_ALIGN ); + alloc_size =ALIGN (sizeof (struct adi_axi_adc_client ),IIO_DMA_MINALIGN );if (sizeof_priv) - alloc_size +=ALIGN (sizeof_priv,IIO_ALIGN ); + alloc_size +=ALIGN (sizeof_priv,IIO_DMA_MINALIGN ); cl =kzalloc (alloc_size,GFP_KERNEL );if (!cl)
drivers/iio/industrialio-core.c +2 -2
@@ -1669,7 +1669,7 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) alloc_size =sizeof (struct iio_dev_opaque );if (sizeof_priv) { - alloc_size =ALIGN (alloc_size,IIO_ALIGN ); + alloc_size =ALIGN (alloc_size,IIO_DMA_MINALIGN ); alloc_size += sizeof_priv; }
@@ -1679,7 +1679,7 @@ struct iio_dev *iio_device_alloc(struct device *parent, int sizeof_priv) indio_dev = &iio_dev_opaque->indio_dev; indio_dev->priv = (char *)iio_dev_opaque + -ALIGN (sizeof (struct iio_dev_opaque ),IIO_ALIGN ); +ALIGN (sizeof (struct iio_dev_opaque ),IIO_DMA_MINALIGN ); indio_dev->dev.parent = parent; indio_dev->dev.type = &iio_device_type;
include/linux/iio/iio.h +8 -2
@@ -9,6 +9,7 @@#include <linux/device.h> #include <linux/cdev.h> +#include <linux/slab.h> #include <linux/iio/types.h> #include <linux/of.h> /* IIO TODO LIST */
@@ -709,8 +710,13 @@ static inline void *iio_device_get_drvdata(const struct iio_dev *indio_dev)return dev_get_drvdata (&indio_dev->dev); } -/* Can we make this smaller? */ -#define IIO_ALIGN L1_CACHE_BYTES +/* +* Used to ensure the iio_priv() structure is aligned to allow that structure +* to in turn include IIO_DMA_MINALIGN'd elements such as buffers which +* must not share cachelines with the rest of the structure, thus making +* them safe for use with non-coherent DMA. +*/ +#define IIO_DMA_MINALIGN ARCH_KMALLOC_MINALIGNstruct iio_dev *iio_device_alloc (struct device *parent,int sizeof_priv);/* The information at the returned address is guaranteed to be cacheline aligned */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 632/1157 iio: accel: adxl313: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit f68a0445ee86e48dafbfdea50163ad6fc6dba268 ]
____cacheline_aligned is insufficient guarantee for non-coherent DMA. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/accel/adxl313_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/accel/adxl313_core.c +1 -1
@@ -46,7 +46,7 @@ EXPORT_SYMBOL_NS_GPL(adxl313_writable_regs_table, IIO_ADXL313);struct adxl313_data {struct regmap *regmap;struct mutex lock;/* lock to protect transf_buf */ -__le16 transf_buf____cacheline_aligned ; +__le16 transf_buf__aligned(IIO_DMA_MINALIGN) ; };static const int adxl313_odr_freqs[][2 ] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 633/1157 iio: accel: adxl355: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 46403dcf3a7cbd24b86f809fd79962f4d6b137c5 ]
____cacheline_aligned is insufficient guarantee for non-coherent DMA.
Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/accel/adxl355_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/accel/adxl355_core.c +1 -1
@@ -177,7 +177,7 @@ struct adxl355_data {u8 buf[14 ];s64 ts; } buffer; - }____cacheline_aligned ; + }__aligned(IIO_DMA_MINALIGN) ; }; static int adxl355_set_op_mode(struct adxl355_data *data,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 634/1157 iio: accel: adxl367: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit e1f956a804df9074fb5de557563d153ae25252e7 ]
____cacheline_aligned is insufficient guarantee for non-coherent DMA. Switch to the updated IIO_DMA_MINALIGN definition.
Update comment to reflect that DMA safety may require separate cachelines.
--- drivers/iio/accel/adxl367.c | 2 +- drivers/iio/accel/adxl367_spi.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/iio/accel/adxl367.c +1 -1
@@ -179,7 +179,7 @@ struct adxl367_state {unsigned int fifo_set_size;unsigned int fifo_watermark; -__be16 fifo_buf[ADXL367_FIFO_SIZE ]____cacheline_aligned ; +__be16 fifo_buf[ADXL367_FIFO_SIZE ]__aligned(IIO_DMA_MINALIGN) ;__be16 sample_buf;u8 act_threshold_buf[2 ];u8 inact_time_buf[2 ];
drivers/iio/accel/adxl367_spi.c +5 -3
@@ -9,6 +9,8 @@#include <linux/regmap.h> #include <linux/spi/spi.h> +#include <linux/iio/iio.h> +#include "adxl367.h" #define ADXL367_SPI_WRITE_COMMAND 0x0A
@@ -28,10 +30,10 @@ struct adxl367_spi_state {struct spi_transfer fifo_xfer[2 ];/* -* DMA (thus cache coherency maintenance) requires the -* transfer buffers to live in their own cache lines. +* DMA (thus cache coherency maintenance) may require the +* transfer buffers live in their own cache lines. */ -u8 reg_write_tx_buf[1 ]____cacheline_aligned ; +u8 reg_write_tx_buf[1 ]__aligned(IIO_DMA_MINALIGN) ;u8 reg_read_tx_buf[2 ];u8 fifo_tx_buf[1 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 635/1157 iio: accel: bma220: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 38e71240e2ff97184cdcdaf877cf62d3f16678e2 ]
____cacheline_aligned is insufficient guarantee for non-coherent DMA. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/accel/bma220_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/accel/bma220_spi.c +1 -1
@@ -67,7 +67,7 @@ struct bma220_data {/* Ensure timestamp is naturally aligned. */ s64 timestamp__aligned(8) ; } scan; -u8 tx_buf[2 ]____cacheline_aligned ; +u8 tx_buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct iio_chan_spec bma220_channels[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 636/1157 iio: accel: sca3000: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit a263456f0e27ec2f00d25119757f4d4bd656b2e9 ]
____cacheline_aligned is insufficient guarantee for non-coherent DMA. Switch to the updated IIO_DMA_MINALIGN definition.
The second alignment marking is left in place to avoid doing more than the simple fix in this patch.
--- drivers/iio/accel/sca3000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/accel/sca3000.c +2 -2
@@ -167,8 +167,8 @@ struct sca3000_state {int mo_det_use_count;struct mutex lock;/* Can these share a cacheline ? */ -u8 rx[384 ]____cacheline_aligned ; -u8 tx[6 ]____cacheline_aligned ; +u8 rx[384 ]__aligned(IIO_DMA_MINALIGN) ; +u8 tx[6 ]__aligned(IIO_DMA_MINALIGN) ; };/**
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 637/1157 iio: accel: sca3300: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b1d3a806630dbbf3b4d75a2e850adccf4f4439e7 ]
____cacheline_aligned is insufficient guarantee for non-coherent DMA. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/accel/sca3300.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/accel/sca3300.c +1 -1
@@ -115,7 +115,7 @@ struct sca3300_data {s16 channels[4 ];s64 ts__aligned(sizeof(s64)) ; } scan; -u8 txbuf[4 ]____cacheline_aligned ; +u8 txbuf[4 ]__aligned(IIO_DMA_MINALIGN) ;u8 rxbuf[4 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 638/1157 iio: adc: ad7266: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b990cdfe7536a8da7e134d516350402981300016 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to reflect that DMA safety 'may' require separate cachelines.
--- drivers/iio/adc/ad7266.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7266.c +2 -2
@@ -37,7 +37,7 @@ struct ad7266_state {struct gpio_desc *gpios[3 ];/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * The buffer needs to be large enough to hold two samples (4 bytes) and * the naturally aligned timestamp (8 bytes).
@@ -45,7 +45,7 @@ struct ad7266_state {struct {__be16 sample[2 ];s64 timestamp; - } data____cacheline_aligned ; + } data__aligned(IIO_DMA_MINALIGN) ; };static int ad7266_wakeup (struct ad7266_state *st)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 639/1157 iio: adc: ad7280a: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 4e2008429588b857bbc13d048b67b931a8d84816 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ad7280a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7280a.c +1 -1
@@ -183,7 +183,7 @@ struct ad7280_state {unsigned char cb_mask[AD7280A_MAX_CHAIN ];struct mutex lock;/* protect sensor state */ -__be32 tx____cacheline_aligned ; +__be32 tx__aligned(IIO_DMA_MINALIGN) ;__be32 rx; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 640/1157 iio: adc: ad7292: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 98295a206d04633bae31f279de11ff7d04724bce ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ad7292.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7292.c +1 -1
@@ -80,7 +80,7 @@ struct ad7292_state {struct regulator *reg;unsigned short vref_mv; -__be16 d16____cacheline_aligned ; +__be16 d16__aligned(IIO_DMA_MINALIGN) ;u8 d8[2 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 641/1157 iio: adc: ad7298: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 585c9772f883da3ac425e2e8277b2aaceb201f38 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ad7298.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7298.c +1 -1
@@ -49,7 +49,7 @@ struct ad7298_state {* DMA (thus cache coherency maintenance) requires the * transfer buffers to live in their own cache lines. */ -__be16 rx_buf[12 ]____cacheline_aligned ; +__be16 rx_buf[12 ]__aligned(IIO_DMA_MINALIGN) ;__be16 tx_buf[2 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 642/1157 iio: adc: ad7476: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 58b74555afc8affe4ae4f57d396349158433fc80 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA
on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to reflect that DMA safety 'may' require separate cachelines.
Fixes tag is unlikely to be the actual introdution of the problem but is far enough back to cover any likely backporting.
--- drivers/iio/adc/ad7476.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iio/adc/ad7476.c +2 -3
@@ -44,13 +44,12 @@ struct ad7476_state {struct spi_transfer xfer;struct spi_message msg;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * Make the buffer large enough for one 16 bit sample and one 64 bit * aligned 64 bit timestamp. */ -unsigned char data[ALIGN (2 ,sizeof (s64)) +sizeof (s64)] -____cacheline_aligned ; +unsigned char data[ALIGN (2 ,sizeof (s64)) +sizeof (s64)]__aligned(IIO_DMA_MINALIGN) ; };enum ad7476_supported_device_ids {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 643/1157 iio: adc: ad7606: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 6268c6eebb13f228d418f9adaca848b3ed5b3cf9 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_ALIGN definition.
Update the comment to reflect the fact DMA safety 'may' require separate cachelines.
--- drivers/iio/adc/ad7606.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7606.h +2 -2
@@ -116,11 +116,11 @@ struct ad7606_state {struct completion completion;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * 16 * 16-bit samples + 64-bit timestamp */ -unsigned short data[20 ]____cacheline_aligned ; +unsigned short data[20 ]__aligned(IIO_DMA_MINALIGN) ;__be16 d16[2 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 644/1157 iio: adc: ad7766: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 009ae227a1dace2d4d27c804e5bd65907e1d0557 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to reflect the fact DMA safety 'may' require separate cachelines.
--- drivers/iio/adc/ad7766.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iio/adc/ad7766.c +2 -3
@@ -45,13 +45,12 @@ struct ad7766 {struct spi_message msg;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * Make the buffer large enough for one 24 bit sample and one 64 bit * aligned 64 bit timestamp. */ -unsigned char data[ALIGN (3 ,sizeof (s64)) +sizeof (s64)] -____cacheline_aligned ; +unsigned char data[ALIGN (3 ,sizeof (s64)) +sizeof (s64)]__aligned(IIO_DMA_MINALIGN) ; };/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 645/1157 iio: adc: ad7768-1: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 211f810f8fae05c1f78e531b2b113ea1ab3d1ce7 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to reflect that separate cachelines 'may' be required.
--- drivers/iio/adc/ad7768-1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +2 -2
@@ -163,7 +163,7 @@ struct ad7768_state {struct gpio_desc *gpio_sync_in;const char *labels[ARRAY_SIZE (ad7768_channels)];/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {
@@ -173,7 +173,7 @@ struct ad7768_state { } scan;__be32 d32;u8 d8[2 ]; - } data____cacheline_aligned ; + } data__aligned(IIO_DMA_MINALIGN) ; }; static int ad7768_spi_reg_read(struct ad7768_state *st, unsigned int addr,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 646/1157 iio: adc: ad7887: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b330ea6bc52468e183ced79189ff064f36c64aa7 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
Fixes tag is clearly not where this was introduced but it is very unlikely anyone will back port it past that point.
--- drivers/iio/adc/ad7887.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iio/adc/ad7887.c +2 -3
@@ -66,13 +66,12 @@ struct ad7887_state {unsigned char tx_cmd_buf[4 ];/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * Buffer needs to be large enough to hold two 16 bit samples and a * 64 bit aligned 64 bit timestamp. */ -unsigned char data[ALIGN (4 ,sizeof (s64)) +sizeof (s64)] -____cacheline_aligned ; +unsigned char data[ALIGN (4 ,sizeof (s64)) +sizeof (s64)]__aligned(IIO_DMA_MINALIGN) ; };enum ad7887_supported_device_ids {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 647/1157 iio: adc: ad7923: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 908af45d7057345bc910940a9340f7a1d8935875 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
Note that some other fixes have applied to this line of code that may complicate automated backporting.
--- drivers/iio/adc/ad7923.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7923.c +2 -2
@@ -57,12 +57,12 @@ struct ad7923_state {unsigned int settings;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * Ensure rx_buf can be directly used in iio_push_to_buffers_with_timetamp * Length = 8 channels + 4 extra for 8 byte timestamp */ -__be16 rx_buf[12 ]____cacheline_aligned ; +__be16 rx_buf[12 ]__aligned(IIO_DMA_MINALIGN) ;__be16 tx_buf[4 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 648/1157 iio: adc: ad7949: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 9c6c7eff7d4a53efd4d0818f8664259a1862665a ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Note the fixes tag predates some changes to this line of code so automated application of this fix may fail.
--- drivers/iio/adc/ad7949.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7949.c +1 -1
@@ -86,7 +86,7 @@ struct ad7949_adc_chip {u8 resolution;u16 cfg;unsigned int current_channel; -u16 buffer____cacheline_aligned ; +u16 buffer__aligned(IIO_DMA_MINALIGN) ;__be16 buf8b; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 649/1157 iio: adc: hi8435: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 48e4ae96b0b10f93de23b86fd34e573c44e95ab3 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/hi8435.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/hi8435.c +1 -1
@@ -49,7 +49,7 @@ struct hi8435_priv {unsigned threshold_lo[2 ];/* GND-Open and Supply-Open thresholds */ unsigned threshold_hi[2 ];/* GND-Open and Supply-Open thresholds */ -u8 reg_buffer[3 ]____cacheline_aligned ; +u8 reg_buffer[3 ]__aligned(IIO_DMA_MINALIGN) ; };static int hi8435_readb (struct hi8435_priv *priv,u8 reg,u8 *val)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 650/1157 iio: adc: ltc2496: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 1673b7ca2dc1fb3b8d7c94a112496c02d34ae449 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/adc/ltc2496.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ltc2496.c +2 -2
@@ -24,10 +24,10 @@ struct ltc2496_driverdata {struct spi_device *spi;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -unsigned char rxbuf[3 ]____cacheline_aligned ; +unsigned char rxbuf[3 ]__aligned(IIO_DMA_MINALIGN) ;unsigned char txbuf[3 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 651/1157 iio: adc: ltc2497: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 6ebf401d555ee1e75e779b865d38e171db0aa1f2 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/adc/ltc2497.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ltc2497.c +2 -2
@@ -20,10 +20,10 @@ struct ltc2497_driverdata {struct ltc2497core_driverdata common_ddata;struct i2c_client *client;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -__be32 buf____cacheline_aligned ; +__be32 buf__aligned(IIO_DMA_MINALIGN) ; }; static int ltc2497_result_and_measure(struct ltc2497core_driverdata *ddata,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 652/1157 iio: adc: max1027: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit e754fb7e7a05e3838c9aa044b4114869dd0d1e17 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/max1027.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/max1027.c +1 -1
@@ -272,7 +272,7 @@ struct max1027_state {struct mutex lock;struct completion complete; -u8 reg____cacheline_aligned ; +u8 reg__aligned(IIO_DMA_MINALIGN) ; };static int max1027_wait_eoc (struct iio_dev *indio_dev)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 653/1157 iio: adc: max11100: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 51f30d63145cc84cb8a8e0ec96f9a8b73e6b5448 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/adc/max11100.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/max11100.c +2 -2
@@ -33,10 +33,10 @@ struct max11100_state {struct spi_device *spi;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -u8 buffer[3 ]____cacheline_aligned ; +u8 buffer[3 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct iio_chan_spec max11100_channels[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 654/1157 iio: adc: max1118: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit f746ab0bac5b335b09143dcd01db6f9f26d0c9ec ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/max1118.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/max1118.c +1 -1
@@ -42,7 +42,7 @@ struct max1118 {s64 ts__aligned(8) ; } scan; -u8 data____cacheline_aligned ; +u8 data__aligned(IIO_DMA_MINALIGN) ; };#define MAX1118_CHANNEL (ch) \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 655/1157 iio: adc: max1241: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 9d7019e43ee67a48cef63f8f23f002233064d390 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/max1241.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/max1241.c +1 -1
@@ -26,7 +26,7 @@ struct max1241 {struct regulator *vref;struct gpio_desc *shutdown; -__be16 data____cacheline_aligned ; +__be16 data__aligned(IIO_DMA_MINALIGN) ; };static const struct iio_chan_spec max1241_channels[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 656/1157 iio: adc: mcp320x: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit e770f78036ce4327caf285873f4b20564a8b4f0f ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Worth noting the fixes tag refers to the same issue being observed on a platform that probably had only 64 byte cachelines.
--- drivers/iio/adc/mcp320x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/mcp320x.c +1 -1
@@ -92,7 +92,7 @@ struct mcp320x {struct mutex lock;const struct mcp320x_chip_info *chip_info; -u8 tx_buf____cacheline_aligned ; +u8 tx_buf__aligned(IIO_DMA_MINALIGN) ;u8 rx_buf[4 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 657/1157 iio: adc: ti-adc0832: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 1e6bb81c23a84a078736a0f2a52bd765863e94ed ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-adc0832.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-adc0832.c +1 -1
@@ -36,7 +36,7 @@ struct adc0832 {*/ u8 data[24 ]__aligned(8) ; -u8 tx_buf[2 ]____cacheline_aligned ; +u8 tx_buf[2 ]__aligned(IIO_DMA_MINALIGN) ;u8 rx_buf[2 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 658/1157 iio: adc: ti-adc084s021: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit bb102fd600d1d6c0020a4514197c0604c4a218d9 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/adc/ti-adc084s021.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ti-adc084s021.c +2 -2
@@ -32,10 +32,10 @@ struct adc084s021 {s64 ts__aligned(8) ; } scan;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache line. */ -u16 tx_buf[4 ]____cacheline_aligned ; +u16 tx_buf[4 ]__aligned(IIO_DMA_MINALIGN) ;__be16 rx_buf[5 ];/* First 16-bits are trash */ };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 659/1157 iio: adc: ti-adc108s102: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 6909fe17888b66ea53ebb15640f82b97daa587a0 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Dual fixes tags as two cases that were introduced in different patches. One of those patches is a fix however and likely to have been backported to stable kernels.
Note the second alignment marking is likely to be unnecessary, but is left for now to keep this fix simple.
--- drivers/iio/adc/ti-adc108s102.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ti-adc108s102.c +2 -2
@@ -77,8 +77,8 @@ struct adc108s102_state {* tx_buf: 8 channel read commands, plus 1 dummy command * rx_buf: 1 dummy response, 8 channel responses */ -__be16 rx_buf[9 ]____cacheline_aligned ; -__be16 tx_buf[9 ]____cacheline_aligned ; +__be16 rx_buf[9 ]__aligned(IIO_DMA_MINALIGN) ; +__be16 tx_buf[9 ]__aligned(IIO_DMA_MINALIGN) ; };#define ADC108S102_V_CHAN (index) \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 660/1157 iio: adc: ti-adc12138: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 76890c3bce6003caf53b283c49a210280cb8ea33 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-adc12138.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-adc12138.c +1 -1
@@ -55,7 +55,7 @@ struct adc12138 {*/ __be16 data[20 ]__aligned(8) ; -u8 tx_buf[2 ]____cacheline_aligned ; +u8 tx_buf[2 ]__aligned(IIO_DMA_MINALIGN) ;u8 rx_buf[2 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 661/1157 iio: adc: ti-adc128s052: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 23c81e7a7e5204a08b553d07362d3082926663b8 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-adc128s052.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-adc128s052.c +1 -1
@@ -29,7 +29,7 @@ struct adc128 {struct regulator *reg;struct mutex lock; -u8 buffer[2 ]____cacheline_aligned ; +u8 buffer[2 ]__aligned(IIO_DMA_MINALIGN) ; };static int adc128_adc_conversion (struct adc128 *adc,u8 channel)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 662/1157 iio: adc: ti-adc161s626: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 3a828f204a110dc9f253c4cf3c1103d00a0681da ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-adc161s626.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-adc161s626.c +1 -1
@@ -71,7 +71,7 @@ struct ti_adc_data {u8 read_size;u8 shift; -u8 buffer[16 ]____cacheline_aligned ; +u8 buffer[16 ]__aligned(IIO_DMA_MINALIGN) ; }; static int ti_adc_read_measurement(struct ti_adc_data *data,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 663/1157 iio: adc: ti-ads124s08: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 7df19bd26cc0b85ff997cc9e2aaea712836b5460 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-ads124s08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-ads124s08.c +1 -1
@@ -106,7 +106,7 @@ struct ads124s_private {* timestamp is maintained. */ u32 buffer[ADS124S08_MAX_CHANNELS +sizeof (s64)/sizeof (u32)]__aligned(8) ; -u8 data[5 ]____cacheline_aligned ; +u8 data[5 ]__aligned(IIO_DMA_MINALIGN) ; };#define ADS124S08_CHAN (index) \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 664/1157 iio: adc: ti-ads131e08: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 55afdd050c063ae4b8dbd566107a030c00d005fd ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-ads131e08.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-ads131e08.c +1 -1
@@ -105,7 +105,7 @@ struct ads131e08_state {s64 ts__aligned(8) ; } tmp_buf; -u8 tx_buf[3 ]____cacheline_aligned ; +u8 tx_buf[3 ]__aligned(IIO_DMA_MINALIGN) ;/* * Add extra one padding byte to be able to access the last channel * value using u32 pointer
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 665/1157 iio: adc: ti-ads7950: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit dd54ba8b2469f6ae665c529623a9454ce5293ca8 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/adc/ti-ads7950.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ti-ads7950.c +2 -2
@@ -102,11 +102,11 @@ struct ti_ads7950_state {unsigned int gpio_cmd_settings_bitmask;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ u16 rx_buf[TI_ADS7950_MAX_CHAN +2 +TI_ADS7950_TIMESTAMP_SIZE ] -____cacheline_aligned ; +__aligned(IIO_DMA_MINALIGN) ;u16 tx_buf[TI_ADS7950_MAX_CHAN +2 ];u16 single_tx;u16 single_rx;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 666/1157 iio: adc: ti-ads8344: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 8966b11e5a14aaabc747ee97a7942fd50a681402 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-ads8344.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-ads8344.c +1 -1
@@ -28,7 +28,7 @@ struct ads8344 {*/ struct mutex lock; -u8 tx_buf____cacheline_aligned ; +u8 tx_buf__aligned(IIO_DMA_MINALIGN) ;u8 rx_buf[3 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 667/1157 iio: adc: ti-ads8688: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit a2105d87eb8eb03591515df10102e04a1c9e0e46 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/adc/ti-ads8688.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ti-ads8688.c +1 -1
@@ -71,7 +71,7 @@ struct ads8688_state {union {__be32 d32;u8 d8[4 ]; - } data[2 ]____cacheline_aligned ; + } data[2 ]__aligned(IIO_DMA_MINALIGN) ; };enum ads8688_id {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 668/1157 iio: adc: ti-tlc4541: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 62fa19bf484bfeb52c56b7c6d6a6b1222c597f9c ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/adc/ti-tlc4541.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ti-tlc4541.c +2 -2
@@ -37,12 +37,12 @@ struct tlc4541_state {struct spi_message scan_single_msg;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * 2 bytes data + 6 bytes padding + 8 bytes timestamp when * call iio_push_to_buffers_with_timestamp. */ -__be16 rx_buf[8 ]____cacheline_aligned ; +__be16 rx_buf[8 ]__aligned(IIO_DMA_MINALIGN) ; };struct tlc4541_chip_info {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 669/1157 iio: addac: ad74413r: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 00eb2b8a077062557772234019ecd6045b8b6298 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/addac/ad74413r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/addac/ad74413r.c +2 -2
@@ -77,13 +77,13 @@ struct ad74413r_state {struct spi_transfer adc_samples_xfer[AD74413R_CHANNEL_MAX +1 ];/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ struct {u8 rx_buf[AD74413R_FRAME_SIZE *AD74413R_CHANNEL_MAX ];s64 timestamp; - } adc_samples_buf____cacheline_aligned ; + } adc_samples_buf__aligned(IIO_DMA_MINALIGN) ;u8 adc_samples_tx_buf[AD74413R_FRAME_SIZE *AD74413R_CHANNEL_MAX ];u8 reg_tx_buf[AD74413R_FRAME_SIZE ];
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 670/1157 iio: amplifiers: ad8366: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 026bffa458d029a5f15ac3f82a9bb0f64aca403d ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/amplifiers/ad8366.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/amplifiers/ad8366.c +2 -2
@@ -45,10 +45,10 @@ struct ad8366_state {enum ad8366_type type;struct ad8366_info *info;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -unsigned char data[2 ]____cacheline_aligned ; +unsigned char data[2 ]__aligned(IIO_DMA_MINALIGN) ; };static struct ad8366_info ad8366_infos[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 671/1157 iio: common: ssp: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 314d2b1978bb3d20b1ec239f4e28c394da493f36 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/common/ssp_sensors/ssp.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/common/ssp_sensors/ssp.h +1 -2
@@ -221,8 +221,7 @@ struct ssp_data {struct iio_dev *sensor_devs[SSP_SENSOR_MAX ];atomic_t enable_refcount; -__le16 header_buffer[SSP_HEADER_BUFFER_SIZE /sizeof (__le16)] -____cacheline_aligned ; +__le16 header_buffer[SSP_HEADER_BUFFER_SIZE /sizeof (__le16)]__aligned(IIO_DMA_MINALIGN) ; };void ssp_clean_pending_list (struct ssp_data *data);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 672/1157 iio: dac: ad5064: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 8779b88c214fa0f8fdfb9c54a124f468884d356a ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5064.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5064.c +2 -2
@@ -115,13 +115,13 @@ struct ad5064_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {u8 i2c[3 ];__be32 spi; - } data____cacheline_aligned ; + } data__aligned(IIO_DMA_MINALIGN) ; };enum ad5064_type {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 673/1157 iio: dac: ad5360: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 94ec314e1bd686b669c24385ce2dbc967eb74147 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5360.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5360.c +2 -2
@@ -79,13 +79,13 @@ struct ad5360_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {__be32 d32;u8 d8[4 ]; - } data[2 ]____cacheline_aligned ; + } data[2 ]__aligned(IIO_DMA_MINALIGN) ; };enum ad5360_type {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 674/1157 iio: dac: ad5421: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit d2b240d3d31c66df4d2da54c75ff8e27a0e006c3 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5421.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5421.c +2 -2
@@ -72,13 +72,13 @@ struct ad5421_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {__be32 d32;u8 d8[4 ]; - } data[2 ]____cacheline_aligned ; + } data[2 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct iio_event_spec ad5421_current_event[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 675/1157 iio: dac: ad5449: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 678d536bb454e3bbedcaa68208550ac9dc1cc066 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5449.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5449.c +2 -2
@@ -68,10 +68,10 @@ struct ad5449 {uint16_t dac_cache[AD5449_MAX_CHANNELS ];/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -__be16 data[2 ]____cacheline_aligned ; +__be16 data[2 ]__aligned(IIO_DMA_MINALIGN) ; };enum ad5449_type {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 676/1157 iio: dac: ad5504: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 00b9737caa5aaed5cf45a7c7498edf5957efa3b2 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ad5504.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5504.c +1 -1
@@ -54,7 +54,7 @@ struct ad5504_state {unsigned pwr_down_mask;unsigned pwr_down_mode; -__be16 data[2 ]____cacheline_aligned ; +__be16 data[2 ]__aligned(IIO_DMA_MINALIGN) ; };/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 677/1157 iio: dac: ad5592r: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 4a4a79c06caeec47003bcbee1cf3094479f26e24 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ad5592r-base.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/dac/ad5592r-base.h +3 -1
@@ -14,6 +14,8 @@#include <linux/mutex.h> #include <linux/gpio/driver.h> +#include <linux/iio/iio.h> +struct device ;struct ad5592r_state ;
@@ -65,7 +67,7 @@ struct ad5592r_state {u8 gpio_in;u8 gpio_val; -__be16 spi_msg____cacheline_aligned ; +__be16 spi_msg__aligned(IIO_DMA_MINALIGN) ;__be16 spi_msg_nop; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 678/1157 iio: dac: ad5686: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 444e38927d9af093de7cdc6afbb7afdc3485da2d ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5686.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5686.h +4 -2
@@ -13,6 +13,8 @@#include <linux/mutex.h> #include <linux/kernel.h> +#include <linux/iio/iio.h> +#define AD5310_CMD (x) ((x) << 12)#define AD5683_DATA (x) ((x) << 4)
@@ -137,7 +139,7 @@ struct ad5686_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */
@@ -145,7 +147,7 @@ struct ad5686_state {__be32 d32;__be16 d16;u8 d8[4 ]; - } data[3 ]____cacheline_aligned ; + } data[3 ]__aligned(IIO_DMA_MINALIGN) ; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 679/1157 iio: dac: ad5755: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit d0c167ceff2d833ee493dd58164dc87bd36e48aa ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5755.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5755.c +2 -2
@@ -189,14 +189,14 @@ struct ad5755_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {__be32 d32;u8 d8[4 ]; - } data[2 ]____cacheline_aligned ; + } data[2 ]__aligned(IIO_DMA_MINALIGN) ; };enum ad5755_type {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 680/1157 iio: dac: ad5761: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 7d12a61187aed57863c41032acbc1fae516d6e49 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5761.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5761.c +2 -2
@@ -70,13 +70,13 @@ struct ad5761_state {enum ad5761_voltage_range range;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {__be32 d32;u8 d8[4 ]; - } data[3 ]____cacheline_aligned ; + } data[3 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct ad5761_range_params ad5761_range_params[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 681/1157 iio: dac: ad5764: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b378722a3e9bb51318c0de7eeb4d71f2fcd6987f ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad5764.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad5764.c +2 -2
@@ -56,13 +56,13 @@ struct ad5764_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ union {__be32 d32;u8 d8[4 ]; - } data[2 ]____cacheline_aligned ; + } data[2 ]__aligned(IIO_DMA_MINALIGN) ; };enum ad5764_type {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 682/1157 iio: dac: ad5766: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit c32be7f035ae430ba9c142b03ceb9f935b09ed6b ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ad5766.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5766.c +1 -1
@@ -123,7 +123,7 @@ struct ad5766_state {u32 d32;u16 w16[2 ];u8 b8[4 ]; - } data[3 ]____cacheline_aligned ; + } data[3 ]__aligned(IIO_DMA_MINALIGN) ; };struct ad5766_span_tbl {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 683/1157 iio: dac: ad5770r: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 27f2261d16d01858b8e5baca5a1a515b040429c4 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ad5770r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5770r.c +1 -1
@@ -140,7 +140,7 @@ struct ad5770r_state {bool ch_pwr_down[AD5770R_MAX_CHANNELS ];bool internal_ref;bool external_res; -u8 transf_buf[2 ]____cacheline_aligned ; +u8 transf_buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct regmap_config ad5770r_spi_regmap_config = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 684/1157 iio: dac: ad5791: Fix alignment for DMA saftey
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b2d5e9de77c8774a5a6cff59d928f2fa38cbc642 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ad5791.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad5791.c +1 -1
@@ -95,7 +95,7 @@ struct ad5791_state {union {__be32 d32;u8 d8[4 ]; - } data[3 ]____cacheline_aligned ; + } data[3 ]__aligned(IIO_DMA_MINALIGN) ; };enum ad5791_supported_device_ids {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 685/1157 iio: dac: ad7293: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 8482468b30bdb16d4a764f995d7a63d94fa0cf40 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ad7293.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad7293.c +1 -1
@@ -144,7 +144,7 @@ struct ad7293_state {struct regulator *reg_avdd;struct regulator *reg_vdrive;u8 page_select; -u8 data[3 ]____cacheline_aligned ; +u8 data[3 ]__aligned(IIO_DMA_MINALIGN) ; };static int ad7293_page_select (struct ad7293_state *st,unsigned int reg)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 686/1157 iio: dac: ad7303: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 69e51448ddfb9062efdf83e2d3179498e0aeb293 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ad7303.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ad7303.c +2 -2
@@ -44,10 +44,10 @@ struct ad7303_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -__be16 data____cacheline_aligned ; +__be16 data__aligned(IIO_DMA_MINALIGN) ; }; static int ad7303_write(struct ad7303_state *st, unsigned int chan,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 687/1157 iio: dac: ad8801: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 1c20292c6b60cfc60a5e652174b8063e5cc03fec ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ad8801.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ad8801.c +1 -1
@@ -26,7 +26,7 @@ struct ad8801_state {struct regulator *vrefh_reg;struct regulator *vrefl_reg; -__be16 data____cacheline_aligned ; +__be16 data__aligned(IIO_DMA_MINALIGN) ; }; static int ad8801_spi_write(struct ad8801_state *state,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 688/1157 iio: dac: ltc2688: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 2030708377a219b548a9a36da57d3852382baf1d ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Update the comment to include 'may'.
--- drivers/iio/dac/ltc2688.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ltc2688.c +2 -2
@@ -91,10 +91,10 @@ struct ltc2688_state {struct mutex lock;int vref;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -u8 tx_data[6 ]____cacheline_aligned ; +u8 tx_data[6 ]__aligned(IIO_DMA_MINALIGN) ;u8 rx_data[3 ]; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 689/1157 iio: dac: mcp4922: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit e66bf04797f1f95a2402414c00e64d00f63d31ec ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/mcp4922.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/mcp4922.c +1 -1
@@ -29,7 +29,7 @@ struct mcp4922_state {unsigned int value[MCP4922_NUM_CHANNELS ];unsigned int vref_mv;struct regulator *vref_reg; -u8 mosi[2 ]____cacheline_aligned ; +u8 mosi[2 ]__aligned(IIO_DMA_MINALIGN) ; };#define MCP4922_CHAN (chan, bits) { \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 690/1157 iio: dac: ti-dac082s085: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 03a0cc77f164e4e59b970d50c6e9a6caf06dae80 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ti-dac082s085.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ti-dac082s085.c +1 -1
@@ -55,7 +55,7 @@ struct ti_dac_chip {bool powerdown;u8 powerdown_mode;u8 resolution; -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };#define WRITE_NOT_UPDATE (chan) (0x00 | (chan) << 6)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 691/1157 iio: dac: ti-dac5571: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 58e22371539e01c742be5c30295f591a6a17e348 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ti-dac5571.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ti-dac5571.c +1 -1
@@ -52,7 +52,7 @@ struct dac5571_data {struct dac5571_spec const *spec;int (*dac5571_cmd)(struct dac5571_data *data,int channel,u16 val);int (*dac5571_pwrdwn)(struct dac5571_data *data,int channel,u8 pwrdwn); -u8 buf[3 ]____cacheline_aligned ; +u8 buf[3 ]__aligned(IIO_DMA_MINALIGN) ; };#define DAC5571_POWERDOWN (mode) ((mode) + 1)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 692/1157 iio: dac: ti-dac7311: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 3637c49ed54632d7c221af718d2d7b1d381d4b6e ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/dac/ti-dac7311.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/dac/ti-dac7311.c +1 -1
@@ -52,7 +52,7 @@ struct ti_dac_chip {bool powerdown;u8 powerdown_mode;u8 resolution; -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };static u8 ti_dac_get_power (struct ti_dac_chip *ti_dac,bool powerdown)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 693/1157 iio: dac: ti-dac7612: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b9ac08b3282a95fcefb057c2886028a6807725d8 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Updated help text to 'may' require buffers to be in their own cacheline.
--- drivers/iio/dac/ti-dac7612.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/dac/ti-dac7612.c +2 -2
@@ -31,10 +31,10 @@ struct dac7612 {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -uint8_t data[2 ]____cacheline_aligned ; +uint8_t data[2 ]__aligned(IIO_DMA_MINALIGN) ; };static int dac7612_cmd_single (struct dac7612 *priv,int channel,u16 val)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 694/1157 iio: frequency: ad9523: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 8ff2eb625c353b1491d9f89f1dfd52e7aef5734c ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Updated help text to 'may' require buffers to be in their own cacheline.
--- drivers/iio/frequency/ad9523.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/frequency/ad9523.c +3 -3
@@ -287,13 +287,13 @@ struct ad9523_state {struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the -* transfer buffers to live in their own cache lines. +* DMA (thus cache coherency maintenance) may require that +* transfer buffers live in their own cache lines. */ union {__be32 d32;u8 d8[4 ]; - } data[2 ]____cacheline_aligned ; + } data[2 ]__aligned(IIO_DMA_MINALIGN) ; };static int ad9523_read (struct iio_dev *indio_dev,unsigned int addr)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 695/1157 iio: frequency: adf4350: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 389b8972eb2a614cb3189e5fa55b1b7f66142c71 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Updated help text to 'may' require buffers to be in their own cacheline.
--- drivers/iio/frequency/adf4350.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/frequency/adf4350.c +3 -3
@@ -56,10 +56,10 @@ struct adf4350_state {*/ struct mutex lock;/* -* DMA (thus cache coherency maintenance) requires the -* transfer buffers to live in their own cache lines. +* DMA (thus cache coherency maintenance) may require that +* transfer buffers live in their own cache lines. */ -__be32 val____cacheline_aligned ; +__be32 val__aligned(IIO_DMA_MINALIGN) ; };static struct adf4350_platform_data default_pdata = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 696/1157 iio: frequency: adf4371: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 0bb5675befe666eeed71ad808426cf2ec1c9a714 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/frequency/adf4371.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/frequency/adf4371.c +1 -1
@@ -175,7 +175,7 @@ struct adf4371_state {unsigned int mod2;unsigned int rf_div_sel;unsigned int ref_div_factor; -u8 buf[10 ]____cacheline_aligned ; +u8 buf[10 ]__aligned(IIO_DMA_MINALIGN) ; }; static unsigned long long adf4371_pll_fract_n_get_rate(struct adf4371_state *st,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 697/1157 iio: frequency: admv1013: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b3f3f8d264b9be0cb3e50e89e3f8789a948a43bb ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/frequency/admv1013.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/frequency/admv1013.c +1 -1
@@ -100,7 +100,7 @@ struct admv1013_state {unsigned int input_mode;unsigned int quad_se_mode;bool det_en; -u8 data[3 ]____cacheline_aligned ; +u8 data[3 ]__aligned(IIO_DMA_MINALIGN) ; }; static int __admv1013_spi_read(struct admv1013_state *st, unsigned int reg,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 698/1157 iio: frequency: admv1014: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit a3e38a557a54df0edea791d7eb623515bb86e39a ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/frequency/admv1014.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/frequency/admv1014.c +1 -1
@@ -127,7 +127,7 @@ struct admv1014_state {unsigned int quad_se_mode;unsigned int p1db_comp;bool det_en; -u8 data[3 ]____cacheline_aligned ; +u8 data[3 ]__aligned(IIO_DMA_MINALIGN) ; };static const int mixer_vgate_table[] = {106 ,107 ,108 ,110 ,111 ,112 ,113 ,114 ,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 699/1157 iio: frequency: admv4420: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit f890aaac771bd015c348eddb967b4027e88344c0 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/frequency/admv4420.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/frequency/admv4420.c +1 -1
@@ -113,7 +113,7 @@ struct admv4420_state {struct admv4420_n_counter n_counter;enum admv4420_mux_sel mux_sel;struct mutex lock; -u8 transf_buf[4 ]____cacheline_aligned ; +u8 transf_buf[4 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct regmap_config admv4420_regmap_config = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 700/1157 iio: frequency: adrf6780: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 9a5b11884cb72780cb824cac8aab47094654a84f ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/frequency/adrf6780.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/frequency/adrf6780.c +1 -1
@@ -86,7 +86,7 @@ struct adrf6780_state {bool uc_bias_en;bool lo_sideband;bool vdet_out_en; -u8 data[3 ]____cacheline_aligned ; +u8 data[3 ]__aligned(IIO_DMA_MINALIGN) ; }; static int __adrf6780_spi_read(struct adrf6780_state *st, unsigned int reg,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 701/1157 iio: gyro: adis16080: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit ae6eeb534924ecc2afd5a394964fd6de0ca54d39 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Fixes tag is inaccurate but unlikely anyone will backport this beyond that point so I haven't chased the history futher than 2013.
--- drivers/iio/gyro/adis16080.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/gyro/adis16080.c +1 -1
@@ -45,7 +45,7 @@ struct adis16080_state {const struct adis16080_chip_info *info;struct mutex lock; -__be16 buf____cacheline_aligned ; +__be16 buf__aligned(IIO_DMA_MINALIGN) ; }; static int adis16080_read_sample(struct iio_dev *indio_dev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 702/1157 iio: gyro: adis16130: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit ff3211b2ba9afac80ceb795d148831dd879b30b7 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/gyro/adis16130.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/gyro/adis16130.c +1 -1
@@ -41,7 +41,7 @@struct adis16130_state {struct spi_device *us;struct mutex buf_lock; -u8 buf[4 ]____cacheline_aligned ; +u8 buf[4 ]__aligned(IIO_DMA_MINALIGN) ; };static int adis16130_spi_read (struct iio_dev *indio_dev,u8 reg_addr,u32 *val)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 703/1157 iio: gyro: adxrs450: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 966d2f4ee7f6e189df47abf67223266ad31e201f ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Fixes tag is inaccurate but unlikely anyone will be interested in backporting beyond that point.
--- drivers/iio/gyro/adxrs450.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/gyro/adxrs450.c +1 -1
@@ -73,7 +73,7 @@ enum {struct adxrs450_state {struct spi_device *us;struct mutex buf_lock; -__be32 tx____cacheline_aligned ; +__be32 tx__aligned(IIO_DMA_MINALIGN) ;__be32 rx; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 704/1157 iio: gyro: fxas210002c: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 3aafe923987cb4a15e16f03c6185ed4b6a78ca00 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Updated the comment to 'may' require.
--- drivers/iio/gyro/fxas21002c_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/gyro/fxas21002c_core.c +3 -3
@@ -150,10 +150,10 @@ struct fxas21002c_data {struct regulator *vddio;/* -* DMA (thus cache coherency maintenance) requires the -* transfer buffers to live in their own cache lines. +* DMA (thus cache coherency maintenance) may require the +* transfer buffers live in their own cache lines. */ -s16 buffer[8 ]____cacheline_aligned ; +s16 buffer[8 ]__aligned(IIO_DMA_MINALIGN) ; };enum fxas21002c_channel_index {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 705/1157 iio: imu: fxos8700: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit c9a8417a13ed9c81383662fca8a4b89f84d31e78 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/imu/fxos8700_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/fxos8700_core.c +1 -1
@@ -167,7 +167,7 @@struct fxos8700_data {struct regmap *regmap;struct iio_trigger *trig; -__be16 buf[FXOS8700_DATA_BUF_SIZE ]____cacheline_aligned ; +__be16 buf[FXOS8700_DATA_BUF_SIZE ]__aligned(IIO_DMA_MINALIGN) ; };/* Regmap info */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 706/1157 iio: imu: inv_icm42600: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 848847702bd10bf0bf547e38adc44c14e9742784 ]
Partial fix for this driver as a second instance was introduced in a later patch.
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/imu/inv_icm42600/inv_icm42600.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/inv_icm42600/inv_icm42600.h +1 -1
@@ -141,7 +141,7 @@ struct inv_icm42600_state {struct inv_icm42600_suspended suspended;struct iio_dev *indio_gyro;struct iio_dev *indio_accel; -uint8_t buffer[2 ]____cacheline_aligned ; +uint8_t buffer[2 ]__aligned(IIO_DMA_MINALIGN) ;struct inv_icm42600_fifo fifo;struct {int64_t gyro;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 707/1157 iio: imu: inv_icm42600: Fix alignment for DMA safety in buffer code.
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b0aa05065a0c1d1bffa10923dbc36f7193babbb7 ]
Second fix for this driver due to different introducing patches.
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h +1 -1
@@ -39,7 +39,7 @@ struct inv_icm42600_fifo {size_t accel;size_t total; } nb; -uint8_t data[2080 ]____cacheline_aligned ; +uint8_t data[2080 ]__aligned(IIO_DMA_MINALIGN) ; };/* FIFO data packet */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 708/1157 iio: imu: mpu6050: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 54e03562bb960e78af050d2e550c28d77642ee44 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +1 -1
@@ -204,7 +204,7 @@ struct inv_mpu6050_state {s32 magn_raw_to_gauss[3 ];struct iio_mount_matrix magn_orient;unsigned int suspended_sensors; -u8 data[INV_MPU6050_OUTPUT_DATA_SIZE ]____cacheline_aligned ; +u8 data[INV_MPU6050_OUTPUT_DATA_SIZE ]__aligned(IIO_DMA_MINALIGN) ; };/*register and associated bit definition*/
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 709/1157 iio: potentiometer: ad5110: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit b5841c38cb2f7e54b0787b3e0326a6b21b89ea3e ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/potentiometer/ad5110.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/potentiometer/ad5110.c +2 -2
@@ -63,10 +63,10 @@ struct ad5110_data {struct mutex lock;const struct ad5110_cfg *cfg;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct iio_chan_spec ad5110_channels[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 710/1157 iio: potentiometer: ad5272: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit da803652534271dbb4af0802bd678c759e27e6de ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/potentiometer/ad5272.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/potentiometer/ad5272.c +1 -1
@@ -50,7 +50,7 @@ struct ad5272_data {struct i2c_client *client;struct mutex lock;const struct ad5272_cfg *cfg; -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct iio_chan_spec ad5272_channel = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 711/1157 iio: potentiometer: max5481: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit ec1ac1c0e7a14657d729159ccfbea72f434bdaf1 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/potentiometer/max5481.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/potentiometer/max5481.c +1 -1
@@ -44,7 +44,7 @@ static const struct max5481_cfg max5481_cfg[] = {struct max5481_data {struct spi_device *spi;const struct max5481_cfg *cfg; -u8 msg[3 ]____cacheline_aligned ; +u8 msg[3 ]__aligned(IIO_DMA_MINALIGN) ; };#define MAX5481_CHANNEL { \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 712/1157 iio: potentiometer: mcp41010: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit c5f78f4d2168ba21324095b0d46d4353c2eace4d ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/potentiometer/mcp41010.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/potentiometer/mcp41010.c +1 -1
@@ -60,7 +60,7 @@ struct mcp41010_data {const struct mcp41010_cfg *cfg;struct mutex lock;/* Protect write sequences */ unsigned int value[MCP41010_MAX_WIPERS ];/* Cache wiper values */ -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };#define MCP41010_CHANNEL (ch) { \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 713/1157 iio: potentiometer: mcp4131: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 4842e5de6f39ebf2c0f6da9e6a0cb751c7108507 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/potentiometer/mcp4131.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/potentiometer/mcp4131.c +1 -1
@@ -129,7 +129,7 @@ struct mcp4131_data {struct spi_device *spi;const struct mcp4131_cfg *cfg;struct mutex lock; -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };#define MCP4131_CHANNEL (ch) { \
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 714/1157 iio: proximity: as3935: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 2386c0f8c5b740873a4b9126c3706601b127fe22 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/proximity/as3935.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/proximity/as3935.c +1 -1
@@ -65,7 +65,7 @@ struct as3935_state {u8 chan;s64 timestamp__aligned(8) ; } scan; -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; };static const struct iio_chan_spec as3935_channels[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 715/1157 iio: resolver: ad2s1200: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 37882314d3bdc2ae775ebb9fa8ed7a94cd1aad61 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Fixes tag is probably not where the issue was first introduced, but is likely to be as far as anyone considers backporting this fix.
--- drivers/iio/resolver/ad2s1200.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/resolver/ad2s1200.c +1 -1
@@ -41,7 +41,7 @@ struct ad2s1200_state {struct spi_device *sdev;struct gpio_desc *sample;struct gpio_desc *rdvel; -__be16 rx____cacheline_aligned ; +__be16 rx__aligned(IIO_DMA_MINALIGN) ; }; static int ad2s1200_read_raw(struct iio_dev *indio_dev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 716/1157 iio: resolver: ad2s90: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit faa05ecb1349070d874810e161b653c2220e0006 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
Fixes tag is probably not where the issue was first introduced, but is likely to be far beyond the point where anyone considers backporting this fix.
--- drivers/iio/resolver/ad2s90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/resolver/ad2s90.c +1 -1
@@ -24,7 +24,7 @@struct ad2s90_state {struct mutex lock;/* lock to protect rx buffer */ struct spi_device *sdev; -u8 rx[2 ]____cacheline_aligned ; +u8 rx[2 ]__aligned(IIO_DMA_MINALIGN) ; }; static int ad2s90_read_raw(struct iio_dev *indio_dev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 717/1157 iio: temp: ltc2983: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 732f2cb2fbb51bd5bc03a114bd102ab3b2f537fe ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition.
--- drivers/iio/temperature/ltc2983.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/temperature/ltc2983.c +2 -2
@@ -204,11 +204,11 @@ struct ltc2983_data {u8 num_channels;u8 iio_channels;/* -* DMA (thus cache coherency maintenance) requires the +* DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * Holds the converted temperature */ -__be32 temp____cacheline_aligned ; +__be32 temp__aligned(IIO_DMA_MINALIGN) ; };struct ltc2983_sensor {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 718/1157 iio: temp: max31865: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit ecdef5b8317cdf18acb46223e087f04a226fa619 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition
--- drivers/iio/temperature/max31865.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/temperature/max31865.c +1 -1
@@ -55,7 +55,7 @@ struct max31865_data {struct mutex lock;bool filter_50hz;bool three_wire; -u8 buf[2 ]____cacheline_aligned ; +u8 buf[2 ]__aligned(IIO_DMA_MINALIGN) ; }; static int max31865_read(struct max31865_data *data, u8 reg,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 719/1157 iio: temp: maxim_thermocouple: Fix alignment for DMA safety
In reply to Greg Kroah-HartmanFrom: Jonathan Cameron <[email protected]>
[ Upstream commit 10897f34309b3c7bc14698407436c82d11c07f47 ]
____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition
--- drivers/iio/temperature/maxim_thermocouple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/temperature/maxim_thermocouple.c +1 -1
@@ -122,7 +122,7 @@ struct maxim_thermocouple_data {struct spi_device *spi;const struct maxim_thermocouple_chip *chip; -u8 buffer[16 ]____cacheline_aligned ; +u8 buffer[16 ]__aligned(IIO_DMA_MINALIGN) ;char tc_type; };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 720/1157 clk: mediatek: reset: Fix written reset bit offset
In reply to Greg Kroah-HartmanFrom: Rex-BC Chen <[email protected]>
[ Upstream commit edabcf71d100fd433a0fc2d0c97057c446c33b2a ]
Original assert/deassert bit is BIT(0), but it's more resonable to modify them to BIT(id % 32) which is based on id.
This patch will not influence any previous driver because the reset is only used for thermal. The id (MT8183_INFRACFG_AO_THERM_SW_RST) is 0.
--- drivers/clk/mediatek/reset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/mediatek/reset.c +2 -2
@@ -25,7 +25,7 @@ static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev, struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);unsigned int reg = data->regofs + ((id /32 ) <<4 ); -return regmap_write (data->regmap, reg,1 ); +return regmap_write (data->regmap, reg,BIT (id %32 )); } static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev,
@@ -34,7 +34,7 @@ static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev, struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev);unsigned int reg = data->regofs + ((id /32 ) <<4 ) +0x4 ; -return regmap_write (data->regmap, reg,1 ); +return regmap_write (data->regmap, reg,BIT (id %32 )); } static int mtk_reset_assert(struct reset_controller_dev *rcdev,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 721/1157 clk: imx93: use adc_root as the parent clock of adc1
In reply to Greg Kroah-HartmanFrom: Haibo Chen <[email protected]>
[ Upstream commit 18d6d8fe4f24938985844d52c481b86fcce9d102 ]
When debug, find after system boot up, all adc register operation will trigger system hang, this is because the internal adc ipg clock is gate off. In dts, only reference the IMX93_CLK_ADC1_GATE, which is adc1, no one touch the adc_root, so adc_root will be gate off automatically after system boot up.
--- drivers/clk/imx/clk-imx93.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx93.c +1 -1
@@ -150,7 +150,7 @@ static const struct imx93_clk_ccgr { { IMX93_CLK_A55_GATE, "a55", "a55_root", 0x8000, }, /* M33 critical clk for system run */ { IMX93_CLK_CM33_GATE, "cm33", "m33_root", 0x8040, CLK_IS_CRITICAL }, - { IMX93_CLK_ADC1_GATE, "adc1", "osc_24m", 0x82c0, }, + { IMX93_CLK_ADC1_GATE, "adc1", "adc_root", 0x82c0, }, { IMX93_CLK_WDOG1_GATE, "wdog1", "osc_24m", 0x8300, }, { IMX93_CLK_WDOG2_GATE, "wdog2", "osc_24m", 0x8340, }, { IMX93_CLK_WDOG3_GATE, "wdog3", "osc_24m", 0x8380, },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 722/1157 clk: imx93: correct nic_media parent
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 1e3c837a663e9a12c4afabb3279d18cb5110a8f4 ]
NIC_MEDIA sources from media_axi_root, not media_apb_root.
--- drivers/clk/imx/clk-imx93.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx93.c +1 -1
@@ -219,7 +219,7 @@ static const struct imx93_clk_ccgr { { IMX93_CLK_LCDIF_GATE, "lcdif", "media_apb_root", 0x9640, }, { IMX93_CLK_PXP_GATE, "pxp", "media_apb_root", 0x9680, }, { IMX93_CLK_ISI_GATE, "isi", "media_apb_root", 0x96c0, }, - { IMX93_CLK_NIC_MEDIA_GATE, "nic_media", "media_apb_root", 0x9700, }, + { IMX93_CLK_NIC_MEDIA_GATE, "nic_media", "media_axi_root", 0x9700, }, { IMX93_CLK_USB_CONTROLLER_GATE, "usb_controller", "hsio_root", 0x9a00, }, { IMX93_CLK_USB_TEST_60M_GATE, "usb_test_60m", "hsio_usb_test_60m_root", 0x9a40, }, { IMX93_CLK_HSIO_TROUT_24M_GATE, "hsio_trout_24m", "osc_24m", 0x9a80, },
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 723/1157 clk: imx: clk-fracn-gppll: fix mfd value
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 044034efbeea05f65c09d2ba15ceeab53b60e947 ]
According to spec:
A value of 0 is disallowed and should not be programmed in this register
Fix to 1.
--- drivers/clk/imx/clk-fracn-gppll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/imx/clk-fracn-gppll.c +4 -4
@@ -64,10 +64,10 @@ struct clk_fracn_gppll {* Fout = Fvco / (rdiv * odiv) */ static const struct imx_fracn_gppll_rate_table fracn_tbl[] = { -PLL_FRACN_GP (650000000U ,81 ,0 ,0 ,0 ,3 ), -PLL_FRACN_GP (594000000U ,198 ,0 ,0 ,0 ,8 ), -PLL_FRACN_GP (560000000U ,70 ,0 ,0 ,0 ,3 ), -PLL_FRACN_GP (400000000U ,50 ,0 ,0 ,0 ,3 ), +PLL_FRACN_GP (650000000U ,81 ,0 ,1 ,0 ,3 ), +PLL_FRACN_GP (594000000U ,198 ,0 ,1 ,0 ,8 ), +PLL_FRACN_GP (560000000U ,70 ,0 ,1 ,0 ,3 ), +PLL_FRACN_GP (400000000U ,50 ,0 ,1 ,0 ,3 ),PLL_FRACN_GP (393216000U ,81 ,92 ,100 ,0 ,5 ) };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 724/1157 clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate()
In reply to Greg Kroah-HartmanFrom: Liu Ying <[email protected]>
[ Upstream commit 5ebaf9f7da5bb2dc56d394eabfcbe46dc6b1ea8d ]
The PLL parameters in rate table should be directly compared with those read from PLL registers instead of the cooked ones.
--- drivers/clk/imx/clk-fracn-gppll.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/clk/imx/clk-fracn-gppll.c +13 -11
@@ -131,18 +131,7 @@ static unsigned long clk_fracn_gppll_recalc_rate(struct clk_hw *hw, unsigned lon mfi =FIELD_GET (PLL_MFI_MASK , pll_div); rdiv =FIELD_GET (PLL_RDIV_MASK , pll_div); - rdiv = rdiv +1 ; odiv =FIELD_GET (PLL_ODIV_MASK , pll_div); -switch (odiv) { -case 0 : - odiv =2 ; -break ; -case 1 : - odiv =3 ; -break ; -default : -break ; - }/* * Sometimes, the recalculated rate has deviation due to
@@ -160,6 +149,19 @@ static unsigned long clk_fracn_gppll_recalc_rate(struct clk_hw *hw, unsigned lonif (rate)return (unsigned long )rate; + rdiv = rdiv +1 ; + +switch (odiv) { +case 0 : + odiv =2 ; +break ; +case 1 : + odiv =3 ; +break ; +default : +break ; + } +/* Fvco = Fref * (MFI + MFN / MFD) */ fvco = fvco * mfi * mfd + fvco * mfn;do_div (fvco, mfd * rdiv * odiv);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 725/1157 clk: imx: clk-fracn-gppll: correct rdiv
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit f300cb7fccf69ba1835b983c76d70deb818ad194 ]
According to Reference Manual:
000b - Divide by 1
001b - Divide by 1
010b - Divide by 2
011b - Divide by 3
100b - Divide by 4
101b - Divide by 5
110b - Divide by 6
111b - Divide by 7
So only need increase rdiv by 1 when the register value is 0.
--- drivers/clk/imx/clk-fracn-gppll.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-fracn-gppll.c +2 -1
@@ -149,7 +149,8 @@ static unsigned long clk_fracn_gppll_recalc_rate(struct clk_hw *hw, unsigned lonif (rate)return (unsigned long )rate; - rdiv = rdiv +1 ; +if (!rdiv) + rdiv = rdiv +1 ;switch (odiv) {case 0 :
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 726/1157 RDMA/rxe: fix xa_alloc_cycle() error return value check again
In reply to Greg Kroah-HartmanFrom: Dongliang Mu <[email protected]>
[ Upstream commit 1a685940e6200e9def6e34bbaa19dd31dc5aeaf8 ]
Currently rxe_alloc checks ret to indicate error, but 1 is also a valid return and just indicates that the allocation succeeded with a wrap.
Fix this by modifying the check to be < 0.
--- drivers/infiniband/sw/rxe/rxe_pool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_pool.c +2 -2
@@ -139,7 +139,7 @@ void *rxe_alloc(struct rxe_pool *pool) err =xa_alloc_cyclic (&pool->xa, &elem->index, elem, pool->limit, &pool->next,GFP_KERNEL ); -if (err) +if (err <0 ) goto err_free;return obj;
@@ -167,7 +167,7 @@ int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_elem *elem) err =xa_alloc_cyclic (&pool->xa, &elem->index, elem, pool->limit, &pool->next,GFP_KERNEL ); -if (err) +if (err <0 ) goto err_cnt;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 727/1157 lib/test_hmm: avoid accessing uninitialized pages
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit ed913b055a74b723976f8e885a3395162a0371e6 ]
If make_device_exclusive_range() fails or returns pages marked for exclusive access less than required, remaining fields of pages will left uninitialized. So dmirror_atomic_map() will access those yet uninitialized fields of pages. To fix it, do dmirror_atomic_map() iff all pages are marked for exclusive access (we will break if mapped is less than required anyway) so we won't access those uninitialized fields of pages.
--- lib/test_hmm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
lib/test_hmm.c +8 -2
@@ -732,7 +732,7 @@ static int dmirror_exclusive(struct dmirror *dmirror,mmap_read_lock (mm);for (addr = start; addr < end; addr = next) { -unsigned long mapped; +unsigned long mapped =0 ;int i;if (end < addr + (ARRAY_SIZE (pages) <<PAGE_SHIFT ))
@@ -741,7 +741,13 @@ static int dmirror_exclusive(struct dmirror *dmirror, next = addr + (ARRAY_SIZE (pages) <<PAGE_SHIFT ); ret =make_device_exclusive_range (mm, addr, next, pages,NULL ); - mapped =dmirror_atomic_map (addr, next, pages, dmirror); +/* +* Do dmirror_atomic_map() iff all pages are marked for +* exclusive access to avoid accessing uninitialized +* fields of pages. +*/ +if (ret == (next - addr) >>PAGE_SHIFT ) + mapped =dmirror_atomic_map (addr, next, pages, dmirror);for (i =0 ; i < ret; i++) {if (pages[i]) {unlock_page (pages[i]);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 728/1157 mm/memremap: fix memunmap_pages() race with get_dev_pagemap()
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit 1e57ffb6e3fd9583268c6462c4e3853575b21701 ]
Think about the below scene:
CPU1 CPU2
memunmap_pages
percpu_ref_exit
__percpu_ref_exit
free_percpu(percpu_count);
/* percpu_count is freed here! */
get_dev_pagemap
xa_load(&pgmap_array, PHYS_PFN(phys))
/* pgmap still in the pgmap_array */
percpu_ref_tryget_live(&pgmap->ref)
if __ref_is_percpu
/* __PERCPU_REF_ATOMIC_DEAD not set yet */
this_cpu_inc(*percpu_count)
/* access freed percpu_count here! */
ref->percpu_count_ptr = __PERCPU_REF_ATOMIC_DEAD;
/* too late... */ pageunmap_range
To fix the issue, do percpu_ref_exit() after pgmap_array is emptied. So we won't do percpu_ref_tryget_live() against a being freed percpu_ref.
--- mm/memremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/memremap.c +1 -1
@@ -141,10 +141,10 @@ void memunmap_pages(struct dev_pagemap *pgmap)for (i =0 ; i < pgmap->nr_range; i++)percpu_ref_put_many (&pgmap->ref,pfn_len (pgmap, i));wait_for_completion (&pgmap->done); -percpu_ref_exit (&pgmap->ref);for (i =0 ; i < pgmap->nr_range; i++)pageunmap_range (pgmap, i); +percpu_ref_exit (&pgmap->ref);WARN_ONCE (pgmap->altmap.alloc,"failed to free all reserved pages\n" );devmap_managed_enable_put (pgmap);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 729/1157 KVM: Dont set Accessed/Dirty bits for ZERO_PAGE
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit a1040b0d42acf69bb4f6dbdc54c2dcd78eea1de5 ]
Don't set Accessed/Dirty bits for a struct page with PG_reserved set, i.e. don't set A/D bits for the ZERO_PAGE. The ZERO_PAGE (or pages depending on the architecture) should obviously never be written, and similarly there's no point in marking it accessed as the page will never be swapped out or reclaimed. The comment in page-flags.h is quite clear that PG_reserved pages should be managed only by their owner, and strictly following that mandate also simplifies KVM's logic.
Message-Id: <[email protected]>
--- virt/kvm/kvm_main.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
virt/kvm/kvm_main.c +14 -2
@@ -2853,16 +2853,28 @@ void kvm_release_pfn_dirty(kvm_pfn_t pfn) }EXPORT_SYMBOL_GPL (kvm_release_pfn_dirty); +static bool kvm_is_ad_tracked_pfn (kvm_pfn_t pfn) +{ +if (!pfn_valid (pfn)) +return false; + +/* +* Per page-flags.h, pages tagged PG_reserved "should in general not be +* touched (e.g. set dirty) except by its owner". +*/ +return !PageReserved (pfn_to_page (pfn)); +} +void kvm_set_pfn_dirty (kvm_pfn_t pfn) { -if (!kvm_is_reserved_pfn (pfn) && !kvm_is_zone_device_pfn (pfn)) +if (kvm_is_ad_tracked_pfn (pfn))SetPageDirty (pfn_to_page (pfn)); }EXPORT_SYMBOL_GPL (kvm_set_pfn_dirty);void kvm_set_pfn_accessed (kvm_pfn_t pfn) { -if (!kvm_is_reserved_pfn (pfn) && !kvm_is_zone_device_pfn (pfn)) +if (kvm_is_ad_tracked_pfn (pfn))mark_page_accessed (pfn_to_page (pfn)); }EXPORT_SYMBOL_GPL (kvm_set_pfn_accessed);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 730/1157 KVM: selftests: Convert s390x/diag318_test_handler away from VCPU_ID
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 7cdcdfe50d8d68b7b9ba2e1b0345ff47fdda390f ]
Convert diag318_test_handler to use vm_create_with_vcpus() and pass around a 'struct kvm_vcpu' object instead of passing around vCPU IDs. Note, this is a "functional" change in the sense that the test now creates a vCPU with vcpu_id==0 instead of vcpu_id==6. The non-zero VCPU_ID was 100% arbitrary and added little to no validation coverage. If testing non-zero vCPU IDs is desirable for generic tests, that can be done in the future by tweaking the VM creation helpers.
--- .../selftests/kvm/lib/s390x/diag318_test_handler.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/lib/s390x/diag318_test_handler.c +4 -5
@@ -8,8 +8,6 @@#include "test_util.h" #include "kvm_util.h" -#define VCPU_ID 6 -#define ICPT_INSTRUCTION 0x04#define IPA0_DIAG 0x8300
@@ -27,14 +25,15 @@ static void guest_code(void)*/ static uint64_t diag318_handler (void ) { +struct kvm_vcpu *vcpu;struct kvm_vm *vm;struct kvm_run *run;uint64_t reg;uint64_t diag318_info; - vm =vm_create_default (VCPU_ID ,0 , guest_code); -vcpu_run (vm,VCPU_ID ); - run =vcpu_state (vm,VCPU_ID ); + vm =vm_create_with_one_vcpu (&vcpu, guest_code); +vcpu_run (vm, vcpu->id); + run = vcpu->run;TEST_ASSERT (run->exit_reason ==KVM_EXIT_S390_SIEIC ,"DIAGNOSE 0x0318 instruction was not intercepted" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 731/1157 KVM: selftests: Use vm_create_with_vcpus() in max_guest_memory_test
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 3468fd7d883110e481dfb8c8c7b802dc252ab186 ]
Use vm_create_with_vcpus() in max_guest_memory_test and reference vCPUs by their 'struct kvm_vcpu' object instead of their ID.
--- .../selftests/kvm/max_guest_memory_test.c | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/max_guest_memory_test.c +16 -10
@@ -28,8 +28,7 @@ static void guest_code(uint64_t start_gpa, uint64_t end_gpa, uint64_t stride) }struct vcpu_info { -struct kvm_vm *vm; -uint32_t id; +struct kvm_vcpu *vcpu;uint64_t start_gpa;uint64_t end_gpa; };
@@ -60,12 +59,13 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpu_id)static void *vcpu_worker (void *data) { -struct vcpu_info *vcpu = data; +struct vcpu_info *info = data; +struct kvm_vcpu *vcpu = info->vcpu;struct kvm_vm *vm = vcpu->vm;struct kvm_sregs sregs;struct kvm_regs regs; -vcpu_args_set (vm, vcpu->id,3 , vcpu->start_gpa, vcpu->end_gpa, +vcpu_args_set (vm, vcpu->id,3 , info->start_gpa, info->end_gpa,vm_get_page_size (vm));/* Snapshot regs before the first run. */
@@ -89,8 +89,8 @@ static void *vcpu_worker(void *data)return NULL ; } -static pthread_t *spawn_workers (struct kvm_vm *vm,uint64_t start_gpa, -uint64_t end_gpa) +static pthread_t *spawn_workers (struct kvm_vm *vm,struct kvm_vcpu **vcpus, +uint64_t start_gpa,uint64_t end_gpa) {struct vcpu_info *info;uint64_t gpa, nr_bytes;
@@ -108,8 +108,7 @@ static pthread_t *spawn_workers(struct kvm_vm *vm, uint64_t start_gpa,TEST_ASSERT (nr_bytes,"C'mon, no way you have %d CPUs" , nr_vcpus);for (i =0 , gpa = start_gpa; i < nr_vcpus; i++, gpa += nr_bytes) { - info[i].vm = vm; - info[i].id = i; + info[i].vcpu = vcpus[i]; info[i].start_gpa = gpa; info[i].end_gpa = gpa + nr_bytes;pthread_create (&threads[i],NULL , vcpu_worker, &info[i]);
@@ -172,6 +171,7 @@ int main(int argc, char *argv[])uint64_t max_gpa, gpa, slot_size, max_mem, i;int max_slots, slot, opt, fd;bool hugepages = false; +struct kvm_vcpu **vcpus;pthread_t *threads;struct kvm_vm *vm;void *mem;
@@ -215,7 +215,10 @@ int main(int argc, char *argv[]) } } - vm =vm_create_default_with_vcpus (nr_vcpus,0 ,0 , guest_code,NULL ); + vcpus =malloc (nr_vcpus *sizeof (*vcpus)); +TEST_ASSERT (vcpus,"Failed to allocate vCPU array" ); + + vm =vm_create_with_vcpus (nr_vcpus, guest_code, vcpus); max_gpa =vm_get_max_gfn (vm) <<vm_get_page_shift (vm);TEST_ASSERT (max_gpa > (4 * slot_size),"MAXPHYADDR <4gb " );
@@ -252,7 +255,10 @@ int main(int argc, char *argv[]) }atomic_set (&rendezvous, nr_vcpus +1 ); - threads =spawn_workers (vm, start_gpa, gpa); + threads =spawn_workers (vm, vcpus, start_gpa, gpa); + +free (vcpus); + vcpus =NULL ;pr_info ("Running with %lugb of guest memory and %u vCPUs\n" , (gpa - start_gpa) / size_1gb, nr_vcpus);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 732/1157 devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit 77515ebaf01920e2db49e04672ef669a7c2907f2 ]
The dev_coredumpv() and dev_coredumpm() could not be used in atomic context, because they call kvasprintf_const() and kstrdup() with GFP_KERNEL parameter. The process is shown below:
dev_coredumpv(.., gfp_t gfp)
dev_coredumpm(.., gfp_t gfp)
dev_set_name
kobject_set_name_vargs
kvasprintf_const(GFP_KERNEL, ...); //may sleep
kstrdup(s, GFP_KERNEL); //may sleep
This patch removes gfp_t parameter of dev_coredumpv() and dev_coredumpm() and changes the gfp_t parameter of kzalloc() in dev_coredumpm() to GFP_KERNEL in order to show they could not be used in atomic context.
--- drivers/base/devcoredump.c | 16 ++++++---------- drivers/bluetooth/btmrvl_sdio.c | 2 +- drivers/bluetooth/hci_qca.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_dump.c | 2 +- drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 4 ++-- drivers/gpu/drm/msm/msm_gpu.c | 4 ++-- drivers/media/platform/qcom/venus/core.c | 2 +- drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c | 2 +- drivers/net/wireless/ath/ath10k/coredump.c | 2 +- .../net/wireless/ath/wil6210/wil_crash_dump.c | 2 +- .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 2 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 6 ++---- drivers/net/wireless/marvell/mwifiex/main.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 3 +-- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 3 +-- drivers/net/wireless/realtek/rtw88/main.c | 2 +- drivers/net/wireless/realtek/rtw89/ser.c | 2 +- drivers/remoteproc/qcom_q6v5_mss.c | 2 +- drivers/remoteproc/remoteproc_coredump.c | 8 ++++---- include/drm/drm_print.h | 2 +- include/linux/devcoredump.h | 13 ++++++------- sound/soc/intel/avs/apl.c | 2 +- sound/soc/intel/avs/skl.c | 2 +- sound/soc/intel/catpt/dsp.c | 2 +- 24 files changed, 40 insertions(+), 50 deletions(-)
drivers/base/devcoredump.c +6 -10
@@ -173,15 +173,13 @@ static void devcd_freev(void *data)* @dev: the struct device for the crashed device * @data: vmalloc data containing the device coredump * @datalen: length of the data -* @gfp: allocation flags * * This function takes ownership of the vmalloc'ed data and will free * it when it is no longer used. See dev_coredumpm() for more information. */ -void dev_coredumpv (struct device *dev,void *data,size_t datalen, -gfp_t gfp) +void dev_coredumpv (struct device *dev,void *data,size_t datalen) { -dev_coredumpm (dev,NULL , data, datalen, gfp, devcd_readv, devcd_freev); +dev_coredumpm (dev,NULL , data, datalen, devcd_readv, devcd_freev); }EXPORT_SYMBOL_GPL (dev_coredumpv);
@@ -236,7 +234,6 @@ static ssize_t devcd_read_from_sgtable(char *buffer, loff_t offset,* @owner: the module that contains the read/free functions, use %THIS_MODULE * @data: data cookie for the @read/@free functions * @datalen: length of the data -* @gfp: allocation flags * @read: function to read from the given buffer * @free: function to free the given buffer *
@@ -246,7 +243,7 @@ static ssize_t devcd_read_from_sgtable(char *buffer, loff_t offset,* function will be called to free the data. */ void dev_coredumpm (struct device *dev,struct module *owner, -void *data,size_t datalen,gfp_t gfp, +void *data,size_t datalen,ssize_t (*read)(char *buffer,loff_t offset,size_t count,void *data,size_t datalen),void (*free)(void *data))
@@ -268,7 +265,7 @@ void dev_coredumpm(struct device *dev, struct module *owner,if (!try_module_get (owner)) goto free; - devcd =kzalloc (sizeof (*devcd), gfp); + devcd =kzalloc (sizeof (*devcd),GFP_KERNEL );if (!devcd) goto put_module;
@@ -318,7 +315,6 @@ EXPORT_SYMBOL_GPL(dev_coredumpm);* @dev: the struct device for the crashed device * @table: the dump data * @datalen: length of the data -* @gfp: allocation flags * * Creates a new device coredump for the given device. If a previous one hasn't * been read yet, the new coredump is discarded. The data lifetime is determined
@@ -326,9 +322,9 @@ EXPORT_SYMBOL_GPL(dev_coredumpm);* it will free the data. */ void dev_coredumpsg (struct device *dev,struct scatterlist *table, -size_t datalen,gfp_t gfp) +size_t datalen) { -dev_coredumpm (dev,NULL , table, datalen, gfp, devcd_read_from_sgtable, +dev_coredumpm (dev,NULL , table, datalen, devcd_read_from_sgtable, devcd_free_sgtable); }EXPORT_SYMBOL_GPL (dev_coredumpsg);
drivers/bluetooth/btmrvl_sdio.c +1 -1
@@ -1515,7 +1515,7 @@ static void btmrvl_sdio_coredump(struct device *dev)/* fw_dump_data will be free in device coredump release function * after 5 min */ -dev_coredumpv (&card->func->dev, fw_dump_data, fw_dump_len,GFP_KERNEL ); +dev_coredumpv (&card->func->dev, fw_dump_data, fw_dump_len);BT_INFO ("== btmrvl firmware dump to /sys/class/devcoredump end" ); }
drivers/bluetooth/hci_qca.c +1 -1
@@ -1120,7 +1120,7 @@ static void qca_controller_memdump(struct work_struct *work) qca_memdump->ram_dump_size); memdump_buf = qca_memdump->memdump_buf_head;dev_coredumpv (&hu->serdev->dev, memdump_buf, - qca_memdump->received_dump,GFP_KERNEL ); + qca_memdump->received_dump);cancel_delayed_work (&qca->ctrl_memdump_timeout);kfree (qca->qca_memdump); qca->qca_memdump =NULL ;
drivers/gpu/drm/etnaviv/etnaviv_dump.c +1 -1
@@ -225,5 +225,5 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit)etnaviv_core_dump_header (&iter,ETDUMP_BUF_END , iter.data); -dev_coredumpv (gpu->dev, iter.start, iter.data - iter.start,GFP_KERNEL ); +dev_coredumpv (gpu->dev, iter.start, iter.data - iter.start); }
drivers/gpu/drm/msm/disp/msm_disp_snapshot.c +2 -2
@@ -74,8 +74,8 @@ static void _msm_disp_snapshot_work(struct kthread_work *work)* If there is a codedump pending for the device, the dev_coredumpm() * will also free new coredump state. */ -dev_coredumpm (disp_state->dev,THIS_MODULE , disp_state,0 ,GFP_KERNEL , - disp_devcoredump_read, msm_disp_state_free); +dev_coredumpm (disp_state->dev,THIS_MODULE , disp_state,0 , + disp_devcoredump_read, msm_disp_state_free); }void msm_disp_snapshot_state (struct drm_device *drm_dev)
drivers/gpu/drm/msm/msm_gpu.c +2 -2
@@ -299,8 +299,8 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, gpu->crashstate = state;/* FIXME: Release the crashstate if this errors out? */ -dev_coredumpm (gpu->dev->dev,THIS_MODULE , gpu,0 ,GFP_KERNEL , - msm_gpu_devcoredump_read, msm_gpu_devcoredump_free); +dev_coredumpm (gpu->dev->dev,THIS_MODULE , gpu,0 , + msm_gpu_devcoredump_read, msm_gpu_devcoredump_free); }#else static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
drivers/media/platform/qcom/venus/core.c +1 -1
@@ -49,7 +49,7 @@ static void venus_coredump(struct venus_core *core)memcpy (data, mem_va, mem_size);memunmap (mem_va); -dev_coredumpv (dev, data, mem_size,GFP_KERNEL ); +dev_coredumpv (dev, data, mem_size); }static void venus_event_notify (struct venus_core *core,u32 event)
drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c +1 -1
@@ -281,5 +281,5 @@ void mcp251xfd_dump(const struct mcp251xfd_priv *priv)mcp251xfd_dump_end (priv, &iter);dev_coredumpv (&priv->spi->dev, iter.start, - iter.data - iter.start,GFP_KERNEL ); + iter.data - iter.start); }
drivers/net/wireless/ath/ath10k/coredump.c +1 -1
@@ -1607,7 +1607,7 @@ int ath10k_coredump_submit(struct ath10k *ar)return -ENODATA ; } -dev_coredumpv (ar->dev, dump,le32_to_cpu (dump->len),GFP_KERNEL ); +dev_coredumpv (ar->dev, dump,le32_to_cpu (dump->len));return 0 ; }
drivers/net/wireless/ath/wil6210/wil_crash_dump.c +1 -1
@@ -117,6 +117,6 @@ void wil_fw_core_dump(struct wil6210_priv *wil)/* fw_dump_data will be free in device coredump release function * after 5 min */ -dev_coredumpv (wil_to_dev (wil), fw_dump_data, fw_dump_size,GFP_KERNEL ); +dev_coredumpv (wil_to_dev (wil), fw_dump_data, fw_dump_size);wil_info (wil,"fw core dumped, size %d bytes\n" , fw_dump_size); }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c +1 -1
@@ -37,7 +37,7 @@ int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,return err; } -dev_coredumpv (bus->dev, dump, len + ramsize,GFP_KERNEL ); +dev_coredumpv (bus->dev, dump, len + ramsize);return 0 ; }
drivers/net/wireless/intel/iwlwifi/fw/dbg.c +2 -4
@@ -2601,8 +2601,7 @@ static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt, fw_error_dump.trans_ptr->data, fw_error_dump.trans_ptr->len, fw_error_dump.fwrt_len); -dev_coredumpsg (fwrt->trans->dev, sg_dump_data, file_len, -GFP_KERNEL ); +dev_coredumpsg (fwrt->trans->dev, sg_dump_data, file_len); }vfree (fw_error_dump.fwrt_ptr);vfree (fw_error_dump.trans_ptr);
@@ -2647,8 +2646,7 @@ static void iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt, entry->data, entry->size, offs); offs += entry->size; } -dev_coredumpsg (fwrt->trans->dev, sg_dump_data, file_len, -GFP_KERNEL ); +dev_coredumpsg (fwrt->trans->dev, sg_dump_data, file_len); }iwl_dump_ini_list_free (&dump_list); }
drivers/net/wireless/marvell/mwifiex/main.c +1 -2
@@ -1115,8 +1115,7 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter)*/ mwifiex_dbg (adapter,MSG ,"== mwifiex dump information to /sys/class/devcoredump start\n" ); -dev_coredumpv (adapter->dev, adapter->devdump_data, adapter->devdump_len, -GFP_KERNEL ); +dev_coredumpv (adapter->dev, adapter->devdump_data, adapter->devdump_len);mwifiex_dbg (adapter,MSG ,"== mwifiex dump information to /sys/class/devcoredump end\n" );
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +1 -2
@@ -2422,6 +2422,5 @@ void mt7615_coredump_work(struct work_struct *work)dev_kfree_skb (skb); } -dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ , -GFP_KERNEL ); +dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ ); }
drivers/net/wireless/mediatek/mt76/mt7921/mac.c +1 -2
@@ -1419,8 +1419,7 @@ void mt7921_coredump_work(struct work_struct *work) }if (dump) -dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ , -GFP_KERNEL ); +dev_coredumpv (dev->mt76.dev, dump,MT76_CONNAC_COREDUMP_SZ );mt7921_reset (&dev->mt76); }
drivers/net/wireless/realtek/rtw88/main.c +1 -1
@@ -414,7 +414,7 @@ static void rtw_fwcd_dump(struct rtw_dev *rtwdev)* framework. Note that a new dump will be discarded if a previous one * hasn't been released yet. */ -dev_coredumpv (rtwdev->dev, desc->data, desc->size,GFP_KERNEL ); +dev_coredumpv (rtwdev->dev, desc->data, desc->size); }static void rtw_fwcd_free (struct rtw_dev *rtwdev,bool free_self)
drivers/net/wireless/realtek/rtw89/ser.c +1 -1
@@ -127,7 +127,7 @@ static void rtw89_ser_cd_send(struct rtw89_dev *rtwdev,* will be discarded if a previous one hasn't been released by * framework yet. */ -dev_coredumpv (rtwdev->dev, buf,sizeof (*buf),GFP_KERNEL ); +dev_coredumpv (rtwdev->dev, buf,sizeof (*buf)); } static void rtw89_ser_cd_free(struct rtw89_dev *rtwdev,
drivers/remoteproc/qcom_q6v5_mss.c +1 -1
@@ -597,7 +597,7 @@ static void q6v5_dump_mba_logs(struct q6v5 *qproc) data =vmalloc (MBA_LOG_SIZE );if (data) {memcpy (data, mba_region,MBA_LOG_SIZE ); -dev_coredumpv (&rproc->dev, data,MBA_LOG_SIZE ,GFP_KERNEL ); +dev_coredumpv (&rproc->dev, data,MBA_LOG_SIZE ); }memunmap (mba_region); }
drivers/remoteproc/remoteproc_coredump.c +4 -4
@@ -309,7 +309,7 @@ void rproc_coredump(struct rproc *rproc) phdr +=elf_size_of_phdr (class); }if (dump_conf ==RPROC_COREDUMP_ENABLED ) { -dev_coredumpv (&rproc->dev, data, data_size,GFP_KERNEL ); +dev_coredumpv (&rproc->dev, data, data_size);return ; }
@@ -318,7 +318,7 @@ void rproc_coredump(struct rproc *rproc) dump_state.header = data;init_completion (&dump_state.dump_done); -dev_coredumpm (&rproc->dev,NULL , &dump_state, data_size,GFP_KERNEL , +dev_coredumpm (&rproc->dev,NULL , &dump_state, data_size, rproc_coredump_read, rproc_coredump_free);/*
@@ -449,7 +449,7 @@ void rproc_coredump_using_sections(struct rproc *rproc) }if (dump_conf ==RPROC_COREDUMP_ENABLED ) { -dev_coredumpv (&rproc->dev, data, data_size,GFP_KERNEL ); +dev_coredumpv (&rproc->dev, data, data_size);return ; }
@@ -458,7 +458,7 @@ void rproc_coredump_using_sections(struct rproc *rproc) dump_state.header = data;init_completion (&dump_state.dump_done); -dev_coredumpm (&rproc->dev,NULL , &dump_state, data_size,GFP_KERNEL , +dev_coredumpm (&rproc->dev,NULL , &dump_state, data_size, rproc_coredump_read, rproc_coredump_free);/* Wait until the dump is read and free is called. Data is freed
include/drm/drm_print.h +1 -1
@@ -162,7 +162,7 @@ struct drm_print_iterator {* void makecoredump(...) * { * ... -* dev_coredumpm(dev, THIS_MODULE, data, 0, GFP_KERNEL, +* dev_coredumpm(dev, THIS_MODULE, data, 0, * coredump_read, ...) * } *
include/linux/devcoredump.h +6 -7
@@ -52,27 +52,26 @@ static inline void _devcd_free_sgtable(struct scatterlist *table)#ifdef CONFIG_DEV_COREDUMP -void dev_coredumpv (struct device *dev,void *data,size_t datalen, -gfp_t gfp); +void dev_coredumpv (struct device *dev,void *data,size_t datalen);void dev_coredumpm (struct device *dev,struct module *owner, -void *data,size_t datalen,gfp_t gfp, +void *data,size_t datalen,ssize_t (*read)(char *buffer,loff_t offset,size_t count,void *data,size_t datalen),void (*free)(void *data));void dev_coredumpsg (struct device *dev,struct scatterlist *table, -size_t datalen,gfp_t gfp); +size_t datalen);#else static inline void dev_coredumpv (struct device *dev,void *data, -size_t datalen,gfp_t gfp) +size_t datalen) {vfree (data); }static inline void dev_coredumpm (struct device *dev,struct module *owner, -void *data,size_t datalen,gfp_t gfp, +void *data,size_t datalen,ssize_t (*read)(char *buffer,loff_t offset,size_t count,void *data,size_t datalen),void (*free)(void *data))
@@ -81,7 +80,7 @@ dev_coredumpm(struct device *dev, struct module *owner, }static inline void dev_coredumpsg (struct device *dev,struct scatterlist *table, -size_t datalen,gfp_t gfp) +size_t datalen) {_devcd_free_sgtable (table); }
sound/soc/intel/avs/apl.c +1 -1
@@ -164,7 +164,7 @@ static int apl_coredump(struct avs_dev *adev, union avs_notify_msg *msg) }while (offset < msg->ext.coredump.stack_dump_size); exit: -dev_coredumpv (adev->dev, dump, dump_size,GFP_KERNEL ); +dev_coredumpv (adev->dev, dump, dump_size);return 0 ; }
sound/soc/intel/avs/skl.c +1 -1
@@ -88,7 +88,7 @@ static int skl_coredump(struct avs_dev *adev, union avs_notify_msg *msg)return -ENOMEM ;memcpy_fromio (dump,avs_sram_addr (adev,AVS_FW_REGS_WINDOW ),AVS_FW_REGS_SIZE ); -dev_coredumpv (adev->dev, dump,AVS_FW_REGS_SIZE ,GFP_KERNEL ); +dev_coredumpv (adev->dev, dump,AVS_FW_REGS_SIZE );return 0 ; }
sound/soc/intel/catpt/dsp.c +1 -1
@@ -539,7 +539,7 @@ int catpt_coredump(struct catpt_dev *cdev) pos +=CATPT_DMA_REGS_SIZE ; } -dev_coredumpv (cdev->dev, dump, dump_size,GFP_KERNEL ); +dev_coredumpv (cdev->dev, dump, dump_size);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 733/1157 mwifiex: fix sleep in atomic context bugs caused by dev_coredumpv
In reply to Greg Kroah-HartmanFrom: Duoming Zhou <[email protected]>
[ Upstream commit a52ed4866d2b90dd5e4ae9dabd453f3ed8fa3cbc ]
There are sleep in atomic context bugs when uploading device dump data in mwifiex. The root cause is that dev_coredumpv could not be used in atomic contexts, because it calls dev_set_name which include operations that may sleep. The call tree shows execution paths that could lead to bugs:
(Interrupt context)fw_dump_timer_fn
mwifiex_upload_device_dump
dev_coredumpv(..., GFP_KERNEL)
dev_coredumpm()
kzalloc(sizeof(*devcd), gfp); //may sleep dev_set_name
kobject_set_name_vargs
kvasprintf_const(GFP_KERNEL, ...); //may sleep kstrdup(s, GFP_KERNEL); //may sleep
The corresponding fail log is shown below:
[ 135.275938] usb 1-1: == mwifiex dump information to /sys/class/devcoredump start [ 135.281029] BUG: sleeping function called from invalid context at include/linux/sched/mm.h:265 ... [ 135.293613] Call Trace: [ 135.293613] <IRQ> [ 135.293613] dump_stack_lvl+0x57/0x7d [ 135.293613] __might_resched.cold+0x138/0x173 [ 135.293613] ? dev_coredumpm+0xca/0x2e0 [ 135.293613] kmem_cache_alloc_trace+0x189/0x1f0 [ 135.293613] ? devcd_match_failing+0x30/0x30 [ 135.293613] dev_coredumpm+0xca/0x2e0 [ 135.293613] ? devcd_freev+0x10/0x10 [ 135.293613] dev_coredumpv+0x1c/0x20 [ 135.293613] ? devcd_match_failing+0x30/0x30 [ 135.293613] mwifiex_upload_device_dump+0x65/0xb0 [ 135.293613] ? mwifiex_dnld_fw+0x1b0/0x1b0 [ 135.293613] call_timer_fn+0x122/0x3d0 [ 135.293613] ? msleep_interruptible+0xb0/0xb0 [ 135.293613] ? lock_downgrade+0x3c0/0x3c0 [ 135.293613] ? __next_timer_interrupt+0x13c/0x160 [ 135.293613] ? lockdep_hardirqs_on_prepare+0xe/0x220 [ 135.293613] ? mwifiex_dnld_fw+0x1b0/0x1b0 [ 135.293613] __run_timers.part.0+0x3f8/0x540 [ 135.293613] ? call_timer_fn+0x3d0/0x3d0 [ 135.293613] ? arch_restore_msi_irqs+0x10/0x10 [ 135.293613] ? lapic_next_event+0x31/0x40 [ 135.293613] run_timer_softirq+0x4f/0xb0 [ 135.293613] __do_softirq+0x1c2/0x651 ... [ 135.293613] RIP: 0010:default_idle+0xb/0x10 [ 135.293613] RSP: 0018:ffff888006317e68 EFLAGS: 00000246 [ 135.293613] RAX: ffffffff82ad8d10 RBX: ffff888006301cc0 RCX: ffffffff82ac90e1 [ 135.293613] RDX: ffffed100d9ff1b4 RSI: ffffffff831ad140 RDI: ffffffff82ad8f20 [ 135.293613] RBP: 0000000000000003 R08: 0000000000000000 R09: ffff88806cff8d9b [ 135.293613] R10: ffffed100d9ff1b3 R11: 0000000000000001 R12: ffffffff84593410 [ 135.293613] R13: 0000000000000000 R14: 0000000000000000 R15: 1ffff11000c62fd2 ... [ 135.389205] usb 1-1: == mwifiex dump information to /sys/class/devcoredump end
This patch uses delayed work to replace timer and moves the operations that may sleep into a delayed work in order to mitigate bugs, it was tested on Marvell 88W8801 chip whose port is usb and the firmware is usb8801_uapsta.bin. The following is the result after using delayed work to replace timer.
[ 134.936453] usb 1-1: == mwifiex dump information to /sys/class/devcoredump start [ 135.043344] usb 1-1: == mwifiex dump information to /sys/class/devcoredump end
As we can see, there is no bug now.
--- drivers/net/wireless/marvell/mwifiex/init.c | 9 +++++---- drivers/net/wireless/marvell/mwifiex/main.h | 3 ++- drivers/net/wireless/marvell/mwifiex/sta_event.c | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/wireless/marvell/mwifiex/init.c +5 -4
@@ -63,9 +63,10 @@ static void wakeup_timer_fn(struct timer_list *t) adapter->if_ops.card_reset (adapter); } -static void fw_dump_timer_fn (struct timer_list *t) +static void fw_dump_work (struct work_struct *work) { -struct mwifiex_adapter *adapter =from_timer (adapter, t, devdump_timer); +struct mwifiex_adapter *adapter = + container_of(work, struct mwifiex_adapter, devdump_work.work);mwifiex_upload_device_dump (adapter); }
@@ -321,7 +322,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) adapter->active_scan_triggered = false;timer_setup (&adapter->wakeup_timer, wakeup_timer_fn,0 ); adapter->devdump_len =0 ; -timer_setup (&adapter->devdump_timer, fw_dump_timer_fn,0 ); +INIT_DELAYED_WORK (&adapter->devdump_work, fw_dump_work); }/*
@@ -400,7 +401,7 @@ static void mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter) {del_timer (&adapter->wakeup_timer); -del_timer_sync (&adapter->devdump_timer); +cancel_delayed_work_sync (&adapter->devdump_work);mwifiex_cancel_all_pending_cmd (adapter);wake_up_interruptible (&adapter->cmd_wait_q.wait);wake_up_interruptible (&adapter->hs_activate_wait_q);
drivers/net/wireless/marvell/mwifiex/main.h +2 -1
@@ -49,6 +49,7 @@#include <linux/pm_runtime.h> #include <linux/slab.h> #include <linux/of_irq.h> +#include <linux/workqueue.h> #include "decl.h" #include "ioctl.h"
@@ -1055,7 +1056,7 @@ struct mwifiex_adapter {/* Device dump data/length */ void *devdump_data;int devdump_len; -struct timer_list devdump_timer; +struct delayed_work devdump_work;bool ignore_btcoex_events; };
drivers/net/wireless/marvell/mwifiex/sta_event.c +3 -3
@@ -623,8 +623,8 @@ mwifiex_fw_dump_info_event(struct mwifiex_private *priv,* transmission event get lost, in this cornel case, * user would still get partial of the dump. */ -mod_timer (&adapter->devdump_timer, - jiffies +msecs_to_jiffies (MWIFIEX_TIMER_10S )); +schedule_delayed_work (&adapter->devdump_work, +msecs_to_jiffies (MWIFIEX_TIMER_10S )); }/* Overflow check */
@@ -643,7 +643,7 @@ mwifiex_fw_dump_info_event(struct mwifiex_private *priv,return ; upload_dump: -del_timer_sync (&adapter->devdump_timer); +cancel_delayed_work_sync (&adapter->devdump_work);mwifiex_upload_device_dump (adapter); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 734/1157 scsi: iscsi: Allow iscsi_if_stop_conn() to be called from kernel
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 3328333b47f4163504267440ec0a36087a407a5f ]
iscsi_if_stop_conn() is only called from the userspace interface but in a subsequent commit we will want to call it from the kernel interface to allow drivers like qedi to remove sessions from inside the kernel during shutdown. This removes the iscsi_uevent code from iscsi_if_stop_conn() so we can call it in a new helper.
--- drivers/scsi/scsi_transport_iscsi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +7 -10
@@ -2264,16 +2264,8 @@ static void iscsi_if_disconnect_bound_ep(struct iscsi_cls_conn *conn, } } -static int iscsi_if_stop_conn (struct iscsi_transport *transport, -struct iscsi_uevent *ev) +static int iscsi_if_stop_conn (struct iscsi_cls_conn *conn,int flag) { -int flag = ev->u.stop_conn.flag; -struct iscsi_cls_conn *conn; - - conn =iscsi_conn_lookup (ev->u.stop_conn.sid, ev->u.stop_conn.cid); -if (!conn) -return -EINVAL ; -ISCSI_DBG_TRANS_CONN (conn,"iscsi if conn stop.\n" );/* * If this is a termination we have to call stop_conn with that flag
@@ -3720,7 +3712,12 @@ static int iscsi_if_transport_conn(struct iscsi_transport *transport,case ISCSI_UEVENT_DESTROY_CONN :return iscsi_if_destroy_conn (transport, ev);case ISCSI_UEVENT_STOP_CONN : -return iscsi_if_stop_conn (transport, ev); + conn =iscsi_conn_lookup (ev->u.stop_conn.sid, + ev->u.stop_conn.cid); +if (!conn) +return -EINVAL ; + +return iscsi_if_stop_conn (conn, ev->u.stop_conn.flag); }/*
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 735/1157 scsi: iscsi: Add helper to remove a session from the kernel
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit bb42856bfd54fda1cbc7c470fcf5db1596938f4f ]
During qedi shutdown we need to stop the iSCSI layer from sending new nops as pings and from responding to target ones and make sure there is no running connection cleanups. Commit d1f2ce77638d ("scsi: qedi: Fix host removal with running sessions") converted the driver to use the libicsi helper to drive session removal, so the above issues could be handled. The problem is that during system shutdown iscsid will not be running so when we try to remove the root session we will hang waiting for userspace to reply.
Add a helper that will drive the destruction of sessions like these during system shutdown.
--- drivers/scsi/scsi_transport_iscsi.c | 49 +++++++++++++++++++++++++++++ include/scsi/scsi_transport_iscsi.h | 1 + 2 files changed, 50 insertions(+)
drivers/scsi/scsi_transport_iscsi.c +49 -0
@@ -2341,6 +2341,55 @@ static void iscsi_cleanup_conn_work_fn(struct work_struct *work)ISCSI_DBG_TRANS_CONN (conn,"cleanup done.\n" ); } +static int iscsi_iter_force_destroy_conn_fn (struct device *dev,void *data) +{ +struct iscsi_transport *transport; +struct iscsi_cls_conn *conn; + +if (!iscsi_is_conn_dev (dev)) +return 0 ; + + conn =iscsi_dev_to_conn (dev); + transport = conn->transport; + +if (READ_ONCE (conn->state) !=ISCSI_CONN_DOWN ) +iscsi_if_stop_conn (conn,STOP_CONN_TERM ); + + transport->destroy_conn (conn); +return 0 ; +} + +/** +* iscsi_force_destroy_session - destroy a session from the kernel +* @session: session to destroy +* +* Force the destruction of a session from the kernel. This should only be +* used when userspace is no longer running during system shutdown. +*/ +void iscsi_force_destroy_session (struct iscsi_cls_session *session) +{ +struct iscsi_transport *transport = session->transport; +unsigned long flags; + +WARN_ON_ONCE (system_state ==SYSTEM_RUNNING ); + +spin_lock_irqsave (&sesslock, flags); +if (list_empty (&session->sess_list)) { +spin_unlock_irqrestore (&sesslock, flags); +/* +* Conn/ep is already freed. Session is being torn down via +* async path. For shutdown we don't care about it so return. +*/ +return ; + } +spin_unlock_irqrestore (&sesslock, flags); + +device_for_each_child (&session->dev,NULL , + iscsi_iter_force_destroy_conn_fn); + transport->destroy_session (session); +} +EXPORT_SYMBOL_GPL (iscsi_force_destroy_session); +void iscsi_free_session (struct iscsi_cls_session *session) {ISCSI_DBG_TRANS_SESSION (session,"Freeing session\n" );
include/scsi/scsi_transport_iscsi.h +1 -0
@@ -442,6 +442,7 @@ extern struct iscsi_cls_session *iscsi_create_session(struct Scsi_Host *shost,struct iscsi_transport *t, int dd_size, unsigned int target_id); +extern void iscsi_force_destroy_session (struct iscsi_cls_session *session);extern void iscsi_remove_session (struct iscsi_cls_session *session);extern void iscsi_free_session (struct iscsi_cls_session *session); extern struct iscsi_cls_conn *iscsi_alloc_conn(struct iscsi_cls_session *sess,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 736/1157 scsi: iscsi: Fix session removal on shutdown
In reply to Greg Kroah-HartmanFrom: Mike Christie <[email protected]>
[ Upstream commit 31500e902759322ba3c64b60dabae2704e738df8 ]
When the system is shutting down, iscsid is not running so we will not get a response to the ISCSI_ERR_INVALID_HOST error event. The system shutdown will then hang waiting on userspace to remove the session.
This has libiscsi force the destruction of the session from the kernel when iscsi_host_remove() is called from a driver's shutdown callout.
This fixes a regression added in qedi boot with commit d1f2ce77638d ("scsi:
qedi: Fix host removal with running sessions") which made qedi use the common session removal function that waits on userspace instead of rolling its own kernel based removal.
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 4 ++-- drivers/scsi/be2iscsi/be_main.c | 2 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/cxgbi/libcxgbi.c | 2 +- drivers/scsi/iscsi_tcp.c | 4 ++-- drivers/scsi/libiscsi.c | 9 +++++++-- drivers/scsi/qedi/qedi_main.c | 9 ++++++--- include/scsi/libiscsi.h | 2 +- 8 files changed, 21 insertions(+), 13 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +2 -2
@@ -568,7 +568,7 @@ static void iscsi_iser_session_destroy(struct iscsi_cls_session *cls_session)struct Scsi_Host *shost =iscsi_session_to_shost (cls_session);iscsi_session_teardown (cls_session); -iscsi_host_remove (shost); +iscsi_host_remove (shost, false);iscsi_host_free (shost); }
@@ -685,7 +685,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,return cls_session; remove_host: -iscsi_host_remove (shost); +iscsi_host_remove (shost, false); free_host:iscsi_host_free (shost);return NULL ;
drivers/scsi/be2iscsi/be_main.c +1 -1
@@ -5745,7 +5745,7 @@ static void beiscsi_remove(struct pci_dev *pcidev)cancel_work_sync (&phba->sess_work);beiscsi_iface_destroy_default (phba); -iscsi_host_remove (phba->shost); +iscsi_host_remove (phba->shost, false);beiscsi_disable_port (phba,1 );/* after cancelling boot_work */
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -1
@@ -909,7 +909,7 @@ void bnx2i_free_hba(struct bnx2i_hba *hba) {struct Scsi_Host *shost = hba->shost; -iscsi_host_remove (shost); +iscsi_host_remove (shost, false);INIT_LIST_HEAD (&hba->ep_ofld_list);INIT_LIST_HEAD (&hba->ep_active_list);INIT_LIST_HEAD (&hba->ep_destroy_list);
drivers/scsi/cxgbi/libcxgbi.c +1 -1
@@ -328,7 +328,7 @@ void cxgbi_hbas_remove(struct cxgbi_device *cdev) chba = cdev->hbas[i];if (chba) { cdev->hbas[i] =NULL ; -iscsi_host_remove (chba->shost); +iscsi_host_remove (chba->shost, false);pci_dev_put (cdev->pdev);iscsi_host_free (chba->shost); }
drivers/scsi/iscsi_tcp.c +2 -2
@@ -898,7 +898,7 @@ iscsi_sw_tcp_session_create(struct iscsi_endpoint *ep, uint16_t cmds_max, remove_session:iscsi_session_teardown (cls_session); remove_host: -iscsi_host_remove (shost); +iscsi_host_remove (shost, false); free_host:iscsi_host_free (shost);return NULL ;
@@ -915,7 +915,7 @@ static void iscsi_sw_tcp_session_destroy(struct iscsi_cls_session *cls_session)iscsi_tcp_r2tpool_free (cls_session->dd_data);iscsi_session_teardown (cls_session); -iscsi_host_remove (shost); +iscsi_host_remove (shost, false);iscsi_host_free (shost); }
drivers/scsi/libiscsi.c +7 -2
@@ -2828,11 +2828,12 @@ static void iscsi_notify_host_removed(struct iscsi_cls_session *cls_session)/** * iscsi_host_remove - remove host and sessions * @shost: scsi host +* @is_shutdown: true if called from a driver shutdown callout * * If there are any sessions left, this will initiate the removal and wait * for the completion. */ -void iscsi_host_remove (struct Scsi_Host *shost) +void iscsi_host_remove (struct Scsi_Host *shost,bool is_shutdown) {struct iscsi_host *ihost =shost_priv (shost);unsigned long flags;
@@ -2841,7 +2842,11 @@ void iscsi_host_remove(struct Scsi_Host *shost) ihost->state =ISCSI_HOST_REMOVED ;spin_unlock_irqrestore (&ihost->lock, flags); -iscsi_host_for_each_session (shost, iscsi_notify_host_removed); +if (!is_shutdown) +iscsi_host_for_each_session (shost, iscsi_notify_host_removed); +else +iscsi_host_for_each_session (shost, iscsi_force_destroy_session); +wait_event_interruptible (ihost->session_removal_wq, ihost->num_sessions ==0 );if (signal_pending (current))
drivers/scsi/qedi/qedi_main.c +6 -3
@@ -2414,9 +2414,12 @@ static void __qedi_remove(struct pci_dev *pdev, int mode)int rval;u16 retry =10 ; -if (mode ==QEDI_MODE_NORMAL || mode ==QEDI_MODE_SHUTDOWN ) { -iscsi_host_remove (qedi->shost); +if (mode ==QEDI_MODE_NORMAL ) +iscsi_host_remove (qedi->shost, false); +else if (mode ==QEDI_MODE_SHUTDOWN ) +iscsi_host_remove (qedi->shost, true); +if (mode ==QEDI_MODE_NORMAL || mode ==QEDI_MODE_SHUTDOWN ) {if (qedi->tmf_thread) {destroy_workqueue (qedi->tmf_thread); qedi->tmf_thread =NULL ;
@@ -2791,7 +2794,7 @@ static int __qedi_probe(struct pci_dev *pdev, int mode)#ifdef CONFIG_DEBUG_FS qedi_dbg_host_exit (&qedi->dbg_ctx);#endif -iscsi_host_remove (qedi->shost); +iscsi_host_remove (qedi->shost, false); stop_iscsi_func: qedi_ops->stop (qedi->cdev); stop_slowpath:
include/scsi/libiscsi.h +1 -1
@@ -411,7 +411,7 @@ extern int iscsi_host_add(struct Scsi_Host *shost, struct device *pdev);extern struct Scsi_Host *iscsi_host_alloc (struct scsi_host_template *sht,int dd_data_size,bool xmit_can_sleep); -extern void iscsi_host_remove (struct Scsi_Host *shost); +extern void iscsi_host_remove (struct Scsi_Host *shost,bool is_shutdown);extern void iscsi_host_free (struct Scsi_Host *shost);extern int iscsi_target_alloc (struct scsi_target *starget); extern int iscsi_host_get_max_scsi_cmds(struct Scsi_Host *shost,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 737/1157 dmaengine: dw-edma: Fix eDMA Rd/Wr-channels and DMA-direction semantics
In reply to Greg Kroah-HartmanFrom: Serge Semin <[email protected]>
[ Upstream commit c1e33979171da63cf47e56243ccb8ba82363c7d3 ]
In accordance with [1, 2] the DW eDMA controller has been created to be part of the DW PCIe Root Port and DW PCIe End-point controllers and to offload the transferring of large blocks of data between application and remote PCIe domains leaving the system CPU free for other tasks. In the first case (eDMA being part of DW PCIe Root Port) the eDMA controller is always accessible via the CPU DBI interface and never over the PCIe wire.
The latter case is more complex. Depending on the DW PCIe End-Point IP-core synthesize parameters it's possible to have the eDMA registers accessible not only from the application CPU side, but also via mapping the eDMA CSRs over a dedicated endpoint BAR. So based on the specifics denoted above the eDMA driver is supposed to support two types of the DMA controller setups:
1) eDMA embedded into the DW PCIe Root Port/End-point and accessible over the local CPU from the application side.
2) eDMA embedded into the DW PCIe End-point and accessible via the PCIe wire with MWr/MRd TLPs generated by the CPU PCIe host controller.
Since the CPU memory resides different sides in these cases the semantics of the MEM_TO_DEV and DEV_TO_MEM operations is flipped with respect to the Tx and Rx DMA channels. So MEM_TO_DEV/DEV_TO_MEM corresponds to the Tx/Rx channels in setup 1) and to the Rx/Tx channels in case of setup 2).
The DW eDMA driver has supported the case 2) since e63d79d1ffcd ("dmaengine: Add Synopsys eDMA IP core driver") in the framework of the drivers/dma/dw-edma/dw-edma-pcie.c driver.
The case 1) support was added later by bd96f1b2f43a ("dmaengine: dw-edma:
support local dma device transfer semantics"). Afterwards the driver was supposed to cover the both possible eDMA setups, but the latter commit turned out to be not fully correct.
The problem was that the commit together with the new functionality support also changed the channel direction semantics so the eDMA Read-channel (corresponding to the DMA_DEV_TO_MEM direction for case 1) now uses the sgl/cyclic base addresses as the Source addresses of the DMA transfers and dma_slave_config.dst_addr as the Destination address of the DMA transfers.
Similarly the eDMA Write-channel (corresponding to the DMA_MEM_TO_DEV direction for case 1) now uses dma_slave_config.src_addr as a source address of the DMA transfers and sgl/cyclic base address as the Destination address of the DMA transfers. This contradicts the logic of the DMA-interface, which implies that DEV side is supposed to belong to the PCIe device memory and MEM - to the CPU/Application memory. Indeed it seems irrational to have the SG-list defined in the PCIe bus space, while expecting a contiguous buffer allocated in the CPU memory. Moreover the passed SG-list and cyclic DMA buffers are supposed to be mapped in a way so to be seen by the DW eDMA Application (CPU) interface.
So in order to have the correct DW eDMA interface we need to invert the eDMA Rd/Wr-channels and DMA-slave directions semantics by selecting the src/dst addresses based on the DMA transfer direction instead of using the channel direction capability.
[1] DesignWare Cores PCI Express Controller Databook - DWC PCIe Root Port,
v.5.40a, March 2019, p.1092
[2] DesignWare Cores PCI Express Controller Databook - DWC PCIe Endpoint,
v.5.40a, March 2019, p.1189--- drivers/dma/dw-edma/dw-edma-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/dw-edma/dw-edma-core.c +1 -1
@@ -423,7 +423,7 @@ dw_edma_device_transfer(struct dw_edma_transfer *xfer) chunk->ll_region.sz += burst->sz; desc->alloc_sz += burst->sz; -if (chan->dir ==EDMA_DIR_WRITE ) { +if (dir ==DMA_DEV_TO_MEM ) { burst->sar = src_addr;if (xfer->type ==EDMA_XFER_CYCLIC ) { burst->dar = xfer->xfer.cyclic.paddr;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 738/1157 KVM: x86: Fix errant brace in KVM capability handling
In reply to Greg Kroah-HartmanFrom: Ben Gardon <[email protected]>
[ Upstream commit 1c4dc57328bf218e999951824dce75c6125c4f3c ]
The braces around the KVM_CAP_XSAVE2 block also surround the KVM_CAP_PMU_CAPABILITY block, likely the result of a merge issue. Simply move the curly brace back to where it belongs.
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/x86.c +1 -1
@@ -4398,10 +4398,10 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)if (r <sizeof (struct kvm_xsave )) r =sizeof (struct kvm_xsave );break ; + }case KVM_CAP_PMU_CAPABILITY : r = enable_pmu ?KVM_CAP_PMU_VALID_MASK :0 ;break ; - }case KVM_CAP_DISABLE_QUIRKS2 : r =KVM_X86_VALID_QUIRKS ;break ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 739/1157 mtd: hyperbus: rpc-if: Fix RPM imbalance in probe error path
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit c223a38d62e57aa60a890ea7247e3c58a54478e6 ]
If rpcif_hw_init() fails, Runtime PM is left enabled.
--- drivers/mtd/hyperbus/rpc-if.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/mtd/hyperbus/rpc-if.c +6 -2
@@ -134,7 +134,7 @@ static int rpcif_hb_probe(struct platform_device *pdev) error =rpcif_hw_init (&hyperbus->rpc, true);if (error) -return error; + goto out_disable_rpm; hyperbus->hbdev.map.size = hyperbus->rpc.size; hyperbus->hbdev.map.virt = hyperbus->rpc.dirmap;
@@ -145,8 +145,12 @@ static int rpcif_hb_probe(struct platform_device *pdev) hyperbus->hbdev.np =of_get_next_child (pdev->dev.parent->of_node,NULL ); error =hyperbus_register_device (&hyperbus->hbdev);if (error) -rpcif_disable_rpm (&hyperbus->rpc); + goto out_disable_rpm; + +return 0 ; +out_disable_rpm: +rpcif_disable_rpm (&hyperbus->rpc);return error; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 740/1157 mtd: dataflash: Add SPI ID table
In reply to Greg Kroah-HartmanFrom: Mark Brown <[email protected]>
[ Upstream commit ac4f83482afbfd927d0fe118151b747cf175e724 ]
Currently autoloading for SPI devices does not use the DT ID table, it uses SPI modalises. Supporting OF modalises is going to be difficult if not impractical, an attempt was made but has been reverted, so ensure that module autoloading works for this driver by adding an id_table listing the SPI IDs for everything.
--- drivers/mtd/devices/mtd_dataflash.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/mtd/devices/mtd_dataflash.c +8 -0
@@ -112,6 +112,13 @@ static const struct of_device_id dataflash_dt_ids[] = {MODULE_DEVICE_TABLE (of, dataflash_dt_ids);#endif +static const struct spi_device_id dataflash_spi_ids[] = { + { .name ="at45" , }, + { .name ="dataflash" , }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (spi, dataflash_spi_ids); +/* ......................................................................... */ /*
@@ -936,6 +943,7 @@ static struct spi_driver dataflash_driver = { .probe = dataflash_probe, .remove = dataflash_remove, + .id_table = dataflash_spi_ids,/* FIXME: investigate suspend and resume... */ };
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 741/1157 clk: qcom: camcc-sm8250: Fix halt on boot by reducing drivers init level
In reply to Greg Kroah-HartmanFrom: Vladimir Zapolskiy <[email protected]>
[ Upstream commit c4f40351901a10cd662ac2c081396d8fb04f584d ]
Access to I/O of SM8250 camera clock controller IP depends on enabled GCC_CAMERA_AHB_CLK clock supplied by global clock controller, the latter one is inited on subsys level, so, to satisfy the dependency, it would make sense to deprive the init level of camcc-sm8250 driver.
If both drivers are compiled as built-in, there is a change that a board won't boot up due to a race, which happens on the same init level.
--- drivers/clk/qcom/camcc-sm8250.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/clk/qcom/camcc-sm8250.c +1 -11
@@ -2440,17 +2440,7 @@ static struct platform_driver cam_cc_sm8250_driver = { }, }; -static int __init cam_cc_sm8250_init (void ) -{ -return platform_driver_register (&cam_cc_sm8250_driver); -} -subsys_initcall (cam_cc_sm8250_init); - -static void __exit cam_cc_sm8250_exit(void) -{ -platform_driver_unregister (&cam_cc_sm8250_driver); -} -module_exit (cam_cc_sm8250_exit); +module_platform_driver (cam_cc_sm8250_driver);MODULE_DESCRIPTION ("QTI CAMCC SM8250 Driver" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 742/1157 misc: rtsx: Fix an error handling path in rtsx_pci_probe()
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 44fd1917314e9d4f53dd95dd65df1c152f503d3a ]
If an error occurs after a successful idr_alloc() call, the corresponding resource must be released with idr_remove() as already done in the .remove function.
Update the error handling path to add the missing idr_remove() call.
--- drivers/misc/cardreader/rtsx_pcr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/misc/cardreader/rtsx_pcr.c +5 -1
@@ -1507,7 +1507,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->remap_addr =ioremap (base, len);if (!pcr->remap_addr) { ret = -ENOMEM ; - goto free_handle; + goto free_idr; } pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev),
@@ -1570,6 +1570,10 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr); unmap:iounmap (pcr->remap_addr); +free_idr: +spin_lock (&rtsx_pci_lock); +idr_remove (&rtsx_pci_idr, pcr->id); +spin_unlock (&rtsx_pci_lock); free_handle:kfree (handle); free_pcr:
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 743/1157 driver core: fix potential deadlock in __driver_attach
In reply to Greg Kroah-HartmanFrom: Zhang Wensheng <[email protected]>
[ Upstream commit 70fe758352cafdee72a7b13bf9db065f9613ced8 ]
In __driver_attach function, There are also AA deadlock problem, like the commit b232b02bf3c2 ("driver core: fix deadlock in __device_attach").
stack like commit b232b02bf3c2 ("driver core: fix deadlock in __device_attach").
list below:
In __driver_attach function, The lock holding logic is as follows:
...
__driver_attach
if (driver_allows_async_probing(drv))
device_lock(dev) // get lock dev
async_schedule_dev(__driver_attach_async_helper, dev); // func
async_schedule_node
async_schedule_node_domain(func)
entry = kzalloc(sizeof(struct async_entry), GFP_ATOMIC); /* when fail or work limit, sync to execute func, but
__driver_attach_async_helper will get lock dev as will, which will lead to A-A deadlock. */
if (!entry || atomic_read(&entry_count) > MAX_WORK) {
func;
else
queue_work_node(node, system_unbound_wq, &entry->work)
device_unlock(dev)
As above show, when it is allowed to do async probes, because of out of memory or work limit, async work is not be allowed, to do sync execute instead. it will lead to A-A deadlock because of __driver_attach_async_helper getting lock dev.
Reproduce:
and it can be reproduce by make the condition
(if (!entry || atomic_read(&entry_count) > MAX_WORK)) untenable, like below:
[ 370.785650] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 370.787154] task:swapper/0 state:D stack: 0 pid: 1 ppid: 0 flags:0x00004000 [ 370.788865] Call Trace: [ 370.789374] <TASK> [ 370.789841] __schedule+0x482/0x1050 [ 370.790613] schedule+0x92/0x1a0 [ 370.791290] schedule_preempt_disabled+0x2c/0x50 [ 370.792256] __mutex_lock.isra.0+0x757/0xec0 [ 370.793158] __mutex_lock_slowpath+0x1f/0x30 [ 370.794079] mutex_lock+0x50/0x60 [ 370.794795] __device_driver_lock+0x2f/0x70 [ 370.795677] ? driver_probe_device+0xd0/0xd0 [ 370.796576] __driver_attach_async_helper+0x1d/0xd0 [ 370.797318] ? driver_probe_device+0xd0/0xd0 [ 370.797957] async_schedule_node_domain+0xa5/0xc0 [ 370.798652] async_schedule_node+0x19/0x30 [ 370.799243] __driver_attach+0x246/0x290 [ 370.799828] ? driver_allows_async_probing+0xa0/0xa0 [ 370.800548] bus_for_each_dev+0x9d/0x130 [ 370.801132] driver_attach+0x22/0x30 [ 370.801666] bus_add_driver+0x290/0x340 [ 370.802246] driver_register+0x88/0x140 [ 370.802817] ? virtio_scsi_init+0x116/0x116 [ 370.803425] scsi_register_driver+0x1a/0x30 [ 370.804057] init_sd+0x184/0x226 [ 370.804533] do_one_initcall+0x71/0x3a0 [ 370.805107] kernel_init_freeable+0x39a/0x43a [ 370.805759] ? rest_init+0x150/0x150 [ 370.806283] kernel_init+0x26/0x230 [ 370.806799] ret_from_fork+0x1f/0x30
To fix the deadlock, move the async_schedule_dev outside device_lock, as we can see, in async_schedule_node_domain, the parameter of queue_work_node is system_unbound_wq, so it can accept concurrent operations. which will also not change the code logic, and will not lead to deadlock.
--- drivers/base/dd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/dd.c +4 -1
@@ -1115,6 +1115,7 @@ static void __driver_attach_async_helper(void *_dev, async_cookie_t cookie)static int __driver_attach (struct device *dev,void *data) {struct device_driver *drv = data; +bool async = false;int ret;/*
@@ -1153,9 +1154,11 @@ static int __driver_attach(struct device *dev, void *data)if (!dev->driver && !dev->p->async_driver) {get_device (dev); dev->p->async_driver = drv; -async_schedule_dev (__driver_attach_async_helper, dev); + async = true; }device_unlock (dev); +if (async) +async_schedule_dev (__driver_attach_async_helper, dev);return 0 ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 744/1157 clk: qcom: clk-krait: unlock spin after mux completion
In reply to Greg Kroah-HartmanFrom: Ansuel Smith <[email protected]>
[ Upstream commit df83d2c9e72910416f650ade1e07cc314ff02731 ]
Unlock spinlock after the mux switch is completed to prevent any corner case of mux request while the switch still needs to be done.
--- drivers/clk/qcom/clk-krait.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/clk/qcom/clk-krait.c +6 -1
@@ -32,11 +32,16 @@ static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel) regval |= (sel & mux->mask) << (mux->shift +LPL_SHIFT ); }krait_set_l2_indirect_reg (mux->offset, regval); -spin_unlock_irqrestore (&krait_clock_reg_lock, flags);/* Wait for switch to complete. */ mb ();udelay (1 ); + +/* +* Unlock now to make sure the mux register is not +* modified while switching to the new parent. +*/ +spin_unlock_irqrestore (&krait_clock_reg_lock, flags); }static int krait_mux_set_parent (struct clk_hw *hw,u8 index)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 745/1157 coresight: configfs: Fix unload of configurations on module exit
In reply to Greg Kroah-HartmanFrom: Mike Leach <[email protected]>
[ Upstream commit 199380decc5f9188a9e65676031950f1734aaffe ]
Any loaded configurations must be correctly unloaded on coresight module exit, or issues can arise with nested locking in the configfs directory code if built with CONFIG_LOCKDEP.
Prior to this patch, the preloaded configuration configfs directory entries were being unloaded by the recursive code in configfs_unregister_subsystem().
However, when built with CONFIG_LOCKDEP, this caused a nested lock warning, which was not mitigated by the LOCKDEP dependent code in fs/configfs/dir.c designed to prevent this, due to the different directory levels for the root of the directory being removed.
As the preloaded (and all other) configurations are registered after configfs_register_subsystem(), we now explicitly unload them before the call to configfs_unregister_subsystem().
The new routine cscfg_unload_cfgs_on_exit() iterates through the load owner list to unload any remaining configurations that were not unloaded by the user before the module exits. This covers both the CSCFG_OWNER_PRELOAD and CSCFG_OWNER_MODULE owner types, and will be extended to cover future load owner types for CoreSight configurations.
--- .../hwtracing/coresight/coresight-syscfg.c | 104 ++++++++++++++++-- 1 file changed, 93 insertions(+), 11 deletions(-)
drivers/hwtracing/coresight/coresight-syscfg.c +93 -11
@@ -414,6 +414,27 @@ static void cscfg_remove_owned_csdev_features(struct coresight_device *csdev, vo } } +/* +* Unregister all configuration and features from configfs owned by load_owner. +* Although this is called without the list mutex being held, it is in the +* context of an unload operation which are strictly serialised, +* so the lists cannot change during this call. +*/ +static void cscfg_fs_unregister_cfgs_feats (void *load_owner) +{ +struct cscfg_config_desc *config_desc; +struct cscfg_feature_desc *feat_desc; + +list_for_each_entry (config_desc, &cscfg_mgr->config_desc_list, item) { +if (config_desc->load_owner == load_owner) +cscfg_configfs_del_config (config_desc); + } +list_for_each_entry (feat_desc, &cscfg_mgr->feat_desc_list, item) { +if (feat_desc->load_owner == load_owner) +cscfg_configfs_del_feature (feat_desc); + } +} +/* * removal is relatively easy - just remove from all lists, anything that * matches the owner. Memory for the descriptors will be managed by the owner,
@@ -1022,8 +1043,10 @@ struct device *cscfg_device(void)/* Must have a release function or the kernel will complain on module unload */ static void cscfg_dev_release (struct device *dev) { +mutex_lock (&cscfg_mutex);kfree (cscfg_mgr); cscfg_mgr =NULL ; +mutex_unlock (&cscfg_mutex); }/* a device is needed to "own" some kernel elements such as sysfs entries. */
@@ -1042,6 +1065,13 @@ static int cscfg_create_device(void)if (!cscfg_mgr) goto create_dev_exit_unlock; +/* initialise the cscfg_mgr structure */ +INIT_LIST_HEAD (&cscfg_mgr->csdev_desc_list); +INIT_LIST_HEAD (&cscfg_mgr->feat_desc_list); +INIT_LIST_HEAD (&cscfg_mgr->config_desc_list); +INIT_LIST_HEAD (&cscfg_mgr->load_order_list); +atomic_set (&cscfg_mgr->sys_active_cnt,0 ); +/* setup the device */ dev =cscfg_device (); dev->release = cscfg_dev_release;
@@ -1056,17 +1086,73 @@ static int cscfg_create_device(void)return err; } -static void cscfg_clear_device (void ) +/* +* Loading and unloading is generally on user discretion. +* If exiting due to coresight module unload, we need to unload any configurations that remain, +* before we unregister the configfs intrastructure. +* +* Do this by walking the load_owner list and taking appropriate action, depending on the load +* owner type. +*/ +static void cscfg_unload_cfgs_on_exit (void ) { -struct cscfg_config_desc *cfg_desc; +struct cscfg_load_owner_info *owner_info =NULL ; +/* +* grab the mutex - even though we are exiting, some configfs files +* may still be live till we dump them, so ensure list data is +* protected from a race condition. +*/ mutex_lock (&cscfg_mutex); -list_for_each_entry (cfg_desc, &cscfg_mgr->config_desc_list, item) { -etm_perf_del_symlink_cscfg (cfg_desc); +while (!list_empty (&cscfg_mgr->load_order_list)) { + +/* remove in reverse order of loading */ + owner_info =list_last_entry (&cscfg_mgr->load_order_list, + struct cscfg_load_owner_info, item); + +/* action according to type */ +switch (owner_info->type) { +case CSCFG_OWNER_PRELOAD : +/* +* preloaded descriptors are statically allocated in +* this module - just need to unload dynamic items from +* csdev lists, and remove from configfs directories. +*/ +pr_info ("cscfg: unloading preloaded configurations\n" ); +break ; + +case CSCFG_OWNER_MODULE : +/* +* this is an error - the loadable module must have been unloaded prior +* to the coresight module unload. Therefore that module has not +* correctly unloaded configs in its own exit code. +* Nothing to do other than emit an error string as the static descriptor +* references we need to unload will have disappeared with the module. +*/ +pr_err ("cscfg: ERROR: prior module failed to unload configuration\n" ); + goto list_remove; + } + +/* remove from configfs - outside the scope of the list mutex */ +mutex_unlock (&cscfg_mutex); +cscfg_fs_unregister_cfgs_feats (owner_info); +mutex_lock (&cscfg_mutex); + +/* Next unload from csdev lists. */ +cscfg_unload_owned_cfgs_feats (owner_info); + +list_remove: +/* remove from load order list */ +list_del (&owner_info->item); } +mutex_unlock (&cscfg_mutex); +} + +static void cscfg_clear_device (void ) +{ +cscfg_unload_cfgs_on_exit ();cscfg_configfs_release (cscfg_mgr);device_unregister (cscfg_device ()); -mutex_unlock (&cscfg_mutex); }/* Initialise system config management API device */
@@ -1074,20 +1160,16 @@ int __init cscfg_init(void) {int err =0 ; +/* create the device and init cscfg_mgr */ err =cscfg_create_device ();if (err)return err; +/* initialise configfs subsystem */ err =cscfg_configfs_init (cscfg_mgr);if (err) goto exit_err; -INIT_LIST_HEAD (&cscfg_mgr->csdev_desc_list); -INIT_LIST_HEAD (&cscfg_mgr->feat_desc_list); -INIT_LIST_HEAD (&cscfg_mgr->config_desc_list); -INIT_LIST_HEAD (&cscfg_mgr->load_order_list); -atomic_set (&cscfg_mgr->sys_active_cnt,0 ); -/* preload built-in configurations */ err =cscfg_preload (THIS_MODULE );if (err)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 746/1157 coresight: syscfg: Update load and unload operations
In reply to Greg Kroah-HartmanFrom: Mike Leach <[email protected]>
[ Upstream commit 8add26f7ef33bba7984cb6ff7911c6aa970fe55a ]
The configfs system is a source of access to the config information in the configuration and feature lists.
This can result in additional LOCKDEP issues as a result of the mutex ordering between the config list mutex (cscfg_mutex) and the configfs system mutexes.
As such we need to adjust how load/unload operations work to ensure correct operation.
1) Previously the cscfg_mutex was held throughout the load/unload operation. This is now only held during configuration list manipulations, resulting in a multi-stage load/unload process.
2) All operations that manipulate the configfs representation of the configurations and features are now separated out and run without the cscfg_mutex being held. This avoids circular lock_dep issue with the built-in configfs mutexes and semaphores
3) As the load and unload is now multi-stage, some parts under the cscfg_mutex and others not:
i) A flag indicating a load / unload operation in progress is used to serialise load / unload operations.
ii) activating any configuration not possible when unload is in progress. iii) Configurations have an "available" flag set only after the last load stage for the configuration is complete. Activation of the configuration not possible till flag is set.
4) Following load/unload rules remain:
i) Unload prevented while any configuration is active remains. ii) Unload in strict reverse order of load.
iii) Existing configurations can be activated while a new load operation is underway. (by definition there can be no dependencies between an existing configuration and a new loading one due to ii) above.)
--- .../hwtracing/coresight/coresight-config.h | 2 + .../hwtracing/coresight/coresight-syscfg.c | 191 ++++++++++++++---- .../hwtracing/coresight/coresight-syscfg.h | 13 ++ 3 files changed, 165 insertions(+), 41 deletions(-)
drivers/hwtracing/coresight/coresight-config.h +2 -0
@@ -134,6 +134,7 @@ struct cscfg_feature_desc {* @active_cnt: ref count for activate on this configuration. * @load_owner: handle to load owner for dynamic load and unload of configs. * @fs_group: reference to configfs group for dynamic unload. +* @available: config can be activated - multi-stage load sets true on completion. */ struct cscfg_config_desc {const char *name;
@@ -148,6 +149,7 @@ struct cscfg_config_desc {atomic_t active_cnt;void *load_owner;struct config_group *fs_group; +bool available; };/**
drivers/hwtracing/coresight/coresight-syscfg.c +150 -41
271 lines not on this page · raw message
drivers/hwtracing/coresight/coresight-syscfg.h +13 -0
@@ -12,6 +12,17 @@#include "coresight-config.h" +/* +* Load operation types. +* When loading or unloading, another load operation cannot be run. +* When unloading configurations cannot be activated. +*/ +enum cscfg_load_ops { +CSCFG_NONE , +CSCFG_LOAD , +CSCFG_UNLOAD +}; +/** * System configuration manager device. *
@@ -30,6 +41,7 @@* @cfgfs_subsys: configfs subsystem used to manage configurations. * @sysfs_active_config:Active config hash used if CoreSight controlled from sysfs. * @sysfs_active_preset:Active preset index used if CoreSight controlled from sysfs. +* @load_state: A multi-stage load/unload operation is in progress. */ struct cscfg_manager {struct device dev;
@@ -41,6 +53,7 @@ struct cscfg_manager {struct configfs_subsystem cfgfs_subsys;u32 sysfs_active_config;int sysfs_active_preset; +enum cscfg_load_ops load_state; };/* get reference to dev in cscfg_manager */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 747/1157 usb: gadget: f_mass_storage: Make CD-ROM emulation works with Windows OS
In reply to Greg Kroah-HartmanFrom: Neal Liu <[email protected]>
[ Upstream commit 3b91edd624ab1ab694deef513a45eb9e9d49d75f ]
Add read TOC with format 1 to support CD-ROM emulation with Windows OS.
This patch is tested on Windows OS Server 2019.
--- drivers/usb/gadget/function/f_mass_storage.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/usb/gadget/function/f_mass_storage.c +6 -5
@@ -1192,13 +1192,14 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)u8 format;int i, len; + format = common->cmnd[2 ] &0xf ; +if ((common->cmnd[1 ] & ~0x02 ) !=0 ||/* Mask away MSF */ - start_track >1 ) { + (start_track >1 && format !=0x1 )) { curlun->sense_data =SS_INVALID_FIELD_IN_CDB ;return -EINVAL ; } - format = common->cmnd[2 ] &0xf ;/* * Check if CDB is old style SFF-8020i * i.e. format is in 2 MSBs of byte 9
@@ -1208,8 +1209,8 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh) format = (common->cmnd[9 ] >>6 ) &0x3 ;switch (format) { -case 0 : -/* Formatted TOC */ +case 0 :/* Formatted TOC */ +case 1 :/* Multi-session info */ len =4 +2 *8 ;/* 4 byte header + 2 descriptors */ memset (buf,0 , len); buf[1 ] = len -2 ;/* TOC Length excludes length field */
@@ -1250,7 +1251,7 @@ static int do_read_toc(struct fsg_common *common, struct fsg_buffhd *bh)return len;default : -/* Multi-session, PMA, ATIP, CD-TEXT not supported/required */ +/* PMA, ATIP, CD-TEXT not supported/required */ curlun->sense_data =SS_INVALID_FIELD_IN_CDB ;return -EINVAL ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 748/1157 clk: qcom: gcc-msm8939: Add missing SYSTEM_MM_NOC_BFDCD_CLK_SRC
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
[ Upstream commit 07e7fcf1714c5f9930ad27613fea940aedba68da ]
When adding in the indexes for this clock-controller we missed SYSTEM_MM_NOC_BFDCD_CLK_SRC.
Add it in now.
--- include/dt-bindings/clock/qcom,gcc-msm8939.h | 1 + 1 file changed, 1 insertion(+)
include/dt-bindings/clock/qcom,gcc-msm8939.h +1 -0
@@ -192,6 +192,7 @@#define GCC_VENUS0_CORE0_VCODEC0_CLK 183#define GCC_VENUS0_CORE1_VCODEC0_CLK 184#define GCC_OXILI_TIMER_CLK 185 +#define SYSTEM_MM_NOC_BFDCD_CLK_SRC 186/* Indexes for GDSCs */ #define BIMC_GDSC 0
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 749/1157 clk: qcom: gcc-msm8939: Fix bimc_ddr_clk_src rcgr base address
In reply to Greg Kroah-HartmanFrom: Bryan O'Donoghue <[email protected]>
[ Upstream commit 63d42708320d6d2ca9ed505123d50ff4a542c36f ]
Reviewing qcom docs for the 8939 we can see the command rcgr is pointing to the wrong address. bimc_ddr_clk_src_rcgr is @ 0x01832024 not 0x01832004.
--- drivers/clk/qcom/gcc-msm8939.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/qcom/gcc-msm8939.c +1 -1
@@ -632,7 +632,7 @@ static struct clk_rcg2 system_noc_bfdcd_clk_src = { };static struct clk_rcg2 bimc_ddr_clk_src = { - .cmd_rcgr =0x32004 , + .cmd_rcgr =0x32024 , .hid_width =5 , .parent_map = gcc_xo_gpll0_bimc_map, .clkr.hw.init = &(struct clk_init_data ){
Signature · 1 line
2.35.1