Skip to content

Commit ad3c429

Browse files
committed
Merge tag 'v6.1.141' into orange-pi-6.1-rk35xx
This is the 6.1.141 stable release * tag 'v6.1.141' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: Linux 6.1.141 net: ethernet: ti: am65-cpsw: Lower random mac address error print to info platform/x86: thinkpad_acpi: Ignore battery threshold change event notification platform/x86: fujitsu-laptop: Support Lifebook S2110 hotkeys NFS: Avoid flushing data while holding directory locks in nfs_rename() nvme-pci: add NVME_QUIRK_NO_DEEPEST_PS quirk for SOLIDIGM P44 Pro spi: spi-sun4i: fix early activation um: let 'make clean' properly clean underlying SUBARCH as well platform/x86: thinkpad_acpi: Support also NEC Lavie X1475JAS nfs: don't share pNFS DS connections between net namespaces HID: quirks: Add ADATA XPG alpha wireless mouse support coredump: hand a pidfd to the usermode coredump helper fork: use pidfd_prepare() pid: add pidfd_prepare() coredump: fix error handling for replace_fd() perf/arm-cmn: Initialise cmn->cpu earlier perf/arm-cmn: Fix REQ2/SNP2 mixup net_sched: hfsc: Address reentrant enqueue adding class to eltree twice arm64: dts: qcom: sm8350: Fix typo in pil_camera_mem node af_unix: Fix uninit-value in __unix_walk_scc() af_unix: Fix garbage collection of embryos carrying OOB with SCM_RIGHTS af_unix: Add dead flag to struct scm_fp_list. af_unix: Don't access successor in unix_del_edges() during GC. af_unix: Try not to hold unix_gc_lock during accept(). af_unix: Remove lock dance in unix_peek_fds(). af_unix: Replace garbage collection algorithm. af_unix: Detect dead SCC. af_unix: Assign a unique index to SCC. af_unix: Avoid Tarjan's algorithm if unnecessary. af_unix: Skip GC if no cycle exists. af_unix: Save O(n) setup of Tarjan's algo. af_unix: Fix up unix_edge.successor for embryo socket. af_unix: Save listener for embryo socket. af_unix: Detect Strongly Connected Components. af_unix: Iterate all vertices by DFS. af_unix: Bulk update unix_tot_inflight/unix_inflight when queuing skb. af_unix: Link struct unix_edge when queuing skb. af_unix: Allocate struct unix_edge for each inflight AF_UNIX fd. af_unix: Allocate struct unix_vertex for each inflight AF_UNIX fd. af_unix: Remove CONFIG_UNIX_SCM. af_unix: Remove io_uring code for GC. af_unix: Replace BUG_ON() with WARN_ON_ONCE(). af_unix: Try to run GC async. af_unix: Run GC on only one CPU. af_unix: Return struct unix_sock from unix_get_socket(). af_unix: Kconfig: make CONFIG_UNIX bool btrfs: check folio mapping after unlock in relocate_one_folio() hrtimers: Force migrate away hrtimers queued after CPUHP_AP_HRTIMERS_DYING octeontx2-pf: Fix page pool frag allocation warning octeontx2-pf: Fix page pool cache index corruption. octeontx2-pf: fix page_pool creation fail for rings > 32k dmaengine: idxd: Fix passing freed memory in idxd_cdev_open() x86/mm/init: Handle the special case of device private pages in add_pages(), to not increase max_pfn and trigger dma_addressing_limited() bounce buffers bounce buffers i3c: master: svc: Fix implicit fallthrough in svc_i3c_master_ibi_work() pinctrl: tegra: Fix off by one in tegra_pinctrl_get_group() serial: sh-sci: Save and restore more registers kbuild: Disable -Wdefault-const-init-unsafe spi: spi-fsl-dspi: Reset SR flags before sending a new message spi: spi-fsl-dspi: Halt the module after a new message transfer spi: spi-fsl-dspi: restrict register range for regmap access ksmbd: fix stream write failure Revert "arm64: dts: allwinner: h6: Use RSB for AXP805 PMIC connection" mm/page_alloc.c: avoid infinite retries caused by cpuset race memcg: always call cond_resched() after fn() Revert "drm/amd: Keep display off while going into S4" smb: client: Reset all search buffer pointers when releasing buffer smb: client: Fix use-after-free in cifs_fill_dirent drm/edid: fixed the bug that hdr metadata was not reset platform/x86: dell-wmi-sysman: Avoid buffer overflow in current_password_store() llc: fix data loss when reading from a socket in llc_ui_recvmsg() ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ASP10 ALSA: pcm: Fix race of buffer access at PCM OSS layer can: bcm: add missing rcu read protection for procfs content can: bcm: add locking for bcm_op runtime updates can: slcan: allow reception of short error messages padata: do not leak refcount in reorder_work crypto: algif_hash - fix double free in hash_accept octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG octeontx2-af: Set LMT_ENA bit for APR table entries net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done octeontx2-pf: Add AF_XDP non-zero copy support octeontx2-pf: Add support for page pool sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() io_uring: fix overflow resched cqe reordering net: lan743x: Restore SGMII CTRL register on resume net: dwmac-sun8i: Use parsed internal PHY address instead of 1 ice: fix vf->num_mac count with port representors bridge: netfilter: Fix forwarding of fragmented packets Bluetooth: L2CAP: Fix not checking l2cap_chan security level dmaengine: idxd: Fix ->poll() return value xfrm: Sanitize marks before insert clk: sunxi-ng: d1: Add missing divider for MMC mod clocks remoteproc: qcom_wcnss: Fix on platforms without fallback regulators dmaengine: idxd: Fix allowing write() from different address spaces dmaengine: idxd: add idxd_copy_cr() to copy user completion record during page fault handling dmaengine: idxd: add per DSA wq workqueue for processing cr faults espintcp: remove encap socket caching to avoid reference leak __legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock xenbus: Allow PVH dom0 a non-local xenstore wifi: iwlwifi: add support for Killer on MTL btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref io_uring/fdinfo: annotate racy sq/cq head/tail reads nvmet-tcp: don't restore null sk_state_change ALSA: hda/realtek: Add quirk for HP Spectre x360 15-df1xxx ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013 pinctrl: meson: define the pull up/down resistor value as 60 kOhm ASoC: imx-card: Adjust over allocation of memory in imx_card_parse_of() drm: Add valid clones check drm/panel-edp: Add Starry 116KHD024006 drm/atomic: clarify the rules around drm_atomic_state->allow_modeset wifi: ath9k: return by of_get_mac_address regulator: ad5398: Add device tree support spi: zynqmp-gqspi: Always acknowledge interrupts wifi: rtw89: add wiphy_lock() to work that isn't held wiphy_lock() yet wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate wifi: rtl8xxxu: retry firmware download on error perf/amd/ibs: Fix perf_ibs_op.cnt_mask for CurCnt bpftool: Fix readlink usage in get_fd_type drm/ast: Find VBIOS mode from regular display size ASoC: codecs: pcm3168a: Allow for 24-bit in provider mode HID: usbkbd: Fix the bit shift number for LED_KANA scsi: st: Restore some drive settings after reset scsi: lpfc: Free phba irq in lpfc_sli4_enable_msi() when pci_irq_vector() fails scsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine net/mana: fix warning in the writer of client oob ice: count combined queues using Rx/Tx count perf: Avoid the read if the count is already updated rcu: fix header guard for rcu_all_qs() rcu: handle unstable rdp in rcu_read_unlock_strict() rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y r8169: don't scan PHY addresses > 0 vxlan: Annotate FDB data races media: qcom: camss: csid: Only add TPG v4l2 ctrl if TPG hardware is available hwmon: (xgene-hwmon) use appropriate type for the latency value clk: qcom: camcc-sm8250: Use clk_rcg2_shared_ops for some RCGs wifi: rtw88: Fix download_firmware_validate() for RTL8814AU r8152: add vendor/device ID pair for Dell Alienware AW1022z ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure(). arch/powerpc/perf: Check the instruction type before creating sample with perf_mem_data_src wifi: mac80211: remove misplaced drv_mgd_complete_tx() call wifi: mac80211: don't unconditionally call drv_mgd_complete_tx() net/mlx5e: reduce rep rxq depth to 256 for ECPF net/mlx5e: set the tx_queue_len for pfifo_fast net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB drm/amd/display/dm: drop hw_support check in amdgpu_dm_i2c_xfer() drm/amdgpu: enlarge the VBIOS binary size limit drm/amd/display: Initial psr_version with correct setting drm/amdgpu: reset psp->cmd to NULL after releasing the buffer phy: core: don't require set_mode() callback for phy_get_mode() to work serial: sh-sci: Update the suspend/resume support clk: qcom: clk-alpha-pll: Do not use random stack value for recalc rate net/mlx4_core: Avoid impossible mlx4_db_alloc() order value kunit: tool: Use qboot on QEMU x86_64 smack: recognize ipv4 CIPSO w/o categories pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot() ASoC: tas2764: Power up/down amp on mute ops ASoC: tas2764: Mark SW_RESET as volatile ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG ASoC: ops: Enforce platform maximum on initial value net/mlx5: Apply rate-limiting to high temperature warning net/mlx5: Modify LSB bitmask in temperature event to include only the first bit media: test-drivers: vivid: don't call schedule in loop vxlan: Join / leave MC group after remote changes ACPI: HED: Always initialize before evged PCI: Fix old_size lower bound in calculate_iosize() too eth: mlx4: don't try to complete XDP frames in netpoll can: c_can: Use of_property_present() to test existence of DT property pmdomain: imx: gpcv2: use proper helper for property detection RDMA/core: Fix best page size finding when it can cross SG entries serial: mctrl_gpio: split disable_ms into sync and no_sync APIs i3c: master: svc: Flush FIFO before sending Dynamic Address Assignment(DAA) EDAC/ie31200: work around false positive build warning net: pktgen: fix access outside of user given buffer in pktgen_thread_write() wifi: rtw89: fw: propagate error code from rtw89_h2c_tx() wifi: rtw88: Fix rtw_desc_to_mcsrate() to handle MCS16-31 wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU wifi: rtw88: Fix rtw_init_vht_cap() for RTL8814AU scsi: mpt3sas: Send a diag reset if target reset fails clocksource: mips-gic-timer: Enable counter when CPUs start MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie MIPS: Use arch specific syscall name match function x86/kaslr: Reduce KASLR entropy on most x86 systems dm: fix unconditional IO throttle caused by REQ_PREFLUSH libbpf: Fix out-of-bound read media: adv7180: Disable test-pattern control on adv7180 cpuidle: menu: Avoid discarding useful information x86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus() drm/amd/display: handle max_downscale_src_width fail check x86/build: Fix broken copy command in genimage.sh when making isoimage soc: ti: k3-socinfo: Do not use syscon helper to build regmap bonding: report duplicate MAC address in all situations net: xgene-v2: remove incorrect ACPI_PTR annotation net: ethernet: mtk_ppe_offload: Allow QinQ, double ETH_P_8021Q only leds: pwm-multicolor: Add check for fwnode_property_read_u32 drm/amdkfd: KFD release_work possible circular locking selftests/net: have `gro.sh -t` return a correct exit code net/mlx5: Avoid report two health errors on same syndrome firmware: arm_ffa: Set dma_mask for ffa devices PCI: brcmstb: Add a softdep to MIP MSI-X driver PCI: brcmstb: Expand inbound window size up to 64GB soc: apple: rtkit: Implement OSLog buffers properly soc: apple: rtkit: Use high prio work queue fpga: altera-cvp: Increase credit timeout drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence ARM: at91: pm: fix at91_suspend_finish for ZQ calibration hwmon: (gpio-fan) Add missing mutex locks x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2 clk: imx8mp: inform CCF of maximum frequency of clocks media: uvcvideo: Add sanity check to uvc_ioctl_xu_ctrl_map drm/rockchip: vop2: Add uv swap for cluster window ipv4: fib: Move fib_valid_key_len() to rtm_to_fib_config(). ALSA: hda/realtek: Enable PC beep passthrough for HP EliteBook 855 G7 perf/hw_breakpoint: Return EOPNOTSUPP for unsupported breakpoint type net: pktgen: fix mpls maximum labels list parsing net: ethernet: ti: cpsw_new: populate netdev of_node pinctrl: bcm281xx: Use "unsigned int" instead of bare "unsigned" media: cx231xx: set device_caps for 417 drm/amdgpu: Do not program AGP BAR regs under SRIOV in gfxhub_v1_0.c remoteproc: qcom_wcnss: Handle platforms with only single power domain net: phylink: use pl->link_interface in phylink_expects_phy() orangefs: Do not truncate file size dm cache: prevent BUG_ON by blocking retries on failed device resumes media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe() ARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114 ieee802154: ca8210: Use proper setters and getters for bitwise types rtc: ds1307: stop disabling alarms on probe tcp: bring back NUMA dispersion in inet_ehash_locks_alloc() ALSA: seq: Improve data consistency at polling powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7 arm64: tegra: p2597: Fix gpio for vdd-1v8-dis regulator crypto: lzo - Fix compression buffer overrun cpufreq: tegra186: Share policy per cluster iommu/amd/pgtbl_v2: Improve error handling ASoC: qcom: sm8250: explicitly set format in sm8250_be_hw_params_fixup() auxdisplay: charlcd: Partially revert "Move hwidth and bwidth to struct hd44780_common" gfs2: Check for empty queue in run_queue drm/amd/display: calculate the remain segments for all pipes ipv6: save dontfrag in cork hwmon: (dell-smm) Increment the number of fans mmc: sdhci: Disable SD card clock before changing parameters mmc: dw_mmc: add exynos7870 DW MMC support arm64/mm: Check PUD_TYPE_TABLE in pud_bad() netfilter: conntrack: Bound nf_conntrack sysctl writes timer_list: Don't use %pK through printk() posix-timers: Add cond_resched() to posix_timer_add() search loop RDMA/uverbs: Propagate errors from rdma_lookup_get_uobject() ext4: reject the 'data_err=abort' option in nojournal mode ASoC: sun4i-codec: support hp-det-gpios property pinctrl-tegra: Restore SFSEL bit when freeing pins xen: Add support for XenServer 6.1 platform device net/smc: use the correct ndev to find pnetid by pnetid table dm: restrict dm device size to 2^63-512 bytes crypto: octeontx2 - suppress auth failure screaming due to negative tests kbuild: fix argument parsing in scripts/config ASoC: mediatek: mt6359: Add stub for mt6359_accdet_enable_jack_detect thunderbolt: Do not add non-active NVM if NVM upgrade is disabled for retimer rtc: rv3032: fix EERD location tcp: reorganize tcp_in_ack_event() and tcp_count_delivered() bpf: Return prog btf_id without capable check vfio/pci: Handle INTx IRQ_NOTCONNECTED scsi: st: ERASE does not change tape location scsi: st: Tighten the page format heuristics with MODE SELECT ext4: reorder capability check last um: Update min_low_pfn to match changes in uml_reserved um: Store full CSGSFS and SS register from mcontext dlm: make tcp still work in multi-link env i3c: master: svc: Fix missing STOP for master request drm/amd/display: Guard against setting dispclk low for dcn31x btrfs: send: return -ENAMETOOLONG when attempting a path that is too long btrfs: get zone unusable bytes while holding lock at btrfs_reclaim_bgs_work() btrfs: fix non-empty delayed iputs list on unmount due to async workers btrfs: run btrfs_error_commit_super() early btrfs: avoid linker error in btrfs_find_create_tree_block() btrfs: make btrfs_discard_workfn() block_group ref explicit i2c: pxa: fix call balance of i2c->clk handling routines i2c: qup: Vote for interconnect bandwidth to DRAM x86/mm: Check return value from memblock_phys_alloc_range() mmc: host: Wait for Vdd to settle on card power off libnvdimm/labels: Fix divide error in nd_label_data_init() PCI: vmd: Disable MSI remapping bypass under Xen pNFS/flexfiles: Report ENETDOWN as a connection error tools/build: Don't pass test log files to linker PCI: dwc: ep: Ensure proper iteration over outbound map windows objtool: Properly disable uaccess validation lockdep: Fix wait context check on softirq for PREEMPT_RT dql: Fix dql->limit value when reset. thermal/drivers/qoriq: Power down TMU on system suspend SUNRPC: rpcbind should never reset the port to the value '0' SUNRPC: rpc_clnt_set_transport() must not change the autobind setting NFSv4: Treat ENETUNREACH errors as fatal for state recovery cifs: Fix establishing NetBIOS session for SMB2+ connection fbdev: core: tileblit: Implement missing margin clearing for tileblit fbcon: Use correct erase colour for clearing in fbcon fbdev: fsl-diu-fb: add missing device_remove_file() mailbox: use error ret code of of_parse_phandle_with_args() tracing: Mark binary printing functions with __printf() attribute arm64: Add support for HIP09 Spectre-BHB mitigation SUNRPC: Don't allow waiting for exiting tasks NFS: Don't allow waiting for exiting tasks NFSv4: Check for delegation validity in nfs_start_delegation_return_locked() fuse: Return EPERM rather than ENOSYS from link() cifs: Fix negotiate retry functionality cifs: Fix querying and creating MF symlinks over SMB1 cifs: Add fallback for SMB2 CREATE without FILE_READ_ATTRIBUTES s390/vfio-ap: Fix no AP queue sharing allowed message written to kernel log kconfig: merge_config: use an empty file as initfile samples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora bpf: fix possible endless loop in BPF map iteration selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure drm/amdgpu: Allow P2P access through XGMI net: enetc: refactor bulk flipping of RX buffers to separate function scsi: mpi3mr: Add level check to control event logging cgroup: Fix compilation issue due to cgroup_mutex not being exported dma-mapping: avoid potential unused data compilation warning virtio_ring: Fix data race by tagging event_triggered as racy for KCSAN scsi: target: iscsi: Fix timeout on deleted connection phy: renesas: rcar-gen3-usb2: Assert PLL reset on PHY power off phy: renesas: rcar-gen3-usb2: Lock around hardware registers and driver data phy: renesas: rcar-gen3-usb2: Move IRQ request in probe phy: renesas: rcar-gen3-usb2: Add support to initialize the bus gpio: pca953x: fix IRQ storm on system wake up gpio: pca953x: Simplify code with cleanup helpers gpio: pca953x: Split pca953x_restore_context() and pca953x_save_context() gpio: pca953x: Add missing header(s) Signed-off-by: Khusika Dhamar Gusti <[email protected]> Conflicts: drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
2 parents e080cf3 + 58485ff commit ad3c429

