December 2023 - Linux-stable-mirror

stable/LTS test report from KernelCI (2023-12-08)

by Gustavo Padovan

Hello, As discussed with Greg at LPC, we are starting an iterative process to deliver meaningful stable test reports from KernelCI. As Greg pointed out, he doesn't look at the current reports sent automatically from KernelCI. Those are not clean enough to help the stable release process, so we discussed starting over again. This reporting process is a learning exercise, growing over time. We are starting small with data we can verify manually (at first) to make sure we are not introducing noise or reporting flakes and false-positives. The feedback loop will teach us how to filter the results and report with incremental automation of the steps. Today we are starting with build and boot tests (for the hardware platforms in KernelCI with sustained availability over time). Then, at every iteration we try to improve it, increasing the coverage and data visualization. Feedback is really important. Eventually, we will also have this report implemented in the upcoming KernelCI Web Dashboard. This work is a contribution from Collabora(on behalf of its clients) to improve the Kernel Integration as whole. Moving forward, Shreeya Patel, from the Collabora team will be taking on the responsibilities of delivering these reports. Without further ado, here's our first report: ## stable-rc HEADs: Date: 2023-12-08 6.1: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… 5:15: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… 5.10: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… 5:4: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/… * 6.6 stable-rc was not added in KernelCI yet, but we plan to add it next week. ## Build failures: No build failures seen for the stable-rc/queue commit heads for 6.1/5.15/5.10/5.4 \o/ ## Boot failures: No **new** boot failures seen for the stable-rc/queue commit heads for 6.1/5.15/5.10/5.4 \o/ (for the time being we are leaving existing failures behind) ## Considerations All this data is available in the legacy KernelCI Web Dashboard - https://linux.kernelci.org/ - but not easily filtered there. The data in this report was checked manually. As we evolve this report, we want to add traceability of the information, making it really easy for anyone to dig deeper for more info, logs, etc. The report covers the hardware platforms in KernelCI with sustained availability over time - we will detail this further in future reports. We opted to make the report really simple as you can see above. It is just an initial spark. From here your feedback will drive the process. So really really tell us what you want to see next. We want FEEDBACK! Best, - Gus -- Gustavo Padovan Kernel Lead Collabora Ltd. Platinum Building, St John's Innovation Park Cambridge CB4 0DS, UK Registered in England & Wales, no. 5513718

10 months, 1 week

3
4
0 0

