@@ -185,17 +185,17 @@ static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev)
185185 * If we don't have a buffer release the lock and allocate memory.
186186 * Otherwise keep the lock and move along.
187187 */
188- spin_lock_irqsave (& drvdata -> spinlock , flags );
188+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
189189 if (!drvdata -> buf ) {
190- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
190+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
191191
192192 /* Allocating the memory here while outside of the spinlock */
193193 buf = kzalloc (drvdata -> size , GFP_KERNEL );
194194 if (!buf )
195195 return - ENOMEM ;
196196
197197 /* Let's try again */
198- spin_lock_irqsave (& drvdata -> spinlock , flags );
198+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
199199 }
200200
201201 if (drvdata -> reading ) {
@@ -237,7 +237,7 @@ static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev)
237237 used = false;
238238 }
239239out :
240- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
240+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
241241
242242 /* Free memory outside the spinlock if need be */
243243 if (!used )
@@ -255,7 +255,7 @@ static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, void *data)
255255 struct perf_output_handle * handle = data ;
256256 struct cs_buffers * buf = etm_perf_sink_config (handle );
257257
258- spin_lock_irqsave (& drvdata -> spinlock , flags );
258+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
259259 do {
260260 ret = - EINVAL ;
261261 if (drvdata -> reading )
@@ -298,7 +298,7 @@ static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, void *data)
298298 csdev -> refcnt ++ ;
299299 }
300300 } while (0 );
301- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
301+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
302302
303303 return ret ;
304304}
@@ -333,16 +333,16 @@ static int tmc_disable_etf_sink(struct coresight_device *csdev)
333333 unsigned long flags ;
334334 struct tmc_drvdata * drvdata = dev_get_drvdata (csdev -> dev .parent );
335335
336- spin_lock_irqsave (& drvdata -> spinlock , flags );
336+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
337337
338338 if (drvdata -> reading ) {
339- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
339+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
340340 return - EBUSY ;
341341 }
342342
343343 csdev -> refcnt -- ;
344344 if (csdev -> refcnt ) {
345- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
345+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
346346 return - EBUSY ;
347347 }
348348
@@ -353,7 +353,7 @@ static int tmc_disable_etf_sink(struct coresight_device *csdev)
353353 drvdata -> pid = -1 ;
354354 coresight_set_mode (csdev , CS_MODE_DISABLED );
355355
356- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
356+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
357357
358358 dev_dbg (& csdev -> dev , "TMC-ETB/ETF disabled\n" );
359359 return 0 ;
@@ -368,9 +368,9 @@ static int tmc_enable_etf_link(struct coresight_device *csdev,
368368 struct tmc_drvdata * drvdata = dev_get_drvdata (csdev -> dev .parent );
369369 bool first_enable = false;
370370
371- spin_lock_irqsave (& drvdata -> spinlock , flags );
371+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
372372 if (drvdata -> reading ) {
373- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
373+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
374374 return - EBUSY ;
375375 }
376376
@@ -383,7 +383,7 @@ static int tmc_enable_etf_link(struct coresight_device *csdev,
383383 }
384384 if (!ret )
385385 csdev -> refcnt ++ ;
386- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
386+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
387387
388388 if (first_enable )
389389 dev_dbg (& csdev -> dev , "TMC-ETF enabled\n" );
@@ -398,9 +398,9 @@ static void tmc_disable_etf_link(struct coresight_device *csdev,
398398 struct tmc_drvdata * drvdata = dev_get_drvdata (csdev -> dev .parent );
399399 bool last_disable = false;
400400
401- spin_lock_irqsave (& drvdata -> spinlock , flags );
401+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
402402 if (drvdata -> reading ) {
403- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
403+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
404404 return ;
405405 }
406406
@@ -410,7 +410,7 @@ static void tmc_disable_etf_link(struct coresight_device *csdev,
410410 coresight_set_mode (csdev , CS_MODE_DISABLED );
411411 last_disable = true;
412412 }
413- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
413+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
414414
415415 if (last_disable )
416416 dev_dbg (& csdev -> dev , "TMC-ETF disabled\n" );
@@ -490,7 +490,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev,
490490 if (WARN_ON_ONCE (coresight_get_mode (csdev ) != CS_MODE_PERF ))
491491 return 0 ;
492492
493- spin_lock_irqsave (& drvdata -> spinlock , flags );
493+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
494494
495495 /* Don't do anything if another tracer is using this sink */
496496 if (csdev -> refcnt != 1 )
@@ -587,7 +587,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev,
587587 */
588588 CS_LOCK (drvdata -> base );
589589out :
590- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
590+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
591591
592592 return to_read ;
593593}
@@ -705,7 +705,7 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata)
705705 drvdata -> config_type != TMC_CONFIG_TYPE_ETF ))
706706 return - EINVAL ;
707707
708- spin_lock_irqsave (& drvdata -> spinlock , flags );
708+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
709709
710710 if (drvdata -> reading ) {
711711 ret = - EBUSY ;
@@ -737,7 +737,7 @@ int tmc_read_prepare_etb(struct tmc_drvdata *drvdata)
737737
738738 drvdata -> reading = true;
739739out :
740- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
740+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
741741
742742 return ret ;
743743}
@@ -754,14 +754,14 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata)
754754 drvdata -> config_type != TMC_CONFIG_TYPE_ETF ))
755755 return - EINVAL ;
756756
757- spin_lock_irqsave (& drvdata -> spinlock , flags );
757+ raw_spin_lock_irqsave (& drvdata -> spinlock , flags );
758758
759759 /* Re-enable the TMC if need be */
760760 if (coresight_get_mode (drvdata -> csdev ) == CS_MODE_SYSFS ) {
761761 /* There is no point in reading a TMC in HW FIFO mode */
762762 mode = readl_relaxed (drvdata -> base + TMC_MODE );
763763 if (mode != TMC_MODE_CIRCULAR_BUFFER ) {
764- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
764+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
765765 return - EINVAL ;
766766 }
767767 /*
@@ -775,7 +775,7 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata)
775775 memset (drvdata -> buf , 0 , drvdata -> size );
776776 rc = __tmc_etb_enable_hw (drvdata );
777777 if (rc ) {
778- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
778+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
779779 return rc ;
780780 }
781781 } else {
@@ -788,7 +788,7 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata)
788788 }
789789
790790 drvdata -> reading = false;
791- spin_unlock_irqrestore (& drvdata -> spinlock , flags );
791+ raw_spin_unlock_irqrestore (& drvdata -> spinlock , flags );
792792
793793 /*
794794 * Free allocated memory outside of the spinlock. There is no need
0 commit comments