drm/bufs: Fix Spectre v1 vulnerability
Subsystems (51)
Sasha Levin
maintainerPATCH 13/304 drm/amd/display: Fix potential nullptr error
In reply to Sasha LevinFrom: Bhawanpreet Lakha <[email protected]>
[ Upstream commit 4f7129112c2a30331f3045a42026fad82e6cb72b ]
[Why]
Fix surface/plane potential nullptr
[How]
add null check
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +6 -0
@@ -5333,6 +5333,12 @@ enum surface_update_type dm_determine_update_type_for_commit(struct dc *dc, strustruct dc_stream_update stream_update;enum surface_update_type update_type =UPDATE_TYPE_FAST ; +if (!updates || !surface) { +DRM_ERROR ("Plane or surface update failed to allocate" ); +/* Set type to FULL to avoid crashing in DC*/ + update_type =UPDATE_TYPE_FULL ; + goto ret; + }for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { new_dm_crtc_state =to_dm_crtc_state (new_crtc_state);
Signature · 6 lines
2.19.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 19/304 scsi: lpfc: Correct LCB RJT handling
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit b114d9009d386276bfc3352289fc235781ae3353 ]
When LCB's are rejected, if beaconing was already in progress, the Reason Code Explanation was not being set. Should have been set to command in progress.
--- drivers/scsi/lpfc/lpfc_els.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/lpfc/lpfc_els.c +3 -0
@@ -5701,6 +5701,9 @@ error: stat = (struct ls_rjt *)(pcmd +sizeof (uint32_t )); stat->un.b.lsRjtRsnCode =LSRJT_UNABLE_TPC ; +if (shdr_add_status ==ADD_STATUS_OPERATION_ALREADY_ACTIVE ) + stat->un.b.lsRjtRsnCodeExp =LSEXP_CMD_IN_PROGRESS ; + elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp; phba->fc_stat.elsXmitLSRJT++; rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 20/304 scsi: mpt3sas: Call sas_remove_host before removing the target devices
In reply to Sasha LevinFrom: Suganath Prabu <[email protected]>
[ Upstream commit dc730212e8a378763cb182b889f90c8101331332 ]
Call sas_remove_host() before removing the target devices in the driver's .remove() callback function(i.e. during driver unload time). So that driver can provide a way to allow SYNC CACHE, START STOP unit commands etc. (which are issued from SML) to the target drives during driver unload time.
Once sas_remove_host() is called before removing the target drives then driver can just clean up the resources allocated for target devices and no need to call sas_port_delete_phy(), sas_port_delete() API's as these API's internally called from sas_remove_host().
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- drivers/scsi/mpt3sas/mpt3sas_transport.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +1 -1
@@ -9641,6 +9641,7 @@ static void scsih_remove(struct pci_dev *pdev)/* release all the volumes */ _scsih_ir_shutdown (ioc); +sas_remove_host (shost);list_for_each_entry_safe (raid_device, next, &ioc->raid_device_list, list) {if (raid_device->starget) {
@@ -9682,7 +9683,6 @@ static void scsih_remove(struct pci_dev *pdev) ioc->sas_hba.num_phys =0 ; } -sas_remove_host (shost);mpt3sas_base_detach (ioc);spin_lock (&gioc_lock);list_del (&ioc->list);
drivers/scsi/mpt3sas/mpt3sas_transport.c +5 -2
@@ -821,10 +821,13 @@ mpt3sas_transport_port_remove(struct MPT3SAS_ADAPTER *ioc, u64 sas_address, mpt3sas_port->remote_identify.sas_address, mpt3sas_phy->phy_id); mpt3sas_phy->phy_belongs_to_port =0 ; -sas_port_delete_phy (mpt3sas_port->port, mpt3sas_phy->phy); +if (!ioc->remove_host) +sas_port_delete_phy (mpt3sas_port->port, + mpt3sas_phy->phy);list_del (&mpt3sas_phy->port_siblings); } -sas_port_delete (mpt3sas_port->port); +if (!ioc->remove_host) +sas_port_delete (mpt3sas_port->port);kfree (mpt3sas_port); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 21/304 scsi: lpfc: Fix LOGO/PLOGI handling when triggerd by ABTS Timeout event
In reply to Sasha LevinFrom: James Smart <[email protected]>
[ Upstream commit 30e196cacefdd9a38c857caed23cefc9621bc5c1 ]
After a LOGO in response to an ABTS timeout, a PLOGI wasn't issued to re-establish the login. An nlp_type check in the LOGO completion handler failed to restart discovery for NVME targets. Revised the nlp_type check for NVME as well as SCSI.
While reviewing the LOGO handling a few other issues were seen and were addressed:
- Better lock synchronization around ndlp data types
- When the ABTS times out, unregister the RPI before sending the LOGO so that all local exchange contexts are cleared and nothing received while awaiting LOGO/PLOGI handling will be accepted.
- LOGO handling optimized to:
Wait only R_A_TOV for a response.
It doesn't need to be retried on timeout. If there wasn't a
response, a PLOGI will be sent, thus an implicit logout applies as well when the other port sees it.
If there is a response, any kind of response is considered "good"
and the XRI quarantined for a exchange qualifier window.
- PLOGI is issued as soon a LOGO state is resolved.
--- drivers/scsi/lpfc/lpfc_els.c | 49 +++++++++++++----------------- drivers/scsi/lpfc/lpfc_nportdisc.c | 5 +++ 2 files changed, 26 insertions(+), 28 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +21 -28
@@ -242,6 +242,8 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, icmd->ulpCommand =CMD_ELS_REQUEST64_CR ;if (elscmd ==ELS_CMD_FLOGI ) icmd->ulpTimeout =FF_DEF_RATOV *2 ; +else if (elscmd ==ELS_CMD_LOGO ) + icmd->ulpTimeout = phba->fc_ratov;else icmd->ulpTimeout = phba->fc_ratov *2 ; }else {
@@ -2682,16 +2684,15 @@ lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, goto out; } +/* The LOGO will not be retried on failure. A LOGO was +* issued to the remote rport and a ACC or RJT or no Answer are +* all acceptable. Note the failure and move forward with +* discovery. The PLOGI will retry. +*/ if (irsp->ulpStatus) { -/* Check for retry */ -if (lpfc_els_retry (phba, cmdiocb, rspiocb)) { -/* ELS command is being retried */ - skip_recovery =1 ; - goto out; - }/* LOGO failed */ lpfc_printf_vlog (vport,KERN_ERR ,LOG_ELS , -"2756 LOGO failure DID:%06X Status:x%x/x%x\n" , +"2756 LOGO failure, No Retry DID:%06X Status:x%x/x%x\n" , ndlp->nlp_DID, irsp->ulpStatus, irsp->un.ulpWord[4 ]);/* Do not call DSM for lpfc_els_abort'ed ELS cmds */
@@ -2737,7 +2738,8 @@ out:* For any other port type, the rpi is unregistered as an implicit * LOGO. */ -if ((ndlp->nlp_type &NLP_FCP_TARGET ) && (skip_recovery ==0 )) { +if (ndlp->nlp_type & (NLP_FCP_TARGET |NLP_NVME_TARGET ) && + skip_recovery ==0 ) {lpfc_cancel_retry_delay_tmo (vport, ndlp);spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;
@@ -2770,6 +2772,8 @@ out:* will be stored into the context1 field of the IOCB for the completion * callback function to the LOGO ELS command. * +* Callers of this routine are expected to unregister the RPI first +* * Return code * 0 - successfully issued logo * 1 - failed to issue logo
@@ -2811,22 +2815,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,"Issue LOGO: did:x%x" , ndlp->nlp_DID, 0, 0); -/* -* If we are issuing a LOGO, we may try to recover the remote NPort -* by issuing a PLOGI later. Even though we issue ELS cmds by the -* VPI, if we have a valid RPI, and that RPI gets unreg'ed while -* that ELS command is in-flight, the HBA returns a IOERR_INVALID_RPI -* for that ELS cmd. To avoid this situation, lets get rid of the -* RPI right now, before any ELS cmds are sent. -*/ -spin_lock_irq (shost->host_lock); - ndlp->nlp_flag |=NLP_ISSUE_LOGO ; -spin_unlock_irq (shost->host_lock); -if (lpfc_unreg_rpi (vport, ndlp)) { -lpfc_els_free_iocb (phba, elsiocb); -return 0 ; - } - phba->fc_stat.elsXmitLOGO++; elsiocb->iocb_cmpl = lpfc_cmpl_els_logo;spin_lock_irq (shost->host_lock);
@@ -2834,7 +2822,6 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, ndlp->nlp_flag &= ~NLP_ISSUE_LOGO ;spin_unlock_irq (shost->host_lock); rc =lpfc_sli_issue_iocb (phba,LPFC_ELS_RING , elsiocb,0 ); -if (rc ==IOCB_ERROR ) {spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_LOGO_SND ;
@@ -2842,6 +2829,11 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,lpfc_els_free_iocb (phba, elsiocb);return 1 ; } + +spin_lock_irq (shost->host_lock); + ndlp->nlp_prev_state = ndlp->nlp_state; +spin_unlock_irq (shost->host_lock); +lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE );return 0 ; }
@@ -9508,7 +9500,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport, "rport in state 0x%x\n", ndlp->nlp_state);return ; } - lpfc_printf_log(phba, KERN_INFO, LOG_SLI, + lpfc_printf_log(phba, KERN_ERR, + LOG_ELS | LOG_FCP_ERROR | LOG_NVME_IOERR, "3094 Start rport recovery on shost id 0x%x " "fc_id 0x%06x vpi 0x%x rpi 0x%x state 0x%x " "flags 0x%x\n",
@@ -9521,8 +9514,8 @@ lpfc_sli_abts_recover_port(struct lpfc_vport *vport,*/ spin_lock_irqsave (shost->host_lock, flags); ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE ; + ndlp->nlp_flag |=NLP_ISSUE_LOGO ;spin_unlock_irqrestore (shost->host_lock, flags); -lpfc_issue_els_logo (vport, ndlp,0 ); -lpfc_nlp_set_state (vport, ndlp,NLP_STE_LOGO_ISSUE ); +lpfc_unreg_rpi (vport, ndlp); }
drivers/scsi/lpfc/lpfc_nportdisc.c +5 -0
@@ -836,7 +836,9 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)struct Scsi_Host *shost =lpfc_shost_from_vport (vport);if (!(ndlp->nlp_flag &NLP_RPI_REGISTERED )) { +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);return 0 ; }
@@ -851,7 +853,10 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)return 1 ; } } + +spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~NLP_NPR_ADISC ; +spin_unlock_irq (shost->host_lock);lpfc_unreg_rpi (vport, ndlp);return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 22/304 platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
In reply to Sasha LevinFrom: João Paulo Rechi Vita <[email protected]>
[ Upstream commit b3f2f3799a972d3863d0fdc2ab6287aef6ca631f ]
When the OS registers to handle events from the display off hotkey the EC will send a notification with 0x35 for every key press, independent of the backlight state.
The behavior of this key on Windows, with the ATKACPI driver from Asus installed, is turning off the backlight of all connected displays with a fading effect, and any cursor input or key press turning the backlight back on. The key press or cursor input that wakes up the display is also passed through to the application under the cursor or under focus.
The key that matches this behavior the closest is KEY_SCREENLOCK.
--- drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/asus-nb-wmi.c +1 -0
@@ -444,6 +444,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ + { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } }, { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 25/304 dlm: Don't swamp the CPU with callbacks queued during recovery
In reply to Sasha LevinFrom: Bob Peterson <[email protected]>
[ Upstream commit 216f0efd19b9cc32207934fd1b87a45f2c4c593e ]
Before this patch, recovery would cause all callbacks to be delayed, put on a queue, and afterward they were all queued to the callback work queue. This patch does the same thing, but occasionally takes a break after 25 of them so it won't swamp the CPU at the expense of other RT processes like corosync.
--- fs/dlm/ast.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/dlm/ast.c +10 -0
@@ -292,6 +292,8 @@ void dlm_callback_suspend(struct dlm_ls *ls)flush_workqueue (ls->ls_callback_wq); } +#define MAX_CB_QUEUE 25 +void dlm_callback_resume (struct dlm_ls *ls) {struct dlm_lkb *lkb, *safe;
@@ -302,15 +304,23 @@ void dlm_callback_resume(struct dlm_ls *ls)if (!ls->ls_callback_wq)return ; +more:mutex_lock (&ls->ls_cb_mutex);list_for_each_entry_safe (lkb, safe, &ls->ls_cb_delay, lkb_cb_list) {list_del_init (&lkb->lkb_cb_list);queue_work (ls->ls_callback_wq, &lkb->lkb_cb_work); count++; +if (count ==MAX_CB_QUEUE ) +break ; }mutex_unlock (&ls->ls_cb_mutex);if (count)log_rinfo (ls,"dlm_callback_resume %d" , count); +if (count ==MAX_CB_QUEUE ) { + count =0 ; +cond_resched (); + goto more; + } }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 29/304 of: overlay: do not duplicate properties from overlay for new nodes
In reply to Sasha LevinFrom: Frank Rowand <[email protected]>
[ Upstream commit 8814dc46bd9e347d4de55ec5bf8f16ea54470499 ]
When allocating a new node, add_changeset_node() was duplicating the properties from the respective node in the overlay instead of allocating a node with no properties.
When this patch is applied the errors reported by the devictree unittest from patch "of: overlay: add tests to validate kfrees from overlay removal" will no longer occur. These error messages are of the form:
"OF: ERROR: ..."
and the unittest results will change from:
### dt-test ### end of unittest - 203 passed, 7 failed
to
### dt-test ### end of unittest - 210 passed, 0 failed
--- drivers/of/overlay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/overlay.c +1 -1
@@ -368,7 +368,7 @@ static int add_changeset_node(struct overlay_changeset *ovcs,break ;if (!tchild) { - tchild =__of_node_dup (node, node_kbasename); + tchild =__of_node_dup (NULL , node_kbasename);if (!tchild)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 31/304 s390/qeth: utilize virtual MAC for Layer2 OSD devices
In reply to Sasha LevinFrom: Julian Wiedmann <[email protected]>
[ Upstream commit b144b99fff69a5bc0d34c8e168bedb88c68ca23d ]
By default, READ MAC on a Layer2 OSD device returns the adapter's burnt-in MAC address. Given the default scenario of many virtual devices on the same adapter, qeth can't make any use of this address and therefore skips the READ MAC call for this device type.
But in some configurations, the READ MAC command for a Layer2 OSD device actually returns a pre-provisioned, virtual MAC address. So enable the READ MAC code to detect this situation, and let the L2 subdriver call READ MAC for OSD devices.
This also removes the QETH_LAYER2_MAC_READ flag, which protects L2 devices against calling READ MAC multiple times. Instead protect the whole call to qeth_l2_request_initial_mac().
--- drivers/s390/net/qeth_core.h | 1 - drivers/s390/net/qeth_core_main.c | 12 +++++++----- drivers/s390/net/qeth_core_mpc.h | 25 +++++++++++++++---------- drivers/s390/net/qeth_l2_main.c | 10 ++++------ 4 files changed, 26 insertions(+), 22 deletions(-)
drivers/s390/net/qeth_core.h +0 -1
@@ -665,7 +665,6 @@ struct qeth_card_blkt {#define QETH_BROADCAST_WITH_ECHO 0x01#define QETH_BROADCAST_WITHOUT_ECHO 0x02 -#define QETH_LAYER2_MAC_READ 0x01#define QETH_LAYER2_MAC_REGISTERED 0x02struct qeth_card_info {unsigned short unit_addr2;
drivers/s390/net/qeth_core_main.c +7 -5
@@ -4235,16 +4235,18 @@ static int qeth_setadpparms_change_macaddr_cb(struct qeth_card *card, struct qeth_reply *reply, unsigned long data) {struct qeth_ipa_cmd *cmd = (struct qeth_ipa_cmd *) data; +struct qeth_ipacmd_setadpparms *adp_cmd;QETH_CARD_TEXT (card,4 ,"chgmaccb" );if (qeth_setadpparms_inspect_rc (cmd))return 0 ; -if (IS_LAYER3 (card) || !(card->info.mac_bits &QETH_LAYER2_MAC_READ )) { -ether_addr_copy (card->dev->dev_addr, - cmd->data.setadapterparms.data.change_addr.addr); - card->info.mac_bits |=QETH_LAYER2_MAC_READ ; - } + adp_cmd = &cmd->data.setadapterparms; +if (IS_LAYER2 (card) &&IS_OSD (card) && !IS_VM_NIC (card) && + !(adp_cmd->hdr.flags &QETH_SETADP_FLAGS_VIRTUAL_MAC )) +return 0 ; + +ether_addr_copy (card->dev->dev_addr, adp_cmd->data.change_addr.addr);return 0 ; }
drivers/s390/net/qeth_core_mpc.h +15 -10
@@ -80,7 +80,9 @@ enum qeth_card_types { };#define IS_IQD (card) ((card)->info.type == QETH_CARD_TYPE_IQD) +#define IS_OSD (card) ((card)->info.type == QETH_CARD_TYPE_OSD)#define IS_OSN (card) ((card)->info.type == QETH_CARD_TYPE_OSN) +#define IS_VM_NIC (card) ((card)->info.guestlan)#define QETH_MPC_DIFINFO_LEN_INDICATES_LINK_TYPE 0x18/* only the first two bytes are looked at in qeth_get_cardname_short */
@@ -529,17 +531,20 @@ struct qeth_query_switch_attributes {__u8 reserved3[8 ]; }; +#define QETH_SETADP_FLAGS_VIRTUAL_MAC 0x80/* for CHANGE_ADDR_READ_MAC */ +struct qeth_ipacmd_setadpparms_hdr { -__u32 supp_hw_cmds; -__u32 reserved1; -__u16 cmdlength; -__u16 reserved2; -__u32 command_code; -__u16 return_code; -__u8 used_total; -__u8 seq_no; -__u32 reserved3; -} __attribute__ ((packed)); +u32 supp_hw_cmds; +u32 reserved1; +u16 cmdlength; +u16 reserved2; +u32 command_code; +u16 return_code; +u8 used_total; +u8 seq_no; +u8 flags; +u8 reserved3[3 ]; +};struct qeth_ipacmd_setadpparms {struct qeth_ipacmd_setadpparms_hdr hdr;
drivers/s390/net/qeth_l2_main.c +4 -6
@@ -461,12 +461,9 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)/* fall back to alternative mechanism: */ } -if (card->info.type ==QETH_CARD_TYPE_IQD || - card->info.type ==QETH_CARD_TYPE_OSM || - card->info.type ==QETH_CARD_TYPE_OSX || - card->info.guestlan) { +if (!IS_OSN (card)) { rc =qeth_setadpparms_change_macaddr (card); -if (!rc) +if (!rc &&is_valid_ether_addr (card->dev->dev_addr)) goto out;QETH_DBF_MESSAGE (2 ,"READ_MAC Assist failed on device %x: %#x\n" ,CARD_DEVID (card), rc);
@@ -917,7 +914,8 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok) PAGE_SIZE * (QDIO_MAX_ELEMENTS_PER_BUFFER - 1)); } -qeth_l2_request_initial_mac (card); +if (!is_valid_ether_addr (card->dev->dev_addr)) +qeth_l2_request_initial_mac (card);netif_napi_add (card->dev, &card->napi, qeth_poll,QETH_NAPI_WEIGHT ); rc =register_netdev (card->dev);if (!rc && carrier_ok)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 33/304 drm/vc4: ->x_scaling[1] should never be set to VC4_SCALING_NONE
In reply to Sasha LevinFrom: Boris Brezillon <[email protected]>
[ Upstream commit 0560054da5673b25d56bea6c57c8d069673af73b ]
For the YUV conversion to work properly, ->x_scaling[1] should never be set to VC4_SCALING_NONE, but vc4_get_scaling_mode() might return VC4_SCALING_NONE if the horizontal scaling ratio exactly matches the horizontal subsampling factor. Add a test to turn VC4_SCALING_NONE into VC4_SCALING_PPF when that happens.
The old ->x_scaling[0] adjustment is dropped as I couldn't find any mention to this constraint in the spec and it's proven to be unnecessary (I tested various multi-planar YUV formats with scaling disabled, and all of them worked fine without this adjustment).
--- drivers/gpu/drm/vc4/vc4_plane.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/vc4/vc4_plane.c +7 -5
@@ -314,12 +314,14 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)vc4_get_scaling_mode (vc4_state->src_h[1 ], vc4_state->crtc_h); -/* YUV conversion requires that horizontal scaling be enabled, -* even on a plane that's otherwise 1:1. Looks like only PPF -* works in that case, so let's pick that one. +/* YUV conversion requires that horizontal scaling be enabled +* on the UV plane even if vc4_get_scaling_mode() returned +* VC4_SCALING_NONE (which can happen when the down-scaling +* ratio is 0.5). Let's force it to VC4_SCALING_PPF in this +* case. */ -if (vc4_state->is_unity) - vc4_state->x_scaling[0 ] =VC4_SCALING_PPF ; +if (vc4_state->x_scaling[1 ] ==VC4_SCALING_NONE ) + vc4_state->x_scaling[1 ] =VC4_SCALING_PPF ; }else { vc4_state->is_yuv = false; vc4_state->x_scaling[1 ] =VC4_SCALING_NONE ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 34/304 serial: fsl_lpuart: clear parity enable bit when disable parity
In reply to Sasha LevinFrom: Andy Duan <[email protected]>
[ Upstream commit 397bd9211fe014b347ca8f95a8f4e1017bac1aeb ]
Current driver only enable parity enable bit and never clear it when user set the termios. The fix clear the parity enable bit when PARENB flag is not set in termios->c_cflag.
--- drivers/tty/serial/fsl_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/tty/serial/fsl_lpuart.c +4 -0
@@ -1479,6 +1479,8 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios,else cr1 &= ~UARTCR1_PT ; } + }else { + cr1 &= ~UARTCR1_PE ; }/* ask the core to calculate the divisor */
@@ -1690,6 +1692,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios,else ctrl &= ~UARTCTRL_PT ; } + }else { + ctrl &= ~UARTCTRL_PE ; }/* ask the core to calculate the divisor */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 37/304 MIPS: Boston: Disable EG20T prefetch
In reply to Sasha LevinFrom: Paul Burton <[email protected]>
[ Upstream commit 5ec17af7ead09701e23d2065e16db6ce4e137289 ]
The Intel EG20T Platform Controller Hub used on the MIPS Boston development board supports prefetching memory to optimize DMA transfers. Unfortunately for unknown reasons this doesn't work well with some MIPS CPUs such as the P6600, particularly when using an I/O Coherence Unit (IOCU) to provide cache-coherent DMA. In these systems it is common for DMA data to be lost, resulting in broken access to EG20T devices such as the MMC or SATA controllers.
Support for a DT property to configure the prefetching was added a while back by commit 549ce8f134bd ("misc: pch_phub: Read prefetch value from device tree if passed") but we never added the DT snippet to make use of it. Add that now in order to disable the prefetching & fix DMA on the affected systems.
Patchwork: https://patchwork.linux-mips.org/patch/21068/
--- arch/mips/boot/dts/img/boston.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/mips/boot/dts/img/boston.dts +6 -0
@@ -141,6 +141,12 @@ #size-cells = <2>; #interrupt-cells = <1>; + eg20t_phub@2,0,0 { + compatible = "pci8086,8801"; + reg = <0x00020000 0 0 0 0>; + intel,eg20t-prefetch = <0>; + }; + eg20t_mac@2,0,1 { compatible = "pci8086,8802"; reg = <0x00020100 0 0 0 0>;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 39/304 sctp: Fix SKB list traversal in sctp_intl_store_ordered().
In reply to Sasha LevinFrom: "David S. Miller" <[email protected]>
[ Upstream commit e15e067d0656625c77c52b4e5f0cfbf0c0c3583f ]
Same change as made to sctp_intl_store_reasm().
To be fully correct, an iterator has an undefined value when something like skb_queue_walk() naturally terminates.
This will actually matter when SKB queues are converted over to list_head.
Formalize what this code ends up doing with the current implementation.
--- net/sctp/stream_interleave.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
net/sctp/stream_interleave.c +12 -5
@@ -383,7 +383,7 @@ static void sctp_intl_store_ordered(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) {struct sctp_ulpevent *cevent; -struct sk_buff *pos; +struct sk_buff *pos, *loc; pos =skb_peek_tail (&ulpq->lobby);if (!pos) {
@@ -403,18 +403,25 @@ static void sctp_intl_store_ordered(struct sctp_ulpq *ulpq,return ; } + loc =NULL ; skb_queue_walk(&ulpq->lobby, pos) { cevent = (struct sctp_ulpevent *)pos->cb; -if (cevent->stream > event->stream) +if (cevent->stream > event->stream) { + loc = pos;break ; - + }if (cevent->stream = event->stream && -MID_lt (event->mid, cevent->mid)) +MID_lt (event->mid, cevent->mid)) { + loc = pos;break ; + } } -__skb_queue_before (&ulpq->lobby, pos,sctp_event2skb (event)); +if (!loc) +__skb_queue_tail (&ulpq->lobby,sctp_event2skb (event)); +else +__skb_queue_before (&ulpq->lobby, loc,sctp_event2skb (event)); } static void sctp_intl_retrieve_ordered(struct sctp_ulpq *ulpq,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 40/304 sctp: Fix SKB list traversal in sctp_intl_store_reasm().
In reply to Sasha LevinFrom: "David S. Miller" <[email protected]>
[ Upstream commit 348bbc25c40844c5efa083a3842c7f53d70a815e ]
To be fully correct, an iterator has an undefined value when something like skb_queue_walk() naturally terminates.
This will actually matter when SKB queues are converted over to list_head.
Formalize what this code ends up doing with the current implementation.
--- net/sctp/stream_interleave.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
net/sctp/stream_interleave.c +12 -5
@@ -140,7 +140,7 @@ static void sctp_intl_store_reasm(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) {struct sctp_ulpevent *cevent; -struct sk_buff *pos; +struct sk_buff *pos, *loc; pos =skb_peek_tail (&ulpq->reasm);if (!pos) {
@@ -166,23 +166,30 @@ static void sctp_intl_store_reasm(struct sctp_ulpq *ulpq,return ; } + loc =NULL ; skb_queue_walk(&ulpq->reasm, pos) { cevent =sctp_skb2event (pos);if (event->stream < cevent->stream || (event->stream = cevent->stream && -MID_lt (event->mid, cevent->mid))) +MID_lt (event->mid, cevent->mid))) { + loc = pos;break ; - + }if (event->stream = cevent->stream && event->mid = cevent->mid && !(cevent->msg_flags &SCTP_DATA_FIRST_FRAG ) && (event->msg_flags &SCTP_DATA_FIRST_FRAG || - event->fsn < cevent->fsn)) + event->fsn < cevent->fsn)) { + loc = pos;break ; + } } -__skb_queue_before (&ulpq->reasm, pos,sctp_event2skb (event)); +if (!loc) +__skb_queue_tail (&ulpq->reasm,sctp_event2skb (event)); +else +__skb_queue_before (&ulpq->reasm, loc,sctp_event2skb (event)); } static struct sctp_ulpevent *sctp_intl_retrieve_partial(
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 50/304 scsi: hisi_sas: change the time of SAS SSP connection
In reply to Sasha LevinFrom: Xiang Chen <[email protected]>
[ Upstream commit 15bc43f31a074076f114e0b87931e3b220b7bff1 ]
Currently the time of SAS SSP connection is 1ms, which means the link connection will fail if no IO response after this period.
For some disks handling large IO (such as 512k), 1ms is not enough, so change it to 5ms.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -1
@@ -494,7 +494,7 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba)hisi_sas_phy_write32 (hisi_hba, i,PHYCTRL_OOB_RESTART_MSK ,0x1 );hisi_sas_phy_write32 (hisi_hba, i,STP_LINK_TIMER ,0x7f7a120 );hisi_sas_phy_write32 (hisi_hba, i,CON_CFG_DRIVER ,0x2a0a01 ); - +hisi_sas_phy_write32 (hisi_hba, i,SAS_SSP_CON_TIMER_CFG ,0x32 );/* used for 12G negotiate */ hisi_sas_phy_write32 (hisi_hba, i,COARSETUNE_TIME ,0x1e );hisi_sas_phy_write32 (hisi_hba, i,AIP_LIMIT ,0x2ffff );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 53/304 drm/rockchip: fix for mailbox read size
In reply to Sasha LevinFrom: Damian Kos <[email protected]>
[ Upstream commit fa68d4f8476bea4cdf441062b614b41bb85ef1da ]
Some of the functions (like cdn_dp_dpcd_read, cdn_dp_get_edid_block) allow to read 64KiB, but the cdn_dp_mailbox_read_receive, that is used by them, can read only up to 255 bytes at once. Normally, it's not a big issue as DPCD or EDID reads won't (hopefully) exceed that value.
The real issue here is the revocation list read during the HDCP authentication process. (problematic use case:
https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4/drivers/gpu/drm/rockchip/cdn-dp-reg.c#1152)
The list can reach 127*5+4 bytes (num devs * 5 bytes per ID/Bksv + 4 bytes of an additional info).
In other words - CTSes with HDCP Repeater won't pass without this fix. Oh, and the driver will most likely stop working (best case scenario).
--- drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/rockchip/cdn-dp-reg.c +1 -1
@@ -147,7 +147,7 @@ static int cdn_dp_mailbox_validate_receive(struct cdn_dp_device *dp, }static int cdn_dp_mailbox_read_receive (struct cdn_dp_device *dp, -u8 *buff,u8 buff_size) +u8 *buff,u16 buff_size) {u32 i;int ret;
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 54/304 ARM: OMAP2+: hwmod: Fix some section annotations
In reply to Sasha LevinFrom: Nathan Chancellor <[email protected]>
[ Upstream commit c10b26abeb53cabc1e6271a167d3f3d396ce0218 ]
When building the kernel with Clang, the following section mismatch warnings appears:
WARNING: vmlinux.o(.text+0x2d398): Section mismatch in reference from the function _setup() to the function .init.text:_setup_iclk_autoidle() The function _setup() references
the function __init _setup_iclk_autoidle().
This is often because _setup lacks a __init
annotation or the annotation of _setup_iclk_autoidle is wrong.
WARNING: vmlinux.o(.text+0x2d3a0): Section mismatch in reference from the function _setup() to the function .init.text:_setup_reset() The function _setup() references
the function __init _setup_reset().
This is often because _setup lacks a __init
annotation or the annotation of _setup_reset is wrong.
WARNING: vmlinux.o(.text+0x2d408): Section mismatch in reference from the function _setup() to the function .init.text:_setup_postsetup() The function _setup() references
the function __init _setup_postsetup().
This is often because _setup lacks a __init
annotation or the annotation of _setup_postsetup is wrong.
_setup is used in omap_hwmod_allocate_module, which isn't marked __init and looks like it shouldn't be, meaning to fix these warnings, those functions must be moved out of the init section, which this patch does.
--- arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +3 -3
@@ -2413,7 +2413,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)* a stub; implementing this properly requires iclk autoidle usecounting in * the clock code. No return value. */ -static void __init _setup_iclk_autoidle (struct omap_hwmod *oh) +static void _setup_iclk_autoidle (struct omap_hwmod *oh) {struct omap_hwmod_ocp_if *os;
@@ -2444,7 +2444,7 @@ static void __init _setup_iclk_autoidle(struct omap_hwmod *oh)* reset. Returns 0 upon success or a negative error code upon * failure. */ -static int __init _setup_reset (struct omap_hwmod *oh) +static int _setup_reset (struct omap_hwmod *oh) {int r;
@@ -2505,7 +2505,7 @@ static int __init _setup_reset(struct omap_hwmod *oh)* * No return value. */ -static void __init _setup_postsetup (struct omap_hwmod *oh) +static void _setup_postsetup (struct omap_hwmod *oh) {u8 postsetup_state;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 55/304 drm/amd/display: fix gamma not being applied correctly
In reply to Sasha LevinFrom: Murton Liu <[email protected]>
[ Upstream commit 8ce504b9389be846bcdf512ed5be8f661b3bf097 ]
[why]
Gamma was always being set as identity on SDR monitor, leading to no changes in gamma. This caused nightlight to not apply correctly.
[how]
Added a default gamma structure to compare against in the sdr case.
--- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +2 -1
@@ -1226,7 +1226,8 @@ static bool dcn10_set_input_transfer_func(struct pipe_ctx *pipe_ctx, tf = plane_state->in_transfer_func;if (plane_state->gamma_correction && - !plane_state->gamma_correction->is_identity + !dpp_base->ctx->dc->debug.always_use_regamma + && !plane_state->gamma_correction->is_identity &&dce_use_lut (plane_state->format)) dpp_base->funcs->dpp_program_input_lut (dpp_base, plane_state->gamma_correction);
Signature · 6 lines
2.19.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 56/304 drm/amd/display: calculate stream->phy_pix_clk before clock mapping
In reply to Sasha LevinFrom: Yogesh Mohan Marimuthu <[email protected]>
[ Upstream commit 08e1c28dd521c7b08d1b0af0bae9fb22ccc012a4 ]
[why]phy_pix_clk is one of the variable used to check if one PLL can be shared with displays having common mode set configuration. As of now phy_pix_clock varialbe is calculated in function dc_validate_stream(). dc_validate_stream() function is called after clocks are assigned for the new display. Due to this during hotplug, when PLL sharing conditions are checked for new display phy_pix_clk variable will be 0 and for displays that are already enabled phy_pix_clk will have some value. Hence PLL will not be shared and if the display hardware doesn't have any more PLL to assign, mode set will fail due to resource unavailability.
[how]
Instead of only calculating the phy_pix_clk variable after the PLL is assigned for new display, this patch calculates phy_pix_clk also during the before assigning the PLL for new display.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +2 -0
@@ -2002,6 +2002,8 @@ enum dc_status resource_map_pool_resources(} */ +calculate_phy_pix_clks (stream); +/* acquire new resources */ pipe_idx =acquire_first_free_pipe (&context->res_ctx, pool, stream);
Signature · 6 lines
2.19.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 58/304 net/mlx5: EQ, Use the right place to store/read IRQ affinity hint
In reply to Sasha LevinFrom: Saeed Mahameed <[email protected]>
[ Upstream commit 1e86ace4c140fd5a693e266c9b23409358f25381 ]
Currently the cpu affinity hint mask for completion EQs is stored and read from the wrong place, since reading and storing is done from the same index, there is no actual issue with that, but internal irq_info for completion EQs stars at MLX5_EQ_VEC_COMP_BASE offset in irq_info array, this patch changes the code to use the correct offset to store and read the IRQ affinity hint.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 ++++++++------ include/linux/mlx5/driver.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -1771,7 +1771,7 @@ static void mlx5e_close_cq(struct mlx5e_cq *cq)static int mlx5e_get_cpu (struct mlx5e_priv *priv,int ix) { -return cpumask_first (priv->mdev->priv.irq_info[ix].mask); +return cpumask_first (priv->mdev->priv.irq_info[ix +MLX5_EQ_VEC_COMP_BASE ].mask); } static int mlx5e_open_tx_cqs(struct mlx5e_channel *c,
drivers/net/ethernet/mellanox/mlx5/core/main.c +8 -6
@@ -640,18 +640,19 @@ u64 mlx5_read_internal_timer(struct mlx5_core_dev *dev)static int mlx5_irq_set_affinity_hint (struct mlx5_core_dev *mdev,int i) {struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int vecidx =MLX5_EQ_VEC_COMP_BASE + i; +int irq =pci_irq_vector (mdev->pdev, vecidx); -if (!zalloc_cpumask_var (&priv->irq_info[i].mask,GFP_KERNEL )) { +if (!zalloc_cpumask_var (&priv->irq_info[vecidx].mask,GFP_KERNEL )) {mlx5_core_warn (mdev,"zalloc_cpumask_var failed" );return -ENOMEM ; }cpumask_set_cpu (cpumask_local_spread (i, priv->numa_node), - priv->irq_info[i].mask); + priv->irq_info[vecidx].mask);if (IS_ENABLED (CONFIG_SMP ) && -irq_set_affinity_hint (irq, priv->irq_info[i].mask)) +irq_set_affinity_hint (irq, priv->irq_info[vecidx].mask))mlx5_core_warn (mdev,"irq_set_affinity_hint failed, irq 0x%.4x" , irq);return 0 ;
@@ -659,11 +660,12 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)static void mlx5_irq_clear_affinity_hint (struct mlx5_core_dev *mdev,int i) { +int vecidx =MLX5_EQ_VEC_COMP_BASE + i;struct mlx5_priv *priv = &mdev->priv; -int irq =pci_irq_vector (mdev->pdev,MLX5_EQ_VEC_COMP_BASE + i); +int irq =pci_irq_vector (mdev->pdev, vecidx);irq_set_affinity_hint (irq,NULL ); -free_cpumask_var (priv->irq_info[i].mask); +free_cpumask_var (priv->irq_info[vecidx].mask); }static int mlx5_irq_set_affinity_hints (struct mlx5_core_dev *mdev)
include/linux/mlx5/driver.h +1 -1
@@ -1309,7 +1309,7 @@ enum {static inline const struct cpumask *mlx5_get_vector_affinity_hint (struct mlx5_core_dev *dev,int vector) { -return dev->priv.irq_info[vector].mask; +return dev->priv.irq_info[vector +MLX5_EQ_VEC_COMP_BASE ].mask; }#endif /* MLX5_DRIVER_H */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 61/304 scsi: cxgb4i: fix thermal configuration dependencies
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 8d0bb86e2cf6c96d88c3de56a2a29329872c454d ]
I fixed a bug by adding a dependency in the network driver, but that fix caused a related bug in the SCSI driver:
WARNING: unmet direct dependencies detected for CHELSIO_T4
Depends on [m]: NETDEVICES [=y] && ETHERNET [=y] && NET_VENDOR_CHELSIO [=y] && PCI [=y] && (IPV6 [=y] || IPV6 [=y]=n) && (THERMAL [=m] || !THERMAL [=m]) Selected by [y]:
- SCSI_CXGB4_ISCSI [=y] && SCSI_LOWLEVEL [=y] && SCSI [=y] && PCI [=y] && INET [=y] && (IPV6 [=y] || IPV6 [=y]=n)drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.o: In function `cxgb4_thermal_init':
cxgb4_thermal.c:(.text+0x158): undefined reference to thermal_zone_device_register' drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.o: In function cxgb4_thermal_remove':
cxgb4_thermal.c:(.text+0x1d8): undefined reference to `thermal_zone_device_unregister'
/git/arm-soc/Makefile:1042: recipe for target 'vmlinux' failed
The same dependency needs to be propagated here to make it work correctly with CONFIG_THERMAL=m and SCSI_CXGB4_ISCSI=y. That change by itself causes another problem with a circular dependency, as we use 'select NETDEVICES'. This is something we really should not do anyway, as a driver symbol should never select another major subsystem, so let's turn that into a 'depends on'. I don't see any downsides of that, as NETDEVICES is only disabled in rather obscure cases that are not relevant to the users of cxgb4i.
--- drivers/scsi/cxgbi/cxgb4i/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/cxgbi/cxgb4i/Kconfig +2 -2
@@ -1,8 +1,8 @@ config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" depends on PCI && INET && (IPV6 || IPV6=n) - select NETDEVICES - select ETHERNET + depends on THERMAL || !THERMAL + depends on ETHERNET select NET_VENDOR_CHELSIO select CHELSIO_T4 select CHELSIO_LIB
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 62/304 soc/tegra: Don't leak device tree node reference
In reply to Sasha LevinFrom: Yangtao Li <[email protected]>
[ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_tegra() doesn't do that, so fix it.
--- drivers/soc/tegra/common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/soc/tegra/common.c +5 -1
@@ -22,11 +22,15 @@ static const struct of_device_id tegra_machine_match[] = {bool soc_is_tegra (void ) { +const struct of_device_id *match;struct device_node *root; root =of_find_node_by_path ("/" );if (!root)return false; -return of_match_node (tegra_machine_match, root) !=NULL ; + match =of_match_node (tegra_machine_match, root); +of_node_put (root); + +return match !=NULL ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 66/304 staging: erofs: fix the definition of DBG_BUGON
In reply to Sasha LevinFrom: Gao Xiang <[email protected]>
[ Upstream commit eef168789866514e5d4316f030131c9fe65b643f ]
It's better not to positively BUG_ON the kernel, however developers need a way to locate issues as soon as possible.
DBG_BUGON is introduced and it could only crash when EROFS_FS_DEBUG (EROFS developping feature) is on. It is helpful for developers to find and solve bugs quickly by eng builds.
Previously, DBG_BUGON is defined as ((void)0) if EROFS_FS_DEBUG is off, but some unused variable warnings as follows could occur:
drivers/staging/erofs/unzip_vle.c: In function `init_alway:':drivers/staging/erofs/unzip_vle.c:61:33: warning: unused variable `work' [-Wunused-variable]
struct z_erofs_vle_work *const work =
^~~~
Fix it to #define DBG_BUGON(x) ((void)(x)).
--- drivers/staging/erofs/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/erofs/internal.h +1 -1
@@ -39,7 +39,7 @@#define debugln (x, ...) ((void)0)#define dbg_might_sleep () ((void)0) -#define DBG_BUGON (...) ((void)0) +#define DBG_BUGON (x) ((void)(x))#endif enum {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 67/304 staging: erofs: fix race when the managed cache is enabled
In reply to Sasha LevinFrom: Gao Xiang <[email protected]>
[ Upstream commit 51232df5e4b268936beccde5248f312a316800be ]
When the managed cache is enabled, the last reference count of a workgroup must be used for its workstation.
Otherwise, it could lead to incorrect (un)freezes in the reclaim path, and it would be harmful.
A typical race as follows:
Thread 1 (In the reclaim path) Thread 2workgroup_freeze(grp, 1) refcnt = 1
...
workgroup_unfreeze(grp, 1) refcnt = 1
workgroup_get(grp) refcnt = 2 (x)
workgroup_put(grp) refcnt = 1 (x)...unexpected behaviors
* grp is detached but still used, which violates cache-managed freeze constraint.
--- drivers/staging/erofs/internal.h | 1 + drivers/staging/erofs/utils.c | 134 ++++++++++++++++++++++--------- 2 files changed, 96 insertions(+), 39 deletions(-)
drivers/staging/erofs/internal.h +1 -0
@@ -250,6 +250,7 @@ repeat: }#define __erofs_workgroup_get (grp) atomic_inc(&(grp)->refcount) +#define __erofs_workgroup_put (grp) atomic_dec(&(grp)->refcount)extern int erofs_workgroup_put (struct erofs_workgroup *grp);
drivers/staging/erofs/utils.c +95 -39
168 lines not on this page · raw message
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 70/304 RDMA/core: Sync unregistration with netlink commands
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit 01b671170d7f82b959dad6d5dbb44d7a915e647d ]
When the rdma device is getting removed, get resource info can race with device removal, as below:
CPU-0 CPU-1
-------- --------
rdma_nl_rcv_msg()
nldev_res_get_cq_dumpit()
mutex_lock(device_lock);
get device reference
mutex_unlock(device_lock); [..]
ib_unregister_device()
/* Valid reference to
* device->dev exists.
*/
ib_dealloc_device()
[..]
provider->fill_res_entry();Even though device object is not freed, fill_res_entry() can get called on device which doesn't have a driver anymore. Kernel core device reference count is not sufficient, as this only keeps the structure valid, and doesn't guarantee the driver is still loaded.
Similar race can occur with device renaming and device removal, where device_rename() tries to rename a unregistered device. While this is fine for devices of a class which are not net namespace aware, but it is incorrect for net namespace aware class coming in subsequent series. If a class is net namespace aware, then the below [1] call trace is observed in above situation.
Therefore, to avoid the race, keep a reference count and let device unregistration wait until all netlink users drop the reference.
[1] Call trace:
kernfs: ns required in 'infiniband' for 'mlx5_0'
WARNING: CPU: 18 PID: 44270 at fs/kernfs/dir.c:842 kernfs_find_ns+0x104/0x120 libahci i2c_core mlxfw libata dca [last unloaded: devlink] RIP: 0010:kernfs_find_ns+0x104/0x120 Call Trace: kernfs_find_and_get_ns+0x2e/0x50 sysfs_rename_link_ns+0x40/0xb0 device_rename+0xb2/0xf0 ib_device_rename+0xb3/0x100 [ib_core] nldev_set_doit+0x165/0x190 [ib_core] rdma_nl_rcv_msg+0x249/0x250 [ib_core] ? netlink_deliver_tap+0x8f/0x3e0 rdma_nl_rcv+0xd6/0x120 [ib_core] netlink_unicast+0x17c/0x230 netlink_sendmsg+0x2f0/0x3e0 sock_sendmsg+0x30/0x40 __sys_sendto+0xdc/0x160
--- drivers/infiniband/core/core_priv.h | 1 + drivers/infiniband/core/device.c | 26 ++++++++++++++++++++++---- drivers/infiniband/core/nldev.c | 20 ++++++++++---------- include/rdma/ib_verbs.h | 8 +++++++- 4 files changed, 40 insertions(+), 15 deletions(-)
drivers/infiniband/core/core_priv.h +1 -0
@@ -296,6 +296,7 @@ static inline int ib_mad_enforce_security(struct ib_mad_agent_private *map,#endif struct ib_device *ib_device_get_by_index (u32 ifindex); +void ib_device_put (struct ib_device *device);/* RDMA device netlink */ void nldev_init (void );void nldev_exit (void );
drivers/infiniband/core/device.c +22 -4
@@ -145,7 +145,8 @@ static struct ib_device *__ib_device_get_by_index(u32 index) }/* -* Caller is responsible to return refrerence count by calling put_device() +* Caller must perform ib_device_put() to return the device reference count +* when ib_device_get_by_index() returns valid device pointer. */ struct ib_device *ib_device_get_by_index (u32 index) {
@@ -153,13 +154,21 @@ struct ib_device *ib_device_get_by_index(u32 index)down_read (&lists_rwsem); device =__ib_device_get_by_index (index); -if (device) -get_device (&device->dev); - +if (device) { +/* Do not return a device if unregistration has started. */ +if (!refcount_inc_not_zero (&device->refcount)) + device =NULL ; + }up_read (&lists_rwsem);return device; } +void ib_device_put (struct ib_device *device) +{ +if (refcount_dec_and_test (&device->refcount)) +complete (&device->unreg_completion); +} +static struct ib_device *__ib_device_get_by_name (const char *name) {struct ib_device *device;
@@ -293,6 +302,8 @@ struct ib_device *ib_alloc_device(size_t size)rwlock_init (&device->client_data_lock);INIT_LIST_HEAD (&device->client_data_list);INIT_LIST_HEAD (&device->port_list); +refcount_set (&device->refcount,1 ); +init_completion (&device->unreg_completion);return device; }
@@ -641,6 +652,13 @@ void ib_unregister_device(struct ib_device *device)struct ib_client_data *context, *tmp;unsigned long flags; +/* +* Wait for all netlink command callers to finish working on the +* device. +*/ +ib_device_put (device); +wait_for_completion (&device->unreg_completion); +mutex_lock (&device_mutex);down_write (&lists_rwsem);
drivers/infiniband/core/nldev.c +10 -10
@@ -632,13 +632,13 @@ static int nldev_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh,nlmsg_end (msg, nlh); -put_device (&device->dev); +ib_device_put (device);return rdma_nl_unicast (msg,NETLINK_CB (skb).portid); err_free:nlmsg_free (msg); err: -put_device (&device->dev); +ib_device_put (device);return err; }
@@ -668,7 +668,7 @@ static int nldev_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh, err =ib_device_rename (device, name); } -put_device (&device->dev); +ib_device_put (device);return err; }
@@ -752,14 +752,14 @@ static int nldev_port_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, goto err_free;nlmsg_end (msg, nlh); -put_device (&device->dev); +ib_device_put (device);return rdma_nl_unicast (msg,NETLINK_CB (skb).portid); err_free:nlmsg_free (msg); err: -put_device (&device->dev); +ib_device_put (device);return err; }
@@ -816,7 +816,7 @@ static int nldev_port_get_dumpit(struct sk_buff *skb, } out: -put_device (&device->dev); +ib_device_put (device); cb->args[0 ] = idx;return skb->len; }
@@ -855,13 +855,13 @@ static int nldev_res_get_doit(struct sk_buff *skb, struct nlmsghdr *nlh, goto err_free;nlmsg_end (msg, nlh); -put_device (&device->dev); +ib_device_put (device);return rdma_nl_unicast (msg,NETLINK_CB (skb).portid); err_free:nlmsg_free (msg); err: -put_device (&device->dev); +ib_device_put (device);return ret; }
@@ -1054,7 +1054,7 @@ next: idx++;if (!filled) goto err; -put_device (&device->dev); +ib_device_put (device);return skb->len; res_err:
@@ -1065,7 +1065,7 @@ err:nlmsg_cancel (skb, nlh); err_index: -put_device (&device->dev); +ib_device_put (device);return ret; }
include/rdma/ib_verbs.h +7 -1
@@ -56,7 +56,7 @@#include <linux/string.h> #include <linux/slab.h> #include <linux/netdevice.h> - +#include <linux/refcount.h> #include <linux/if_link.h> #include <linux/atomic.h> #include <linux/mmu_notifier.h>
@@ -2605,6 +2605,12 @@ struct ib_device {const struct uverbs_object_tree_def *const *driver_specs;enum rdma_driver_id driver_id; +/* +* Provides synchronization between device unregistration and netlink +* commands on a device. To be used only by core. +*/ +refcount_t refcount; +struct completion unreg_completion; };struct ib_client {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 83/304 ACPI: SPCR: Consider baud rate 0 as preconfigured state
In reply to Sasha LevinFrom: Andy Shevchenko <[email protected]>
[ Upstream commit b413b1abeb21b4a152c0bf8d1379efa30759b6e3 ]
Since SPCR 1.04 [1] the baud rate of 0 means a preconfigured state of UART. Assume firmware or bootloader configures console correctly.
--- drivers/acpi/spcr.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/acpi/spcr.c +11 -0
@@ -148,6 +148,13 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console) }switch (table->baud_rate) { +case 0 : +/* +* SPCR 1.04 defines 0 as a preconfigured state of UART. +* Assume firmware or bootloader configures console correctly. +*/ + baud_rate =0 ; +break ;case 3 : baud_rate =9600 ;break ;
@@ -196,6 +203,10 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)* UART so don't attempt to change to the baud rate state * in the table because driver cannot calculate the dividers */ + baud_rate =0 ; + } + +if (!baud_rate) {snprintf (opts,sizeof (opts),"%s,%s,0x%llx" , uart, iotype, table->serial_port.address); }else {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 86/304 f2fs: move dir data flush to write checkpoint process
In reply to Sasha LevinFrom: Yunlei He <[email protected]>
[ Upstream commit b61ac5b720146c619c7cdf17eff2551b934399e5 ]
This patch move dir data flush to write checkpoint process, by doing this, it may reduce some time for dir fsync.
pre:
-f2fs_do_sync_file enter
-file_write_and_wait_range <- flush & wait -write_checkpoint
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
now:
-f2fs_do_sync_file enter
-write_checkpoint
-block_operations <- flush dir & no wait
-do_checkpoint <- wait all
-f2fs_do_sync_file exit
--- fs/f2fs/file.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/file.c +3 -0
@@ -216,6 +216,9 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,trace_f2fs_sync_file_enter (inode); +if (S_ISDIR (inode->i_mode)) + goto go_write; +/* if fdatasync is triggered, let's do in-place-update */ if (datasync ||get_dirty_pages (inode) <=SM_I (sbi)->min_fsync_blocks)set_inode_flag (inode,FI_NEED_IPU );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 88/304 f2fs: fix race between write_checkpoint and write_begin
In reply to Sasha LevinFrom: Sheng Yong <[email protected]>
[ Upstream commit 2866fb16d67992195b0526d19e65acb6640fb87f ]
The following race could lead to inconsistent SIT bitmap:
Task A Task B
====== ======f2fs_write_checkpoint
block_operations
f2fs_lock_all
down_write(node_change)
down_write(node_write)
... sync ...
up_write(node_change)
f2fs_file_write_iter
set_inode_flag(FI_NO_PREALLOC)
......
f2fs_write_begin(index=0, has inline data)
prepare_write_begin
__do_map_lock(AIO) => down_read(node_change)
f2fs_convert_inline_page => update SIT
__do_map_lock(AIO) => up_read(node_change) f2fs_flush_sit_entries <= inconsistent SIT finish write checkpoint sudden-power-off
If SPO occurs after checkpoint is finished, SIT bitmap will be set incorrectly.
--- fs/f2fs/data.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
fs/f2fs/data.c +10 -2
@@ -2326,6 +2326,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,bool locked = false;struct extent_info ei = {0 ,0 ,0 };int err =0 ; +int flag;/* * we already allocated all the blocks, so we don't need to get
@@ -2335,9 +2336,15 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, !is_inode_flag_set(inode, FI_NO_PREALLOC))return 0 ; +/* f2fs_lock_op avoids race between write CP and convert_inline_page */ +if (f2fs_has_inline_data (inode) && pos + len >MAX_INLINE_DATA (inode)) + flag =F2FS_GET_BLOCK_DEFAULT ; +else + flag =F2FS_GET_BLOCK_PRE_AIO ; +if (f2fs_has_inline_data (inode) || (pos &PAGE_MASK ) >=i_size_read (inode)) { -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +__do_map_lock (sbi, flag, true); locked = true; } restart:
@@ -2375,6 +2382,7 @@ restart:f2fs_put_dnode (&dn);__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); +WARN_ON (flag !=F2FS_GET_BLOCK_PRE_AIO ); locked = true; goto restart; }
@@ -2388,7 +2396,7 @@ out:f2fs_put_dnode (&dn); unlock_out:if (locked) -__do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , false); +__do_map_lock (sbi, flag, false);return err; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 90/304 i2c: sh_mobile: add support for r8a77990 (R-Car E3)
In reply to Sasha LevinFrom: Simon Horman <[email protected]>
[ Upstream commit 5eb316e636eb298c204f5b368526d4480b63c0ba ]
Add support for the IIC code for the r8a77990 (R-Car E3).
It is not considered compatible with existing fallback bindings due to the documented absence of automatic transmission registers.
These registers are currently not used by the driver and thus the provides the same behaviour for "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic". The point of declaring incompatibility is to allow for automatic transmission register support to be added to "renesas,iic-r8a77990" and "renesas,rcar-gen3-iic" in future.
--- drivers/i2c/busses/i2c-sh_mobile.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-sh_mobile.c +1 -0
@@ -808,6 +808,7 @@ static const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible = "renesas,rcar-gen2-iic", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-r8a7795", .data = &fast_clock_dt_config }, { .compatible = "renesas,rcar-gen3-iic", .data = &fast_clock_dt_config }, + { .compatible = "renesas,iic-r8a77990", .data = &fast_clock_dt_config }, { .compatible = "renesas,iic-sh73a0", .data = &fast_clock_dt_config }, { .compatible = "renesas,rmobile-iic", .data = &default_dt_config }, {},
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 100/304 Thermal: do not clear passive state during system sleep
In reply to Sasha LevinFrom: Wei Wang <[email protected]>
[ Upstream commit 964f4843a455d2ffb199512b08be8d5f077c4cac ]
commit ff140fea847e ("Thermal: handle thermal zone device properly during system sleep") added PM hook to call thermal zone reset during sleep. However resetting thermal zone will also clear the passive state and thus cancel the polling queue which leads the passive cooling device state not being cleared properly after sleep.
thermal_pm_notify => thermal_zone_device_reset set passive to 0 thermal_zone_trip_update will skip update passive as `old_target == instance->target'.monitor_thermal_zone => thermal_zone_device_set_polling will cancel tz->poll_queue, so the cooling device state will not be changed afterwards.
--- drivers/thermal/thermal_core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/thermal/thermal_core.c +8 -4
@@ -453,16 +453,20 @@ static void update_temperature(struct thermal_zone_device *tz) tz->last_temperature, tz->temperature); } -static void thermal_zone_device_reset (struct thermal_zone_device *tz) +static void thermal_zone_device_init (struct thermal_zone_device *tz) {struct thermal_instance *pos; - tz->temperature =THERMAL_TEMP_INVALID ; - tz->passive =0 ;list_for_each_entry (pos, &tz->thermal_instances, tz_node) pos->initialized = false; } +static void thermal_zone_device_reset (struct thermal_zone_device *tz) +{ + tz->passive =0 ; +thermal_zone_device_init (tz); +} +void thermal_zone_device_update (struct thermal_zone_device *tz,enum thermal_notify_event event) {
@@ -1504,7 +1508,7 @@ static int thermal_pm_notify(struct notifier_block *nb,case PM_POST_SUSPEND :atomic_set (&in_suspend,0 );list_for_each_entry (tz, &thermal_tz_list, node) { -thermal_zone_device_reset (tz); +thermal_zone_device_init (tz);thermal_zone_device_update (tz,THERMAL_EVENT_UNSPECIFIED ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 101/304 thermal: Fix locking in cooling device sysfs update cur_state
In reply to Sasha LevinFrom: Thara Gopinath <[email protected]>
[ Upstream commit 68000a0d983f539c95ebe5dccd4f29535c7ac0af ]
Sysfs interface to update cooling device cur_state does not currently holding cooling device lock sometimes leading to stale values in cur_state if getting updated simultanelously from user space and thermal framework. Adding the proper locking code fixes this issue.
--- drivers/thermal/thermal_sysfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/thermal/thermal_sysfs.c +7 -4
@@ -712,11 +712,14 @@ cur_state_store(struct device *dev, struct device_attribute *attr,if ((long )state <0 )return -EINVAL ; +mutex_lock (&cdev->lock); + result = cdev->ops->set_cur_state (cdev, state); -if (result) -return result; -thermal_cooling_device_stats_update (cdev, state); -return count; +if (!result) +thermal_cooling_device_stats_update (cdev, state); + +mutex_unlock (&cdev->lock); +return result ? result : count; } static struct device_attribute
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 102/304 firmware/efi: Add NULL pointer checks in efivars API functions
In reply to Sasha LevinFrom: Arend van Spriel <[email protected]>
[ Upstream commit ab2180a15ce54739fed381efb4cb12e78dfb1561 ]
Since commit:
ce2e6db554fa ("brcmfmac: Add support for getting nvram contents from EFI variables")
we have a device driver accessing the efivars API. Several functions in the efivars API assume __efivars is set, i.e., that they will be accessed only after efivars_register() has been called. However, the following NULL pointer access was reported calling efivar_entry_size() from the brcmfmac device driver:
Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = 60bfa5f1 [00000008] *pgd=00000000 Internal error: Oops: 5 [#1] SMP ARM ... Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) Workqueue: events request_firmware_work_func PC is at efivar_entry_size+0x28/0x90 LR is at brcmf_fw_complete_request+0x3f8/0x8d4 [brcmfmac] pc : [<c0c40718>] lr : [<bf2a3ef4>] psr: a00d0113 sp : ede7fe28 ip : ee983410 fp : c1787f30 r10: 00000000 r9 : 00000000 r8 : bf2b2258 r7 : ee983000 r6 : c1604c48 r5 : ede7fe88 r4 : edf337c0 r3 : 00000000 r2 : 00000000 r1 : ede7fe88 r0 : c17712c8 Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: ad16804a DAC: 00000051
Disassembly showed that the local static variable __efivars is NULL, which is not entirely unexpected given that it is a non-EFI platform.
So add a NULL pointer check to efivar_entry_size(), and to related functions while at it. In efivars_register() a couple of sanity checks are added as well.
--- drivers/firmware/efi/vars.c | 99 +++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 21 deletions(-)
drivers/firmware/efi/vars.c +78 -21
@@ -318,7 +318,12 @@ EXPORT_SYMBOL_GPL(efivar_variable_is_removable);static efi_status_t check_var_size (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -329,7 +334,12 @@ check_var_size(u32 attributes, unsigned long size)static efi_status_t check_var_size_nonblocking (u32 attributes,unsigned long size) { -const struct efivar_operations *fops = __efivars->ops; +const struct efivar_operations *fops; + +if (!__efivars) +return EFI_UNSUPPORTED ; + + fops = __efivars->ops;if (!fops->query_variable_store)return EFI_UNSUPPORTED ;
@@ -429,13 +439,18 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *),void *data,bool duplicates,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;unsigned long variable_name_size =1024 ;efi_char16_t *variable_name;efi_status_t status;efi_guid_t vendor_guid;int err =0 ; +if (!__efivars) +return -EFAULT ; + + ops = __efivars->ops; + variable_name =kzalloc (variable_name_size,GFP_KERNEL );if (!variable_name) {printk (KERN_ERR "efivars: Memory allocation failed.\n" );
@@ -583,12 +598,14 @@ static void efivar_entry_list_del_unlock(struct efivar_entry *entry)*/ int __efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->set_variable (entry->var.VariableName, - &entry->var.VendorGuid, -0 ,0 ,NULL ); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->set_variable (entry->var.VariableName, + &entry->var.VendorGuid, +0 ,0 ,NULL );return efi_status_to_err (status); }
@@ -607,12 +624,17 @@ EXPORT_SYMBOL_GPL(__efivar_entry_delete);*/ int efivar_entry_delete (struct efivar_entry *entry) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->set_variable (entry->var.VariableName, &entry->var.VendorGuid,0 ,0 ,NULL );
@@ -650,13 +672,19 @@ EXPORT_SYMBOL_GPL(efivar_entry_delete);int efivar_entry_set (struct efivar_entry *entry,u32 attributes,unsigned long size,void *data,struct list_head *head) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;efi_char16_t *name = entry->var.VariableName;efi_guid_t vendor = entry->var.VendorGuid;if (down_interruptible (&efivars_lock))return -EINTR ; + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops;if (head &&efivar_entry_find (name, vendor, head, false)) {up (&efivars_lock);return -EEXIST ;
@@ -687,12 +715,17 @@ static int efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor, u32 attributes, unsigned long size, void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status;if (down_trylock (&efivars_lock))return -EBUSY ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + status =check_var_size_nonblocking (attributes, size +ucs2_strsize (name,1024 ));if (status !=EFI_SUCCESS ) {
@@ -700,6 +733,7 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,return -ENOSPC ; } + ops = __efivars->ops; status = ops->set_variable_nonblocking (name, &vendor, attributes, size, data);
@@ -727,9 +761,13 @@ efivar_entry_set_nonblocking(efi_char16_t *name, efi_guid_t vendor,int efivar_entry_set_safe (efi_char16_t *name,efi_guid_t vendor,u32 attributes,bool block,unsigned long size,void *data) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; +if (!__efivars) +return -EINVAL ; + + ops = __efivars->ops;if (!ops->query_variable_store)return -ENOSYS ;
@@ -829,13 +867,18 @@ EXPORT_SYMBOL_GPL(efivar_entry_find);*/ int efivar_entry_size (struct efivar_entry *entry,unsigned long *size) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_status_t status; *size =0 ;if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + ops = __efivars->ops; status = ops->get_variable (entry->var.VariableName, &entry->var.VendorGuid,NULL , size,NULL );up (&efivars_lock);
@@ -861,12 +904,14 @@ EXPORT_SYMBOL_GPL(efivar_entry_size);int __efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); +if (!__efivars) +return -EINVAL ; + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);return efi_status_to_err (status); }
@@ -882,14 +927,19 @@ EXPORT_SYMBOL_GPL(__efivar_entry_get);int efivar_entry_get (struct efivar_entry *entry,u32 *attributes,unsigned long *size,void *data) { -const struct efivar_operations *ops = __efivars->ops;efi_status_t status;if (down_interruptible (&efivars_lock))return -EINTR ; - status = ops->get_variable (entry->var.VariableName, - &entry->var.VendorGuid, - attributes, size, data); + +if (!__efivars) { +up (&efivars_lock); +return -EINVAL ; + } + + status = __efivars->ops->get_variable (entry->var.VariableName, + &entry->var.VendorGuid, + attributes, size, data);up (&efivars_lock);return efi_status_to_err (status);
@@ -921,7 +971,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_get);int efivar_entry_set_get_size (struct efivar_entry *entry,u32 attributes,unsigned long *size,void *data,bool *set) { -const struct efivar_operations *ops = __efivars->ops; +const struct efivar_operations *ops;efi_char16_t *name = entry->var.VariableName;efi_guid_t *vendor = &entry->var.VendorGuid;efi_status_t status;
@@ -940,6 +990,11 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes,if (down_interruptible (&efivars_lock))return -EINTR ; +if (!__efivars) { + err = -EINVAL ; + goto out; + } +/* * Ensure that the available space hasn't shrunk below the safe level */
@@ -956,6 +1011,8 @@ int efivar_entry_set_get_size(struct efivar_entry *entry, u32 attributes, } } + ops = __efivars->ops; + status = ops->set_variable (name, vendor, attributes, *size, data);if (status !=EFI_SUCCESS ) { err =efi_status_to_err (status);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 103/304 s390/zcrypt: improve special ap message cmd handling
In reply to Sasha LevinFrom: Harald Freudenberger <[email protected]>
[ Upstream commit be534791011100d204602e2e0496e9e6ce8edf63 ]
There exist very few ap messages which need to have the 'special' flag enabled. This flag tells the firmware layer to do some pre- and maybe postprocessing. However, it may happen that this special flag is enabled but the firmware is unable to deal with this kind of message and thus returns with reply code 0x41. For example older firmware may not know the newest messages triggered by the zcrypt device driver and thus react with reject and the named reply code. Unfortunately this reply code is not known to the zcrypt error routines and thus default behavior is to switch the ap queue offline.
This patch now makes the ap error routine aware of the reply code and so userspace is informed about the bad processing result but the queue is not switched to offline state any more.
--- arch/s390/include/uapi/asm/zcrypt.h | 4 ++-- drivers/s390/crypto/zcrypt_error.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
arch/s390/include/uapi/asm/zcrypt.h +2 -2
@@ -150,8 +150,8 @@ struct ica_xcRB {* @cprb_len: CPRB header length [0x0020] * @cprb_ver_id: CPRB version id. [0x04] * @pad_000: Alignment pad bytes -* @flags: Admin cmd [0x80] or functional cmd [0x00] -* @func_id: Function id / subtype [0x5434] +* @flags: Admin bit [0x80], Special bit [0x20] +* @func_id: Function id / subtype [0x5434] "T4" * @source_id: Source id [originator id] * @target_id: Target id [usage/ctrl domain id] * @ret_code: Return code
drivers/s390/crypto/zcrypt_error.h +2 -0
@@ -51,6 +51,7 @@ struct error_hdr {#define REP82_ERROR_FORMAT_FIELD 0x29#define REP82_ERROR_INVALID_COMMAND 0x30#define REP82_ERROR_MALFORMED_MSG 0x40 +#define REP82_ERROR_INVALID_SPECIAL_CMD 0x41#define REP82_ERROR_INVALID_DOMAIN_PRECHECK 0x42#define REP82_ERROR_RESERVED_FIELDO 0x50/* old value */ #define REP82_ERROR_WORD_ALIGNMENT 0x60
@@ -89,6 +90,7 @@ static inline int convert_error(struct zcrypt_queue *zq,case REP88_ERROR_MESSAGE_MALFORMD :case REP82_ERROR_INVALID_DOMAIN_PRECHECK :case REP82_ERROR_INVALID_DOMAIN_PENDING : +case REP82_ERROR_INVALID_SPECIAL_CMD :// REP88_ERROR_INVALID_KEY // '82' CEX2A // REP88_ERROR_OPERAND // '84' CEX2A // REP88_ERROR_OPERAND_EVEN_MOD // '85' CEX2A
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 108/304 ARM: dts: mmp2: fix TWSI2
In reply to Sasha LevinFrom: Lubomir Rintel <[email protected]>
[ Upstream commit 1147e05ac9fc2ef86a3691e7ca5c2db7602d81dd ]
Marvell keeps their MMP2 datasheet secret, but there are good clues that TWSI2 is not on 0xd4025000 on that platform, not does it use IRQ 58. In fact, the IRQ 58 on MMP2 seems to be a signal processor:
arch/arm/mach-mmp/irqs.h:#define IRQ_MMP2_MSP 58
I'm taking a somewhat educated guess that is probably a copy & paste error from PXA168 or PXA910 and that the real controller in fact hides at address 0xd4031000 and uses an interrupt line multiplexed via IRQ 17.
I'm also copying some properties from TWSI1 that were missing or incorrect.
Tested on a OLPC XO 1.75 machine, where the RTC is on TWSI2.
--- arch/arm/boot/dts/mmp2.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/arm/boot/dts/mmp2.dtsi +6 -3
@@ -220,12 +220,15 @@ status = "disabled"; }; - twsi2: i2c@d4025000 { + twsi2: i2c@d4031000 { compatible = "mrvl,mmp-twsi"; - reg = <0xd4025000 0x1000>; - interrupts = <58>; + reg = <0xd4031000 0x1000>; + interrupt-parent = <&intcmux17>; + interrupts = <0>; clocks = <&soc_clocks MMP2_CLK_TWSI1>; resets = <&soc_clocks MMP2_CLK_TWSI1>; + #address-cells = <1>; + #size-cells = <0>; status = "disabled"; };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 111/304 ARM: dts: aspeed: add missing memory unit-address
In reply to Sasha LevinFrom: Rob Herring <[email protected]>
[ Upstream commit 8ef86955fe59f7912a40d57ae4c6d511f0187b4d ]
The base aspeed-g5.dtsi already defines a '/memory at 80000000' node, so '/memory' in the board files create a duplicate node. We're probably getting lucky that the bootloader fixes up the memory node that the kernel ends up using. Add the unit-address so it's merged with the base node.
Found with DT json-schema checks.
--- arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +-- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts +1 -1
@@ -13,7 +13,7 @@ bootargs = "earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +1 -2
@@ -14,7 +14,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x40000000>; };
@@ -322,4 +322,3 @@ &adc { status = "okay"; }; -
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +1 -1
@@ -17,7 +17,7 @@ bootargs = "console=ttyS4,115200 earlyprintk"; }; - memory { + memory at 80000000 { reg = <0x80000000 0x20000000>; };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 112/304 spi: fix spi-at91-usart.c build errors when PINCTRL is not set
In reply to Sasha LevinFrom: Randy Dunlap <[email protected]>
[ Upstream commit c2b142cc3939e932d4fa2210c2a5155df5736590 ]
Fix build errors when CONFIG_PINCTRL is not enabled.
The header file <linux/pinctrl/consumer.h> handles both CONFIG_PINCTRL enabled and disabled cases.
CC [M] drivers/spi/spi-at91-usart.o../drivers/spi/spi-at91-usart.c: In function 'at91_usart_spi_runtime_suspend':../drivers/spi/spi-at91-usart.c:409:2: error: implicit declaration of function 'pinctrl_pm_select_sleep_state' [-Werror=implicit-function-declaration]
pinctrl_pm_select_sleep_state(dev);../drivers/spi/spi-at91-usart.c: In function 'at91_usart_spi_runtime_resume':../drivers/spi/spi-at91-usart.c:419:2: error: implicit declaration of function 'pinctrl_pm_select_default_state' [-Werror=implicit-function-declaration]
pinctrl_pm_select_default_state(dev);
--- drivers/spi/spi-at91-usart.c | 1 + 1 file changed, 1 insertion(+)
drivers/spi/spi-at91-usart.c +1 -0
@@ -12,6 +12,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of_gpio.h> +#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> #include <linux/spi/spi.h>
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 113/304 x86/fpu: Add might_fault() to user_insn()
In reply to Sasha LevinFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 6637401c35b2f327a35d27f44bda05e327f2f017 ]
Every user of user_insn() passes an user memory pointer to this macro.
Add might_fault() to user_insn() so we can spot users which are using this macro in sections where page faulting is not allowed.
[ bp: Space it out to make it more visible. ]
--- arch/x86/include/asm/fpu/internal.h | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/include/asm/fpu/internal.h +3 -0
@@ -106,6 +106,9 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu); #define user_insn(insn, output, input...) \ ({ \ int err; \ + \ + might_fault(); \ + \ asm volatile(ASM_STAC "\n" \ "1:" #insn "\n\t" \ "2: " ASM_CLAC "\n" \
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 116/304 platform/x86: Fix config space access for intel_atomisp2_pm
In reply to Sasha LevinFrom: Ville Syrjälä <[email protected]>
[ Upstream commit 6a31061833a52a79c99221b6251db08cf377470e ]
We lose even config space access when we power gate the ISP via the PUNIT. That makes lspci & co. produce gibberish.
To fix that let's try to implement actual runtime pm hooks and inform the pci core that the device always goes to D3cold. That will cause the pci core to resume the device before attempting config space access.
This introduces another annoyance though. We get the
following error every time we try to resume the device:intel_atomisp2_pm 0000:00:03.0: Refused to change power state, currently in D3
The reason being that the pci core tries to put the device back into D0 via the standard PCI PM mechanism before calling the driver resume hook. To fix this properly we'd need to infiltrate the platform pm hooks (could turn ugly real fast), or use pm domains (which don't seem to exist on x86), or some extra early resume hook for the driver (which doesn't exist either). So maybe we just choose to live with the error?
--- drivers/platform/x86/intel_atomisp2_pm.c | 68 +++++++++++++++++------- 1 file changed, 48 insertions(+), 20 deletions(-)
drivers/platform/x86/intel_atomisp2_pm.c +48 -20
@@ -33,46 +33,45 @@#define ISPSSPM0_IUNIT_POWER_ON 0x0#define ISPSSPM0_IUNIT_POWER_OFF 0x3 -static int isp_probe (struct pci_dev *dev,const struct pci_device_id *id) +static int isp_set_power (struct pci_dev *dev,bool enable) {unsigned long timeout; -u32 val; - -pci_write_config_dword (dev,PCI_INTERRUPT_CTRL ,0 ); - -/* -* MRFLD IUNIT DPHY is located in an always-power-on island -* MRFLD HW design need all CSI ports are disabled before -* powering down the IUNIT. -*/ -pci_read_config_dword (dev,PCI_CSI_CONTROL , &val); - val |=PCI_CSI_CONTROL_PORTS_OFF_MASK ; -pci_write_config_dword (dev,PCI_CSI_CONTROL , val); +u32 val = enable ?ISPSSPM0_IUNIT_POWER_ON : +ISPSSPM0_IUNIT_POWER_OFF ; -/* Write 0x3 to ISPSSPM0 bit[1:0] to power off the IUNIT */ +/* Write to ISPSSPM0 bit[1:0] to power on/off the IUNIT */ iosf_mbi_modify (BT_MBI_UNIT_PMC ,MBI_REG_READ ,ISPSSPM0 , -ISPSSPM0_IUNIT_POWER_OFF ,ISPSSPM0_ISPSSC_MASK ); + val,ISPSSPM0_ISPSSC_MASK );/* * There should be no IUNIT access while power-down is * in progress HW sighting: 4567865 * Wait up to 50 ms for the IUNIT to shut down. +* And we do the same for power on. */ timeout = jiffies +msecs_to_jiffies (50 );while (1 ) { -/* Wait until ISPSSPM0 bit[25:24] shows 0x3 */ -iosf_mbi_read (BT_MBI_UNIT_PMC ,MBI_REG_READ ,ISPSSPM0 , &val); - val = (val &ISPSSPM0_ISPSSS_MASK ) >>ISPSSPM0_ISPSSS_OFFSET ; -if (val ==ISPSSPM0_IUNIT_POWER_OFF ) +u32 tmp; + +/* Wait until ISPSSPM0 bit[25:24] shows the right value */ +iosf_mbi_read (BT_MBI_UNIT_PMC ,MBI_REG_READ ,ISPSSPM0 , &tmp); + tmp = (tmp &ISPSSPM0_ISPSSS_MASK ) >>ISPSSPM0_ISPSSS_OFFSET ; +if (tmp == val)break ;if (time_after (jiffies, timeout)) { -dev_err (&dev->dev,"IUNIT power-off timeout.\n" ); +dev_err (&dev->dev,"IUNIT power-%s timeout.\n" , + enable ?"on" :"off" );return -EBUSY ; }usleep_range (1000 ,2000 ); } +return 0 ; +} + +static int isp_probe (struct pci_dev *dev,const struct pci_device_id *id) +{pm_runtime_allow (&dev->dev);pm_runtime_put_sync_suspend (&dev->dev);
@@ -87,11 +86,40 @@ static void isp_remove(struct pci_dev *dev)static int isp_pci_suspend (struct device *dev) { +struct pci_dev *pdev =to_pci_dev (dev); +u32 val; + +pci_write_config_dword (pdev,PCI_INTERRUPT_CTRL ,0 ); + +/* +* MRFLD IUNIT DPHY is located in an always-power-on island +* MRFLD HW design need all CSI ports are disabled before +* powering down the IUNIT. +*/ +pci_read_config_dword (pdev,PCI_CSI_CONTROL , &val); + val |=PCI_CSI_CONTROL_PORTS_OFF_MASK ; +pci_write_config_dword (pdev,PCI_CSI_CONTROL , val); + +/* +* We lose config space access when punit power gates +* the ISP. Can't use pci_set_power_state() because +* pmcsr won't actually change when we write to it. +*/ +pci_save_state (pdev); + pdev->current_state = PCI_D3cold; +isp_set_power (pdev, false); +return 0 ; }static int isp_pci_resume (struct device *dev) { +struct pci_dev *pdev =to_pci_dev (dev); + +isp_set_power (pdev, true); + pdev->current_state =PCI_D0 ; +pci_restore_state (pdev); +return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 118/304 xtensa: xtfpga.dtsi: fix dtc warnings about SPI
In reply to Sasha LevinFrom: Max Filippov <[email protected]>
[ Upstream commit f37598be4e3896359e87c824be57ddddc280cc3f ]
Rename SPI controller node in the XTFPGA DTS to spi@... This fixes the following build warnings:
arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705_nommu.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx200mx.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/kc705.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/ml605.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_bridge):
/soc/spi-master@0d0a0000: node name for SPI buses should be 'spi'arch/xtensa/boot/dts/lx60.dtb: Warning (spi_bus_reg):
Failed prerequisite 'spi_bus_bridge'
--- arch/xtensa/boot/dts/xtfpga.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/xtensa/boot/dts/xtfpga.dtsi +1 -1
@@ -103,7 +103,7 @@ }; }; - spi0: spi-master@0d0a0000 { + spi0: spi@0d0a0000 { compatible = "cdns,xtfpga-spi"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 128/304 pinctrl: nuvoton: check for devm_kasprintf() failure
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit 4be1eaf322f07bb9694618fd2763a3a1f0a3dd25 ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignment to .label is not safe if not checked. On error npcm7xx_gpio_of() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +3 -0
@@ -1932,6 +1932,9 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl) pctrl->gpio_bank[id].gc.label =devm_kasprintf (pctrl->dev,GFP_KERNEL ,"%pOF" , np); +if (pctrl->gpio_bank[id].gc.label ==NULL ) +return -ENOMEM ; + pctrl->gpio_bank[id].gc.dbg_show = npcmgpio_dbg_show; pctrl->gpio_bank[id].direction_input = pctrl->gpio_bank[id].gc.direction_input;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 129/304 drm/amdgpu/powerplay: fix clock stretcher limits on polaris (v2)
In reply to Sasha LevinFrom: Alex Deucher <[email protected]>
[ Upstream commit de4aaab5cc9770a8c4dc13d9bfb6a83b06bba57e ]
Adjust limits for newer polaris variants.
v2: fix polaris11 kicker (Jerry)
--- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +15 -2
@@ -1529,8 +1529,21 @@ static int polaris10_populate_clock_stretcher_data_table(struct pp_hwmgr *hwmgr) efuse = efuse >>24 ;if (hwmgr->chip_id ==CHIP_POLARIS10 ) { - min =1000 ; - max =2300 ; +if (hwmgr->is_kicker) { + min =1200 ; + max =2500 ; + }else { + min =1000 ; + max =2300 ; + } + }else if (hwmgr->chip_id ==CHIP_POLARIS11 ) { +if (hwmgr->is_kicker) { + min =900 ; + max =2100 ; + }else { + min =1100 ; + max =2100 ; + } }else { min =1100 ; max =2100 ;
Signature · 6 lines
2.19.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 131/304 arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios
In reply to Sasha LevinFrom: Oskari Lemmela <oskari-fV/[email protected]>
[ Upstream commit 690e16bada6029694740d5501025faf483d14339 ]
Rockpro64 is not able boot if GPIO1_C1 pin is pulled high before loading linux kernel.
In rockpro64 GPIO1_C1 pin is connected vdd_cpu_b regulator VSEL pin. Pin should be pulled down in normal operation and pulled high in suspend.
PMIC LDO_REG2 is connected to touch panel connector. Rename regulator and set it to correct voltage.
PCIe power is controller by GPIO1_D0.
Schematics can be downloaded from:
http://files.pine64.org/doc/rockpro64/rockpro64_v21-SCH.pdf
--- .../boot/dts/rockchip/rk3399-rockpro64.dts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts +12 -8
@@ -97,7 +97,7 @@ vcc3v3_pcie: vcc3v3-pcie-regulator { compatible = "regulator-fixed"; enable-active-high; - gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>; + gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pcie_pwr_en>; regulator-name = "vcc3v3_pcie";
@@ -293,12 +293,12 @@ }; }; - vcc2v8_dvp: LDO_REG2 { - regulator-name = "vcc2v8_dvp"; + vcc3v0_touch: LDO_REG2 { + regulator-name = "vcc3v0_touch"; regulator-always-on; regulator-boot-on; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; regulator-state-mem { regulator-off-in-suspend; };
@@ -397,7 +397,9 @@ vdd_cpu_b: regulator@40 { compatible = "silergy,syr827"; reg = <0x40>; - fcs,suspend-voltage-selector = <0>; + fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&vsel1_gpio>; regulator-name = "vdd_cpu_b"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>;
@@ -415,6 +417,8 @@ compatible = "silergy,syr828"; reg = <0x41>; fcs,suspend-voltage-selector = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&vsel2_gpio>; regulator-name = "vdd_gpu"; regulator-min-microvolt = <712500>; regulator-max-microvolt = <1500000>;
@@ -519,7 +523,7 @@ pcie { pcie_pwr_en: pcie-pwr-en { - rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; + rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; }; };
@@ -529,7 +533,7 @@ }; vsel1_gpio: vsel1-gpio { - rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; }; vsel2_gpio: vsel2-gpio {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 134/304 IB/hfi1: Unreserve a reserved request when it is completed
In reply to Sasha LevinFrom: Kaike Wan <[email protected]>
[ Upstream commit ca95f802ef5139722acc8d30aeaab6fe5bbe939e ]
Currently, When a reserved operation is completed, its entry in the send queue will not be unreserved, which leads to the miscalculation of qp->s_avail and thus the triggering of a WARN_ON call trace. This patch fixes the problem by unreserving the reserved operation when it is completed.
--- drivers/infiniband/hw/hfi1/rc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/infiniband/hw/hfi1/rc.c +2 -0
@@ -1157,6 +1157,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah)if (cmp_psn (wqe->lpsn, qp->s_sending_psn) >=0 &&cmp_psn (qp->s_sending_psn, qp->s_sending_hpsn) <=0 )break ; +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
@@ -1209,6 +1210,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp,u32 s_last;rvt_put_swqe (wqe); +rvt_qp_wqe_unreserve (qp, wqe); s_last = qp->s_last;trace_hfi1_qp_send_completion (qp, wqe, s_last);if (++s_last >= qp->s_size)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 136/304 gpio: mt7621: report failure of devm_kasprintf()
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit 59d646c775d6ae688ee90fda9f2a4270c47b7490 ]
kasprintf() may return NULL on failure of internal allocation thus the assigned label is not safe if not explicitly checked. On error mediatek_gpio_bank_probe() returns negative values so -ENOMEM in the (unlikely) failure case should be fine here.
--- drivers/gpio/gpio-mt7621.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-mt7621.c +2 -0
@@ -244,6 +244,8 @@ mediatek_gpio_bank_probe(struct device *dev, rg->chip.of_xlate = mediatek_gpio_xlate; rg->chip.label =devm_kasprintf (dev,GFP_KERNEL ,"%s-bank%d" ,dev_name (dev), bank); +if (!rg->chip.label) +return -ENOMEM ; ret =devm_gpiochip_add_data (dev, &rg->chip, mtk);if (ret <0 ) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 137/304 gpio: mt7621: pass mediatek_gpio_bank_probe() failure up the stack
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit a109c2dbb571b10bb9969285b646f57309c98251 ]
The error cases of mediatek_gpio_bank_probe() would go unnoticed (except for the dev_err() messages). The probe function should return an error if one of the banks failed to initialize properly indicated by not returning non-0.
--- drivers/gpio/gpio-mt7621.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpio/gpio-mt7621.c +6 -2
@@ -297,6 +297,7 @@ mediatek_gpio_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct mtk *mtk;int i; +int ret; mtk =devm_kzalloc (dev,sizeof (*mtk),GFP_KERNEL );if (!mtk)
@@ -311,8 +312,11 @@ mediatek_gpio_probe(struct platform_device *pdev)platform_set_drvdata (pdev, mtk); mediatek_gpio_irq_chip.name =dev_name (dev); -for (i =0 ; i <MTK_BANK_CNT ; i++) -mediatek_gpio_bank_probe (dev, np, i); +for (i =0 ; i <MTK_BANK_CNT ; i++) { + ret =mediatek_gpio_bank_probe (dev, np, i); +if (ret) +return ret; + }return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 138/304 pinctrl: sx150x: handle failure case of devm_kstrdup
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit a9d9f6b83f1bb05da849b3540e6d1f70ef1c2343 ]
devm_kstrdup() may return NULL if internal allocation failed. Thus using label, name is unsafe without checking. Therefor in the unlikely case of allocation failure, sx150x_probe() simply returns -ENOMEM.
--- drivers/pinctrl/pinctrl-sx150x.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-sx150x.c +8 -3
@@ -1166,7 +1166,6 @@ static int sx150x_probe(struct i2c_client *client, }/* Register GPIO controller */ - pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); pctl->gpio.base =-1 ; pctl->gpio.ngpio = pctl->data->npins; pctl->gpio.get_direction = sx150x_gpio_get_direction;
@@ -1180,6 +1179,10 @@ static int sx150x_probe(struct i2c_client *client, pctl->gpio.of_node = dev->of_node;#endif pctl->gpio.can_sleep = true; + pctl->gpio.label =devm_kstrdup (dev, client->name,GFP_KERNEL ); +if (!pctl->gpio.label) +return -ENOMEM ; +/* * Setting multiple pins is not safe when all pins are not * handled by the same regmap register. The oscio pin (present
@@ -1200,13 +1203,15 @@ static int sx150x_probe(struct i2c_client *client,/* Add Interrupt support if an irq is specified */ if (client->irq >0 ) { - pctl->irq_chip.name =devm_kstrdup (dev, client->name, -GFP_KERNEL ); pctl->irq_chip.irq_mask = sx150x_irq_mask; pctl->irq_chip.irq_unmask = sx150x_irq_unmask; pctl->irq_chip.irq_set_type = sx150x_irq_set_type; pctl->irq_chip.irq_bus_lock = sx150x_irq_bus_lock; pctl->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock; + pctl->irq_chip.name =devm_kstrdup (dev, client->name, +GFP_KERNEL ); +if (!pctl->irq_chip.name) +return -ENOMEM ; pctl->irq.masked = ~0 ; pctl->irq.sense =0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 139/304 iommu/amd: Fix amd_iommu=force_isolation
In reply to Sasha LevinFrom: Yu Zhao <[email protected]>
[ Upstream commit c12b08ebbe16f0d3a96a116d86709b04c1ee8e74 ]
The parameter is still there but it's ignored. We need to check its value before deciding to go into passthrough mode for AMD IOMMU v2 capable device.
We occasionally use this parameter to force v2 capable device into translation mode to debug memory corruption that we suspect is caused by DMA writes.
To address the following comment from Joerg Roedel on the first version, v2 capability of device is completely ignored.
Quoted 2 lines
This breaks the
iommu_v2use-case, as it needs a direct mapping for the devices that support it.
And from Documentation/admin-guide/kernel-parameters.txt:
This option does not override iommu=pt
--- drivers/iommu/amd_iommu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +8 -1
@@ -438,7 +438,14 @@ static int iommu_init_device(struct device *dev) dev_data->alias =get_alias (dev); -if (dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) { +/* +* By default we use passthrough mode for IOMMUv2 capable device. +* But if amd_iommu=force_isolation is set (e.g. to debug DMA to +* invalid address), we ignore the capability for the device so +* it'll be forced to go into translation mode. +*/ +if ((iommu_pass_through || !amd_iommu_force_isolation) && +dev_is_pci (dev) &&pci_iommuv2_capable (to_pci_dev (dev))) {struct amd_iommu *iommu; iommu = amd_iommu_rlookup_table[dev_data->devid];
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 141/304 ARM: OMAP1: ams-delta: Fix audio permanently muted
In reply to Sasha LevinFrom: Janusz Krzysztofik <[email protected]>
[ Upstream commit 2afdb4c41d7876e430b9bc6e2d7e2fe28609fd6a ]
Since commit 1137ceee76ba ("ARM: OMAP1: ams-delta: Don't request unused GPIOs"), on-board audio has appeared muted. Believed to be unused GPIO pin "hookflash1", apparently set high regardless of the corresponding bit of "latch2" port attempted to be set low during .init_machine(), has been identified as the reason.
According to Amstrad E3 wiki, the purpose of the pin hasn't been clearly identified. Original Amstrad software used to produce a high pulse on it when the phone was taken off hook or recall was pressed. With the current finding, we can assume the pin provides a kind of audio mute function.
Proper resolution of the issue should be done in two steps:
- resolution of an issue with the pin state not reflecting the value the corresponding bit of the port was attempted to be initialized with,
- extension of on-board audio driver with a new control.
For now, rename the pin to "audio_mute" to reflect its function and, as a quick fix, hogg it as output low so on-board audio can produce audible sound again.
--- arch/arm/mach-omap1/board-ams-delta.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-omap1/board-ams-delta.c +4 -2
@@ -247,8 +247,8 @@ static struct platform_device latch2_gpio_device = {#define LATCH2_PIN_SCARD_CMDVCC 11#define LATCH2_PIN_MODEM_NRESET 12#define LATCH2_PIN_MODEM_CODEC 13 -#define LATCH2_PIN_HOOKFLASH1 14 -#define LATCH2_PIN_HOOKFLASH2 15 +#define LATCH2_PIN_AUDIO_MUTE 14 +#define LATCH2_PIN_HOOKFLASH 15static struct regulator_consumer_supply modem_nreset_consumers[] = {REGULATOR_SUPPLY ("RESET#" ,"serial8250.1" ),
@@ -588,6 +588,8 @@ static int gpiochip_match_by_label(struct gpio_chip *chip, void *data)static struct gpiod_hog ams_delta_gpio_hogs[] = {GPIO_HOG (LATCH2_LABEL ,LATCH2_PIN_KEYBRD_DATAOUT ,"keybrd_dataout" ,GPIO_ACTIVE_HIGH ,GPIOD_OUT_LOW ), +GPIO_HOG (LATCH2_LABEL ,LATCH2_PIN_AUDIO_MUTE ,"audio_mute" , +GPIO_ACTIVE_HIGH ,GPIOD_OUT_LOW ), {}, };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 142/304 ARM: dts: Fix OMAP4430 SDP Ethernet startup
In reply to Sasha LevinFrom: Russell King - ARM Linux <[email protected]>
[ Upstream commit 84fb6c7feb1494ebb7d1ec8b95cfb7ada0264465 ]
It was noticed that unbinding and rebinding the KSZ8851 ethernet resulted in the driver reporting "failed to read device ID" at probe. Probing the reset line with a 'scope while repeatedly attempting to bind the driver in a shell loop revealed that the KSZ8851 RSTN pin is constantly held at zero, meaning the device is held in reset, and does not respond on the SPI bus.
Experimentation with the startup delay on the regulator set to 50ms shows that the reset is positively released after 20ms.
Schematics for this board are not available, and the traces are buried in the inner layers of the board which makes tracing where the RSTN pin extremely difficult. We can only guess that the RSTN pin is wired to a reset generator chip driven off the ethernet supply, which fits the observed behaviour.
Include this delay in the regulator startup delay - effectively treating the reset as a "supply stable" indicator.
This can not be modelled as a delay in the KSZ8851 driver since the reset generation is board specific - if the RSTN pin had been wired to a GPIO, reset could be released earlier via the already provided support in the KSZ8851 driver.
This also got confirmed by Peter Ujfalusi <[email protected]> based on Blaze schematics that should be very close to SDP4430:
TPS22902YFPR is used as the regulator switch (gpio48 controlled):
Convert arm boot_lock to raw The VOUT is routed to TPS3808G01DBV. (SCH Note: Threshold set at 90%. Vsense: 0.405V).
According to the TPS3808 data sheet the RESET delay time when Ct is open (this is the case in the schema): MIN/TYP/MAX: 12/20/28 ms.
--- arch/arm/boot/dts/omap4-sdp.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/omap4-sdp.dts +1 -0
@@ -33,6 +33,7 @@ gpio = <&gpio2 16 GPIO_ACTIVE_HIGH>; /* gpio line 48 */ enable-active-high; regulator-boot-on; + startup-delay-us = <25000>; }; vbat: fixedregulator-vbat {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 145/304 arm64: dts: meson: Fix IRQ trigger type for macirq
In reply to Sasha LevinFrom: Carlo Caione <[email protected]>
[ Upstream commit 8b3e6f8999f8d704fccce225b9455b3fa639d1c9 ]
A long running stress test on a custom board shipping an AXG SoCs and a Realtek RTL8211F PHY revealed that after a few hours the connection speed would drop drastically, from ~1000Mbps to ~3Mbps. At the same time the 'macirq' (eth0) IRQ would stop being triggered at all and as consequence the GMAC IRQs never ACKed.
After a painful investigation the problem seemed to be due to a wrong defined IRQ type for the GMAC IRQ that should be LEVEL_HIGH instead of EDGE_RISING.
The change in the macirq IRQ type also solved another long standing issue affecting this SoC/PHY where EEE was causing the network connection to die after stressing it with iperf3 (even though much sooner). It's now possible to remove the 'eee-broken-1000t' quirk as well.
--- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 1 - 4 files changed, 2 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/amlogic/meson-axg.dtsi +1 -1
@@ -143,7 +143,7 @@ compatible = "amlogic,meson-axg-dwmac", "snps,dwmac"; reg = <0x0 0xff3f0000 0x0 0x10000 0x0 0xff634540 0x0 0x8>; - interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq"; clocks = <&clkc CLKID_ETH>, <&clkc CLKID_FCLK_DIV2>,
arch/arm64/boot/dts/amlogic/meson-gx.dtsi +1 -1
@@ -462,7 +462,7 @@ compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac"; reg = <0x0 0xc9410000 0x0 0x10000 0x0 0xc8834540 0x0 0x4>; - interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "macirq"; status = "disabled"; };
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +0 -1
@@ -143,7 +143,6 @@ interrupt-parent = <&gpio_intc>; /* MAC_INTR on GPIOZ_15 */ interrupts = <29 IRQ_TYPE_LEVEL_LOW>; - eee-broken-1000t; }; }; };
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi +0 -1
@@ -142,7 +142,6 @@ eth_phy0: ethernet-phy@0 { /* Realtek RTL8211F (0x001cc916) */ reg = <0>; - eee-broken-1000t; }; }; };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 146/304 ARM: dts: Fix up the D-Link DIR-685 MTD partition info
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 738a05e673435afb986b53da43befd83ad87ec3b ]
The vendor firmware was analyzed to get the right idea about this flash layout. /proc/mtd contains:
dev: size erasesize name
mtd0: 01e7ff40 00020000 "rootfs"
mtd1: 01f40000 00020000 "upgrade"
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd4: 00040000 00020000 "RedBoot"
mtd5: 00020000 00020000 "LangPack"
mtd6: 02000000 00020000 "flash"
Here "flash" is obviously the whole device and we know "rootfs" is a bogus hack to point to a squashfs rootfs inside of the main "upgrade partition". We know "RedBoot" is the first 0x40000 of the flash and the "upgrade" partition follows from 0x40000 to 0x1f8000. So we have mtd0, 1, 4 and 6 covered.
Remains:
mtd2: 00040000 00020000 "rgdb"
mtd3: 00020000 00020000 "nvram"
mtd5: 00020000 00020000 "LangPack"
Inspecting the flash at 0x1f8000 and 0x1fa000 reveals each of these starting with "RGCFG1" so we assume 0x1f8000-1fbfff is "rgdb" of 0x40000.
--- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
arch/arm/boot/dts/gemini-dlink-dir-685.dts +6 -10
@@ -274,20 +274,16 @@ read-only; }; /* - * Between the boot loader and the rootfs is the kernel - * in a custom Storlink format flashed from the boot - * menu. The rootfs is in squashfs format. + * This firmware image contains the kernel catenated + * with the squashfs root filesystem. For some reason + * this is called "upgrade" on the vendor system. */ - partition@1800c0 { - label = "rootfs"; - reg = <0x001800c0 0x01dbff40>; - read-only; - }; - partition@1f40000 { + partition@40000 { label = "upgrade"; - reg = <0x01f40000 0x00040000>; + reg = <0x00040000 0x01f40000>; read-only; }; + /* RGDB, Residental Gateway Database? */ partition@1f80000 { label = "rgdb"; reg = <0x01f80000 0x00040000>;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 148/304 Input: rotary-encoder - don't log EPROBE_DEFER to kernel log
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 0832e93632c61987d504e251b927a2be769dd21a ]
When a driver fails to bind because a resource it still missing it's not helpful to report this as (usually) probing is repeated later.
--- drivers/input/misc/rotary_encoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/input/misc/rotary_encoder.c +4 -2
@@ -240,8 +240,10 @@ static int rotary_encoder_probe(struct platform_device *pdev) encoder->gpios =devm_gpiod_get_array (dev,NULL ,GPIOD_IN );if (IS_ERR (encoder->gpios)) { -dev_err (dev,"unable to get gpios\n" ); -return PTR_ERR (encoder->gpios); + err =PTR_ERR (encoder->gpios); +if (err != -EPROBE_DEFER ) +dev_err (dev,"unable to get gpios: %d\n" , err); +return err; }if (encoder->gpios->ndescs <2 ) {dev_err (dev,"not enough gpios found\n" );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 150/304 ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
In reply to Sasha LevinFrom: Andrey Smirnov <[email protected]>
[ Upstream commit 79da07dec740a42c70963ebacbd2bf8866af9e20 ]
TPA6130A2 SD pin on RDU1 is not really controlled by SoC and instead is only meant to notify the system that audio was "muted" by external actors. To accommodate that, drop "power-gpio" property of hpa1 node as well as specify a name for that GPIO so that userspace can access it.
--- arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx51-zii-rdu1.dts +13 -4
@@ -477,6 +477,15 @@ }; &gpio1 { + gpio-line-names = "", "", "", "", + "", "", "", "", + "", "hp-amp-shutdown-b", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", "", + "", "", "", ""; + unused-sd3-wp-gpio { /* * See pinctrl_esdhc1 below for more details on this
@@ -495,9 +504,6 @@ hpa1: amp@60 { compatible = "ti,tpa6130a2"; reg = <0x60>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_ampgpio>; - power-gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; Vdd-supply = <®_3p3v>; };
@@ -671,7 +677,10 @@ }; &iomuxc { - pinctrl_ampgpio: ampgpiogrp { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + pinctrl_hog: hoggrp { fsl,pins = < MX51_PAD_GPIO1_9__GPIO1_9 0x5e >;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 152/304 iommu/arm-smmu-v3: Avoid memory corruption from Hisilicon MSI payloads
In reply to Sasha LevinFrom: Zhen Lei <[email protected]>
[ Upstream commit 84a9a75774961612d0c7dd34a1777e8f98a65abd ]
The GITS_TRANSLATER MMIO doorbell register in the ITS hardware is architected to be 4 bytes in size, yet on hi1620 and earlier, Hisilicon have allocated the adjacent 4 bytes to carry some IMPDEF sideband information which results in an 8-byte MSI payload being delivered when signalling an interrupt:
MSIAddr:
|----4bytes----|----4bytes----| | MSIData | IMPDEF |
This poses no problem for the ITS hardware because the adjacent 4 bytes are reserved in the memory map. However, when delivering MSIs to memory, as we do in the SMMUv3 driver for signalling the completion of a SYNC command, the extended payload will corrupt the 4 bytes adjacent to the "sync_count" member in struct arm_smmu_device. Fortunately, the current layout allocates these bytes to padding, but this is fragile and we should make this explicit.
--- drivers/iommu/arm-smmu-v3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +5 -1
@@ -576,7 +576,11 @@ struct arm_smmu_device {struct arm_smmu_strtab_cfg strtab_cfg; -u32 sync_count; +/* Hi16xx adds an extra 32 bits of goodness to its MSI payload */ +union { +u32 sync_count; +u64 padding; + };/* IOMMU core code handle */ struct iommu_device iommu;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 153/304 iommu/arm-smmu: Add support for qcom,smmu-v2 variant
In reply to Sasha LevinFrom: Vivek Gautam <[email protected]>
[ Upstream commit 89cddc563743cb1e0068867ac97013b2a5bf86aa ]
qcom,smmu-v2 is an arm,smmu-v2 implementation with specific clock and power requirements.
On msm8996, multiple cores, viz. mdss, video, etc. use this smmu. On sdm845, this smmu is used with gpu.
Add bindings for the same.
--- drivers/iommu/arm-smmu.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/iommu/arm-smmu.c +3 -0
@@ -119,6 +119,7 @@ enum arm_smmu_implementation {GENERIC_SMMU ,ARM_MMU500 ,CAVIUM_SMMUV2 , + QCOM_SMMUV2, }; struct arm_smmu_s2cr {
@@ -1954,6 +1955,7 @@ ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU);ARM_SMMU_MATCH_DATA (arm_mmu401,ARM_SMMU_V1_64K ,GENERIC_SMMU );ARM_SMMU_MATCH_DATA (arm_mmu500,ARM_SMMU_V2 ,ARM_MMU500 );ARM_SMMU_MATCH_DATA (cavium_smmuv2,ARM_SMMU_V2 ,CAVIUM_SMMUV2 ); +ARM_SMMU_MATCH_DATA (qcom_smmuv2,ARM_SMMU_V2 ,QCOM_SMMUV2 );static const struct of_device_id arm_smmu_of_match[] = { { .compatible ="arm,smmu-v1" , .data = &smmu_generic_v1 },
@@ -1962,6 +1964,7 @@ static const struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,mmu-401", .data = &arm_mmu401 }, { .compatible = "arm,mmu-500", .data = &arm_mmu500 }, { .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 }, + { .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 }, { }, };MODULE_DEVICE_TABLE (of, arm_smmu_of_match);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 154/304 iommu/arm-smmu-v3: Use explicit mb() when moving cons pointer
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit a868e8530441286342f90c1fd9c5f24de3aa2880 ]
After removing an entry from a queue (e.g. reading an event in arm_smmu_evtq_thread()) it is necessary to advance the MMIO consumer pointer to free the queue slot back to the SMMU. A memory barrier is required here so that all reads targetting the queue entry have completed before the consumer pointer is updated.
The implementation of queue_inc_cons() relies on a writel() to complete the previous reads, but this is incorrect because writel() is only guaranteed to complete prior writes. This patch replaces the call to writel() with an mb(); writel_relaxed() sequence, which gives us the read->write ordering which we require.
--- drivers/iommu/arm-smmu-v3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/iommu/arm-smmu-v3.c +7 -1
@@ -679,7 +679,13 @@ static void queue_inc_cons(struct arm_smmu_queue *q)u32 cons = (Q_WRP (q, q->cons) |Q_IDX (q, q->cons)) +1 ; q->cons =Q_OVF (q, q->cons) |Q_WRP (q, cons) |Q_IDX (q, cons); -writel (q->cons, q->cons_reg); + +/* +* Ensure that all CPU accesses (reads and writes) to the queue +* are complete before we update the cons pointer. +*/ +mb (); +writel_relaxed (q->cons, q->cons_reg); }static int queue_sync_prod (struct arm_smmu_queue *q)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 155/304 sata_rcar: fix deferred probing
In reply to Sasha LevinFrom: Sergei Shtylyov <[email protected]>
[ Upstream commit 9f83cfdb1ace3ef268ecc6fda50058d2ec37d603 ]
The driver overrides the error codes returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver would fail the probe permanently instead of the deferred probing. Switch to propagating the error code upstream, still checking/overriding IRQ0 as libata regards it as "no IRQ" (thus polling) anyway...
--- drivers/ata/sata_rcar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/sata_rcar.c +3 -1
@@ -891,7 +891,9 @@ static int sata_rcar_probe(struct platform_device *pdev)int ret =0 ; irq =platform_get_irq (pdev,0 ); -if (irq <=0 ) +if (irq <0 ) +return irq; +if (!irq)return -EINVAL ; priv =devm_kzalloc (dev,sizeof (struct sata_rcar_priv ),GFP_KERNEL );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 157/304 platform/x86: mlx-platform: Fix tachometer registers
In reply to Sasha LevinFrom: Vadim Pasternak <[email protected]>
[ Upstream commit edd45cba5ed7f53974475ddc9a1453c2c87b3328 ]
Shift by one the registers for tachometers (7 - 12).
This fix is relevant for the same new systems MQMB7, MSN37, MSN34, which are about to be released to the customers.
At the moment, none of them is at customers sites. The customers will not suffer from this change.
This fix is necessary, because register used before for tachometer 7 has been than reserved for the second PWM for newer systems, which are not supported yet in mlx-platform driver. So registers of tachometers 7-12 have been shifted by one.
--- drivers/platform/x86/mlx-platform.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/platform/x86/mlx-platform.c +6 -6
@@ -83,12 +83,12 @@#define MLXPLAT_CPLD_LPC_REG_TACHO4_OFFSET 0xe7#define MLXPLAT_CPLD_LPC_REG_TACHO5_OFFSET 0xe8#define MLXPLAT_CPLD_LPC_REG_TACHO6_OFFSET 0xe9 -#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xea -#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xeb -#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xec -#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xed -#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xee -#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO7_OFFSET 0xeb +#define MLXPLAT_CPLD_LPC_REG_TACHO8_OFFSET 0xec +#define MLXPLAT_CPLD_LPC_REG_TACHO9_OFFSET 0xed +#define MLXPLAT_CPLD_LPC_REG_TACHO10_OFFSET 0xee +#define MLXPLAT_CPLD_LPC_REG_TACHO11_OFFSET 0xef +#define MLXPLAT_CPLD_LPC_REG_TACHO12_OFFSET 0xf0#define MLXPLAT_CPLD_LPC_IO_RANGE 0x100#define MLXPLAT_CPLD_LPC_I2C_CH1_OFF 0xdb#define MLXPLAT_CPLD_LPC_I2C_CH2_OFF 0xda
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 158/304 cpuidle: big.LITTLE: fix refcount leak
In reply to Sasha LevinFrom: Yangtao Li <[email protected]>
[ Upstream commit 9456823c842f346c74265fcd98d008d87a7eb6f5 ]
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. bl_idle_init() doesn't do that, so fix it.
--- drivers/cpuidle/cpuidle-big_little.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/cpuidle/cpuidle-big_little.c +6 -1
@@ -167,6 +167,7 @@ static int __init bl_idle_init(void) {int ret;struct device_node *root =of_find_node_by_path ("/" ); +const struct of_device_id *match_id;if (!root)return -ENODEV ;
@@ -174,7 +175,11 @@ static int __init bl_idle_init(void)/* * Initialize the driver just for a compliant set of machines */ -if (!of_match_node (compatible_machine_match, root)) + match_id =of_match_node (compatible_machine_match, root); + +of_node_put (root); + +if (!match_id)return -ENODEV ;if (!mcpm_is_available ())
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 159/304 OPP: Use opp_table->regulators to verify no regulator case
In reply to Sasha LevinFrom: Viresh Kumar <[email protected]>
[ Upstream commit 90e3577b5feb42bac1269e16bb3d2bdd8f6df40f ]
The value of opp_table->regulator_count is not very consistent right now and it may end up being 0 while we do have a "opp-microvolt" property in the OPP table. It was kept that way as we used to check if any regulators are set with the OPP core for a device or not using value of regulator_count.
Lets use opp_table->regulators for that purpose as the meaning of regulator_count is going to change in the later patches.
--- drivers/opp/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/opp/core.c +7 -4
@@ -196,12 +196,12 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)if (IS_ERR (opp_table))return 0 ; - count = opp_table->regulator_count; -/* Regulator may not be required for the device */ -if (!count) +if (!opp_table->regulators) goto put_opp_table; + count = opp_table->regulator_count; + uV =kmalloc_array (count,sizeof (*uV),GFP_KERNEL );if (!uV) goto put_opp_table;
@@ -1102,6 +1102,9 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp,struct regulator *reg;int i; +if (!opp_table->regulators) +return true; +for (i =0 ; i < opp_table->regulator_count; i++) { reg = opp_table->regulators[i];
@@ -1386,7 +1389,7 @@ static int _allocate_set_opp_data(struct opp_table *opp_table)struct dev_pm_set_opp_data *data;int len, count = opp_table->regulator_count; -if (WARN_ON (!count)) +if (WARN_ON (!opp_table->regulators))return -EINVAL ;/* space for set_opp_data */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 161/304 drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver
In reply to Sasha LevinFrom: Abhinav Kumar <[email protected]>
[ Upstream commit c1866d44d149a1ea5c303632114fb6aa08cfd263 ]
Fix the dsi clock names in the DSI 10nm PLL driver to match the names in the dispcc driver as those are according to the clock plan of the chipset.
Changes in v2:
- Update the clock diagram with the new clock name
--- drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +4 -4
@@ -17,7 +17,7 @@* | | * | | * +---------+ | +----------+ | +----+ -* dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0pllbyte +* dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0_phy_pll_out_byteclk * +---------+ | +----------+ | +----+ * | | * | | dsi0_pll_by_2_bit_clk
@@ -25,7 +25,7 @@* | | +----+ | |\ dsi0_pclk_mux * | |--| /2 |--o--| \ | * | | +----+ | \ | +---------+ -* | --------------| |--o--| div_7_4 |-- dsi0pll +* | --------------| |--o--| div_7_4 |-- dsi0_phy_pll_out_dsiclk * |------------------------------| / +---------+ * | +-----+ | / * -----------| /4? |--o----------|/
@@ -690,7 +690,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; -snprintf (clk_name,32 ,"dsi%dpllbyte" , pll_10nm->id); +snprintf (clk_name,32 ,"dsi%d_phy_pll_out_byteclk" , pll_10nm->id);snprintf (parent,32 ,"dsi%d_pll_bit_clk" , pll_10nm->id);/* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
@@ -739,7 +739,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm) hws[num++] = hw; -snprintf (clk_name,32 ,"dsi%dpll" , pll_10nm->id); +snprintf (clk_name,32 ,"dsi%d_phy_pll_out_dsiclk" , pll_10nm->id);snprintf (parent,32 ,"dsi%d_pclk_mux" , pll_10nm->id);/* PIX CLK DIV : DIV_CTRL_7_4*/
Signature · 6 lines
2.19.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sasha Levin
maintainerPATCH 162/304 drm/msm: dpu: Only check flush register against pending flushes
In reply to Sasha LevinFrom: Sean Paul <[email protected]>
[ Upstream commit 5f79e03b1f7c1b2cf0019ce6365fe5d52629813d ]
There exists a case where a flush of a plane/dma may have been triggered & started from an async commit. If that plane/dma is subsequently disabled by the next commit, the flush register will continue to hold the flush bit for the disabled plane. Since the bit remains active, pending_kickoff_cnt will never decrement and we'll miss frame_done events.
This patch limits the check of flush_register to include only those bits which have been updated with the latest commit.
Changes in v2:
- None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +1 -1
@@ -331,7 +331,7 @@ static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx)if (hw_ctl && hw_ctl->ops.get_flush_register) flush_register = hw_ctl->ops.get_flush_register (hw_ctl); -if (flush_register ==0 ) +if (!(flush_register & hw_ctl->ops.get_pending_flush (hw_ctl))) new_cnt =atomic_add_unless (&phys_enc->pending_kickoff_cnt,-1 ,0 );spin_unlock_irqrestore (phys_enc->enc_spinlock, lock_flags);
Signature · 6 lines
2.19.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sasha Levin
maintainerPATCH 166/304 i2c-axxia: check for error conditions first
In reply to Sasha LevinFrom: "Adamski, Krzysztof (Nokia - PL/Wroclaw)" <[email protected]>
[ Upstream commit 4f5c85fe3a60ace555d09898166af372547f97fc ]
It was observed that when using seqentional mode contrary to the documentation, the SS bit (which is supposed to only be set if automatic/sequence command completed normally), is sometimes set together with NA (NAK in address phase) causing transfer to falsely be considered successful.
My assumption is that this does not happen during manual mode since the controller is stopping its work the moment it sets NA/ND bit in status register. This is not the case in Automatic/Sequentional mode where it is still working to send STOP condition and the actual status we get depends on the time when the ISR is run.
This patch changes the order of checking status bits in ISR - error conditions are checked first and only if none of them occurred, the transfer may be considered successful. This is required to introduce using of sequentional mode in next patch.
--- drivers/i2c/busses/i2c-axxia.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-axxia.c +16 -16
@@ -296,22 +296,7 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)i2c_int_disable (idev,MST_STATUS_TFL ); } -if (status &MST_STATUS_SCC ) { -/* Stop completed */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_SNS ) { -/* Transfer done */ -i2c_int_disable (idev, ~MST_STATUS_TSS ); -if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) -axxia_i2c_empty_rx_fifo (idev); -complete (&idev->msg_complete); - }else if (status &MST_STATUS_TSS ) { -/* Transfer timeout */ - idev->msg_err = -ETIMEDOUT ; -i2c_int_disable (idev, ~MST_STATUS_TSS ); -complete (&idev->msg_complete); - }else if (unlikely (status &MST_STATUS_ERR )) { +if (unlikely (status &MST_STATUS_ERR )) {/* Transfer error */ i2c_int_disable (idev, ~0 );if (status &MST_STATUS_AL )
@@ -328,6 +313,21 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)readl (idev->base +MST_TX_BYTES_XFRD ), readl(idev->base + MST_TX_XFER));complete (&idev->msg_complete); + }else if (status &MST_STATUS_SCC ) { +/* Stop completed */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_SNS ) { +/* Transfer done */ +i2c_int_disable (idev, ~MST_STATUS_TSS ); +if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len) +axxia_i2c_empty_rx_fifo (idev); +complete (&idev->msg_complete); + }else if (status &MST_STATUS_TSS ) { +/* Transfer timeout */ + idev->msg_err = -ETIMEDOUT ; +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); } out:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 167/304 lightnvm: Fix uninitialized return value in nvm_get_chunk_meta()
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 55e58c5e78aad9d3246f57e7718cf5ee7adde9e3 ]
With gcc 4.1:
drivers/lightnvm/core.c: In function ?nvm_get_bb_meta?:
drivers/lightnvm/core.c:977: warning: ?ret? may be used uninitialized in this function
and
drivers/nvme/host/lightnvm.c: In function ?nvme_nvm_get_chk_meta?:
drivers/nvme/host/lightnvm.c:580: warning: ?ret? may be used uninitialized in this function
Indeed, if (for the former) the number of channels or LUNs is zero, or (for both) the passed number of chunks is zero, ret will be returned uninitialized.
Fix this by preinitializing ret to zero.
--- drivers/lightnvm/core.c | 2 +- drivers/nvme/host/lightnvm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/lightnvm/core.c +1 -1
@@ -974,7 +974,7 @@ static int nvm_get_bb_meta(struct nvm_dev *dev, sector_t slba,struct ppa_addr ppa;u8 *blks;int ch, lun, nr_blks; -int ret; +int ret =0 ; ppa.ppa = slba; ppa =dev_to_generic_addr (dev, ppa);
drivers/nvme/host/lightnvm.c +2 -1
@@ -577,7 +577,8 @@ static int nvme_nvm_get_chk_meta(struct nvm_dev *ndev,struct ppa_addr ppa;size_t left = nchks *sizeof (struct nvme_nvm_chk_meta );size_t log_pos, offset, len; -int ret, i, max_len; +int i, max_len; +int ret =0 ;/* * limit requests to maximum 256K to avoid issuing arbitrary large
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 172/304 selftests/bpf: use __bpf_constant_htons in test_prog.c
In reply to Sasha LevinFrom: Stanislav Fomichev <sdf at google.com>
[ Upstream commit a0517a0f7ef23550b4484c37e2b9c2d32abebf64 ]
For some reason, my older GCC (< 4.8) isn't smart enough to optimize the !__builtin_constant_p() branch in bpf_htons, I see:
error: implicit declaration of function '__builtin_bswap16'
Let's use __bpf_constant_htons as suggested by Daniel Borkmann.
I tried to use simple htons, but it produces the following:
test_progs.c:54:17: error: braced-group within expression allowed only inside a function
.eth.h_proto = htons(ETH_P_IP),
--- tools/testing/selftests/bpf/test_progs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/bpf/test_progs.c +4 -4
@@ -51,10 +51,10 @@ static struct {struct iphdr iph;struct tcphdr tcp; }__packed pkt_v4 = { - .eth.h_proto =bpf_htons (ETH_P_IP ), + .eth.h_proto =__bpf_constant_htons (ETH_P_IP ), .iph.ihl =5 , .iph.protocol =6 , - .iph.tot_len =bpf_htons (MAGIC_BYTES ), + .iph.tot_len =__bpf_constant_htons (MAGIC_BYTES ), .tcp.urg_ptr =123 , };
@@ -64,9 +64,9 @@ static struct {struct ipv6hdr iph;struct tcphdr tcp; }__packed pkt_v6 = { - .eth.h_proto =bpf_htons (ETH_P_IPV6 ), + .eth.h_proto =__bpf_constant_htons (ETH_P_IPV6 ), .iph.nexthdr =6 , - .iph.payload_len =bpf_htons (MAGIC_BYTES ), + .iph.payload_len =__bpf_constant_htons (MAGIC_BYTES ), .tcp.urg_ptr =123 , };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 176/304 fix dma-buf/udmabuf selftest
In reply to Sasha LevinFrom: Tom Murphy <murphyt7 at tcd.ie>
[ Upstream commit 6edf2e3710f4ef2555ad7a2681dbeb4a69092b2d ]
This patch fixes the udmabuf selftest. Currently the selftest is broken. I fixed the selftest by setting the F_SEAL_SHRINK seal on the memfd file descriptor which is required by udmabuf and added the test to the selftest Makefile.
--- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/drivers/dma-buf/Makefile | 2 ++ tools/testing/selftests/drivers/dma-buf/udmabuf.c | 11 +++++++++-- 3 files changed, 12 insertions(+), 2 deletions(-)
tools/testing/selftests/Makefile +1 -0
@@ -6,6 +6,7 @@ TARGETS += capabilities TARGETS += cgroup TARGETS += cpufreq TARGETS += cpu-hotplug +TARGETS += drivers/dma-buf TARGETS += efivarfs TARGETS += exec TARGETS += filesystems
tools/testing/selftests/drivers/dma-buf/Makefile +2 -0
@@ -2,4 +2,6 @@ CFLAGS += -I../../../../../usr/include/ TEST_GEN_PROGS := udmabuf +top_srcdir ?=../../../../.. + include ../../lib.mk
tools/testing/selftests/drivers/dma-buf/udmabuf.c +9 -2
@@ -4,7 +4,7 @@#include <unistd.h> #include <string.h> #include <errno.h> -#include <fcntl.h> +#include <linux/fcntl.h> #include <malloc.h> #include <sys/ioctl.h>
@@ -33,12 +33,19 @@ int main(int argc, char *argv[])exit (77 ); } - memfd =memfd_create ("udmabuf-test" ,MFD_CLOEXEC ); + memfd =memfd_create ("udmabuf-test" ,MFD_ALLOW_SEALING );if (memfd <0 ) {printf ("%s: [skip,no-memfd]\n" ,TEST_PREFIX );exit (77 ); } + ret =fcntl (memfd,F_ADD_SEALS ,F_SEAL_SHRINK ); +if (ret <0 ) { +printf ("%s: [skip,fcntl-add-seals]\n" ,TEST_PREFIX ); +exit (77 ); + } + + size =getpagesize () *NUM_PAGES ; ret =ftruncate (memfd, size);if (ret ==-1 ) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 177/304 clk: qcom: Leave mmss noc on for 8998
In reply to Sasha LevinFrom: Jeffrey Hugo <[email protected]>
[ Upstream commit 12eced09cd301aa7b1868a67c50a651c2aacd363 ]
Similar to other qcom targets, gcc_mmss_noc_cfg_ahb_clk should not be disabled. Any mmss access depends on this clock, and its been observed that enabling mmssnoc_axi_rpm_clk with rpmcc results in an implicit access to mmss and will crash the system if gcc_mmss_noc_cfg_ahb_clk is disabled.
--- drivers/clk/qcom/gcc-msm8998.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/qcom/gcc-msm8998.c +6 -0
@@ -2042,6 +2042,12 @@ static struct clk_branch gcc_mmss_noc_cfg_ahb_clk = { .hw.init = &(struct clk_init_data){ .name ="gcc_mmss_noc_cfg_ahb_clk" , .ops = &clk_branch2_ops, +/* +* Any access to mmss depends on this clock. +* Gating this clock has been shown to crash the system +* when mmssnoc_axi_rpm_clk is inited in rpmcc. +*/ + .flags =CLK_IS_CRITICAL , }, }, };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 178/304 f2fs: fix to reorder set_page_dirty and wait_on_page_writeback
In reply to Sasha LevinFrom: Chao Yu <[email protected]>
[ Upstream commit 8d64d365aed355b2e2465d19ba61df02462fff4d ]
This patch reorders flow from
- update page
- set_page_dirty
- wait_on_page_writeback
to
- wait_on_page_writeback
- update page
- set_page_dirty
The reason is:
- set_page_dirty will increase reference of dirty page, the reference should be cleared before wait_on_page_writeback to keep its consistency.
- some devices need stable page during page writebacking, so we should not change page's data.
--- fs/f2fs/checkpoint.c | 7 ++++--- fs/f2fs/gc.c | 5 +++-- fs/f2fs/node.c | 5 +++-- fs/f2fs/segment.c | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-)
fs/f2fs/checkpoint.c +4 -3
@@ -1290,11 +1290,12 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,struct page *page =f2fs_grab_meta_page (sbi, blk_addr);int err; -memcpy (page_address (page), src,PAGE_SIZE ); -set_page_dirty (page); -f2fs_wait_on_page_writeback (page,META , true);f2fs_bug_on (sbi,PageWriteback (page)); + +memcpy (page_address (page), src,PAGE_SIZE ); + +set_page_dirty (page);if (unlikely (!clear_page_dirty_for_io (page)))f2fs_bug_on (sbi,1 );
fs/f2fs/gc.c +3 -2
@@ -812,8 +812,8 @@ static int move_data_block(struct inode *inode, block_t bidx, } write_page: -set_page_dirty (fio.encrypted_page);f2fs_wait_on_page_writeback (fio.encrypted_page,DATA , true); +set_page_dirty (fio.encrypted_page);if (clear_page_dirty_for_io (fio.encrypted_page))dec_page_count (fio.sbi,F2FS_DIRTY_META );
@@ -907,8 +907,9 @@ static int move_data_page(struct inode *inode, block_t bidx, int gc_type,bool is_dirty =PageDirty (page); retry: -set_page_dirty (page);f2fs_wait_on_page_writeback (page,DATA , true); + +set_page_dirty (page);if (clear_page_dirty_for_io (page)) {inode_dec_dirty_pages (inode);f2fs_remove_dirty_inode (inode);
fs/f2fs/node.c +3 -2
@@ -1598,10 +1598,11 @@ int f2fs_move_node_page(struct page *node_page, int gc_type) .for_reclaim = 0, }; -set_page_dirty (node_page);f2fs_wait_on_page_writeback (node_page,NODE , true); -f2fs_bug_on (F2FS_P_SB (node_page),PageWriteback (node_page)); + +set_page_dirty (node_page); +if (!clear_page_dirty_for_io (node_page)) { err = -EAGAIN ; goto out_page;
fs/f2fs/segment.c +2 -1
@@ -387,8 +387,9 @@ static int __f2fs_commit_inmem_pages(struct inode *inode)if (page->mapping == inode->i_mapping) {trace_f2fs_commit_inmem_page (page,INMEM ); -set_page_dirty (page);f2fs_wait_on_page_writeback (page,DATA , true); + +set_page_dirty (page);if (clear_page_dirty_for_io (page)) {inode_dec_dirty_pages (inode);f2fs_remove_dirty_inode (inode);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 181/304 KVM: PPC: Book3S: Only report KVM_CAP_SPAPR_TCE_VFIO on powernv machines
In reply to Sasha LevinFrom: Suraj Jitindar Singh <[email protected]>
[ Upstream commit 693ac10a88a2219bde553b2e8460dbec97e594e6 ]
The kvm capability KVM_CAP_SPAPR_TCE_VFIO is used to indicate the availability of in kernel tce acceleration for vfio. However it is currently the case that this is only available on a powernv machine, not for a pseries machine.
Thus make this capability dependent on having the cpu feature CPU_FTR_HVMODE.
[[email protected] - fixed compilation for Book E.]
--- arch/powerpc/kvm/powerpc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kvm/powerpc.c +4 -1
@@ -543,8 +543,11 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)#ifdef CONFIG_PPC_BOOK3S_64 case KVM_CAP_SPAPR_TCE :case KVM_CAP_SPAPR_TCE_64 : -/* fallthrough */ + r =1 ; +break ;case KVM_CAP_SPAPR_TCE_VFIO : + r = !!cpu_has_feature (CPU_FTR_HVMODE ); +break ;case KVM_CAP_PPC_RTAS :case KVM_CAP_PPC_FIXUP_HCALL :case KVM_CAP_PPC_ENABLE_HCALL :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 182/304 mmc: bcm2835: Recover from MMC_SEND_EXT_CSD
In reply to Sasha LevinFrom: Phil Elwell <[email protected]>
[ Upstream commit 07d405769afea5718529fc9e341f0b13b3189b6f ]
If the user issues an "mmc extcsd read", the SD controller receives what it thinks is a SEND_IF_COND command with an unexpected data block. The resulting operations leave the FSM stuck in READWAIT, a state which persists until the MMC framework resets the controller, by which point the root filesystem is likely to have been unmounted.
A less heavyweight solution is to detect the condition and nudge the FSM by asserting the (self-clearing) FORCE_DATA_MODE bit.
--- drivers/mmc/host/bcm2835.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/mmc/host/bcm2835.c +9 -0
@@ -772,6 +772,8 @@ static void bcm2835_finish_command(struct bcm2835_host *host)if (!(sdhsts &SDHSTS_CRC7_ERROR ) || (host->cmd->opcode !=MMC_SEND_OP_COND )) { +u32 edm, fsm; +if (sdhsts &SDHSTS_CMD_TIME_OUT ) { host->cmd->error = -ETIMEDOUT ; }else {
@@ -780,6 +782,13 @@ static void bcm2835_finish_command(struct bcm2835_host *host)bcm2835_dumpregs (host); host->cmd->error = -EILSEQ ; } + edm =readl (host->ioaddr +SDEDM ); + fsm = edm &SDEDM_FSM_MASK ; +if (fsm ==SDEDM_FSM_READWAIT || + fsm ==SDEDM_FSM_WRITESTART1 ) +/* Kick the FSM out of its wait */ +writel (edm |SDEDM_FORCE_DATA_MODE , + host->ioaddr +SDEDM );bcm2835_finish_request (host);return ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 183/304 mmc: bcm2835: reset host on timeout
In reply to Sasha LevinFrom: Michal Suchanek <[email protected]>
[ Upstream commit f6000a4eb34e6462bc0dd39809c1bb99f9633269 ]
The bcm2835 mmc host tends to lock up for unknown reason so reset it on timeout. The upper mmc block layer tries retransimitting with single blocks which tends to work out after a long wait.
This is better than giving up and leaving the machine broken for no obvious reason.
--- drivers/mmc/host/bcm2835.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/mmc/host/bcm2835.c +3 -0
@@ -286,6 +286,7 @@ static void bcm2835_reset(struct mmc_host *mmc)if (host->dma_chan)dmaengine_terminate_sync (host->dma_chan); + host->dma_chan =NULL ;bcm2835_reset_internal (host); }
@@ -846,6 +847,8 @@ static void bcm2835_timeout(struct work_struct *work)dev_err (dev,"timeout waiting for hardware interrupt.\n" );bcm2835_dumpregs (host); +bcm2835_reset (host->mmc); +if (host->data) { host->data->error = -ETIMEDOUT ;bcm2835_finish_data (host);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 184/304 mmc: meson-mx-sdio: check devm_kasprintf for failure
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit b0d06f1cb0e2079a3c64fb6e27c19d9a55c723a1 ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments to init.name are not safe if not checked. On error meson_mx_mmc_register_clks() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/mmc/host/meson-mx-sdio.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/mmc/host/meson-mx-sdio.c +6 -0
@@ -596,6 +596,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) init.name =devm_kasprintf (host->controller_dev,GFP_KERNEL ,"%s#fixed_factor" ,dev_name (host->controller_dev)); +if (!init.name) +return -ENOMEM ; + init.ops = &clk_fixed_factor_ops; init.flags =0 ; init.parent_names = &clk_fixed_factor_parent;
@@ -612,6 +615,9 @@ static int meson_mx_mmc_register_clks(struct meson_mx_mmc_host *host) clk_div_parent =__clk_get_name (host->fixed_factor_clk); init.name =devm_kasprintf (host->controller_dev,GFP_KERNEL ,"%s#div" ,dev_name (host->controller_dev)); +if (!init.name) +return -ENOMEM ; + init.ops = &clk_divider_ops; init.flags =CLK_SET_RATE_PARENT ; init.parent_names = &clk_div_parent;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 186/304 mmc: sdhci-of-esdhc: Fix timeout checks
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit ea6d027312111c6d96309ad1a684b33cb37e6764 ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-of-esdhc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-of-esdhc.c +12 -4
@@ -528,8 +528,12 @@ static void esdhc_clock_enable(struct sdhci_host *host, bool enable)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); val =ESDHC_CLOCK_STABLE ; -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) & val)) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) & val) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));break ;
@@ -594,8 +598,12 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!(sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readl (host,ESDHC_PRSSTAT ) &ESDHC_CLOCK_STABLE ) +break ; +if (timedout) {pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc));return ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 187/304 mmc: sdhci-omap: Fix timeout checks
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit 9f0ea0bda1d06120b053bb0c283f54afec59293d ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-omap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/mmc/host/sdhci-omap.c +12 -4
@@ -220,8 +220,12 @@ static void sdhci_omap_conf_bus_power(struct sdhci_omap_host *omap_host,/* wait 1ms */ timeout =ktime_add_ms (ktime_get (),SDHCI_OMAP_TIMEOUT ); -while (!(sdhci_omap_readl (omap_host,SDHCI_OMAP_HCTL ) &HCTL_SDBP )) { -if (WARN_ON (ktime_after (ktime_get (), timeout))) +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_omap_readl (omap_host,SDHCI_OMAP_HCTL ) &HCTL_SDBP ) +break ; +if (WARN_ON (timedout))return ;usleep_range (5 ,10 ); }
@@ -653,8 +657,12 @@ static void sdhci_omap_init_74_clocks(struct sdhci_host *host, u8 power_mode)/* wait 1ms */ timeout =ktime_add_ms (ktime_get (),SDHCI_OMAP_TIMEOUT ); -while (!(sdhci_omap_readl (omap_host,SDHCI_OMAP_STAT ) &INT_CC_EN )) { -if (WARN_ON (ktime_after (ktime_get (), timeout))) +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_omap_readl (omap_host,SDHCI_OMAP_STAT ) &INT_CC_EN ) +break ; +if (WARN_ON (timedout))return ;usleep_range (5 ,10 ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 188/304 mmc: sdhci-xenon: Fix timeout checks
In reply to Sasha LevinFrom: Adrian Hunter <[email protected]>
[ Upstream commit 0e6e7c2ff397e1bbebc882ca3132148aaaef1ddd ]
Always check the wait condition before returning timeout.
--- drivers/mmc/host/sdhci-xenon-phy.c | 10 +++++++--- drivers/mmc/host/sdhci-xenon.c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-)
drivers/mmc/host/sdhci-xenon-phy.c +7 -3
@@ -357,9 +357,13 @@ static int xenon_emmc_phy_enable_dll(struct sdhci_host *host)/* Wait max 32 ms */ timeout =ktime_add_ms (ktime_get (),32 ); -while (!(sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & -XENON_DLL_LOCK_STATE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + +if (sdhci_readw (host,XENON_SLOT_EXT_PRESENT_STATE ) & +XENON_DLL_LOCK_STATE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Wait for DLL Lock time-out\n" );return -ETIMEDOUT ; }
drivers/mmc/host/sdhci-xenon.c +7 -3
@@ -34,9 +34,13 @@ static int xenon_enable_internal_clk(struct sdhci_host *host)sdhci_writel (host, reg,SDHCI_CLOCK_CONTROL );/* Wait max 20 ms */ timeout =ktime_add_ms (ktime_get (),20 ); -while (!((reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL )) - &SDHCI_CLOCK_INT_STABLE )) { -if (ktime_after (ktime_get (), timeout)) { +while (1 ) { +bool timedout =ktime_after (ktime_get (), timeout); + + reg =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +if (reg &SDHCI_CLOCK_INT_STABLE ) +break ; +if (timedout) {dev_err (mmc_dev (host->mmc),"Internal clock never stabilised.\n" );return -ETIMEDOUT ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 189/304 mmc: jz4740: Get CD/WP GPIOs from descriptors
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 0c901c0566fb4edc2631c3786e5085a037be91f8 ]
Modifty the JZ4740 driver to retrieve card detect and write protect GPIO pins from GPIO descriptors instead of hard-coded global numbers. Augment the only board file using this in the process and cut down on passed in platform data.
Preserve the code setting the caps2 flags for CD and WP as active low or high since the slot GPIO code currently ignores the gpiolib polarity inversion semantice and uses the raw accessors to read the GPIO lines, but set the right polarity flags in the descriptor table for jz4740.
--- .../mips/include/asm/mach-jz4740/jz4740_mmc.h | 2 -- arch/mips/jz4740/board-qi_lb60.c | 12 ++++++++--- drivers/mmc/host/jz4740_mmc.c | 20 +++++++++---------- 3 files changed, 19 insertions(+), 15 deletions(-)
arch/mips/include/asm/mach-jz4740/jz4740_mmc.h +0 -2
@@ -4,8 +4,6 @@struct jz4740_mmc_platform_data {int gpio_power; -int gpio_card_detect; -int gpio_read_only;unsigned card_detect_active_low:1 ;unsigned read_only_active_low:1 ;unsigned power_active_low:1 ;
arch/mips/jz4740/board-qi_lb60.c +9 -3
@@ -43,7 +43,6 @@#include "clock.h" /* GPIOs */ -#define QI_LB60_GPIO_SD_CD JZ_GPIO_PORTD(0)#define QI_LB60_GPIO_SD_VCC_EN_N JZ_GPIO_PORTD(2)#define QI_LB60_GPIO_KEYOUT (x) (JZ_GPIO_PORTC(10) + (x))
@@ -386,12 +385,18 @@ static struct platform_device qi_lb60_gpio_keys = { };static struct jz4740_mmc_platform_data qi_lb60_mmc_pdata = { - .gpio_card_detect =QI_LB60_GPIO_SD_CD , - .gpio_read_only =-1 , .gpio_power =QI_LB60_GPIO_SD_VCC_EN_N , .power_active_low =1 , }; +static struct gpiod_lookup_table qi_lb60_mmc_gpio_table = { + .dev_id ="jz4740-mmc.0" , + .table = { +GPIO_LOOKUP ("GPIOD" ,0 ,"cd" ,GPIO_ACTIVE_HIGH ), + { }, + }, +}; +/* beeper */ static struct pwm_lookup qi_lb60_pwm_lookup[] = { PWM_LOOKUP("jz4740-pwm", 4, "pwm-beeper", NULL, 0,
@@ -500,6 +505,7 @@ static int __init qi_lb60_init_platform_devices(void)gpiod_add_lookup_table (&qi_lb60_audio_gpio_table);gpiod_add_lookup_table (&qi_lb60_nand_gpio_table);gpiod_add_lookup_table (&qi_lb60_spigpio_gpio_table); +gpiod_add_lookup_table (&qi_lb60_mmc_gpio_table);spi_register_board_info (qi_lb60_spi_board_info,ARRAY_SIZE (qi_lb60_spi_board_info));
drivers/mmc/host/jz4740_mmc.c +10 -10
@@ -983,17 +983,17 @@ static int jz4740_mmc_request_gpios(struct mmc_host *mmc,if (!pdata->read_only_active_low) mmc->caps2 |=MMC_CAP2_RO_ACTIVE_HIGH ; -if (gpio_is_valid (pdata->gpio_card_detect)) { - ret =mmc_gpio_request_cd (mmc, pdata->gpio_card_detect,0 ); -if (ret) -return ret; - } +/* +* Get optional card detect and write protect GPIOs, +* only back out on probe deferral. +*/ + ret =mmc_gpiod_request_cd (mmc,"cd" ,0 , false,0 ,NULL ); +if (ret == -EPROBE_DEFER ) +return ret; -if (gpio_is_valid (pdata->gpio_read_only)) { - ret =mmc_gpio_request_ro (mmc, pdata->gpio_read_only); -if (ret) -return ret; - } + ret =mmc_gpiod_request_ro (mmc,"wp" ,0 , false,0 ,NULL ); +if (ret == -EPROBE_DEFER ) +return ret;return jz4740_mmc_request_gpio (&pdev->dev, pdata->gpio_power,"MMC read only" , true, pdata->power_active_low);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 193/304 serial: sh-sci: Fix locking in sci_submit_rx()
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit dd1f2250da95e87cb3e612858f94b14f99445a7c ]
Some callers of sci_submit_rx() hold the port spinlock, others don't. During fallback to PIO, the driver needs to obtain the port spinlock. If the lock was already held, spinlock recursion is detected, causing a
deadlock: BUG: spinlock recursion on CPU#0.
Fix this by adding a flag parameter to sci_submit_rx() for the caller to indicate the port spinlock is already held, so spinlock recursion can be avoided.
Move the spin_lock_irqsave() up, so all DMA disable steps are protected, which is safe as the recently introduced dmaengine_terminate_async() can be called in atomic context.
--- drivers/tty/serial/sh-sci.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/tty/serial/sh-sci.c +9 -7
@@ -1331,7 +1331,7 @@ static void sci_tx_dma_release(struct sci_port *s)dma_release_channel (chan); } -static void sci_submit_rx (struct sci_port *s) +static void sci_submit_rx (struct sci_port *s,bool port_lock_held) {struct dma_chan *chan = s->chan_rx;struct uart_port *port = &s->port;
@@ -1362,16 +1362,18 @@ static void sci_submit_rx(struct sci_port *s)return ; fail: +/* Switch to PIO */ +if (!port_lock_held) +spin_lock_irqsave (&port->lock, flags);if (i)dmaengine_terminate_async (chan);for (i =0 ; i <2 ; i++) s->cookie_rx[i] = -EINVAL ; s->active_rx = -EINVAL ; -/* Switch to PIO */ -spin_lock_irqsave (&port->lock, flags); s->chan_rx =NULL ;sci_start_rx (port); -spin_unlock_irqrestore (&port->lock, flags); +if (!port_lock_held) +spin_unlock_irqrestore (&port->lock, flags); }static void work_fn_tx (struct work_struct *work)
@@ -1491,7 +1493,7 @@ static enum hrtimer_restart rx_timer_fn(struct hrtimer *t) }if (port->type ==PORT_SCIFA || port->type ==PORT_SCIFB ) -sci_submit_rx (s); +sci_submit_rx (s, true);/* Direct new serial port interrupts back to CPU */ scr =serial_port_in (port,SCSCR );
@@ -1617,7 +1619,7 @@ static void sci_request_dma(struct uart_port *port) s->chan_rx_saved = s->chan_rx = chan;if (port->type ==PORT_SCIFA || port->type ==PORT_SCIFB ) -sci_submit_rx (s); +sci_submit_rx (s, false); } }
@@ -1667,7 +1669,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr) scr |=SCSCR_RDRQE ; }else { scr &= ~SCSCR_RIE ; -sci_submit_rx (s); +sci_submit_rx (s, false); }serial_port_out (port,SCSCR , scr);/* Clear current interrupt */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 194/304 serial: sh-sci: Resume PIO in sci_rx_interrupt() on DMA failure
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 71ab1c0336c71ace5725740f200beca9667a339f ]
On (H)SCIF, sci_submit_rx() is called in the receive interrupt handler. Hence if DMA submission fails, the interrupt handler should resume handling reception using PIO, else no more data is received.
Make sci_submit_rx() return an error indicator, so the receive interrupt handler can act appropriately.
--- drivers/tty/serial/sh-sci.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/tty/serial/sh-sci.c +8 -3
@@ -1331,7 +1331,7 @@ static void sci_tx_dma_release(struct sci_port *s)dma_release_channel (chan); } -static void sci_submit_rx (struct sci_port *s,bool port_lock_held) +static int sci_submit_rx (struct sci_port *s,bool port_lock_held) {struct dma_chan *chan = s->chan_rx;struct uart_port *port = &s->port;
@@ -1359,7 +1359,7 @@ static void sci_submit_rx(struct sci_port *s, bool port_lock_held) s->active_rx = s->cookie_rx[0 ];dma_async_issue_pending (chan); -return ; +return 0 ; fail:/* Switch to PIO */
@@ -1374,6 +1374,7 @@ fail:sci_start_rx (port);if (!port_lock_held)spin_unlock_irqrestore (&port->lock, flags); +return -EAGAIN ; }static void work_fn_tx (struct work_struct *work)
@@ -1668,8 +1669,10 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)disable_irq_nosync (irq); scr |=SCSCR_RDRQE ; }else { +if (sci_submit_rx (s, false) <0 ) + goto handle_pio; + scr &= ~SCSCR_RIE ; -sci_submit_rx (s, false); }serial_port_out (port,SCSCR , scr);/* Clear current interrupt */
@@ -1681,6 +1684,8 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)return IRQ_HANDLED ; } + +handle_pio:#endif if (s->rx_trigger >1 && s->rx_fifo_timeout >0 ) {
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 195/304 tty: serial: samsung: Properly set flags in autoCTS mode
In reply to Sasha LevinFrom: Beomho Seo <[email protected]>
[ Upstream commit 31e933645742ee6719d37573a27cce0761dcf92b ]
Commit 391f93f2ec9f ("serial: core: Rework hw-assited flow control support") has changed the way the autoCTS mode is handled.
According to that change, serial drivers which enable H/W autoCTS mode must set UPSTAT_AUTOCTS to prevent the serial core from inadvertently disabling TX. This patch adds proper handling of UPSTAT_AUTOCTS flag.
--- drivers/tty/serial/samsung.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/samsung.c +3 -0
@@ -1365,11 +1365,14 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,wr_regl (port,S3C2410_ULCON , ulcon);wr_regl (port,S3C2410_UBRDIV , quot); + port->status &= ~UPSTAT_AUTOCTS ; + umcon =rd_regl (port,S3C2410_UMCON );if (termios->c_cflag &CRTSCTS ) { umcon |=S3C2410_UMCOM_AFC ;/* Disable RTS when RX FIFO contains 63 bytes */ umcon &= ~S3C2412_UMCON_AFC_8 ; + port->status =UPSTAT_AUTOCTS ; }else { umcon &= ~S3C2410_UMCOM_AFC ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 202/304 i2c: sh_mobile: Add support for r8a774c0 (RZ/G2E)
In reply to Sasha LevinFrom: Fabrizio Castro <[email protected]>
[ Upstream commit 51243b73455f2d12cb82abffa7bc9028aec656e0 ]
Similarly to R-Car E3, RZ/G2E doesn't come with automatic transmission registers, as such it is not considered compatible with the existing fallback bindings.
Add SoC specific binding compatibility to allow for later support for automatic transmission.
--- drivers/i2c/busses/i2c-sh_mobile.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-sh_mobile.c +1 -0
@@ -800,6 +800,7 @@ static const struct sh_mobile_dt_config r8a7740_dt_config = {static const struct of_device_id sh_mobile_i2c_dt_ids[] = { { .compatible ="renesas,iic-r8a73a4" , .data = &fast_clock_dt_config }, { .compatible ="renesas,iic-r8a7740" , .data = &r8a7740_dt_config }, + { .compatible ="renesas,iic-r8a774c0" , .data = &fast_clock_dt_config }, { .compatible ="renesas,iic-r8a7790" , .data = &v2_freq_calc_dt_config }, { .compatible ="renesas,iic-r8a7791" , .data = &fast_clock_dt_config }, { .compatible ="renesas,iic-r8a7792" , .data = &fast_clock_dt_config },
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 204/304 KVM: s390: unregister debug feature on failing arch init
In reply to Sasha LevinFrom: Michael Mueller <[email protected]>
[ Upstream commit 308c3e6673b012beecb96ef04cc65f4a0e7cdd99 ]
Make sure the debug feature and its allocated resources get released upon unsuccessful architecture initialization.
A related indication of the issue will be reported as kernel message.
Message-Id: <[email protected]>
--- arch/s390/kvm/kvm-s390.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/s390/kvm/kvm-s390.c +14 -3
@@ -417,19 +417,30 @@ static void kvm_s390_cpu_feat_init(void)int kvm_arch_init (void *opaque) { +int rc; + kvm_s390_dbf =debug_register ("kvm-trace" ,32 ,1 ,7 *sizeof (long ));if (!kvm_s390_dbf)return -ENOMEM ;if (debug_register_view (kvm_s390_dbf, &debug_sprintf_view)) { -debug_unregister (kvm_s390_dbf); -return -ENOMEM ; + rc = -ENOMEM ; + goto out_debug_unreg; }kvm_s390_cpu_feat_init ();/* Register floating interrupt controller interface. */ -return kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); + rc =kvm_register_device_ops (&kvm_flic_ops,KVM_DEV_TYPE_FLIC ); +if (rc) { +pr_err ("Failed to register FLIC rc=%d\n" , rc); + goto out_debug_unreg; + } +return 0 ; + +out_debug_unreg: +debug_unregister (kvm_s390_dbf); +return rc; }void kvm_arch_exit (void )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 206/304 pinctrl: rza1: Handle devm_kasprintf() failure cases
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit db221412cd2014506642967155698825ad80f6b6 ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments are not safe if not checked. On error rza1_pinctrl_register() respectively rza1_parse_gpiochip() return negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/pinctrl/pinctrl-rza1.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/pinctrl/pinctrl-rza1.c +5 -0
@@ -1225,6 +1225,9 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl, chip->base =-1 ; chip->label =devm_kasprintf (rza1_pctl->dev,GFP_KERNEL ,"%pOFn" , np); +if (!chip->label) +return -ENOMEM ; + chip->ngpio = of_args.args[2 ]; chip->of_node = np; chip->parent = rza1_pctl->dev;
@@ -1326,6 +1329,8 @@ static int rza1_pinctrl_register(struct rza1_pinctrl *rza1_pctl) pins[i].number = i; pins[i].name =devm_kasprintf (rza1_pctl->dev,GFP_KERNEL ,"P%u-%u" , port, pin); +if (!pins[i].name) +return -ENOMEM ;if (i %RZA1_PINS_PER_PORT ==0 ) {/*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 209/304 arm64: KVM: Skip MMIO insn after emulation
In reply to Sasha LevinFrom: Mark Rutland <[email protected]>
[ Upstream commit 0d640732dbebed0f10f18526de21652931f0b2f2 ]
When we emulate an MMIO instruction, we advance the CPU state within decode_hsr(), before emulating the instruction effects.
Having this logic in decode_hsr() is opaque, and advancing the state before emulation is problematic. It gets in the way of applying consistent single-step logic, and it prevents us from being able to fail an MMIO instruction with a synchronous exception.
Clean this up by only advancing the CPU state *after* the effects of the instruction are emulated.
--- virt/kvm/arm/mmio.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
virt/kvm/arm/mmio.c +6 -5
@@ -117,6 +117,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)vcpu_set_reg (vcpu, vcpu->arch.mmio_decode.rt, data); } +/* +* The MMIO instruction is emulated and should not be re-executed +* in the guest. +*/ +kvm_skip_instr (vcpu,kvm_vcpu_trap_il_is32bit (vcpu)); +return 0 ; }
@@ -144,11 +150,6 @@ static int decode_hsr(struct kvm_vcpu *vcpu, bool *is_write, int *len) vcpu->arch.mmio_decode.sign_extend = sign_extend; vcpu->arch.mmio_decode.rt = rt; -/* -* The MMIO instruction is emulated and should not be re-executed -* in the guest. -*/ -kvm_skip_instr (vcpu,kvm_vcpu_trap_il_is32bit (vcpu));return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 218/304 drm/amd/display: Add retry to read ddc_clock pin
In reply to Sasha LevinFrom: Paul Hsieh <[email protected]>
[ Upstream commit bd4905a9583c760da31ded7256dca6f71483c3dc ]
[WHY]
On customer board, there is one pluse (1v , < 1ms) on DDC_CLK pin when plug / unplug DP cable. Driver will read it and config DP to HDMI/DVI dongle.
[HOW]
If there is a real dongle, DDC_CLK should be always pull high. Try to read again to recovery this special case. Retry times = 3. Need additional 3ms to detect DP passive dongle(3 failures)
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +17 -6
@@ -332,7 +332,7 @@ bool dc_link_is_dp_sink_present(struct dc_link *link) {enum gpio_result gpio_result;uint32_t clock_pin =0 ; - +uint8_t retry =0 ;struct ddc *ddc; enum connector_id connector_id =
@@ -361,11 +361,22 @@ bool dc_link_is_dp_sink_present(struct dc_link *link)return present; } -/* Read GPIO: DP sink is present if both clock and data pins are zero */ -/* [anaumov] in DAL2, there was no check for GPIO failure */ - - gpio_result =dal_gpio_get_value (ddc->pin_clock, &clock_pin); -ASSERT (gpio_result ==GPIO_RESULT_OK ); +/* +* Read GPIO: DP sink is present if both clock and data pins are zero +* +* [W/A] plug-unplug DP cable, sometimes customer board has +* one short pulse on clk_pin(1V, < 1ms). DP will be config to HDMI/DVI +* then monitor can't br light up. Add retry 3 times +* But in real passive dongle, it need additional 3ms to detect +*/ +do { + gpio_result =dal_gpio_get_value (ddc->pin_clock, &clock_pin); +ASSERT (gpio_result ==GPIO_RESULT_OK ); +if (clock_pin) +udelay (1000 ); +else +break ; + }while (retry++ <3 ); present = (gpio_result ==GPIO_RESULT_OK ) && !clock_pin;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 219/304 drm/amd/display: Wait edp HPD to high in detect_sink
In reply to Sasha LevinFrom: Dale Zhao <[email protected]>
[ Upstream commit 0a6414e75d231ee1bb7ffb2f5eb246b682a884cd ]
[Why]
In 99% user case, edp will be post by vbios.
In 1% / current case: Lenovo don't light up edp panel in vbios post stage, vbios won't be lit up. Thus in dal when we init DCN 10 hw, we power up edp, then we start detect_sink, but internal time is too short, when we detect it, HPD is still low, so we don't detect the edp, and edp shows black.
[How]
When we init hw, we wait edp HPD to high after power up edp.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +3 -0
@@ -208,6 +208,9 @@ bool dc_link_detect_sink(struct dc_link *link, enum dc_connection_type *type)return true; } +if (link->connector_signal ==SIGNAL_TYPE_EDP ) + link->dc->hwss.edp_wait_for_hpd_ready (link, true); +/* todo: may need to lock gpio access */ hpd_pin =get_hpd_gpio (link->ctx->dc_bios, link->link_id, link->ctx->gpio_service);if (hpd_pin ==NULL )
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 221/304 drm/amd/display: fix YCbCr420 blank color
In reply to Sasha LevinFrom: Eric Yang <[email protected]>
[ Upstream commit 12750d1647f118496f1da727146f255f5e44d500 ]
[Why]
YCbCr420 packing format uses two chanels for luma, and 1 channel for both chroma component. Our previous implementation did not account for this and results in every other pixel having very high luma value, showing greyish color instead of black.
YCbCr444 = <Y1, Cb1, Cr1>; <Y2, Cb2, Cr2> .....
YCbCr420 = <Y1, Y2, Cb1>; <Y3, Y4, Cr1> .....
[How]
Program the second channel with the black color value for luma as well.
--- .../drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 11 ++++++++++- .../gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +10 -1
@@ -1268,10 +1268,19 @@ static void program_scaler(const struct dc *dc, pipe_ctx->plane_res.scl_data.lb_params.depth, &pipe_ctx->stream->bit_depth_params); -if (pipe_ctx->stream_res.tg->funcs->set_overscan_blank_color) +if (pipe_ctx->stream_res.tg->funcs->set_overscan_blank_color) { +/* +* The way 420 is packed, 2 channels carry Y component, 1 channel +* alternate between Cb and Cr, so both channels need the pixel +* value for Y +*/ +if (pipe_ctx->stream->timing.pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) + color.color_r_cr = color.color_g_y; + pipe_ctx->stream_res.tg->funcs->set_overscan_blank_color ( pipe_ctx->stream_res.tg, &color); + } pipe_ctx->plane_res.xfm->funcs->transform_set_scaler (pipe_ctx->plane_res.xfm, &pipe_ctx->plane_res.scl_data);
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +9 -0
@@ -2165,6 +2165,15 @@ static void dcn10_blank_pixel_data( color_space = stream->output_color_space;color_space_to_black_color (dc, color_space, &black_color); +/* +* The way 420 is packed, 2 channels carry Y component, 1 channel +* alternate between Cb and Cr, so both channels need the pixel +* value for Y +*/ +if (stream->timing.pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) + black_color.color_r_cr = black_color.color_g_y; + +if (stream_res->tg->funcs->set_blank_color) stream_res->tg->funcs->set_blank_color( stream_res->tg,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 226/304 scsi: smartpqi: correct host serial num for ssa
In reply to Sasha LevinFrom: Mahesh Rajashekhara <[email protected]>
[ Upstream commit b2346b5030cf9458f30a84028d9fe904b8c942a7 ]
--- drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +3 -0
@@ -640,6 +640,7 @@ struct bmic_host_wellness_driver_version {u8 driver_version_tag[2 ];__le16 driver_version_length;char driver_version[32 ]; +u8 dont_write_tag[2 ];u8 end_tag[2 ]; };
@@ -669,6 +670,8 @@ static int pqi_write_driver_version_to_host_wellness(strncpy (buffer->driver_version,"Linux " DRIVER_VERSION ,sizeof (buffer->driver_version) -1 ); buffer->driver_version[sizeof (buffer->driver_version) -1 ] ='\0' ; + buffer->dont_write_tag[0 ] ='D' ; + buffer->dont_write_tag[1 ] ='W' ; buffer->end_tag[0 ] ='Z' ; buffer->end_tag[1 ] ='Z' ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 227/304 scsi: smartpqi: correct volume status
In reply to Sasha LevinFrom: Dave Carroll <[email protected]>
[ Upstream commit 7ff44499bafbd376115f0bb6b578d980f56ee13b ]
- fix race condition when a unit is deleted after an RLL, and before we have gotten the LV_STATUS page of the unit.
- In this case we will get a standard inquiry, rather than the desired page. This will result in a unit presented which no longer exists.
- If we ask for LV_STATUS, insure we get LV_STATUS
--- drivers/scsi/smartpqi/smartpqi_init.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/smartpqi/smartpqi_init.c +3 -0
@@ -1168,6 +1168,9 @@ static void pqi_get_volume_status(struct pqi_ctrl_info *ctrl_info,if (rc) goto out; +if (vpd->page_code !=CISS_VPD_LV_STATUS ) + goto out; + page_length = offsetof(struct ciss_vpd_logical_volume_status , volume_status) + vpd->page_length;if (page_length <sizeof (*vpd))
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 228/304 scsi: smartpqi: increase fw status register read timeout
In reply to Sasha LevinFrom: Mahesh Rajashekhara <[email protected]>
[ Upstream commit 65111785acccb836ec75263b03b0e33f21e74f47 ]
Problem:
- during the driver initialization, driver will poll fw for KERNEL_UP in a 30 seconds timeout.
- if the firmware is not ready after 30 seconds,
driver will not be loaded.
Fix:
- change timeout from 30 seconds to 3 minutes.
--- drivers/scsi/smartpqi/smartpqi_sis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_sis.c +1 -1
@@ -59,7 +59,7 @@#define SIS_CTRL_KERNEL_UP 0x80#define SIS_CTRL_KERNEL_PANIC 0x100 -#define SIS_CTRL_READY_TIMEOUT_SECS 30 +#define SIS_CTRL_READY_TIMEOUT_SECS 180#define SIS_CTRL_READY_RESUME_TIMEOUT_SECS 90#define SIS_CTRL_READY_POLL_INTERVAL_MSECS 10
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 236/304 mlx5: update timecounter at least twice per counter overflow
In reply to Sasha LevinFrom: Miroslav Lichvar <[email protected]>
[ Upstream commit 5d8678365c90b9ce1fd2243ff5ea562609f6cec1 ]
The timecounter needs to be updated at least once in half of the cyclecounter interval to prevent timecounter_cyc2time() interpreting a new timestamp as an old value and causing a backward jump.
This would be an issue if the timecounter multiplier was so small that the update interval would not be limited by the 64-bit overflow in multiplication.
Shorten the calculated interval to make sure the timecounter is updated in time even when the system clock is slowed down by up to 10%, the multiplier is increased by up to 10%, and the scheduled overflow check is late by 15%.
--- drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +2 -2
@@ -511,14 +511,14 @@ void mlx5_init_clock(struct mlx5_core_dev *mdev) ktime_to_ns(ktime_get_real()));/* Calculate period in seconds to call the overflow watchdog - to make -* sure counter is checked at least once every wrap around. +* sure counter is checked at least twice every wrap around. * The period is calculated as the minimum between max HW cycles count * (The clock source mask) and max amount of cycles that can be * multiplied by clock multiplier where the result doesn't exceed * 64bits. */ overflow_cycles =div64_u64 (~0ULL >>1 , clock->cycles.mult); - overflow_cycles =min (overflow_cycles, clock->cycles.mask >>1 ); + overflow_cycles =min (overflow_cycles,div_u64 (clock->cycles.mask,3 )); ns =cyclecounter_cyc2ns (&clock->cycles, overflow_cycles, frac, &frac);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 243/304 drm/amd/display: validate extended dongle caps
In reply to Sasha LevinFrom: Wenjing Liu <[email protected]>
[ Upstream commit 99b922f9ed6a6313c0d2247cde8aa1e4a0bd67e4 ]
[why]
Some dongle doesn't have a valid extended dongle caps, but we still set the extended dongle caps to be valid. This causes validation fails for all timing.
[how]
If no dp_hdmi_max_pixel_clk is provided,
don't use extended dongle caps.
--- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +2 -1
@@ -2240,7 +2240,8 @@ static void get_active_converter_info(translate_dpcd_max_bpc ( hdmi_color_caps.bits.MAX_BITS_PER_COLOR_COMPONENT); - link->dpcd_caps.dongle_caps.extendedCapValid = true; +if (link->dpcd_caps.dongle_caps.dp_hdmi_max_pixel_clk !=0 ) + link->dpcd_caps.dongle_caps.extendedCapValid = true; }break ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 244/304 video: clps711x-fb: release disp device node in probe()
In reply to Sasha LevinFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit fdac751355cd76e049f628afe6acb8ff4b1399f7 ]
clps711x_fb_probe() increments refcnt of disp device node by of_parse_phandle() and leaves it undecremented on both successful and error paths.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/video/fbdev/clps711x-fb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/video/fbdev/clps711x-fb.c +4 -1
@@ -287,14 +287,17 @@ static int clps711x_fb_probe(struct platform_device *pdev) } ret =of_get_fb_videomode (disp, &cfb->mode,OF_USE_NATIVE_MODE ); -if (ret) +if (ret) { +of_node_put (disp); goto out_fb_release; + }of_property_read_u32 (disp,"ac-prescale" , &cfb->ac_prescale); cfb->cmap_invert =of_property_read_bool (disp,"cmap-invert" ); ret =of_property_read_u32 (disp,"bits-per-pixel" , &info->var.bits_per_pixel); +of_node_put (disp);if (ret) goto out_fb_release;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 245/304 md: fix raid10 hang issue caused by barrier
In reply to Sasha LevinFrom: Guoqing Jiang <[email protected]>
[ Upstream commit e820d55cb99dd93ac2dc949cf486bb187e5cd70d ]
When both regular IO and resync IO happen at the same time, and if we also need to split regular. Then we can see tasks hang due to barrier.
1. resync thread
[ 1463.757205] INFO: task md1_resync:5215 blocked for more than 480 seconds. [ 1463.757207] Not tainted 4.19.5-1-default #1 [ 1463.757209] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1463.757212] md1_resync D 0 5215 2 0x80000000 [ 1463.757216] Call Trace: [ 1463.757223] ? __schedule+0x29a/0x880 [ 1463.757231] ? raise_barrier+0x8d/0x140 [raid10] [ 1463.757236] schedule+0x78/0x110 [ 1463.757243] raise_barrier+0x8d/0x140 [raid10] [ 1463.757248] ? wait_woken+0x80/0x80 [ 1463.757257] raid10_sync_request+0x1f6/0x1e30 [raid10] [ 1463.757265] ? _raw_spin_unlock_irq+0x22/0x40 [ 1463.757284] ? is_mddev_idle+0x125/0x137 [md_mod] [ 1463.757302] md_do_sync.cold.78+0x404/0x969 [md_mod] [ 1463.757311] ? wait_woken+0x80/0x80 [ 1463.757336] ? md_rdev_init+0xb0/0xb0 [md_mod] [ 1463.757351] md_thread+0xe9/0x140 [md_mod] [ 1463.757358] ? _raw_spin_unlock_irqrestore+0x2e/0x60 [ 1463.757364] ? __kthread_parkme+0x4c/0x70 [ 1463.757369] kthread+0x112/0x130 [ 1463.757374] ? kthread_create_worker_on_cpu+0x40/0x40 [ 1463.757380] ret_from_fork+0x3a/0x50
2. regular IO
[ 1463.760679] INFO: task kworker/0:8:5367 blocked for more than 480 seconds. [ 1463.760683] Not tainted 4.19.5-1-default #1 [ 1463.760684] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1463.760687] kworker/0:8 D 0 5367 2 0x80000000 [ 1463.760718] Workqueue: md submit_flushes [md_mod] [ 1463.760721] Call Trace: [ 1463.760731] ? __schedule+0x29a/0x880 [ 1463.760741] ? wait_barrier+0xdd/0x170 [raid10] [ 1463.760746] schedule+0x78/0x110 [ 1463.760753] wait_barrier+0xdd/0x170 [raid10] [ 1463.760761] ? wait_woken+0x80/0x80 [ 1463.760768] raid10_write_request+0xf2/0x900 [raid10] [ 1463.760774] ? wait_woken+0x80/0x80 [ 1463.760778] ? mempool_alloc+0x55/0x160 [ 1463.760795] ? md_write_start+0xa9/0x270 [md_mod] [ 1463.760801] ? try_to_wake_up+0x44/0x470 [ 1463.760810] raid10_make_request+0xc1/0x120 [raid10] [ 1463.760816] ? wait_woken+0x80/0x80 [ 1463.760831] md_handle_request+0x121/0x190 [md_mod] [ 1463.760851] md_make_request+0x78/0x190 [md_mod] [ 1463.760860] generic_make_request+0x1c6/0x470 [ 1463.760870] raid10_write_request+0x77a/0x900 [raid10] [ 1463.760875] ? wait_woken+0x80/0x80 [ 1463.760879] ? mempool_alloc+0x55/0x160 [ 1463.760895] ? md_write_start+0xa9/0x270 [md_mod] [ 1463.760904] raid10_make_request+0xc1/0x120 [raid10] [ 1463.760910] ? wait_woken+0x80/0x80 [ 1463.760926] md_handle_request+0x121/0x190 [md_mod] [ 1463.760931] ? _raw_spin_unlock_irq+0x22/0x40 [ 1463.760936] ? finish_task_switch+0x74/0x260 [ 1463.760954] submit_flushes+0x21/0x40 [md_mod]
So resync io is waiting for regular write io to complete to decrease nr_pending (conf->barrier++ is called before waiting). The regular write io splits another bio after call wait_barrier which call nr_pending++, then the splitted bio would continue with raid10_write_request -> wait_barrier, so the splitted bio has to wait for barrier to be zero, then deadlock happens as follows.
resync io regular io
raise_barrier
wait_barrier generic_make_request wait_barrier
To resolve the issue, we need to call allow_barrier to decrease nr_pending before generic_make_request since regular IO is not issued to underlying devices, and wait_barrier is called again to ensure no internal IO happening.
--- drivers/md/raid10.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/md/raid10.c +4 -0
@@ -1209,7 +1209,9 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,struct bio *split =bio_split (bio, max_sectors, gfp, &conf->bio_split);bio_chain (split, bio); +allow_barrier (conf);generic_make_request (bio); +wait_barrier (conf); bio = split; r10_bio->master_bio = bio; r10_bio->sectors = max_sectors;
@@ -1514,7 +1516,9 @@ retry_write:struct bio *split =bio_split (bio, r10_bio->sectors,GFP_NOIO , &conf->bio_split);bio_chain (split, bio); +allow_barrier (conf);generic_make_request (bio); +wait_barrier (conf); bio = split; r10_bio->master_bio = bio; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 246/304 fbdev: fbmem: behave better with small rotated displays and many CPUs
In reply to Sasha LevinFrom: Peter Rosin <[email protected]>
[ Upstream commit f75df8d4b4fabfad7e3cba2debfad12741c6fde7 ]
Blitting an image with "negative" offsets is not working since there is no clipping. It hopefully just crashes. For the bootup logo, there is protection so that blitting does not happen as the image is drawn further and further to the right (ROTATE_UR) or further and further down (ROTATE_CW). There is however no protection when drawing in the opposite directions (ROTATE_UD and ROTATE_CCW).
Add back this protection.
The regression is 20-odd years old but the mindless warning-killing mentality displayed in commit 34bdb666f4b2 ("fbdev: fbmem: remove positive test on unsigned values") is also to blame, methinks.
--- drivers/video/fbdev/core/fbmem.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/video/fbdev/core/fbmem.c +6 -2
@@ -436,7 +436,9 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dx += image->width +8 ; } }else if (rotate =FB_ROTATE_UD ) { -for (x =0 ; x < num; x++) { +u32 dx = image->dx; + +for (x =0 ; x < num && image->dx <= dx; x++) { info->fbops->fb_imageblit (info, image); image->dx -= image->width +8 ; }
@@ -448,7 +450,9 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image, image->dy += image->height +8 ; } }else if (rotate =FB_ROTATE_CCW ) { -for (x =0 ; x < num; x++) { +u32 dy = image->dy; + +for (x =0 ; x < num && image->dy <= dy; x++) { info->fbops->fb_imageblit (info, image); image->dy -= image->height +8 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 250/304 ACPI/APEI: Clear GHES block_status before panic()
In reply to Sasha LevinFrom: Lenny Szubowicz <[email protected]>
[ Upstream commit 98cff8b23ed1c763a029ee81ea300df0d153d07d ]
In __ghes_panic() clear the block status in the APEI generic error status block for that generic hardware error source before calling panic() to prevent a second panic() in the crash kernel for exactly the same fatal error.
Otherwise ghes_probe(), running in the crash kernel, would see an unhandled error in the APEI generic error status block and panic again, thereby precluding any crash dump.
--- drivers/acpi/apei/ghes.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/acpi/apei/ghes.c +2 -0
@@ -691,6 +691,8 @@ static void __ghes_panic(struct ghes *ghes) {__ghes_print_estatus (KERN_EMERG , ghes->generic, ghes->estatus); +ghes_clear_estatus (ghes); +/* reboot to log the error! */ if (!panic_timeout) panic_timeout = ghes_panic_timeout;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 251/304 fbdev: fbcon: Fix unregister crash when more than one framebuffer
In reply to Sasha LevinFrom: Noralf Trønnes <[email protected]>
[ Upstream commit 2122b40580dd9d0620398739c773d07a7b7939d0 ]
When unregistering fbdev using unregister_framebuffer(), any bound console will unbind automatically. This is working fine if this is the only framebuffer, resulting in a switch to the dummy console. However if there is a fb0 and I unregister fb1 having a bound console, I eventually get a crash. The fastest way for me to trigger the crash is to do a reboot, resulting in this splat:
[ 76.478825] WARNING: CPU: 0 PID: 527 at linux/kernel/workqueue.c:1442 __queue_work+0x2d4/0x41c [ 76.478849] Modules linked in: raspberrypi_hwmon gpio_backlight backlight bcm2835_rng rng_core [last unloaded: tinydrm] [ 76.478916] CPU: 0 PID: 527 Comm: systemd-udevd Not tainted 4.20.0-rc4+ #4 [ 76.478933] Hardware name: BCM2835 [ 76.478949] Backtrace: [ 76.478995] [<c010d388>] (dump_backtrace) from [<c010d670>] (show_stack+0x20/0x24) [ 76.479022] r6:00000000 r5:c0bc73be r4:00000000 r3:6fb5bf81 [ 76.479060] [<c010d650>] (show_stack) from [<c08e82f4>] (dump_stack+0x20/0x28) [ 76.479102] [<c08e82d4>] (dump_stack) from [<c0120070>] (__warn+0xec/0x12c) [ 76.479134] [<c011ff84>] (__warn) from [<c01201e4>] (warn_slowpath_null+0x4c/0x58) [ 76.479165] r9:c0eb6944 r8:00000001 r7:c0e927f8 r6:c0bc73be r5:000005a2 r4:c0139e84 [ 76.479197] [<c0120198>] (warn_slowpath_null) from [<c0139e84>] (__queue_work+0x2d4/0x41c) [ 76.479222] r6:d7666a00 r5:c0e918ee r4:dbc4e700 [ 76.479251] [<c0139bb0>] (__queue_work) from [<c013a02c>] (queue_work_on+0x60/0x88) [ 76.479281] r10:c0496bf8 r9:00000100 r8:c0e92ae0 r7:00000001 r6:d9403700 r5:d7666a00 [ 76.479298] r4:20000113 [ 76.479348] [<c0139fcc>] (queue_work_on) from [<c0496c28>] (cursor_timer_handler+0x30/0x54) [ 76.479374] r7:d8a8fabc r6:c0e08088 r5:d8afdc5c r4:d8a8fabc [ 76.479413] [<c0496bf8>] (cursor_timer_handler) from [<c0178744>] (call_timer_fn+0x100/0x230) [ 76.479435] r4:c0e9192f r3:d758a340 [ 76.479465] [<c0178644>] (call_timer_fn) from [<c0178980>] (expire_timers+0x10c/0x12c) [ 76.479495] r10:40000000 r9:c0e9192f r8:c0e92ae0 r7:d8afdccc r6:c0e19280 r5:c0496bf8 [ 76.479513] r4:d8a8fabc [ 76.479541] [<c0178874>] (expire_timers) from [<c0179630>] (run_timer_softirq+0xa8/0x184) [ 76.479570] r9:00000001 r8:c0e19280 r7:00000000 r6:c0e08088 r5:c0e1a3e0 r4:c0e19280 [ 76.479603] [<c0179588>] (run_timer_softirq) from [<c0102404>] (__do_softirq+0x1ac/0x3fc) [ 76.479632] r10:c0e91680 r9:d8afc020 r8:0000000a r7:00000100 r6:00000001 r5:00000002 [ 76.479650] r4:c0eb65ec [ 76.479686] [<c0102258>] (__do_softirq) from [<c0124d10>] (irq_exit+0xe8/0x168) [ 76.479716] r10:d8d1a9b0 r9:d8afc000 r8:00000001 r7:d949c000 r6:00000000 r5:c0e8b3f0 [ 76.479734] r4:00000000 [ 76.479764] [<c0124c28>] (irq_exit) from [<c016b72c>] (__handle_domain_irq+0x94/0xb0) [ 76.479793] [<c016b698>] (__handle_domain_irq) from [<c01021dc>] (bcm2835_handle_irq+0x3c/0x48) [ 76.479823] r8:d8afdebc r7:d8afddfc r6:ffffffff r5:c0e089f8 r4:d8afddc8 r3:d8afddc8 [ 76.479851] [<c01021a0>] (bcm2835_handle_irq) from [<c01019f0>] (__irq_svc+0x70/0x98)
The problem is in the console rebinding in fbcon_fb_unbind(). It uses the virtual console index as the new framebuffer index to bind the console(s) to. The correct way is to use the con2fb_map lookup table to find the framebuffer index.
--- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/core/fbcon.c +1 -1
@@ -3064,7 +3064,7 @@ static int fbcon_fb_unbind(int idx)for (i = first_fb_vc; i <= last_fb_vc; i++) {if (con2fb_map[i] != idx && con2fb_map[i] !=-1 ) { - new_idx = i; + new_idx = con2fb_map[i];break ; } }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 255/304 pinctrl: meson: meson8: fix the GPIO function for the GPIOAO pins
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 42f9b48cc5402be11d2364275eb18c257d2a79e8 ]
The GPIOAO pins (as well as the two exotic GPIO_BSD_EN and GPIO_TEST_N) only belong to the pin controller in the AO domain. With the current definition these pins cannot be referred to in .dts files as group (which is possible on GXBB and GXL for example).
Add a separate "gpio_aobus" function to fix the mapping between the pin controller and the GPIO pins in the AO domain. This is similar to how the GXBB and GXL drivers implement this functionality.
--- drivers/pinctrl/meson/pinctrl-meson8.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pinctrl/meson/pinctrl-meson8.c +3 -0
@@ -807,7 +807,9 @@ static const char * const gpio_groups[] = {"BOOT_5" ,"BOOT_6" ,"BOOT_7" ,"BOOT_8" ,"BOOT_9" ,"BOOT_10" ,"BOOT_11" ,"BOOT_12" ,"BOOT_13" ,"BOOT_14" , "BOOT_15", "BOOT_16", "BOOT_17", "BOOT_18", +}; +static const char *const gpio_aobus_groups[] = {"GPIOAO_0" ,"GPIOAO_1" ,"GPIOAO_2" ,"GPIOAO_3" ,"GPIOAO_4" ,"GPIOAO_5" ,"GPIOAO_6" ,"GPIOAO_7" , "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11",
@@ -1030,6 +1032,7 @@ static struct meson_pmx_func meson8_cbus_functions[] = { };static struct meson_pmx_func meson8_aobus_functions[] = { +FUNCTION (gpio_aobus),FUNCTION (uart_ao),FUNCTION (remote),FUNCTION (i2c_slave_ao),
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 256/304 pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 2b745ac3cceb8fc1d9985990c8241a821ea97e53 ]
The GPIOAO pins (as well as the two exotic GPIO_BSD_EN and GPIO_TEST_N) only belong to the pin controller in the AO domain. With the current definition these pins cannot be referred to in .dts files as group (which is possible on GXBB and GXL for example).
Add a separate "gpio_aobus" function to fix the mapping between the pin controller and the GPIO pins in the AO domain. This is similar to how the GXBB and GXL drivers implement this functionality.
--- drivers/pinctrl/meson/pinctrl-meson8b.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/pinctrl/meson/pinctrl-meson8b.c +8 -5
@@ -646,16 +646,18 @@ static const char * const gpio_groups[] = {"BOOT_10" ,"BOOT_11" ,"BOOT_12" ,"BOOT_13" ,"BOOT_14" ,"BOOT_15" ,"BOOT_16" ,"BOOT_17" ,"BOOT_18" , -"GPIOAO_0" ,"GPIOAO_1" ,"GPIOAO_2" ,"GPIOAO_3" , -"GPIOAO_4" ,"GPIOAO_5" ,"GPIOAO_6" ,"GPIOAO_7" , -"GPIOAO_8" ,"GPIOAO_9" ,"GPIOAO_10" ,"GPIOAO_11" , -"GPIOAO_12" ,"GPIOAO_13" ,"GPIO_BSD_EN" ,"GPIO_TEST_N" , -"DIF_0_P" ,"DIF_0_N" ,"DIF_1_P" ,"DIF_1_N" ,"DIF_2_P" ,"DIF_2_N" ,"DIF_3_P" ,"DIF_3_N" ,"DIF_4_P" ,"DIF_4_N" }; +static const char *const gpio_aobus_groups[] = { +"GPIOAO_0" ,"GPIOAO_1" ,"GPIOAO_2" ,"GPIOAO_3" , +"GPIOAO_4" ,"GPIOAO_5" ,"GPIOAO_6" ,"GPIOAO_7" , +"GPIOAO_8" ,"GPIOAO_9" ,"GPIOAO_10" ,"GPIOAO_11" , +"GPIOAO_12" ,"GPIOAO_13" ,"GPIO_BSD_EN" ,"GPIO_TEST_N" +}; +static const char *const sd_a_groups[] = {"sd_d0_a" ,"sd_d1_a" ,"sd_d2_a" ,"sd_d3_a" ,"sd_clk_a" , "sd_cmd_a"
@@ -871,6 +873,7 @@ static struct meson_pmx_func meson8b_cbus_functions[] = { };static struct meson_pmx_func meson8b_aobus_functions[] = { +FUNCTION (gpio_aobus),FUNCTION (uart_ao),FUNCTION (uart_ao_b),FUNCTION (i2c_slave_ao),
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 257/304 KVM: x86: svm: report MSR_IA32_MCG_EXT_CTL as unsupported
In reply to Sasha LevinFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit e87555e550cef4941579cd879759a7c0dee24e68 ]
AMD doesn't seem to implement MSR_IA32_MCG_EXT_CTL and svm code in kvm knows nothing about it, however, this MSR is among emulated_msrs and thus returned with KVM_GET_MSR_INDEX_LIST. The consequent KVM_GET_MSRS, of course, fails.
Report the MSR as unsupported to not confuse userspace.
--- arch/x86/kvm/svm.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kvm/svm.c +7 -0
@@ -5836,6 +5836,13 @@ static bool svm_cpu_has_accelerated_tpr(void)static bool svm_has_emulated_msr (int index) { +switch (index) { +case MSR_IA32_MCG_EXT_CTL : +return false; +default : +break ; + } +return true; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 259/304 selftests: kvm: report failed stage when exit reason is unexpected
In reply to Sasha LevinFrom: Vitaly Kuznetsov <[email protected]>
[ Upstream commit b85c32dd27495075380350fcd5d614a6b45311b8 ]
When we get a report like
==== Test Assertion Failure ====
x86_64/state_test.c:157: run->exit_reason == KVM_EXIT_IO pid=955 tid=955 - Success
1 0x0000000000401350: main at state_test.c:154
2 0x00007fc31c9e9412: ?? ??:0
3 0x000000000040159d: _start at ??:?Unexpected exit reason: 8 (SHUTDOWN),
it is not obvious which particular stage failed. Add the info.
--- tools/testing/selftests/kvm/x86_64/evmcs_test.c | 4 ++-- tools/testing/selftests/kvm/x86_64/state_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/testing/selftests/kvm/x86_64/evmcs_test.c +2 -2
@@ -113,8 +113,8 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {_vcpu_run (vm,VCPU_ID );TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, +"Stage %d: unexpected exit reason: %u (%s),\n" , + stage, run->exit_reason,exit_reason_str (run->exit_reason));memset (®s1,0 ,sizeof (regs1));
tools/testing/selftests/kvm/x86_64/state_test.c +2 -2
@@ -152,8 +152,8 @@ int main(int argc, char *argv[])for (stage =1 ;; stage++) {_vcpu_run (vm,VCPU_ID );TEST_ASSERT (run->exit_reason ==KVM_EXIT_IO , -"Unexpected exit reason: %u (%s),\n" , - run->exit_reason, +"Stage %d: unexpected exit reason: %u (%s),\n" , + stage, run->exit_reason,exit_reason_str (run->exit_reason));memset (®s1,0 ,sizeof (regs1));
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 260/304 kvm: Change offset in kvm_write_guest_offset_cached to unsigned
In reply to Sasha LevinFrom: Jim Mattson <[email protected]>
[ Upstream commit 7a86dab8cf2f0fdf508f3555dddfc236623bff60 ]
Since the offset is added directly to the hva from the gfn_to_hva_cache, a negative offset could result in an out of bounds write. The existing BUG_ON only checks for addresses beyond the end of the gfn_to_hva_cache, not for addresses before the start of the gfn_to_hva_cache.
Note that all current call sites have non-negative offsets.
--- include/linux/kvm_host.h | 3 ++- virt/kvm/kvm_main.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
include/linux/kvm_host.h +2 -1
@@ -694,7 +694,8 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,int kvm_write_guest_cached (struct kvm *kvm,struct gfn_to_hva_cache *ghc,void *data,unsigned long len);int kvm_write_guest_offset_cached (struct kvm *kvm,struct gfn_to_hva_cache *ghc, -void *data,int offset,unsigned long len); +void *data,unsigned int offset, +unsigned long len);int kvm_gfn_to_hva_cache_init (struct kvm *kvm,struct gfn_to_hva_cache *ghc,gpa_t gpa,unsigned long len);int kvm_clear_guest_page (struct kvm *kvm,gfn_t gfn,int offset,int len);
virt/kvm/kvm_main.c +2 -1
@@ -1965,7 +1965,8 @@ int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,EXPORT_SYMBOL_GPL (kvm_gfn_to_hva_cache_init);int kvm_write_guest_offset_cached (struct kvm *kvm,struct gfn_to_hva_cache *ghc, -void *data,int offset,unsigned long len) +void *data,unsigned int offset, +unsigned long len) {struct kvm_memslots *slots =kvm_memslots (kvm);int r;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 269/304 cifs: check ntwrk_buf_start for NULL before dereferencing it
In reply to Sasha LevinFrom: Ronnie Sahlberg <[email protected]>
[ Upstream commit 59a63e479ce36a3f24444c3a36efe82b78e4a8e0 ]
RHBZ: 1021460
There is an issue where when multiple threads open/close the same directory ntwrk_buf_start might end up being NULL, causing the call to smbCalcSize later to oops with a NULL deref.
The real bug is why this happens and why this can become NULL for an open cfile, which should not be allowed.
This patch tries to avoid a oops until the time when we fix the underlying issue.
--- fs/cifs/readdir.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/cifs/readdir.c +8 -1
@@ -655,7 +655,14 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos,/* scan and find it */ int i;char *cur_ent; -char *end_of_smb = cfile->srch_inf.ntwrk_buf_start + +char *end_of_smb; + +if (cfile->srch_inf.ntwrk_buf_start ==NULL ) { +cifs_dbg (VFS ,"ntwrk_buf_start is NULL during readdir\n" ); +return -EIO ; + } + + end_of_smb = cfile->srch_inf.ntwrk_buf_start + server->ops->calc_smb_size ( cfile->srch_inf.ntwrk_buf_start, server);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 270/304 f2fs: fix use-after-free issue when accessing sbi->stat_info
In reply to Sasha LevinFrom: Sahitya Tummala <[email protected]>
[ Upstream commit 60aa4d5536ab7fe32433ca1173bd9d6633851f27 ]
iput() on sbi->node_inode can update sbi->stat_info in the below context, if the f2fs_write_checkpoint() has failed with error.
f2fs_balance_fs_bg+0x1ac/0x1ec f2fs_write_node_pages+0x4c/0x260 do_writepages+0x80/0xbc __writeback_single_inode+0xdc/0x4ac writeback_single_inode+0x9c/0x144 write_inode_now+0xc4/0xec iput+0x194/0x22c f2fs_put_super+0x11c/0x1e8 generic_shutdown_super+0x70/0xf4 kill_block_super+0x2c/0x5c kill_f2fs_super+0x44/0x50 deactivate_locked_super+0x60/0x8c deactivate_super+0x68/0x74 cleanup_mnt+0x40/0x78
Fix this by moving f2fs_destroy_stats() further below iput() in both f2fs_put_super() and f2fs_fill_super() paths.
--- fs/f2fs/super.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
fs/f2fs/super.c +15 -12
@@ -1058,9 +1058,6 @@ static void f2fs_put_super(struct super_block *sb)f2fs_write_checkpoint (sbi, &cpc); } -/* f2fs_write_checkpoint can update stat informaion */ -f2fs_destroy_stats (sbi); -/* * normally superblock is clean, so we need to release this. * In addition, EIO will skip do checkpoint, we need this as well.
@@ -1080,6 +1077,12 @@ static void f2fs_put_super(struct super_block *sb)iput (sbi->node_inode);iput (sbi->meta_inode); +/* +* iput() can update stat information, if f2fs_write_checkpoint() +* above failed with error. +*/ +f2fs_destroy_stats (sbi); +/* destroy f2fs internal modules */ f2fs_destroy_node_manager (sbi);f2fs_destroy_segment_manager (sbi);
@@ -3256,30 +3259,30 @@ try_onemore:f2fs_build_gc_manager (sbi); + err =f2fs_build_stats (sbi); +if (err) + goto free_nm; +/* get an inode for node space */ sbi->node_inode =f2fs_iget (sb,F2FS_NODE_INO (sbi));if (IS_ERR (sbi->node_inode)) {f2fs_msg (sb,KERN_ERR ,"Failed to read node inode" ); err =PTR_ERR (sbi->node_inode); - goto free_nm; + goto free_stats; } - err =f2fs_build_stats (sbi); -if (err) - goto free_node_inode; -/* read root inode and dentry */ root =f2fs_iget (sb,F2FS_ROOT_INO (sbi));if (IS_ERR (root)) {f2fs_msg (sb,KERN_ERR ,"Failed to read root inode" ); err =PTR_ERR (root); - goto free_stats; + goto free_node_inode; }if (!S_ISDIR (root->i_mode) || !root->i_blocks || !root->i_size || !root->i_nlink) {iput (root); err = -EINVAL ; - goto free_stats; + goto free_node_inode; } sb->s_root =d_make_root (root);/* allocate root dentry */
@@ -3403,12 +3406,12 @@ free_meta: free_root_inode:dput (sb->s_root); sb->s_root =NULL ; -free_stats: -f2fs_destroy_stats (sbi); free_node_inode:f2fs_release_ino_entry (sbi, true);truncate_inode_pages_final (NODE_MAPPING (sbi));iput (sbi->node_inode); +free_stats: +f2fs_destroy_stats (sbi); free_nm:f2fs_destroy_node_manager (sbi); free_sm:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 277/304 arch/sh/boards/mach-kfr2r09/setup.c: fix struct mtd_oob_ops build warning
In reply to Sasha LevinFrom: Randy Dunlap <[email protected]>
[ Upstream commit 440e7b379f91acd245d5c8de94d533f40f5dffb3 ]
arch/sh/boards/mach-kfr2r09/setup.c does not need to #include <mtd/onenand.h>, and doing so causes a build warning, so drop that header file.
In file included from ../arch/sh/boards/mach-kfr2r09/setup.c:28:../include/linux/mtd/onenand.h:225:12: warning: 'struct mtd_oob_ops' declared inside parameter list will not be visible outside of this definition or declaration
struct mtd_oob_ops *ops);
--- arch/sh/boards/mach-kfr2r09/setup.c | 1 - 1 file changed, 1 deletion(-)
arch/sh/boards/mach-kfr2r09/setup.c +0 -1
@@ -25,7 +25,6 @@#include <linux/memblock.h> #include <linux/mfd/tmio.h> #include <linux/mmc/host.h> -#include <linux/mtd/onenand.h> #include <linux/mtd/physmap.h> #include <linux/platform_data/lv5207lp.h> #include <linux/platform_device.h>
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 287/304 thermal: bcm2835: enable hwmon explicitly
In reply to Sasha LevinFrom: Matthias Brugger <[email protected]>
[ Upstream commit d56c19d07e0bc3ceff366a49b7d7a2440c967b1b ]
By defaul of-based thermal driver do not enable hwmon. This patch does this explicitly, so that the temperature can be read through the common hwmon sysfs.
--- drivers/thermal/broadcom/bcm2835_thermal.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/thermal/broadcom/bcm2835_thermal.c +11 -0
@@ -18,6 +18,8 @@#include <linux/platform_device.h> #include <linux/thermal.h> +#include "../thermal_hwmon.h" +#define BCM2835_TS_TSENSCTL 0x00#define BCM2835_TS_TSENSSTAT 0x04
@@ -266,6 +268,15 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)platform_set_drvdata (pdev, tz); +/* +* Thermal_zone doesn't enable hwmon as default, +* enable it here +*/ + tz->tzp->no_hwmon = false; + err =thermal_add_hwmon_sysfs (tz); +if (err) + goto err_tz; +bcm2835_thermal_debugfs (pdev);return 0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 289/304 thermal: tsens: qcom: do not create duplicate regmap debugfs entries
In reply to Sasha LevinFrom: Srinivas Kandagatla <[email protected]>
[ Upstream commit 4ab248b3b10a58e379e2d32333fff99ea5ca256c ]
Regmap would use device name to create debugfs entries. If the device has multiple regmaps it is recommended to use name field in regmap_config. Fix this by providing name to the regmap configs correctly.
Without this patch we would see below error on DB820c.
qcom-tsens 4a9000.thermal-sensor: Failed to create 4a9000.thermal-sensor debugfs directory
--- drivers/thermal/qcom/tsens-common.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/thermal/qcom/tsens-common.c +10 -2
@@ -114,6 +114,14 @@ int get_temp_common(struct tsens_device *tmdev, int id, int *temp) }static const struct regmap_config tsens_config = { + .name ="tm" , + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , +}; + +static const struct regmap_config tsens_srot_config = { + .name ="srot" , .reg_bits =32 , .val_bits =32 , .reg_stride =4 ,
@@ -139,8 +147,8 @@ int __init init_common(struct tsens_device *tmdev)if (IS_ERR (srot_base))return PTR_ERR (srot_base); - tmdev->srot_map =devm_regmap_init_mmio (tmdev->dev, - srot_base, &tsens_config); + tmdev->srot_map =devm_regmap_init_mmio (tmdev->dev, srot_base, + &tsens_srot_config);if (IS_ERR (tmdev->srot_map))return PTR_ERR (tmdev->srot_map);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 292/304 thermal: generic-adc: Fix adc to temp interpolation
In reply to Sasha LevinFrom: Bjorn Andersson <[email protected]>
[ Upstream commit 9d216211fded20fff301d0317af3238d8383634c ]
First correct the edge case to return the last element if we're outside the range, rather than at the last element, so that interpolation is not omitted for points between the two last entries in the table.
Then correct the formula to perform linear interpolation based the two points surrounding the read ADC value. The indices for temp are kept as "hi" and "lo" to pair with the adc indices, but there's no requirement that the temperature is provided in descendent order. mult_frac() is used to prevent issues with overflowing the int.
--- drivers/thermal/thermal-generic-adc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/thermal/thermal-generic-adc.c +8 -4
@@ -26,7 +26,7 @@ struct gadc_thermal_info {static int gadc_thermal_adc_to_temp (struct gadc_thermal_info *gti,int val) { -int temp, adc_hi, adc_lo; +int temp, temp_hi, temp_lo, adc_hi, adc_lo;int i;for (i =0 ; i < gti->nlookup_table; i++) {
@@ -36,13 +36,17 @@ static int gadc_thermal_adc_to_temp(struct gadc_thermal_info *gti, int val)if (i ==0 ) { temp = gti->lookup_table[0 ]; - }else if (i >= (gti->nlookup_table -1 )) { + }else if (i >= gti->nlookup_table) { temp = gti->lookup_table[2 * (gti->nlookup_table -1 )]; }else { adc_hi = gti->lookup_table[2 * i -1 ]; adc_lo = gti->lookup_table[2 * i +1 ]; - temp = gti->lookup_table[2 * i]; - temp -= ((val - adc_lo) *1000 ) / (adc_hi - adc_lo); + + temp_hi = gti->lookup_table[2 * i -2 ]; + temp_lo = gti->lookup_table[2 * i]; + + temp = temp_hi +mult_frac (temp_lo - temp_hi, val - adc_hi, + adc_lo - adc_hi); }return temp;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 294/304 HID: lenovo: Add checks to fix of_led_classdev_register
In reply to Sasha LevinFrom: Aditya Pakki <[email protected]>
[ Upstream commit 6ae16dfb61bce538d48b7fe98160fada446056c5 ]
In lenovo_probe_tpkbd(), the function of_led_classdev_register() could return an error value that is unchecked. The fix adds these checks.
--- drivers/hid/hid-lenovo.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/hid/hid-lenovo.c +8 -2
@@ -743,7 +743,9 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) data_pointer->led_mute.brightness_get = lenovo_led_brightness_get_tpkbd; data_pointer->led_mute.brightness_set = lenovo_led_brightness_set_tpkbd; data_pointer->led_mute.dev = dev; -led_classdev_register (dev, &data_pointer->led_mute); + ret =led_classdev_register (dev, &data_pointer->led_mute); +if (ret <0 ) + goto err; data_pointer->led_micmute.name = name_micmute; data_pointer->led_micmute.brightness_get =
@@ -751,7 +753,11 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev) data_pointer->led_micmute.brightness_set = lenovo_led_brightness_set_tpkbd; data_pointer->led_micmute.dev = dev; -led_classdev_register (dev, &data_pointer->led_micmute); + ret =led_classdev_register (dev, &data_pointer->led_micmute); +if (ret <0 ) { +led_classdev_unregister (&data_pointer->led_mute); + goto err; + }lenovo_features_set_tpkbd (hdev);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 1/304 drm/bufs: Fix Spectre v1 vulnerability
From: "Gustavo A. R. Silva" <[email protected]>
[ Upstream commit a37805098900a6e73a55b3a43b7d3bcd987bb3f4 ]
idx can be indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability.
This issue was detected with the help of Smatch:
drivers/gpu/drm/drm_bufs.c:1420 drm_legacy_freebufs() warn: potential spectre issue 'dma->buflist' [r] (local cap)
Fix this by sanitizing idx before using it to index dma->buflist
Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1].
[1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2
--- drivers/gpu/drm/drm_bufs.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_bufs.c +3 -0
@@ -36,6 +36,8 @@#include <drm/drmP.h> #include "drm_legacy.h" +#include <linux/nospec.h> +static struct drm_map_list *drm_find_matching_map (struct drm_device *dev,struct drm_local_map *map) {
@@ -1417,6 +1419,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data, idx, dma->buf_count - 1);return -EINVAL ; } + idx =array_index_nospec (idx, dma->buf_count); buf = dma->buflist[idx];if (buf->file_priv != file_priv) { DRM_ERROR("Process %d freeing buffer not owned\n",
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 4/304 drm/vgem: Fix vgem_init to get drm device available.
From: Deepak Sharma <[email protected]>
[ Upstream commit d5c04dff24870ef07ce6453a3f4e1ffd9cf88d27 ]
Modify vgem_init to take platform dev as parent in drm_dev_init. This will make drm device available at "/sys/devices/platform/vgem" in x86 chromebook.
v2: rebase, address checkpatch typo and line over 80 characters
--- drivers/gpu/drm/vgem/vgem_drv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/vgem/vgem_drv.c +8 -8
@@ -471,31 +471,31 @@ static int __init vgem_init(void)if (!vgem_device)return -ENOMEM ; - ret =drm_dev_init (&vgem_device->drm, &vgem_driver,NULL ); -if (ret) - goto out_free; - vgem_device->platform =platform_device_register_simple ("vgem" ,-1 ,NULL ,0 );if (IS_ERR (vgem_device->platform)) { ret =PTR_ERR (vgem_device->platform); - goto out_fini; + goto out_free; }dma_coerce_mask_and_coherent (&vgem_device->platform->dev,DMA_BIT_MASK (64 )); + ret =drm_dev_init (&vgem_device->drm, &vgem_driver, + &vgem_device->platform->dev); +if (ret) + goto out_unregister;/* Final step: expose the device/driver to userspace */ ret =drm_dev_register (&vgem_device->drm,0 );if (ret) - goto out_unregister; + goto out_fini;return 0 ; -out_unregister: -platform_device_unregister (vgem_device->platform); out_fini:drm_dev_fini (&vgem_device->drm); +out_unregister: +platform_device_unregister (vgem_device->platform); out_free:kfree (vgem_device);return ret;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 7/304 ASoC: Intel: mrfld: fix uninitialized variable access
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 1539c7f23f256120f89f8b9ec53160790bce9ed2 ]
Randconfig testing revealed a very old bug, with gcc-8:
sound/soc/intel/atom/sst/sst_loader.c: In function 'sst_load_fw':sound/soc/intel/atom/sst/sst_loader.c:357:5: error: 'fw' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (fw == NULL) {
^sound/soc/intel/atom/sst/sst_loader.c:354:25: note: 'fw' was declared here
const struct firmware *fw;
We must check the return code of request_firmware() before we look at the pointer result that may be uninitialized when the function fails.
--- sound/soc/intel/atom/sst/sst_loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/intel/atom/sst/sst_loader.c +4 -4
@@ -354,14 +354,14 @@ static int sst_request_fw(struct intel_sst_drv *sst)const struct firmware *fw; retval =request_firmware (&fw, sst->firmware_name, sst->dev); -if (fw ==NULL ) { -dev_err (sst->dev,"fw is returning as null\n" ); -return -EINVAL ; - }if (retval) {dev_err (sst->dev,"request fw failed %d\n" , retval);return retval; } +if (fw ==NULL ) { +dev_err (sst->dev,"fw is returning as null\n" ); +return -EINVAL ; + }mutex_lock (&sst->sst_lock); retval =sst_cache_and_parse_fw (sst, fw);mutex_unlock (&sst->sst_lock);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 12/304 gpu: ipu-v3: image-convert: Prevent race between run and unprepare
In reply to Sasha LevinFrom: Steve Longerbeam <[email protected]>
[ Upstream commit 819bec35c8c9706185498c9222bd244e0781ad35 ]
Prevent possible race by parallel threads between ipu_image_convert_run() and ipu_image_convert_unprepare(). This involves setting ctx->aborting to true unconditionally so that no new job runs can be queued during unprepare, and holding the ctx->aborting flag until the context is freed.
Note that the "normal" ipu_image_convert_abort() case (e.g. not during context unprepare) should clear the ctx->aborting flag after aborting any active run and clearing the context's pending queue. This is because it should be possible to continue to use the conversion context and queue more runs after an abort.
--- drivers/gpu/ipu-v3/ipu-image-convert.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/ipu-v3/ipu-image-convert.c +7 -3
@@ -1524,7 +1524,7 @@ unlock:EXPORT_SYMBOL_GPL (ipu_image_convert_queue);/* Abort any active or pending conversions for this context */ -void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +static void __ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) {struct ipu_image_convert_chan *chan = ctx->chan;struct ipu_image_convert_priv *priv = chan->priv;
@@ -1551,7 +1551,7 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx) need_abort = (run_count || active_run); - ctx->aborting = need_abort; + ctx->aborting = true;spin_unlock_irqrestore (&chan->irqlock, flags);
@@ -1572,7 +1572,11 @@ void ipu_image_convert_abort(struct ipu_image_convert_ctx *ctx)dev_warn (priv->ipu->dev,"%s: timeout\n" , __func__);force_abort (ctx); } +} +void ipu_image_convert_abort (struct ipu_image_convert_ctx *ctx) +{ +__ipu_image_convert_abort (ctx); ctx->aborting = false; }EXPORT_SYMBOL_GPL (ipu_image_convert_abort);
@@ -1586,7 +1590,7 @@ void ipu_image_convert_unprepare(struct ipu_image_convert_ctx *ctx)bool put_res;/* make sure no runs are hanging around */ -ipu_image_convert_abort (ctx); +__ipu_image_convert_abort (ctx);dev_dbg (priv->ipu->dev,"%s: task %u: removing ctx %p\n" , __func__, chan->ic_task, ctx);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 9/304 drm/sun4i: Initialize registers in tcon-top driver
In reply to Sasha LevinFrom: Jernej Skrabec <[email protected]>
[ Upstream commit c96d62215fb540e2ae61de44cb7caf4db50958e3 ]
It turns out that TCON TOP registers in H6 SoC have non-zero reset value. This may cause issues if bits are not changed during configuration.
To prevent that, initialize registers to 0.
--- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/sun4i/sun8i_tcon_top.c +7 -0
@@ -167,6 +167,13 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, goto err_assert_reset; } +/* +* At least on H6, some registers have some bits set by default +* which may cause issues. Clear them here. +*/ +writel (0 , regs +TCON_TOP_PORT_SEL_REG ); +writel (0 , regs +TCON_TOP_GATE_SRC_REG ); +/* * TCON TOP has two muxes, which select parent clock for each TCON TV * channel clock. Parent could be either TCON TV or TVE clock. For now
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 11/304 genirq/affinity: Spread IRQs to all available NUMA nodes
In reply to Sasha LevinFrom: Long Li <[email protected]>
[ Upstream commit b82592199032bf7c778f861b936287e37ebc9f62 ]
If the number of NUMA nodes exceeds the number of MSI/MSI-X interrupts which are allocated for a device, the interrupt affinity spreading code fails to spread them across all nodes.
The reason is, that the spreading code starts from node 0 and continues up to the number of interrupts requested for allocation. This leaves the nodes past the last interrupt unused.
This results in interrupt concentration on the first nodes which violates the assumption of the block layer that all nodes are covered evenly. As a consequence the NUMA nodes above the number of interrupts are all assigned to hardware queue 0 and therefore NUMA node 0, which results in bad performance and has CPU hotplug implications, because queue 0 gets shut down when the last CPU of node 0 is offlined.
Go over all NUMA nodes and assign them round-robin to all requested interrupts to solve this.
[ tglx: Massaged changelog ]
--- kernel/irq/affinity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/irq/affinity.c +2 -3
@@ -117,12 +117,11 @@ static int irq_build_affinity_masks(const struct irq_affinity *affd,*/ if (numvecs <= nodes) {for_each_node_mask (n, nodemsk) { -cpumask_copy (masks + curvec, node_to_cpumask[n]); -if (++done == numvecs) -break ; +cpumask_or (masks + curvec, masks + curvec, node_to_cpumask[n]);if (++curvec == last_affv) curvec = affd->pre_vectors; } + done = numvecs; goto out; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 14/304 nds32: Fix gcc 8.0 compiler option incompatible.
In reply to Sasha LevinFrom: Nickhu <[email protected]>
[ Upstream commit 4c3d6174e0e17599549f636ec48ddf78627a17fe ]
When the kernel configs of ftrace and frame pointer options are
choosed, the compiler option of kernel will incompatible.
Error message:
nds32le-linux-gcc: error: -pg and -fomit-frame-pointer are incompatible
--- arch/nds32/mm/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/nds32/mm/Makefile +5 -1
@@ -4,4 +4,8 @@ obj-y := extable.o tlb.o \ obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o obj-$(CONFIG_HIGHMEM) += highmem.o -CFLAGS_proc-n13.o += -fomit-frame-pointer + +ifdef CONFIG_FUNCTION_TRACER +CFLAGS_REMOVE_proc.o = $(CC_FLAGS_FTRACE) +endif +CFLAGS_proc.o += -fomit-frame-pointer
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 16/304 wil6210: fix memory leak in wil_find_tx_bcast_2
In reply to Sasha LevinFrom: Lior David <[email protected]>
[ Upstream commit 664497400c89a4d40aee51bcf48bbd2e4dc71104 ]
A successful call to wil_tx_ring takes skb reference so it will only be freed in wil_tx_complete. Consume the skb in wil_find_tx_bcast_2 to prevent memory leak.
--- drivers/net/wireless/ath/wil6210/txrx.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/wil6210/txrx.c +2 -0
@@ -1403,6 +1403,8 @@ found:wil_dbg_txrx (wil,"BCAST DUP -> ring %d\n" , i);wil_set_da_for_vring (wil, skb2, i);wil_tx_ring (wil, vif, v2, skb2); +/* successful call to wil_tx_ring takes skb2 ref */ +dev_kfree_skb_any (skb2); }else {wil_err (wil,"skb_copy failed\n" ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 17/304 ath10k: assign 'n_cipher_suites' for WCN3990
In reply to Sasha LevinFrom: Brian Norris <[email protected]>
[ Upstream commit 2bd345cd2bfc0bd44528896313c0b45f087bdf67 ]
Commit 2ea9f12cefe4 ("ath10k: add new cipher suite support") added a new n_cipher_suites HW param with a fallback value and a warning log. Commit 03a72288c546 ("ath10k: wmi: add hw params entry for wcn3990") later added WCN3990 HW entries, but it missed the n_cipher_suites.
Rather than seeing this warning every boot
ath10k_snoc 18800000.wifi: invalid hw_params.n_cipher_suites 0
let's provide the appropriate value.
--- drivers/net/wireless/ath/ath10k/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/ath/ath10k/core.c +1 -0
@@ -561,6 +561,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .hw_ops = &wcn3990_ops, .decap_align_bytes = 1, .num_peers = TARGET_HL_10_TLV_NUM_PEERS, + .n_cipher_suites = 8, .ast_skid_limit = TARGET_HL_10_TLV_AST_SKID_LIMIT, .num_wds_entries = TARGET_HL_10_TLV_NUM_WDS_ENTRIES, .target_64bit = true,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 18/304 ath9k: dynack: use authentication messages for 'late' ack
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 3831a2a0010c72e3956020cbf1057a1701a2e469 ]
In order to properly support dynack in ad-hoc mode running wpa_supplicant, take into account authentication frames for 'late ack' detection. This patch has been tested on devices mounted on offshore high-voltage stations connected through ~24Km link
--- drivers/net/wireless/ath/ath9k/dynack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/dynack.c +2 -1
@@ -187,7 +187,8 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,/* late ACK */ if (ts->ts_status &ATH9K_TXERR_XRETRY ) {if (ieee80211_is_assoc_req (hdr->frame_control) || -ieee80211_is_assoc_resp (hdr->frame_control)) { +ieee80211_is_assoc_resp (hdr->frame_control) || +ieee80211_is_auth (hdr->frame_control)) {ath_dbg (common,DYNACK ,"late ack\n" );ath9k_hw_setslottime (ah, (LATEACK_TO -3 ) /2 );ath9k_hw_set_ack_timeout (ah,LATEACK_TO );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 24/304 clk: boston: fix possible memory leak in clk_boston_setup()
In reply to Sasha LevinFrom: Yi Wang <[email protected]>
[ Upstream commit 46fda5b5067a391912cf73bf3d32c26b6a22ad09 ]
Smatch report warnings:drivers/clk/imgtec/clk-boston.c:76 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:83 clk_boston_setup() warn: possible memory leak of 'onecell' drivers/clk/imgtec/clk-boston.c:90 clk_boston_setup() warn: possible memory leak of 'onecell'
'onecell' is malloced in clk_boston_setup(), but not be freed before leaving from the error handling cases.
--- drivers/clk/imgtec/clk-boston.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/clk/imgtec/clk-boston.c +8 -3
@@ -73,27 +73,32 @@ static void __init clk_boston_setup(struct device_node *np) hw =clk_hw_register_fixed_rate (NULL ,"input" ,NULL ,0 , in_freq);if (IS_ERR (hw)) {pr_err ("failed to register input clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_INPUT ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"sys" ,"input" ,0 , sys_freq);if (IS_ERR (hw)) {pr_err ("failed to register sys clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_SYS ] = hw; hw =clk_hw_register_fixed_rate (NULL ,"cpu" ,"input" ,0 , cpu_freq);if (IS_ERR (hw)) {pr_err ("failed to register cpu clock: %ld\n" ,PTR_ERR (hw)); -return ; + goto error; } onecell->hws[BOSTON_CLK_CPU ] = hw; err =of_clk_add_hw_provider (np, of_clk_hw_onecell_get, onecell);if (err)pr_err ("failed to add DT provider: %d\n" , err); + +return ; + +error: +kfree (onecell); }/*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 26/304 x86/PCI: Fix Broadcom CNB20LE unintended sign extension (redux)
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 53bb565fc5439f2c8c57a786feea5946804aa3e9 ]
In the expression "word1 << 16", word1 starts as u16, but is promoted to a signed int, then sign-extended to resource_size_t, which is probably not what was intended. Cast to resource_size_t to avoid the sign extension.
This fixes an identical issue as fixed by commit 0b2d70764bb3 ("x86/PCI:
Fix Broadcom CNB20LE unintended sign extension") back in 2014.
Detected by CoverityScan, CID#138749, 138750 ("Unintended sign extension")
--- arch/x86/pci/broadcom_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/pci/broadcom_bus.c +2 -2
@@ -50,8 +50,8 @@ static void __init cnb20le_res(u8 bus, u8 slot, u8 func) word1 =read_pci_config_16 (bus, slot, func,0xc0 ); word2 =read_pci_config_16 (bus, slot, func,0xc2 );if (word1 != word2) { - res.start = (word1 <<16 ) |0x0000 ; - res.end = (word2 <<16 ) |0xffff ; + res.start = ((resource_size_t ) word1 <<16 ) |0x0000 ; + res.end = ((resource_size_t ) word2 <<16 ) |0xffff ; res.flags =IORESOURCE_MEM ;update_res (info, res.start, res.end, res.flags,0 ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 30/304 bpftool: Improve handling of ENOENT on map dumps
In reply to Sasha LevinFrom: David Ahern <[email protected]>
[ Upstream commit bf598a8f0f771302d4ecb0ef0003c54732221597 ]
bpftool output is not user friendly when dumping a map with only a few populated entries:
$ bpftool map
1: devmap name tx_devmap flags 0x0
key 4B value 4B max_entries 64 memlock 4096B
2: array name tx_idxmap flags 0x0
key 4B value 4B max_entries 64 memlock 4096B $ bpftool map dump id 1
key:
00 00 00 00
value:
No such file or directory
key:
01 00 00 00
value:
No such file or directory
key:
02 00 00 00
value:
No such file or directory
key: 03 00 00 00 value: 03 00 00 00Handle ENOENT by keeping the line format sane and dumping "<no entry>" for the value
$ bpftool map dump id 1
key: 00 00 00 00 value: <no entry>
key: 01 00 00 00 value: <no entry>
key: 02 00 00 00 value: <no entry>
key: 03 00 00 00 value: 03 00 00 00
...--- tools/bpf/bpftool/map.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
tools/bpf/bpftool/map.c +14 -4
@@ -383,7 +383,10 @@ static void print_entry_plain(struct bpf_map_info *info, unsigned char *key,printf (single_line ?" " :"\n" );printf ("value:%c" , break_names ?'\n' :' ' ); -fprint_hex (stdout, value, info->value_size," " ); +if (value) +fprint_hex (stdout, value, info->value_size," " ); +else +printf ("<no entry>" );printf ("\n" ); }else {
@@ -398,8 +401,11 @@ static void print_entry_plain(struct bpf_map_info *info, unsigned char *key,for (i =0 ; i < n; i++) {printf ("value (CPU %02d):%c" , i, info->value_size >16 ?'\n' :' ' ); -fprint_hex (stdout, value + i * step, - info->value_size," " ); +if (value) +fprint_hex (stdout, value + i * step, + info->value_size," " ); +else +printf ("<no entry>" );printf ("\n" ); } }
@@ -731,7 +737,11 @@ static int dump_map_elem(int fd, void *key, void *value,jsonw_string_field (json_wtr,"error" ,strerror (lookup_errno));jsonw_end_object (json_wtr); }else { -print_entry_error (map_info, key,strerror (lookup_errno)); +if (errno ==ENOENT ) +print_entry_plain (map_info, key,NULL ); +else +print_entry_error (map_info, key, +strerror (lookup_errno)); }return 0 ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 35/304 serial: core: Allow processing sysrq at port unlock time
In reply to Sasha LevinFrom: Douglas Anderson <[email protected]>
[ Upstream commit d6e1935819db0c91ce4a5af82466f3ab50d17346 ]
Right now serial drivers process sysrq keys deep in their character receiving code. This means that they've already grabbed their port->lock spinlock. This can end up getting in the way if we've go to do serial stuff (especially kgdb) in response to the sysrq.
Serial drivers have various hacks in them to handle this. Looking at '8250_port.c' you can see that the console_write() skips locking if we're in the sysrq handler. Looking at 'msm_serial.c' you can see that the port lock is dropped around uart_handle_sysrq_char().
It turns out that these hacks aren't exactly perfect. If you have lockdep turned on and use something like the 8250_port hack you'll get a splat that looks like:
WARNING: possible circular locking dependency detected [...] is trying to acquire lock:
... (console_owner){-.-.}, at: console_unlock+0x2e0/0x5e4
but task is already holding lock:
... (&port_lock_key){-.-.}, at: serial8250_handle_irq+0x30/0xe4
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&port_lock_key){-.-.}:
_raw_spin_lock_irqsave+0x58/0x70
serial8250_console_write+0xa8/0x250
univ8250_console_write+0x40/0x4c
console_unlock+0x528/0x5e4
register_console+0x2c4/0x3b0
uart_add_one_port+0x350/0x478
serial8250_register_8250_port+0x350/0x3a8
dw8250_probe+0x67c/0x754
platform_drv_probe+0x58/0xa4
really_probe+0x150/0x294
driver_probe_device+0xac/0xe8
__driver_attach+0x98/0xd0
bus_for_each_dev+0x84/0xc8
driver_attach+0x2c/0x34
bus_add_driver+0xf0/0x1ec
driver_register+0xb4/0x100
__platform_driver_register+0x60/0x6c
dw8250_platform_driver_init+0x20/0x28
...-> #0 (console_owner){-.-.}:
lock_acquire+0x1e8/0x214
console_unlock+0x35c/0x5e4
vprintk_emit+0x230/0x274
vprintk_default+0x7c/0x84
vprintk_func+0x190/0x1bc
printk+0x80/0xa0
__handle_sysrq+0x104/0x21c
handle_sysrq+0x30/0x3c
serial8250_read_char+0x15c/0x18c
serial8250_rx_chars+0x34/0x74
serial8250_handle_irq+0x9c/0xe4
dw8250_handle_irq+0x98/0xcc
serial8250_interrupt+0x50/0xe8
...other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&port_lock_key);
lock(console_owner);
lock(&port_lock_key);
lock(console_owner);*** DEADLOCK ***
The hack used in 'msm_serial.c' doesn't cause the above splats but it seems a bit ugly to unlock / lock our spinlock deep in our irq handler.
It seems like we could defer processing the sysrq until the end of the interrupt handler right after we've unlocked the port. With this scheme if a whole batch of sysrq characters comes in one irq then we won't handle them all, but that seems like it should be a fine compromise.
--- include/linux/serial_core.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
include/linux/serial_core.h +36 -1
@@ -175,6 +175,7 @@ struct uart_port {struct console *cons;/* struct console, if any */ #if defined(CONFIG_SERIAL_CORE_CONSOLE ) || defined(SUPPORT_SYSRQ )unsigned long sysrq;/* sysrq timeout */ +unsigned int sysrq_ch;/* char for sysrq */ #endif /* flags must be updated while holding port mutex */
@@ -485,8 +486,42 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch) }return 0 ; } +static inline int +uart_prepare_sysrq_char (struct uart_port *port,unsigned int ch) +{ +if (port->sysrq) { +if (ch &&time_before (jiffies, port->sysrq)) { + port->sysrq_ch = ch; + port->sysrq =0 ; +return 1 ; + } + port->sysrq =0 ; + } +return 0 ; +} +static inline void +uart_unlock_and_check_sysrq (struct uart_port *port,unsigned long irqflags) +{ +int sysrq_ch; + + sysrq_ch = port->sysrq_ch; + port->sysrq_ch =0 ; + +spin_unlock_irqrestore (&port->lock, irqflags); + +if (sysrq_ch) +handle_sysrq (sysrq_ch); +}#else -#define uart_handle_sysrq_char (port,ch) ({ (void)port; 0; }) +static inline int +uart_handle_sysrq_char (struct uart_port *port,unsigned int ch) {return 0 ; } +static inline int +uart_prepare_sysrq_char (struct uart_port *port,unsigned int ch) {return 0 ; } +static inline void +uart_unlock_and_check_sysrq (struct uart_port *port,unsigned long irqflags) +{ +spin_unlock_irqrestore (&port->lock, irqflags); +}#endif /*
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 36/304 ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl
In reply to Sasha LevinFrom: Miroslav Lichvar <[email protected]>
[ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ]
If a gettime64 call fails, return the error and avoid copying data back to user.
--- drivers/ptp/ptp_chardev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ptp/ptp_chardev.c +4 -1
@@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; - ptp->info->gettime64 (ptp->info, &ts); + err = ptp->info->gettime64 (ptp->info, &ts); +if (err) + goto out; pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++;
@@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)break ; } +out:kfree (sysoff);return err; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 43/304 fpga: altera-cvp: Fix registration for CvP incapable devices
In reply to Sasha LevinFrom: Andreas Puhm <[email protected]>
[ Upstream commit 68f60538daa4bc3da5d0764d46f391916fba20fd ]
The probe function needs to verify the CvP enable bit in order to properly determine if FPGA Manager functionality can be safely enabled.
--- drivers/fpga/altera-cvp.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/fpga/altera-cvp.c +9 -0
@@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,struct altera_cvp_conf *conf;struct fpga_manager *mgr;u16 cmd, val; +u32 regval;int ret;/*
@@ -416,6 +417,14 @@ static int altera_cvp_probe(struct pci_dev *pdev,return -ENODEV ; } +pci_read_config_dword (pdev,VSE_CVP_STATUS , ®val); +if (!(regval &VSE_CVP_STATUS_CVP_EN )) { +dev_err (&pdev->dev, +"CVP is disabled for this device: CVP_STATUS Reg 0x%x\n" , + regval); +return -ENODEV ; + } + conf =devm_kzalloc (&pdev->dev,sizeof (*conf),GFP_KERNEL );if (!conf)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 45/304 fpga: altera-cvp: fix 'bad IO access' on x86_64
In reply to Sasha LevinFrom: Anatolij Gustschin <[email protected]>
[ Upstream commit 187fade88ca0ff2df9d360ca751d948d73db7095 ]
If mapping the CvP BAR fails, we still can configure the FPGA via PCI config space access. In this case the iomap pointer is NULL. On x86_64, passing NULL address to pci_iounmap() generates "Bad IO access at port 0x0" output with stack call trace. Fix it.
--- drivers/fpga/altera-cvp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/fpga/altera-cvp.c +4 -2
@@ -478,7 +478,8 @@ static int altera_cvp_probe(struct pci_dev *pdev,return 0 ; err_unmap: -pci_iounmap (pdev, conf->map); +if (conf->map) +pci_iounmap (pdev, conf->map);pci_release_region (pdev,CVP_BAR ); err_disable: cmd &= ~PCI_COMMAND_MEMORY ;
@@ -493,7 +494,8 @@ static void altera_cvp_remove(struct pci_dev *pdev)u16 cmd;fpga_mgr_unregister (mgr); -pci_iounmap (pdev, conf->map); +if (conf->map) +pci_iounmap (pdev, conf->map);pci_release_region (pdev,CVP_BAR );pci_read_config_word (pdev,PCI_COMMAND , &cmd); cmd &= ~PCI_COMMAND_MEMORY ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 44/304 Tools: hv: kvp: Fix a warning of buffer overflow with gcc 8.0.1
In reply to Sasha LevinFrom: Dexuan Cui <[email protected]>
[ Upstream commit 4fcba7802c3e15a6e56e255871d6c72f829b9dd8 ]
The patch fixes:
hv_kvp_daemon.c: In function 'kvp_set_ip_info':
hv_kvp_daemon.c:1305:2: note: 'snprintf' output between 41 and 4136 bytes into a destination of size 4096
The "(unsigned int)str_len" is to avoid:
hv_kvp_daemon.c:1309:30: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
--- tools/hv/hv_kvp_daemon.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
tools/hv/hv_kvp_daemon.c +13 -2
@@ -1178,6 +1178,7 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)FILE *file;char cmd[PATH_MAX ];char *mac_addr; +int str_len;/* * Set the configuration for the specified interface with
@@ -1301,8 +1302,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)* invoke the external script to do its magic. */ -snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , -"hv_set_ifconfig" , if_file); + str_len =snprintf (cmd,sizeof (cmd),KVP_SCRIPTS_PATH "%s %s" , +"hv_set_ifconfig" , if_file); +/* +* This is a little overcautious, but it's necessary to suppress some +* false warnings from gcc 8.0.1. +*/ +if (str_len <=0 || (unsigned int )str_len >=sizeof (cmd)) { +syslog (LOG_ERR ,"Cmd '%s' (len=%d) may be too long" , + cmd, str_len); +return HV_E_FAIL ; + } +if (system (cmd)) {syslog (LOG_ERR ,"Failed to execute cmd '%s'; error: %d %s" , cmd, errno,strerror (errno));
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 48/304 i40e: suppress bogus error message
In reply to Sasha LevinFrom: Mitch Williams <[email protected]>
[ Upstream commit 7cd8eb0861981ad212ce4242a1870c4b5831ceff ]
The i40e driver complains about unprivileged VFs trying to configure promiscuous mode each time a VF reset occurs. This isn't the fault of the poor VF driver - the PF driver itself is making the request.
To fix this, skip the privilege check if the request is to disable all promiscuous activity. This gets rid of the bogus message, but doesn't affect privilege checks, since we really only care if the unprivileged VF is trying to enable promiscuous mode.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -1
@@ -1112,7 +1112,8 @@ static i40e_status i40e_config_vf_promiscuous_mode(struct i40e_vf *vf,if (!i40e_vc_isvalid_vsi_id (vf, vsi_id) || !vsi)return I40E_ERR_PARAM ; -if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps)) { +if (!test_bit (I40E_VIRTCHNL_VF_CAP_PRIVILEGE , &vf->vf_caps) && + (allmulti || alluni)) {dev_err (&pf->pdev->dev,"Unprivileged VF %d is attempting to configure promiscuous mode\n" , vf->vf_id);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 49/304 i40e: prevent overlapping tx_timeout recover
In reply to Sasha LevinFrom: Alan Brady <[email protected]>
[ Upstream commit d5585b7b6846a6d0f9517afe57be3843150719da ]
If a TX hang occurs, we attempt to recover by incrementally resetting. If we're starved for CPU time, it's possible the reset doesn't actually complete (or even fire) before another tx_timeout fires causing us to fly through the different resets without actually doing them.
This adds a bit to set and check if a timeout recovery is already pending and, if so, bail out of tx_timeout. The bit will get cleared at the end of i40e_rebuild when reset is complete.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -122,6 +122,7 @@ enum i40e_state_t { __I40E_MDD_EVENT_PENDING, __I40E_VFLR_EVENT_PENDING, __I40E_RESET_RECOVERY_PENDING, + __I40E_TIMEOUT_RECOVERY_PENDING, __I40E_MISC_IRQ_REQUESTED, __I40E_RESET_INTR_RECEIVED, __I40E_REINIT_REQUESTED,
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -0
@@ -338,6 +338,10 @@ static void i40e_tx_timeout(struct net_device *netdev) (pf->tx_timeout_last_recovery + netdev->watchdog_timeo))) return; /* don't do any new action before the next timeout */ +/* don't kick off another recovery if one is already pending */ +if (test_and_set_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state)) +return ; +if (tx_ring) { head =i40e_get_head (tx_ring);/* Read interrupt register */
@@ -9632,6 +9636,7 @@ end_core_reset:clear_bit (__I40E_RESET_FAILED, pf->state); clear_recovery:clear_bit (__I40E_RESET_RECOVERY_PENDING, pf->state); +clear_bit (__I40E_TIMEOUT_RECOVERY_PENDING, pf->state); }/**
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 52/304 usbnet: smsc95xx: fix rx packet alignment
In reply to Sasha LevinFrom: Ben Dooks <[email protected]>
[ Upstream commit 810eeb1f41a9a272eedc94ca18c072e75678ede4 ]
The smsc95xx driver already takes into account the NET_IP_ALIGN parameter when setting up the receive packet data, which means we do not need to worry about aligning the packets in the usbnet driver.
Adding the EVENT_NO_IP_ALIGN means that the IPv4 header is now passed to the ip_rcv() routine with the start on an aligned address.
Tested on Raspberry Pi B3.
--- drivers/net/usb/smsc95xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/usb/smsc95xx.c +1 -0
@@ -1295,6 +1295,7 @@ static int smsc95xx_bind(struct usbnet *dev, struct usb_interface *intf) dev->net->features |=NETIF_F_RXCSUM ; dev->net->hw_features =NETIF_F_IP_CSUM |NETIF_F_RXCSUM ; +set_bit (EVENT_NO_IP_ALIGN , &dev->flags);smsc95xx_init_mac_address (dev);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 59/304 modpost: validate symbol names also in find_elf_symbol
In reply to Sasha LevinFrom: Sami Tolvanen <[email protected]>
[ Upstream commit 5818c683a619c534c113e1f66d24f636defc29bc ]
If an ARM mapping symbol shares an address with a valid symbol, find_elf_symbol can currently return the mapping symbol instead, as the symbol is not validated. This can result in confusing warnings:
WARNING: vmlinux.o(.text+0x18f4028): Section mismatch in reference from the function set_reset_devices() to the variable .init.text:$x.0
This change adds a call to is_valid_name to find_elf_symbol, similarly to how it's already used in find_elf_symbol2.
--- scripts/mod/modpost.c | 50 ++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 24 deletions(-)
scripts/mod/modpost.c +26 -24
@@ -1204,6 +1204,30 @@ static int secref_whitelist(const struct sectioncheck *mismatch,return 1 ; } +static inline int is_arm_mapping_symbol (const char *str) +{ +return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) + && (str[2 ] =='\0' || str[2 ] =='.' ); +} + +/* +* If there's no name there, ignore it; likewise, ignore it if it's +* one of the magic symbols emitted used by current ARM tools. +* +* Otherwise if find_symbols_between() returns those symbols, they'll +* fail the whitelist tests and cause lots of false alarms ... fixable +* only by merging __exit and __init sections into __text, bloating +* the kernel (which is especially evil on embedded platforms). +*/ +static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) +{ +const char *name = elf->strtab + sym->st_name; + +if (!name || !strlen (name)) +return 0 ; +return !is_arm_mapping_symbol (name); +} +/** * Find symbol based on relocation record info. * In some cases the symbol supplied is a valid symbol so
@@ -1229,6 +1253,8 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,continue ;if (ELF_ST_TYPE (sym->st_info) ==STT_SECTION )continue ; +if (!is_valid_name (elf, sym)) +continue ;if (sym->st_value == addr)return sym;/* Find a symbol nearby - addr are maybe negative */
@@ -1247,30 +1273,6 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,return NULL ; } -static inline int is_arm_mapping_symbol (const char *str) -{ -return str[0 ] =='$' &&strchr ("axtd" , str[1 ]) - && (str[2 ] =='\0' || str[2 ] =='.' ); -} - -/* -* If there's no name there, ignore it; likewise, ignore it if it's -* one of the magic symbols emitted used by current ARM tools. -* -* Otherwise if find_symbols_between() returns those symbols, they'll -* fail the whitelist tests and cause lots of false alarms ... fixable -* only by merging __exit and __init sections into __text, bloating -* the kernel (which is especially evil on embedded platforms). -*/ -static inline int is_valid_name (struct elf_info *elf,Elf_Sym *sym) -{ -const char *name = elf->strtab + sym->st_name; - -if (!name || !strlen (name)) -return 0 ; -return !is_arm_mapping_symbol (name); -} -/* * Find symbols before or equal addr and after addr - in the section sec. * If we find two symbols with equal offset prefer one with a valid name.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 60/304 perf tools: Add Hygon Dhyana support
In reply to Sasha LevinFrom: Pu Wen <[email protected]>
[ Upstream commit 4787eff3fa88f62fede6ed7afa06477ae6bf984d ]
The tool perf is useful for the performance analysis on the Hygon Dhyana platform. But right now there is no Hygon support for it to analyze the KVM guest os data. So add Hygon Dhyana support to it by checking vendor string to share the code path of AMD.
--- tools/perf/arch/x86/util/kvm-stat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/x86/util/kvm-stat.c +1 -1
@@ -156,7 +156,7 @@ int cpu_isa_init(struct perf_kvm_stat *kvm, const char *cpuid)if (strstr (cpuid,"Intel" )) { kvm->exit_reasons = vmx_exit_reasons; kvm->exit_reasons_isa ="VMX" ; - }else if (strstr (cpuid,"AMD" )) { + }else if (strstr (cpuid,"AMD" ) ||strstr (cpuid,"Hygon" )) { kvm->exit_reasons = svm_exit_reasons; kvm->exit_reasons_isa ="SVM" ; }else
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 64/304 media: video-i2c: avoid accessing released memory area when removing driver
In reply to Sasha LevinFrom: Akinobu Mita <[email protected]>
[ Upstream commit c764da98a600a4b068d25c77164f092f159cecec ]
The video device release() callback for video-i2c driver frees the whole struct video_i2c_data. If there is no user left for the video device when video_unregister_device() is called, the release callback is executed.
However, in video_i2c_remove() some fields (v4l2_dev, lock, and queue_lock) in struct video_i2c_data are still accessed after video_unregister_device() is called.
This fixes the use after free by moving the code from video_i2c_remove() to the release() callback.
--- drivers/media/i2c/video-i2c.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/media/i2c/video-i2c.c +6 -5
@@ -510,7 +510,12 @@ static const struct v4l2_ioctl_ops video_i2c_ioctl_ops = {static void video_i2c_release (struct video_device *vdev) { -kfree (video_get_drvdata (vdev)); +struct video_i2c_data *data =video_get_drvdata (vdev); + +v4l2_device_unregister (&data->v4l2_dev); +mutex_destroy (&data->lock); +mutex_destroy (&data->queue_lock); +kfree (data); } static int video_i2c_probe(struct i2c_client *client,
@@ -608,10 +613,6 @@ static int video_i2c_remove(struct i2c_client *client)struct video_i2c_data *data =i2c_get_clientdata (client);video_unregister_device (&data->vdev); -v4l2_device_unregister (&data->v4l2_dev); - -mutex_destroy (&data->lock); -mutex_destroy (&data->queue_lock);return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 69/304 media: vivid: fill in media_device bus_info
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit e10b40f3304360d3a2d07d690ff12197f828f2c8 ]
If you create multiple vivid instances, each with their own media device, then there was no way to tell them apart.
Fill in the bus_info so each instance has a unique bus_info string.
--- drivers/media/platform/vivid/vivid-core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/vivid/vivid-core.c +2 -0
@@ -669,6 +669,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)/* Initialize media device */ strlcpy (dev->mdev.model,VIVID_MODULE_NAME ,sizeof (dev->mdev.model)); +snprintf (dev->mdev.bus_info,sizeof (dev->mdev.bus_info), +"platform:%s-%03d" ,VIVID_MODULE_NAME , inst); dev->mdev.dev = &pdev->dev;media_device_init (&dev->mdev); dev->mdev.ops = &vivid_media_ops;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 68/304 x86/resctrl: Fixup the user-visible strings
In reply to Sasha LevinFrom: Babu Moger <[email protected]>
[ Upstream commit 723f1a0dd8e26a7523ba068204bee11c95ded38d ]
Fix the messages in rdt_last_cmd_printf() and rdt_last_cmd_puts() to make them more meaningful and consistent.
[ bp: s/cpu/CPU/; s/mem\W/memory ]
--- arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 22 ++++++------- arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c | 34 +++++++++---------- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 36 ++++++++++----------- 3 files changed, 46 insertions(+), 46 deletions(-)
arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +11 -11
@@ -71,7 +71,7 @@ int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r,unsigned long bw_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -97,12 +97,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) ret =kstrtoul (buf,16 , &val);if (ret) { -rdt_last_cmd_printf ("non-hex character in mask %s\n" , buf); +rdt_last_cmd_printf ("Non-hex character in the mask %s\n" , buf);return false; }if (val ==0 || val > r->default_ctrl) { -rdt_last_cmd_puts ("mask out of range\n" ); +rdt_last_cmd_puts ("Mask out of range\n" );return false; }
@@ -110,12 +110,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) zero_bit =find_next_zero_bit (&val, cbm_len, first_bit);if (find_next_bit (&val, cbm_len, zero_bit) < cbm_len) { -rdt_last_cmd_printf ("mask %lx has non-consecutive 1-bits\n" , val); +rdt_last_cmd_printf ("The mask %lx has non-consecutive 1-bits\n" , val);return false; }if ((zero_bit - first_bit) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("Need at least %d bits in mask\n" , +rdt_last_cmd_printf ("Need at least %d bits in the mask\n" , r->cache.min_cbm_bits);return false; }
@@ -135,7 +135,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,u32 cbm_val;if (d->have_new_ctrl) { -rdt_last_cmd_printf ("duplicate domain %d\n" , d->id); +rdt_last_cmd_printf ("Duplicate domain %d\n" , d->id);return -EINVAL ; }
@@ -145,7 +145,7 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP &&rdtgroup_pseudo_locked_in_hierarchy (d)) { -rdt_last_cmd_printf ("pseudo-locked region in hierarchy\n" ); +rdt_last_cmd_printf ("Pseudo-locked region in hierarchy\n" );return -EINVAL ; }
@@ -164,14 +164,14 @@ int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,* either is exclusive. */ if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, true)) { -rdt_last_cmd_printf ("overlaps with exclusive group\n" ); +rdt_last_cmd_printf ("Overlaps with exclusive group\n" );return -EINVAL ; }if (rdtgroup_cbm_overlaps (r, d, cbm_val, rdtgrp->closid, false)) {if (rdtgrp->mode ==RDT_MODE_EXCLUSIVE || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { -rdt_last_cmd_printf ("overlaps with other group\n" ); +rdt_last_cmd_printf ("0verlaps with other group\n" );return -EINVAL ; } }
@@ -293,7 +293,7 @@ static int rdtgroup_parse_resource(char *resname, char *tok,if (!strcmp (resname, r->name) && rdtgrp->closid < r->num_closid)return parse_line (tok, r, rdtgrp); } -rdt_last_cmd_printf ("unknown/unsupported resource name '%s'\n" , resname); +rdt_last_cmd_printf ("Unknown or unsupported resource name '%s'\n" , resname);return -EINVAL ; }
@@ -326,7 +326,7 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of,*/ if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED ) { ret = -EINVAL ; -rdt_last_cmd_puts ("resource group is pseudo-locked\n" ); +rdt_last_cmd_puts ("Resource group is pseudo-locked\n" ); goto out; }
arch/x86/kernel/cpu/intel_rdt_pseudo_lock.c +17 -17
@@ -213,7 +213,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)for_each_cpu (cpu, &plr->d->cpu_mask) { pm_req =kzalloc (sizeof (*pm_req),GFP_KERNEL );if (!pm_req) { -rdt_last_cmd_puts ("fail allocating mem for PM QoS\n" ); +rdt_last_cmd_puts ("Failure to allocate memory for PM QoS\n" ); ret = -ENOMEM ; goto out_err; }
@@ -222,7 +222,7 @@ static int pseudo_lock_cstates_constrain(struct pseudo_lock_region *plr)DEV_PM_QOS_RESUME_LATENCY , 30);if (ret <0 ) { -rdt_last_cmd_printf ("fail to add latency req cpu%d\n" , +rdt_last_cmd_printf ("Failed to add latency req CPU%d\n" , cpu);kfree (pm_req); ret =-1 ;
@@ -289,7 +289,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) plr->cpu =cpumask_first (&plr->d->cpu_mask);if (!cpu_online (plr->cpu)) { -rdt_last_cmd_printf ("cpu %u associated with cache not online\n" , +rdt_last_cmd_printf ("CPU %u associated with cache not online\n" , plr->cpu); ret = -ENODEV ; goto out_region;
@@ -307,7 +307,7 @@ static int pseudo_lock_region_init(struct pseudo_lock_region *plr) } ret =-1 ; -rdt_last_cmd_puts ("unable to determine cache line size\n" ); +rdt_last_cmd_puts ("Unable to determine cache line size\n" ); out_region:pseudo_lock_region_clear (plr);return ret;
@@ -361,14 +361,14 @@ static int pseudo_lock_region_alloc(struct pseudo_lock_region *plr)* KMALLOC_MAX_SIZE. */ if (plr->size >KMALLOC_MAX_SIZE ) { -rdt_last_cmd_puts ("requested region exceeds maximum size\n" ); +rdt_last_cmd_puts ("Requested region exceeds maximum size\n" ); ret = -E2BIG ; goto out_region; } plr->kmem =kzalloc (plr->size,GFP_KERNEL );if (!plr->kmem) { -rdt_last_cmd_puts ("unable to allocate memory\n" ); +rdt_last_cmd_puts ("Unable to allocate memory\n" ); ret = -ENOMEM ; goto out_region; }
@@ -665,7 +665,7 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)* default closid associated with it. */ if (rdtgrp == &rdtgroup_default) { -rdt_last_cmd_puts ("cannot pseudo-lock default group\n" ); +rdt_last_cmd_puts ("Cannot pseudo-lock default group\n" );return -EINVAL ; }
@@ -707,17 +707,17 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp)*/ prefetch_disable_bits =get_prefetch_disable_bits ();if (prefetch_disable_bits ==0 ) { -rdt_last_cmd_puts ("pseudo-locking not supported\n" ); +rdt_last_cmd_puts ("Pseudo-locking not supported\n" );return -EINVAL ; }if (rdtgroup_monitor_in_progress (rdtgrp)) { -rdt_last_cmd_puts ("monitoring in progress\n" ); +rdt_last_cmd_puts ("Monitoring in progress\n" );return -EINVAL ; }if (rdtgroup_tasks_assigned (rdtgrp)) { -rdt_last_cmd_puts ("tasks assigned to resource group\n" ); +rdt_last_cmd_puts ("Tasks assigned to resource group\n" );return -EINVAL ; }
@@ -727,13 +727,13 @@ int rdtgroup_locksetup_enter(struct rdtgroup *rdtgrp) }if (rdtgroup_locksetup_user_restrict (rdtgrp)) { -rdt_last_cmd_puts ("unable to modify resctrl permissions\n" ); +rdt_last_cmd_puts ("Unable to modify resctrl permissions\n" );return -EIO ; } ret =pseudo_lock_init (rdtgrp);if (ret) { -rdt_last_cmd_puts ("unable to init pseudo-lock region\n" ); +rdt_last_cmd_puts ("Unable to init pseudo-lock region\n" ); goto out_release; }
@@ -770,7 +770,7 @@ int rdtgroup_locksetup_exit(struct rdtgroup *rdtgrp)if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" );return ret; } rdtgrp->mon.rmid = ret;
@@ -1304,7 +1304,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp) "pseudo_lock/%u", plr->cpu);if (IS_ERR (thread)) { ret =PTR_ERR (thread); -rdt_last_cmd_printf ("locking thread returned error %d\n" , ret); +rdt_last_cmd_printf ("Locking thread returned error %d\n" , ret); goto out_cstates; }
@@ -1322,13 +1322,13 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)* the cleared, but not freed, plr struct resulting in an * empty pseudo-locking loop. */ -rdt_last_cmd_puts ("locking thread interrupted\n" ); +rdt_last_cmd_puts ("Locking thread interrupted\n" ); goto out_cstates; } ret =pseudo_lock_minor_get (&new_minor);if (ret <0 ) { -rdt_last_cmd_puts ("unable to obtain a new minor number\n" ); +rdt_last_cmd_puts ("Unable to obtain a new minor number\n" ); goto out_cstates; }
@@ -1360,7 +1360,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp)if (IS_ERR (dev)) { ret =PTR_ERR (dev); -rdt_last_cmd_printf ("failed to create character device: %d\n" , +rdt_last_cmd_printf ("Failed to create character device: %d\n" , ret); goto out_debugfs; }
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +18 -18
@@ -345,7 +345,7 @@ static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,/* Check whether cpus belong to parent ctrl group */ cpumask_andnot (tmpmask, newmask, &prgrp->cpu_mask);if (cpumask_weight (tmpmask)) { -rdt_last_cmd_puts ("can only add CPUs to mongroup that belong to parent\n" ); +rdt_last_cmd_puts ("Can only add CPUs to mongroup that belong to parent\n" );return -EINVAL ; }
@@ -470,14 +470,14 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,rdt_last_cmd_clear ();if (!rdtgrp) { ret = -ENOENT ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto unlock; }if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -487,7 +487,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of, ret =cpumask_parse (buf, newmask);if (ret) { -rdt_last_cmd_puts ("bad cpu list/mask\n" ); +rdt_last_cmd_puts ("Bad CPU list/mask\n" ); goto unlock; }
@@ -495,7 +495,7 @@ static ssize_t rdtgroup_cpus_write(struct kernfs_open_file *of,cpumask_andnot (tmpmask, newmask, cpu_online_mask);if (cpumask_weight (tmpmask)) { ret = -EINVAL ; -rdt_last_cmd_puts ("can only assign online cpus\n" ); +rdt_last_cmd_puts ("Can only assign online CPUs\n" ); goto unlock; }
@@ -574,7 +574,7 @@ static int __rdtgroup_move_task(struct task_struct *tsk,*/ atomic_dec (&rdtgrp->waitcount);kfree (callback); -rdt_last_cmd_puts ("task exited\n" ); +rdt_last_cmd_puts ("Task exited\n" ); }else {/* * For ctrl_mon groups move both closid and rmid.
@@ -692,7 +692,7 @@ static ssize_t rdtgroup_tasks_write(struct kernfs_open_file *of,if (rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKED || rdtgrp->mode ==RDT_MODE_PSEUDO_LOCKSETUP ) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto unlock; }
@@ -1158,14 +1158,14 @@ static bool rdtgroup_mode_test_exclusive(struct rdtgroup *rdtgrp)list_for_each_entry (d, &r->domains, list) {if (rdtgroup_cbm_overlaps (r, d, d->ctrl_val[closid], rdtgrp->closid, false)) { -rdt_last_cmd_puts ("schemata overlaps\n" ); +rdt_last_cmd_puts ("Schemata overlaps\n" );return false; } } }if (!has_cache) { -rdt_last_cmd_puts ("cannot be exclusive without CAT/CDP\n" ); +rdt_last_cmd_puts ("Cannot be exclusive without CAT/CDP\n" );return false; }
@@ -1206,7 +1206,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out;if (mode ==RDT_MODE_PSEUDO_LOCKED ) { -rdt_last_cmd_printf ("cannot change pseudo-locked group\n" ); +rdt_last_cmd_printf ("Cannot change pseudo-locked group\n" ); ret = -EINVAL ; goto out; }
@@ -1235,7 +1235,7 @@ static ssize_t rdtgroup_mode_write(struct kernfs_open_file *of, goto out; rdtgrp->mode =RDT_MODE_PSEUDO_LOCKSETUP ; }else { -rdt_last_cmd_printf ("unknown/unsupported mode\n" ); +rdt_last_cmd_printf ("Unknown orunsupported mode\n" ); ret = -EINVAL ; }
@@ -2540,7 +2540,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp) tmp_cbm = d->new_ctrl;if (bitmap_weight (&tmp_cbm, r->cache.cbm_len) < r->cache.min_cbm_bits) { -rdt_last_cmd_printf ("no space on %s:%d\n" , +rdt_last_cmd_printf ("No space on %s:%d\n" , r->name, d->id);return -ENOSPC ; }
@@ -2557,7 +2557,7 @@ static int rdtgroup_init_alloc(struct rdtgroup *rdtgrp)continue ; ret =update_domains (r, rdtgrp->closid);if (ret <0 ) { -rdt_last_cmd_puts ("failed to initialize allocations\n" ); +rdt_last_cmd_puts ("Failed to initialize allocations\n" );return ret; } rdtgrp->mode =RDT_MODE_SHAREABLE ;
@@ -2580,7 +2580,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,rdt_last_cmd_clear ();if (!prdtgrp) { ret = -ENODEV ; -rdt_last_cmd_puts ("directory was removed\n" ); +rdt_last_cmd_puts ("Directory was removed\n" ); goto out_unlock; }
@@ -2588,7 +2588,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, (prdtgrp->mode == RDT_MODE_PSEUDO_LOCKSETUP || prdtgrp->mode == RDT_MODE_PSEUDO_LOCKED)) { ret = -EINVAL ; -rdt_last_cmd_puts ("pseudo-locking in progress\n" ); +rdt_last_cmd_puts ("Pseudo-locking in progress\n" ); goto out_unlock; }
@@ -2596,7 +2596,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn, rdtgrp =kzalloc (sizeof (*rdtgrp),GFP_KERNEL );if (!rdtgrp) { ret = -ENOSPC ; -rdt_last_cmd_puts ("kernel out of memory\n" ); +rdt_last_cmd_puts ("Kernel out of memory\n" ); goto out_unlock; } *r = rdtgrp;
@@ -2637,7 +2637,7 @@ static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,if (rdt_mon_capable) { ret =alloc_rmid ();if (ret <0 ) { -rdt_last_cmd_puts ("out of RMIDs\n" ); +rdt_last_cmd_puts ("Out of RMIDs\n" ); goto out_destroy; } rdtgrp->mon.rmid = ret;
@@ -2725,7 +2725,7 @@ static int rdtgroup_mkdir_ctrl_mon(struct kernfs_node *parent_kn, kn = rdtgrp->kn; ret =closid_alloc ();if (ret <0 ) { -rdt_last_cmd_puts ("out of CLOSIDs\n" ); +rdt_last_cmd_puts ("Out of CLOSIDs\n" ); goto out_common_fail; } closid = ret;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 71/304 drm: rcar-du: Fix external clock error checks
In reply to Sasha LevinFrom: Laurent Pinchart <[email protected]>
[ Upstream commit 63a298f22a6183b5b7536a203596c6570dfcfe8e ]
The rcar-du driver supports probe deferral for external clocks, but implements it badly by checking the wrong pointer due to a bad copy and paste. Fix it.
While at it, reject invalid clocks outright for DU channels that have a display PLL, as the external clock is mandatory in that case. This avoids a WARN_ON() at runtime.
--- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/rcar-du/rcar_du_crtc.c +9 -5
@@ -226,9 +226,6 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)* system clock, and have no internal clock divider. */ -if (WARN_ON (!rcrtc->extclock)) -return ; -/* * The H3 ES1.x exhibits dot clock duty cycle stability issues. * We can work around them by configuring the DPLL to twice the
@@ -1113,9 +1110,16 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex, clk =devm_clk_get (rcdu->dev, clk_name);if (!IS_ERR (clk)) { rcrtc->extclock = clk; - }else if (PTR_ERR (rcrtc->clock) == -EPROBE_DEFER ) { -dev_info (rcdu->dev,"can't get external clock %u\n" , hwindex); + }else if (PTR_ERR (clk) == -EPROBE_DEFER ) {return -EPROBE_DEFER ; + }else if (rcdu->info->dpll_mask &BIT (hwindex)) { +/* +* DU channels that have a display PLL can't use the internal +* system clock and thus require an external clock. +*/ + ret =PTR_ERR (clk); +dev_err (rcdu->dev,"can't get dclkin.%u: %d\n" , hwindex, ret); +return ret; }init_waitqueue_head (&rcrtc->flip_wait);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 72/304 ASoC: sunxi: sun50i-codec-analog: Add support for cpvdd regulator supply
In reply to Sasha LevinFrom: Chen-Yu Tsai <[email protected]>
[ Upstream commit ca0412a05756cd0b94751ca4d54fe6522f00b1f4 ]
On the Allwinner A64 SoCs, the audio codec has a built-in headphone amplifier. This amplifier has a power supply separate from the rest of the analog audio circuitry, labeled cpvdd.
This patch adds a DAPM widget for this supply, and ties it to the headphone amp widget.
--- sound/soc/sunxi/sun50i-codec-analog.c | 2 ++ 1 file changed, 2 insertions(+)
sound/soc/sunxi/sun50i-codec-analog.c +2 -0
@@ -274,6 +274,7 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = {* stream widgets at the card level. */ +SND_SOC_DAPM_REGULATOR_SUPPLY ("hpvcc" ,0 ,0 ),SND_SOC_DAPM_MUX ("Headphone Source Playback Route" ,SND_SOC_NOPM ,0 ,0 , sun50i_codec_hp_src), SND_SOC_DAPM_OUT_DRV("Headphone Amp", SUN50I_ADDA_HP_CTRL,
@@ -361,6 +362,7 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = { { "Headphone Source Playback Route", "Mixer", "Left Mixer" }, { "Headphone Source Playback Route", "Mixer", "Right Mixer" }, { "Headphone Amp", NULL, "Headphone Source Playback Route" }, + { "Headphone Amp", NULL, "hpvcc" }, { "HP", NULL, "Headphone Amp" }, /* Microphone Routes */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 73/304 clk: meson: meson8b: do not use cpu_div3 for cpu_scale_out_sel
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit a5ac1ead32c9aac285f6436e09b4f6111996e9b8 ]
The cpu_div3 clock (cpu_in divided by 3) generates a signal with a duty cycle of 33%. The CPU clock however requires a clock signal with a duty cycle of 50% to run stable.cpu_div3 was observed to be problematic when cycling through all available CPU frequencies (with additional patches on top of this one) while running "stress --cpu 4" in the background. This caused sporadic hangs where the whole system would fully lock up.
Amlogic's 3.10 kernel code also does not use the cpu_div3 clock either when changing the CPU clock.
--- drivers/clk/meson/meson8b.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/clk/meson/meson8b.c +9 -2
@@ -612,20 +612,27 @@ static struct clk_regmap meson8b_cpu_scale_div = { }, }; +static u32 mux_table_cpu_scale_out_sel[] = {0 ,1 ,3 };static struct clk_regmap meson8b_cpu_scale_out_sel = { .data = &(struct clk_regmap_mux_data ){ .offset =HHI_SYS_CPU_CLK_CNTL0 , .mask =0x3 , .shift =2 , + .table = mux_table_cpu_scale_out_sel, }, .hw.init = &(struct clk_init_data ){ .name ="cpu_scale_out_sel" , .ops = &clk_regmap_mux_ro_ops, +/* +* NOTE: We are skipping the parent with value 0x2 (which is +* "cpu_div3") because it results in a duty cycle of 33% which +* makes the system unstable and can result in a lockup of the +* whole system. +*/ .parent_names = (const char *[]) {"cpu_in_sel" ,"cpu_div2" , -"cpu_div3" ,"cpu_scale_div" }, - .num_parents =4 , + .num_parents =3 , .flags =CLK_SET_RATE_PARENT , }, };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 74/304 clk: meson: meson8b: fix the width of the cpu_scale_div clock
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit a8662eadd1032018f31e37deda811790b2326662 ]
According to the public S805 datasheet HHI_SYS_CPU_CLK_CNTL1[29:20] is the register for the CPU scale_div clock. This matches the code in Amlogic's 3.10 GPL kernel sources:
N = (aml_read_reg32(P_HHI_SYS_CPU_CLK_CNTL1) >> 20) & 0x3FF;
This means that the divider register is 10 bit wide instead of 9 bits. So far this is not a problem since all u-boot versions I have seen are not using the cpu_scale_div clock at all (instead they are configuring the CPU clock to run off cpu_in_sel directly).
The fixes tag points to the latest rework of the CPU clocks. However, even before the rework it was wrong. Commit 7a29a869434e8b ("clk: meson:
Add support for Meson clock controller") defines MESON_N_WIDTH as 9 (in drivers/clk/meson/clk-cpu.c). But since the old clk-cpu implementation this only carries the fixes tag for the CPU clock rewordk.
--- drivers/clk/meson/meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +1 -1
@@ -599,7 +599,7 @@ static struct clk_regmap meson8b_cpu_scale_div = { .data = &(struct clk_regmap_div_data){ .offset =HHI_SYS_CPU_CLK_CNTL1 , .shift =20 , - .width =9 , + .width =10 , .table = cpu_scale_table, .flags =CLK_DIVIDER_ALLOW_ZERO , },
Signature · 7 lines
2.19.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 75/304 clk: meson: meson8b: mark the CPU clock as CLK_IS_CRITICAL
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 0dad1ec65bc30a549aba38d34a727309bbf41bc8 ]
We don't want the common clock framework to disable the "cpu_clk" if it's not used by any device. The cpufreq-dt driver does not enable the CPU clocks. However, even if it would we would still want the CPU clock to be enabled at all times because the CPU clock is also required even if we disable CPU frequency scaling on a specific board.
The reason why we want the CPU clock to be enabled is a clock further up in the tree:
Since commit 6f888e7bc7bd58 ("clk: meson: clk-pll: add enable bit") the sys_pll can be disabled. However, since the CPU clock is derived from sys_pll we don't want sys_pll to get disabled. The common clock framework takes care of that for us by enabling all parent clocks of our CPU clock when we mark the CPU clock with CLK_IS_CRITICAL.
Until now this is not a problem yet because all clocks in the CPU clock's tree (including sys_pll) are read-only. However, once we allow modifications to the clocks in that tree we will need this.
--- drivers/clk/meson/meson8b.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/clk/meson/meson8b.c +2 -1
@@ -650,7 +650,8 @@ static struct clk_regmap meson8b_cpu_clk = { "cpu_scale_out_sel" }, .num_parents = 2, .flags = (CLK_SET_RATE_PARENT | - CLK_SET_RATE_NO_REPARENT), +CLK_SET_RATE_NO_REPARENT | + CLK_IS_CRITICAL), }, };
Signature · 7 lines
2.19.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Sasha Levin
maintainerPATCH 78/304 powerpc/32: Add .data..Lubsan_data*/.data..Lubsan_type* sections explicitly
In reply to Sasha LevinFrom: Mathieu Malaterre <[email protected]>
[ Upstream commit beba24ac59133cb36ecd03f9af9ccb11971ee20e ]
When both CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y and CONFIG_UBSAN=y are set, link step typically produce numberous warnings about orphan section:
+ powerpc-linux-gnu-ld -EB -m elf32ppc -Bstatic --orphan-handling=warn --build-id --gc-sections -X -o .tmp_vmlinux1 -T ./arch/powerpc/kernel/vmlinux.lds --who le-archive built-in.a --no-whole-archive --start-group lib/lib.a --end-group
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data393' from init/main.o' being placed in section `.data..Lubsan_data393'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_data394' from init/main.o' being placed in section `.data..Lubsan_data394'.
...
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type11' from init/main.o' being placed in section `.data..Lubsan_type11'.
powerpc-linux-gnu-ld: warning: orphan section .data..Lubsan_type12' from init/main.o' being placed in section `.data..Lubsan_type12'.
...
This commit remove those warnings produced at W=1.
--- arch/powerpc/kernel/vmlinux.lds.S | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/kernel/vmlinux.lds.S +4 -0
@@ -308,6 +308,10 @@ SECTIONS #ifdef CONFIG_PPC32 .data : AT(ADDR(.data) - LOAD_OFFSET) { DATA_DATA +#ifdef CONFIG_UBSAN + *(.data..Lubsan_data*) + *(.data..Lubsan_type*) +#endif *(.data.rel*) *(SDATA_MAIN) *(.sdata2)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 79/304 iio: adc: meson-saradc: check for devm_kasprintf failure
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit aad172b017617994343e36d8659c69e14cd694fd ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignments to init.name are not safe if not checked. On error meson_sar_adc_clk_init() returns negative values so -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here.
--- drivers/iio/adc/meson_saradc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/iio/adc/meson_saradc.c +6 -0
@@ -589,6 +589,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =0 ; init.ops = &clk_divider_ops; clk_parents[0 ] =__clk_get_name (priv->clkin);
@@ -608,6 +611,9 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev, init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , indio_dev->dev.of_node); +if (!init.name) +return -ENOMEM ; + init.flags =CLK_SET_RATE_PARENT ; init.ops = &clk_gate_ops; clk_parents[0 ] =__clk_get_name (priv->adc_div_clk);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 80/304 iio: adc: meson-saradc: fix internal clock names
In reply to Sasha LevinFrom: Martin Blumenstingl <[email protected]>
[ Upstream commit 50314f98b0ac468218e7c9af8c99f215a35436df ]
Before this patch we are registering the internal clocks (for example on Meson8b, where the SAR ADC IP block implements the divider and gate clocks) with the following names:
- /soc/cbus@c1100000/adc@8680#adc_div
- /soc/cbus@c1100000/adc@8680#adc_en
This is bad because the common clock framework uses the clock to create a directory in <debugfs>/clk. With such name, the directory creation (silently) fails and the debugfs entry ends up being created at the debugfs root.
With this change, the new clock names are:
- c1108680.adc#adc_div
- c1108680.adc#adc_en
This matches the clock naming scheme used in the PWM, Ethernet and MMC drivers. It also fixes the problem with debugfs.
The idea is shamelessly taken from commit b96e9eb62841c5 ("pwm: meson:
Fix mux clock names").
--- drivers/iio/adc/meson_saradc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/meson_saradc.c +4 -4
@@ -587,8 +587,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,struct clk_init_data init;const char *clk_parents[1 ]; - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_div" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_div" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
@@ -609,8 +609,8 @@ static int meson_sar_adc_clk_init(struct iio_dev *indio_dev,if (WARN_ON (IS_ERR (priv->adc_div_clk)))return PTR_ERR (priv->adc_div_clk); - init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%pOF#adc_en" , - indio_dev->dev.of_node); + init.name =devm_kasprintf (&indio_dev->dev,GFP_KERNEL ,"%s#adc_en" , +dev_name (indio_dev->dev.parent));if (!init.name)return -ENOMEM ;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 82/304 media: adv*/tc358743/ths8200: fill in min width/height/pixelclock
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 2912289a518077ddb8214e05336700148e97e235 ]
The v4l2_dv_timings_cap struct is used to do sanity checks when setting and enumerating DV timings, ensuring that only valid timings as per the HW capabilities are allowed.
However, many drivers just filled in 0 for the minimum width, height or pixelclock frequency. This can cause timings with e.g. 0 as width and height to be accepted, which will in turn lead to a potential division by zero.
Fill in proper values are minimum boundaries. 640x350 was chosen since it is the smallest resolution in v4l2-dv-timings.h. Same for 13 MHz as the lowest pixelclock frequency (it's slightly below the minimum of 13.5 MHz in the v4l2-dv-timings.h header).
--- drivers/media/i2c/ad9389b.c | 2 +- drivers/media/i2c/adv7511.c | 2 +- drivers/media/i2c/adv7604.c | 4 ++-- drivers/media/i2c/adv7842.c | 4 ++-- drivers/media/i2c/tc358743.c | 2 +- drivers/media/i2c/ths8200.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
drivers/media/i2c/ad9389b.c +1 -1
@@ -578,7 +578,7 @@ static const struct v4l2_dv_timings_cap ad9389b_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7511.c +1 -1
@@ -130,7 +130,7 @@ static const struct v4l2_dv_timings_cap adv7511_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT, + V4L2_INIT_BT_TIMINGS(640, ADV7511_MAX_WIDTH, 350, ADV7511_MAX_HEIGHT, ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
drivers/media/i2c/adv7604.c +2 -2
@@ -766,7 +766,7 @@ static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -777,7 +777,7 @@ static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/adv7842.c +2 -2
@@ -663,7 +663,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
@@ -674,7 +674,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, - V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
drivers/media/i2c/tc358743.c +1 -1
@@ -59,7 +59,7 @@ static const struct v4l2_dv_timings_cap tc358743_timings_cap = {/* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 },/* Pixel clock from REF_01 p. 20. Min/max height/width are unknown */ - V4L2_INIT_BT_TIMINGS(1, 10000, 1, 10000, 0, 165000000, + V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 13000000, 165000000, V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, V4L2_DV_BT_CAP_PROGRESSIVE |
drivers/media/i2c/ths8200.c +1 -1
@@ -49,7 +49,7 @@ static const struct v4l2_dv_timings_cap ths8200_timings_cap = { .type = V4L2_DV_BT_656_1120, /* keep this initialization for compatibility with GCC < 4.4.6 */ .reserved = { 0 }, -V4L2_INIT_BT_TIMINGS (0 ,1920 ,0 ,1080 ,25000000 ,148500000 , +V4L2_INIT_BT_TIMINGS (640 ,1920 ,350 ,1080 ,25000000 ,148500000 , V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE) };
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 84/304 staging: pi433: fix potential null dereference
In reply to Sasha LevinFrom: Michael Straube <[email protected]>
[ Upstream commit 64c4c4ca6c129a4191e8e1e91b2d5d9b8d08c518 ]
Add a test for successful call to cdev_alloc() to avoid potential null dereference. Issue reported by smatch.
--- drivers/staging/pi433/pi433_if.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/pi433/pi433_if.c +4 -0
@@ -1255,6 +1255,10 @@ static int pi433_probe(struct spi_device *spi)/* create cdev */ device->cdev =cdev_alloc (); +if (!device->cdev) { +dev_dbg (device->dev,"allocation of cdev failed" ); + goto cdev_failed; + } device->cdev->owner =THIS_MODULE ;cdev_init (device->cdev, &pi433_fops); retval =cdev_add (device->cdev, device->devt,1 );
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 85/304 f2fs: avoid GC causing encrypted file corrupted
In reply to Sasha LevinFrom: Yunlong Song <[email protected]>
[ Upstream commit 9bf1a3f73927492c8be127b642197125e9d52be8 ]
The encrypted file may be corrupted by GC in following case:
Time 1: | segment 1 blkaddr = A | GC -> | segment 2 blkaddr = B | Encrypted block 1 is moved from blkaddr A of segment 1 to blkaddr B of segment 2,
Time 2: | segment 1 blkaddr = B | GC -> | segment 3 blkaddr = C |
Before page 1 is written back and if segment 2 become a victim, then page 1 is moved from blkaddr B of segment 2 to blkaddr Cof segment 3, during the GC process of Time 2, f2fs should wait for page 1 written back before reading it, or move_data_block will read a garbage block from blkaddr B since page is not written back to blkaddr B yet.
Commit 6aa58d8a ("f2fs: readahead encrypted block during GC") introduce ra_data_block to read encrypted block, but it forgets to add f2fs_wait_on_page_writeback to avoid racing between GC and flush.
--- fs/f2fs/gc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/f2fs/gc.c +10 -0
@@ -658,6 +658,14 @@ got_it: fio.page = page; fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr; +/* +* don't cache encrypted data into meta inode until previous dirty +* data were writebacked to avoid racing between GC and flush. +*/ +f2fs_wait_on_page_writeback (page,DATA , true); + +f2fs_wait_on_block_writeback (inode, dn.data_blkaddr); + fio.encrypted_page =f2fs_pagecache_get_page (META_MAPPING (sbi), dn.data_blkaddr,FGP_LOCK |FGP_CREAT ,GFP_NOFS );
@@ -745,6 +753,8 @@ static int move_data_block(struct inode *inode, block_t bidx,*/ f2fs_wait_on_page_writeback (page,DATA , true); +f2fs_wait_on_block_writeback (inode, dn.data_blkaddr); + err =f2fs_get_node_info (fio.sbi, dn.nid, &ni);if (err) goto put_out;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 87/304 f2fs: avoid build warn of fall_through
In reply to Sasha LevinFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit f5d5510e7389fa264337fb524346bac9eb93adc8 ]
After merging the f2fs tree, today's linux-next build
(x86_64_allmodconfig) produced this warning:
In file included from fs/f2fs/dir.c:11:
fs/f2fs/f2fs.h: In function '__mark_inode_dirty_flag':
fs/f2fs/f2fs.h:2388:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (set)
^ fs/f2fs/f2fs.h:2390:2: note: here
case FI_DATA_EXIST:
^~~~
Exposed by my use of -Wimplicit-fallthrough
--- fs/f2fs/f2fs.h | 1 + 1 file changed, 1 insertion(+)
fs/f2fs/f2fs.h +1 -0
@@ -2370,6 +2370,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode,case FI_NEW_INODE :if (set)return ; +/* fall through */ case FI_DATA_EXIST :case FI_INLINE_DOTS :case FI_PIN_FILE :
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 89/304 f2fs: fix wrong return value of f2fs_acl_create
In reply to Sasha LevinFrom: Tiezhu Yang <[email protected]>
[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ]
When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create() should return -EIO instead of -ENOMEM, this patch makes it consistent with posix_acl_create() which has been fixed in commit beaf226b863a ("posix_acl: don't ignore return value of posix_acl_create_masq()").
--- fs/f2fs/acl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
fs/f2fs/acl.c +8 -6
@@ -352,12 +352,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return PTR_ERR (p); clone =f2fs_acl_clone (p,GFP_NOFS ); -if (!clone) - goto no_mem; +if (!clone) { + ret = -ENOMEM ; + goto release_acl; + } ret =f2fs_acl_create_masq (clone, mode);if (ret <0 ) - goto no_mem_clone; + goto release_clone;if (ret ==0 )posix_acl_release (clone);
@@ -371,11 +373,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t *mode,return 0 ; -no_mem_clone: +release_clone:posix_acl_release (clone); -no_mem: +release_acl:posix_acl_release (p); -return -ENOMEM ; +return ret; } int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 91/304 arm64: io: Ensure calls to delay routines are ordered against prior readX()
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit 6460d32014717686d3b7963595950ba2c6d1bb5e ]
A relatively standard idiom for ensuring that a pair of MMIO writes to a device arrive at that device with a specified minimum delay between them is as follows:
writel_relaxed(42, dev_base + CTL1); readl(dev_base + CTL1); udelay(10); writel_relaxed(42, dev_base + CTL2);
the intention being that the read-back from the device will push the prior write to CTL1, and the udelay will hold up the write to CTL1 until at least 10us have elapsed.
Unfortunately, on arm64 where the underlying delay loop is implemented as a read of the architected counter, the CPU does not guarantee ordering from the readl() to the delay loop and therefore the delay loop could in theory be speculated and not provide the desired interval between the two writes.
Fix this in a similar manner to PowerPC by introducing a dummy control dependency on the output of readX() which, combined with the ISB in the read of the architected counter, guarantees that a subsequent delay loop can not be executed until the readX() has returned its result.
--- arch/arm64/include/asm/io.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
arch/arm64/include/asm/io.h +23 -8
@@ -104,7 +104,22 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) }/* IO barriers */ -#define __iormb () rmb() +#define __iormb (v) \ +({ \ + unsigned long tmp; \ + \ + rmb(); \ + \ +/* \ +* Create a dummy control dependency from the IO read to any \ +* later instructions. This ensures that a subsequent call to \ +* udelay() will be ordered due to the ISB in get_cycles(). \ +*/ \ + asmvolatile ("eor %0, %1, %1\n" \ +"cbnz %0, ." \ + :"=r" (tmp) :"r" (v) :"memory" ); \ +}) +#define __iowmb () wmb()#define mmiowb () do { } while (0)
@@ -129,10 +144,10 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)* following Normal memory access. Writes are ordered relative to any prior * Normal memory access. */ -#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(); __v; }) -#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(); __v; }) -#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(); __v; }) -#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(); __v; }) +#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(__v); __v; }) +#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(__v); __v; }) +#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) +#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(__v); __v; })#define writeb (v,c) ({ __iowmb(); writeb_relaxed((v),(c)); })#define writew (v,c) ({ __iowmb(); writew_relaxed((v),(c)); })
@@ -183,9 +198,9 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);/* * io{read,write}{16,32,64}be() macros */ -#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; }) -#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; }) -#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; }) +#define ioread16be (p) ({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(__v); __v; }) +#define ioread32be (p) ({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(__v); __v; }) +#define ioread64be (p) ({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(__v); __v; })#define iowrite16be (v,p) ({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); })#define iowrite32be (v,p) ({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 92/304 net: aquantia: return 'err' if set MPI_DEINIT state fails
In reply to Sasha LevinFrom: YueHaibing <[email protected]>
[ Upstream commit 4e3c7c00bba0636b97eb23d582c20b0f5d95ce20 ]
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c:260:7:
warning: variable 'err' set but not used [-Wunused-but-set-variable]
'err' should be returned while set MPI_DEINIT state fails in hw_atl_utils_soft_reset.
--- drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c +2 -0
@@ -263,6 +263,8 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)AQ_HW_WAIT_FOR ((aq_hw_read_reg (self,HW_ATL_MPI_STATE_ADR ) &HW_ATL_MPI_STATE_MSK ) ==MPI_DEINIT ,10 ,1000U ); +if (err) +return err; }if (self->rbl_enabled)
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 93/304 sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
In reply to Sasha LevinFrom: Young Xiao <[email protected]>
[ Upstream commit a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec ]
__vdc_tx_trigger should only loop on EAGAIN a finite number of times.
See commit adddc32d6fde ("sunvnet: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN") for detail.
--- drivers/block/sunvdc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/block/sunvdc.c +5 -0
@@ -45,6 +45,8 @@ MODULE_VERSION(DRV_MODULE_VERSION);#define WAITING_FOR_GEN_CMD 0x04#define WAITING_FOR_ANY -1 +#define VDC_MAX_RETRIES 10 +static struct workqueue_struct *sunvdc_wq;struct vdc_req_entry {
@@ -431,6 +433,7 @@ static int __vdc_tx_trigger(struct vdc_port *port) .end_idx = dr->prod, };int err, delay; +int retries =0 ; hdr.seq = dr->snd_nxt; delay =1 ;
@@ -443,6 +446,8 @@ static int __vdc_tx_trigger(struct vdc_port *port)udelay (delay);if ((delay <<=1 ) >128 ) delay =128 ; +if (retries++ >VDC_MAX_RETRIES ) +break ; }while (err == -EAGAIN );if (err == -ENOTCONN )
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 96/304 drm: Clear state->acquire_ctx before leaving drm_atomic_helper_commit_duplicated_state()
In reply to Sasha LevinFrom: Sean Paul <[email protected]>
[ Upstream commit aa394b0dd68cb00c483e151dcd84713d4d517ed1 ]
drm_atomic_helper_commit_duplicated_state() sets state->acquire_ctx to the context given in the argument and leaves it in state after it quits. The lifetime of state and context are not guaranteed to be the same, so we shouldn't leave that pointer hanging around. This patch resets the context to NULL to avoid any oopses.
Changes in v2:
- Added to the set
--- drivers/gpu/drm/drm_atomic_helper.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +6 -2
@@ -3212,7 +3212,7 @@ EXPORT_SYMBOL(drm_atomic_helper_suspend);int drm_atomic_helper_commit_duplicated_state (struct drm_atomic_state *state,struct drm_modeset_acquire_ctx *ctx) { -int i; +int i, ret;struct drm_plane *plane;struct drm_plane_state *new_plane_state;struct drm_connector *connector;
@@ -3231,7 +3231,11 @@ int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state,for_each_new_connector_in_state (state, connector, new_conn_state, i) state->connectors[i].old_state = connector->state; -return drm_atomic_commit (state); + ret =drm_atomic_commit (state); + + state->acquire_ctx =NULL ; + +return ret; }EXPORT_SYMBOL (drm_atomic_helper_commit_duplicated_state);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 97/304 drm: Move drm_mode_setcrtc() local re-init to failure path
In reply to Sasha LevinFrom: Sean Paul <[email protected]>
[ Upstream commit c232e9f41b136c141df9938024e521191a7b910d ]
Instead of always re-initializing the variables we need to clean up on out, move the re-initialization into the branch that goes back to retry label.
This is a lateral move right now, but will allow us to pull out the modeset locking into common code. I kept this change separate to make things easier to review.
Changes in v2:
- None
--- drivers/gpu/drm/drm_crtc.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/drm_crtc.c +9 -7
@@ -570,9 +570,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,struct drm_mode_crtc *crtc_req = data;struct drm_crtc *crtc;struct drm_plane *plane; -struct drm_connector **connector_set, *connector; -struct drm_framebuffer *fb; -struct drm_display_mode *mode; +struct drm_connector **connector_set =NULL , *connector; +struct drm_framebuffer *fb =NULL ; +struct drm_display_mode *mode =NULL ;struct drm_mode_set set;uint32_t __user *set_connectors_ptr;struct drm_modeset_acquire_ctx ctx;
@@ -601,10 +601,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,mutex_lock (&crtc->dev->mode_config.mutex);drm_modeset_acquire_init (&ctx,DRM_MODESET_ACQUIRE_INTERRUPTIBLE ); retry: - connector_set =NULL ; - fb =NULL ; - mode =NULL ; - ret =drm_modeset_lock_all_ctx (crtc->dev, &ctx);if (ret) goto out;
@@ -766,6 +762,12 @@ out: }kfree (connector_set);drm_mode_destroy (dev, mode); + +/* In case we need to retry... */ + connector_set =NULL ; + fb =NULL ; + mode =NULL ; +if (ret == -EDEADLK ) { ret =drm_modeset_backoff (&ctx);if (!ret)
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 99/304 arm64: io: Ensure value passed to __iormb() is held in a 64-bit register
In reply to Sasha LevinFrom: Will Deacon <[email protected]>
[ Upstream commit 1b57ec8c75279b873639eb44a215479236f93481 ]
As of commit 6460d3201471 ("arm64: io: Ensure calls to delay routines are ordered against prior readX()"), MMIO reads smaller than 64 bits fail to compile under clang because we end up mixing 32-bit and 64-bit register operands for the same data processing instruction:
./include/asm-generic/io.h:695:9: warning: value size does not match register size specified by the constraint and modifier [-Wasm-operand-widths]
return readb(addr);
^
./arch/arm64/include/asm/io.h:147:58: note: expanded from macro 'readb'
^
./include/asm-generic/io.h:695:9: note: use constraint modifier "w"
./arch/arm64/include/asm/io.h:147:50: note: expanded from macro 'readb'
^
./arch/arm64/include/asm/io.h:118:24: note: expanded from macro '__iormb'
asm volatile("eor %0, %1, %1\n" \
^Fix the build by casting the macro argument to 'unsigned long' when used as an input to the inline asm.
--- arch/arm64/include/asm/io.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/io.h +2 -1
@@ -117,7 +117,8 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)*/ \ asmvolatile ("eor %0, %1, %1\n" \"cbnz %0, ." \ - :"=r" (tmp) :"r" (v) :"memory" ); \ + :"=r" (tmp) :"r" ((unsigned long )(v)) \ + :"memory" ); \ })#define __iowmb () wmb()
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 98/304 perf: arm_spe: handle devm_kasprintf() failure
In reply to Sasha LevinFrom: Nicholas Mc Guire <[email protected]>
[ Upstream commit 754a58db6a556e6e5f5e32f3e84e7d67b5bf9c8e ]
devm_kasprintf() may return NULL on failure of internal allocation thus the assignment to 'name' is not safe if unchecked. If NULL is passed in for name then perf_pmu_register() would not fail but rather silently jump to skip_type which is not the intent here. As perf_pmu_register() may also return -ENOMEM returning -ENOMEM in the (unlikely) failure case of devm_kasprintf() should be fine here as well.
--- drivers/perf/arm_spe_pmu.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/perf/arm_spe_pmu.c +5 -0
@@ -927,6 +927,11 @@ static int arm_spe_pmu_perf_init(struct arm_spe_pmu *spe_pmu) idx =atomic_inc_return (&pmu_idx); name =devm_kasprintf (dev,GFP_KERNEL ,"%s_%d" ,PMUNAME , idx); +if (!name) { +dev_err (dev,"failed to allocate name for pmu %d\n" , idx); +return -ENOMEM ; + } +return perf_pmu_register (&spe_pmu->pmu, name,-1 ); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 104/304 mt76x0: dfs: fix IBI_R11 configuration on non-radar channels
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 6bf4a8e902aad7df55d7f2b10b850cfa3f880996 ]
Fix IBI_R11 configuration on non-radar channels for mt76x0e driver. This patch improve system stability under heavy load. Moreover use IBI_R11 name and remove magic numbers for 0x212c register
--- drivers/net/wireless/mediatek/mt76/mt76x2/pci_dfs.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x2/pci_dfs.c +6 -2
@@ -800,7 +800,7 @@ static void mt76x2_dfs_set_bbp_params(struct mt76x02_dev *dev)/* enable detection*/ mt76_wr (dev,MT_BBP (DFS ,0 ),MT_DFS_CH_EN <<16 ); -mt76_wr (dev,0x212c ,0x0c350001 ); +mt76_wr (dev,MT_BBP (IBI ,11 ),0x0c350001 ); }void mt76x2_dfs_adjust_agc (struct mt76x02_dev *dev)
@@ -843,7 +843,11 @@ void mt76x2_dfs_init_params(struct mt76x02_dev *dev)mt76_wr (dev,MT_BBP (DFS ,0 ),0 );/* clear detector status */ mt76_wr (dev,MT_BBP (DFS ,1 ),0xf ); -mt76_wr (dev,0x212c ,0 ); +if (mt76_chip (&dev->mt76) ==0x7610 || +mt76_chip (&dev->mt76) ==0x7630 ) +mt76_wr (dev,MT_BBP (IBI ,11 ),0xfde8081 ); +else +mt76_wr (dev,MT_BBP (IBI ,11 ),0 );mt76x02_irq_disable (dev,MT_INT_GPTIMER ); mt76_rmw_field(dev, MT_INT_TIMER_EN,
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 105/304 mt76x0: use band parameter for LC calibration
In reply to Sasha LevinFrom: Stanislaw Gruszka <[email protected]>
[ Upstream commit ad3f993a0857ad3b792e7463828eb0d90cdd6f4d ]
We use always 1 as band parameter for MCU_CAL_LC, this break 2GHz, we should use 0 for this band instead.
Patch fixes problems happened sometimes when try to associate with 2GHz AP and manifest by errors like below:
[14680.920823] wlan0: authenticate with 18:31:bf:c0:51:b0 [14681.109506] wlan0: send auth to 18:31:bf:c0:51:b0 (try 1/3) [14681.310454] wlan0: send auth to 18:31:bf:c0:51:b0 (try 2/3) [14681.518469] wlan0: send auth to 18:31:bf:c0:51:b0 (try 3/3) [14681.726499] wlan0: authentication with 18:31:bf:c0:51:b0 timed out
--- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +3 -2
@@ -585,6 +585,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)void mt76x0_phy_calibrate (struct mt76x02_dev *dev,bool power_on) {struct ieee80211_channel *chan = dev->mt76.chandef.chan; +int is_5ghz = (chan->band ==NL80211_BAND_5GHZ ) ?1 :0 ;u32 val, tx_alc, reg_val;if (power_on) {
@@ -602,7 +603,7 @@ void mt76x0_phy_calibrate(struct mt76x02_dev *dev, bool power_on) reg_val =mt76_rr (dev,MT_BBP (IBI ,9 ));mt76_wr (dev,MT_BBP (IBI ,9 ),0xffffff7e ); -if (chan->band ==NL80211_BAND_5GHZ ) { +if (is_5ghz) {if (chan->hw_value <100 ) val =0x701 ;else if (chan->hw_value <140 )
@@ -615,7 +616,7 @@ void mt76x0_phy_calibrate(struct mt76x02_dev *dev, bool power_on)mt76x02_mcu_calibrate (dev,MCU_CAL_FULL , val, false);msleep (350 ); -mt76x02_mcu_calibrate (dev,MCU_CAL_LC ,1 , false); +mt76x02_mcu_calibrate (dev,MCU_CAL_LC , is_5ghz, false);usleep_range (15000 ,20000 );mt76_wr (dev,MT_BBP (IBI ,9 ), reg_val);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 107/304 drm/v3d: Fix prime imports of buffers from other drivers.
In reply to Sasha LevinFrom: Eric Anholt <[email protected]>
[ Upstream commit 62d1a752874962f072de8a779e960fcd2ab4847b ]
v3d_bo_get_pages() checks this to decide to map the imported buffer instead of the backing shmem file. The caller was about to set this value anyway, and there's no error path in between. Ideally we wouldn't even allocate the shmem file for our imports, but that's a more invasive fix.
--- drivers/gpu/drm/v3d/v3d_bo.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/v3d/v3d_bo.c +1 -0
@@ -293,6 +293,7 @@ v3d_prime_import_sg_table(struct drm_device *dev, bo->resv = attach->dmabuf->resv; bo->sgt = sgt; + obj->import_attach = attach;v3d_bo_get_pages (bo);v3d_mmu_insert_ptes (bo);
Signature · 6 lines
2.19.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 106/304 arm64: ftrace: don't adjust the LR value
In reply to Sasha LevinFrom: Mark Rutland <[email protected]>
[ Upstream commit 6e803e2e6e367db9a0d6ecae1bd24bb5752011bd ]
The core ftrace code requires that when it is handed the PC of an instrumented function, this PC is the address of the instrumented instruction. This is necessary so that the core ftrace code can identify the specific instrumentation site. Since the instrumented function will be a BL, the address of the instrumented function is LR - 4 at entry to the ftrace code.
This fixup is applied in the mcount_get_pc and mcount_get_pc0 helpers, which acquire the PC of the instrumented function.
The mcount_get_lr helper is used to acquire the LR of the instrumented function, whose value does not require this adjustment, and cannot be adjusted to anything meaningful. No adjustment of this value is made on other architectures, including arm. However, arm64 adjusts this value by 4.
This patch brings arm64 in line with other architectures and removes the adjustment of the LR value.
--- arch/arm64/kernel/entry-ftrace.S | 1 - 1 file changed, 1 deletion(-)
arch/arm64/kernel/entry-ftrace.S +0 -1
@@ -79,7 +79,6 @@ .macro mcount_get_lr reg ldr \reg, [x29] ldr \reg, [\reg, #8] - mcount_adjust_addr \reg, \reg .endm .macro mcount_get_lr_addr reg
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 109/304 nfp: add locking around representor changes
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 71844fac1ed459024dd2a448d63d5b28b8c87daa ]
Up until now we never needed to keep a networking locks around representors accesses, we only accessed them when device was reconfigured (under nfp pf->lock) or on fast path (under RCU). Now we want to be able to iterate over all representors during notifications, so make sure representor assignment is done under RTNL lock.
--- drivers/net/ethernet/netronome/nfp/abm/main.c | 4 ++++ drivers/net/ethernet/netronome/nfp/nfp_app.c | 2 ++ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 ++ 3 files changed, 8 insertions(+)
drivers/net/ethernet/netronome/nfp/abm/main.c +4 -0
@@ -384,7 +384,9 @@ nfp_abm_spawn_repr(struct nfp_app *app, struct nfp_abm_link *alink, reprs =nfp_reprs_get_locked (app, rtype);WARN (nfp_repr_get_locked (app, reprs, alink->id),"duplicate repr" ); +rtnl_lock ();rcu_assign_pointer (reprs->reprs[alink->id], netdev); +rtnl_unlock (); nfp_info(app->cpp, "%s Port %d Representor(%s) created\n", ptype == NFP_PORT_PF_PORT ? "PCIe" : "Phys",
@@ -410,7 +412,9 @@ nfp_abm_kill_repr(struct nfp_app *app, struct nfp_abm_link *alink, netdev =nfp_repr_get_locked (app, reprs, alink->id);if (!netdev)return ; +rtnl_lock ();rcu_assign_pointer (reprs->reprs[alink->id],NULL ); +rtnl_unlock ();synchronize_rcu ();/* Cast to make sure nfp_repr_clean_and_free() takes a nfp_repr */ nfp_repr_clean_and_free ((struct nfp_repr *)netdev_priv (netdev));
drivers/net/ethernet/netronome/nfp/nfp_app.c +2 -0
@@ -131,7 +131,9 @@ nfp_app_reprs_set(struct nfp_app *app, enum nfp_repr_type type,struct nfp_reprs *old; old =nfp_reprs_get_locked (app, type); +rtnl_lock ();rcu_assign_pointer (app->reprs[type], reprs); +rtnl_unlock ();return old; }
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c +2 -0
@@ -442,7 +442,9 @@ int nfp_reprs_resync_phys_ports(struct nfp_app *app)continue ;nfp_app_repr_preclean (app, netdev); +rtnl_lock ();rcu_assign_pointer (reprs->reprs[i],NULL ); +rtnl_unlock ();synchronize_rcu ();nfp_repr_clean (repr); }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 110/304 ARM: mmp/mmp2: dt: enable the clock
In reply to Sasha LevinFrom: Lubomir Rintel <[email protected]>
[ Upstream commit f36797ee43802b367e59f0f9a9805304a4ff0c98 ]
The device-tree booted MMP2 needs to enable the timer clock, otherwise it would stop ticking when the boot finishes.
It can also use the clock rate from the clk, the non-DT boards need to keep using the hardcoded rates.
--- arch/arm/mach-mmp/common.h | 2 +- arch/arm/mach-mmp/mmp2.c | 2 +- arch/arm/mach-mmp/pxa168.c | 2 +- arch/arm/mach-mmp/time.c | 32 ++++++++++++++++++++------------ 4 files changed, 23 insertions(+), 15 deletions(-)
arch/arm/mach-mmp/common.h +1 -1
@@ -2,7 +2,7 @@#include <linux/reboot.h> #define ARRAY_AND_SIZE (x) (x), ARRAY_SIZE(x) -extern void timer_init (int irq); +extern void timer_init (int irq,unsigned long rate);extern void __init mmp_map_io (void );extern void mmp_restart (enum reboot_mode ,const char *);
arch/arm/mach-mmp/mmp2.c +1 -1
@@ -134,7 +134,7 @@ void __init mmp2_timer_init(void) clk_rst =APBC_APBCLK |APBC_FNCLK |APBC_FNCLKSEL (1 );__raw_writel (clk_rst,APBC_TIMERS ); -timer_init (IRQ_MMP2_TIMER1 ); +timer_init (IRQ_MMP2_TIMER1 ,6500000 ); }/* on-chip devices */
arch/arm/mach-mmp/pxa168.c +1 -1
@@ -79,7 +79,7 @@ void __init pxa168_timer_init(void)/* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel (TIMER_CLK_RST ,APBC_TIMERS ); -timer_init (IRQ_PXA168_TIMER1 ); +timer_init (IRQ_PXA168_TIMER1 ,6500000 ); }void pxa168_clear_keypad_wakeup (void )
arch/arm/mach-mmp/time.c +20 -12
@@ -22,6 +22,7 @@#include <linux/kernel.h> #include <linux/interrupt.h> #include <linux/clockchips.h> +#include <linux/clk.h> #include <linux/io.h> #include <linux/irq.h>
@@ -38,12 +39,6 @@#include "cputype.h" #include "clock.h" -#ifdef CONFIG_CPU_MMP2 -#define MMP_CLOCK_FREQ 6500000 -#else -#define MMP_CLOCK_FREQ 3250000 -#endif -#define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE#define MAX_DELTA (0xfffffffe)
@@ -189,19 +184,18 @@ static struct irqaction timer_irq = { .dev_id = &ckevt, }; -void __init timer_init (int irq) +void __init timer_init (int irq,unsigned long rate) {timer_config (); -sched_clock_register (mmp_read_sched_clock,32 ,MMP_CLOCK_FREQ ); +sched_clock_register (mmp_read_sched_clock,32 , rate); ckevt.cpumask =cpumask_of (0 );setup_irq (irq, &timer_irq); -clocksource_register_hz (&cksrc,MMP_CLOCK_FREQ ); -clockevents_config_and_register (&ckevt,MMP_CLOCK_FREQ , -MIN_DELTA ,MAX_DELTA ); +clocksource_register_hz (&cksrc, rate); +clockevents_config_and_register (&ckevt, rate,MIN_DELTA ,MAX_DELTA ); }#ifdef CONFIG_OF
@@ -213,7 +207,9 @@ static const struct of_device_id mmp_timer_dt_ids[] = {void __init mmp_dt_init_timer (void ) {struct device_node *np; +struct clk *clk;int irq, ret; +unsigned long rate; np =of_find_matching_node (NULL , mmp_timer_dt_ids);if (!np) {
@@ -221,6 +217,18 @@ void __init mmp_dt_init_timer(void) goto out; } + clk =of_clk_get (np,0 ); +if (!IS_ERR (clk)) { + ret =clk_prepare_enable (clk); +if (ret) + goto out; + rate =clk_get_rate (clk) /2 ; + }else if (cpu_is_pj4 ()) { + rate =6500000 ; + }else { + rate =3250000 ; + } + irq =irq_of_parse_and_map (np,0 );if (!irq) { ret = -EINVAL ;
@@ -231,7 +239,7 @@ void __init mmp_dt_init_timer(void) ret = -ENOMEM ; goto out; } -timer_init (irq); +timer_init (irq, rate);return ; out:pr_err ("Failed to get timer from device tree with error:%d\n" , ret);
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 114/304 media: i2c: TDA1997x: select CONFIG_HDMI
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 79e89e36dc8a47ef965a35b484d737a5227feed1 ]
Without CONFIG_HDMI, we get a link error for this driver:
drivers/media/i2c/tda1997x.o: In function `tda1997x_parse_infoframe':
tda1997x.c:(.text+0x2195): undefined reference to hdmi_infoframe_unpack' tda1997x.c:(.text+0x21b6): undefined reference to hdmi_infoframe_log' drivers/media/i2c/tda1997x.o: In function `tda1997x_log_infoframe':
tda1997x.c:(.text.unlikely+0x13d3): undefined reference to hdmi_infoframe_unpack' tda1997x.c:(.text.unlikely+0x1426): undefined reference to hdmi_infoframe_log'
All other drivers in this directory that use HDMI select CONFIG_HDMI, so do the same here:
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -61,6 +61,7 @@ config VIDEO_TDA1997X depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API depends on SND_SOC select SND_PCM + select HDMI ---help--- V4L2 subdevice driver for the NXP TDA1997x HDMI receivers.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 115/304 media: DaVinci-VPBE: fix error handling in vpbe_initialize()
In reply to Sasha LevinFrom: Alexey Khoroshilov <[email protected]>
[ Upstream commit aa35dc3c71950e3fec3e230c06c27c0fbd0067f8 ]
If vpbe_set_default_output() or vpbe_set_default_mode() fails, vpbe_initialize() returns error code without releasing resources.
The patch adds error handling for that case.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/media/platform/davinci/vpbe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/media/platform/davinci/vpbe.c +5 -2
@@ -740,7 +740,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default output %s" , def_output); -return ret; + goto fail_kfree_amp; }printk (KERN_NOTICE "Setting default mode to %s\n" , def_mode);
@@ -748,12 +748,15 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)if (ret) {v4l2_err (&vpbe_dev->v4l2_dev,"Failed to set default mode %s" , def_mode); -return ret; + goto fail_kfree_amp; } vpbe_dev->initialized =1 ;/* TBD handling of bootargs for default output and mode */ return 0 ; +fail_kfree_amp: +mutex_lock (&vpbe_dev->lock); +kfree (vpbe_dev->amp); fail_kfree_encoders:kfree (vpbe_dev->encoders); fail_dev_unregister:
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 117/304 smack: fix access permissions for keyring
In reply to Sasha LevinFrom: Zoran Markovic <[email protected]>
[ Upstream commit 5b841bfab695e3b8ae793172a9ff7990f99cc3e2 ]
Function smack_key_permission() only issues smack requests for the following operations:
- KEY_NEED_READ (issues MAY_READ)
- KEY_NEED_WRITE (issues MAY_WRITE)
- KEY_NEED_LINK (issues MAY_WRITE)
- KEY_NEED_SETATTR (issues MAY_WRITE)
A blank smack request is issued in all other cases, resulting in smack access being granted if there is any rule defined between subject and object, or denied with -EACCES otherwise.
Request MAY_READ access for KEY_NEED_SEARCH and KEY_NEED_VIEW. Fix the logic in the unlikely case when both MAY_READ and MAY_WRITE are needed. Validate access permission field for valid contents.
--- security/smack/smack_lsm.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
security/smack/smack_lsm.c +9 -3
@@ -4333,6 +4333,12 @@ static int smack_key_permission(key_ref_t key_ref,int request =0 ;int rc; +/* +* Validate requested permissions +*/ +if (perm & ~KEY_NEED_ALL ) +return -EINVAL ; + keyp =key_ref_to_ptr (key_ref);if (keyp ==NULL )return -EINVAL ;
@@ -4356,10 +4362,10 @@ static int smack_key_permission(key_ref_t key_ref, ad.a.u.key_struct.key = keyp->serial; ad.a.u.key_struct.key_desc = keyp->description;#endif -if (perm &KEY_NEED_READ ) - request =MAY_READ ; +if (perm & (KEY_NEED_READ |KEY_NEED_SEARCH |KEY_NEED_VIEW )) + request |=MAY_READ ;if (perm & (KEY_NEED_WRITE |KEY_NEED_LINK |KEY_NEED_SETATTR )) - request =MAY_WRITE ; + request |=MAY_WRITE ; rc =smk_access (tkp, keyp->security, request, &ad); rc =smk_bu_note ("key access" , tkp, keyp->security, request, rc);return rc;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 120/304 dmaengine: sprd: Support DMA link-list cyclic callback
In reply to Sasha LevinFrom: Eric Long <[email protected]>
[ Upstream commit 97dbd6ea02beb3a7027c158e0a110b5095268d59 ]
The Spreadtrum DMA link-list mode is always one cyclic transfer, so we should clear the SPRD_DMA_LLIST_END flag for the link-list configuration. Moreover add cyclic callback support for the cyclic transfer.
--- drivers/dma/sprd-dma.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/dma/sprd-dma.c +14 -11
@@ -450,7 +450,7 @@ static irqreturn_t dma_irq_handle(int irq, void *dev_id)struct sprd_dma_desc *sdesc;enum sprd_dma_req_mode req_type;enum sprd_dma_int_type int_type; -bool trans_done = false; +bool trans_done = false, cyclic = false;u32 i;while (irq_status) {
@@ -465,13 +465,19 @@ static irqreturn_t dma_irq_handle(int irq, void *dev_id) sdesc = schan->cur_desc; -/* Check if the dma request descriptor is done. */ - trans_done =sprd_dma_check_trans_done (sdesc, int_type, - req_type); -if (trans_done == true) { -vchan_cookie_complete (&sdesc->vd); - schan->cur_desc =NULL ; -sprd_dma_start (schan); +/* cyclic mode schedule callback */ + cyclic = schan->linklist.phy_addr ? true : false; +if (cyclic == true) { +vchan_cyclic_callback (&sdesc->vd); + }else { +/* Check if the dma request descriptor is done. */ + trans_done =sprd_dma_check_trans_done (sdesc, int_type, + req_type); +if (trans_done == true) { +vchan_cookie_complete (&sdesc->vd); + schan->cur_desc =NULL ; +sprd_dma_start (schan); + } }spin_unlock (&schan->vc.lock); }
@@ -674,9 +680,6 @@ static int sprd_dma_fill_desc(struct dma_chan *chan,/* link-list configuration */ if (schan->linklist.phy_addr) { -if (sg_index == sglen -1 ) - hw->frg_len |=SPRD_DMA_LLIST_END ; - hw->cfg |=SPRD_DMA_LINKLIST_EN ;/* link-list index */
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 122/304 usb: hub: delay hub autosuspend if USB3 port is still link training
In reply to Sasha LevinFrom: Mathias Nyman <[email protected]>
[ Upstream commit e86108940e541febf35813402ff29fa6f4a9ac0b ]
When initializing a hub we want to give a USB3 port in link training the same debounce delay time before autosuspening the hub as already trained, connected enabled ports.
USB3 ports won't reach the enabled state with "current connect status" and "connect status change" bits set until the USB3 link training finishes.
Catching the port in link training (polling) and adding the debounce delay prevents unnecessary failed attempts to autosuspend the hub.
--- drivers/usb/core/hub.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/usb/core/hub.c +10 -0
@@ -1112,6 +1112,16 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) USB_PORT_FEAT_ENABLE); } +/* +* Add debounce if USB3 link is in polling/link training state. +* Link will automatically transition to Enabled state after +* link training completes. +*/ +if (hub_is_superspeed (hdev) && + ((portstatus &USB_PORT_STAT_LINK_STATE ) == +USB_SS_PORT_LS_POLLING )) + need_debounce_delay = true; +/* Clear status-change flags; we'll debounce later */ if (portchange &USB_PORT_STAT_C_CONNECTION ) { need_debounce_delay = true;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 124/304 usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)
In reply to Sasha LevinFrom: Chunfeng Yun <[email protected]>
[ Upstream commit a0678e2eed41e81004308693ac84ea95614b0920 ]
Fix the issue: device doesn't accept LGO_U1/U2:
1. set SW_U1/U2_ACCEPT_ENABLE to eanble controller to accept LGO_U1/U2
by default;
2. enable/disable controller to initiate requests for transition into
U1/U2 by SW_U1/U2_REQUEST_ENABLE instead of SW_U1/U2_ACCEPT_ENABLE;--- drivers/usb/mtu3/mtu3_core.c | 4 +++- drivers/usb/mtu3/mtu3_gadget_ep0.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/usb/mtu3/mtu3_core.c +3 -1
@@ -578,8 +578,10 @@ static void mtu3_regs_init(struct mtu3 *mtu)if (mtu->is_u3_ip) {/* disable LGO_U1/U2 by default */ mtu3_clrbits (mbase,U3D_LINK_POWER_CONTROL , -SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE |SW_U1_REQUEST_ENABLE |SW_U2_REQUEST_ENABLE ); +/* enable accept LGO_U1/U2 link command from host */ +mtu3_setbits (mbase,U3D_LINK_POWER_CONTROL , +SW_U1_ACCEPT_ENABLE |SW_U2_ACCEPT_ENABLE );/* device responses to u3_exit from host automatically */ mtu3_clrbits (mbase,U3D_LTSSM_CTRL ,SOFT_U3_EXIT_EN );/* automatically build U2 link when U3 detect fail */
drivers/usb/mtu3/mtu3_gadget_ep0.c +4 -4
@@ -336,9 +336,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U1_ACCEPT_ENABLE ; + lpc |=SW_U1_REQUEST_ENABLE ;else - lpc &= ~SW_U1_ACCEPT_ENABLE ; + lpc &= ~SW_U1_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u1_enable = !!set;
@@ -351,9 +351,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, lpc =mtu3_readl (mbase,U3D_LINK_POWER_CONTROL );if (set) - lpc |=SW_U2_ACCEPT_ENABLE ; + lpc |=SW_U2_REQUEST_ENABLE ;else - lpc &= ~SW_U2_ACCEPT_ENABLE ; + lpc &= ~SW_U2_REQUEST_ENABLE ;mtu3_writel (mbase,U3D_LINK_POWER_CONTROL , lpc); mtu->u2_enable = !!set;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 126/304 media: imx274: select REGMAP_I2C
In reply to Sasha LevinFrom: Luca Ceresoli <[email protected]>
[ Upstream commit 4f9d7225c70dd9d3f406b79e60f8dbd2cd5ae743 ]
The imx274 driver uses regmap and the build will fail without it.
Fixes:
drivers/media/i2c/imx274.c:142:21: error: variable ‘imx274_regmap_config’ has initializer but incomplete type
static const struct regmap_config imx274_regmap_config = {
^~~~~~~~~~~~~
drivers/media/i2c/imx274.c:1869:19: error: implicit declaration of function ‘devm_regmap_init_i2c’ [-Werror=implicit-function-declaration]
imx274->regmap = devm_regmap_init_i2c(client, &imx274_regmap_config);
^~~~~~~~~~~~~~~~~~~~and others.
--- drivers/media/i2c/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/media/i2c/Kconfig +1 -0
@@ -611,6 +611,7 @@ config VIDEO_IMX274 tristate "Sony IMX274 sensor support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API depends on MEDIA_CAMERA_SUPPORT + select REGMAP_I2C ---help--- This is a V4L2 sensor driver for the Sony IMX274 CMOS image sensor.
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 130/304 tipc: fix node keep alive interval calculation
In reply to Sasha LevinFrom: Hoang Le <[email protected]>
[ Upstream commit f5d6c3e5a359c0507800e7ac68d565c21de9b5a1 ]
When setting LINK tolerance, node timer interval will be calculated base on the LINK with lowest tolerance.
But when calculated, the old node timer interval only updated if current setting value (tolerance/4) less than old ones regardless of number of links as well as links' lowest tolerance value.
This caused to two cases missing if tolerance changed as following:
Case 1:
1.1/ There is one link (L1) available in the system
1.2/ Set L1's tolerance from 1500ms => lower (i.e 500ms) 1.3/ Then, fallback to default (1500ms) or higher (i.e 2000ms)
Expected:
node timer interval is 1500/4=375ms after 1.3
Result:
node timer interval will not being updated after changing tolerance at 1.3 since its value 1500/4=375ms is not less than 500/4=125ms at 1.2.
Case 2:
2.1/ There are two links (L1, L2) available in the system 2.2/ L1 and L2 tolerance value are 2000ms as initial 2.3/ Set L2's tolerance from 2000ms => lower 1500ms 2.4/ Disable link L2 (bring down its bearer)
Expected:
node timer interval is 2000ms/4=500ms after 2.4
Result:
node timer interval will not being updated after disabling L2 since its value 2000ms/4=500ms is still not less than 1500/4=375ms at 2.3 although L2 is already not available in the system.
To fix this, we start the node interval calculation by initializing it to a value larger than any conceivable calculated value. This way, the link with the lowest tolerance will always determine the calculated value.
--- net/tipc/node.c | 6 ++++++ 1 file changed, 6 insertions(+)
net/tipc/node.c +6 -0
@@ -624,6 +624,12 @@ static void tipc_node_timeout(struct timer_list *t)__skb_queue_head_init (&xmitq); +/* Initial node interval to value larger (10 seconds), then it will be +* recalculated with link lowest tolerance +*/ +tipc_node_read_lock (n); + n->keepalive_intv =10000 ; +tipc_node_read_unlock (n);for (bearer_id =0 ; remains && (bearer_id <MAX_BEARERS ); bearer_id++) {tipc_node_read_lock (n); le = &n->links[bearer_id];
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 27/304 powerpc/pseries: add of_node_put() in dlpar_detach_node()
In reply to Sasha LevinFrom: Frank Rowand <[email protected]>
[ Upstream commit 5b3f5c408d8cc59b87e47f1ab9803dbd006e4a91 ]
The previous commit, "of: overlay: add missing of_node_get() in __of_attach_node_sysfs" added a missing of_node_get() to __of_attach_node_sysfs(). This results in a refcount imbalance for nodes attached with dlpar_attach_node(). The calling sequence from dlpar_attach_node() to __of_attach_node_sysfs() is:
dlpar_attach_node()
of_attach_node()
__of_attach_node_sysfs()For more detailed description of the node refcount, see commit 68baf692c435 ("powerpc/pseries: Fix of_node_put() underflow during DLPAR remove").
--- arch/powerpc/platforms/pseries/dlpar.c | 2 ++ 1 file changed, 2 insertions(+)
arch/powerpc/platforms/pseries/dlpar.c +2 -0
@@ -270,6 +270,8 @@ int dlpar_detach_node(struct device_node *dn)if (rc)return rc; +of_node_put (dn); +return 0 ; }
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 133/304 kobject: return error code if writing /sys/.../uevent fails
In reply to Sasha LevinFrom: Peter Rajnoha <[email protected]>
[ Upstream commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ]
Propagate error code back to userspace if writing the /sys/.../uevent file fails. Before, the write operation always returned with success, even if we failed to recognize the input string or if we failed to generate the uevent itself.
With the error codes properly propagated back to userspace, we are able to react in userspace accordingly by not assuming and awaiting a uevent that is not delivered.
--- drivers/base/bus.c | 12 ++++++++---- drivers/base/core.c | 8 +++++++- kernel/module.c | 6 ++++-- 3 files changed, 19 insertions(+), 7 deletions(-)
drivers/base/bus.c +8 -4
@@ -614,8 +614,10 @@ static void remove_probe_files(struct bus_type *bus)static ssize_t uevent_store (struct device_driver *drv,const char *buf,size_t count) { -kobject_synth_uevent (&drv->p->kobj, buf, count); -return count; +int rc; + + rc =kobject_synth_uevent (&drv->p->kobj, buf, count); +return rc ? rc : count; }static DRIVER_ATTR_WO (uevent);
@@ -831,8 +833,10 @@ static void klist_devices_put(struct klist_node *n)static ssize_t bus_uevent_store (struct bus_type *bus,const char *buf,size_t count) { -kobject_synth_uevent (&bus->p->subsys.kobj, buf, count); -return count; +int rc; + + rc =kobject_synth_uevent (&bus->p->subsys.kobj, buf, count); +return rc ? rc : count; } static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);
drivers/base/core.c +7 -1
@@ -1067,8 +1067,14 @@ out:static ssize_t uevent_store (struct device *dev,struct device_attribute *attr,const char *buf,size_t count) { -if (kobject_synth_uevent (&dev->kobj, buf, count)) +int rc; + + rc =kobject_synth_uevent (&dev->kobj, buf, count); + +if (rc) {dev_err (dev,"uevent: failed to send synthetic uevent\n" ); +return rc; + }return count; }
kernel/module.c +4 -2
@@ -1207,8 +1207,10 @@ static ssize_t store_uevent(struct module_attribute *mattr,struct module_kobject *mk, const char *buffer, size_t count) { - kobject_synth_uevent(&mk->kobj, buffer, count); -return count; + int rc; + + rc =kobject_synth_uevent (&mk->kobj, buffer, count); +return rc ? rc : count; } struct module_attribute module_uevent =
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 140/304 media: v4l2-device: Link subdevices to their parent devices if available
In reply to Sasha LevinFrom: Tomasz Figa <[email protected]>
[ Upstream commit ee494cf377e142f65f202fadf0d859f8e12119fb ]
Currently v4l2_device_register_subdev_nodes() does not initialize the dev_parent field of the video_device structs it creates for subdevices being registered. This leads to __video_register_device() falling back to the parent device of associated v4l2_device struct, which often does not match the physical device the subdevice is registered for.
Due to the problem above, the links between real devices and v4l-subdev nodes cannot be obtained from sysfs, which might be confusing for the userspace trying to identify the hardware.
Fix this by initializing the dev_parent field of the video_device struct with the value of dev field of the v4l2_subdev struct. In case of subdevices without a parent struct device, the field will be NULL and the old behavior will be preserved by the semantics of __video_register_device().
--- drivers/media/v4l2-core/v4l2-device.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/v4l2-core/v4l2-device.c +1 -0
@@ -247,6 +247,7 @@ int v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev)video_set_drvdata (vdev, sd);strscpy (vdev->name, sd->name,sizeof (vdev->name)); + vdev->dev_parent = sd->dev; vdev->v4l2_dev = v4l2_dev; vdev->fops = &v4l2_subdev_fops; vdev->release = v4l2_device_release_subdev_node;
Signature · 1 line
2.19.1
Sasha Levin
maintainerPATCH 143/304 mips: bpf: fix encoding bug for mm_srlv32_op
In reply to Sasha LevinFrom: Jiong Wang <[email protected]>
[ Upstream commit 17f6c83fb5ebf7db4fcc94a5be4c22d5a7bfe428 ]
For micro-mips, srlv inside POOL32A encoding space should use 0x50 sub-opcode, NOT 0x90.
Some early version ISA doc describes the encoding as 0x90 for both srlv and srav, this looks to me was a typo. I checked Binutils libopcode implementation which is using 0x50 for srlv and 0x90 for srav.
v1->v2:
- Keep mm_srlv32_op sorted by value.
--- arch/mips/include/uapi/asm/inst.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/include/uapi/asm/inst.h +1 -1
@@ -369,8 +369,8 @@ enum mm_32a_minor_op { mm_ext_op =0x02c , mm_pool32axf_op =0x03c , mm_srl32_op =0x040 , + mm_srlv32_op =0x050 , mm_sra_op =0x080 , - mm_srlv32_op =0x090 , mm_rotr_op =0x0c0 , mm_lwxs_op =0x118 , mm_addu32_op = 0x150,
Signature · 1 line
2.19.1