[PATCH 5.4 00/94] 5.4.263-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.263 release. There are 94 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu, 07 Dec 2023 03:14:57 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.263-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.4.263-rc1 Adrian Hunter <adrian.hunter(a)intel.com> mmc: block: Retry commands in CQE error recovery Zheng Yongjun <zhengyongjun3(a)huawei.com> mmc: core: convert comma to semicolon Adrian Hunter <adrian.hunter(a)intel.com> mmc: cqhci: Fix task clearing in CQE error recovery Adrian Hunter <adrian.hunter(a)intel.com> mmc: cqhci: Warn of halt or task clear failure Adrian Hunter <adrian.hunter(a)intel.com> mmc: cqhci: Increase recovery halt timeout Christoph Niedermaier <cniedermaier(a)dh-electronics.com> cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily Christoph Niedermaier <cniedermaier(a)dh-electronics.com> cpufreq: imx6q: don't warn for disabling a non-existing frequency Quinn Tran <qutran(a)marvell.com> scsi: qla2xxx: Fix system crash due to bad pointer access Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Use scsi_cmd_to_rq() instead of scsi_cmnd.request Bart Van Assche <bvanassche(a)acm.org> scsi: core: Introduce the scsi_cmd_to_rq() function Bart Van Assche <bvanassche(a)acm.org> scsi: qla2xxx: Simplify the code for aborting SCSI commands Mimi Zohar <zohar(a)linux.ibm.com> ima: detect changes to the backing overlay file Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru> ovl: skip overlayfs superblocks at global sync Amir Goldstein <amir73il(a)gmail.com> ima: annotate iint mutex to avoid lockdep false positive warnings Helge Deller <deller(a)gmx.de> fbdev: stifb: Make the STI next font pointer a 32-bit signed offset Linus Walleij <linus.walleij(a)linaro.org> mtd: cfi_cmdset_0001: Byte swap OTP info Jean-Philippe Brucker <jean-philippe(a)linaro.org> mtd: cfi_cmdset_0001: Support the absence of protection registers Heiko Carstens <hca(a)linux.ibm.com> s390/cmma: fix detection of DAT pages Alexander Gordeev <agordeev(a)linux.ibm.com> s390/mm: fix phys vs virt confusion in mark_kernel_pXd() functions family Steve French <stfrench(a)microsoft.com> smb3: fix touch -h of symlink Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Fix async branch flags Adrian Hunter <adrian.hunter(a)intel.com> perf intel-pt: Adjust sample flags for VM-Exit Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com> net: ravb: Start TX queues after HW initialization succeeded Claudiu Beznea <claudiu.beznea.uj(a)bp.renesas.com> net: ravb: Use pm_runtime_resume_and_get() Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> ravb: Fix races between ravb_tx_timeout_work() and net related ops Furong Xu <0x1207(a)gmail.com> net: stmmac: xgmac: Disable FPE MMC interrupts Zhengchao Shao <shaozhengchao(a)huawei.com> ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet Max Nguyen <maxwell.nguyen(a)hp.com> Input: xpad - add HyperX Clutch Gladiate Support Filipe Manana <fdmanana(a)suse.com> btrfs: make error messages more clear when getting a chunk map Jann Horn <jannh(a)google.com> btrfs: send: ensure send_fd is writable Filipe Manana <fdmanana(a)suse.com> btrfs: fix off-by-one when checking chunk map includes logical address Qu Wenruo <wqu(a)suse.com> btrfs: add dmesg output for first mount and last unmount of a filesystem Timothy Pearson <tpearson(a)raptorengineering.com> powerpc: Don't clobber f0/vs0 during fp|altivec register save Markus Weippert <markus(a)gekmihesg.de> bcache: revert replacing IS_ERR_OR_NULL with IS_ERR Wu Bo <bo.wu(a)vivo.com> dm verity: don't perform FEC for failed readahead IO Mikulas Patocka <mpatocka(a)redhat.com> dm-verity: align struct dm_verity_fec_io properly Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek: Add supported ALC257 for ChromeOS Kailang Yang <kailang(a)realtek.com> ALSA: hda/realtek: Headset Mic VREF to 100% Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Disable power-save on KONTRON SinglePC Adrian Hunter <adrian.hunter(a)intel.com> mmc: block: Do not lose cache flush during CQE error recovery Wenchao Chen <wenchao.chen(a)unisoc.com> mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled Yang Yingliang <yangyingliang(a)huawei.com> firewire: core: fix possible memory leak in create_units() Maria Yu <quic_aiquny(a)quicinc.com> pinctrl: avoid reload of p state in list iteration Adrian Hunter <adrian.hunter(a)intel.com> perf inject: Fix GEN_ELF_TEXT_OFFSET for jit Keith Busch <kbusch(a)kernel.org> io_uring: fix off-by one bvec index Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: qcom: fix wakeup after probe deferral Johan Hovold <johan+linaro(a)kernel.org> USB: dwc3: qcom: fix resource leaks on probe deferral Ricardo Ribalda <ribalda(a)chromium.org> usb: dwc3: set the dma max_seg_size Oliver Neukum <oneukum(a)suse.com> USB: dwc2: write HCINT with INTMASK applied Lech Perczak <lech.perczak(a)gmail.com> USB: serial: option: don't claim interface 4 for ZTE MF290 Puliang Lu <puliang.lu(a)fibocom.com> USB: serial: option: fix FM101R-GL defines Victor Fragoso <victorffs(a)hotmail.com> USB: serial: option: add Fibocom L7xx modules Rand Deeb <rand.sec96(a)gmail.com> bcache: prevent potential division by zero error Coly Li <colyli(a)suse.de> bcache: check return value from btree_node_alloc_replacement() Mikulas Patocka <mpatocka(a)redhat.com> dm-delay: fix a race between delay_presuspend and delay_bio Long Li <longli(a)microsoft.com> hv_netvsc: Mark VF as slave before exposing it to user-mode Haiyang Zhang <haiyangz(a)microsoft.com> hv_netvsc: Fix race of register_netdevice_notifier and VF register Asuna Yang <spriteovo(a)gmail.com> USB: serial: option: add Luat Air72*U series products Jan Höppner <hoeppner(a)linux.ibm.com> s390/dasd: protect device queue against concurrent access Coly Li <colyli(a)suse.de> bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce() Hans de Goede <hdegoede(a)redhat.com> ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CVA Andrew Murray <andrew.murray(a)arm.com> KVM: arm64: limit PMU version to PMUv3 for ARMv8.1 Andrew Murray <andrew.murray(a)arm.com> arm64: cpufeature: Extract capped perfmon fields Zhang Yi <yi.zhang(a)huawei.com> ext4: make sure allocate pending entry not fail Baokun Li <libaokun1(a)huawei.com> ext4: fix slab-use-after-free in ext4_es_insert_extent() Baokun Li <libaokun1(a)huawei.com> ext4: using nofail preallocation in ext4_es_insert_extent() Baokun Li <libaokun1(a)huawei.com> ext4: using nofail preallocation in ext4_es_insert_delayed_block() Baokun Li <libaokun1(a)huawei.com> ext4: using nofail preallocation in ext4_es_remove_extent() Baokun Li <libaokun1(a)huawei.com> ext4: use pre-allocated es in __es_remove_extent() Baokun Li <libaokun1(a)huawei.com> ext4: use pre-allocated es in __es_insert_extent() Baokun Li <libaokun1(a)huawei.com> ext4: factor out __es_alloc_extent() and __es_free_extent() Baokun Li <libaokun1(a)huawei.com> ext4: add a new helper to check if es must be kept Huacai Chen <chenhuacai(a)loongson.cn> MIPS: KVM: Fix a build warning about variable set but not used Christoph Hellwig <hch(a)lst.de> nvmet: nul-terminate the NQNs passed in the connect command Chaitanya Kulkarni <chaitanya.kulkarni(a)wdc.com> nvmet: remove unnecessary ctrl parameter David Howells <dhowells(a)redhat.com> afs: Fix file locking on R/O volumes to operate in local mode David Howells <dhowells(a)redhat.com> afs: Return ENOENT if no cell DNS record can be found Samuel Holland <samuel.holland(a)sifive.com> net: axienet: Fix check for partial TX checksum Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: propagate the correct speed and duplex status Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: handle the corner-case during tx completion Raju Rangoju <Raju.Rangoju(a)amd.com> amd-xgbe: handle corner-case during sfp hotplug Stefano Stabellini <sstabellini(a)kernel.org> arm/xen: fix xen_vcpu_info allocation alignment Jose Ignacio Tornos Martinez <jtornosm(a)redhat.com> net: usb: ax88179_178a: fix failed operations during ax88179_reset Kunwu Chan <chentao(a)kylinos.cn> ipv4: Correct/silence an endian warning in __ip_do_redirect Charles Yi <be286(a)163.com> HID: fix HID device resource race between HID core and debugging support Benjamin Tissoires <benjamin.tissoires(a)redhat.com> HID: core: store the unique system identifier in hid_device Jonas Karlman <jonas(a)kwiboo.se> drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full Chen Ni <nichen(a)iscas.ac.cn> ata: pata_isapnp: Add missing error check for devm_ioport_map() Marek Vasut <marex(a)denx.de> drm/panel: simple: Fix Innolux G101ICE-L01 timings Marek Vasut <marex(a)denx.de> drm/panel: simple: Fix Innolux G101ICE-L01 bus flags David Howells <dhowells(a)redhat.com> afs: Make error on cell lookup failure consistent with OpenAFS Nathan Chancellor <nathan(a)kernel.org> PCI: keystone: Drop __init from ks_pcie_add_pcie_{ep,port}() Christopher Bednarz <christopher.n.bednarz(a)intel.com> RDMA/irdma: Prevent zero-length STAG registration Saravana Kannan <saravanak(a)google.com> driver core: Release all resources during unbind before updating device links ------------- Diffstat: Makefile | 4 +- arch/arm/xen/enlighten.c | 3 +- arch/arm64/include/asm/cpufeature.h | 23 ++ arch/arm64/include/asm/sysreg.h | 6 + arch/arm64/kvm/sys_regs.c | 10 + arch/mips/kvm/mmu.c | 3 +- arch/powerpc/kernel/fpu.S | 13 + arch/powerpc/kernel/vector.S | 2 + arch/s390/mm/page-states.c | 14 +- drivers/acpi/resource.c | 7 + drivers/ata/pata_isapnp.c | 3 + drivers/base/dd.c | 4 +- drivers/cpufreq/imx6q-cpufreq.c | 32 +-- drivers/firewire/core-device.c | 11 +- drivers/gpu/drm/panel/panel-simple.c | 13 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 14 +- drivers/hid/hid-core.c | 16 +- drivers/hid/hid-debug.c | 3 + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 6 + drivers/infiniband/hw/i40iw/i40iw_type.h | 2 + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 10 +- drivers/input/joystick/xpad.c | 2 + drivers/md/bcache/btree.c | 6 +- drivers/md/bcache/sysfs.c | 2 +- drivers/md/dm-delay.c | 17 +- drivers/md/dm-verity-fec.c | 3 +- drivers/md/dm-verity-target.c | 4 +- drivers/md/dm-verity.h | 6 - drivers/mmc/core/block.c | 2 + drivers/mmc/core/core.c | 15 +- drivers/mmc/host/cqhci.c | 44 ++-- drivers/mmc/host/sdhci-sprd.c | 25 ++ drivers/mtd/chips/cfi_cmdset_0001.c | 29 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 14 + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 11 +- drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 14 +- drivers/net/ethernet/renesas/ravb_main.c | 20 +- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/hyperv/netvsc_drv.c | 41 ++- drivers/net/usb/ax88179_178a.c | 4 +- drivers/nvme/target/core.c | 21 +- drivers/nvme/target/fabrics-cmd.c | 15 +- drivers/nvme/target/nvmet.h | 5 +- drivers/pci/controller/dwc/pci-keystone.c | 8 +- drivers/pinctrl/core.c | 6 +- drivers/s390/block/dasd.c | 24 +- drivers/scsi/qla2xxx/qla_def.h | 3 - drivers/scsi/qla2xxx/qla_isr.c | 5 - drivers/scsi/qla2xxx/qla_os.c | 39 +-- drivers/usb/dwc2/hcd_intr.c | 15 +- drivers/usb/dwc3/core.c | 2 + drivers/usb/dwc3/dwc3-qcom.c | 17 +- drivers/usb/serial/option.c | 11 +- drivers/video/fbdev/sticore.h | 2 +- fs/afs/dynroot.c | 4 +- fs/afs/super.c | 2 + fs/afs/vl_rotate.c | 10 + fs/btrfs/disk-io.c | 1 + fs/btrfs/send.c | 2 +- fs/btrfs/super.c | 5 +- fs/btrfs/volumes.c | 9 +- fs/cifs/cifsfs.c | 1 + fs/ext4/extents_status.c | 306 +++++++++++++++------- fs/io_uring.c | 2 +- fs/overlayfs/super.c | 5 +- fs/sync.c | 3 +- include/linux/fs.h | 2 + include/linux/hid.h | 5 + include/scsi/scsi_cmnd.h | 6 + net/ipv4/igmp.c | 6 +- net/ipv4/route.c | 2 +- security/integrity/iint.c | 48 +++- security/integrity/ima/ima_api.c | 5 + security/integrity/ima/ima_main.c | 16 +- security/integrity/integrity.h | 2 + sound/pci/hda/hda_intel.c | 2 + sound/pci/hda/patch_realtek.c | 12 + tools/perf/util/genelf.h | 4 +- tools/perf/util/intel-pt.c | 13 +- 80 files changed, 790 insertions(+), 320 deletions(-)