File tree

353 files changed

+4182
-1982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+4182
-1982
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5780,6 +5780,8 @@
57805780

57815781
Selecting 'on' will also enable the mitigation
57825782
against user space to user space task attacks.
5783+
Selecting specific mitigation does not force enable
5784+
user mitigations.
57835785

57845786
Selecting 'off' will disable both the kernel and
57855787
the user space protections.

Documentation/driver-api/serial/driver.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ Some helpers are provided in order to set/get modem control lines via GPIO.
100100
.. kernel-doc:: drivers/tty/serial/serial_mctrl_gpio.c
101101
:identifiers: mctrl_gpio_init mctrl_gpio_free mctrl_gpio_to_gpiod
102102
mctrl_gpio_set mctrl_gpio_get mctrl_gpio_enable_ms
103-
mctrl_gpio_disable_ms
103+
mctrl_gpio_disable_ms_sync mctrl_gpio_disable_ms_no_sync

Documentation/hwmon/dell-smm-hwmon.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ Temperature sensors and fans can be queried and set via the standard
3232
=============================== ======= =======================================
3333
Name Perm Description
3434
=============================== ======= =======================================
35-
fan[1-3]_input RO Fan speed in RPM.
36-
fan[1-3]_label RO Fan label.
37-
fan[1-3]_min RO Minimal Fan speed in RPM
38-
fan[1-3]_max RO Maximal Fan speed in RPM
39-
fan[1-3]_target RO Expected Fan speed in RPM
40-
pwm[1-3] RW Control the fan PWM duty-cycle.
35+
fan[1-4]_input RO Fan speed in RPM.
36+
fan[1-4]_label RO Fan label.
37+
fan[1-4]_min RO Minimal Fan speed in RPM
38+
fan[1-4]_max RO Maximal Fan speed in RPM
39+
fan[1-4]_target RO Expected Fan speed in RPM
40+
pwm[1-4] RW Control the fan PWM duty-cycle.
4141
pwm1_enable WO Enable or disable automatic BIOS fan
4242
control (not supported on all laptops,
4343
see below for details).
@@ -93,7 +93,7 @@ Again, when you find new codes, we'd be happy to have your patches!
9393
---------------------------
9494

