media: staging: media: zoran: move videodev alloc
Subsystems (9)
Sasha Levin
maintainerPATCH 1/66 media: staging: media: zoran: move videodev alloc
From: Corentin Labbe <[email protected]>
[ Upstream commit 82e3a496eb56da0b9f29fdc5b63cedb3289e91de ]
Move some code out of zr36057_init() and create new functions for handling zr->video_dev. This permit to ease code reading and fix a zr->video_dev memory leak.
--- drivers/staging/media/zoran/zoran.h | 2 +- drivers/staging/media/zoran/zoran_card.c | 80 ++++++++++++++-------- drivers/staging/media/zoran/zoran_driver.c | 5 +- 3 files changed, 54 insertions(+), 33 deletions(-)
drivers/staging/media/zoran/zoran.h +1 -1
@@ -313,6 +313,6 @@ static inline struct zoran *to_zoran(struct v4l2_device *v4l2_dev)#endif -int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq); +int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq,int dir);void zoran_queue_exit (struct zoran *zr);int zr_set_buf (struct zoran *zr);
drivers/staging/media/zoran/zoran_card.c +50 -30
115 lines not on this page · raw message
drivers/staging/media/zoran/zoran_driver.c +3 -2
@@ -1008,7 +1008,7 @@ static const struct vb2_ops zr_video_qops = { .wait_finish = vb2_ops_wait_finish, }; -int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq) +int zoran_queue_init (struct zoran *zr,struct vb2_queue *vq,int dir) {int err;
@@ -1016,7 +1016,8 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq)INIT_LIST_HEAD (&zr->queued_bufs); vq->dev = &zr->pci_dev->dev; - vq->type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; + vq->type = dir; + vq->io_modes =VB2_USERPTR |VB2_DMABUF |VB2_MMAP |VB2_READ |VB2_WRITE ; vq->drv_priv = zr; vq->buf_struct_size =sizeof (struct zr_buffer );
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 2/66 media: staging: media: zoran: calculate the right buffer number for zoran_reap_stat_com
From: Corentin Labbe <[email protected]>
[ Upstream commit e3b86f4e558cea9eed71d894df2f19b10d60a207 ]
On the case tmp_dcim=1, the index of buffer is miscalculated. This generate a NULL pointer dereference later.
So let's fix the calcul and add a check to prevent this to reappear.
--- drivers/staging/media/zoran/zoran_device.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/staging/media/zoran/zoran_device.c +6 -1
@@ -814,7 +814,7 @@ static void zoran_reap_stat_com(struct zoran *zr)if (zr->jpg_settings.tmp_dcm ==1 ) i = (zr->jpg_dma_tail - zr->jpg_err_shift) &BUZ_MASK_STAT_COM ;else - i = ((zr->jpg_dma_tail - zr->jpg_err_shift) &1 ) *2 +1 ; + i = ((zr->jpg_dma_tail - zr->jpg_err_shift) &1 ) *2 ; stat_com =le32_to_cpu (zr->stat_com[i]);if ((stat_com &1 ) ==0 ) {
@@ -826,6 +826,11 @@ static void zoran_reap_stat_com(struct zoran *zr) size = (stat_com &GENMASK (22 ,1 )) >>1 ; buf = zr->inuse[i]; +if (!buf) { +spin_unlock_irqrestore (&zr->queued_bufs_lock, flags); +pci_err (zr->pci_dev,"No buffer at slot %d\n" , i); +return ; + } buf->vbuf.vb2_buf.timestamp =ktime_get_ns ();if (zr->codec_mode ==BUZ_MODE_MOTION_COMPRESS ) {
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 3/66 media: staging: media: zoran: fix various V4L2 compliance errors
In reply to Sasha LevinFrom: Hans Verkuil <[email protected]>
[ Upstream commit 914941827aad5ecddf9bf3a6dee67fbec1af1fff ]
This fixes several issues found with 'v4l2-compliance -s':
1) read()/write() is supported, but not reported in the capabilities
2) S_STD(G_STD()) failed: setting the same standard should just return 0.
3) G_PARM failed to set readbuffers.
4) different field values in the format vs. what v4l2_buffer reported.
5) zero the sequence number when starting streaming.
6) drop VB_USERPTR: makes no sense with dma_contig streaming.
--- drivers/staging/media/zoran/zoran_card.c | 2 +- drivers/staging/media/zoran/zoran_driver.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/staging/media/zoran/zoran_card.c +1 -1
@@ -811,7 +811,7 @@ static int zoran_init_video_device(struct zoran *zr, struct video_device *video_ *video_dev = zoran_template; video_dev->v4l2_dev = &zr->v4l2_dev; video_dev->lock = &zr->lock; - video_dev->device_caps =V4L2_CAP_STREAMING | dir; + video_dev->device_caps =V4L2_CAP_STREAMING |V4L2_CAP_READWRITE | dir;strscpy (video_dev->name,ZR_DEVNAME (zr),sizeof (video_dev->name));/*
drivers/staging/media/zoran/zoran_driver.c +10 -3
@@ -255,8 +255,6 @@ static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capabilitystrscpy (cap->card,ZR_DEVNAME (zr),sizeof (cap->card));strscpy (cap->driver,"zoran" ,sizeof (cap->driver));snprintf (cap->bus_info,sizeof (cap->bus_info),"PCI:%s" ,pci_name (zr->pci_dev)); - cap->device_caps = zr->video_dev->device_caps; - cap->capabilities = cap->device_caps |V4L2_CAP_DEVICE_CAPS ;return 0 ; }
@@ -582,6 +580,9 @@ static int zoran_s_std(struct file *file, void *__fh, v4l2_std_id std)struct zoran *zr =video_drvdata (file);int res =0 ; +if (zr->norm == std) +return 0 ; +if (zr->running !=ZORAN_MAP_MODE_NONE )return -EBUSY ;
@@ -739,6 +740,7 @@ static int zoran_g_parm(struct file *file, void *priv, struct v4l2_streamparm *pif (parm->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE )return -EINVAL ; + parm->parm.capture.readbuffers =9 ;return 0 ; }
@@ -869,6 +871,10 @@ int zr_set_buf(struct zoran *zr) vbuf = &buf->vbuf; buf->vbuf.field =V4L2_FIELD_INTERLACED ; +if (BUZ_MAX_HEIGHT < (zr->v4l_settings.height *2 )) + buf->vbuf.field =V4L2_FIELD_INTERLACED ; +else + buf->vbuf.field =V4L2_FIELD_TOP ;vb2_set_plane_payload (&buf->vbuf.vb2_buf,0 , zr->buffer_size);vb2_buffer_done (&buf->vbuf.vb2_buf,VB2_BUF_STATE_DONE ); zr->inuse[0 ] =NULL ;
@@ -928,6 +934,7 @@ static int zr_vb2_start_streaming(struct vb2_queue *vq, unsigned int count) zr->stat_com[j] =cpu_to_le32 (1 ); zr->inuse[j] =NULL ; } + zr->vbseq =0 ;if (zr->map_mode !=ZORAN_MAP_MODE_RAW ) {pci_info (zr->pci_dev,"START JPG\n" );
@@ -1018,7 +1025,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq, int dir) vq->dev = &zr->pci_dev->dev; vq->type = dir; - vq->io_modes =VB2_USERPTR |VB2_DMABUF |VB2_MMAP |VB2_READ |VB2_WRITE ; + vq->io_modes =VB2_DMABUF |VB2_MMAP |VB2_READ |VB2_WRITE ; vq->drv_priv = zr; vq->buf_struct_size =sizeof (struct zr_buffer ); vq->ops = &zr_video_qops;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 4/66 media: atmel: atmel-isc-base: report frame sizes as full supported range
In reply to Sasha LevinFrom: Eugen Hristev <[email protected]>
[ Upstream commit 72802a86e11c34e819fbfb38f58c5aef668f833d ]
The ISC supports a full broad range of frame sizes.
Until now, the subdevice was queried for possible frame sizes and these were reported to the user space.
However, the ISC should not care about which frame sizes the subdev supports, as long as this frame size is supported.
Thus, report a continuous range from smallest frame size up to the max resolution.
--- drivers/media/platform/atmel/atmel-isc-base.c | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/media/platform/atmel/atmel-isc-base.c +10 -12
@@ -1369,14 +1369,12 @@ static int isc_enum_framesizes(struct file *file, void *fh, struct v4l2_frmsizeenum *fsize) {struct isc_device *isc =video_drvdata (file); -struct v4l2_subdev_frame_size_enum fse = { - .code = isc->config.sd_format->mbus_code, - .index = fsize->index, - .which =V4L2_SUBDEV_FORMAT_ACTIVE , - };int ret = -EINVAL ;int i; +if (fsize->index) +return -EINVAL ; +for (i =0 ; i < isc->num_user_formats; i++)if (isc->user_formats[i]->fourcc == fsize->pixel_format) ret =0 ;
@@ -1388,14 +1386,14 @@ static int isc_enum_framesizes(struct file *file, void *fh,if (ret)return ret; - ret =v4l2_subdev_call (isc->current_subdev->sd, pad, enum_frame_size, -NULL , &fse); -if (ret) -return ret; + fsize->type =V4L2_FRMSIZE_TYPE_CONTINUOUS ; - fsize->type =V4L2_FRMSIZE_TYPE_DISCRETE ; - fsize->discrete.width = fse.max_width; - fsize->discrete.height = fse.max_height; + fsize->stepwise.min_width =16 ; + fsize->stepwise.max_width = isc->max_width; + fsize->stepwise.min_height =16 ; + fsize->stepwise.max_height = isc->max_height; + fsize->stepwise.step_width =1 ; + fsize->stepwise.step_height =1 ;return 0 ; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 5/66 media: ir_toy: free before error exiting
In reply to Sasha LevinFrom: Peiwei Hu <[email protected]>
[ Upstream commit 52cdb013036391d9d87aba5b4fc49cdfc6ea4b23 ]
Fix leak in error path.
--- drivers/media/rc/ir_toy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/ir_toy.c +1 -1
@@ -458,7 +458,7 @@ static int irtoy_probe(struct usb_interface *intf, err =usb_submit_urb (irtoy->urb_in,GFP_KERNEL );if (err !=0 ) {dev_err (irtoy->dev,"fail to submit in urb: %d\n" , err); -return err; + goto free_rcdev; } err =irtoy_setup (irtoy);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 6/66 ASoC: sh: rz-ssi: Make the data structures available before registering the handlers
In reply to Sasha LevinFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 0788785c78342d422f93b1c9831c2b2b7f137937 ]
Initialize the spinlock and make the data structures available before registering the interrupt handlers.
--- sound/soc/sh/rz-ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/sh/rz-ssi.c +3 -2
@@ -975,6 +975,9 @@ static int rz_ssi_probe(struct platform_device *pdev) ssi->playback.priv = ssi; ssi->capture.priv = ssi; +spin_lock_init (&ssi->lock); +dev_set_drvdata (&pdev->dev, ssi); +/* Error Interrupt */ ssi->irq_int =platform_get_irq_byname (pdev,"int_req" );if (ssi->irq_int <0 )
@@ -1027,8 +1030,6 @@ static int rz_ssi_probe(struct platform_device *pdev)return dev_err_probe (ssi->dev, ret,"pm_runtime_resume_and_get failed\n" ); } -spin_lock_init (&ssi->lock); -dev_set_drvdata (&pdev->dev, ssi); ret =devm_snd_soc_register_component (&pdev->dev, &rz_ssi_soc_component, rz_ssi_soc_dai,ARRAY_SIZE (rz_ssi_soc_dai));
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 7/66 ASoC: cs42l42: Report full jack status when plug is detected
In reply to Sasha LevinFrom: Richard Fitzgerald <[email protected]>
[ Upstream commit 8d06f797f844d04a961f201f886f7f9985edc9bf ]
When a plug event is detect report the full state of all status bits, don't assume that there will have been a previous unplug event to clear all the bits. Report the state of both HEADPHONE and MICROPHONE bits according to detected type, and clear all the button status bits. The current button status is already checked and reported at the end of the function.
During a system suspend the jack could be unplugged and plugged, possibly changing the jack type. On resume the interrupt status will indicate a plug event - there will not be an unplug event to clear the bits.
--- sound/soc/codecs/cs42l42.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
sound/soc/codecs/cs42l42.c +11 -3
@@ -1637,7 +1637,11 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data)mutex_lock (&cs42l42->jack_detect_mutex); -/* Check auto-detect status */ +/* +* Check auto-detect status. Don't assume a previous unplug event has +* cleared the flags. If the jack is unplugged and plugged during +* system suspend there won't have been an unplug event. +*/ if ((~masks[5 ]) & irq_params_table[5 ].mask) {if (stickies[5 ] &CS42L42_HSDET_AUTO_DONE_MASK ) {cs42l42_process_hs_type_detect (cs42l42);
@@ -1645,11 +1649,15 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data)case CS42L42_PLUG_CTIA :case CS42L42_PLUG_OMTP :snd_soc_jack_report (cs42l42->jack,SND_JACK_HEADSET , -SND_JACK_HEADSET ); +SND_JACK_HEADSET | +SND_JACK_BTN_0 |SND_JACK_BTN_1 | +SND_JACK_BTN_2 |SND_JACK_BTN_3 );break ;case CS42L42_PLUG_HEADPHONE :snd_soc_jack_report (cs42l42->jack,SND_JACK_HEADPHONE , -SND_JACK_HEADPHONE ); +SND_JACK_HEADSET | +SND_JACK_BTN_0 |SND_JACK_BTN_1 | +SND_JACK_BTN_2 |SND_JACK_BTN_3 );break ;default :break ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 8/66 ASoC: SOF: Intel: match sdw version on link_slaves_found
In reply to Sasha LevinFrom: Bard Liao <[email protected]>
[ Upstream commit f67c0c0d3b9048d86ea6ae52e36a2b78c48f265d ]
Codecs with the same part id, manufacturer id and part id, but different sdw version should be treated as different codecs. For example, rt711 and rt711-sdca are different. So, we should match sdw version as well.
--- sound/soc/sof/intel/hda.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/sof/intel/hda.c +10 -5
@@ -1188,7 +1188,7 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,struct hdac_bus *bus =sof_to_bus (sdev);struct sdw_intel_slave_id *ids = sdw->ids;int num_slaves = sdw->num_slaves; -unsigned int part_id, link_id, unique_id, mfg_id; +unsigned int part_id, link_id, unique_id, mfg_id, version;int i, j, k;for (i =0 ; i < link->num_adr; i++) {
@@ -1198,12 +1198,14 @@ static bool link_slaves_found(struct snd_sof_dev *sdev, mfg_id =SDW_MFG_ID (adr); part_id =SDW_PART_ID (adr); link_id =SDW_DISCO_LINK_ID (adr); + version =SDW_VERSION (adr);for (j =0 ; j < num_slaves; j++) {/* find out how many identical parts were reported on that link */ if (ids[j].link_id == link_id && ids[j].id.part_id == part_id && - ids[j].id.mfg_id == mfg_id) + ids[j].id.mfg_id == mfg_id && + ids[j].id.sdw_version == version) reported_part_count++; }
@@ -1212,21 +1214,24 @@ static bool link_slaves_found(struct snd_sof_dev *sdev,if (ids[j].link_id != link_id || ids[j].id.part_id != part_id || - ids[j].id.mfg_id != mfg_id) + ids[j].id.mfg_id != mfg_id || + ids[j].id.sdw_version != version)continue ;/* find out how many identical parts are expected */ for (k =0 ; k < link->num_adr; k++) {u64 adr2 = link->adr_d[k].adr; -unsigned int part_id2, link_id2, mfg_id2; +unsigned int part_id2, link_id2, mfg_id2, version2; mfg_id2 =SDW_MFG_ID (adr2); part_id2 =SDW_PART_ID (adr2); link_id2 =SDW_DISCO_LINK_ID (adr2); + version2 =SDW_VERSION (adr2);if (link_id2 == link_id && part_id2 == part_id && - mfg_id2 == mfg_id) + mfg_id2 == mfg_id && + version2 == version) expected_part_count++; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 9/66 media: imx-jpeg: Prevent decoding NV12M jpegs into single-planar buffers
In reply to Sasha LevinFrom: Mirela Rabulea <[email protected]>
[ Upstream commit 417591a766b3c040c346044541ff949c0b2bb7b2 ]
If the application queues an NV12M jpeg as output buffer, but then queues a single planar capture buffer, the kernel will crash with "Unable to handle kernel NULL pointer dereference" in mxc_jpeg_addrs, prevent this by finishing the job with error.
--- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/platform/imx-jpeg/mxc-jpeg.c +6 -0
@@ -947,6 +947,12 @@ static void mxc_jpeg_device_run(void *priv)v4l2_m2m_buf_copy_metadata (src_buf, dst_buf, true); jpeg_src_buf =vb2_to_mxc_buf (&src_buf->vb2_buf); +if (q_data_cap->fmt->colplanes != dst_buf->vb2_buf.num_planes) { +dev_err (dev,"Capture format %s has %d planes, but capture buffer has %d planes\n" , + q_data_cap->fmt->name, q_data_cap->fmt->colplanes, + dst_buf->vb2_buf.num_planes); + jpeg_src_buf->jpeg_parse_error = true; + }if (jpeg_src_buf->jpeg_parse_error) { jpeg->slot_data[ctx->slot].used = false;v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 10/66 ASoC: SOF: Intel: hda: Remove link assignment limitation
In reply to Sasha LevinFrom: Ranjani Sridharan <[email protected]>
[ Upstream commit 2ce0d008dcc59f9c01f43277b9f9743af7b01dad ]
The limitation to assign a link DMA channel for a BE iff the corresponding host DMA channel is assigned to a connected FE is only applicable if the PROCEN_FMT_QUIRK is set. So, remove it for platforms that do not enable the quirk.
Complements: a792bfc1c2bc ("ASoC: SOF: Intel: hda-stream: limit PROCEN workaround")
--- sound/soc/sof/intel/hda-dai.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
sound/soc/sof/intel/hda-dai.c +13 -0
@@ -59,6 +59,8 @@ static struct hdac_ext_stream * {struct snd_soc_pcm_runtime *rtd =asoc_substream_to_rtd (substream);struct sof_intel_hda_stream *hda_stream; +const struct sof_intel_dsp_desc *chip; +struct snd_sof_dev *sdev;struct hdac_ext_stream *res =NULL ;struct hdac_stream *stream =NULL ;
@@ -77,9 +79,20 @@ static struct hdac_ext_stream *continue ; hda_stream =hstream_to_sof_hda_stream (hstream); + sdev = hda_stream->sdev; + chip =get_chip_info (sdev->pdata);/* check if link is available */ if (!hstream->link_locked) { +/* +* choose the first available link for platforms that do not have the +* PROCEN_FMT_QUIRK set. +*/ +if (!(chip->quirks &SOF_INTEL_PROCEN_FMT_QUIRK )) { + res = hstream; +break ; + } +if (stream->opened) {/* * check if the stream tag matches the stream
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 11/66 media: iommu/mediatek-v1: Free the existed fwspec if the master dev already has
In reply to Sasha LevinFrom: Yong Wu <[email protected]>
[ Upstream commit 822a2ed8c606caf6a11b1a180b8e46292bd77d71 ]
When the iommu master device enters of_iommu_xlate, the ops may be NULL(iommu dev is defered), then it will initialize the fwspec here:
[<c0c9c5bc>] (dev_iommu_fwspec_set) from [<c06bda80>] (iommu_fwspec_init+0xbc/0xd4)
[<c06bd9c4>] (iommu_fwspec_init) from [<c06c0db4>] (of_iommu_xlate+0x7c/0x12c)
[<c06c0d38>] (of_iommu_xlate) from [<c06c10e8>] (of_iommu_configure+0x144/0x1e8)
BUT the mtk_iommu_v1.c only supports arm32, the probing flow still is a bit weird. We always expect create the fwspec internally. otherwise it will enter here and return fail.
static int mtk_iommu_create_mapping(struct device *dev,
struct of_phandle_args *args)
{
...
if (!fwspec) {
....
} else if (dev_iommu_fwspec_get(dev)->ops != &mtk_iommu_ops) {
>>>>>>>>>>Enter here. return fail.<<<<<<<<<<<<
return -EINVAL;
}
...
}Thus, Free the existed fwspec if the master device already has fwspec.
This issue is reported at:
https://lore.kernel.org/linux-mediatek/trinity-7d9ebdc9-4849-4d93-bfb5-429dcb4ee449-1626253158870@3c-app-gmx-bs01/
--- drivers/iommu/mtk_iommu_v1.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/iommu/mtk_iommu_v1.c +9 -0
@@ -425,6 +425,15 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)struct mtk_iommu_data *data;int err, idx =0 ; +/* +* In the deferred case, free the existed fwspec. +* Always initialize the fwspec internally. +*/ +if (fwspec) { +iommu_fwspec_free (dev); + fwspec =dev_iommu_fwspec_get (dev); + } +while (!of_parse_phandle_with_args (dev->of_node,"iommus" ,"#iommu-cells" , idx, &iommu_spec)) {
Signature · 6 lines
2.34.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 12/66 media: iommu/mediatek: Return ENODEV if the device is NULL
In reply to Sasha LevinFrom: Yong Wu <[email protected]>
[ Upstream commit 2fb0feed51085db77606de9b9477c96894328809 ]
The platform device is created at:of_platform_default_populate_init: arch_initcall_sync
->of_platform_populate
->of_platform_device_create_pdata
When entering our probe, all the devices should be already created. if it is null, means NODEV. Currently we don't get the fail case. It's a minor fix, no need add fixes tags.
--- drivers/iommu/mtk_iommu.c | 2 +- drivers/iommu/mtk_iommu_v1.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +1 -1
@@ -848,7 +848,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) plarbdev =of_find_device_by_node (larbnode);if (!plarbdev) {of_node_put (larbnode); -return -EPROBE_DEFER ; +return -ENODEV ; } data->larb_imu[id].dev = &plarbdev->dev;
drivers/iommu/mtk_iommu_v1.c +1 -1
@@ -604,7 +604,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) plarbdev =of_find_device_by_node (larbnode);if (!plarbdev) {of_node_put (larbnode); -return -EPROBE_DEFER ; +return -ENODEV ; } data->larb_imu[i].dev = &plarbdev->dev;
Signature · 6 lines
2.34.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 13/66 media: iommu/mediatek: Add device_link between the consumer and the larb devices
In reply to Sasha LevinFrom: Yong Wu <[email protected]>
[ Upstream commit 635319a4a7444ca97124d781cd96deb277ff4d40 ]
MediaTek IOMMU-SMI diagram is like below. all the consumer connect with smi-larb, then connect with smi-common.
M4U
|
smi-common
|
-------------
| | ...
| |
larb1 larb2
| |
vdec vencWhen the consumer works, it should enable the smi-larb's power which also need enable the smi-common's power firstly.
Thus, First of all, use the device link connect the consumer and the smi-larbs. then add device link between the smi-larb and smi-common.
This patch adds device_link between the consumer and the larbs.
When device_link_add, I add the flag DL_FLAG_STATELESS to avoid calling pm_runtime_xx to keep the original status of clocks. It can avoid two issues:
1) Display HW show fastlogo abnormally reported in [1]. At the beggining, all the clocks are enabled before entering kernel, but the clocks for display HW(always in larb0) will be gated after clk_enable and clk_disable called from device_link_add(->pm_runtime_resume) and rpm_idle. The clock operation happened before display driver probe. At that time, the display HW will be abnormal.
2) A deadlock issue reported in [2]. Use DL_FLAG_STATELESS to skip pm_runtime_xx to avoid the deadlock.
Corresponding, DL_FLAG_AUTOREMOVE_CONSUMER can't be added, then device_link_removed should be added explicitly.
Meanwhile, Currently we don't have a device connect with 2 larbs at the same time. Disallow this case, print the error log.
[1] https://lore.kernel.org/linux-mediatek/1564213888.22908.4.camel@mhfsdcap03/
[2] https://lore.kernel.org/patchwork/patch/1086569/
--- drivers/iommu/mtk_iommu.c | 30 ++++++++++++++++++++++++++++++ drivers/iommu/mtk_iommu_v1.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +30 -0
@@ -562,22 +562,52 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev);struct mtk_iommu_data *data; +struct device_link *link; +struct device *larbdev; +unsigned int larbid, larbidx, i;if (!fwspec || fwspec->ops != &mtk_iommu_ops)return ERR_PTR (-ENODEV );/* Not a iommu client device */ data =dev_iommu_priv_get (dev); +/* +* Link the consumer device with the smi-larb device(supplier). +* The device that connects with each a larb is a independent HW. +* All the ports in each a device should be in the same larbs. +*/ + larbid =MTK_M4U_TO_LARB (fwspec->ids[0 ]); +for (i =1 ; i < fwspec->num_ids; i++) { + larbidx =MTK_M4U_TO_LARB (fwspec->ids[i]); +if (larbid != larbidx) { +dev_err (dev,"Can only use one larb. Fail@larb%d-%d.\n" , + larbid, larbidx); +return ERR_PTR (-EINVAL ); + } + } + larbdev = data->larb_imu[larbid].dev; + link =device_link_add (dev, larbdev, +DL_FLAG_PM_RUNTIME |DL_FLAG_STATELESS ); +if (!link) +dev_err (dev,"Unable to link %s\n" ,dev_name (larbdev));return &data->iommu; }static void mtk_iommu_release_device (struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev); +struct mtk_iommu_data *data; +struct device *larbdev; +unsigned int larbid;if (!fwspec || fwspec->ops != &mtk_iommu_ops)return ; + data =dev_iommu_priv_get (dev); + larbid =MTK_M4U_TO_LARB (fwspec->ids[0 ]); + larbdev = data->larb_imu[larbid].dev; +device_link_remove (dev, larbdev); +iommu_fwspec_free (dev); }
drivers/iommu/mtk_iommu_v1.c +28 -1
@@ -423,7 +423,9 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev);struct of_phandle_args iommu_spec;struct mtk_iommu_data *data; -int err, idx =0 ; +int err, idx =0 , larbid, larbidx; +struct device_link *link; +struct device *larbdev;/* * In the deferred case, free the existed fwspec.
@@ -453,6 +455,23 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev) data =dev_iommu_priv_get (dev); +/* Link the consumer device with the smi-larb device(supplier) */ + larbid =mt2701_m4u_to_larb (fwspec->ids[0 ]); +for (idx =1 ; idx < fwspec->num_ids; idx++) { + larbidx =mt2701_m4u_to_larb (fwspec->ids[idx]); +if (larbid != larbidx) { +dev_err (dev,"Can only use one larb. Fail@larb%d-%d.\n" , + larbid, larbidx); +return ERR_PTR (-EINVAL ); + } + } + + larbdev = data->larb_imu[larbid].dev; + link =device_link_add (dev, larbdev, +DL_FLAG_PM_RUNTIME |DL_FLAG_STATELESS ); +if (!link) +dev_err (dev,"Unable to link %s\n" ,dev_name (larbdev)); +return &data->iommu; }
@@ -473,10 +492,18 @@ static void mtk_iommu_probe_finalize(struct device *dev)static void mtk_iommu_release_device (struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev); +struct mtk_iommu_data *data; +struct device *larbdev; +unsigned int larbid;if (!fwspec || fwspec->ops != &mtk_iommu_ops)return ; + data =dev_iommu_priv_get (dev); + larbid =mt2701_m4u_to_larb (fwspec->ids[0 ]); + larbdev = data->larb_imu[larbid].dev; +device_link_remove (dev, larbdev); +iommu_fwspec_free (dev); }
Signature · 6 lines
2.34.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 14/66 video: fbdev: nvidiafb: Use strscpy() to prevent buffer overflow
In reply to Sasha LevinFrom: Tim Gardner <[email protected]>
[ Upstream commit 37a1a2e6eeeb101285cd34e12e48a881524701aa ]
Coverity complains of a possible buffer overflow. However, given the 'static' scope of nvidia_setup_i2c_bus() it looks like that can't happen after examiniing the call sites.
CID 19036 (#1 of 1): Copy into fixed size buffer (STRING_OVERFLOW)
1. fixed_size_dest: You might overrun the 48-character fixed-size string chan->adapter.name by copying name without checking the length.
2. parameter_as_source: Note: This defect has an elevated risk because the source argument is a parameter of the current function.
89 strcpy(chan->adapter.name, name);
Fix this warning by using strscpy() which will silence the warning and prevent any future buffer overflows should the names used to identify the channel become much longer.
--- drivers/video/fbdev/nvidia/nv_i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/nvidia/nv_i2c.c +1 -1
@@ -86,7 +86,7 @@ static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name, {int rc; -strcpy (chan->adapter.name, name); +strscpy (chan->adapter.name, name,sizeof (chan->adapter.name)); chan->adapter.owner =THIS_MODULE ; chan->adapter.class = i2c_class; chan->adapter.algo_data = &chan->algo;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 15/66 video: fbdev: w100fb: Reset global state
In reply to Sasha LevinFrom: Evgeny Novikov <[email protected]>
[ Upstream commit 8738ddcac644964ae128ccd3d80d48773c8d528e ]
w100fb_probe() did not reset the global state to its initial state. This can result in invocation of iounmap() even when there was not the appropriate successful call of ioremap(). For instance, this may be the case if first probe fails after two successful ioremap() while second probe fails when first ioremap() fails. The similar issue is with w100fb_remove(). The patch fixes both bugs.
Found by Linux Driver Verification project (linuxtesting.org).
--- drivers/video/fbdev/w100fb.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/video/fbdev/w100fb.c +12 -3
@@ -770,12 +770,18 @@ static int w100fb_probe(struct platform_device *pdev)fb_dealloc_cmap (&info->cmap);kfree (info->pseudo_palette); } -if (remapped_fbuf !=NULL ) +if (remapped_fbuf !=NULL ) {iounmap (remapped_fbuf); -if (remapped_regs !=NULL ) + remapped_fbuf =NULL ; + } +if (remapped_regs !=NULL ) {iounmap (remapped_regs); -if (remapped_base !=NULL ) + remapped_regs =NULL ; + } +if (remapped_base !=NULL ) {iounmap (remapped_base); + remapped_base =NULL ; + }if (info)framebuffer_release (info);return err;
@@ -795,8 +801,11 @@ static int w100fb_remove(struct platform_device *pdev)fb_dealloc_cmap (&info->cmap);iounmap (remapped_base); + remapped_base =NULL ;iounmap (remapped_regs); + remapped_regs =NULL ;iounmap (remapped_fbuf); + remapped_fbuf =NULL ;framebuffer_release (info);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 16/66 video: fbdev: cirrusfb: check pixclock to avoid divide by zero
In reply to Sasha LevinFrom: George Kennedy <[email protected]>
[ Upstream commit 5c6f402bdcf9e7239c6bc7087eda71ac99b31379 ]
Do a sanity check on pixclock value to avoid divide by zero.
If the pixclock value is zero, the cirrusfb driver will round up pixclock to get the derived frequency as close to maxclock as possible.
Syzkaller reported a divide error in cirrusfb_check_pixclock.
divide error: 0000 [#1] SMP KASAN PTI
CPU: 0 PID: 14938 Comm: cirrusfb_test Not tainted 5.15.0-rc6 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2 RIP: 0010:cirrusfb_check_var+0x6f1/0x1260 Call Trace: fb_set_var+0x398/0xf90 do_fb_ioctl+0x4b8/0x6f0 fb_ioctl+0xeb/0x130 __x64_sys_ioctl+0x19d/0x220 do_syscall_64+0x3a/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xae
--- drivers/video/fbdev/cirrusfb.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/video/fbdev/cirrusfb.c +8 -8
@@ -469,7 +469,7 @@ static int cirrusfb_check_mclk(struct fb_info *info, long freq)return 0 ; } -static int cirrusfb_check_pixclock (const struct fb_var_screeninfo *var, +static int cirrusfb_check_pixclock (struct fb_var_screeninfo *var,struct fb_info *info) {long freq;
@@ -478,9 +478,7 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,unsigned maxclockidx = var->bits_per_pixel >>3 ;/* convert from ps to kHz */ - freq =PICOS2KHZ (var->pixclock); - -dev_dbg (info->device,"desired pixclock: %ld kHz\n" , freq); + freq =PICOS2KHZ (var->pixclock ? :1 ); maxclock = cirrusfb_board_info[cinfo->btype].maxclock[maxclockidx]; cinfo->multiplexing =0 ;
@@ -488,11 +486,13 @@ static int cirrusfb_check_pixclock(const struct fb_var_screeninfo *var,/* If the frequency is greater than we can support, we might be able * to use multiplexing for the video mode */ if (freq > maxclock) { -dev_err (info->device, -"Frequency greater than maxclock (%ld kHz)\n" , - maxclock); -return -EINVAL ; + var->pixclock =KHZ2PICOS (maxclock); + +while ((freq =PICOS2KHZ (var->pixclock)) > maxclock) + var->pixclock++; } +dev_dbg (info->device,"desired pixclock: %ld kHz\n" , freq); +/* * Additional constraint: 8bpp uses DAC clock doubling to allow maximum * pixel clock
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 17/66 video: fbdev: omapfb: acx565akm: replace snprintf with sysfs_emit
In reply to Sasha LevinFrom: Yang Guang <[email protected]>
[ Upstream commit 24565bc4115961db7ee64fcc7ad2a7437c0d0a49 ]
coccinelle report:./drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c:
479:9-17: WARNING: use scnprintf or sprintf
Use sysfs_emit instead of scnprintf or sprintf makes more sense.
--- .../video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c +1 -1
@@ -476,7 +476,7 @@ static ssize_t show_cabc_available_modes(struct device *dev,int i;if (!ddata->has_cabc) -return snprintf (buf,PAGE_SIZE ,"%s\n" , cabc_modes[0 ]); +return sysfs_emit (buf,"%s\n" , cabc_modes[0 ]);for (i =0 , len =0 ; len <PAGE_SIZE && i <ARRAY_SIZE (cabc_modes); i++)
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 18/66 ARM: dts: qcom: fix gic_irq_domain_translate warnings for msm8960
In reply to Sasha LevinFrom: David Heidelberg <[email protected]>
[ Upstream commit 6f7e221e7a5cfc3299616543fce42b36e631497b ]
IRQ types blindly copied from very similar APQ8064.
Fixes warnings as:
WARNING: CPU: 0 PID: 1 at drivers/irqchip/irq-gic.c:1080 gic_irq_domain_translate+0x118/0x120
...
--- arch/arm/boot/dts/qcom-msm8960.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/qcom-msm8960.dtsi +5 -3
@@ -146,7 +146,9 @@ reg = <0x108000 0x1000>; qcom,ipc = <&l2cc 0x8 2>; - interrupts = <0 19 0>, <0 21 0>, <0 22 0>; + interrupts = <GIC_SPI 19 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>, + <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>; interrupt-names = "ack", "err", "wakeup"; regulators {
@@ -192,7 +194,7 @@ compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>, <0x16400000 0x1000>; - interrupts = <0 154 0x0>; + interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>; clock-names = "core", "iface"; status = "disabled";
@@ -318,7 +320,7 @@ #address-cells = <1>; #size-cells = <0>; reg = <0x16080000 0x1000>; - interrupts = <0 147 0>; + interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; spi-max-frequency = <24000000>; cs-gpios = <&msmgpio 8 0>;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 19/66 ARM: dts: bcm2837: Add the missing L1/L2 cache information
In reply to Sasha LevinFrom: Richard Schleich <[email protected]>
[ Upstream commit bdf8762da268d2a34abf517c36528413906e9cd5 ]
This patch fixes the kernel warning "cacheinfo: Unable to detect cache hierarchy for CPU 0" for the bcm2837 on newer kernel versions.
--- arch/arm/boot/dts/bcm2837.dtsi | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)
arch/arm/boot/dts/bcm2837.dtsi +49 -0
@@ -40,12 +40,26 @@ #size-cells = <0>; enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit + /* Source for d/i-cache-line-size and d/i-cache-sets + * https://developer.arm.com/documentation/ddi0500/e/level-1-memory-system + * /about-the-l1-memory-system?lang=en + * + * Source for d/i-cache-size + * https://magpi.raspberrypi.com/articles/raspberry-pi-3-specs-benchmarks + */ cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a53"; reg = <0>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000d8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu1: cpu@1 {
@@ -54,6 +68,13 @@ reg = <1>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu2: cpu@2 {
@@ -62,6 +83,13 @@ reg = <2>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; }; cpu3: cpu@3 {
@@ -70,6 +98,27 @@ reg = <3>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000f0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <128>; // 32KiB(size)/64(line-size)=512ways/4-way set + i-cache-size = <0x8000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + next-level-cache = <&l2>; + }; + + /* Source for cache-line-size + cache-sets + * https://developer.arm.com/documentation/ddi0500 + * /e/level-2-memory-system/about-the-l2-memory-system?lang=en + * Source for cache-size + * https://datasheets.raspberrypi.com/cm/cm1-and-cm3-datasheet.pdf + */ + l2: l2-cache0 { + compatible = "cache"; + cache-size = <0x80000>; + cache-line-size = <64>; + cache-sets = <512>; // 512KiB(size)/64(line-size)=8192ways/16-way set + cache-level = <2>; }; }; };
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 20/66 ASoC: madera: Add dependencies on MFD
In reply to Sasha LevinFrom: Charles Keepax <[email protected]>
[ Upstream commit ec29170c724ca30305fc3a19ba2ee73ecac65509 ]
The Madera CODECs use regmap_irq functions but nothing ensures that regmap_irq is built into the kernel. Add dependencies on the ASoC symbols for the relevant MFD component. There is no point in building the ASoC driver if the MFD doesn't support it and the MFD part contains the necessary dependencies to ensure everything is built into the kernel.
--- sound/soc/codecs/Kconfig | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/codecs/Kconfig +5 -0
@@ -733,6 +733,7 @@ config SND_SOC_CS4349 config SND_SOC_CS47L15 tristate + depends on MFD_CS47L15 config SND_SOC_CS47L24 tristate
@@ -740,15 +741,19 @@ config SND_SOC_CS47L24 config SND_SOC_CS47L35 tristate + depends on MFD_CS47L35 config SND_SOC_CS47L85 tristate + depends on MFD_CS47L85 config SND_SOC_CS47L90 tristate + depends on MFD_CS47L90 config SND_SOC_CS47L92 tristate + depends on MFD_CS47L92 # Cirrus Logic Quad-Channel ADC config SND_SOC_CS53L30
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 21/66 media: atomisp_gmin_platform: Add DMI quirk to not turn AXP ELDO2 regulator off on some boards
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 2c39a01154ea57d596470afa1d278e3be3b37f6a ]
The TrekStor SurfTab duo W1 10.1 has a hw bug where turning eldo2 back on after having turned it off causes the CPLM3218 ambient-light-sensor on the front camera sensor's I2C bus to crash, hanging the bus.
Add a DMI quirk table for systems on which to leave eldo2 on.
Note an alternative fix is to turn off the CPLM3218 ambient-light-sensor as long as the camera sensor is being used, this is what Windows seems to do as a workaround (based on analyzing the DSDT). But that is not easy to do cleanly under Linux.
--- .../media/atomisp/pci/atomisp_gmin_platform.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c +18 -0
@@ -748,6 +748,21 @@ static int axp_regulator_set(struct device *dev, struct gmin_subdev *gs,return 0 ; } +/* +* Some boards contain a hw-bug where turning eldo2 back on after having turned +* it off causes the CPLM3218 ambient-light-sensor on the image-sensor's I2C bus +* to crash, hanging the bus. Do not turn eldo2 off on these systems. +*/ +static const struct dmi_system_id axp_leave_eldo2_on_ids[] = { + { + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TrekStor" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"SurfTab duo W1 10.1 (VT4)" ), + }, + }, + { } +}; +static int axp_v1p8_on (struct device *dev,struct gmin_subdev *gs) {int ret;
@@ -782,6 +797,9 @@ static int axp_v1p8_off(struct device *dev, struct gmin_subdev *gs)if (ret)return ret; +if (dmi_check_system (axp_leave_eldo2_on_ids)) +return 0 ; + ret =axp_regulator_set (dev, gs, gs->eldo2_sel_reg, gs->eldo2_1p8v,ELDO_CTRL_REG , gs->eldo2_ctrl_shift, false);return ret;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 22/66 media: atomisp: fix dummy_ptr check to avoid duplicate active_bo
In reply to Sasha LevinFrom: Tsuchiya Yuto <[email protected]>
[ Upstream commit 127efdbc51fe6064336c0452ce9c910b3e107cf0 ]
The dummy_ptr check in hmm_init() [1] results in the following "hmm_init Failed to create sysfs" error exactly once every two times on atomisp reload by rmmod/insmod (although atomisp module loads and works fine regardless of this error):
[ 140.230662] sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:03.0/active_bo' [ 140.230668] CPU: 1 PID: 2502 Comm: insmod Tainted: G C OE 5.15.0-rc4-1-surface-mainline #1 b8acf6eb64994414b2e20bad312a7a2c45f748f9 [ 140.230675] Hardware name: OEMB OEMB/OEMB, BIOS 1.51116.238 03/09/2015 [ 140.230678] Call Trace: [ 140.230687] dump_stack_lvl+0x46/0x5a [ 140.230702] sysfs_warn_dup.cold+0x17/0x24 [ 140.230710] sysfs_add_file_mode_ns+0x160/0x170 [ 140.230717] internal_create_group+0x126/0x390 [ 140.230723] hmm_init+0x5c/0x70 [atomisp 7a6a680bf400629363d2a6f58fd10e7299678b99] [ 140.230811] atomisp_pci_probe.cold+0x1136/0x148e [atomisp 7a6a680bf400629363d2a6f58fd10e7299678b99] [ 140.230875] local_pci_probe+0x45/0x80 [ 140.230882] ? pci_match_device+0xd7/0x130 [ 140.230887] pci_device_probe+0xfa/0x1b0 [ 140.230892] really_probe+0x1f5/0x3f0 [ 140.230899] __driver_probe_device+0xfe/0x180 [ 140.230903] driver_probe_device+0x1e/0x90 [ 140.230908] __driver_attach+0xc0/0x1c0 [ 140.230912] ? __device_attach_driver+0xe0/0xe0 [ 140.230915] ? __device_attach_driver+0xe0/0xe0 [ 140.230919] bus_for_each_dev+0x89/0xd0 [ 140.230924] bus_add_driver+0x12b/0x1e0 [ 140.230929] driver_register+0x8f/0xe0 [ 140.230933] ? 0xffffffffc153f000 [ 140.230937] do_one_initcall+0x57/0x220 [ 140.230945] do_init_module+0x5c/0x260 [ 140.230952] load_module+0x24bd/0x26a0 [ 140.230962] ? __do_sys_finit_module+0xae/0x110 [ 140.230966] __do_sys_finit_module+0xae/0x110 [ 140.230972] do_syscall_64+0x5c/0x80 [ 140.230979] ? syscall_exit_to_user_mode+0x23/0x40 [ 140.230983] ? do_syscall_64+0x69/0x80 [ 140.230988] ? exc_page_fault+0x72/0x170 [ 140.230991] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 140.230997] RIP: 0033:0x7f7fd5d8718d [ 140.231003] Code: b4 0c 00 0f 05 eb a9 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d b3 6c 0c 00 f7 d8 64 89 01 48 [ 140.231006] RSP: 002b:00007ffefc25f0e8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 140.231012] RAX: ffffffffffffffda RBX: 000055ac3edcd7f0 RCX: 00007f7fd5d8718d [ 140.231015] RDX: 0000000000000000 RSI: 000055ac3d723270 RDI: 0000000000000003 [ 140.231017] RBP: 0000000000000000 R08: 0000000000000000 R09: 00007f7fd5e52380 [ 140.231019] R10: 0000000000000003 R11: 0000000000000246 R12: 000055ac3d723270 [ 140.231021] R13: 0000000000000000 R14: 000055ac3edd06e0 R15: 0000000000000000 [ 140.231038] atomisp-isp2 0000:00:03.0: hmm_init Failed to create sysfs
The problem is that dummy_ptr == 0 is a valid value. So, change the logic which checks if dummy_ptr was allocated.
At this point, atomisp now gives WARN_ON() in hmm_free() [2] on atomisp reload by rmmod/insmod. Again, the check is wrong there.
So, change both checks for mmgr_EXCEPTION, which is the error value when HMM allocation fails, and initialize dummy_ptr with such value.
[1] added on commit
d9ab83953fa7 ("media: atomisp: don't cause a warn if probe failed")
[2] added on commit
b83cc378dfc4 ("atomisp: clean up the hmm init/cleanup indirections")
--- drivers/staging/media/atomisp/pci/hmm/hmm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/media/atomisp/pci/hmm/hmm.c +4 -3
@@ -39,7 +39,7 @@struct hmm_bo_device bo_device;struct hmm_pool dynamic_pool;struct hmm_pool reserved_pool; -static ia_css_ptr dummy_ptr; +static ia_css_ptr dummy_ptr = mmgr_EXCEPTION;static bool hmm_initialized;struct _hmm_mem_stat hmm_mem_stat;
@@ -209,7 +209,7 @@ int hmm_init(void)void hmm_cleanup (void ) { -if (!dummy_ptr) +if (dummy_ptr == mmgr_EXCEPTION)return ;sysfs_remove_group (&atomisp_dev->kobj, atomisp_attribute_group);
@@ -288,7 +288,8 @@ void hmm_free(ia_css_ptr virt)dev_dbg (atomisp_dev,"%s: free 0x%08x\n" , __func__, virt); -WARN_ON (!virt); +if (WARN_ON (virt == mmgr_EXCEPTION)) +return ; bo =hmm_bo_device_search_start (&bo_device, (unsigned int )virt);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 23/66 ARM: ftrace: avoid redundant loads or clobbering IP
In reply to Sasha LevinFrom: Ard Biesheuvel <[email protected]>
[ Upstream commit d11967870815b5ab89843980e35aab616c97c463 ]
Tweak the ftrace return paths to avoid redundant loads of SP, as well as unnecessary clobbering of IP.
This also fixes the inconsistency of using MOV to perform a function return, which is sub-optimal on recent micro-architectures but more importantly, does not perform an interworking return, unlike compiler generated function returns in Thumb2 builds.
Let's fix this by popping PC from the stack like most ordinary code does.
--- arch/arm/kernel/entry-ftrace.S | 51 +++++++++++++++------------------- 1 file changed, 22 insertions(+), 29 deletions(-)
arch/arm/kernel/entry-ftrace.S +22 -29
@@ -22,10 +22,7 @@ * mcount can be thought of as a function called in the middle of a subroutine * call. As such, it needs to be transparent for both the caller and the * callee: the original lr needs to be restored when leaving mcount, and no - * registers should be clobbered. (In the __gnu_mcount_nc implementation, we - * clobber the ip register. This is OK because the ARM calling convention - * allows it to be clobbered in subroutines and doesn't use it to hold - * parameters.) + * registers should be clobbered. * * When using dynamic ftrace, we patch out the mcount call by a "pop {lr}" * instead of the __gnu_mcount_nc call (see arch/arm/kernel/ftrace.c).
@@ -70,26 +67,25 @@ .macro __ftrace_regs_caller - sub sp, sp, #8 @ space for PC and CPSR OLD_R0, + str lr, [sp, #-8]! @ store LR as PC and make space for CPSR/OLD_R0, @ OLD_R0 will overwrite previous LR - add ip, sp, #12 @ move in IP the value of SP as it was - @ before the push {lr} of the mcount mechanism + ldr lr, [sp, #8] @ get previous LR - str lr, [sp, #0] @ store LR instead of PC + str r0, [sp, #8] @ write r0 as OLD_R0 over previous LR - ldr lr, [sp, #8] @ get previous LR + str lr, [sp, #-4]! @ store previous LR as LR - str r0, [sp, #8] @ write r0 as OLD_R0 over previous LR + add lr, sp, #16 @ move in LR the value of SP as it was + @ before the push {lr} of the mcount mechanism - stmdb sp!, {ip, lr} - stmdb sp!, {r0-r11, lr} + push {r0-r11, ip, lr} @ stack content at this point: @ 0 4 48 52 56 60 64 68 72 - @ R0 | R1 | ... | LR | SP + 4 | previous LR | LR | PSR | OLD_R0 | + @ R0 | R1 | ... | IP | SP + 4 | previous LR | LR | PSR | OLD_R0 | - mov r3, sp @ struct pt_regs* + mov r3, sp @ struct pt_regs* ldr r2, =function_trace_op ldr r2, [r2] @ pointer to the current
@@ -112,11 +108,9 @@ ftrace_graph_regs_call: #endif @ pop saved regs - ldmia sp!, {r0-r12} @ restore r0 through r12 - ldr ip, [sp, #8] @ restore PC - ldr lr, [sp, #4] @ restore LR - ldr sp, [sp, #0] @ restore SP - mov pc, ip @ return + pop {r0-r11, ip, lr} @ restore r0 through r12 + ldr lr, [sp], #4 @ restore LR + ldr pc, [sp], #12 .endm #ifdef CONFIG_FUNCTION_GRAPH_TRACER
@@ -132,11 +126,9 @@ ftrace_graph_regs_call: bl prepare_ftrace_return @ pop registers saved in ftrace_regs_caller - ldmia sp!, {r0-r12} @ restore r0 through r12 - ldr ip, [sp, #8] @ restore PC - ldr lr, [sp, #4] @ restore LR - ldr sp, [sp, #0] @ restore SP - mov pc, ip @ return + pop {r0-r11, ip, lr} @ restore r0 through r12 + ldr lr, [sp], #4 @ restore LR + ldr pc, [sp], #12 .endm #endif
@@ -202,16 +194,17 @@ ftrace_graph_call\suffix: .endm .macro mcount_exit - ldmia sp!, {r0-r3, ip, lr} - ret ip + ldmia sp!, {r0-r3} + ldr lr, [sp, #4] + ldr pc, [sp], #8 .endm ENTRY(__gnu_mcount_nc) UNWIND(.fnstart) #ifdef CONFIG_DYNAMIC_FTRACE - mov ip, lr - ldmia sp!, {lr} - ret ip + push {lr} + ldr lr, [sp, #4] + ldr pc, [sp], #8 #else __mcount #endif
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 24/66 ALSA: hda: Fix driver index handling at re-binding
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 69458e2c27800da7697c87ed908b65323ef3f3bd ]
HD-audio driver handles the multiple instances and keeps the static index that is incremented at each probe. This becomes a problem when user tries to re-bind the device via sysfs multiple times; as the device index isn't cleared unlike rmmod case, it points to the next element at re-binding, and eventually later you can't probe any more when it reaches to SNDRV_CARDS_MAX (usually 32).
This patch is an attempt to improve the handling at rebinding. Instead of a static device index, now we keep a bitmap and assigns to the first zero bit position. At the driver remove, in return, the bitmap slot is cleared again, so that it'll be available for the next probe.
--- sound/pci/hda/hda_intel.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
sound/pci/hda/hda_intel.c +7 -3
@@ -2066,14 +2066,16 @@ static const struct hda_controller_ops pci_hda_ops = { .position_check = azx_position_check, }; +static DECLARE_BITMAP(probed_devs, SNDRV_CARDS); +static int azx_probe (struct pci_dev *pci,const struct pci_device_id *pci_id) { -static int dev;struct snd_card *card;struct hda_intel *hda;struct azx *chip;bool schedule_probe; +int dev;int err;if (pci_match_id (driver_denylist, pci)) {
@@ -2081,10 +2083,11 @@ static int azx_probe(struct pci_dev *pci,return -ENODEV ; } + dev =find_first_zero_bit (probed_devs,SNDRV_CARDS );if (dev >=SNDRV_CARDS )return -ENODEV ;if (!enable[dev]) { - dev++; +set_bit (dev, probed_devs);return -ENOENT ; }
@@ -2151,7 +2154,7 @@ static int azx_probe(struct pci_dev *pci,if (schedule_probe)schedule_delayed_work (&hda->probe_work,0 ); - dev++; +set_bit (dev, probed_devs);if (chip->disabled)complete_all (&hda->probe_wait);return 0 ;
@@ -2374,6 +2377,7 @@ static void azx_remove(struct pci_dev *pci)cancel_delayed_work_sync (&hda->probe_work);device_lock (&pci->dev); +clear_bit (chip->dev_index, probed_devs);pci_set_drvdata (pci,NULL );snd_card_free (card); }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 25/66 ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk
In reply to Sasha LevinFrom: Abel Vesa <[email protected]>
[ Upstream commit 4cb7df64c732b2b9918424095c11660c2a8c4a33 ]
The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790), but according to the reference manual, there is no such gate. Moreover, the consumer driver of the mentioned clock might gate it and leave the ECSPI2 (the true owner of that gate) hanging. So lets use the audio_mclk_post_div, which is the parent.
--- arch/arm/boot/dts/imx7-colibri.dtsi | 4 ++-- arch/arm/boot/dts/imx7-mba7.dtsi | 2 +- arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- arch/arm/boot/dts/imx7d-pico-hobbit.dts | 4 ++-- arch/arm/boot/dts/imx7d-pico-pi.dts | 4 ++-- arch/arm/boot/dts/imx7d-sdb.dts | 4 ++-- arch/arm/boot/dts/imx7s-warp.dts | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +2 -2
@@ -40,7 +40,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&codec>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -293,7 +293,7 @@ compatible = "fsl,sgtl5000"; #sound-dai-cells = <0>; reg = <0x0a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai1_mclk>; VDDA-supply = <®_module_3v3_avdd>;
arch/arm/boot/dts/imx7-mba7.dtsi +1 -1
@@ -302,7 +302,7 @@ tlv320aic32x4: audio-codec@18 { compatible = "ti,tlv320aic32x4"; reg = <0x18>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; ldoin-supply = <®_audio_3v3>; iov-supply = <®_audio_3v3>;
arch/arm/boot/dts/imx7d-nitrogen7.dts +1 -1
@@ -288,7 +288,7 @@ codec: wm8960@1a { compatible = "wlf,wm8960"; reg = <0x1a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; wlf,shared-lrclk; };
arch/arm/boot/dts/imx7d-pico-hobbit.dts +2 -2
@@ -31,7 +31,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&sgtl5000>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -41,7 +41,7 @@ #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply = <®_2p5v>; VDDIO-supply = <®_vref_1v8>; };
arch/arm/boot/dts/imx7d-pico-pi.dts +2 -2
@@ -31,7 +31,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&sgtl5000>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -41,7 +41,7 @@ #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; VDDA-supply = <®_2p5v>; VDDIO-supply = <®_vref_1v8>; };
arch/arm/boot/dts/imx7d-sdb.dts +2 -2
@@ -385,14 +385,14 @@ codec: wm8960@1a { compatible = "wlf,wm8960"; reg = <0x1a>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; clock-names = "mclk"; wlf,shared-lrclk; wlf,hp-cfg = <2 2 3>; wlf,gpio-cfg = <1 3>; assigned-clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_SRC>, <&clks IMX7D_PLL_AUDIO_POST_DIV>, - <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; assigned-clock-rates = <0>, <884736000>, <12288000>; };
arch/arm/boot/dts/imx7s-warp.dts +2 -2
@@ -75,7 +75,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&codec>; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; }; }; };
@@ -232,7 +232,7 @@ #sound-dai-cells = <0>; reg = <0x0a>; compatible = "fsl,sgtl5000"; - clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai1_mclk>; VDDA-supply = <&vgen4_reg>;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 26/66 arm64: defconfig: build imx-sdma as a module
In reply to Sasha LevinFrom: Marcel Ziswiler <[email protected]>
[ Upstream commit e95622289f263662240544a9f0009b25c19e64d4 ]
This avoids firmware load error and sysfs fallback reported as follows:
[ 0.199448] imx-sdma 302c0000.dma-controller: Direct firmware load for imx/sdma/sdma-imx7d.bin failed with error -2 [ 0.199487] imx-sdma 302c0000.dma-controller: Falling back to sysfs fallback for: imx/sdma/sdma-imx7d.bin
--- arch/arm64/configs/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/configs/defconfig +1 -1
@@ -939,7 +939,7 @@ CONFIG_DMADEVICES=y CONFIG_DMA_BCM2835=y CONFIG_DMA_SUN6I=m CONFIG_FSL_EDMA=y -CONFIG_IMX_SDMA=y +CONFIG_IMX_SDMA=m CONFIG_K3_DMA=y CONFIG_MV_XOR=y CONFIG_MV_XOR_V2=y
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 27/66 video: fbdev: omapfb: panel-dsi-cm: Use sysfs_emit() instead of snprintf()
In reply to Sasha LevinFrom: Jing Yao <[email protected]>
[ Upstream commit f63658a59c3d439c8ad7b290f8ec270980e0f384 ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c +4 -4
@@ -409,7 +409,7 @@ static ssize_t dsicm_num_errors_show(struct device *dev,if (r)return r; -return snprintf (buf,PAGE_SIZE ,"%d\n" , errors); +return sysfs_emit (buf,"%d\n" , errors); } static ssize_t dsicm_hw_revision_show(struct device *dev,
@@ -439,7 +439,7 @@ static ssize_t dsicm_hw_revision_show(struct device *dev,if (r)return r; -return snprintf (buf,PAGE_SIZE ,"%02x.%02x.%02x\n" , id1, id2, id3); +return sysfs_emit (buf,"%02x.%02x.%02x\n" , id1, id2, id3); } static ssize_t dsicm_store_ulps(struct device *dev,
@@ -487,7 +487,7 @@ static ssize_t dsicm_show_ulps(struct device *dev, t = ddata->ulps_enabled;mutex_unlock (&ddata->lock); -return snprintf (buf,PAGE_SIZE ,"%u\n" , t); +return sysfs_emit (buf,"%u\n" , t); } static ssize_t dsicm_store_ulps_timeout(struct device *dev,
@@ -532,7 +532,7 @@ static ssize_t dsicm_show_ulps_timeout(struct device *dev, t = ddata->ulps_timeout;mutex_unlock (&ddata->lock); -return snprintf (buf,PAGE_SIZE ,"%u\n" , t); +return sysfs_emit (buf,"%u\n" , t); } static DEVICE_ATTR(num_dsi_errors, S_IRUGO, dsicm_num_errors_show, NULL);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 28/66 video: fbdev: omapfb: panel-tpo-td043mtea1: Use sysfs_emit() instead of snprintf()
In reply to Sasha LevinFrom: Jing Yao <[email protected]>
[ Upstream commit c07a039cbb96748f54c02995bae8131cc9a73b0a ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- .../video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c +2 -2
@@ -169,7 +169,7 @@ static ssize_t tpo_td043_vmirror_show(struct device *dev, {struct panel_drv_data *ddata =dev_get_drvdata (dev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ddata->vmirror); +return sysfs_emit (buf,"%d\n" , ddata->vmirror); } static ssize_t tpo_td043_vmirror_store(struct device *dev,
@@ -199,7 +199,7 @@ static ssize_t tpo_td043_mode_show(struct device *dev, {struct panel_drv_data *ddata =dev_get_drvdata (dev); -return snprintf (buf,PAGE_SIZE ,"%d\n" , ddata->mode); +return sysfs_emit (buf,"%d\n" , ddata->mode); } static ssize_t tpo_td043_mode_store(struct device *dev,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 29/66 video: fbdev: udlfb: replace snprintf in show functions with sysfs_emit
In reply to Sasha LevinFrom: Jing Yao <[email protected]>
[ Upstream commit 81a998288956d09d7a7a2303d47e4d60ad55c401 ]
Use sysfs_emit instead of scnprintf, snprintf or sprintf.
--- drivers/video/fbdev/udlfb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/udlfb.c +4 -4
@@ -1426,7 +1426,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->bytes_rendered)); }
@@ -1434,7 +1434,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->bytes_identical)); }
@@ -1442,7 +1442,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->bytes_sent)); }
@@ -1450,7 +1450,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev, struct device_attribute *a, char *buf) { struct fb_info *fb_info = dev_get_drvdata(fbdev);struct dlfb_data *dlfb = fb_info->par; -return snprintf (buf,PAGE_SIZE ,"%u\n" , +return sysfs_emit (buf,"%u\n" ,atomic_read (&dlfb->cpu_kcycles_used)); }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 30/66 ARM: dts: bcm2711: Add the missing L1/L2 cache information
In reply to Sasha LevinFrom: Richard Schleich <[email protected]>
[ Upstream commit 618682b350990f8f1bee718949c4b3858711eb58 ]
This patch fixes the kernel warning "cacheinfo: Unable to detect cache hierarchy for CPU 0" for the bcm2711 on newer kernel versions.
--- arch/arm/boot/dts/bcm2711.dtsi | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
arch/arm/boot/dts/bcm2711.dtsi +50 -0
@@ -459,12 +459,26 @@ #size-cells = <0>; enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit + /* Source for d/i-cache-line-size and d/i-cache-sets + * https://developer.arm.com/documentation/100095/0003 + * /Level-1-Memory-System/About-the-L1-memory-system?lang=en + * Source for d/i-cache-size + * https://www.raspberrypi.com/documentation/computers + * /processors.html#bcm2711 + */ cpu0: cpu@0 { device_type = "cpu"; compatible = "arm,cortex-a72"; reg = <0>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000d8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; }; cpu1: cpu@1 {
@@ -473,6 +487,13 @@ reg = <1>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; }; cpu2: cpu@2 {
@@ -481,6 +502,13 @@ reg = <2>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000e8>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; }; cpu3: cpu@3 {
@@ -489,6 +517,28 @@ reg = <3>; enable-method = "spin-table"; cpu-release-addr = <0x0 0x000000f0>; + d-cache-size = <0x8000>; + d-cache-line-size = <64>; + d-cache-sets = <256>; // 32KiB(size)/64(line-size)=512ways/2-way set + i-cache-size = <0xc000>; + i-cache-line-size = <64>; + i-cache-sets = <256>; // 48KiB(size)/64(line-size)=768ways/3-way set + next-level-cache = <&l2>; + }; + + /* Source for d/i-cache-line-size and d/i-cache-sets + * https://developer.arm.com/documentation/100095/0003 + * /Level-2-Memory-System/About-the-L2-memory-system?lang=en + * Source for d/i-cache-size + * https://www.raspberrypi.com/documentation/computers + * /processors.html#bcm2711 + */ + l2: l2-cache0 { + compatible = "cache"; + cache-size = <0x100000>; + cache-line-size = <64>; + cache-sets = <1024>; // 1MiB(size)/64(line-size)=16384ways/16-way set + cache-level = <2>; }; };
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 31/66 printk: Add panic_in_progress helper
In reply to Sasha LevinFrom: Stephen Brennan <[email protected]>
[ Upstream commit 77498617857f68496b360081dde1a492d40c28b2 ]
This will be used help avoid deadlocks during panics. Although it would be better to include this in linux/panic.h, it would require that header to include linux/atomic.h as well. On some architectures, this results in a circular dependency as well. So instead add the helper directly to printk.c.
--- kernel/printk/printk.c | 5 +++++ 1 file changed, 5 insertions(+)
kernel/printk/printk.c +5 -0
@@ -257,6 +257,11 @@ static void __up_console_sem(unsigned long ip) }#define up_console_sem () __up_console_sem(_RET_IP_) +static bool panic_in_progress (void ) +{ +return unlikely (atomic_read (&panic_cpu) !=PANIC_CPU_INVALID ); +} +/* * This is used for debugging the mess that is the VT code by * keeping track if we have the console semaphore held. It's
Signature · 1 line
2.34.1
Greg KH
maintainerRe: [PATCH AUTOSEL 5.17 31/66] printk: Add panic_in_progress helper
Quoted 40 lines · Sasha Levin
From: Stephen Brennan <[email protected]>
[ Upstream commit
77498617857f68496b360081dde1a492d40c28b2]This will be used help avoid deadlocks during panics. Although it would be better to include this in
linux/panic.h, it would require that header to includelinux/atomic.has well. On some architectures, this results in a circular dependency as well. So instead add the helper directly toprintk.c.Suggested-by Petr Mladek <[email protected]>Signed-off-by Stephen Brennan <[email protected]>Reviewed-by Petr Mladek <[email protected]>Reviewed-by Sergey Senozhatsky <[email protected]>Signed-off-by Petr Mladek <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- kernel/printk/printk.c | 5 +++++ 1 file changed, 5 insertions(+)kernel/printk/printk.c +5
-0@@ -257,6 +257,11 @@ static void __up_console_sem(unsigned long ip) }#define up_console_sem () __up_console_sem(_RET_IP_) +static bool panic_in_progress (void ) +{ +return unlikely (atomic_read (&panic_cpu) !=PANIC_CPU_INVALID ); +} +/* * This is used for debugging the mess that is the VT code by * keeping track if we have the console semaphore held. It's Signature · 1 line
2.34.1
All 4 of the printk patches should not need to be backported to stable kernels, thanks. Please drop them all.
greg k-h
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.17 31/66] printk: Add panic_in_progress helper
Quoted 30 lines · Greg KH
Quoted 29 lines · Sasha Levin
From: Stephen Brennan <[email protected]>
[ Upstream commit
77498617857f68496b360081dde1a492d40c28b2]This will be used help avoid deadlocks during panics. Although it would be better to include this in
linux/panic.h, it would require that header to includelinux/atomic.has well. On some architectures, this results in a circular dependency as well. So instead add the helper directly toprintk.c.Suggested-by Petr Mladek <[email protected]>Signed-off-by Stephen Brennan <[email protected]>Reviewed-by Petr Mladek <[email protected]>Reviewed-by Sergey Senozhatsky <[email protected]>Signed-off-by Petr Mladek <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- kernel/printk/printk.c | 5 +++++ 1 file changed, 5 insertions(+)kernel/printk/printk.c +0
-0@@ -257,6 +257,11 @@ static void __up_console_sem(unsigned long ip) }#define up_console_sem () __up_console_sem(_RET_IP_)
Quoted 14 lines
Quoted 11 lines
kernel/printk/printk.c +5
-1+static bool panic_in_progress (void ) +{ +return unlikely (atomic_read (&panic_cpu) !=PANIC_CPU_INVALID ); +} +/* * This is used for debugging the mess that is the VT code by * keeping track if we have the console semaphore held. It's -- 2.34.1
All 4 of the printk patches should not need to be backported to stable kernels, thanks. Please drop them all.
I'll drop them, thanks.
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 32/66 printk: Avoid livelock with heavy printk during panic
In reply to Sasha LevinFrom: Stephen Brennan <[email protected]>
[ Upstream commit 13fb0f74d7029df3b8137f11ef955e578a4a4a60 ]
During panic(), if another CPU is writing heavily the kernel log (e.g. via /dev/kmsg), then the panic CPU may livelock writing out its messages to the console. Note when too many messages are dropped during panic and suppress further printk, except from the panic CPU. This could result in some important messages being dropped. However, messages are already being dropped, so this approach at least prevents a livelock.
--- kernel/printk/printk.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
kernel/printk/printk.c +15 -0
@@ -93,6 +93,12 @@ EXPORT_SYMBOL_GPL(console_drivers);*/ int __read_mostly suppress_printk; +/* +* During panic, heavy printk by other CPUs can delay the +* panic and risk deadlock on console resources. +*/ +int __read_mostly suppress_panic_printk; +#ifdef CONFIG_LOCKDEP static struct lockdep_map console_lock_dep_map = { .name = "console_lock"
@@ -2223,6 +2229,10 @@ asmlinkage int vprintk_emit(int facility, int level,if (unlikely (suppress_printk))return 0 ; +if (unlikely (suppress_panic_printk) && +atomic_read (&panic_cpu) !=raw_smp_processor_id ()) +return 0 ; +if (level ==LOGLEVEL_SCHED ) { level =LOGLEVEL_DEFAULT ; in_sched = true;
@@ -2608,6 +2618,7 @@ void console_unlock(void) {static char ext_text[CONSOLE_EXT_LOG_MAX ];static char text[CONSOLE_LOG_MAX ]; +static int panic_console_dropped;unsigned long flags;bool do_cond_resched, retry;struct printk_info info;
@@ -2662,6 +2673,10 @@ void console_unlock(void)if (console_seq != r.info->seq) { console_dropped += r.info->seq - console_seq; console_seq = r.info->seq; +if (panic_in_progress () && panic_console_dropped++ >10 ) { + suppress_panic_printk =1 ; +pr_warn_once ("Too many dropped messages. Suppress messages on non-panic CPUs to prevent livelock.\n" ); + } }if (suppress_message_printing (r.info->level)) {
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 33/66 printk: Drop console_sem during panic
In reply to Sasha LevinFrom: Stephen Brennan <[email protected]>
[ Upstream commit 8ebc476fd51e6c0fd3174ec1959a20ba99d4c5e5 ]
If another CPU is in panic, we are about to be halted. Try to gracefully abandon the console_sem, leaving it free for the panic CPU to grab.
--- kernel/printk/printk.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
kernel/printk/printk.c +24 -1
@@ -2588,6 +2588,25 @@ static int have_callable_console(void)return 0 ; } +/* +* Return true when this CPU should unlock console_sem without pushing all +* messages to the console. This reduces the chance that the console is +* locked when the panic CPU tries to use it. +*/ +static bool abandon_console_lock_in_panic (void ) +{ +if (!panic_in_progress ()) +return false; + +/* +* We can use raw_smp_processor_id() here because it is impossible for +* the task to be migrated to the panic_cpu, or away from it. If +* panic_cpu has already been set, and we're not currently executing on +* that CPU, then we never will be. +*/ +return atomic_read (&panic_cpu) !=raw_smp_processor_id (); +} +/* * Can we actually use the console at this time on this cpu? *
@@ -2736,6 +2755,10 @@ void console_unlock(void)if (handover)return ; +/* Allow panic_cpu to take over the consoles safely */ +if (abandon_console_lock_in_panic ()) +break ; +if (do_cond_resched)cond_resched (); }
@@ -2753,7 +2776,7 @@ void console_unlock(void)* flush, no worries. */ retry =prb_read_valid (prb, next_seq,NULL ); -if (retry &&console_trylock ()) +if (retry && !abandon_console_lock_in_panic () &&console_trylock ()) goto again; }EXPORT_SYMBOL (console_unlock);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 34/66 ASoC: soc-core: skip zero num_dai component in searching dai name
In reply to Sasha LevinFrom: Shengjiu Wang <[email protected]>
[ Upstream commit f7d344a2bd5ec81fbd1ce76928fd059e57ec9bea ]
In the case like dmaengine which's not a dai but as a component, the num_dai is zero, dmaengine component has the same component_of_node as cpu dai, when cpu dai component is not ready, but dmaengine component is ready, try to get cpu dai name, the snd_soc_get_dai_name() return -EINVAL, not -EPROBE_DEFER, that cause below error:
asoc-simple-card <card name>: parse error -22
asoc-simple-card: probe of <card name> failed with error -22
The sound card failed to probe.
So this patch fixes the issue above by skipping the zero num_dai component in searching dai name.
--- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/soc-core.c +1 -1
@@ -3233,7 +3233,7 @@ int snd_soc_get_dai_name(const struct of_phandle_args *args,for_each_component (pos) {struct device_node *component_of_node =soc_component_to_node (pos); -if (component_of_node != args->np) +if (component_of_node != args->np || !pos->num_dai)continue ; ret =snd_soc_component_of_xlate_dai_name (pos, args, dai_name);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 35/66 printk: use atomic updates for klogd work
In reply to Sasha LevinFrom: John Ogness <[email protected]>
[ Upstream commit 2ba3673d70178bf07fb75ff25c54bc478add4021 ]
The per-cpu @printk_pending variable can be updated from sleepable contexts, such as:
get_random_bytes()
warn_unseeded_randomness()
printk_deferred()
defer_console_output()
and can be updated from interrupt contexts, such as:
handle_irq_event_percpu()
__irq_wake_thread()
wake_up_process()
try_to_wake_up()
select_task_rq()
select_fallback_rq()
printk_deferred()
defer_console_output()and can be updated from NMI contexts, such as:
vprintk()
if (in_nmi()) defer_console_output()
Therefore the atomic variant of the updating functions must be used.
Replace __this_cpu_xchg() with this_cpu_xchg().
Replace __this_cpu_or() with this_cpu_or().
--- kernel/printk/printk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/printk/printk.c +2 -2
@@ -3271,7 +3271,7 @@ static DEFINE_PER_CPU(int, printk_pending);static void wake_up_klogd_work_func (struct irq_work *irq_work) { -int pending =__this_cpu_xchg (printk_pending,0 ); +int pending =this_cpu_xchg (printk_pending,0 );if (pending &PRINTK_PENDING_OUTPUT ) {/* If trylock fails, someone else is doing the printing */
@@ -3305,7 +3305,7 @@ void defer_console_output(void)return ;preempt_disable (); -__this_cpu_or (printk_pending,PRINTK_PENDING_OUTPUT ); +this_cpu_or (printk_pending,PRINTK_PENDING_OUTPUT );irq_work_queue (this_cpu_ptr (&wake_up_klogd_work));preempt_enable (); }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 36/66 ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021
In reply to Sasha LevinFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit ce6a70bfce21bb4edb7c0f29ecfb0522fa34ab71 ]
Huawei D15 uses SSP_CODEC(0).
--- sound/soc/intel/boards/sof_es8336.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/soc/intel/boards/sof_es8336.c +8 -0
@@ -247,6 +247,14 @@ static const struct dmi_system_id sof_es8336_quirk_table[] = { SOF_ES8336_TGL_GPIO_QUIRK | SOF_ES8336_ENABLE_DMIC) }, + { + .callback = sof_es8336_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "HUAWEI"), + DMI_MATCH(DMI_BOARD_NAME, "BOHB-WAX9-PCB-B2"), + }, + .driver_data = (void *)SOF_ES8336_SSP_CODEC(0) + }, {} };
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 37/66 media: imx-jpeg: fix a bug of accessing array out of bounds
In reply to Sasha LevinFrom: Ming Qian <[email protected]>
[ Upstream commit 97558d170a1236280407e8d29a7d095d2c2ed554 ]
When error occurs in parsing jpeg, the slot isn't acquired yet, it may be the default value MXC_MAX_SLOTS.
If the driver access the slot using the incorrect slot number, it will access array out of bounds.
The result is the driver will change num_domains, which follows slot_data in struct mxc_jpeg_dev.
Then the driver won't detach the pm domain at rmmod, which will lead to kernel panic when trying to insmod again.
--- drivers/media/platform/imx-jpeg/mxc-jpeg.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/platform/imx-jpeg/mxc-jpeg.c +0 -1
@@ -954,7 +954,6 @@ static void mxc_jpeg_device_run(void *priv) jpeg_src_buf->jpeg_parse_error = true; }if (jpeg_src_buf->jpeg_parse_error) { - jpeg->slot_data[ctx->slot].used = false;v4l2_m2m_src_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx);v4l2_m2m_buf_done (src_buf,VB2_BUF_STATE_ERROR );
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 38/66 media: cx88-mpeg: clear interrupt status register before streaming video
In reply to Sasha LevinFrom: Daniel González Cabanelas <[email protected]>
[ Upstream commit 56cb61f70e547e1b0cdfe6ff5a1f1ce6242e6d96 ]
Some cx88 video cards may have transport stream status interrupts set to 1 from cold start, causing errors like this:
cx88xx: cx88_print_irqbits: core:irq mpeg [0x100000] ts_err?*
cx8802: cx8802_mpeg_irq: mpeg:general errors: 0x00100000
According to CX2388x datasheet, the interrupt status register should be cleared before enabling IRQs to stream video.
Fix it by clearing the Transport Stream Interrupt Status register.
--- drivers/media/pci/cx88/cx88-mpeg.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/media/pci/cx88/cx88-mpeg.c +3 -0
@@ -162,6 +162,9 @@ int cx8802_start_dma(struct cx8802_dev *dev,cx_write (MO_TS_GPCNTRL ,GP_COUNT_CONTROL_RESET ); q->count =0 ; +/* clear interrupt status register */ +cx_write (MO_TS_INTSTAT ,0x1f1111 ); +/* enable irqs */ dprintk (1 ,"setting the interrupt mask\n" );cx_set (MO_PCI_INTMSK , core->pci_irqmask |PCI_INT_TSINT );
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 39/66 ASoC: rt5682s: Fix the wrong jack type detected
In reply to Sasha LevinFrom: Derek Fang <[email protected]>
[ Upstream commit c07ac3ee76e5e5506bca9c03fbbb15e40ab28430 ]
Some powers were changed during the jack insert detection and clk's enable/disable in CCF.
If in parallel, the influence has a chance to detect the wrong jack type.
We refer to the below commit of the variant codec (rt5682) to fix this issue.
ASoC: rt5682: Fix deadlock on resume
1. Remove rt5682s_headset_detect in rt5682s_jd_check_handler and use jack_detect_work instead of.
2. Use dapm mutex used in CCF to protect most of jack_detect_work.
--- sound/soc/codecs/rt5682s.c | 26 +++++++++----------------- sound/soc/codecs/rt5682s.h | 1 - 2 files changed, 9 insertions(+), 18 deletions(-)
sound/soc/codecs/rt5682s.c +9 -17
@@ -822,6 +822,7 @@ static void rt5682s_jack_detect_handler(struct work_struct *work) {struct rt5682s_priv *rt5682s = container_of(work, struct rt5682s_priv, jack_detect_work.work); +struct snd_soc_dapm_context *dapm;int val, btn_type; if (!rt5682s->component || !rt5682s->component->card ||
@@ -832,7 +833,9 @@ static void rt5682s_jack_detect_handler(struct work_struct *work)return ; } -mutex_lock (&rt5682s->jdet_mutex); + dapm =snd_soc_component_get_dapm (rt5682s->component); + +snd_soc_dapm_mutex_lock (dapm);mutex_lock (&rt5682s->calibrate_mutex); val =snd_soc_component_read (rt5682s->component,RT5682S_AJD1_CTRL )
@@ -889,6 +892,9 @@ static void rt5682s_jack_detect_handler(struct work_struct *work) rt5682s->irq_work_delay_time =50 ; } +mutex_unlock (&rt5682s->calibrate_mutex); +snd_soc_dapm_mutex_unlock (dapm); +snd_soc_jack_report (rt5682s->hs_jack, rt5682s->jack_type,SND_JACK_HEADSET |SND_JACK_BTN_0 |SND_JACK_BTN_1 |SND_JACK_BTN_2 |SND_JACK_BTN_3 );
@@ -898,9 +904,6 @@ static void rt5682s_jack_detect_handler(struct work_struct *work)schedule_delayed_work (&rt5682s->jd_check_work,0 ); else cancel_delayed_work_sync(&rt5682s->jd_check_work); - -mutex_unlock (&rt5682s->calibrate_mutex); -mutex_unlock (&rt5682s->jdet_mutex); }static void rt5682s_jd_check_handler (struct work_struct *work)
@@ -908,14 +911,9 @@ static void rt5682s_jd_check_handler(struct work_struct *work)struct rt5682s_priv *rt5682s = container_of(work, struct rt5682s_priv, jd_check_work.work); -if (snd_soc_component_read (rt5682s->component,RT5682S_AJD1_CTRL ) - &RT5682S_JDH_RS_MASK ) { +if (snd_soc_component_read (rt5682s->component,RT5682S_AJD1_CTRL ) &RT5682S_JDH_RS_MASK ) {/* jack out */ - rt5682s->jack_type =rt5682s_headset_detect (rt5682s->component,0 ); - -snd_soc_jack_report (rt5682s->hs_jack, rt5682s->jack_type, -SND_JACK_HEADSET |SND_JACK_BTN_0 |SND_JACK_BTN_1 | -SND_JACK_BTN_2 |SND_JACK_BTN_3 ); +schedule_delayed_work (&rt5682s->jack_detect_work,0 ); }else {schedule_delayed_work (&rt5682s->jd_check_work,500 ); }
@@ -1323,7 +1321,6 @@ static int rt5682s_hp_amp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) {struct snd_soc_component *component =snd_soc_dapm_to_component (w->dapm); -struct rt5682s_priv *rt5682s =snd_soc_component_get_drvdata (component);switch (event) {case SND_SOC_DAPM_POST_PMU :
@@ -1339,8 +1336,6 @@ static int rt5682s_hp_amp_event(struct snd_soc_dapm_widget *w,snd_soc_component_write (component,RT5682S_BIAS_CUR_CTRL_11 ,0x6666 );snd_soc_component_write (component,RT5682S_BIAS_CUR_CTRL_12 ,0xa82a ); -mutex_lock (&rt5682s->jdet_mutex); - snd_soc_component_update_bits(component, RT5682S_HP_CTRL_2, RT5682S_HPO_L_PATH_MASK | RT5682S_HPO_R_PATH_MASK | RT5682S_HPO_SEL_IP_EN_SW, RT5682S_HPO_L_PATH_EN |
@@ -1348,8 +1343,6 @@ static int rt5682s_hp_amp_event(struct snd_soc_dapm_widget *w,usleep_range (5000 ,10000 );snd_soc_component_update_bits (component,RT5682S_HP_AMP_DET_CTL_1 ,RT5682S_CP_SW_SIZE_MASK ,RT5682S_CP_SW_SIZE_L |RT5682S_CP_SW_SIZE_S ); - -mutex_unlock (&rt5682s->jdet_mutex);break ;case SND_SOC_DAPM_POST_PMD :
@@ -3103,7 +3096,6 @@ static int rt5682s_i2c_probe(struct i2c_client *i2c,mutex_init (&rt5682s->calibrate_mutex);mutex_init (&rt5682s->sar_mutex); -mutex_init (&rt5682s->jdet_mutex);rt5682s_calibrate (rt5682s); regmap_update_bits(rt5682s->regmap, RT5682S_MICBIAS_2,
sound/soc/codecs/rt5682s.h +0 -1
@@ -1446,7 +1446,6 @@ struct rt5682s_priv {struct delayed_work jd_check_work;struct mutex calibrate_mutex;struct mutex sar_mutex; -struct mutex jdet_mutex;#ifdef CONFIG_COMMON_CLK struct clk_hw dai_clks_hw[RT5682S_DAI_NUM_CLKS ];
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 40/66 ARM: tegra: transformer: Drop reg-shift for Tegra HS UART
In reply to Sasha LevinFrom: Svyatoslav Ryhel <[email protected]>
[ Upstream commit 79b788bfc787b60699d46b9e273b42ebe18336b3 ]
When the Tegra High-Speed UART is used instead of the regular UART, the reg-shift property is implied from the compatible string and should not be explicitly listed.
--- arch/arm/boot/dts/tegra20-asus-tf101.dts | 2 ++ arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi | 2 ++ arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 2 ++ 3 files changed, 6 insertions(+)
arch/arm/boot/dts/tegra20-asus-tf101.dts +2 -0
@@ -442,11 +442,13 @@ serial@70006040 { compatible = "nvidia,tegra20-hsuart"; + /delete-property/ reg-shift; /* GPS BCM4751 */ }; serial@70006200 { compatible = "nvidia,tegra20-hsuart"; + /delete-property/ reg-shift; status = "okay"; /* Azurewave AW-NH615 BCM4329B1 */
arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi +2 -0
@@ -1080,6 +1080,7 @@ serial@70006040 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; /* Broadcom GPS BCM47511 */
@@ -1087,6 +1088,7 @@ serial@70006200 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; nvidia,adjust-baud-rates = <0 9600 100>,
arch/arm/boot/dts/tegra30-pegatron-chagall.dts +2 -0
@@ -1103,6 +1103,7 @@ uartb: serial@70006040 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; /* Broadcom GPS BCM47511 */
@@ -1110,6 +1111,7 @@ uartc: serial@70006200 { compatible = "nvidia,tegra30-hsuart"; + /delete-property/ reg-shift; status = "okay"; nvidia,adjust-baud-rates = <0 9600 100>,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 41/66 uaccess: fix type mismatch warnings from access_ok()
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 23fc539e81295b14b50c6ccc5baeb4f3d59d822d ]
On some architectures, access_ok() does not do any argument type checking, so replacing the definition with a generic one causes a few warnings for harmless issues that were never caught before.
Fix the ones that I found either through my own test builds or that were reported by the 0-day bot.
--- arch/arc/kernel/process.c | 2 +- arch/arm/kernel/swp_emulate.c | 2 +- arch/arm/kernel/traps.c | 2 +- arch/csky/kernel/perf_callchain.c | 2 +- arch/csky/kernel/signal.c | 2 +- arch/nios2/kernel/signal.c | 20 +++++++++++--------- arch/powerpc/lib/sstep.c | 4 ++-- arch/riscv/kernel/perf_callchain.c | 4 ++-- arch/sparc/kernel/signal_32.c | 2 +- lib/test_lockup.c | 4 ++-- 10 files changed, 23 insertions(+), 21 deletions(-)
arch/arc/kernel/process.c +1 -1
@@ -43,7 +43,7 @@ SYSCALL_DEFINE0(arc_gettls)return task_thread_info (current)->thr_ptr; } -SYSCALL_DEFINE3(arc_usr_cmpxchg, int *, uaddr, int, expected, int, new) +SYSCALL_DEFINE3(arc_usr_cmpxchg, int __user *, uaddr, int, expected, int, new) {struct pt_regs *regs =current_pt_regs ();u32 uval;
arch/arm/kernel/swp_emulate.c +1 -1
@@ -195,7 +195,7 @@ static int swp_handler(struct pt_regs *regs, unsigned int instr) destreg, EXTRACT_REG_NUM(instr, RT2_OFFSET), data);/* Check access in reasonable access range for both SWP and SWPB */ -if (!access_ok ((address & ~3 ),4 )) { +if (!access_ok ((void __user *)(address & ~3 ),4 )) {pr_debug ("SWP{B} emulation: access to %p not allowed!\n" , (void *)address); res = -EFAULT ;
arch/arm/kernel/traps.c +1 -1
@@ -577,7 +577,7 @@ do_cache_op(unsigned long start, unsigned long end, int flags)if (end < start || flags)return -EINVAL ; -if (!access_ok (start, end - start)) +if (!access_ok ((void __user *)start, end - start))return -EFAULT ;return __do_cache_op (start, end);
arch/csky/kernel/perf_callchain.c +1 -1
@@ -49,7 +49,7 @@ static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry, {struct stackframe buftail;unsigned long lr =0 ; -unsigned long *user_frame_tail = (unsigned long *)fp; +unsigned long __user *user_frame_tail = (unsigned long __user *)fp;/* Check accessibility of one struct frame_tail beyond */ if (!access_ok (user_frame_tail,sizeof (buftail)))
arch/csky/kernel/signal.c +1 -1
@@ -136,7 +136,7 @@ static inline void __user *get_sigframe(struct ksignal *ksig,static int setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) { -struct rt_sigframe *frame; +struct rt_sigframe __user *frame;int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame));
arch/nios2/kernel/signal.c +11 -9
@@ -36,10 +36,10 @@ struct rt_sigframe {static inline int rt_restore_ucontext (struct pt_regs *regs,struct switch_stack *sw, -struct ucontext *uc,int *pr2) +struct ucontext __user *uc,int *pr2) {int temp; -unsigned long *gregs = uc->uc_mcontext.gregs; +unsigned long __user *gregs = uc->uc_mcontext.gregs;int err;/* Always make any pending restarted system calls return -EINTR */
@@ -102,10 +102,11 @@ asmlinkage int do_rt_sigreturn(struct switch_stack *sw) {struct pt_regs *regs = (struct pt_regs *)(sw +1 );/* Verify, can we follow the stack back */ -struct rt_sigframe *frame = (struct rt_sigframe *) regs->sp; +struct rt_sigframe __user *frame;sigset_t set;int rval; + frame = (struct rt_sigframe __user *) regs->sp;if (!access_ok (frame,sizeof (*frame))) goto badframe;
@@ -124,10 +125,10 @@ asmlinkage int do_rt_sigreturn(struct switch_stack *sw)return 0 ; } -static inline int rt_setup_ucontext (struct ucontext *uc,struct pt_regs *regs) +static inline int rt_setup_ucontext (struct ucontext __user *uc,struct pt_regs *regs) {struct switch_stack *sw = (struct switch_stack *)regs -1 ; -unsigned long *gregs = uc->uc_mcontext.gregs; +unsigned long __user *gregs = uc->uc_mcontext.gregs;int err =0 ; err |=__put_user (MCONTEXT_VERSION , &uc->uc_mcontext.version);
@@ -162,8 +163,9 @@ static inline int rt_setup_ucontext(struct ucontext *uc, struct pt_regs *regs)return err; } -static inline void *get_sigframe (struct ksignal *ksig,struct pt_regs *regs, -size_t frame_size) +static inline void __user *get_sigframe (struct ksignal *ksig, +struct pt_regs *regs, +size_t frame_size) {unsigned long usp;
@@ -174,13 +176,13 @@ static inline void *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, usp =sigsp (usp, ksig);/* Verify, is it 32 or 64 bit aligned */ -return (void *)((usp - frame_size) &-8UL ); +return (void __user *)((usp - frame_size) &-8UL ); }static int setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) { -struct rt_sigframe *frame; +struct rt_sigframe __user *frame;int err =0 ; frame =get_sigframe (ksig, regs,sizeof (*frame));
arch/powerpc/lib/sstep.c +2 -2
@@ -112,9 +112,9 @@ static nokprobe_inline long address_ok(struct pt_regs *regs, {if (!user_mode (regs))return 1 ; -if (__access_ok (ea, nb)) +if (access_ok ((void __user *)ea, nb))return 1 ; -if (__access_ok (ea,1 )) +if (access_ok ((void __user *)ea,1 ))/* Access overlaps the end of the user region */ regs->dar =TASK_SIZE_MAX -1 ;else
arch/riscv/kernel/perf_callchain.c +2 -2
@@ -15,8 +15,8 @@ static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry, {struct stackframe buftail;unsigned long ra =0 ; -unsigned long *user_frame_tail = - (unsigned long *)(fp -sizeof (struct stackframe )); +unsigned long __user *user_frame_tail = + (unsigned long __user *)(fp -sizeof (struct stackframe ));/* Check accessibility of one struct frame_tail beyond */ if (!access_ok (user_frame_tail,sizeof (buftail)))
arch/sparc/kernel/signal_32.c +1 -1
@@ -65,7 +65,7 @@ struct rt_signal_frame {*/ static inline bool invalid_frame_pointer (void __user *fp,int fplen) { -if ((((unsigned long ) fp) &15 ) || !__access_ok ((unsigned long )fp, fplen)) +if ((((unsigned long ) fp) &15 ) || !access_ok (fp, fplen))return true;return false;
lib/test_lockup.c +2 -2
@@ -417,8 +417,8 @@ static bool test_kernel_ptr(unsigned long addr, int size)return false;/* should be at least readable kernel address */ -if (access_ok (ptr,1 ) || -access_ok (ptr + size -1 ,1 ) || +if (access_ok ((void __user *)ptr,1 ) || +access_ok ((void __user *)ptr + size -1 ,1 ) ||get_kernel_nofault (buf, ptr) ||get_kernel_nofault (buf, ptr + size -1 )) {pr_err ("invalid kernel ptr: %#lx\n" , addr);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 42/66 lib/test_lockup: fix kernel pointer check for separate address spaces
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 5a06fcb15b43d1f7bf740c672950122331cb5655 ]
test_kernel_ptr() uses access_ok() to figure out if a given address points to user space instead of kernel space. However on architectures that set CONFIG_ALTERNATE_USER_ADDRESS_SPACE, a pointer can be valid for both, and the check always fails because access_ok() returns true.
Make the check for user space pointers conditional on the type of address space layout.
--- lib/test_lockup.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
lib/test_lockup.c +8 -3
@@ -417,9 +417,14 @@ static bool test_kernel_ptr(unsigned long addr, int size)return false;/* should be at least readable kernel address */ -if (access_ok ((void __user *)ptr,1 ) || -access_ok ((void __user *)ptr + size -1 ,1 ) || -get_kernel_nofault (buf, ptr) || +if (!IS_ENABLED (CONFIG_ALTERNATE_USER_ADDRESS_SPACE ) && + (access_ok ((void __user *)ptr,1 ) || +access_ok ((void __user *)ptr + size -1 ,1 ))) { +pr_err ("user space ptr invalid in kernel: %#lx\n" , addr); +return true; + } + +if (get_kernel_nofault (buf, ptr) ||get_kernel_nofault (buf, ptr + size -1 )) {pr_err ("invalid kernel ptr: %#lx\n" , addr);return true;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 43/66 ARM: tegra: tamonten: Fix I2C3 pad setting
In reply to Sasha LevinFrom: Richard Leitner <[email protected]>
[ Upstream commit 0092c25b541a5422d7e71892a13c55ee91abc34b ]
This patch fixes the tristate configuration for i2c3 function assigned to the dtf pins on the Tamonten Tegra20 SoM.
--- arch/arm/boot/dts/tegra20-tamonten.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra20-tamonten.dtsi +3 -3
@@ -183,8 +183,8 @@ }; conf_ata { nvidia,pins = "ata", "atb", "atc", "atd", "ate", - "cdev1", "cdev2", "dap1", "dtb", "gma", - "gmb", "gmc", "gmd", "gme", "gpu7", + "cdev1", "cdev2", "dap1", "dtb", "dtf", + "gma", "gmb", "gmc", "gmd", "gme", "gpu7", "gpv", "i2cp", "irrx", "irtx", "pta", "rm", "slxa", "slxk", "spia", "spib", "uac";
@@ -203,7 +203,7 @@ }; conf_crtp { nvidia,pins = "crtp", "dap2", "dap3", "dap4", - "dtc", "dte", "dtf", "gpu", "sdio1", + "dtc", "dte", "gpu", "sdio1", "slxc", "slxd", "spdi", "spdo", "spig", "uda"; nvidia,pull = <TEGRA_PIN_PULL_NONE>;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 44/66 ARM: mmp: Fix failure to remove sram device
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit 4036b29a146b2749af3bb213b003eb69f3e5ecc4 ]
Make sure in .probe() to set driver data before the function is left to make it possible in .remove() to undo the actions done.
This fixes a potential memory leak and stops returning an error code in .remove() that is ignored by the driver core anyhow.
--- arch/arm/mach-mmp/sram.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
arch/arm/mach-mmp/sram.c +12 -10
@@ -72,6 +72,8 @@ static int sram_probe(struct platform_device *pdev)if (!info)return -ENOMEM ; +platform_set_drvdata (pdev, info); + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (res ==NULL ) {dev_err (&pdev->dev,"no memory resource defined\n" );
@@ -107,8 +109,6 @@ static int sram_probe(struct platform_device *pdev)list_add (&info->node, &sram_bank_list);mutex_unlock (&sram_lock); -platform_set_drvdata (pdev, info); -dev_info (&pdev->dev,"initialized\n" );return 0 ;
@@ -127,17 +127,19 @@ static int sram_remove(struct platform_device *pdev)struct sram_bank_info *info; info =platform_get_drvdata (pdev); -if (info ==NULL ) -return -ENODEV ; -mutex_lock (&sram_lock); -list_del (&info->node); -mutex_unlock (&sram_lock); +if (info->sram_size) { +mutex_lock (&sram_lock); +list_del (&info->node); +mutex_unlock (&sram_lock); + +gen_pool_destroy (info->gpool); +iounmap (info->sram_virt); +kfree (info->pool_name); + } -gen_pool_destroy (info->gpool); -iounmap (info->sram_virt); -kfree (info->pool_name);kfree (info); +return 0 ; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 45/66 ASoC: amd: vg: fix for pm resume callback sequence
In reply to Sasha LevinFrom: Vijendar Mukunda <[email protected]>
[ Upstream commit 83b713619ee1b15e09eae11a92a7f3305534223d ]
The previous condition is used to cross check only the active stream status for I2S HS instance playback and capture use cases.
Modified logic to invoke sequence for two i2s controller instances.
This also fixes warnings reported by kernel robot:
"warning: variable 'frmt_val' set but not used" "warning: variable 'reg_val' set but not used"
--- sound/soc/amd/vangogh/acp5x-pcm-dma.c | 66 +++++++++++++-------------- 1 file changed, 33 insertions(+), 33 deletions(-)
sound/soc/amd/vangogh/acp5x-pcm-dma.c +33 -33
@@ -426,51 +426,51 @@ static int acp5x_audio_remove(struct platform_device *pdev)static int __maybe_unused acp5x_pcm_resume (struct device *dev) {struct i2s_dev_data *adata; -u32 val, reg_val, frmt_val; +struct i2s_stream_instance *rtd; +u32 val; - reg_val =0 ; - frmt_val =0 ; adata =dev_get_drvdata (dev);if (adata->play_stream && adata->play_stream->runtime) { -struct i2s_stream_instance *rtd = - adata->play_stream->runtime->private_data; + rtd = adata->play_stream->runtime->private_data;config_acp5x_dma (rtd,SNDRV_PCM_STREAM_PLAYBACK ); -switch (rtd->i2s_instance) { -case I2S_HS_INSTANCE : - reg_val =ACP_HSTDM_ITER ; - frmt_val =ACP_HSTDM_TXFRMT ; -break ; -case I2S_SP_INSTANCE : -default : - reg_val =ACP_I2STDM_ITER ; - frmt_val =ACP_I2STDM_TXFRMT ; +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_HSTDM_ITER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_HSTDM_TXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_HSTDM_ITER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_HSTDM_ITER ); + } + } +if (adata->i2ssp_play_stream && adata->i2ssp_play_stream->runtime) { + rtd = adata->i2ssp_play_stream->runtime->private_data; +config_acp5x_dma (rtd,SNDRV_PCM_STREAM_PLAYBACK ); +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_I2STDM_ITER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_I2STDM_TXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_I2STDM_ITER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_I2STDM_ITER ); } -acp_writel ((rtd->xfer_resolution <<3 ), - rtd->acp5x_base + reg_val); }if (adata->capture_stream && adata->capture_stream->runtime) { -struct i2s_stream_instance *rtd = - adata->capture_stream->runtime->private_data; + rtd = adata->capture_stream->runtime->private_data;config_acp5x_dma (rtd,SNDRV_PCM_STREAM_CAPTURE ); -switch (rtd->i2s_instance) { -case I2S_HS_INSTANCE : - reg_val =ACP_HSTDM_IRER ; - frmt_val =ACP_HSTDM_RXFRMT ; -break ; -case I2S_SP_INSTANCE : -default : - reg_val =ACP_I2STDM_IRER ; - frmt_val =ACP_I2STDM_RXFRMT ; +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_HSTDM_IRER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_HSTDM_RXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_HSTDM_IRER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_HSTDM_IRER ); } -acp_writel ((rtd->xfer_resolution <<3 ), - rtd->acp5x_base + reg_val); } -if (adata->tdm_mode ==TDM_ENABLE ) { -acp_writel (adata->tdm_fmt, adata->acp5x_base + frmt_val); - val =acp_readl (adata->acp5x_base + reg_val); -acp_writel (val |0x2 , adata->acp5x_base + reg_val); +if (adata->i2ssp_capture_stream && adata->i2ssp_capture_stream->runtime) { + rtd = adata->i2ssp_capture_stream->runtime->private_data; +config_acp5x_dma (rtd,SNDRV_PCM_STREAM_CAPTURE ); +acp_writel ((rtd->xfer_resolution <<3 ), rtd->acp5x_base +ACP_I2STDM_IRER ); +if (adata->tdm_mode ==TDM_ENABLE ) { +acp_writel (adata->tdm_fmt, adata->acp5x_base +ACP_I2STDM_RXFRMT ); + val =acp_readl (adata->acp5x_base +ACP_I2STDM_IRER ); +acp_writel (val |0x2 , adata->acp5x_base +ACP_I2STDM_IRER ); + } }acp_writel (1 , adata->acp5x_base +ACP_EXTERNAL_INTR_ENB );return 0 ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 46/66 ASoC: amd: vangogh: fix uninitialized symbol warning in machine driver
In reply to Sasha LevinFrom: Vijendar Mukunda <[email protected]>
[ Upstream commit 6f989800639a7a29ab9a02e165b04dc144dd4f2b ]
Fixed below smatch static checker warning. sound/soc/amd/vangogh/acp5x-mach.c:190 acp5x_cs35l41_hw_params()
error: uninitialized symbol 'ret'.
--- sound/soc/amd/vangogh/acp5x-mach.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/amd/vangogh/acp5x-mach.c +1 -0
@@ -165,6 +165,7 @@ static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *substream,unsigned int num_codecs = rtd->num_codecs;unsigned int bclk_val; + ret =0 ;for (i =0 ; i < num_codecs; i++) { codec_dai =asoc_rtd_to_codec (rtd, i); if ((strcmp(codec_dai->name, "spi-VLV1776:00") == 0) ||
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 47/66 video: fbdev: sm712fb: Fix crash in smtcfb_write()
In reply to Sasha LevinFrom: Zheyu Ma <[email protected]>
[ Upstream commit 4f01d09b2bbfbcb47b3eb305560a7f4857a32260 ]
When the sm712fb driver writes three bytes to the framebuffer, the driver will crash:
BUG: unable to handle page fault for address: ffffc90001ffffff
RIP: 0010:smtcfb_write+0x454/0x5b0
Call Trace:
vfs_write+0x291/0xd60
? do_sys_openat2+0x27d/0x350
? __fget_light+0x54/0x340
ksys_write+0xce/0x190
do_syscall_64+0x43/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xaeFix it by removing the open-coded endianness fixup-code.
--- drivers/video/fbdev/sm712fb.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-)
drivers/video/fbdev/sm712fb.c +4 -17
@@ -1130,7 +1130,7 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf, count = total_size - p; } - buffer =kmalloc ((count >PAGE_SIZE ) ?PAGE_SIZE : count,GFP_KERNEL ); + buffer =kmalloc (PAGE_SIZE ,GFP_KERNEL );if (!buffer)return -ENOMEM ;
@@ -1148,24 +1148,11 @@ static ssize_t smtcfb_write(struct fb_info *info, const char __user *buf,break ; } -for (i = c >>2 ; i--;) { -fb_writel (big_swap (*src), dst++); +for (i = (c +3 ) >>2 ; i--;) { +fb_writel (big_swap (*src), dst); + dst++; src++; } -if (c &3 ) { -u8 *src8 = (u8 *)src; -u8 __iomem *dst8 = (u8 __iomem *)dst; - -for (i = c &3 ; i--;) { -if (i &1 ) { -fb_writeb (*src8++, ++dst8); - }else { -fb_writeb (*src8++, --dst8); - dst8 +=2 ; - } - } - dst = (u32 __iomem *)dst8; - } *ppos += c; buf += c;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 48/66 media: i2c: ov5648: Fix lockdep error
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit d4cb5d3c4cee28aa89b02bc33d930a6cf75e7f79 ]
ov5648_state_init() calls ov5648_state_mipi_configure() which uses __v4l2_ctrl_s_ctrl[_int64](). This means that sensor->mutex (which is also sensor->ctrls.handler.lock) must be locked before calling ov5648_state_init().
ov5648_state_mipi_configure() is also used in other places where the lock is already held so it cannot be changed itself.
Note this is based on an identical (tested) fix for the ov8865 driver, this has only been compile-tested.
--- drivers/media/i2c/ov5648.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/media/i2c/ov5648.c +8 -2
@@ -1778,8 +1778,14 @@ static int ov5648_state_configure(struct ov5648_sensor *sensor,static int ov5648_state_init (struct ov5648_sensor *sensor) { -return ov5648_state_configure (sensor, &ov5648_modes[0 ], - ov5648_mbus_codes[0 ]); +int ret; + +mutex_lock (&sensor->mutex); + ret =ov5648_state_configure (sensor, &ov5648_modes[0 ], + ov5648_mbus_codes[0 ]); +mutex_unlock (&sensor->mutex); + +return ret; }/* Sensor Base */
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 49/66 media: Revert "media: em28xx: add missing em28xx_close_extension"
In reply to Sasha LevinFrom: Pavel Skripkin <[email protected]>
[ Upstream commit fde18c3bac3f964d8333ae53b304d8fee430502b ]
This reverts commit 2c98b8a3458df03abdc6945bbef67ef91d181938.
Reverted patch causes problems with Hauppauge WinTV dualHD as Maximilian reported [1]. Since quick solution didn't come up let's just revert it to make this device work with upstream kernels.
--- drivers/media/usb/em28xx/em28xx-cards.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/media/usb/em28xx/em28xx-cards.c +1 -4
@@ -4150,11 +4150,8 @@ static void em28xx_usb_disconnect(struct usb_interface *intf)em28xx_close_extension (dev); -if (dev->dev_next) { -em28xx_close_extension (dev->dev_next); +if (dev->dev_next)em28xx_release_resources (dev->dev_next); - } -em28xx_release_resources (dev);if (dev->dev_next) {
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 50/66 media: hdpvr: initialize dev->worker at hdpvr_register_videodev
In reply to Sasha LevinFrom: Dongliang Mu <[email protected]>
[ Upstream commit 07922937e9a580825f9965c46fd15e23ba5754b6 ]
hdpvr_register_videodev is responsible to initialize a worker in hdpvr_device. However, the worker is only initialized at hdpvr_start_streaming other than hdpvr_register_videodev. When hdpvr_probe does not initialize its worker, the hdpvr_disconnect will encounter one WARN in flush_work.The stack trace is as follows:
hdpvr_disconnect+0xb8/0xf2 drivers/media/usb/hdpvr/hdpvr-core.c:425 usb_unbind_interface+0xbf/0x3a0 drivers/usb/core/driver.c:458 __device_release_driver drivers/base/dd.c:1206 [inline] device_release_driver_internal+0x22a/0x230 drivers/base/dd.c:1237 bus_remove_device+0x108/0x160 drivers/base/bus.c:529 device_del+0x1fe/0x510 drivers/base/core.c:3592 usb_disable_device+0xd1/0x1d0 drivers/usb/core/message.c:1419 usb_disconnect+0x109/0x330 drivers/usb/core/hub.c:2228
Fix this by moving the initialization of dev->worker to the starting of hdpvr_register_videodev
--- drivers/media/usb/hdpvr/hdpvr-video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/usb/hdpvr/hdpvr-video.c +3 -1
@@ -308,7 +308,6 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev) dev->status =STATUS_STREAMING ; -INIT_WORK (&dev->worker, hdpvr_transmit_buffers);schedule_work (&dev->worker); v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
@@ -1165,6 +1164,9 @@ int hdpvr_register_videodev(struct hdpvr_device *dev, struct device *parent,bool ac3 = dev->flags &HDPVR_FLAG_AC3_CAP ;int res; +// initialize dev->worker +INIT_WORK (&dev->worker, hdpvr_transmit_buffers); + dev->cur_std =V4L2_STD_525_60 ; dev->width =720 ; dev->height =480 ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 51/66 ASoC: SOF: debug: clarify operator precedence
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 9188812539d1d9a13dac690c95ec657259859ba4 ]
cppcheck warning:
for '&' and '?'. [clarifyCalculation]
char *level = flags & SOF_DBG_DUMP_OPTIONAL ? KERN_DEBUG : KERN_ERR;
^sound/soc/sof/debug.c:398:46: style: Clarify calculation precedence
--- sound/soc/sof/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/debug.c +1 -1
@@ -960,7 +960,7 @@ static void snd_sof_dbg_print_fw_state(struct snd_sof_dev *sdev, const char *levvoid snd_sof_dsp_dbg_dump (struct snd_sof_dev *sdev,const char *msg,u32 flags) { -char *level = flags &SOF_DBG_DUMP_OPTIONAL ?KERN_DEBUG :KERN_ERR ; +char *level = (flags &SOF_DBG_DUMP_OPTIONAL ) ?KERN_DEBUG :KERN_ERR ;bool print_all =sof_debug_check_flag (SOF_DBG_PRINT_ALL_DUMPS );if (flags &SOF_DBG_DUMP_OPTIONAL && !print_all)
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 52/66 ASoC: Intel: sof_sdw: fix quirks for 2022 HP Spectre x360 13"
In reply to Sasha LevinFrom: Anthony I Gilea <[email protected]>
[ Upstream commit ce73ef6ec67104d1fcc4c5911d77ce83288a0998 ]
HP changed the DMI identification for 2022 devices:
Product Name: HP Spectre x360 Conv 13-ap0001na
Product Name: 8709
This patch relaxes the DMI_MATCH criterion to work with all versions of this product.
--- drivers/soundwire/dmi-quirks.c | 2 +- sound/soc/intel/boards/sof_sdw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/soundwire/dmi-quirks.c +1 -1
@@ -59,7 +59,7 @@ static const struct dmi_system_id adr_remap_quirk_table[] = { { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "HP"), - DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Conv"), }, .driver_data = (void *)intel_tgl_bios, },
sound/soc/intel/boards/sof_sdw.c +1 -1
@@ -185,7 +185,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .callback = sof_sdw_quirk_cb, .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"HP" ), - DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Convertible"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Spectre x360 Conv"), }, .driver_data = (void *)(SOF_SDW_TGL_HDMI | SOF_SDW_PCH_DMIC |
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 53/66 ASoC: SOF: Intel: hda: retrieve DMIC number for I2S boards
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 92c1b7c0f780f0084f7b114be316ae4e182676e5 ]
We currently extract the DMIC number only for HDaudio or SoundWire platforms. For I2S/TDM platforms, this wasn't necessary until now, but with devices with ES8336 we need to find a solution to detect dmics more reliably than with a DMI quirk.
--- sound/soc/sof/intel/hda.c | 46 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 21 deletions(-)
sound/soc/sof/intel/hda.c +25 -21
@@ -432,11 +432,9 @@ static char *hda_model;module_param (hda_model, charp,0444 );MODULE_PARM_DESC (hda_model,"Use the given HDA board model." ); -#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) ||IS_ENABLED (CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE ) -static int hda_dmic_num =-1 ; -module_param_named (dmic_num, hda_dmic_num, int,0444 ); +static int dmic_num_override =-1 ; +module_param_named (dmic_num, dmic_num_override, int,0444 );MODULE_PARM_DESC (dmic_num,"SOF HDA DMIC number" ); -#endif #if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA )static bool hda_codec_use_common_hdmi =IS_ENABLED (CONFIG_SND_HDA_CODEC_HDMI );
@@ -644,24 +642,35 @@ static int hda_init(struct snd_sof_dev *sdev)return ret; } -#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) ||IS_ENABLED (CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE ) - -static int check_nhlt_dmic (struct snd_sof_dev *sdev) +static int check_dmic_num (struct snd_sof_dev *sdev) {struct nhlt_acpi_table *nhlt; -int dmic_num; +int dmic_num =0 ; nhlt =intel_nhlt_init (sdev->dev);if (nhlt) { dmic_num =intel_nhlt_get_dmic_geo (sdev->dev, nhlt);intel_nhlt_free (nhlt); -if (dmic_num >=1 && dmic_num <=4 ) -return dmic_num; } -return 0 ; +/* allow for module parameter override */ +if (dmic_num_override !=-1 ) { +dev_dbg (sdev->dev, +"overriding DMICs detected in NHLT tables %d by kernel param %d\n" , + dmic_num, dmic_num_override); + dmic_num = dmic_num_override; + } + +if (dmic_num <0 || dmic_num >4 ) { +dev_dbg (sdev->dev,"invalid dmic_number %d\n" , dmic_num); + dmic_num =0 ; + } + +return dmic_num; } +#if IS_ENABLED (CONFIG_SND_SOC_SOF_HDA ) ||IS_ENABLED (CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE ) + static const char *fixup_tplg_name(struct snd_sof_dev *sdev, const char *sof_tplg_filename, const char *idisp_str,
@@ -697,16 +706,8 @@ static int dmic_topology_fixup(struct snd_sof_dev *sdev,const char *dmic_str;int dmic_num; -/* first check NHLT for DMICs */ - dmic_num =check_nhlt_dmic (sdev); - -/* allow for module parameter override */ -if (hda_dmic_num !=-1 ) { -dev_dbg (sdev->dev, -"overriding DMICs detected in NHLT tables %d by kernel param %d\n" , - dmic_num, hda_dmic_num); - dmic_num = hda_dmic_num; - } +/* first check for DMICs (using NHLT or module parameter) */ + dmic_num =check_dmic_num (sdev);switch (dmic_num) {case 1 :
@@ -1392,6 +1393,9 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev)if (!sof_pdata->tplg_filename) sof_pdata->tplg_filename = mach->sof_tplg_filename; +/* report to machine driver if any DMICs are found */ + mach->mach_params.dmic_num =check_dmic_num (sdev); +if (mach->link_mask) { mach->mach_params.links = mach->links; mach->mach_params.link_mask = mach->link_mask;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 54/66 ALSA: intel-nhlt: add helper to detect SSP link mask
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 0c470db0399e17310ed2ba54dd1c25cfa16ce0d3 ]
The NHLT information can be used to figure out which SSPs are enabled in a platform.
The 'SSP' link type is too broad for machine drivers, since it can cover the Bluetooth sideband and the analog audio codec connections, so this helper exposes a parameter to filter with the device type (DEVICE_I2S refers to analog audio codec in NHLT parlance).
The helper returns a mask, since more than one SSP may be used for analog audio, e.g. the NHLT spec describes the use of SSP0 for amplifiers and SSP1 for headset codec. Note that if more than one bit is set, it's impossible to determine which SSP is connected to what external component. Additional platform-specific information based on e.g. DMI quirks would still be required in the machine driver to configure the relevant dailinks.
--- include/sound/intel-nhlt.h | 22 +++++++++++++++------- sound/hda/intel-nhlt.c | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 7 deletions(-)
include/sound/intel-nhlt.h +15 -7
@@ -18,6 +18,13 @@ enum nhlt_link_type {NHLT_LINK_INVALID }; +enum nhlt_device_type { +NHLT_DEVICE_BT =0 , +NHLT_DEVICE_DMIC =1 , +NHLT_DEVICE_I2S =4 , +NHLT_DEVICE_INVALID +}; +#if IS_ENABLED (CONFIG_ACPI ) &&IS_ENABLED (CONFIG_SND_INTEL_NHLT ) struct wav_fmt {
@@ -41,13 +48,6 @@ struct wav_fmt_ext {u8 sub_fmt[16 ]; } __packed; -enum nhlt_device_type { -NHLT_DEVICE_BT =0 , -NHLT_DEVICE_DMIC =1 , -NHLT_DEVICE_I2S =4 , -NHLT_DEVICE_INVALID -}; -struct nhlt_specific_cfg {u32 size;u8 caps[];
@@ -133,6 +133,9 @@ void intel_nhlt_free(struct nhlt_acpi_table *addr);int intel_nhlt_get_dmic_geo (struct device *dev,struct nhlt_acpi_table *nhlt);bool intel_nhlt_has_endpoint_type (struct nhlt_acpi_table *nhlt,u8 link_type); + +int intel_nhlt_ssp_endpoint_mask (struct nhlt_acpi_table *nhlt,u8 device_type); +struct nhlt_specific_cfg * intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, u32 bus_id, u8 link_type, u8 vbps, u8 bps,
@@ -163,6 +166,11 @@ static inline bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt,return false; } +static inline int intel_nhlt_ssp_endpoint_mask (struct nhlt_acpi_table *nhlt,u8 device_type) +{ +return 0 ; +} +static inline struct nhlt_specific_cfg * intel_nhlt_get_endpoint_blob(struct device *dev, struct nhlt_acpi_table *nhlt, u32 bus_id, u8 link_type, u8 vbps, u8 bps,
sound/hda/intel-nhlt.c +22 -0
@@ -130,6 +130,28 @@ bool intel_nhlt_has_endpoint_type(struct nhlt_acpi_table *nhlt, u8 link_type) }EXPORT_SYMBOL (intel_nhlt_has_endpoint_type); +int intel_nhlt_ssp_endpoint_mask (struct nhlt_acpi_table *nhlt,u8 device_type) +{ +struct nhlt_endpoint *epnt; +int ssp_mask =0 ; +int i; + +if (!nhlt || (device_type !=NHLT_DEVICE_BT && device_type !=NHLT_DEVICE_I2S )) +return 0 ; + + epnt = (struct nhlt_endpoint *)nhlt->desc; +for (i =0 ; i < nhlt->endpoint_count; i++) { +if (epnt->linktype ==NHLT_LINK_SSP && epnt->device_type == device_type) { +/* for SSP the virtual bus id is the SSP port */ + ssp_mask |=BIT (epnt->virtual_bus_id); + } + epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length); + } + +return ssp_mask; +} +EXPORT_SYMBOL (intel_nhlt_ssp_endpoint_mask); +static struct nhlt_specific_cfg *nhlt_get_specific_cfg (struct device *dev,struct nhlt_fmt *fmt,u8 num_ch,u32 rate,u8 vbps,u8 bps)
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 55/66 ALSA: intel-dsp-config: add more ACPI HIDs for ES83x6 devices
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit de24d97fb845ffd2229811ee256438e42b5a8d12 ]
We only saw ESSX8336 so far, but now with reports of 'ESSX8326' we need to expand to a full list. Let's reuse the 'snd_soc_acpi_codecs' structure to store the information.
--- sound/hda/intel-dsp-config.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-)
sound/hda/intel-dsp-config.c +22 -9
@@ -11,6 +11,7 @@#include <sound/core.h> #include <sound/intel-dsp-config.h> #include <sound/intel-nhlt.h> +#include <sound/soc-acpi.h> static int dsp_driver;
@@ -31,7 +32,12 @@ struct config_entry {u16 device;u8 acpi_hid[ACPI_ID_LEN ];const struct dmi_system_id *dmi_table; -u8 codec_hid[ACPI_ID_LEN ]; +const struct snd_soc_acpi_codecs *codec_hid; +}; + +static const struct snd_soc_acpi_codecs __maybe_unused essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, };/*
@@ -77,7 +83,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x5a98, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, #endif #if IS_ENABLED(CONFIG_SND_SOC_INTEL_APL)
@@ -163,7 +169,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x3198, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, },#endif
@@ -251,7 +257,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x02c8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
@@ -280,7 +286,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x06c8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
@@ -327,7 +333,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0x4dc8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC,
@@ -353,7 +359,7 @@ static const struct config_entry config_table[] = { { .flags = FLAG_SOF, .device = 0xa0c8, - .codec_hid = "ESSX8336", + .codec_hid = &essx_83x6, }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
@@ -414,8 +420,15 @@ static const struct config_entry *snd_intel_dsp_find_configcontinue ;if (table->dmi_table && !dmi_check_system (table->dmi_table))continue ; -if (table->codec_hid[0 ] && !acpi_dev_present (table->codec_hid,NULL ,-1 )) -continue ; +if (table->codec_hid) { +int i; + +for (i =0 ; i < table->codec_hid->num_codecs; i++) +if (acpi_dev_present (table->codec_hid->codecs[i],NULL ,-1 )) +break ; +if (i == table->codec_hid->num_codecs) +continue ; + }return table; }return NULL ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 56/66 ASoC: Intel: soc-acpi: add more ACPI HIDs for ES83x6 devices
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 1cedb6eabf0f2dd8285d3bb0ce1abd2369529084 ]
We only saw ESSX8336 so far, but now with reports of 'ESSX8326' we need to expand to a full list. Let's reuse the 'snd_soc_acpi_codecs' structure to store the information.
Note that ES8326 will need a dedicated codec driver, but the plan is to use the same machine driver for all Everest Audio devices.
--- sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-cml-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-glk-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 7 ++++++- sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-)
sound/soc/intel/common/soc-acpi-intel-bxt-match.c +6 -1
@@ -41,6 +41,11 @@ static struct snd_soc_acpi_mach *apl_quirk(void *arg)return mach; } +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs bxt_codecs = { .num_codecs =1 , .codecs = {"MX98357A" }
@@ -83,7 +88,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = { .sof_tplg_filename = "sof-apl-tdf8532.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-apl.ri", .sof_tplg_filename = "sof-apl-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-cml-match.c +6 -1
@@ -9,6 +9,11 @@#include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs rt1011_spk_codecs = { .num_codecs =1 , .codecs = {"10EC1011" }
@@ -82,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = { .sof_tplg_filename = "sof-cml-da7219-max98390.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-cml.ri", .sof_tplg_filename = "sof-cml-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-glk-match.c +6 -1
@@ -9,6 +9,11 @@#include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs glk_codecs = { .num_codecs =1 , .codecs = {"MX98357A" }
@@ -58,7 +63,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = { .sof_tplg_filename = "sof-glk-cs42l42.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-glk.ri", .sof_tplg_filename = "sof-glk-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-jsl-match.c +6 -1
@@ -9,6 +9,11 @@#include <sound/soc-acpi.h> #include <sound/soc-acpi-intel-match.h> +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs jsl_7219_98373_codecs = { .num_codecs =1 , .codecs = {"MX98373" }
@@ -87,7 +92,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { .sof_tplg_filename = "sof-jsl-cs42l42-mx98360a.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-jsl.ri", .sof_tplg_filename = "sof-jsl-es8336.tplg",
sound/soc/intel/common/soc-acpi-intel-tgl-match.c +6 -1
@@ -10,6 +10,11 @@#include <sound/soc-acpi-intel-match.h> #include "soc-acpi-intel-sdw-mockup-match.h" +static const struct snd_soc_acpi_codecs essx_83x6 = { + .num_codecs =3 , + .codecs = {"ESSX8316" ,"ESSX8326" ,"ESSX8336" }, +}; +static const struct snd_soc_acpi_codecs tgl_codecs = { .num_codecs =1 , .codecs = {"MX98357A" }
@@ -389,7 +394,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { .sof_tplg_filename = "sof-tgl-rt1011-rt5682.tplg", }, { - .id = "ESSX8336", + .comp_ids = &essx_83x6, .drv_name = "sof-essx8336", .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-es8336.tplg",
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 57/66 ALSA: intel-dspconfig: add ES8336 support for CNL
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit cded07a2dccd5493696a3adce175f01e413423c6 ]
We're missing this check for the CNL PCI id
--- sound/hda/intel-dsp-config.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/hda/intel-dsp-config.c +5 -0
@@ -199,6 +199,11 @@ static const struct config_entry config_table[] = { {} } }, + { + .flags = FLAG_SOF, + .device = 0x09dc8, + .codec_hid = &essx_83x6, + }, { .flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE, .device = 0x9dc8,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 58/66 ASoC: Intel: Revert "ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021"
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 1b5283483a782f6560999d8d5965b1874d104812 ]
This reverts commit ce6a70bfce21bb4edb7c0f29ecfb0522fa34ab71.
The next patch will add run-time detection of the required SSP and this hard-coded quirk is not needed.
--- sound/soc/intel/boards/sof_es8336.c | 8 -------- 1 file changed, 8 deletions(-)
sound/soc/intel/boards/sof_es8336.c +0 -8
@@ -247,14 +247,6 @@ static const struct dmi_system_id sof_es8336_quirk_table[] = { SOF_ES8336_TGL_GPIO_QUIRK | SOF_ES8336_ENABLE_DMIC) }, - { - .callback = sof_es8336_quirk_cb, - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "HUAWEI"), - DMI_MATCH(DMI_BOARD_NAME, "BOHB-WAX9-PCB-B2"), - }, - .driver_data = (void *)SOF_ES8336_SSP_CODEC(0) - }, {} };
Signature · 1 line
2.34.1
Re: [PATCH AUTOSEL 5.17 58/66] ASoC: Intel: Revert "ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021"
Quoted 8 lines · Sasha Levin
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit
1b5283483a782f6560999d8d5965b1874d104812]This reverts commit
ce6a70bfce21bb4edb7c0f29ecfb0522fa34ab71.The next patch will add run-time detection of the required SSP and this hard-coded quirk is not needed.
This is reverting a commit which was bacported earlier in this series?
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.17 58/66] ASoC: Intel: Revert "ASoC: Intel: sof_es8336: add quirk for Huawei D15 2021"
Quoted 11 lines · Mark Brown
Quoted 8 lines · Sasha Levin
From: Pierre-Louis Bossart <[email protected]>
[ Upstream commit
1b5283483a782f6560999d8d5965b1874d104812]This reverts commit
ce6a70bfce21bb4edb7c0f29ecfb0522fa34ab71.The next patch will add run-time detection of the required SSP and this hard-coded quirk is not needed.
This is reverting a commit which was bacported earlier in this series?
Yeah, it makes it easier for us to track and make sure we won't pick up the quirk commit again.
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 59/66 ASoC: Intel: sof_es8336: use NHLT information to set dmic and SSP
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 651c304df7f6e3fbb4779527efa3eb128ef91329 ]
Since we see a proliferation of devices with various configurations, we want to automatically set the DMIC and SSP information. This patch relies on the information extracted from NHLT and partially reverts existing DMI quirks added by commit a164137ce91a ("ASoC: Intel: add machine driver for SOF+ES8336")
Note that NHLT can report multiple SSPs, choosing from the ssp_link_mask in an MSB-first manner was found experimentally to work fine.
The only thing that cannot be detected is the GPIO type, and users may want to use the quirk override parameter if the 'wrong' solution is provided.
--- sound/soc/intel/boards/sof_es8336.c | 56 +++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 15 deletions(-)
sound/soc/intel/boards/sof_es8336.c +41 -15
@@ -228,24 +228,25 @@ static int sof_es8336_quirk_cb(const struct dmi_system_id *id)return 1 ; } +/* +* this table should only be used to add GPIO or jack-detection quirks +* that cannot be detected from ACPI tables. The SSP and DMIC +* information are providing by the platform driver and are aligned +* with the topology used. +* +* If the GPIO support is missing, the quirk parameter can be used to +* enable speakers. In that case it's recommended to keep the SSP and DMIC +* information consistent, overriding the SSP and DMIC can only be done +* if the topology file is modified as well. +*/ static const struct dmi_system_id sof_es8336_quirk_table[] = { - { - .callback = sof_es8336_quirk_cb, - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"CHUWI Innovation And Technology" ), -DMI_MATCH (DMI_BOARD_NAME ,"Hi10 X" ), - }, - .driver_data = (void *)SOF_ES8336_SSP_CODEC (2 ) - }, { .callback = sof_es8336_quirk_cb, .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"IP3 tech" ),DMI_MATCH (DMI_BOARD_NAME ,"WN1" ), }, - .driver_data = (void *)(SOF_ES8336_SSP_CODEC (0 ) | -SOF_ES8336_TGL_GPIO_QUIRK | -SOF_ES8336_ENABLE_DMIC ) + .driver_data = (void *)(SOF_ES8336_TGL_GPIO_QUIRK ) }, {} };
@@ -470,11 +471,33 @@ static int sof_es8336_probe(struct platform_device *pdev) card = &sof_es8336_card; card->dev = dev; -if (!dmi_check_system (sof_es8336_quirk_table)) - quirk =SOF_ES8336_SSP_CODEC (2 ); +/* check GPIO DMI quirks */ +dmi_check_system (sof_es8336_quirk_table); -if (quirk &SOF_ES8336_ENABLE_DMIC ) - dmic_be_num =2 ; +if (!mach->mach_params.i2s_link_mask) { +dev_warn (dev,"No I2S link information provided, using SSP0. This may need to be modified with the quirk module parameter\n" ); + }else { +/* +* Set configuration based on platform NHLT. +* In this machine driver, we can only support one SSP for the +* ES8336 link, the else-if below are intentional. +* In some cases multiple SSPs can be reported by NHLT, starting MSB-first +* seems to pick the right connection. +*/ +unsigned long ssp =0 ; + +if (mach->mach_params.i2s_link_mask &BIT (2 )) + ssp =SOF_ES8336_SSP_CODEC (2 ); +else if (mach->mach_params.i2s_link_mask &BIT (1 )) + ssp =SOF_ES8336_SSP_CODEC (1 ); +else if (mach->mach_params.i2s_link_mask &BIT (0 )) + ssp =SOF_ES8336_SSP_CODEC (0 ); + + quirk |= ssp; + } + +if (mach->mach_params.dmic_num) + quirk |=SOF_ES8336_ENABLE_DMIC ;if (quirk_override !=-1 ) { dev_info(dev, "Overriding quirk 0x%lx => 0x%x\n",
@@ -483,6 +506,9 @@ static int sof_es8336_probe(struct platform_device *pdev) }log_quirks (dev); +if (quirk &SOF_ES8336_ENABLE_DMIC ) + dmic_be_num =2 ; + sof_es8336_card.num_links += dmic_be_num + hdmi_num; dai_links = sof_card_dai_links_create(dev, SOF_ES8336_SSP_CODEC(quirk),
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 60/66 ASoC: Intel: sof_es8336: log all quirks
In reply to Sasha LevinFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 9c818d849192491a8799b1cb14ca0f7aead4fb09 ]
We only logged the SSP quirk, make sure the GPIO and DMIC quirks are exposed.
--- sound/soc/intel/boards/sof_es8336.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/intel/boards/sof_es8336.c +6 -1
@@ -63,7 +63,12 @@ static const struct acpi_gpio_mapping *gpio_mapping = acpi_es8336_gpios;static void log_quirks (struct device *dev) { -dev_info (dev,"quirk SSP%ld" ,SOF_ES8336_SSP_CODEC (quirk)); +dev_info (dev,"quirk mask %#lx\n" , quirk); +dev_info (dev,"quirk SSP%ld\n" ,SOF_ES8336_SSP_CODEC (quirk)); +if (quirk &SOF_ES8336_ENABLE_DMIC ) +dev_info (dev,"quirk DMIC enabled\n" ); +if (quirk &SOF_ES8336_TGL_GPIO_QUIRK ) +dev_info (dev,"quirk TGL GPIO enabled\n" ); } static int sof_es8316_speaker_power_event(struct snd_soc_dapm_widget *w,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 61/66 tracing: Have TRACE_DEFINE_ENUM affect trace event types as well
In reply to Sasha LevinFrom: "Steven Rostedt (Google)" <[email protected]>
[ Upstream commit b3bc8547d3be60898818885f5bf22d0a62e2eb48 ]
The macro TRACE_DEFINE_ENUM is used to convert enums in the kernel to their actual value when they are exported to user space via the trace event format file.
Currently only the enums in the "print fmt" (TP_printk in the TRACE_EVENT macro) have the enums converted. But the enums can be used to denote array size:
field:unsigned int fc_ineligible_rc[EXT4_FC_REASON_MAX]; offset:12; size:36; signed:0;
The EXT4_FC_REASON_MAX has no meaning to userspace but it needs to know that information to know how to parse the array.
Have the array indexes also be parsed as well.
--- kernel/trace/trace_events.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
kernel/trace/trace_events.c +28 -0
@@ -2633,6 +2633,33 @@ static void update_event_printk(struct trace_event_call *call, } } +static void update_event_fields (struct trace_event_call *call, +struct trace_eval_map *map) +{ +struct ftrace_event_field *field; +struct list_head *head; +char *ptr; +int len =strlen (map->eval_string); + + head =trace_get_fields (call); +list_for_each_entry (field, head, link) { + ptr =strchr (field->type,'[' ); +if (!ptr) +continue ; + ptr++; + +if (!isalpha (*ptr) && *ptr !='_' ) +continue ; + +if (strncmp (map->eval_string, ptr, len) !=0 ) +continue ; + + ptr =eval_replace (ptr, map, len); +/* enum/sizeof string smaller than value */ +WARN_ON_ONCE (!ptr); + } +} +void trace_event_eval_update (struct trace_eval_map **map,int len) {struct trace_event_call *call, *p;
@@ -2668,6 +2695,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len) first = false; }update_event_printk (call, map[i]); +update_event_fields (call, map[i]); } } }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 62/66 mmc: host: Return an error when ->enable_sdio_irq() ops is missing
In reply to Sasha LevinFrom: Ulf Hansson <[email protected]>
[ Upstream commit d6c9219ca1139b74541b2a98cee47a3426d754a9 ]
Even if the current WARN() notifies the user that something is severely wrong, we can still end up in a PANIC() when trying to invoke the missing ->enable_sdio_irq() ops. Therefore, let's also return an error code and prevent the host from being added.
While at it, move the code into a separate function to prepare for subsequent changes and for further host caps validations.
--- drivers/mmc/core/host.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/mmc/core/host.c +13 -2
@@ -588,6 +588,16 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)EXPORT_SYMBOL (mmc_alloc_host); +static int mmc_validate_host_caps (struct mmc_host *host) +{ +if (host->caps &MMC_CAP_SDIO_IRQ && !host->ops->enable_sdio_irq) { +dev_warn (host->parent,"missing ->enable_sdio_irq() ops\n" ); +return -EINVAL ; + } + +return 0 ; +} +/** * mmc_add_host - initialise host hardware * @host: mmc host
@@ -600,8 +610,9 @@ int mmc_add_host(struct mmc_host *host) {int err; -WARN_ON ((host->caps &MMC_CAP_SDIO_IRQ ) && - !host->ops->enable_sdio_irq); + err =mmc_validate_host_caps (host); +if (err) +return err; err =device_add (&host->class_dev);if (err)
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 63/66 ASoC: mediatek: Fix error handling in mt8183_da7219_max98357_dev_probe
In reply to Sasha LevinFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 28a265a1ee11febeec5ea73a804f30dcec3181ca ]
The device_node pointer is returned by of_parse_phandle() with refcount incremented. We should use of_node_put() on it when done.
This function only calls of_node_put() in the regular path. And it will cause refcount leak in error paths. Fix this by calling of_node_put() in error handling too.
--- .../mediatek/mt8183/mt8183-da7219-max98357.c | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-)
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +16 -7
@@ -695,8 +695,11 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) } card = (struct snd_soc_card *)of_device_get_match_data (&pdev->dev); -if (!card) -return -EINVAL ; +if (!card) { + ret = -EINVAL ; + goto put_platform_node; + } + card->dev = &pdev->dev; hdmi_codec = of_parse_phandle(pdev->dev.of_node,
@@ -761,12 +764,15 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)if (!mt8183_da7219_max98357_headset_dev.dlc.of_node) {dev_err (&pdev->dev,"Property 'mediatek,headset-codec' missing/invalid\n" ); -return -EINVAL ; + ret = -EINVAL ; + goto put_hdmi_codec; } priv =devm_kzalloc (&pdev->dev,sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; +if (!priv) { + ret = -ENOMEM ; + goto put_hdmi_codec; + }snd_soc_card_set_drvdata (card, priv);
@@ -775,13 +781,16 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev) ret =PTR_ERR (pinctrl);dev_err (&pdev->dev,"%s failed to select default state %d\n" , __func__, ret); -return ret; + goto put_hdmi_codec; } ret =devm_snd_soc_register_card (&pdev->dev, card); -of_node_put (platform_node); + +put_hdmi_codec:of_node_put (hdmi_codec); +put_platform_node: +of_node_put (platform_node);return ret; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 64/66 ASoC: ak4642: Use of_device_get_match_data()
In reply to Sasha LevinFrom: Minghao Chi <[email protected]>
[ Upstream commit 835ca59799f5c60b4b54bdc7aa785c99552f63e4 ]
Use of_device_get_match_data() to simplify the code.
--- sound/soc/codecs/ak4613.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
sound/soc/codecs/ak4613.c +3 -8
@@ -653,15 +653,10 @@ static int ak4613_i2c_probe(struct i2c_client *i2c,struct ak4613_priv *priv; regmap_cfg =NULL ; -if (np) { -const struct of_device_id *of_id; - - of_id =of_match_device (ak4613_of_match, dev); -if (of_id) - regmap_cfg = of_id->data; - }else { +if (np) + regmap_cfg =of_device_get_match_data (dev); +else regmap_cfg = (const struct regmap_config *)id->driver_data; - }if (!regmap_cfg)return -EINVAL ;
Signature · 1 line
2.34.1
Re: [PATCH AUTOSEL 5.17 64/66] ASoC: ak4642: Use of_device_get_match_data()
Quoted 5 lines · Sasha Levin
From: Minghao Chi <[email protected]>
[ Upstream commit
835ca59799f5c60b4b54bdc7aa785c99552f63e4]Use
of_device_get_match_data()to simplify the code.
This is just a random code style improvement, I can't see why we'd backport it to stable?
Sasha Levin
maintainerRe: [PATCH AUTOSEL 5.17 64/66] ASoC: ak4642: Use of_device_get_match_data()
Quoted 9 lines · Mark Brown
Quoted 5 lines · Sasha Levin
From: Minghao Chi <[email protected]>
[ Upstream commit
835ca59799f5c60b4b54bdc7aa785c99552f63e4]Use
of_device_get_match_data()to simplify the code.This is just a random code style improvement, I can't see why we'd backport it to stable?
Yup, I'll drop it.
Signature · 2 lines
Thanks, Sasha
Sasha Levin
maintainerPATCH 65/66 media: atomisp: fix bad usage at error handling logic
In reply to Sasha LevinFrom: Mauro Carvalho Chehab <[email protected]>
[ Upstream commit fc0b582c858ed73f94c8f3375c203ea46f1f7402 ]
As warned by sparse:
atomisp: drivers/staging/media/atomisp/pci/atomisp_acc.c:508 atomisp_acc_load_extensions() warn: iterator used outside loop: 'acc_fw'
The acc_fw interactor is used outside the loop, at the error handling logic. On most cases, this is actually safe there, but, if atomisp_css_set_acc_parameters() has an error, an attempt to use it will pick an invalid value for acc_fw.
--- .../staging/media/atomisp/pci/atomisp_acc.c | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_acc.c +19 -9
@@ -439,6 +439,18 @@ int atomisp_acc_s_mapped_arg(struct atomisp_sub_device *asd,return 0 ; } +static void atomisp_acc_unload_some_extensions (struct atomisp_sub_device *asd, +int i, +struct atomisp_acc_fw *acc_fw) +{ +while (--i >=0 ) { +if (acc_fw->flags & acc_flag_to_pipe[i].flag) { +atomisp_css_unload_acc_extension (asd, acc_fw->fw, + acc_flag_to_pipe[i].pipe_id); + } + } +} +/* * Appends the loaded acceleration binary extensions to the * current ISP mode. Must be called just before sh_css_start().
@@ -479,16 +491,20 @@ int atomisp_acc_load_extensions(struct atomisp_sub_device *asd) acc_fw->fw, acc_flag_to_pipe[i].pipe_id, acc_fw->type); -if (ret) +if (ret) { +atomisp_acc_unload_some_extensions (asd, i, acc_fw); goto error; + } ext_loaded = true; } } ret =atomisp_css_set_acc_parameters (acc_fw); -if (ret <0 ) +if (ret <0 ) { +atomisp_acc_unload_some_extensions (asd, i, acc_fw); goto error; + } }if (!ext_loaded)
@@ -497,6 +513,7 @@ int atomisp_acc_load_extensions(struct atomisp_sub_device *asd) ret =atomisp_css_update_stream (asd);if (ret) {dev_err (isp->dev,"%s: update stream failed.\n" , __func__); +atomisp_acc_unload_extensions (asd); goto error; }
@@ -504,13 +521,6 @@ int atomisp_acc_load_extensions(struct atomisp_sub_device *asd)return 0 ; error: -while (--i >=0 ) { -if (acc_fw->flags & acc_flag_to_pipe[i].flag) { -atomisp_css_unload_acc_extension (asd, acc_fw->fw, - acc_flag_to_pipe[i].pipe_id); - } - } -list_for_each_entry_continue_reverse (acc_fw, &asd->acc.fw, list) {if (acc_fw->type !=ATOMISP_ACC_FW_LOAD_TYPE_OUTPUT && acc_fw->type !=ATOMISP_ACC_FW_LOAD_TYPE_VIEWFINDER )
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 66/66 ALSA: hda/realtek: Add alc256-samsung-headphone fixup
In reply to Sasha LevinFrom: Matt Kramer <[email protected]>
[ Upstream commit ef248d9bd616b04df8be25539a4dc5db4b6c56f4 ]
This fixes the near-silence of the headphone jack on the ALC256-based Samsung Galaxy Book Flex Alpha (NP730QCJ). The magic verbs were found through trial and error, using known ALC298 hacks as inspiration. The fixup is auto-enabled only when the NP730QCJ is detected. It can be manually enabled using model=alc256-samsung-headphone.
--- Documentation/sound/hd-audio/models.rst | 4 ++++ sound/pci/hda/patch_realtek.c | 11 +++++++++++ 2 files changed, 15 insertions(+)
Documentation/sound/hd-audio/models.rst +4 -0
@@ -261,6 +261,10 @@ alc-sense-combo huawei-mbx-stereo Enable initialization verbs for Huawei MBX stereo speakers; might be risky, try this at your own risk +alc298-samsung-headphone + Samsung laptops with ALC298 +alc256-samsung-headphone + Samsung laptops with ALC256 ALC66x/67x/892 ==============
sound/pci/hda/patch_realtek.c +11 -0
@@ -6948,6 +6948,7 @@ enum {ALC236_FIXUP_HP_MUTE_LED ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET , +ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ,ALC295_FIXUP_ASUS_MIC_NO_PRESENCE ,ALC269VC_FIXUP_ACER_VCOPPERBOX_PINS , ALC269VC_FIXUP_ACER_HEADSET_MIC,
@@ -8273,6 +8274,14 @@ static const struct hda_fixup alc269_fixups[] = { { } }, }, + [ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { + { 0x20, AC_VERB_SET_COEF_INDEX, 0x08}, + { 0x20, AC_VERB_SET_PROC_COEF, 0x2fcf}, + { } + }, + }, [ALC295_FIXUP_ASUS_MIC_NO_PRESENCE] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) {
@@ -9054,6 +9063,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x144d ,0xc740 ,"Samsung Ativ book 8 (NP870Z5G)" ,ALC269_FIXUP_ATIV_BOOK_8 ),SND_PCI_QUIRK (0x144d ,0xc812 ,"Samsung Notebook Pen S (NT950SBE-X58)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x144d ,0xc830 ,"Samsung Galaxy Book Ion (NT950XCJ-X716A)" ,ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ), +SND_PCI_QUIRK (0x144d ,0xc832 ,"Samsung Galaxy Book Flex Alpha (NP730QCJ)" ,ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET ),SND_PCI_QUIRK (0x1458 ,0xfa53 ,"Gigabyte BXBT-2807" ,ALC283_FIXUP_HEADSET_MIC ),SND_PCI_QUIRK (0x1462 ,0xb120 ,"MSI Cubi MS-B120" ,ALC283_FIXUP_HEADSET_MIC ), SND_PCI_QUIRK(0x1462, 0xb171, "Cubi N 8GL (MS-B171)", ALC283_FIXUP_HEADSET_MIC),
@@ -9400,6 +9410,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC298_FIXUP_HUAWEI_MBX_STEREO, .name = "huawei-mbx-stereo"}, {.id = ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, .name = "alc256-medion-headset"}, {.id = ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc298-samsung-headphone"}, + {.id = ALC256_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET, .name = "alc256-samsung-headphone"}, {.id = ALC255_FIXUP_XIAOMI_HEADSET_MIC, .name = "alc255-xiaomi-headset"}, {.id = ALC274_FIXUP_HP_MIC, .name = "alc274-hp-mic-detect"}, {.id = ALC245_FIXUP_HP_X360_AMP, .name = "alc245-hp-x360-amp"},
Signature · 1 line
2.34.1