10 months, 1 week

5
100
0 0

Further cleanups for pci_iounmap() and lib/iomap.c discussion

by Philipp Stanner

Hola, This is a discussion about whether we want to move lib/iomap.c and remove the remaining pci_io(un)map() definition of s390. That would be followup work on our pci_iounmap() cleanup [1] that was discussed here [2] (but is not yet merged). The summary from the last discussions was: * GENERIC_IOMAP is not generic anymore, but x86-specific * All (?) archs should be able to use generic pci_iounmap() I've been looking into GENERIC_IOMAP a bit and am unsure whether that's true. Notably, powerpc seems to do something with it; see platforms/Kconfig: config PPC_INDIRECT_PIO bool select GENERIC_IOMAP I've had a few ideas, but don't really want to pursue them until we had a discussion about it: 1. If GENERIC_IOMAP is really x86-specific, that should mean that we could move lib/iomap.c to x86 completely, since that file is only built when that symbol is defined. 2. If it's moved to x86, the question arises whether it's possible to provide exact variants for lib/iomap.c's PIO_* constants. The comment above them in that file hint at those being just rough estimates ("assuming that all the low addresses are always PIO"). 3. To really just have one pci_iounmap(), we'd have to jump into s390 and replace its pci_iounmap(), which might be a bad idea since it also has its own pci_iomap(). So my tendency would be to leave s390 alone, figure out what's going on with powerpc and then, if possible, move lib/iomap.c to x86 and consequently have the second "generic" definition of iomem_is_ioport() from asm-generic/iomap.h removed. Ideas? P. [1] https://lore.kernel.org/all/20231213104922.13894-1-pstanner@redhat.com/ [2] https://lore.kernel.org/all/619ea619-29e4-42fb-9b27-1d1a32e0ee66@app.fastma…

10 months, 1 week

1
0
0 0