9595
The driver also exports the fans as thermal cooling devices with
96-
``type`` set to ``dell-smm-fan[1-3]``. This allows for easy fan control
96+
``type`` set to ``dell-smm-fan[1-4]``. This allows for easy fan control
9797
using one of the thermal governors.
9898

9999
Module parameters

Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 1
4-
SUBLEVEL = 140
4+
SUBLEVEL = 141
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

@@ -875,6 +875,18 @@ ifdef CONFIG_CC_IS_CLANG
875875
KBUILD_CPPFLAGS += -Qunused-arguments
876876
# The kernel builds with '-std=gnu11' so use of GNU extensions is acceptable.
877877
KBUILD_CFLAGS += -Wno-gnu
878+
879+
# Clang may emit a warning when a const variable, such as the dummy variables
880+
# in typecheck(), or const member of an aggregate type are not initialized,
881+
# which can result in unexpected behavior. However, in many audited cases of
882+
# the "field" variant of the warning, this is intentional because the field is
883+
# never used within a particular call path, the field is within a union with
884+
# other non-const members, or the containing object is not const so the field
885+
# can be modified via memcpy() / memset(). While the variable warning also gets
886+
# disabled with this same switch, there should not be too much coverage lost
887+
# because -Wuninitialized will still flag when an uninitialized const variable
888+
# is used.
889+
KBUILD_CFLAGS += $(call cc-disable-warning, default-const-init-unsafe)
878890
else
879891

