2f84185dd7
* 'android11-5.4-lts' of https://android.googlesource.com/kernel/common: FROMGIT: clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd Linux 5.4.268 arm64: dts: armada-3720-turris-mox: set irq type for RTC perf top: Skip side-band event setup if HAVE_LIBBPF_SUPPORT is not set i2c: s3c24xx: fix transferring more than one message in polling mode i2c: s3c24xx: fix read transfers in polling mode mlxsw: spectrum_acl_erp: Fix error flow of pool allocation failure kdb: Fix a potential buffer overflow in kdb_local() kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ ipvs: avoid stat macros calls from preemptible context netfilter: nf_tables: skip dead set elements in netlink dump net: dsa: vsc73xx: Add null pointer check to vsc73xx_gpio_probe net: ravb: Fix dma_addr_t truncation in error case net: phy: micrel: populate .soft_reset for KSZ9131 net: qualcomm: rmnet: fix global oob in rmnet_policy s390/pci: fix max size calculation in zpci_memcpy_toio() PCI: keystone: Fix race condition when initializing PHYs nvmet-tcp: Fix the H2C expected PDU len calculation serial: imx: Correct clock error message in function probe() apparmor: avoid crash when parsed profile name is empty perf env: Avoid recursively taking env->bpf_progs.lock perf bpf: Decouple creating the evlist from adding the SB event perf top: Move sb_evlist to 'struct perf_top' perf record: Move sb_evlist to 'struct record' perf env: Add perf_env__numa_node() nvmet-tcp: fix a crash in nvmet_req_complete() nvmet-tcp: Fix a kernel panic when host sends an invalid H2C PDU length perf genelf: Set ELF program header addresses properly software node: Let args be NULL in software_node_get_reference_args acpi: property: Let args be NULL in __acpi_node_get_property_reference serial: 8250: omap: Don't skip resource freeing if pm_runtime_resume_and_get() failed MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup() MIPS: Alchemy: Fix an out-of-bound access in db1200_dev_setup() mips: Fix incorrect max_low_pfn adjustment HID: wacom: Correct behavior when processing some confidence == false touches x86/kvm: Do not try to disable kvmclock if it was not enabled wifi: mwifiex: configure BSSID consistently when starting AP wifi: rtlwifi: Convert LNKCTL change to PCIe cap RMW accessors wifi: rtlwifi: Remove bogus and dangerous ASPM disable/enable code rootfs: Fix support for rootfstype= when root= is given fbdev: flush deferred work in fb_deferred_io_fsync() ALSA: oxygen: Fix right channel of capture volume mixer usb: mon: Fix atomicity violation in mon_bin_vma_fault usb: typec: class: fix typec_altmode_put_partner to put plugs Revert "usb: typec: class: fix typec_altmode_put_partner to put plugs" usb: chipidea: wait controller resume finished for wakeup irq Revert "usb: dwc3: don't reset device side if dwc3 was configured as host-only" Revert "usb: dwc3: Soft reset phy on probe for host" usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart usb: phy: mxs: remove CONFIG_USB_OTG condition for mxs_phy_is_otg_host() tick-sched: Fix idle and iowait sleeptime accounting vs CPU hotplug binder: fix unused alloc->free_async_space binder: fix race between mmput() and do_exit() xen-netback: don't produce zero-size SKB frags Revert "ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek" Input: atkbd - use ab83 as id when skipping the getid command binder: fix use-after-free in shinker's callback binder: fix async space check for 0-sized buffers of: unittest: Fix of_count_phandle_with_args() expected value message of: Fix double free in of_parse_phandle_with_args_map mmc: sdhci_omap: Fix TI SoC dependencies clk: si5341: fix an error code problem in si5341_output_clk_set_rate watchdog: bcm2835_wdt: Fix WDIOC_SETTIMEOUT handling watchdog/hpwdt: Only claim UNKNOWN NMI if from iLO watchdog: set cdev owner before adding drivers: clk: zynqmp: calculate closest mux rate gpu/drm/radeon: fix two memleaks in radeon_vm_init drivers/amd/pm: fix a use-after-free in kv_parse_power_table drm/amd/pm: fix a double-free in si_dpm_init drm/amdgpu/debugfs: fix error code when smc register accessors are NULL media: dvbdev: drop refcount on error path in dvb_device_open() media: cx231xx: fix a memleak in cx231xx_init_isoc drm/bridge: tc358767: Fix return value on error case drm/radeon/trinity_dpm: fix a memleak in trinity_parse_power_table drm/radeon/dpm: fix a memleak in sumo_parse_power_table drm/radeon: check the alloc_workqueue return value in radeon_crtc_init() drm/drv: propagate errors from drm_modeset_register_all() drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks drm/msm/mdp4: flush vblank event on disable ASoC: cs35l34: Fix GPIO name and drop legacy include ASoC: cs35l33: Fix GPIO name and drop legacy include drm/radeon: check return value of radeon_ring_lock() drm/radeon/r100: Fix integer overflow issues in r100_cs_track_check() drm/radeon/r600_cs: Fix possible int overflows in r600_cs_check_reg() f2fs: fix to avoid dirent corruption drm/bridge: Fix typo in post_disable() description media: pvrusb2: fix use after free on context disconnection RDMA/usnic: Silence uninitialized symbol smatch warnings ARM: davinci: always select CONFIG_CPU_ARM926T ip6_tunnel: fix NEXTHDR_FRAGMENT handling in ip6_tnl_parse_tlv_enc_lim() Bluetooth: btmtkuart: fix recv_buf() return value Bluetooth: Fix bogus check for re-auth no supported with non-ssp netfilter: nf_tables: mark newset as dead on transaction abort wifi: rtlwifi: rtl8192se: using calculate_bit_shift() wifi: rtlwifi: rtl8192ee: using calculate_bit_shift() wifi: rtlwifi: rtl8192de: using calculate_bit_shift() rtlwifi: rtl8192de: make arrays static const, makes object smaller wifi: rtlwifi: rtl8192ce: using calculate_bit_shift() wifi: rtlwifi: rtl8192cu: using calculate_bit_shift() wifi: rtlwifi: rtl8192c: using calculate_bit_shift() wifi: rtlwifi: rtl8188ee: phy: using calculate_bit_shift() wifi: rtlwifi: add calculate_bit_shift() dma-mapping: clear dev->dma_mem to NULL after freeing it virtio/vsock: fix logic which reduces credit update messages selftests/net: fix grep checking for fib_nexthop_multiprefix scsi: hisi_sas: Replace with standard error code return value arm64: dts: qcom: sdm845-db845c: correct LED panic indicator scsi: fnic: Return error if vmalloc() failed wifi: rtlwifi: rtl8821ae: phy: fix an undefined bitwise shift behavior rtlwifi: Use ffs in <foo>_phy_calculate_bit_shift firmware: ti_sci: Fix an off-by-one in ti_sci_debugfs_create() net/ncsi: Fix netlink major/minor version numbers ncsi: internal.h: Fix a spello ARM: dts: qcom: apq8064: correct XOADC register address wifi: libertas: stop selecting wext bpf, lpm: Fix check prefixlen before walking trie wifi: rtw88: fix RX filter in FIF_ALLMULTI flag NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT blocklayoutdriver: Fix reference leak of pnfs_device_node crypto: scomp - fix req->dst buffer overflow crypto: sahara - do not resize req->src when doing hash operations crypto: sahara - fix processing hash requests with req->nbytes < sg->length crypto: sahara - improve error handling in sahara_sha_process() crypto: sahara - fix wait_for_completion_timeout() error handling crypto: sahara - fix ahash reqsize crypto: virtio - Wait for tasklet to complete on device remove gfs2: Fix kernel NULL pointer dereference in gfs2_rgrp_dump pstore: ram_core: fix possible overflow in persistent_ram_init_ecc() crypto: sahara - fix error handling in sahara_hw_descriptor_create() crypto: sahara - fix processing requests with cryptlen < sg->length crypto: sahara - fix ahash selftest failure crypto: sahara - remove FLAGS_NEW_KEY logic crypto: af_alg - Disallow multiple in-flight AIO requests crypto: ccp - fix memleak in ccp_init_dm_workarea virtio_crypto: Introduce VIRTIO_CRYPTO_NOSPC crypto: virtio - don't use 'default m' crypto: virtio - Handle dataq logic with tasklet selinux: Fix error priority for bind with AF_UNSPEC on PF_INET6 socket mtd: Fix gluebi NULL pointer dereference caused by ftl notifier spi: sh-msiof: Enforce fixed DTDL for R-Car H3 calipso: fix memory leak in netlbl_calipso_add_pass() netlabel: remove unused parameter in netlbl_netlink_auditinfo() net: netlabel: Fix kerneldoc warnings ACPI: LPIT: Avoid u32 multiplication overflow ACPI: video: check for error while searching for backlight device parent mtd: rawnand: Increment IFC_TIMEOUT_MSECS for nand controller response powerpc/imc-pmu: Add a null pointer check in update_events_in_group() powerpc/powernv: Add a null pointer check in opal_powercap_init() powerpc/powernv: Add a null pointer check in opal_event_init() powerpc/powernv: Add a null pointer check to scom_debug_init_one() selftests/powerpc: Fix error handling in FPU/VMX preemption tests powerpc/pseries/memhp: Fix access beyond end of drmem array powerpc/pseries/memhotplug: Quieten some DLPAR operations powerpc/44x: select I2C for CURRITUCK powerpc: add crtsavres.o to always-y instead of extra-y EDAC/thunderx: Fix possible out-of-bounds string access x86/lib: Fix overflow when counting digits coresight: etm4x: Fix width of CCITMIN field parport: parport_serial: Add Brainboxes device IDs and geometry parport: parport_serial: Add Brainboxes BAR details uio: Fix use-after-free in uio_open binder: fix comment on binder_alloc_new_buf() return value binder: fix trivial typo of binder_free_buf_locked() binder: use EPOLLERR from eventpoll.h ACPI: resource: Add another DMI match for the TongFang GMxXGxx drm/crtc: fix uninitialized variable use ARM: sun9i: smp: fix return code check of of_property_match_string ida: Fix crash in ida_free when the bitmap is empty Input: xpad - add Razer Wolverine V2 support ARC: fix spare error s390/scm: fix virtual vs physical address confusion Input: i8042 - add nomux quirk for Acer P459-G2-M Input: atkbd - skip ATKBD_CMD_GETID in translated mode reset: hisilicon: hi6220: fix Wvoid-pointer-to-enum-cast warning ring-buffer: Do not record in NMI if the arch does not support cmpxchg in NMI tracing: Add size check when printing trace_marker output tracing: Have large events show up as '[LINE TOO BIG]' instead of nothing neighbour: Don't let neigh_forced_gc() disable preemption for long drm/crtc: Fix uninit-value bug in drm_mode_setcrtc jbd2: correct the printing of write_flags in jbd2_write_superblock() clk: rockchip: rk3128: Fix HCLK_OTG gate register drm/exynos: fix a wrong error checking drm/exynos: fix a potential error pointer dereference nvme: introduce helper function to get ctrl state ASoC: da7219: Support low DC impedance headset net/tg3: fix race condition in tg3_reset_task() nouveau/tu102: flush all pdbs on vmm flush ASoC: rt5650: add mutex to avoid the jack detection failure ASoC: cs43130: Fix incorrect frame delay configuration ASoC: cs43130: Fix the position of const qualifier ASoC: Intel: Skylake: mem leak in skl register function ASoC: nau8822: Fix incorrect type in assignment and cast to restricted __be16 ASoC: Intel: Skylake: Fix mem leak in few functions ALSA: hda - Fix speaker and headset mic pin config for CHUWI CoreBook XPro pinctrl: lochnagar: Don't build on MIPS f2fs: explicitly null-terminate the xattr list Revert "ipv6: make ip6_rt_gc_expire an atomic_t" Revert "ipv6: remove max_size check inline with ipv4" Linux 5.4.267 ASoC: meson: codec-glue: fix pcm format cast warning ipv6: remove max_size check inline with ipv4 ipv6: make ip6_rt_gc_expire an atomic_t net/dst: use a smaller percpu_counter batch for dst entries accounting PCI: Disable ATS for specific Intel IPU E2000 devices PCI: Extract ATS disabling to a helper function netfilter: nf_tables: Reject tables of unsupported family net: tls, update curr on splice as well ath10k: Get rid of "per_ce_irq" hw param ath10k: Keep track of which interrupts fired, don't poll them ath10k: Add interrupt summary based CE processing ath10k: Wait until copy complete is actually done before completing mmc: sdhci-sprd: Fix eMMC init failure after hw reset mmc: core: Cancel delayed work before releasing host mmc: rpmb: fixes pause retune on all RPMB partitions. mm: fix unmap_mapping_range high bits shift bug i2c: core: Fix atomic xfer check for non-preempt config firewire: ohci: suppress unexpected system reboot in AMD Ryzen machines and ASM108x/VT630x PCIe cards mm/memory-failure: check the mapcount of the precise page net: Implement missing SO_TIMESTAMPING_NEW cmsg support bnxt_en: Remove mis-applied code from bnxt_cfg_ntp_filters() asix: Add check for usbnet_get_endpoints net/qla3xxx: fix potential memleak in ql_alloc_buffer_queues net/qla3xxx: switch from 'pci_' to 'dma_' API i40e: Restore VF MSI-X state during PCI reset ASoC: meson: g12a-tohdmitx: Fix event generation for S/PDIF mux ASoC: meson: g12a-tohdmitx: Validate written enum values ASoC: meson: g12a: extract codec-to-codec utils i40e: fix use-after-free in i40e_aqc_add_filters() net: Save and restore msg_namelen in sock_sendmsg net: bcmgenet: Fix FCS generation for fragmented skbuffs ARM: sun9i: smp: Fix array-index-out-of-bounds read in sunxi_mc_smp_init net-timestamp: extend SOF_TIMESTAMPING_OPT_ID to HW timestamps can: raw: add support for SO_MARK can: raw: add support for SO_TXTIME/SCM_TXTIME net: sched: em_text: fix possible memory leak in em_text_destroy() i40e: Fix filter input checks to prevent config with invalid values nfc: llcp_core: Hold a ref to llcp_local->dev when holding a ref to llcp_local ANDROID: db845c: Enable device tree overlay support Linux 5.4.266 block: Don't invalidate pagecache for invalid falloc modes ring-buffer: Fix wake ups when buffer_percent is set to 100 smb: client: fix OOB in smbCalcSize() usb: fotg210-hcd: delete an incorrect bounds test x86/alternatives: Sync core before enabling interrupts net: rfkill: gpio: set GPIO direction net: 9p: avoid freeing uninit memory in p9pdu_vreadf Bluetooth: hci_event: Fix not checking if HCI_OP_INQUIRY has been sent USB: serial: option: add Quectel RM500Q R13 firmware support USB: serial: option: add Foxconn T99W265 with new baseline USB: serial: option: add Quectel EG912Y module support USB: serial: ftdi_sio: update Actisense PIDs constant names wifi: cfg80211: fix certs build to not depend on file order wifi: cfg80211: Add my certificate iio: adc: ti_am335x_adc: Fix return value check of tiadc_request_dma() iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table scsi: bnx2fc: Fix skb double free in bnx2fc_rcv() Input: ipaq-micro-keys - add error handling for devm_kmemdup iio: imu: inv_mpu6050: fix an error code problem in inv_mpu6050_read_raw interconnect: Treat xlate() returning NULL node as an error btrfs: do not allow non subvolume root targets for snapshot smb: client: fix NULL deref in asn1_ber_decoder() ALSA: hda/hdmi: add force-connect quirk for NUC5CPYB ALSA: hda/hdmi: Add quirk to force pin connectivity on NUC10 pinctrl: at91-pio4: use dedicated lock class for IRQ i2c: aspeed: Handle the coalesced stop conditions with the start conditions. afs: Fix overwriting of result of DNS query net: check dev->gso_max_size in gso_features_check() net: warn if gso_type isn't set for a GSO SKB afs: Fix dynamic root lookup DNS check afs: Fix the dynamic root's d_delete to always delete unused dentries net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev() net/rose: fix races in rose_kill_by_device() ethernet: atheros: fix a memleak in atl1e_setup_ring_resources net: sched: ife: fix potential use-after-free net/mlx5e: Correct snprintf truncation handling for fw_version buffer used by representors net/mlx5: Fix fw tracer first block check net/mlx5: improve some comments Revert "net/mlx5e: fix double free of encap_header" wifi: mac80211: mesh_plink: fix matches_local logic s390/vx: fix save/restore of fpu kernel context reset: Fix crash when freeing non-existent optional resets ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init ksmbd: fix wrong name of SMB2_CREATE_ALLOCATION_SIZE ALSA: hda/realtek: Enable headset on Lenovo M90 Gen5 ANDROID: GKI: fix crc issue in include/net/addrconf.h Revert "cred: switch to using atomic_long_t" Linux 5.4.265 powerpc/ftrace: Fix stack teardown in ftrace_no_trace powerpc/ftrace: Create a dummy stackframe to fix stack unwind mmc: block: Be sure to wait while busy in CQE error recovery ring-buffer: Fix memory leak of free page team: Fix use-after-free when an option instance allocation fails arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify ext4: prevent the normalized size from exceeding EXT_MAX_BLOCKS soundwire: stream: fix NULL pointer dereference for multi_link perf: Fix perf_event_validate_size() lockdep splat HID: hid-asus: add const to read-only outgoing usb buffer net: usb: qmi_wwan: claim interface 4 for ZTE MF290 asm-generic: qspinlock: fix queued_spin_value_unlocked() implementation HID: multitouch: Add quirk for HONOR GLO-GXXX touchpad HID: hid-asus: reset the backlight brightness level on resume HID: add ALWAYS_POLL quirk for Apple kb platform/x86: intel_telemetry: Fix kernel doc descriptions bcache: avoid NULL checking to c->root in run_cache_set() bcache: add code comments for bch_btree_node_get() and __bch_btree_node_alloc() bcache: avoid oversize memory allocation by small stripe_size blk-throttle: fix lockdep warning of "cgroup_mutex or RCU read lock required!" usb: aqc111: check packet for fixup for true limit Revert "PCI: acpiphp: Reassign resources on bridge if necessary" ALSA: hda/hdmi: add force-connect quirks for ASUSTeK Z170 variants cred: switch to using atomic_long_t appletalk: Fix Use-After-Free in atalk_ioctl net: stmmac: Handle disabled MDIO busses from devicetree net: stmmac: use dev_err_probe() for reporting mdio bus registration failure vsock/virtio: Fix unsigned integer wrap around in virtio_transport_has_space() sign-file: Fix incorrect return values check net: Remove acked SYN flag from packet in the transmit queue correctly qed: Fix a potential use-after-free in qed_cxt_tables_alloc net/rose: Fix Use-After-Free in rose_ioctl atm: Fix Use-After-Free in do_vcc_ioctl atm: solos-pci: Fix potential deadlock on &tx_queue_lock atm: solos-pci: Fix potential deadlock on &cli_queue_lock qca_spi: Fix reset behavior qca_debug: Fix ethtool -G iface tx behavior qca_debug: Prevent crash on TX ring changes net: ipv6: support reporting otherwise unknown prefix flags in RTM_NEWPREFIX afs: Fix refcount underflow from error handling race Revert "psample: Require 'CAP_NET_ADMIN' when joining "packets" group" Revert "mmc: core: add helpers mmc_regulator_enable/disable_vqmmc" Revert "mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled" Revert "genetlink: add CAP_NET_ADMIN test for multicast bind" Revert "drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group" Revert "perf/core: Add a new read format to get a number of lost samples" Revert "perf: Fix perf_event_validate_size()" Revert "hrtimers: Push pending hrtimers away from outgoing CPU earlier" Linux 5.4.264 devcoredump: Send uevent once devcd is ready devcoredump : Serialize devcd_del work smb: client: fix potential NULL deref in parse_dfs_referrals() cifs: Fix non-availability of dedup breaking generic/304 Revert "btrfs: add dmesg output for first mount and last unmount of a filesystem" tools headers UAPI: Sync linux/perf_event.h with the kernel sources drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group psample: Require 'CAP_NET_ADMIN' when joining "packets" group genetlink: add CAP_NET_ADMIN test for multicast bind netlink: don't call ->netlink_bind with table lock held io_uring/af_unix: disable sending io_uring over sockets nilfs2: fix missing error check for sb_set_blocksize call KVM: s390/mm: Properly reset no-dat x86/CPU/AMD: Check vendor in the AMD microcode callback serial: 8250_omap: Add earlycon support for the AM654 UART controller serial: sc16is7xx: address RX timeout interrupt errata ARM: PL011: Fix DMA support usb: typec: class: fix typec_altmode_put_partner to put plugs parport: Add support for Brainboxes IX/UC/PX parallel cards usb: gadget: f_hid: fix report descriptor allocation mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled mmc: core: add helpers mmc_regulator_enable/disable_vqmmc gpiolib: sysfs: Fix error handling on failed export perf: Fix perf_event_validate_size() perf/core: Add a new read format to get a number of lost samples arm64: dts: mediatek: mt8173-evb: Fix regulator-fixed node names arm64: dts: mediatek: mt7622: fix memory node warning check packet: Move reference count in packet_sock to atomic_long_t tracing: Fix a possible race when disabling buffered events tracing: Fix incomplete locking when disabling buffered events tracing: Always update snapshot buffer size nilfs2: prevent WARNING in nilfs_sufile_set_segment_usage() ALSA: pcm: fix out-of-bounds in snd_pcm_state_names ARM: dts: imx7: Declare timers compatible with fsl,imx6dl-gpt ARM: dts: imx: make gpt node name generic ARM: imx: Check return value of devm_kasprintf in imx_mmdc_perf_init scsi: be2iscsi: Fix a memleak in beiscsi_init_wrb_handle() tracing: Fix a warning when allocating buffered events fails ASoC: wm_adsp: fix memleak in wm_adsp_buffer_populate hwmon: (acpi_power_meter) Fix 4.29 MW bug RDMA/bnxt_re: Correct module description string bpf: sockmap, updating the sg structure should also update curr tcp: do not accept ACK of bytes we never sent netfilter: xt_owner: Fix for unsafe access of sk->sk_socket net: hns: fix fake link up on xge port ipv4: ip_gre: Avoid skb_pull() failure in ipgre_xmit() arcnet: restoring support for multiple Sohard Arcnet cards net: arcnet: com20020 fix error handling net: arcnet: Fix RESET flag handling hv_netvsc: rndis_filter needs to select NLS ipv6: fix potential NULL deref in fib6_add() of: dynamic: Fix of_reconfig_get_state_change() return value documentation of: Add missing 'Return' section in kerneldoc comments of: Fix kerneldoc output formatting of: base: Fix some formatting issues and provide missing descriptions of/irq: Make of_msi_map_rid() PCI bus agnostic of/irq: make of_msi_map_get_device_domain() bus agnostic of/iommu: Make of_map_rid() PCI agnostic ACPI/IORT: Make iort_msi_map_rid() PCI agnostic ACPI/IORT: Make iort_get_device_domain IRQ domain agnostic of: base: Add of_get_cpu_state_node() to get idle states for a CPU node drm/amdgpu: correct chunk_ptr to a pointer to chunk. kconfig: fix memory leak from range properties tg3: Increment tx_dropped in tg3_tso_bug() tg3: Move the [rt]x_dropped counters to tg3_napi netfilter: ipset: fix race condition between swap/destroy and kernel side add/del/test hrtimers: Push pending hrtimers away from outgoing CPU earlier Revert "HID: core: store the unique system identifier in hid_device" Revert "HID: fix HID device resource race between HID core and debugging support" Linux 5.4.263 mmc: block: Retry commands in CQE error recovery mmc: core: convert comma to semicolon mmc: cqhci: Fix task clearing in CQE error recovery mmc: cqhci: Warn of halt or task clear failure mmc: cqhci: Increase recovery halt timeout cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily cpufreq: imx6q: don't warn for disabling a non-existing frequency scsi: qla2xxx: Fix system crash due to bad pointer access scsi: qla2xxx: Use scsi_cmd_to_rq() instead of scsi_cmnd.request scsi: core: Introduce the scsi_cmd_to_rq() function scsi: qla2xxx: Simplify the code for aborting SCSI commands ima: detect changes to the backing overlay file ovl: skip overlayfs superblocks at global sync ima: annotate iint mutex to avoid lockdep false positive warnings fbdev: stifb: Make the STI next font pointer a 32-bit signed offset mtd: cfi_cmdset_0001: Byte swap OTP info mtd: cfi_cmdset_0001: Support the absence of protection registers s390/cmma: fix detection of DAT pages s390/mm: fix phys vs virt confusion in mark_kernel_pXd() functions family smb3: fix touch -h of symlink net: ravb: Start TX queues after HW initialization succeeded net: ravb: Use pm_runtime_resume_and_get() ravb: Fix races between ravb_tx_timeout_work() and net related ops net: stmmac: xgmac: Disable FPE MMC interrupts ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet Input: xpad - add HyperX Clutch Gladiate Support btrfs: make error messages more clear when getting a chunk map btrfs: send: ensure send_fd is writable btrfs: fix off-by-one when checking chunk map includes logical address btrfs: add dmesg output for first mount and last unmount of a filesystem powerpc: Don't clobber f0/vs0 during fp|altivec register save bcache: revert replacing IS_ERR_OR_NULL with IS_ERR dm verity: don't perform FEC for failed readahead IO dm-verity: align struct dm_verity_fec_io properly ALSA: hda/realtek: Add supported ALC257 for ChromeOS ALSA: hda/realtek: Headset Mic VREF to 100% ALSA: hda: Disable power-save on KONTRON SinglePC mmc: block: Do not lose cache flush during CQE error recovery firewire: core: fix possible memory leak in create_units() pinctrl: avoid reload of p state in list iteration io_uring: fix off-by one bvec index USB: dwc3: qcom: fix wakeup after probe deferral USB: dwc3: qcom: fix resource leaks on probe deferral usb: dwc3: set the dma max_seg_size USB: dwc2: write HCINT with INTMASK applied USB: serial: option: don't claim interface 4 for ZTE MF290 USB: serial: option: fix FM101R-GL defines USB: serial: option: add Fibocom L7xx modules bcache: prevent potential division by zero error bcache: check return value from btree_node_alloc_replacement() dm-delay: fix a race between delay_presuspend and delay_bio hv_netvsc: Mark VF as slave before exposing it to user-mode hv_netvsc: Fix race of register_netdevice_notifier and VF register USB: serial: option: add Luat Air72*U series products s390/dasd: protect device queue against concurrent access bcache: replace a mistaken IS_ERR() by IS_ERR_OR_NULL() in btree_gc_coalesce() ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CVA KVM: arm64: limit PMU version to PMUv3 for ARMv8.1 arm64: cpufeature: Extract capped perfmon fields ext4: make sure allocate pending entry not fail ext4: fix slab-use-after-free in ext4_es_insert_extent() ext4: using nofail preallocation in ext4_es_insert_extent() ext4: using nofail preallocation in ext4_es_insert_delayed_block() ext4: using nofail preallocation in ext4_es_remove_extent() ext4: use pre-allocated es in __es_remove_extent() ext4: use pre-allocated es in __es_insert_extent() ext4: factor out __es_alloc_extent() and __es_free_extent() ext4: add a new helper to check if es must be kept MIPS: KVM: Fix a build warning about variable set but not used nvmet: nul-terminate the NQNs passed in the connect command nvmet: remove unnecessary ctrl parameter afs: Fix file locking on R/O volumes to operate in local mode afs: Return ENOENT if no cell DNS record can be found net: axienet: Fix check for partial TX checksum amd-xgbe: propagate the correct speed and duplex status amd-xgbe: handle the corner-case during tx completion amd-xgbe: handle corner-case during sfp hotplug arm/xen: fix xen_vcpu_info allocation alignment net: usb: ax88179_178a: fix failed operations during ax88179_reset ipv4: Correct/silence an endian warning in __ip_do_redirect HID: fix HID device resource race between HID core and debugging support HID: core: store the unique system identifier in hid_device drm/rockchip: vop: Fix color for RGB888/BGR888 format on VOP full ata: pata_isapnp: Add missing error check for devm_ioport_map() drm/panel: simple: Fix Innolux G101ICE-L01 timings drm/panel: simple: Fix Innolux G101ICE-L01 bus flags afs: Make error on cell lookup failure consistent with OpenAFS PCI: keystone: Drop __init from ks_pcie_add_pcie_{ep,port}() RDMA/irdma: Prevent zero-length STAG registration driver core: Release all resources during unbind before updating device links ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override Revert "tracing: Have trace_event_file have ref counters" Linux 5.4.262 netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush (for 5.4) netfilter: nf_tables: disable toggling dormant table state more than once netfilter: nf_tables: fix table flag updates netfilter: nftables: update table flags from the commit phase netfilter: nf_tables: double hook unregistration in netns path netfilter: nf_tables: unregister flowtable hooks on netns exit netfilter: nf_tables: fix memleak when more than 255 elements expired netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction netfilter: nf_tables: defer gc run if previous batch is still pending netfilter: nf_tables: use correct lock to protect gc_list netfilter: nf_tables: GC transaction race with abort path netfilter: nf_tables: GC transaction race with netns dismantle netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path netfilter: nf_tables: remove busy mark and gc batch API netfilter: nft_set_hash: mark set element as dead when deleting from packet path netfilter: nf_tables: adapt set backend to use GC transaction API netfilter: nf_tables: GC transaction API to avoid race with control plane netfilter: nf_tables: don't skip expired elements during walk netfilter: nft_set_rbtree: fix overlap expiration walk netfilter: nft_set_rbtree: fix null deref on element insertion netfilter: nft_set_rbtree: Switch to node list walk for overlap detection netfilter: nf_tables: drop map element references from preparation phase netfilter: nftables: rename set element data activation/deactivation functions netfilter: nf_tables: pass context to nft_set_destroy() tracing: Have trace_event_file have ref counters drm/amdgpu: fix error handling in amdgpu_bo_list_get() ext4: remove gdb backup copy for meta bg in setup_new_flex_group_blocks ext4: correct the start block of counting reserved clusters ext4: correct return value of ext4_convert_meta_bg ext4: correct offset of gdb backup in non meta_bg group to update_backups ext4: apply umask if ACL support is disabled Revert "net: r8169: Disable multicast filter for RTL8168H and RTL8107E" nfsd: fix file memleak on client_opens_release media: venus: hfi: add checks to handle capabilities from firmware media: venus: hfi: fix the check to handle session buffer requirement media: venus: hfi_parser: Add check to keep the number of codecs within range media: sharp: fix sharp encoding media: lirc: drop trailing space from scancode transmit i2c: i801: fix potential race in i801_block_transaction_byte_by_byte net: dsa: lan9303: consequently nested-lock physical MDIO Revert ncsi: Propagate carrier gain/loss events to the NCSI controller Bluetooth: btusb: Add 0bda:b85b for Fn-Link RTL8852BE Bluetooth: btusb: Add RTW8852BE device 13d3:3570 to device tables bluetooth: Add device 13d3:3571 to device tables bluetooth: Add device 0bda:887b to device tables Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559 Bluetooth: btusb: add Realtek 8822CE to usb_device_id table Bluetooth: btusb: Add flag to define wideband speech capability tty: serial: meson: fix hard LOCKUP on crtscts mode serial: meson: Use platform_get_irq() to get the interrupt tty: serial: meson: retrieve port FIFO size from DT serial: meson: remove redundant initialization of variable id ALSA: hda/realtek - Enable internal speaker of ASUS K6500ZC ALSA: info: Fix potential deadlock at disconnection parisc/pgtable: Do not drop upper 5 address bits of physical address parisc: Prevent booting 64-bit kernels on PA1.x machines i3c: master: cdns: Fix reading status register mm/cma: use nth_page() in place of direct struct page manipulation dmaengine: stm32-mdma: correct desc prep when channel running mcb: fix error handling for different scenarios when parsing i2c: core: Run atomic i2c xfer when !preemptible kernel/reboot: emergency_restart: Set correct system_state quota: explicitly forbid quota files from being encrypted jbd2: fix potential data lost in recovering journal raced with synchronizing fs bdev btrfs: don't arbitrarily slow down delalloc if we're committing PM: hibernate: Clean up sync_read handling in snapshot_write_next() PM: hibernate: Use __get_safe_page() rather than touching the list mmc: vub300: fix an error code clk: qcom: ipq8074: drop the CLK_SET_RATE_PARENT flag from PLL clocks parisc/pdc: Add width field to struct pdc_model PCI: keystone: Don't discard .probe() callback PCI: keystone: Don't discard .remove() callback genirq/generic_chip: Make irq_remove_generic_chip() irqdomain aware mmc: meson-gx: Remove setting of CMD_CFG_ERROR ACPI: resource: Do IRQ override on TongFang GMxXGxx PCI/sysfs: Protect driver's D3cold preference from user space hvc/xen: fix error path in xen_hvc_init() to always register frontend driver audit: don't WARN_ON_ONCE(!current->mm) in audit_exe_compare() audit: don't take task_lock() in audit_exe_compare() code path KVM: x86: Ignore MSR_AMD64_TW_CFG access KVM: x86: hyper-v: Don't auto-enable stimer on write from user-space x86/cpu/hygon: Fix the CPU topology evaluation for real scsi: megaraid_sas: Increase register read retry rount from 3 to 30 for selected registers bpf: Fix precision tracking for BPF_ALU | BPF_TO_BE | BPF_END randstruct: Fix gcc-plugin performance mode to stay in group media: venus: hfi: add checks to perform sanity on queue pointers cifs: spnego: add ';' in HOST_KEY_LEN tools/power/turbostat: Fix a knl bug macvlan: Don't propagate promisc change to lower dev in passthru net/mlx5e: Check return value of snprintf writing to fw_version buffer for representors net/mlx5_core: Clean driver version and name net/mlx5e: fix double free of encap_header net: stmmac: fix rx budget limit check net: stmmac: Rework stmmac_rx() netfilter: nf_conntrack_bridge: initialize err to 0 net: ethernet: cortina: Fix MTU max setting net: ethernet: cortina: Handle large frames net: ethernet: cortina: Fix max RX frame define bonding: stop the device in bond_setup_by_slave() ptp: annotate data-race around q->head and q->tail xen/events: fix delayed eoi list handling ppp: limit MRU to 64K tipc: Fix kernel-infoleak due to uninitialized TLV value net: hns3: fix variable may not initialized problem in hns3_init_mac_addr() tty: Fix uninit-value access in ppp_sync_receive() ipvlan: add ipvlan_route_v6_outbound() helper NFSv4.1: fix SP4_MACH_CRED protection for pnfs IO wifi: iwlwifi: Use FW rate for non-data frames pwm: Fix double shift bug ASoC: ti: omap-mcbsp: Fix runtime PM underflow warnings kgdb: Flush console before entering kgdb on panic drm/amd/display: Avoid NULL dereference of timing generator media: cobalt: Use FIELD_GET() to extract Link Width gfs2: ignore negated quota changes media: vivid: avoid integer overflow media: gspca: cpia1: shift-out-of-bounds in set_flicker i2c: sun6i-p2wi: Prevent potential division by zero usb: gadget: f_ncm: Always set current gadget in ncm_bind() tty: vcc: Add check for kstrdup() in vcc_probe() HID: Add quirk for Dell Pro Wireless Keyboard and Mouse KM5221W scsi: libfc: Fix potential NULL pointer dereference in fc_lport_ptp_setup() atm: iphase: Do PCI error checks on own line PCI: tegra194: Use FIELD_GET()/FIELD_PREP() with Link Width fields ALSA: hda: Fix possible null-ptr-deref when assigning a stream ARM: 9320/1: fix stack depot IRQ stack filter jfs: fix array-index-out-of-bounds in diAlloc jfs: fix array-index-out-of-bounds in dbFindLeaf fs/jfs: Add validity check for db_maxag and db_agpref fs/jfs: Add check for negative db_l2nbperpage RDMA/hfi1: Use FIELD_GET() to extract Link Width crypto: pcrypt - Fix hungtask for PADATA_RESET selftests/efivarfs: create-read: fix a resource leak drm/amdgpu: Fix a null pointer access when the smc_rreg pointer is NULL drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and Tonga drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7 drm/komeda: drop all currently held locks if deadlock happens platform/x86: thinkpad_acpi: Add battery quirk for Thinkpad X120e Bluetooth: Fix double free in hci_conn_cleanup wifi: ath10k: Don't touch the CE interrupt registers after power up net: annotate data-races around sk->sk_dst_pending_confirm net: annotate data-races around sk->sk_tx_queue_mapping wifi: ath10k: fix clang-specific fortify warning wifi: ath9k: fix clang-specific fortify warnings wifi: mac80211: don't return unset power in ieee80211_get_tx_power() wifi: mac80211_hwsim: fix clang-specific fortify warning x86/mm: Drop the 4 MB restriction on minimal NUMA node memory size clocksource/drivers/timer-atmel-tcb: Fix initialization on SAM9 hardware clocksource/drivers/timer-imx-gpt: Fix potential memory leak perf/core: Bail out early if the request AUX area is out of bound locking/ww_mutex/test: Fix potential workqueue corruption Revert "inet: shrink struct flowi_common" Revert "ipvlan: properly track tx_errors" ANDROID: fix up rpmsg_device ABI break ANDROID: fix up platform_device ABI break Linux 5.4.261 btrfs: use u64 for buffer sizes in the tree search ioctls Revert "mmc: core: Capture correct oemid-bits for eMMC cards" fbdev: fsl-diu-fb: mark wr_reg_wa() static fbdev: imsttfb: fix a resource leak in probe fbdev: imsttfb: Fix error path of imsttfb_probe() spi: spi-zynq-qspi: add spi-mem to driver kconfig dependencies drm/syncobj: fix DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE netfilter: nat: fix ipv6 nat redirect with mapped and scoped addresses netfilter: nft_redir: use `struct nf_nat_range2` throughout and deduplicate eval call-backs netfilter: xt_recent: fix (increase) ipv6 literal buffer length r8169: respect userspace disabling IFF_MULTICAST tg3: power down device only on SYSTEM_POWER_OFF net/smc: fix dangling sock under state SMC_APPFINCLOSEWAIT net: stmmac: xgmac: Enable support for multiple Flexible PPS outputs Fix termination state for idr_for_each_entry_ul() net: r8169: Disable multicast filter for RTL8168H and RTL8107E dccp/tcp: Call security_inet_conn_request() after setting IPv6 addresses. dccp: Call security_inet_conn_request() after setting IPv4 addresses. inet: shrink struct flowi_common tipc: Change nla_policy for bearer-related names to NLA_NUL_STRING llc: verify mac len before reading mac header Input: synaptics-rmi4 - fix use after free in rmi_unregister_function() pwm: brcmstb: Utilize appropriate clock APIs in suspend/resume pwm: sti: Reduce number of allocations and drop usage of chip_data pwm: sti: Avoid conditional gotos regmap: prevent noinc writes from clobbering cache media: dvb-usb-v2: af9035: fix missing unlock media: s3c-camif: Avoid inappropriate kfree() media: bttv: fix use after free error due to btv->timeout timer pcmcia: ds: fix possible name leak in error path in pcmcia_device_add() pcmcia: ds: fix refcount leak in pcmcia_device_add() pcmcia: cs: fix possible hung task and memory leak pccardd() rtc: pcf85363: fix wrong mask/val parameters in regmap_update_bits call i3c: Fix potential refcount leak in i3c_master_register_new_i3c_devs powerpc/pseries: fix potential memory leak in init_cpu_associativity() powerpc/imc-pmu: Use the correct spinlock initializer. powerpc/xive: Fix endian conversion size modpost: fix tee MODULE_DEVICE_TABLE built on big-endian host f2fs: fix to initialize map.m_pblk in f2fs_precache_extents() dmaengine: pxa_dma: Remove an erroneous BUG_ON() in pxad_free_desc() USB: usbip: fix stub_dev hub disconnect tools: iio: iio_generic_buffer ensure alignment tools: iio: iio_generic_buffer: Fix some integer type and calculation tools: iio: privatize globals and functions in iio_generic_buffer.c file misc: st_core: Do not call kfree_skb() under spin_lock_irqsave() dmaengine: ti: edma: handle irq_of_parse_and_map() errors usb: dwc2: fix possible NULL pointer dereference caused by driver concurrency tty: tty_jobctrl: fix pid memleak in disassociate_ctty() leds: trigger: ledtrig-cpu:: Fix 'output may be truncated' issue for 'cpu' ledtrig-cpu: Limit to 8 CPUs leds: pwm: Don't disable the PWM when the LED should be off leds: pwm: convert to atomic PWM API leds: pwm: simplify if condition mfd: dln2: Fix double put in dln2_probe ASoC: ams-delta.c: use component after check ASoC: Intel: Skylake: Fix mem leak when parsing UUIDs fails sh: bios: Revive earlyprintk support RDMA/hfi1: Workaround truncation compilation error scsi: ufs: core: Leave space for '\0' in utf8 desc string ext4: move 'ix' sanity check to corrent position ARM: 9321/1: memset: cast the constant byte to unsigned char hid: cp2112: Fix duplicate workqueue initialization HID: cp2112: Use irqchip template crypto: caam/jr - fix Chacha20 + Poly1305 self test failure crypto: caam/qi2 - fix Chacha20 + Poly1305 self test failure nd_btt: Make BTT lanes preemptible sched/rt: Provide migrate_disable/enable() inlines libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value hwrng: geode - fix accessing registers clk: scmi: Free scmi_clk allocated when the clocks with invalid info are skipped firmware: ti_sci: Mark driver as non removable firmware: ti_sci: Replace HTTP links with HTTPS ones soc: qcom: llcc: Handle a second device without data corruption soc: qcom: Rename llcc-slice to llcc-qcom soc: qcom: llcc cleanup to get rid of sdm845 specific driver file ARM: dts: qcom: mdm9615: populate vsdcc fixed regulator arm64: dts: qcom: sdm845-mtp: fix WiFi configuration drm/rockchip: cdn-dp: Fix some error handling paths in cdn_dp_probe() drm/radeon: possible buffer overflow drm/rockchip: vop: Fix call to crtc reset helper drm/rockchip: vop: Fix reset of state in duplicate state crtc funcs hwmon: (coretemp) Fix potentially truncated sysfs attribute name platform/x86: wmi: Fix opening of char device platform/x86: wmi: remove unnecessary initializations platform/x86: wmi: Fix probe failure when failing to register WMI devices clk: mediatek: clk-mt2701: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt7629: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt7629-eth: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt6797: Add check for mtk_alloc_clk_data clk: mediatek: clk-mt6779: Add check for mtk_alloc_clk_data clk: npcm7xx: Fix incorrect kfree clk: keystone: pll: fix a couple NULL vs IS_ERR() checks clk: imx: Select MXC_CLK for CLK_IMX8QXP clk: qcom: gcc-sm8150: Fix gcc_sdcc2_apps_clk_src clk: qcom: gcc-sm8150: use ARRAY_SIZE instead of specifying num_parents clk: qcom: clk-rcg2: Fix clock rate overflow for high parent frequencies regmap: debugfs: Fix a erroneous check after snprintf() ipvlan: properly track tx_errors net: add DEV_STATS_READ() helper ipv6: avoid atomic fragment on GSO packets ACPI: sysfs: Fix create_pnp_modalias() and create_of_modalias() tcp: fix cookie_init_timestamp() overflows tcp: Remove one extra ktime_get_ns() from cookie_init_timestamp chtls: fix tp->rcv_tstamp initialization r8169: fix rare issue with broken rx after link-down on RTL8125 r8169: use tp_to_dev instead of open code thermal: core: prevent potential string overflow can: dev: can_restart(): fix race condition between controller restart and netif_carrier_on() can: dev: can_restart(): don't crash kernel if carrier is OK wifi: rtlwifi: fix EDCA limit set by BT coexistence tcp_metrics: do not create an entry from tcp_init_metrics() tcp_metrics: properly set tp->snd_ssthresh in tcp_init_metrics() tcp_metrics: add missing barriers on delete wifi: mt76: mt7603: rework/fix rx pse hang check wifi: rtw88: debug: Fix the NULL vs IS_ERR() bug for debugfs_create_file() tcp: call tcp_try_undo_recovery when an RTOd TFO SYNACK is ACKed i40e: fix potential memory leaks in i40e_remove() genirq/matrix: Exclude managed interrupts in irq_matrix_allocated() vfs: fix readahead(2) on block devices Linux 5.4.260 tty: 8250: Add support for Intashield IS-100 tty: 8250: Add support for Brainboxes UP cards tty: 8250: Add support for additional Brainboxes UC cards tty: 8250: Remove UC-257 and UC-431 usb: storage: set 1.50 as the lower bcdDevice for older "Super Top" compatibility PCI: Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device Revert "ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver" nvmet-tcp: Fix a possible UAF in queue intialization setup nvmet-tcp: move send/recv error handling in the send/recv methods instead of call-sites remove the sx8 block driver ata: ahci: fix enum constants for gcc-13 net: chelsio: cxgb4: add an error code check in t4_load_phy_fw platform/mellanox: mlxbf-tmfifo: Fix a warning message platform/x86: asus-wmi: Change ASUS_WMI_BRN_DOWN code from 0x20 to 0x2e scsi: mpt3sas: Fix in error path fbdev: uvesafb: Call cn_del_callback() at the end of uvesafb_exit() ASoC: rt5650: fix the wrong result of key button netfilter: nfnetlink_log: silence bogus compiler warning spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0 fbdev: atyfb: only use ioremap_uc() on i386 and ia64 Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport dmaengine: ste_dma40: Fix PM disable depth imbalance in d40_probe irqchip/stm32-exti: add missing DT IRQ flag translation Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table x86: Fix .brk attribute in linker script rpmsg: Fix possible refcount leak in rpmsg_register_device_override() rpmsg: glink: Release driver_override rpmsg: Fix calling device_lock() on non-initialized device rpmsg: Fix kfree() of static memory on setting driver_override rpmsg: Constify local variable in field store macro driver: platform: Add helper for safer setting of driver_override ext4: fix BUG in ext4_mb_new_inode_pa() due to overflow ext4: avoid overlapping preallocations due to overflow ext4: add two helper functions extent_logical_end() and pa_logical_end() x86/mm: Fix RESERVE_BRK() for older binutils x86/mm: Simplify RESERVE_BRK() nfsd: lock_rename() needs both directories to live on the same fs f2fs: fix to do sanity check on inode type during garbage collection smbdirect: missing rc checks while waiting for rdma events kobject: Fix slab-out-of-bounds in fill_kobj_path() arm64: fix a concurrency issue in emulation_proc_handler() drm/dp_mst: Fix NULL deref in get_mst_branch_device_by_guid_helper() x86/i8259: Skip probing when ACPI/MADT advertises PCAT compatibility i40e: Fix wrong check for I40E_TXR_FLAGS_WB_ON_ITR clk: Sanitize possible_parent_show to Handle Return Value of of_clk_get_parent_name perf/core: Fix potential NULL deref nvmem: imx: correct nregs for i.MX6UL nvmem: imx: correct nregs for i.MX6SLL nvmem: imx: correct nregs for i.MX6ULL i2c: aspeed: Fix i2c bus hang in slave read i2c: stm32f7: Fix PEC handling in case of SMBUS transfers i2c: muxes: i2c-demux-pinctrl: Use of_get_i2c_adapter_by_node() i2c: muxes: i2c-mux-gpmux: Use of_get_i2c_adapter_by_node() i2c: muxes: i2c-mux-pinctrl: Use of_get_i2c_adapter_by_node() iio: exynos-adc: request second interupt only when touchscreen mode is used gtp: fix fragmentation needed check with gso gtp: uapi: fix GTPA_MAX tcp: fix wrong RTO timeout when received SACK reneging r8152: Cancel hw_phy_work if we have an error in probe r8152: Run the unload routine if we have errors during probe r8152: Increase USB control msg timeout to 5000ms as per spec net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show() igc: Fix ambiguity in the ethtool advertising neighbour: fix various data-races igb: Fix potential memory leak in igb_add_ethtool_nfc_entry treewide: Spelling fix in comment r8169: fix the KCSAN reported data race in rtl_rx while reading desc->opts1 r8169: fix the KCSAN reported data-race in rtl_tx while reading TxDescArray[entry].opts1 virtio-mmio: fix memory leak of vm_dev virtio_balloon: Fix endless deflation and inflation on arm64 mcb-lpc: Reallocate memory region to avoid memory overlapping mcb: Return actual parsed size when reading chameleon table selftests/ftrace: Add new test case which checks non unique symbol mtd: rawnand: marvell: Ensure program page operations are successful Conflicts: drivers/clk/qcom/gcc-sm8150.c drivers/net/ethernet/stmicro/stmmac/stmmac_main.c drivers/soc/qcom/Kconfig drivers/soc/qcom/Makefile drivers/soc/qcom/llcc-qcom.c drivers/usb/dwc3/core.c drivers/usb/gadget/function/f_ncm.c include/linux/soc/qcom/llcc-qcom.h include/net/netfilter/nf_tables.h mm/memory-failure.c net/netfilter/nf_tables_api.c net/netfilter/nft_set_hash.c net/netfilter/nft_set_rbtree.c Notes: * Dropped the following upstream commits:813fddd
| AOSP soc: qcom: Rename llcc-slice to llcc-qcom0770107
| AOSP soc: qcom: llcc cleanup to get rid of sdm845 specific driver file Change-Id: Id31af0559be59eccc0cd242940754292baed09f7
1364 lines
35 KiB
C
1364 lines
35 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* drivers/net/phy/micrel.c
|
|
*
|
|
* Driver for Micrel PHYs
|
|
*
|
|
* Author: David J. Choi
|
|
*
|
|
* Copyright (c) 2010-2013 Micrel, Inc.
|
|
* Copyright (c) 2014 Johan Hovold <johan@kernel.org>
|
|
*
|
|
* Support : Micrel Phys:
|
|
* Giga phys: ksz9021, ksz9031, ksz9131
|
|
* 100/10 Phys : ksz8001, ksz8721, ksz8737, ksz8041
|
|
* ksz8021, ksz8031, ksz8051,
|
|
* ksz8081, ksz8091,
|
|
* ksz8061,
|
|
* Switch : ksz8873, ksz886x
|
|
* ksz9477
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/phy.h>
|
|
#include <linux/micrel_phy.h>
|
|
#include <linux/of.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
|
|
/* Operation Mode Strap Override */
|
|
#define MII_KSZPHY_OMSO 0x16
|
|
#define KSZPHY_OMSO_FACTORY_TEST BIT(15)
|
|
#define KSZPHY_OMSO_B_CAST_OFF BIT(9)
|
|
#define KSZPHY_OMSO_NAND_TREE_ON BIT(5)
|
|
#define KSZPHY_OMSO_RMII_OVERRIDE BIT(1)
|
|
#define KSZPHY_OMSO_MII_OVERRIDE BIT(0)
|
|
|
|
/* general Interrupt control/status reg in vendor specific block. */
|
|
#define MII_KSZPHY_INTCS 0x1B
|
|
#define KSZPHY_INTCS_JABBER BIT(15)
|
|
#define KSZPHY_INTCS_RECEIVE_ERR BIT(14)
|
|
#define KSZPHY_INTCS_PAGE_RECEIVE BIT(13)
|
|
#define KSZPHY_INTCS_PARELLEL BIT(12)
|
|
#define KSZPHY_INTCS_LINK_PARTNER_ACK BIT(11)
|
|
#define KSZPHY_INTCS_LINK_DOWN BIT(10)
|
|
#define KSZPHY_INTCS_REMOTE_FAULT BIT(9)
|
|
#define KSZPHY_INTCS_LINK_UP BIT(8)
|
|
#define KSZPHY_INTCS_ALL (KSZPHY_INTCS_LINK_UP |\
|
|
KSZPHY_INTCS_LINK_DOWN)
|
|
|
|
/* PHY Control 1 */
|
|
#define MII_KSZPHY_CTRL_1 0x1e
|
|
|
|
/* PHY Control 2 / PHY Control (if no PHY Control 1) */
|
|
#define MII_KSZPHY_CTRL_2 0x1f
|
|
#define MII_KSZPHY_CTRL MII_KSZPHY_CTRL_2
|
|
/* bitmap of PHY register to set interrupt mode */
|
|
#define KSZPHY_CTRL_INT_ACTIVE_HIGH BIT(9)
|
|
#define KSZPHY_RMII_REF_CLK_SEL BIT(7)
|
|
|
|
/* Write/read to/from extended registers */
|
|
#define MII_KSZPHY_EXTREG 0x0b
|
|
#define KSZPHY_EXTREG_WRITE 0x8000
|
|
|
|
#define MII_KSZPHY_EXTREG_WRITE 0x0c
|
|
#define MII_KSZPHY_EXTREG_READ 0x0d
|
|
|
|
/* Extended registers */
|
|
#define MII_KSZPHY_CLK_CONTROL_PAD_SKEW 0x104
|
|
#define MII_KSZPHY_RX_DATA_PAD_SKEW 0x105
|
|
#define MII_KSZPHY_TX_DATA_PAD_SKEW 0x106
|
|
|
|
#define PS_TO_REG 200
|
|
|
|
/*Register 2.10. 15:14 PME Output Select*/
|
|
#define MII_KSZPHY_OMSO_PME_N2 BIT(10)
|
|
/*Register 2.10. BITS 6, 1 and 0 to detect the type of WOL */
|
|
#define MII_KSZPHY_WOL_MAGIC_PKT BIT(6)
|
|
#define MII_KSZPHY_WOL_LINK_DOWN BIT(1)
|
|
#define MII_KSZPHY_WOL_LINK_UP BIT(0)
|
|
/* Register 2.10.15:14 PME Output Select */
|
|
#define MII_KSZPHY_WOL_CTRL_PME_N2 BIT(15)
|
|
#define MII_KSZPHY_WOL_CTRL_INT_N BIT(14)
|
|
|
|
/* MMD Address 2h, Register 2h Operation Mode Strap Override*/
|
|
#define MII_KSZPHY_OMSO_REG 0x2
|
|
/* MMD Address 2h, Register 10h Wake-On-LAN Control */
|
|
#define MII_KSZPHY_WOL_CTRL_REG 0x10
|
|
|
|
struct kszphy_hw_stat {
|
|
const char *string;
|
|
u8 reg;
|
|
u8 bits;
|
|
};
|
|
|
|
static struct kszphy_hw_stat kszphy_hw_stats[] = {
|
|
{ "phy_receive_errors", 21, 16},
|
|
{ "phy_idle_errors", 10, 8 },
|
|
};
|
|
|
|
struct kszphy_type {
|
|
u32 led_mode_reg;
|
|
u16 interrupt_level_mask;
|
|
bool has_broadcast_disable;
|
|
bool has_nand_tree_disable;
|
|
bool has_rmii_ref_clk_sel;
|
|
};
|
|
|
|
struct kszphy_priv {
|
|
const struct kszphy_type *type;
|
|
int led_mode;
|
|
bool rmii_ref_clk_sel;
|
|
bool rmii_ref_clk_sel_val;
|
|
u64 stats[ARRAY_SIZE(kszphy_hw_stats)];
|
|
};
|
|
|
|
static const struct kszphy_type ksz8021_type = {
|
|
.led_mode_reg = MII_KSZPHY_CTRL_2,
|
|
.has_broadcast_disable = true,
|
|
.has_nand_tree_disable = true,
|
|
.has_rmii_ref_clk_sel = true,
|
|
};
|
|
|
|
static const struct kszphy_type ksz8041_type = {
|
|
.led_mode_reg = MII_KSZPHY_CTRL_1,
|
|
};
|
|
|
|
static const struct kszphy_type ksz8051_type = {
|
|
.led_mode_reg = MII_KSZPHY_CTRL_2,
|
|
.has_nand_tree_disable = true,
|
|
};
|
|
|
|
static const struct kszphy_type ksz8081_type = {
|
|
.led_mode_reg = MII_KSZPHY_CTRL_2,
|
|
.has_broadcast_disable = true,
|
|
.has_nand_tree_disable = true,
|
|
.has_rmii_ref_clk_sel = true,
|
|
};
|
|
|
|
static const struct kszphy_type ks8737_type = {
|
|
.interrupt_level_mask = BIT(14),
|
|
};
|
|
|
|
static const struct kszphy_type ksz9021_type = {
|
|
.interrupt_level_mask = BIT(14),
|
|
};
|
|
|
|
static int kszphy_extended_write(struct phy_device *phydev,
|
|
u32 regnum, u16 val)
|
|
{
|
|
phy_write(phydev, MII_KSZPHY_EXTREG, KSZPHY_EXTREG_WRITE | regnum);
|
|
return phy_write(phydev, MII_KSZPHY_EXTREG_WRITE, val);
|
|
}
|
|
|
|
static int kszphy_extended_read(struct phy_device *phydev,
|
|
u32 regnum)
|
|
{
|
|
phy_write(phydev, MII_KSZPHY_EXTREG, regnum);
|
|
return phy_read(phydev, MII_KSZPHY_EXTREG_READ);
|
|
}
|
|
|
|
static int kszphy_ack_interrupt(struct phy_device *phydev)
|
|
{
|
|
/* bit[7..0] int status, which is a read and clear register. */
|
|
int rc;
|
|
|
|
rc = phy_read(phydev, MII_KSZPHY_INTCS);
|
|
|
|
return (rc < 0) ? rc : 0;
|
|
}
|
|
|
|
static int kszphy_config_intr(struct phy_device *phydev)
|
|
{
|
|
const struct kszphy_type *type = phydev->drv->driver_data;
|
|
int temp;
|
|
u16 mask;
|
|
|
|
if (type && type->interrupt_level_mask)
|
|
mask = type->interrupt_level_mask;
|
|
else
|
|
mask = KSZPHY_CTRL_INT_ACTIVE_HIGH;
|
|
|
|
/* set the interrupt pin active low */
|
|
temp = phy_read(phydev, MII_KSZPHY_CTRL);
|
|
if (temp < 0)
|
|
return temp;
|
|
temp &= ~mask;
|
|
phy_write(phydev, MII_KSZPHY_CTRL, temp);
|
|
|
|
/* enable / disable interrupts */
|
|
if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
|
|
temp = KSZPHY_INTCS_ALL;
|
|
else
|
|
temp = 0;
|
|
|
|
return phy_write(phydev, MII_KSZPHY_INTCS, temp);
|
|
}
|
|
|
|
static int kszphy_rmii_clk_sel(struct phy_device *phydev, bool val)
|
|
{
|
|
int ctrl;
|
|
|
|
ctrl = phy_read(phydev, MII_KSZPHY_CTRL);
|
|
if (ctrl < 0)
|
|
return ctrl;
|
|
|
|
if (val)
|
|
ctrl |= KSZPHY_RMII_REF_CLK_SEL;
|
|
else
|
|
ctrl &= ~KSZPHY_RMII_REF_CLK_SEL;
|
|
|
|
return phy_write(phydev, MII_KSZPHY_CTRL, ctrl);
|
|
}
|
|
|
|
static int kszphy_setup_led(struct phy_device *phydev, u32 reg, int val)
|
|
{
|
|
int rc, temp, shift;
|
|
|
|
switch (reg) {
|
|
case MII_KSZPHY_CTRL_1:
|
|
shift = 14;
|
|
break;
|
|
case MII_KSZPHY_CTRL_2:
|
|
shift = 4;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
temp = phy_read(phydev, reg);
|
|
if (temp < 0) {
|
|
rc = temp;
|
|
goto out;
|
|
}
|
|
|
|
temp &= ~(3 << shift);
|
|
temp |= val << shift;
|
|
rc = phy_write(phydev, reg, temp);
|
|
out:
|
|
if (rc < 0)
|
|
phydev_err(phydev, "failed to set led mode\n");
|
|
|
|
return rc;
|
|
}
|
|
|
|
/* Disable PHY address 0 as the broadcast address, so that it can be used as a
|
|
* unique (non-broadcast) address on a shared bus.
|
|
*/
|
|
static int kszphy_broadcast_disable(struct phy_device *phydev)
|
|
{
|
|
int ret;
|
|
|
|
ret = phy_read(phydev, MII_KSZPHY_OMSO);
|
|
if (ret < 0)
|
|
goto out;
|
|
|
|
ret = phy_write(phydev, MII_KSZPHY_OMSO, ret | KSZPHY_OMSO_B_CAST_OFF);
|
|
out:
|
|
if (ret)
|
|
phydev_err(phydev, "failed to disable broadcast address\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int kszphy_nand_tree_disable(struct phy_device *phydev)
|
|
{
|
|
int ret;
|
|
|
|
ret = phy_read(phydev, MII_KSZPHY_OMSO);
|
|
if (ret < 0)
|
|
goto out;
|
|
|
|
if (!(ret & KSZPHY_OMSO_NAND_TREE_ON))
|
|
return 0;
|
|
|
|
ret = phy_write(phydev, MII_KSZPHY_OMSO,
|
|
ret & ~KSZPHY_OMSO_NAND_TREE_ON);
|
|
out:
|
|
if (ret)
|
|
phydev_err(phydev, "failed to disable NAND tree mode\n");
|
|
|
|
return ret;
|
|
}
|
|
|
|
/* Some config bits need to be set again on resume, handle them here. */
|
|
static int kszphy_config_reset(struct phy_device *phydev)
|
|
{
|
|
struct kszphy_priv *priv = phydev->priv;
|
|
int ret;
|
|
|
|
if (priv->rmii_ref_clk_sel) {
|
|
ret = kszphy_rmii_clk_sel(phydev, priv->rmii_ref_clk_sel_val);
|
|
if (ret) {
|
|
phydev_err(phydev,
|
|
"failed to set rmii reference clock\n");
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
if (priv->type && priv->led_mode >= 0)
|
|
kszphy_setup_led(phydev, priv->type->led_mode_reg, priv->led_mode);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int kszphy_config_init(struct phy_device *phydev)
|
|
{
|
|
struct kszphy_priv *priv = phydev->priv;
|
|
const struct kszphy_type *type;
|
|
|
|
if (!priv)
|
|
return 0;
|
|
|
|
type = priv->type;
|
|
|
|
if (type && type->has_broadcast_disable)
|
|
kszphy_broadcast_disable(phydev);
|
|
|
|
if (type && type->has_nand_tree_disable)
|
|
kszphy_nand_tree_disable(phydev);
|
|
|
|
return kszphy_config_reset(phydev);
|
|
}
|
|
|
|
static int ksz8041_config_init(struct phy_device *phydev)
|
|
{
|
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
|
|
|
|
struct device_node *of_node = phydev->mdio.dev.of_node;
|
|
|
|
/* Limit supported and advertised modes in fiber mode */
|
|
if (of_property_read_bool(of_node, "micrel,fiber-mode")) {
|
|
phydev->dev_flags |= MICREL_PHY_FXEN;
|
|
linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, mask);
|
|
linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, mask);
|
|
|
|
linkmode_and(phydev->supported, phydev->supported, mask);
|
|
linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT,
|
|
phydev->supported);
|
|
linkmode_and(phydev->advertising, phydev->advertising, mask);
|
|
linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT,
|
|
phydev->advertising);
|
|
phydev->autoneg = AUTONEG_DISABLE;
|
|
}
|
|
|
|
return kszphy_config_init(phydev);
|
|
}
|
|
|
|
static int ksz8041_config_aneg(struct phy_device *phydev)
|
|
{
|
|
/* Skip auto-negotiation in fiber mode */
|
|
if (phydev->dev_flags & MICREL_PHY_FXEN) {
|
|
phydev->speed = SPEED_100;
|
|
return 0;
|
|
}
|
|
|
|
return genphy_config_aneg(phydev);
|
|
}
|
|
|
|
static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev,
|
|
const bool ksz_8051)
|
|
{
|
|
int ret;
|
|
|
|
if ((phydev->phy_id & MICREL_PHY_ID_MASK) != PHY_ID_KSZ8051)
|
|
return 0;
|
|
|
|
ret = phy_read(phydev, MII_BMSR);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
/* KSZ8051 PHY and KSZ8794/KSZ8795/KSZ8765 switch share the same
|
|
* exact PHY ID. However, they can be told apart by the extended
|
|
* capability registers presence. The KSZ8051 PHY has them while
|
|
* the switch does not.
|
|
*/
|
|
ret &= BMSR_ERCAP;
|
|
if (ksz_8051)
|
|
return ret;
|
|
else
|
|
return !ret;
|
|
}
|
|
|
|
static int ksz8051_match_phy_device(struct phy_device *phydev)
|
|
{
|
|
return ksz8051_ksz8795_match_phy_device(phydev, true);
|
|
}
|
|
|
|
static int ksz8081_config_init(struct phy_device *phydev)
|
|
{
|
|
/* KSZPHY_OMSO_FACTORY_TEST is set at de-assertion of the reset line
|
|
* based on the RXER (KSZ8081RNA/RND) or TXC (KSZ8081MNX/RNB) pin. If a
|
|
* pull-down is missing, the factory test mode should be cleared by
|
|
* manually writing a 0.
|
|
*/
|
|
phy_clear_bits(phydev, MII_KSZPHY_OMSO, KSZPHY_OMSO_FACTORY_TEST);
|
|
|
|
return kszphy_config_init(phydev);
|
|
}
|
|
|
|
static int ksz8061_config_init(struct phy_device *phydev)
|
|
{
|
|
int ret;
|
|
|
|
ret = phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_DEVID1, 0xB61A);
|
|
if (ret)
|
|
return ret;
|
|
|
|
return kszphy_config_init(phydev);
|
|
}
|
|
|
|
static int ksz8795_match_phy_device(struct phy_device *phydev)
|
|
{
|
|
return ksz8051_ksz8795_match_phy_device(phydev, false);
|
|
}
|
|
|
|
static int ksz9021_load_values_from_of(struct phy_device *phydev,
|
|
const struct device_node *of_node,
|
|
u16 reg,
|
|
const char *field1, const char *field2,
|
|
const char *field3, const char *field4)
|
|
{
|
|
int val1 = -1;
|
|
int val2 = -2;
|
|
int val3 = -3;
|
|
int val4 = -4;
|
|
int newval;
|
|
int matches = 0;
|
|
|
|
if (!of_property_read_u32(of_node, field1, &val1))
|
|
matches++;
|
|
|
|
if (!of_property_read_u32(of_node, field2, &val2))
|
|
matches++;
|
|
|
|
if (!of_property_read_u32(of_node, field3, &val3))
|
|
matches++;
|
|
|
|
if (!of_property_read_u32(of_node, field4, &val4))
|
|
matches++;
|
|
|
|
if (!matches)
|
|
return 0;
|
|
|
|
if (matches < 4)
|
|
newval = kszphy_extended_read(phydev, reg);
|
|
else
|
|
newval = 0;
|
|
|
|
if (val1 != -1)
|
|
newval = ((newval & 0xfff0) | ((val1 / PS_TO_REG) & 0xf) << 0);
|
|
|
|
if (val2 != -2)
|
|
newval = ((newval & 0xff0f) | ((val2 / PS_TO_REG) & 0xf) << 4);
|
|
|
|
if (val3 != -3)
|
|
newval = ((newval & 0xf0ff) | ((val3 / PS_TO_REG) & 0xf) << 8);
|
|
|
|
if (val4 != -4)
|
|
newval = ((newval & 0x0fff) | ((val4 / PS_TO_REG) & 0xf) << 12);
|
|
|
|
return kszphy_extended_write(phydev, reg, newval);
|
|
}
|
|
|
|
static int ksz9021_config_init(struct phy_device *phydev)
|
|
{
|
|
const struct device *dev = &phydev->mdio.dev;
|
|
const struct device_node *of_node = dev->of_node;
|
|
const struct device *dev_walker;
|
|
|
|
/* The Micrel driver has a deprecated option to place phy OF
|
|
* properties in the MAC node. Walk up the tree of devices to
|
|
* find a device with an OF node.
|
|
*/
|
|
dev_walker = &phydev->mdio.dev;
|
|
do {
|
|
of_node = dev_walker->of_node;
|
|
dev_walker = dev_walker->parent;
|
|
|
|
} while (!of_node && dev_walker);
|
|
|
|
if (of_node) {
|
|
ksz9021_load_values_from_of(phydev, of_node,
|
|
MII_KSZPHY_CLK_CONTROL_PAD_SKEW,
|
|
"txen-skew-ps", "txc-skew-ps",
|
|
"rxdv-skew-ps", "rxc-skew-ps");
|
|
ksz9021_load_values_from_of(phydev, of_node,
|
|
MII_KSZPHY_RX_DATA_PAD_SKEW,
|
|
"rxd0-skew-ps", "rxd1-skew-ps",
|
|
"rxd2-skew-ps", "rxd3-skew-ps");
|
|
ksz9021_load_values_from_of(phydev, of_node,
|
|
MII_KSZPHY_TX_DATA_PAD_SKEW,
|
|
"txd0-skew-ps", "txd1-skew-ps",
|
|
"txd2-skew-ps", "txd3-skew-ps");
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#define KSZ9031_PS_TO_REG 60
|
|
|
|
/* Extended registers */
|
|
/* MMD Address 0x0 */
|
|
#define MII_KSZ9031RN_FLP_BURST_TX_LO 3
|
|
#define MII_KSZ9031RN_FLP_BURST_TX_HI 4
|
|
|
|
/* MMD Address 0x2 */
|
|
#define MII_KSZ9031RN_CONTROL_PAD_SKEW 4
|
|
#define MII_KSZ9031RN_RX_DATA_PAD_SKEW 5
|
|
#define MII_KSZ9031RN_TX_DATA_PAD_SKEW 6
|
|
#define MII_KSZ9031RN_CLK_PAD_SKEW 8
|
|
|
|
/* MMD Address 0x1C */
|
|
#define MII_KSZ9031RN_EDPD 0x23
|
|
#define MII_KSZ9031RN_EDPD_ENABLE BIT(0)
|
|
|
|
static int ksz9031_ack_interrupt(struct phy_device *phydev)
|
|
{
|
|
/* bit[7..0] int status, which is a read and clear register. */
|
|
int rc;
|
|
u32 reg_value;
|
|
|
|
rc = phy_read(phydev, MII_KSZPHY_INTCS);
|
|
|
|
reg_value = phy_read_mmd(phydev, 0x2, MII_KSZPHY_OMSO_REG);
|
|
if (reg_value & MII_KSZPHY_OMSO_PME_N2) {
|
|
/* PME output is cleared by disabling the PME trigger src */
|
|
reg_value = phy_read_mmd(phydev, 0x2, MII_KSZPHY_WOL_CTRL_REG);
|
|
reg_value &= ~MII_KSZPHY_WOL_MAGIC_PKT;
|
|
reg_value &= ~MII_KSZPHY_WOL_LINK_UP;
|
|
reg_value &= ~MII_KSZPHY_WOL_LINK_DOWN;
|
|
phy_write_mmd(phydev, 0x2, MII_KSZPHY_WOL_CTRL_REG, reg_value);
|
|
reg_value = phy_read_mmd(phydev, 0x2, MII_KSZPHY_WOL_CTRL_REG);
|
|
reg_value |= MII_KSZPHY_WOL_MAGIC_PKT;
|
|
reg_value |= MII_KSZPHY_WOL_LINK_UP;
|
|
reg_value |= MII_KSZPHY_WOL_LINK_DOWN;
|
|
phy_write_mmd(phydev, 0x2, MII_KSZPHY_WOL_CTRL_REG, reg_value);
|
|
}
|
|
|
|
return (rc < 0) ? rc : 0;
|
|
}
|
|
|
|
static int ksz9031_of_load_skew_values(struct phy_device *phydev,
|
|
const struct device_node *of_node,
|
|
u16 reg, size_t field_sz,
|
|
const char *field[], u8 numfields)
|
|
{
|
|
int val[4] = {-1, -2, -3, -4};
|
|
int matches = 0;
|
|
u16 mask;
|
|
u16 maxval;
|
|
u16 newval;
|
|
int i;
|
|
|
|
for (i = 0; i < numfields; i++)
|
|
if (!of_property_read_u32(of_node, field[i], val + i))
|
|
matches++;
|
|
|
|
if (!matches)
|
|
return 0;
|
|
|
|
if (matches < numfields)
|
|
newval = phy_read_mmd(phydev, 2, reg);
|
|
else
|
|
newval = 0;
|
|
|
|
maxval = (field_sz == 4) ? 0xf : 0x1f;
|
|
for (i = 0; i < numfields; i++)
|
|
if (val[i] != -(i + 1)) {
|
|
mask = 0xffff;
|
|
mask ^= maxval << (field_sz * i);
|
|
newval = (newval & mask) |
|
|
(((val[i] / KSZ9031_PS_TO_REG) & maxval)
|
|
<< (field_sz * i));
|
|
}
|
|
|
|
return phy_write_mmd(phydev, 2, reg, newval);
|
|
}
|
|
|
|
/* Center KSZ9031RNX FLP timing at 16ms. */
|
|
static int ksz9031_center_flp_timing(struct phy_device *phydev)
|
|
{
|
|
int result;
|
|
|
|
result = phy_write_mmd(phydev, 0, MII_KSZ9031RN_FLP_BURST_TX_HI,
|
|
0x0006);
|
|
if (result)
|
|
return result;
|
|
|
|
result = phy_write_mmd(phydev, 0, MII_KSZ9031RN_FLP_BURST_TX_LO,
|
|
0x1A80);
|
|
if (result)
|
|
return result;
|
|
|
|
return genphy_restart_aneg(phydev);
|
|
}
|
|
|
|
/* Enable energy-detect power-down mode */
|
|
static int ksz9031_enable_edpd(struct phy_device *phydev)
|
|
{
|
|
int reg;
|
|
|
|
reg = phy_read_mmd(phydev, 0x1C, MII_KSZ9031RN_EDPD);
|
|
if (reg < 0)
|
|
return reg;
|
|
return phy_write_mmd(phydev, 0x1C, MII_KSZ9031RN_EDPD,
|
|
reg | MII_KSZ9031RN_EDPD_ENABLE);
|
|
}
|
|
|
|
static int ksz9031_config_init(struct phy_device *phydev)
|
|
{
|
|
const struct device *dev = &phydev->mdio.dev;
|
|
const struct device_node *of_node = dev->of_node;
|
|
static const char *clk_skews[2] = {"rxc-skew-ps", "txc-skew-ps"};
|
|
static const char *rx_data_skews[4] = {
|
|
"rxd0-skew-ps", "rxd1-skew-ps",
|
|
"rxd2-skew-ps", "rxd3-skew-ps"
|
|
};
|
|
static const char *tx_data_skews[4] = {
|
|
"txd0-skew-ps", "txd1-skew-ps",
|
|
"txd2-skew-ps", "txd3-skew-ps"
|
|
};
|
|
static const char *control_skews[2] = {"txen-skew-ps", "rxdv-skew-ps"};
|
|
const struct device *dev_walker;
|
|
int result;
|
|
|
|
result = ksz9031_enable_edpd(phydev);
|
|
if (result < 0)
|
|
return result;
|
|
|
|
/* The Micrel driver has a deprecated option to place phy OF
|
|
* properties in the MAC node. Walk up the tree of devices to
|
|
* find a device with an OF node.
|
|
*/
|
|
dev_walker = &phydev->mdio.dev;
|
|
do {
|
|
of_node = dev_walker->of_node;
|
|
dev_walker = dev_walker->parent;
|
|
} while (!of_node && dev_walker);
|
|
|
|
if (of_node) {
|
|
ksz9031_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_CLK_PAD_SKEW, 5,
|
|
clk_skews, 2);
|
|
|
|
ksz9031_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_CONTROL_PAD_SKEW, 4,
|
|
control_skews, 2);
|
|
|
|
ksz9031_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_RX_DATA_PAD_SKEW, 4,
|
|
rx_data_skews, 4);
|
|
|
|
ksz9031_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_TX_DATA_PAD_SKEW, 4,
|
|
tx_data_skews, 4);
|
|
|
|
/* Silicon Errata Sheet (DS80000691D or DS80000692D):
|
|
* When the device links in the 1000BASE-T slave mode only,
|
|
* the optional 125MHz reference output clock (CLK125_NDO)
|
|
* has wide duty cycle variation.
|
|
*
|
|
* The optional CLK125_NDO clock does not meet the RGMII
|
|
* 45/55 percent (min/max) duty cycle requirement and therefore
|
|
* cannot be used directly by the MAC side for clocking
|
|
* applications that have setup/hold time requirements on
|
|
* rising and falling clock edges.
|
|
*
|
|
* Workaround:
|
|
* Force the phy to be the master to receive a stable clock
|
|
* which meets the duty cycle requirement.
|
|
*/
|
|
if (of_property_read_bool(of_node, "micrel,force-master")) {
|
|
result = phy_read(phydev, MII_CTRL1000);
|
|
if (result < 0)
|
|
goto err_force_master;
|
|
|
|
/* enable master mode, config & prefer master */
|
|
result |= CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER;
|
|
result = phy_write(phydev, MII_CTRL1000, result);
|
|
if (result < 0)
|
|
goto err_force_master;
|
|
}
|
|
}
|
|
|
|
return ksz9031_center_flp_timing(phydev);
|
|
|
|
err_force_master:
|
|
phydev_err(phydev, "failed to force the phy to master mode\n");
|
|
return result;
|
|
}
|
|
|
|
#define KSZ9131_SKEW_5BIT_MAX 2400
|
|
#define KSZ9131_SKEW_4BIT_MAX 800
|
|
#define KSZ9131_OFFSET 700
|
|
#define KSZ9131_STEP 100
|
|
|
|
static int ksz9131_of_load_skew_values(struct phy_device *phydev,
|
|
struct device_node *of_node,
|
|
u16 reg, size_t field_sz,
|
|
char *field[], u8 numfields)
|
|
{
|
|
int val[4] = {-(1 + KSZ9131_OFFSET), -(2 + KSZ9131_OFFSET),
|
|
-(3 + KSZ9131_OFFSET), -(4 + KSZ9131_OFFSET)};
|
|
int skewval, skewmax = 0;
|
|
int matches = 0;
|
|
u16 maxval;
|
|
u16 newval;
|
|
u16 mask;
|
|
int i;
|
|
|
|
/* psec properties in dts should mean x pico seconds */
|
|
if (field_sz == 5)
|
|
skewmax = KSZ9131_SKEW_5BIT_MAX;
|
|
else
|
|
skewmax = KSZ9131_SKEW_4BIT_MAX;
|
|
|
|
for (i = 0; i < numfields; i++)
|
|
if (!of_property_read_s32(of_node, field[i], &skewval)) {
|
|
if (skewval < -KSZ9131_OFFSET)
|
|
skewval = -KSZ9131_OFFSET;
|
|
else if (skewval > skewmax)
|
|
skewval = skewmax;
|
|
|
|
val[i] = skewval + KSZ9131_OFFSET;
|
|
matches++;
|
|
}
|
|
|
|
if (!matches)
|
|
return 0;
|
|
|
|
if (matches < numfields)
|
|
newval = phy_read_mmd(phydev, 2, reg);
|
|
else
|
|
newval = 0;
|
|
|
|
maxval = (field_sz == 4) ? 0xf : 0x1f;
|
|
for (i = 0; i < numfields; i++)
|
|
if (val[i] != -(i + 1 + KSZ9131_OFFSET)) {
|
|
mask = 0xffff;
|
|
mask ^= maxval << (field_sz * i);
|
|
newval = (newval & mask) |
|
|
(((val[i] / KSZ9131_STEP) & maxval)
|
|
<< (field_sz * i));
|
|
}
|
|
|
|
return phy_write_mmd(phydev, 2, reg, newval);
|
|
}
|
|
|
|
static int ksz9131_config_init(struct phy_device *phydev)
|
|
{
|
|
const struct device *dev = &phydev->mdio.dev;
|
|
struct device_node *of_node = dev->of_node;
|
|
char *clk_skews[2] = {"rxc-skew-psec", "txc-skew-psec"};
|
|
char *rx_data_skews[4] = {
|
|
"rxd0-skew-psec", "rxd1-skew-psec",
|
|
"rxd2-skew-psec", "rxd3-skew-psec"
|
|
};
|
|
char *tx_data_skews[4] = {
|
|
"txd0-skew-psec", "txd1-skew-psec",
|
|
"txd2-skew-psec", "txd3-skew-psec"
|
|
};
|
|
char *control_skews[2] = {"txen-skew-psec", "rxdv-skew-psec"};
|
|
const struct device *dev_walker;
|
|
int ret;
|
|
|
|
dev_walker = &phydev->mdio.dev;
|
|
do {
|
|
of_node = dev_walker->of_node;
|
|
dev_walker = dev_walker->parent;
|
|
} while (!of_node && dev_walker);
|
|
|
|
if (!of_node)
|
|
return 0;
|
|
|
|
ret = ksz9131_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_CLK_PAD_SKEW, 5,
|
|
clk_skews, 2);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = ksz9131_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_CONTROL_PAD_SKEW, 4,
|
|
control_skews, 2);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = ksz9131_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_RX_DATA_PAD_SKEW, 4,
|
|
rx_data_skews, 4);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = ksz9131_of_load_skew_values(phydev, of_node,
|
|
MII_KSZ9031RN_TX_DATA_PAD_SKEW, 4,
|
|
tx_data_skews, 4);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define KSZ8873MLL_GLOBAL_CONTROL_4 0x06
|
|
#define KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX BIT(6)
|
|
#define KSZ8873MLL_GLOBAL_CONTROL_4_SPEED BIT(4)
|
|
static int ksz8873mll_read_status(struct phy_device *phydev)
|
|
{
|
|
int regval;
|
|
|
|
/* dummy read */
|
|
regval = phy_read(phydev, KSZ8873MLL_GLOBAL_CONTROL_4);
|
|
|
|
regval = phy_read(phydev, KSZ8873MLL_GLOBAL_CONTROL_4);
|
|
|
|
if (regval & KSZ8873MLL_GLOBAL_CONTROL_4_DUPLEX)
|
|
phydev->duplex = DUPLEX_HALF;
|
|
else
|
|
phydev->duplex = DUPLEX_FULL;
|
|
|
|
if (regval & KSZ8873MLL_GLOBAL_CONTROL_4_SPEED)
|
|
phydev->speed = SPEED_10;
|
|
else
|
|
phydev->speed = SPEED_100;
|
|
|
|
phydev->link = 1;
|
|
phydev->pause = phydev->asym_pause = 0;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ksz9031_get_features(struct phy_device *phydev)
|
|
{
|
|
int ret;
|
|
|
|
ret = genphy_read_abilities(phydev);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
/* Silicon Errata Sheet (DS80000691D or DS80000692D):
|
|
* Whenever the device's Asymmetric Pause capability is set to 1,
|
|
* link-up may fail after a link-up to link-down transition.
|
|
*
|
|
* The Errata Sheet is for ksz9031, but ksz9021 has the same issue
|
|
*
|
|
* Workaround:
|
|
* Do not enable the Asymmetric Pause capability bit.
|
|
*/
|
|
linkmode_clear_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->supported);
|
|
|
|
/* We force setting the Pause capability as the core will force the
|
|
* Asymmetric Pause capability to 1 otherwise.
|
|
*/
|
|
linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ksz9031_read_status(struct phy_device *phydev)
|
|
{
|
|
int err;
|
|
int regval;
|
|
|
|
err = genphy_read_status(phydev);
|
|
if (err)
|
|
return err;
|
|
|
|
/* Make sure the PHY is not broken. Read idle error count,
|
|
* and reset the PHY if it is maxed out.
|
|
*/
|
|
regval = phy_read(phydev, MII_STAT1000);
|
|
if ((regval & 0xFF) == 0xFF) {
|
|
phy_init_hw(phydev);
|
|
phydev->link = 0;
|
|
if (phydev->drv->config_intr && phy_interrupt_is_valid(phydev))
|
|
phydev->drv->config_intr(phydev);
|
|
return genphy_config_aneg(phydev);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ksz8873mll_config_aneg(struct phy_device *phydev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static int kszphy_get_sset_count(struct phy_device *phydev)
|
|
{
|
|
return ARRAY_SIZE(kszphy_hw_stats);
|
|
}
|
|
|
|
static void kszphy_get_strings(struct phy_device *phydev, u8 *data)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++) {
|
|
strlcpy(data + i * ETH_GSTRING_LEN,
|
|
kszphy_hw_stats[i].string, ETH_GSTRING_LEN);
|
|
}
|
|
}
|
|
|
|
static u64 kszphy_get_stat(struct phy_device *phydev, int i)
|
|
{
|
|
struct kszphy_hw_stat stat = kszphy_hw_stats[i];
|
|
struct kszphy_priv *priv = phydev->priv;
|
|
int val;
|
|
u64 ret;
|
|
|
|
val = phy_read(phydev, stat.reg);
|
|
if (val < 0) {
|
|
ret = U64_MAX;
|
|
} else {
|
|
val = val & ((1 << stat.bits) - 1);
|
|
priv->stats[i] += val;
|
|
ret = priv->stats[i];
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void kszphy_get_stats(struct phy_device *phydev,
|
|
struct ethtool_stats *stats, u64 *data)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(kszphy_hw_stats); i++)
|
|
data[i] = kszphy_get_stat(phydev, i);
|
|
}
|
|
|
|
static int kszphy_suspend(struct phy_device *phydev)
|
|
{
|
|
/* Disable PHY Interrupts */
|
|
if (phy_interrupt_is_valid(phydev)) {
|
|
phydev->interrupts = PHY_INTERRUPT_DISABLED;
|
|
if (phydev->drv->config_intr)
|
|
phydev->drv->config_intr(phydev);
|
|
}
|
|
|
|
return genphy_suspend(phydev);
|
|
}
|
|
|
|
static int kszphy_resume(struct phy_device *phydev)
|
|
{
|
|
int ret;
|
|
|
|
genphy_resume(phydev);
|
|
|
|
/* After switching from power-down to normal mode, an internal global
|
|
* reset is automatically generated. Wait a minimum of 1 ms before
|
|
* read/write access to the PHY registers.
|
|
*/
|
|
usleep_range(1000, 2000);
|
|
|
|
ret = kszphy_config_reset(phydev);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/* Enable PHY Interrupts */
|
|
if (phy_interrupt_is_valid(phydev)) {
|
|
phydev->interrupts = PHY_INTERRUPT_ENABLED;
|
|
if (phydev->drv->config_intr)
|
|
phydev->drv->config_intr(phydev);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int kszphy_probe(struct phy_device *phydev)
|
|
{
|
|
const struct kszphy_type *type = phydev->drv->driver_data;
|
|
const struct device_node *np = phydev->mdio.dev.of_node;
|
|
struct kszphy_priv *priv;
|
|
struct clk *clk;
|
|
int ret;
|
|
|
|
priv = devm_kzalloc(&phydev->mdio.dev, sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
phydev->priv = priv;
|
|
|
|
priv->type = type;
|
|
|
|
if (type && type->led_mode_reg) {
|
|
ret = of_property_read_u32(np, "micrel,led-mode",
|
|
&priv->led_mode);
|
|
if (ret)
|
|
priv->led_mode = -1;
|
|
|
|
if (priv->led_mode > 3) {
|
|
phydev_err(phydev, "invalid led mode: 0x%02x\n",
|
|
priv->led_mode);
|
|
priv->led_mode = -1;
|
|
}
|
|
} else {
|
|
priv->led_mode = -1;
|
|
}
|
|
|
|
clk = devm_clk_get(&phydev->mdio.dev, "rmii-ref");
|
|
/* NOTE: clk may be NULL if building without CONFIG_HAVE_CLK */
|
|
if (!IS_ERR_OR_NULL(clk)) {
|
|
unsigned long rate = clk_get_rate(clk);
|
|
bool rmii_ref_clk_sel_25_mhz;
|
|
|
|
if (type)
|
|
priv->rmii_ref_clk_sel = type->has_rmii_ref_clk_sel;
|
|
rmii_ref_clk_sel_25_mhz = of_property_read_bool(np,
|
|
"micrel,rmii-reference-clock-select-25-mhz");
|
|
|
|
if (rate > 24500000 && rate < 25500000) {
|
|
priv->rmii_ref_clk_sel_val = rmii_ref_clk_sel_25_mhz;
|
|
} else if (rate > 49500000 && rate < 50500000) {
|
|
priv->rmii_ref_clk_sel_val = !rmii_ref_clk_sel_25_mhz;
|
|
} else {
|
|
phydev_err(phydev, "Clock rate out of range: %ld\n",
|
|
rate);
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
/* Support legacy board-file configuration */
|
|
if (phydev->dev_flags & MICREL_PHY_50MHZ_CLK) {
|
|
priv->rmii_ref_clk_sel = true;
|
|
priv->rmii_ref_clk_sel_val = true;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void ksz9031_set_wol_settings(struct phy_device *phydev)
|
|
{
|
|
u32 reg_value;
|
|
|
|
/* Enable both PHY and PME_N2 interrupts */
|
|
reg_value = phy_read_mmd(phydev, 0x2, MII_KSZPHY_WOL_CTRL_REG);
|
|
reg_value |= MII_KSZPHY_WOL_CTRL_PME_N2;
|
|
reg_value &= ~MII_KSZPHY_WOL_CTRL_INT_N;
|
|
reg_value |= MII_KSZPHY_WOL_MAGIC_PKT;
|
|
reg_value |= MII_KSZPHY_WOL_LINK_UP;
|
|
reg_value |= MII_KSZPHY_WOL_LINK_DOWN;
|
|
phy_write_mmd(phydev, 0x2, MII_KSZPHY_WOL_CTRL_REG, reg_value);
|
|
}
|
|
|
|
static int ksz9031_set_wol(struct phy_device *phydev,
|
|
struct ethtool_wolinfo *wol)
|
|
{
|
|
struct net_device *ndev = phydev->attached_dev;
|
|
const u8 *mac;
|
|
int ret = 0;
|
|
u32 reg_value;
|
|
|
|
if (!ndev)
|
|
return -ENODEV;
|
|
|
|
if (wol->wolopts & WAKE_MAGIC) {
|
|
mac = (const u8 *)ndev->dev_addr;
|
|
|
|
if (!is_valid_ether_addr(mac))
|
|
return -EINVAL;
|
|
|
|
phy_write_mmd(phydev, 0x2, 0x11, mac[5] | (mac[4] << 8));
|
|
phy_write_mmd(phydev, 0x2, 0x12, mac[3] | (mac[2] << 8));
|
|
phy_write_mmd(phydev, 0x2, 0x13, mac[1] | (mac[0] << 8));
|
|
|
|
/* Enable WOL interrupt for magic pkt, link up and down */
|
|
ksz9031_set_wol_settings(phydev);
|
|
|
|
/* Enable PME_N2 output */
|
|
reg_value = phy_read_mmd(phydev, 0x2, MII_KSZPHY_OMSO_REG);
|
|
reg_value |= MII_KSZPHY_OMSO_PME_N2;
|
|
phy_write_mmd(phydev, 0x2, MII_KSZPHY_OMSO_REG, reg_value);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static void ksz9031_get_wol(struct phy_device *phydev,
|
|
struct ethtool_wolinfo *wol)
|
|
{
|
|
u32 reg_value;
|
|
|
|
wol->supported = WAKE_MAGIC;
|
|
wol->wolopts = 0;
|
|
|
|
reg_value = phy_read_mmd(phydev, 0x2, MII_KSZPHY_OMSO_REG);
|
|
if (reg_value & MII_KSZPHY_OMSO_PME_N2)
|
|
wol->wolopts |= WAKE_MAGIC;
|
|
}
|
|
|
|
static int ksz9031_suspend(struct phy_device *phydev)
|
|
{
|
|
int value;
|
|
int wol_enabled;
|
|
u32 reg_value;
|
|
|
|
reg_value = phy_read_mmd(phydev, 0x2, MII_KSZPHY_OMSO_REG);
|
|
wol_enabled = reg_value & MII_KSZPHY_OMSO_PME_N2;
|
|
|
|
value = phy_read(phydev, MII_BMCR);
|
|
if (wol_enabled)
|
|
value |= BMCR_ISOLATE;
|
|
else
|
|
value |= BMCR_PDOWN;
|
|
|
|
phy_write(phydev, MII_BMCR, value);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ksz9031_resume(struct phy_device *phydev)
|
|
{
|
|
int value;
|
|
|
|
value = phy_read(phydev, MII_BMCR);
|
|
value &= ~(BMCR_PDOWN | BMCR_ISOLATE);
|
|
phy_write(phydev, MII_BMCR, value);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct phy_driver ksphy_driver[] = {
|
|
{
|
|
.phy_id = PHY_ID_KS8737,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Micrel KS8737",
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ks8737_type,
|
|
.config_init = kszphy_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8021,
|
|
.phy_id_mask = 0x00ffffff,
|
|
.name = "Micrel KSZ8021 or KSZ8031",
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ksz8021_type,
|
|
.probe = kszphy_probe,
|
|
.config_init = kszphy_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8031,
|
|
.phy_id_mask = 0x00ffffff,
|
|
.name = "Micrel KSZ8031",
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ksz8021_type,
|
|
.probe = kszphy_probe,
|
|
.config_init = kszphy_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8041,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Micrel KSZ8041",
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ksz8041_type,
|
|
.probe = kszphy_probe,
|
|
.config_init = ksz8041_config_init,
|
|
.config_aneg = ksz8041_config_aneg,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
/* No suspend/resume callbacks because of errata DS80000700A,
|
|
* receiver error following software power down.
|
|
*/
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8041RNLI,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Micrel KSZ8041RNLI",
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ksz8041_type,
|
|
.probe = kszphy_probe,
|
|
.config_init = kszphy_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.name = "Micrel KSZ8051",
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ksz8051_type,
|
|
.probe = kszphy_probe,
|
|
.config_init = kszphy_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.match_phy_device = ksz8051_match_phy_device,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8001,
|
|
.name = "Micrel KSZ8001 or KS8721",
|
|
.phy_id_mask = 0x00fffffc,
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ksz8041_type,
|
|
.probe = kszphy_probe,
|
|
.config_init = kszphy_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8081,
|
|
.name = "Micrel KSZ8081 or KSZ8091",
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
/* PHY_BASIC_FEATURES */
|
|
.driver_data = &ksz8081_type,
|
|
.probe = kszphy_probe,
|
|
.config_init = ksz8081_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.soft_reset = genphy_soft_reset,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.suspend = kszphy_suspend,
|
|
.resume = kszphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8061,
|
|
.name = "Micrel KSZ8061",
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
/* PHY_BASIC_FEATURES */
|
|
.config_init = ksz8061_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ9021,
|
|
.phy_id_mask = 0x000ffffe,
|
|
.name = "Micrel KSZ9021 Gigabit PHY",
|
|
/* PHY_GBIT_FEATURES */
|
|
.driver_data = &ksz9021_type,
|
|
.probe = kszphy_probe,
|
|
.get_features = ksz9031_get_features,
|
|
.config_init = ksz9021_config_init,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
.read_mmd = genphy_read_mmd_unsupported,
|
|
.write_mmd = genphy_write_mmd_unsupported,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ9031,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Micrel KSZ9031 Gigabit PHY",
|
|
.driver_data = &ksz9021_type,
|
|
.probe = kszphy_probe,
|
|
.get_features = ksz9031_get_features,
|
|
.config_init = ksz9031_config_init,
|
|
.soft_reset = genphy_soft_reset,
|
|
.read_status = ksz9031_read_status,
|
|
.ack_interrupt = ksz9031_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.set_wol = ksz9031_set_wol,
|
|
.get_wol = ksz9031_get_wol,
|
|
.suspend = ksz9031_suspend,
|
|
.resume = ksz9031_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ9131,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Microchip KSZ9131 Gigabit PHY",
|
|
/* PHY_GBIT_FEATURES */
|
|
.driver_data = &ksz9021_type,
|
|
.probe = kszphy_probe,
|
|
.soft_reset = genphy_soft_reset,
|
|
.config_init = ksz9131_config_init,
|
|
.read_status = genphy_read_status,
|
|
.ack_interrupt = kszphy_ack_interrupt,
|
|
.config_intr = kszphy_config_intr,
|
|
.get_sset_count = kszphy_get_sset_count,
|
|
.get_strings = kszphy_get_strings,
|
|
.get_stats = kszphy_get_stats,
|
|
.suspend = genphy_suspend,
|
|
.resume = kszphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ8873MLL,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Micrel KSZ8873MLL Switch",
|
|
/* PHY_BASIC_FEATURES */
|
|
.config_init = kszphy_config_init,
|
|
.config_aneg = ksz8873mll_config_aneg,
|
|
.read_status = ksz8873mll_read_status,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ886X,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Micrel KSZ886X Switch",
|
|
/* PHY_BASIC_FEATURES */
|
|
.config_init = kszphy_config_init,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.name = "Micrel KSZ87XX Switch",
|
|
/* PHY_BASIC_FEATURES */
|
|
.config_init = kszphy_config_init,
|
|
.match_phy_device = ksz8795_match_phy_device,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
}, {
|
|
.phy_id = PHY_ID_KSZ9477,
|
|
.phy_id_mask = MICREL_PHY_ID_MASK,
|
|
.name = "Microchip KSZ9477",
|
|
/* PHY_GBIT_FEATURES */
|
|
.config_init = kszphy_config_init,
|
|
.suspend = genphy_suspend,
|
|
.resume = genphy_resume,
|
|
} };
|
|
|
|
module_phy_driver(ksphy_driver);
|
|
|
|
MODULE_DESCRIPTION("Micrel PHY driver");
|
|
MODULE_AUTHOR("David J. Choi");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
static struct mdio_device_id __maybe_unused micrel_tbl[] = {
|
|
{ PHY_ID_KSZ9021, 0x000ffffe },
|
|
{ PHY_ID_KSZ9031, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ9131, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ8001, 0x00fffffc },
|
|
{ PHY_ID_KS8737, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ8021, 0x00ffffff },
|
|
{ PHY_ID_KSZ8031, 0x00ffffff },
|
|
{ PHY_ID_KSZ8041, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ8051, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ8061, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ8081, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ8873MLL, MICREL_PHY_ID_MASK },
|
|
{ PHY_ID_KSZ886X, MICREL_PHY_ID_MASK },
|
|
{ }
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(mdio, micrel_tbl);
|