[PATCH stable-6.6 0/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes

by Johan Hovold

This is a backport of the following series: https://lore.kernel.org/lkml/20231204124736.132185-1-srinivas.kandagatla@li… which did not build on 6.6 due a rename of the asoc_rtd_to_cpu() interface. Johan Srinivas Kandagatla (2): ASoC: ops: add correct range check for limiting volume ASoC: qcom: sc8280xp: Limit speaker digital volumes sound/soc/qcom/sc8280xp.c | 17 +++++++++++++++++ sound/soc/soc-ops.c | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) -- 2.41.0

10 months, 1 week

5
7
0 0

[git:media_stage/master] media: v4l2-cci: Add support for little-endian encoded registers

by Hans Verkuil

This is an automatic generated email to let you know that the following patch were queued: Subject: media: v4l2-cci: Add support for little-endian encoded registers Author: Alexander Stein <alexander.stein(a)ew.tq-group.com> Date: Thu Nov 2 10:50:47 2023 +0100 Some sensors, e.g. Sony IMX290, are using little-endian registers. Add support for those by encoding the endianness into Bit 20 of the register address. Fixes: af73323b9770 ("media: imx290: Convert to new CCI register access helpers") Cc: stable(a)vger.kernel.org Signed-off-by: Alexander Stein <alexander.stein(a)ew.tq-group.com> Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> [Sakari Ailus: Fixed commit message.] Signed-off-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> drivers/media/v4l2-core/v4l2-cci.c | 44 +++++++++++++++++++++++++++++++------- include/media/v4l2-cci.h | 5 +++++ 2 files changed, 41 insertions(+), 8 deletions(-) --- diff --git a/drivers/media/v4l2-core/v4l2-cci.c b/drivers/media/v4l2-core/v4l2-cci.c index 3179160abde3..10005c80f43b 100644 --- a/drivers/media/v4l2-core/v4l2-cci.c +++ b/drivers/media/v4l2-core/v4l2-cci.c @@ -18,6 +18,7 @@ int cci_read(struct regmap *map, u32 reg, u64 *val, int *err) { + bool little_endian; unsigned int len; u8 buf[8]; int ret; @@ -25,6 +26,7 @@ int cci_read(struct regmap *map, u32 reg, u64 *val, int *err) if (err && *err) return *err; + little_endian = reg & CCI_REG_LE; len = CCI_REG_WIDTH_BYTES(reg); reg = CCI_REG_ADDR(reg); @@ -40,16 +42,28 @@ int cci_read(struct regmap *map, u32 reg, u64 *val, int *err) *val = buf[0]; break; case 2: - *val = get_unaligned_be16(buf); + if (little_endian) + *val = get_unaligned_le16(buf); + else + *val = get_unaligned_be16(buf); break; case 3: - *val = get_unaligned_be24(buf); + if (little_endian) + *val = get_unaligned_le24(buf); + else + *val = get_unaligned_be24(buf); break; case 4: - *val = get_unaligned_be32(buf); + if (little_endian) + *val = get_unaligned_le32(buf); + else + *val = get_unaligned_be32(buf); break; case 8: - *val = get_unaligned_be64(buf); + if (little_endian) + *val = get_unaligned_le64(buf); + else + *val = get_unaligned_be64(buf); break; default: dev_err(regmap_get_device(map), "Error invalid reg-width %u for reg 0x%04x\n", @@ -68,6 +82,7 @@ EXPORT_SYMBOL_GPL(cci_read); int cci_write(struct regmap *map, u32 reg, u64 val, int *err) { + bool little_endian; unsigned int len; u8 buf[8]; int ret; @@ -75,6 +90,7 @@ int cci_write(struct regmap *map, u32 reg, u64 val, int *err) if (err && *err) return *err; + little_endian = reg & CCI_REG_LE; len = CCI_REG_WIDTH_BYTES(reg); reg = CCI_REG_ADDR(reg); @@ -83,16 +99,28 @@ int cci_write(struct regmap *map, u32 reg, u64 val, int *err) buf[0] = val; break; case 2: - put_unaligned_be16(val, buf); + if (little_endian) + put_unaligned_le16(val, buf); + else + put_unaligned_be16(val, buf); break; case 3: - put_unaligned_be24(val, buf); + if (little_endian) + put_unaligned_le24(val, buf); + else + put_unaligned_be24(val, buf); break; case 4: - put_unaligned_be32(val, buf); + if (little_endian) + put_unaligned_le32(val, buf); + else + put_unaligned_be32(val, buf); break; case 8: - put_unaligned_be64(val, buf); + if (little_endian) + put_unaligned_le64(val, buf); + else + put_unaligned_be64(val, buf); break; default: dev_err(regmap_get_device(map), "Error invalid reg-width %u for reg 0x%04x\n", diff --git a/include/media/v4l2-cci.h b/include/media/v4l2-cci.h index 406772a4e32e..4e96e90ee636 100644 --- a/include/media/v4l2-cci.h +++ b/include/media/v4l2-cci.h @@ -43,12 +43,17 @@ struct cci_reg_sequence { #define CCI_REG_WIDTH_BYTES(x) FIELD_GET(CCI_REG_WIDTH_MASK, x) #define CCI_REG_WIDTH(x) (CCI_REG_WIDTH_BYTES(x) << 3) #define CCI_REG_ADDR(x) FIELD_GET(CCI_REG_ADDR_MASK, x) +#define CCI_REG_LE BIT(20) #define CCI_REG8(x) ((1 << CCI_REG_WIDTH_SHIFT) | (x)) #define CCI_REG16(x) ((2 << CCI_REG_WIDTH_SHIFT) | (x)) #define CCI_REG24(x) ((3 << CCI_REG_WIDTH_SHIFT) | (x)) #define CCI_REG32(x) ((4 << CCI_REG_WIDTH_SHIFT) | (x)) #define CCI_REG64(x) ((8 << CCI_REG_WIDTH_SHIFT) | (x)) +#define CCI_REG16_LE(x) (CCI_REG_LE | (2U << CCI_REG_WIDTH_SHIFT) | (x)) +#define CCI_REG24_LE(x) (CCI_REG_LE | (3U << CCI_REG_WIDTH_SHIFT) | (x)) +#define CCI_REG32_LE(x) (CCI_REG_LE | (4U << CCI_REG_WIDTH_SHIFT) | (x)) +#define CCI_REG64_LE(x) (CCI_REG_LE | (8U << CCI_REG_WIDTH_SHIFT) | (x)) /** * cci_read() - Read a value from a single CCI register

10 months, 1 week

1
0
0 0

[git:media_stage/master] media: i2c: imx290: Properly encode registers as little-endian

by Hans Verkuil

This is an automatic generated email to let you know that the following patch were queued: Subject: media: i2c: imx290: Properly encode registers as little-endian Author: Alexander Stein <alexander.stein(a)ew.tq-group.com> Date: Thu Nov 2 10:50:48 2023 +0100 The conversion to CCI also converted the multi-byte register access to big-endian. Correct the register definition by using the correct little-endian ones. Fixes: af73323b9770 ("media: imx290: Convert to new CCI register access helpers") Cc: stable(a)vger.kernel.org Signed-off-by: Alexander Stein <alexander.stein(a)ew.tq-group.com> Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Reviewed-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> [Sakari Ailus: Fixed the Fixes: tag.] Signed-off-by: Sakari Ailus <sakari.ailus(a)linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco(a)xs4all.nl> drivers/media/i2c/imx290.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) --- diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c index 52ba6188911b..9967f3477433 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -41,18 +41,18 @@ #define IMX290_WINMODE_720P (1 << 4) #define IMX290_WINMODE_CROP (4 << 4) #define IMX290_FR_FDG_SEL CCI_REG8(0x3009) -#define IMX290_BLKLEVEL CCI_REG16(0x300a) +#define IMX290_BLKLEVEL CCI_REG16_LE(0x300a) #define IMX290_GAIN CCI_REG8(0x3014) -#define IMX290_VMAX CCI_REG24(0x3018) +#define IMX290_VMAX CCI_REG24_LE(0x3018) #define IMX290_VMAX_MAX 0x3ffff -#define IMX290_HMAX CCI_REG16(0x301c) +#define IMX290_HMAX CCI_REG16_LE(0x301c) #define IMX290_HMAX_MAX 0xffff -#define IMX290_SHS1 CCI_REG24(0x3020) +#define IMX290_SHS1 CCI_REG24_LE(0x3020) #define IMX290_WINWV_OB CCI_REG8(0x303a) -#define IMX290_WINPV CCI_REG16(0x303c) -#define IMX290_WINWV CCI_REG16(0x303e) -#define IMX290_WINPH CCI_REG16(0x3040) -#define IMX290_WINWH CCI_REG16(0x3042) +#define IMX290_WINPV CCI_REG16_LE(0x303c) +#define IMX290_WINWV CCI_REG16_LE(0x303e) +#define IMX290_WINPH CCI_REG16_LE(0x3040) +#define IMX290_WINWH CCI_REG16_LE(0x3042) #define IMX290_OUT_CTRL CCI_REG8(0x3046) #define IMX290_ODBIT_10BIT (0 << 0) #define IMX290_ODBIT_12BIT (1 << 0) @@ -78,28 +78,28 @@ #define IMX290_ADBIT2 CCI_REG8(0x317c) #define IMX290_ADBIT2_10BIT 0x12 #define IMX290_ADBIT2_12BIT 0x00 -#define IMX290_CHIP_ID CCI_REG16(0x319a) +#define IMX290_CHIP_ID CCI_REG16_LE(0x319a) #define IMX290_ADBIT3 CCI_REG8(0x31ec) #define IMX290_ADBIT3_10BIT 0x37 #define IMX290_ADBIT3_12BIT 0x0e #define IMX290_REPETITION CCI_REG8(0x3405) #define IMX290_PHY_LANE_NUM CCI_REG8(0x3407) #define IMX290_OPB_SIZE_V CCI_REG8(0x3414) -#define IMX290_Y_OUT_SIZE CCI_REG16(0x3418) -#define IMX290_CSI_DT_FMT CCI_REG16(0x3441) +#define IMX290_Y_OUT_SIZE CCI_REG16_LE(0x3418) +#define IMX290_CSI_DT_FMT CCI_REG16_LE(0x3441) #define IMX290_CSI_DT_FMT_RAW10 0x0a0a #define IMX290_CSI_DT_FMT_RAW12 0x0c0c #define IMX290_CSI_LANE_MODE CCI_REG8(0x3443) -#define IMX290_EXTCK_FREQ CCI_REG16(0x3444) -#define IMX290_TCLKPOST CCI_REG16(0x3446) -#define IMX290_THSZERO CCI_REG16(0x3448) -#define IMX290_THSPREPARE CCI_REG16(0x344a) -#define IMX290_TCLKTRAIL CCI_REG16(0x344c) -#define IMX290_THSTRAIL CCI_REG16(0x344e) -#define IMX290_TCLKZERO CCI_REG16(0x3450) -#define IMX290_TCLKPREPARE CCI_REG16(0x3452) -#define IMX290_TLPX CCI_REG16(0x3454) -#define IMX290_X_OUT_SIZE CCI_REG16(0x3472) +#define IMX290_EXTCK_FREQ CCI_REG16_LE(0x3444) +#define IMX290_TCLKPOST CCI_REG16_LE(0x3446) +#define IMX290_THSZERO CCI_REG16_LE(0x3448) +#define IMX290_THSPREPARE CCI_REG16_LE(0x344a) +#define IMX290_TCLKTRAIL CCI_REG16_LE(0x344c) +#define IMX290_THSTRAIL CCI_REG16_LE(0x344e) +#define IMX290_TCLKZERO CCI_REG16_LE(0x3450) +#define IMX290_TCLKPREPARE CCI_REG16_LE(0x3452) +#define IMX290_TLPX CCI_REG16_LE(0x3454) +#define IMX290_X_OUT_SIZE CCI_REG16_LE(0x3472) #define IMX290_INCKSEL7 CCI_REG8(0x3480) #define IMX290_PGCTRL_REGEN BIT(0)

10 months, 1 week

1
0
0 0

[PATCH v5 0/5] Regather scattered PCI-Code

by Philipp Stanner

@Stable-Kernel: You receive this patch series because its first patch fixes leaks in PCI. Changes in v5: - Add forgotten update to MAINTAINERS file. Changes in v4: - Apply Arnd's Reviewed-by's - Add ifdef CONFIG_HAS_IOPORT_MAP guard in drivers/pci/iomap.c (build error on openrisc) - Fix typo in patch no.5 Changes in v3: - Create a separate patch for the leaks in lib/iomap.c. Make it the series' first patch. (Arnd) - Turns out the aforementioned bug wasn't just accidentally removing iounmap() with the ifdef, it was also missing ioport_unmap() to begin with. Add it. - Move the ARCH_WANTS_GENERIC_IOMEM_IS_IOPORT-mechanism from asm-generic/io.h to asm-generic/ioport.h. (Arnd) - Adjust the implementation of iomem_is_ioport() in asm-generic/io.h so that it matches exactly what pci_iounmap() previously did in lib/pci_iomap.c. (Arnd) - Move the CONFIG_HAS_IOPORT guard in asm-generic/io.h so that iomem_is_ioport() will always be compiled and just returns false if there are no ports. - Add TODOs to several places informing about the generic iomem_is_ioport() in lib/iomap.c not being generic. - Add TODO about the followup work to make drivers/pci/iomap.c's pci_iounmap() actually generic. Changes in v2: - Replace patch 4, previously extending the comment about pci_iounmap() in lib/iomap.c, with a patch that moves pci_iounmap() from that file to drivers/pci/iomap.c, creating a unified version there. (Arnd) - Implement iomem_is_ioport() as a new helper in asm-generic/io.h and lib/iomap.c. (Arnd) - Move the build rule in drivers/pci/Makefile for iomap.o under the guard of #if PCI. This had to be done because when just checking for GENERIC_PCI_IOMAP being defined, the functions don't disappear, which was the case previously in lib/pci_iomap.c, where the entire file was made empty if PCI was not set by the guard #ifdef PCI. (Intel's Bots) - Rephares all patches' commit messages a little bit. Sooooooooo. I reworked v1. Please review this carefully, the IO-Ranges are obviously a bit tricky, as is the build-system / ifdef-ery. Arnd has suggested that architectures defining a custom inb() need their own iomem_is_ioport(), as well. I've grepped for inb() and found the following list of archs that define their own: - alpha - arm - m68k <-- - parisc - powerpc - sh - sparc - x86 <-- All of those have their own definitons of pci_iounmap(). Therefore, they don't need our generic version in the first place and, thus, also need no iomem_is_ioport(). The two exceptions are x86 and m68k. The former uses lib/iomap.c through CONFIG_GENERIC_IOMAP, as Arnd pointed out in the previous discussion (thus, CONFIG_GENERIC_IOMAP is not really generic in this regard). So as I see it, only m68k WOULD need its own custom definition of iomem_is_ioport(). But as I understand it it doesn't because it uses the one from asm-generic/pci_iomap.h ?? I wasn't entirely sure how to deal with the address ranges for the generic implementation in asm-generic/io.h. It's marked with a TODO. Input appreciated. I removed the guard around define pci_iounmap in asm-generic/io.h. An alternative would be to have it be guarded by CONFIG_GENERIC_IOMAP and CONFIG_GENERIC_PCI_IOMAP, both. Without such a guard, there is no collision however, because generic pci_iounmap() from drivers/pci/iomap.c will only get pulled in when CONFIG_GENERIC_PCI_IOMAP is actually set. I cross-built this for a variety of architectures, including the usual suspects (s390, m68k). So far successfully. But let's see what Intel's robots say :O P. Original cover letter: Hi! So it seems that since ca. 2007 the PCI code has been scattered a bit. PCI's devres code, which is only ever used by users of the entire PCI-subsystem anyways, resides in lib/devres.c and is guarded by an ifdef PCI, just as the content of lib/pci_iomap.c is. It, thus, seems reasonable to move all of that. As I were at it, I moved as much of the devres-specific code from pci.c to devres.c, too. The only exceptions are four functions that are currently difficult to move. More information about that can be read here [1]. I noticed these scattered files while working on (new) PCI-specific devres functions. If we can get this here merged, I'll soon send another patch series that addresses some API-inconsistencies and could move the devres-part of the four remaining functions. I don't want to do that in this series as this here is only about moving code, whereas the next series would have to actually change API behavior. I successfully (cross-)built this for x86, x86_64, AARCH64 and ARM (allyesconfig). I booted a kernel with it on x86_64, with a Fedora desktop environment as payload. The OS came up fine I hope this is OK. If we can get it in, we'd soon have a very consistent PCI API again. Regards, P. Philipp Stanner (5): lib/pci_iomap.c: fix cleanup bugs in pci_iounmap() lib: move pci_iomap.c to drivers/pci/ lib: move pci-specific devres code to drivers/pci/ pci: move devres code from pci.c to devres.c lib, pci: unify generic pci_iounmap() MAINTAINERS | 1 - drivers/pci/Kconfig | 5 + drivers/pci/Makefile | 3 +- drivers/pci/devres.c | 450 +++++++++++++++++++++++++ lib/pci_iomap.c => drivers/pci/iomap.c | 49 +-- drivers/pci/pci.c | 249 -------------- drivers/pci/pci.h | 24 ++ include/asm-generic/io.h | 27 +- include/asm-generic/iomap.h | 21 ++ lib/Kconfig | 3 - lib/Makefile | 1 - lib/devres.c | 208 +----------- lib/iomap.c | 28 +- 13 files changed, 566 insertions(+), 503 deletions(-) create mode 100644 drivers/pci/devres.c rename lib/pci_iomap.c => drivers/pci/iomap.c (75%) -- 2.43.0

10 months, 1 week

2
6
0 0

[PATCH v5 7/7] serial: 8250_exar: Set missing rs485_supported flag

by Lino Sanfilippo

The UART supports an auto-RTS mode in which the RTS pin is automatically activated during transmission. So mark this mode as being supported even if RTS is not controlled by the driver but the UART. Also the serial core expects now at least one of both modes rts-on-send or rts-after-send to be supported. This is since during sanitization unsupported flags are deleted from a RS485 configuration set by userspace. However if the configuration ends up with both flags unset, the core prints a warning since it considers such a configuration invalid (see uart_sanitize_serial_rs485()). Cc: stable(a)vger.kernel.org Signed-off-by: Lino Sanfilippo <l.sanfilippo(a)kunbus.com> --- drivers/tty/serial/8250/8250_exar.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c index 6085d356ad86..23366f868ae3 100644 --- a/drivers/tty/serial/8250/8250_exar.c +++ b/drivers/tty/serial/8250/8250_exar.c @@ -480,7 +480,7 @@ static int sealevel_rs485_config(struct uart_port *port, struct ktermios *termio } static const struct serial_rs485 generic_rs485_supported = { - .flags = SER_RS485_ENABLED, + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND, }; static const struct exar8250_platform exar8250_default_platform = { @@ -524,7 +524,8 @@ static int iot2040_rs485_config(struct uart_port *port, struct ktermios *termios } static const struct serial_rs485 iot2040_rs485_supported = { - .flags = SER_RS485_ENABLED | SER_RS485_RX_DURING_TX | SER_RS485_TERMINATE_BUS, + .flags = SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND | + SER_RS485_RX_DURING_TX | SER_RS485_TERMINATE_BUS, }; static const struct property_entry iot2040_gpio_properties[] = { -- 2.42.0

10 months, 1 week

2
1
0 0

[PATCH] ARM: dts: Fix occasional boot hang for am3 usb

by Tony Lindgren

With subtle timings changes, we can now sometimes get an external abort on non-linefetch error booting am3 devices at sysc_reset(). This is because of a missing reset delay needed for the usb target module. Looks like we never enabled the delay earlier for am3, although a similar issue was seen earlier with a similar usb setup for dm814x as described in commit ebf244148092 ("ARM: OMAP2+: Use srst_udelay for USB on dm814x"). Cc: stable(a)vger.kernel.org Fixes: 0782e8572ce4 ("ARM: dts: Probe am335x musb with ti-sysc") Signed-off-by: Tony Lindgren <tony(a)atomide.com> --- arch/arm/boot/dts/ti/omap/am33xx.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/boot/dts/ti/omap/am33xx.dtsi b/arch/arm/boot/dts/ti/omap/am33xx.dtsi --- a/arch/arm/boot/dts/ti/omap/am33xx.dtsi +++ b/arch/arm/boot/dts/ti/omap/am33xx.dtsi @@ -359,6 +359,7 @@ usb: target-module@47400000 { <SYSC_IDLE_NO>, <SYSC_IDLE_SMART>, <SYSC_IDLE_SMART_WKUP>; + ti,sysc-delay-us = <2>; clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>; clock-names = "fck"; #address-cells = <1>; -- 2.43.0

10 months, 1 week

1
0
0 0

[PATCH 17/25] drm/amd/display: Wake DMCUB before executing GPINT commands

by Wayne Lin

From: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> [Why] DMCUB can be in idle when we attempt to interface with the HW through the GPINT mailbox resulting in a system hang. [How] Add dc_wake_and_execute_gpint() to wrap the wake, execute, sleep sequence. If the GPINT executes successfully then DMCUB will be put back into sleep after the optional response is returned. It functions similar to the inbox command interface. Cc: Mario Limonciello <mario.limonciello(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org Reviewed-by: Hansen Dsouza <hansen.dsouza(a)amd.com> Acked-by: Wayne Lin <wayne.lin(a)amd.com> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> --- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 29 ++------ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 72 ++++++++++++++----- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 11 +++ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 19 ++--- 4 files changed, 77 insertions(+), 54 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index 98b41ec7288e..68a846323912 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -2976,7 +2976,6 @@ static int dmub_trace_mask_set(void *data, u64 val) struct amdgpu_device *adev = data; struct dmub_srv *srv = adev->dm.dc->ctx->dmub_srv->dmub; enum dmub_gpint_command cmd; - enum dmub_status status; u64 mask = 0xffff; u8 shift = 0; u32 res; @@ -3003,13 +3002,7 @@ static int dmub_trace_mask_set(void *data, u64 val) break; } - status = dmub_srv_send_gpint_command(srv, cmd, res, 30); - - if (status == DMUB_STATUS_TIMEOUT) - return -ETIMEDOUT; - else if (status == DMUB_STATUS_INVALID) - return -EINVAL; - else if (status != DMUB_STATUS_OK) + if (!dc_wake_and_execute_gpint(adev->dm.dc->ctx, cmd, res, NULL, DM_DMUB_WAIT_TYPE_WAIT)) return -EIO; usleep_range(100, 1000); @@ -3026,7 +3019,6 @@ static int dmub_trace_mask_show(void *data, u64 *val) enum dmub_gpint_command cmd = DMUB_GPINT__GET_TRACE_BUFFER_MASK_WORD0; struct amdgpu_device *adev = data; struct dmub_srv *srv = adev->dm.dc->ctx->dmub_srv->dmub; - enum dmub_status status; u8 shift = 0; u64 raw = 0; u64 res = 0; @@ -3036,23 +3028,12 @@ static int dmub_trace_mask_show(void *data, u64 *val) return -EINVAL; while (i < 4) { - status = dmub_srv_send_gpint_command(srv, cmd, 0, 30); - - if (status == DMUB_STATUS_OK) { - status = dmub_srv_get_gpint_response(srv, (u32 *) &raw); - - if (status == DMUB_STATUS_INVALID) - return -EINVAL; - else if (status != DMUB_STATUS_OK) - return -EIO; - } else if (status == DMUB_STATUS_TIMEOUT) { - return -ETIMEDOUT; - } else if (status == DMUB_STATUS_INVALID) { - return -EINVAL; - } else { + uint32_t response; + + if (!dc_wake_and_execute_gpint(adev->dm.dc->ctx, cmd, 0, &response, DM_DMUB_WAIT_TYPE_WAIT_WITH_REPLY)) return -EIO; - } + raw = response; usleep_range(100, 1000); cmd++; diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c index fea13bcd4dc7..4b93e7a529d5 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c @@ -301,17 +301,11 @@ bool dc_dmub_srv_optimized_init_done(struct dc_dmub_srv *dc_dmub_srv) bool dc_dmub_srv_notify_stream_mask(struct dc_dmub_srv *dc_dmub_srv, unsigned int stream_mask) { - struct dmub_srv *dmub; - const uint32_t timeout = 30; - if (!dc_dmub_srv || !dc_dmub_srv->dmub) return false; - dmub = dc_dmub_srv->dmub; - - return dmub_srv_send_gpint_command( - dmub, DMUB_GPINT__IDLE_OPT_NOTIFY_STREAM_MASK, - stream_mask, timeout) == DMUB_STATUS_OK; + return dc_wake_and_execute_gpint(dc_dmub_srv->ctx, DMUB_GPINT__IDLE_OPT_NOTIFY_STREAM_MASK, + stream_mask, NULL, DM_DMUB_WAIT_TYPE_WAIT); } bool dc_dmub_srv_is_restore_required(struct dc_dmub_srv *dc_dmub_srv) @@ -1126,25 +1120,20 @@ bool dc_dmub_check_min_version(struct dmub_srv *srv) void dc_dmub_srv_enable_dpia_trace(const struct dc *dc) { struct dc_dmub_srv *dc_dmub_srv = dc->ctx->dmub_srv; - struct dmub_srv *dmub; - enum dmub_status status; - static const uint32_t timeout_us = 30; if (!dc_dmub_srv || !dc_dmub_srv->dmub) { DC_LOG_ERROR("%s: invalid parameters.", __func__); return; } - dmub = dc_dmub_srv->dmub; - - status = dmub_srv_send_gpint_command(dmub, DMUB_GPINT__SET_TRACE_BUFFER_MASK_WORD1, 0x0010, timeout_us); - if (status != DMUB_STATUS_OK) { + if (!dc_wake_and_execute_gpint(dc->ctx, DMUB_GPINT__SET_TRACE_BUFFER_MASK_WORD1, + 0x0010, NULL, DM_DMUB_WAIT_TYPE_WAIT)) { DC_LOG_ERROR("timeout updating trace buffer mask word\n"); return; } - status = dmub_srv_send_gpint_command(dmub, DMUB_GPINT__UPDATE_TRACE_BUFFER_MASK, 0x0000, timeout_us); - if (status != DMUB_STATUS_OK) { + if (!dc_wake_and_execute_gpint(dc->ctx, DMUB_GPINT__UPDATE_TRACE_BUFFER_MASK, + 0x0000, NULL, DM_DMUB_WAIT_TYPE_WAIT)) { DC_LOG_ERROR("timeout updating trace buffer mask word\n"); return; } @@ -1368,3 +1357,52 @@ bool dc_wake_and_execute_dmub_cmd_list(const struct dc_context *ctx, unsigned in return result; } + +static bool dc_dmub_execute_gpint(const struct dc_context *ctx, enum dmub_gpint_command command_code, + uint16_t param, uint32_t *response, enum dm_dmub_wait_type wait_type) +{ + struct dc_dmub_srv *dc_dmub_srv = ctx->dmub_srv; + const uint32_t wait_us = wait_type == DM_DMUB_WAIT_TYPE_NO_WAIT ? 0 : 30; + enum dmub_status status; + + if (response) + *response = 0; + + if (!dc_dmub_srv || !dc_dmub_srv->dmub) + return false; + + status = dmub_srv_send_gpint_command(dc_dmub_srv->dmub, command_code, param, wait_us); + if (status != DMUB_STATUS_OK) { + if (status == DMUB_STATUS_TIMEOUT && wait_type == DM_DMUB_WAIT_TYPE_NO_WAIT) + return true; + + return false; + } + + if (response && wait_type == DM_DMUB_WAIT_TYPE_WAIT_WITH_REPLY) + dmub_srv_get_gpint_response(dc_dmub_srv->dmub, response); + + return true; +} + +bool dc_wake_and_execute_gpint(const struct dc_context *ctx, enum dmub_gpint_command command_code, + uint16_t param, uint32_t *response, enum dm_dmub_wait_type wait_type) +{ + struct dc_dmub_srv *dc_dmub_srv = ctx->dmub_srv; + bool result = false, reallow_idle = false; + + if (!dc_dmub_srv || !dc_dmub_srv->dmub) + return false; + + if (dc_dmub_srv->idle_allowed) { + dc_dmub_srv_apply_idle_power_optimizations(ctx->dc, false); + reallow_idle = true; + } + + result = dc_dmub_execute_gpint(ctx, command_code, param, response, wait_type); + + if (result && reallow_idle) + dc_dmub_srv_apply_idle_power_optimizations(ctx->dc, true); + + return result; +} diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h index 784ca3e44414..952bfb368886 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h @@ -145,5 +145,16 @@ bool dc_wake_and_execute_dmub_cmd(const struct dc_context *ctx, union dmub_rb_cm bool dc_wake_and_execute_dmub_cmd_list(const struct dc_context *ctx, unsigned int count, union dmub_rb_cmd *cmd, enum dm_dmub_wait_type wait_type); +/** + * dc_wake_and_execute_gpint() + * + * @ctx: DC context + * @command_code: The command ID to send to DMCUB + * @param: The parameter to message DMCUB + * @response: Optional response out value - may be NULL. + * @wait_type: The wait behavior for the execution + */ +bool dc_wake_and_execute_gpint(const struct dc_context *ctx, enum dmub_gpint_command command_code, + uint16_t param, uint32_t *response, enum dm_dmub_wait_type wait_type); #endif /* _DMUB_DC_SRV_H_ */ diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c index 3d7cef17f881..3e243e407bb8 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c @@ -105,23 +105,18 @@ static enum dc_psr_state convert_psr_state(uint32_t raw_state) */ static void dmub_psr_get_state(struct dmub_psr *dmub, enum dc_psr_state *state, uint8_t panel_inst) { - struct dmub_srv *srv = dmub->ctx->dmub_srv->dmub; uint32_t raw_state = 0; uint32_t retry_count = 0; - enum dmub_status status; do { // Send gpint command and wait for ack - status = dmub_srv_send_gpint_command(srv, DMUB_GPINT__GET_PSR_STATE, panel_inst, 30); - - if (status == DMUB_STATUS_OK) { - // GPINT was executed, get response - dmub_srv_get_gpint_response(srv, &raw_state); + if (dc_wake_and_execute_gpint(dmub->ctx, DMUB_GPINT__GET_PSR_STATE, panel_inst, &raw_state, + DM_DMUB_WAIT_TYPE_WAIT_WITH_REPLY)) { *state = convert_psr_state(raw_state); - } else + } else { // Return invalid state when GPINT times out *state = PSR_STATE_INVALID; - + } } while (++retry_count <= 1000 && *state == PSR_STATE_INVALID); // Assert if max retry hit @@ -452,13 +447,11 @@ static void dmub_psr_force_static(struct dmub_psr *dmub, uint8_t panel_inst) */ static void dmub_psr_get_residency(struct dmub_psr *dmub, uint32_t *residency, uint8_t panel_inst) { - struct dmub_srv *srv = dmub->ctx->dmub_srv->dmub; uint16_t param = (uint16_t)(panel_inst << 8); /* Send gpint command and wait for ack */ - dmub_srv_send_gpint_command(srv, DMUB_GPINT__PSR_RESIDENCY, param, 30); - - dmub_srv_get_gpint_response(srv, residency); + dc_wake_and_execute_gpint(dmub->ctx, DMUB_GPINT__PSR_RESIDENCY, param, residency, + DM_DMUB_WAIT_TYPE_WAIT_WITH_REPLY); } static const struct dmub_psr_funcs psr_funcs = { -- 2.37.3

10 months, 1 week

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror December 2023