880892
# gcc inanely warns about local variables called 'main'

arch/arm/boot/dts/tegra114.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
reg = <0x54400000 0x00040000>;
140140
clocks = <&tegra_car TEGRA114_CLK_DSIB>,
141141
<&tegra_car TEGRA114_CLK_DSIBLP>,
142-
<&tegra_car TEGRA114_CLK_PLL_D2_OUT0>;
142+
<&tegra_car TEGRA114_CLK_PLL_D_OUT0>;
143143
clock-names = "dsi", "lp", "parent";
144144
resets = <&tegra_car 82>;
145145
reset-names = "dsi";

arch/arm/mach-at91/pm.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -537,11 +537,12 @@ extern u32 at91_pm_suspend_in_sram_sz;
537537

538538
static int at91_suspend_finish(unsigned long val)
539539
{
540-
unsigned char modified_gray_code[] = {
541-
0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x04, 0x05, 0x0c, 0x0d,
542-
0x0e, 0x0f, 0x0a, 0x0b, 0x08, 0x09, 0x18, 0x19, 0x1a, 0x1b,
543-
0x1e, 0x1f, 0x1c, 0x1d, 0x14, 0x15, 0x16, 0x17, 0x12, 0x13,
544-
0x10, 0x11,
540+
/* SYNOPSYS workaround to fix a bug in the calibration logic */
541+
unsigned char modified_fix_code[] = {
542+
0x00, 0x01, 0x01, 0x06, 0x07, 0x0c, 0x06, 0x07, 0x0b, 0x18,
543+
0x0a, 0x0b, 0x0c, 0x0d, 0x0d, 0x0a, 0x13, 0x13, 0x12, 0x13,
544+
0x14, 0x15, 0x15, 0x12, 0x18, 0x19, 0x19, 0x1e, 0x1f, 0x14,
545+
0x1e, 0x1f,
545546
};
546547
unsigned int tmp, index;
547548
int i;
@@ -552,25 +553,25 @@ static int at91_suspend_finish(unsigned long val)
552553
* restore the ZQ0SR0 with the value saved here. But the
553554
* calibration is buggy and restoring some values from ZQ0SR0
554555
* is forbidden and risky thus we need to provide processed
555-
* values for these (modified gray code values).
556+
* values for these.
556557
*/
557558
tmp = readl(soc_pm.data.ramc_phy + DDR3PHY_ZQ0SR0);
558559

559560
/* Store pull-down output impedance select. */
560561
index = (tmp >> DDR3PHY_ZQ0SR0_PDO_OFF) & 0x1f;
561-
soc_pm.bu->ddr_phy_calibration[0] = modified_gray_code[index];
562+
soc_pm.bu->ddr_phy_calibration[0] = modified_fix_code[index] << DDR3PHY_ZQ0SR0_PDO_OFF;
562563

563564
/* Store pull-up output impedance select. */
564565
index = (tmp >> DDR3PHY_ZQ0SR0_PUO_OFF) & 0x1f;
565-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
566+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SR0_PUO_OFF;
566567

567568
/* Store pull-down on-die termination impedance select. */
568569
index = (tmp >> DDR3PHY_ZQ0SR0_PDODT_OFF) & 0x1f;
569-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
570+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SR0_PDODT_OFF;
570571

571572
/* Store pull-up on-die termination impedance select. */
572573
index = (tmp >> DDR3PHY_ZQ0SRO_PUODT_OFF) & 0x1f;
573-
soc_pm.bu->ddr_phy_calibration[0] |= modified_gray_code[index];
574+
soc_pm.bu->ddr_phy_calibration[0] |= modified_fix_code[index] << DDR3PHY_ZQ0SRO_PUODT_OFF;
574575

575576
/*
576577
* The 1st 8 words of memory might get corrupted in the process

arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -151,28 +151,12 @@
151151
vcc-pg-supply = <&reg_aldo1>;
152152
};
153153

154-
&r_ir {
155-
linux,rc-map-name = "rc-beelink-gs1";
156-
status = "okay";
157-
};
158-
159-
&r_pio {
160-
/*
161-
* FIXME: We can't add that supply for now since it would
162-
* create a circular dependency between pinctrl, the regulator
163-
* and the RSB Bus.
164-
*
165-
* vcc-pl-supply = <&reg_aldo1>;
166-
*/
167-
vcc-pm-supply = <&reg_aldo1>;
168-
};
169-
170-
&r_rsb {
154+
&r_i2c {
171155
status = "okay";
172156

173-
axp805: pmic@745 {
157+
axp805: pmic@36 {
174158
compatible = "x-powers,axp805", "x-powers,axp806";
175-
reg = <0x745>;
159+
reg = <0x36>;
176160
interrupt-parent = <&r_intc>;
177161
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
178162
interrupt-controller;
@@ -290,6 +274,22 @@
290274
};
291275
};
292276

277+
&r_ir {
278+
linux,rc-map-name = "rc-beelink-gs1";
279+
status = "okay";
280+
};
281+
282+
&r_pio {
283+
/*
284+
* PL0 and PL1 are used for PMIC I2C
285+
* don't enable the pl-supply else
286+
* it will fail at boot
287+
*
288+
* vcc-pl-supply = <&reg_aldo1>;
289+
*/
290+
vcc-pm-supply = <&reg_aldo1>;
291+
};
292+
293293
&spdif {
294294
pinctrl-names = "default";
295295
pinctrl-0 = <&spdif_tx_pin>;

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,16 +175,12 @@
175175
vcc-pg-supply = <&reg_vcc_wifi_io>;
176176
};
177177

178-
&r_ir {
179-
status = "okay";
180-
};
181-
182-
&r_rsb {
178+
&r_i2c {
183179
status = "okay";
184180

185-
axp805: pmic@745 {
181+
axp805: pmic@36 {
186182
compatible = "x-powers,axp805", "x-powers,axp806";
187-
reg = <0x745>;
183+
reg = <0x36>;
188184
interrupt-parent = <&r_intc>;
189185
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
190186
interrupt-controller;
@@ -295,6 +291,10 @@
295291
};
296292
};
297293

294+
&r_ir {
295+
status = "okay";
296+
};
297+
298298
&rtc {
299299
clocks = <&ext_osc32k>;
300300
};

arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,12 @@
112112
vcc-pg-supply = <&reg_aldo1>;
113113
};
114114

115-
&r_ir {
116-
status = "okay";
117-
};
118-
119-
&r_pio {
120-
vcc-pm-supply = <&reg_bldo3>;
121-
};
122-
123-
&r_rsb {
115+
&r_i2c {
124116
status = "okay";
125117

126-
axp805: pmic@745 {
118+
axp805: pmic@36 {
127119
compatible = "x-powers,axp805", "x-powers,axp806";
128-
reg = <0x745>;
120+
reg = <0x36>;
129121
interrupt-parent = <&r_intc>;
130122
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_LOW>;
131123
interrupt-controller;
@@ -240,6 +232,14 @@
240232
};
241233
};
242234

235+
&r_ir {
236+
status = "okay";
237+
};
238+
239+
&r_pio {
240+
vcc-pm-supply = <&reg_bldo3>;
241+
};
242+
243243
&rtc {
244244
clocks = <&ext_osc32k>;
245245
};

arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,7 @@
16311631
regulator-min-microvolt = <1800000>;
16321632
regulator-max-microvolt = <1800000>;
16331633
regulator-always-on;
1634-
gpio = <&exp1 14 GPIO_ACTIVE_HIGH>;
1634+
gpio = <&exp1 9 GPIO_ACTIVE_HIGH>;
16351635
enable-active-high;
16361636
vin-supply = <&vdd_1v8>;
16371637
};

0 commit comments

Comments
 (0)