- Kernel - mailweb.openeuler.org

[PATCH] net: hns3: add suspend/resume function for hns3 driver
by Jian Shen 21 Apr '20

21 Apr '20

From: Hao Shen <shenhao21(a)huawei.com> The suspend and resume feature is useful when you want to save the current state of your machine, and continue work later from the same state. This patch makes the hns3 net device work form the same state after s3 and s4. Signed-off-by: Weiwei Deng <dengweiwei(a)huawei.com> Signed-off-by: Hao Shen <shenhao21(a)huawei.com> Signed-off-by: Jian Shen <shenjian15(a)huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 32 ++++++++++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 70 ++++++++++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index bb29b46..8b1e690 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -561,6 +561,8 @@ struct hnae3_ae_ops { int (*set_vf_mac)(struct hnae3_handle *handle, int vf, u8 *p); int (*get_module_eeprom)(struct hnae3_handle *handle, u32 offset, u32 len, u8 *data); + int (*suspend)(struct hnae3_ae_dev *ae_dev); + int (*resume)(struct hnae3_ae_dev *ae_dev); }; struct hnae3_dcb_ops { diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 4eca8cf..de3d37c3 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -2226,6 +2226,34 @@ static void hns3_shutdown(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D3hot); } +#ifdef CONFIG_PM +static int hns3_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev); + + if (ae_dev->ops->suspend) + ae_dev->ops->suspend(ae_dev); + + pci_save_state(pdev); + pci_set_power_state(pdev, PCI_D3hot); + + return 0; +} + +static int hns3_resume(struct pci_dev *pdev) +{ + struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev); + + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + + if (ae_dev->ops->resume) + return ae_dev->ops->resume(ae_dev); + + return 0; +} +#endif + static pci_ers_result_t hns3_error_detected(struct pci_dev *pdev, pci_channel_state_t state) { @@ -2310,6 +2338,10 @@ struct pci_driver hns3_driver = { .probe = hns3_probe, .remove = hns3_remove, .shutdown = hns3_shutdown, +#ifdef CONFIG_PM + .suspend = hns3_suspend, + .resume = hns3_resume, +#endif .sriov_configure = hns3_pci_sriov_configure, .err_handler = &hns3_err_handler, }; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index c2ae05f..478a3b5 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3820,6 +3820,72 @@ static void hclge_reset(struct hclge_dev *hdev) hclge_reset_task_schedule(hdev); } +#ifdef CONFIG_PM +static int hclge_suspend(struct hnae3_ae_dev *ae_dev) +{ + struct hclge_dev *hdev = ae_dev->priv; + int ret; + + ret = hclge_notify_roce_client(hdev, HNAE3_DOWN_CLIENT); + if (ret) + return ret; + + rtnl_lock(); + + ret = hclge_notify_client(hdev, HNAE3_DOWN_CLIENT); + if (ret) + goto err_reset_lock; + + ret = hclge_notify_client(hdev, HNAE3_UNINIT_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_unlock(); + + return hclge_notify_roce_client(hdev, HNAE3_UNINIT_CLIENT); + +err_reset_lock: + rtnl_unlock(); + return ret; +} + +static int hclge_resume(struct hnae3_ae_dev *ae_dev) +{ + struct hclge_dev *hdev = ae_dev->priv; + int ret; + + rtnl_lock(); + + ret = hclge_reset_ae_dev(hdev->ae_dev); + if (ret) + goto err_reset_lock; + + ret = hclge_notify_client(hdev, HNAE3_INIT_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_unlock(); + + ret = hclge_notify_roce_client(hdev, HNAE3_INIT_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_lock(); + + ret = hclge_notify_client(hdev, HNAE3_UP_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_unlock(); + + return hclge_notify_roce_client(hdev, HNAE3_UP_CLIENT); + +err_reset_lock: + rtnl_unlock(); + return ret; +} +#endif + static void hclge_reset_event(struct pci_dev *pdev, struct hnae3_handle *handle) { struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev); @@ -11525,6 +11591,10 @@ struct hnae3_ae_ops hclge_ops = { .set_vf_rate = hclge_set_vf_rate, .set_vf_mac = hclge_set_vf_mac, .get_module_eeprom = hclge_get_module_eeprom, +#ifdef CONFIG_PM + .suspend = hclge_suspend, + .resume = hclge_resume, +#endif }; static struct hnae3_ae_algo ae_algo = { -- 1.9.1

1 0

[PATCH hulk-4.19-next] net: hns3: add suspend/resume function for hns3 driver
by Jian Shen 21 Apr '20

21 Apr '20

From: Hao Shen <shenhao21(a)huawei.com> The suspend and resume feature is useful when you want to save the current state of your machine, and continue work later from the same state. This patch makes the hns3 net device work form the same state after s3 and s4. Signed-off-by: Weiwei Deng <dengweiwei(a)huawei.com> Signed-off-by: Hao Shen <shenhao21(a)huawei.com> Signed-off-by: Jian Shen <shenjian15(a)huawei.com> --- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 2 + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 32 ++++++++++ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 70 ++++++++++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h index bb29b46..8b1e690 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h +++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h @@ -561,6 +561,8 @@ struct hnae3_ae_ops { int (*set_vf_mac)(struct hnae3_handle *handle, int vf, u8 *p); int (*get_module_eeprom)(struct hnae3_handle *handle, u32 offset, u32 len, u8 *data); + int (*suspend)(struct hnae3_ae_dev *ae_dev); + int (*resume)(struct hnae3_ae_dev *ae_dev); }; struct hnae3_dcb_ops { diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 4eca8cf..de3d37c3 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -2226,6 +2226,34 @@ static void hns3_shutdown(struct pci_dev *pdev) pci_set_power_state(pdev, PCI_D3hot); } +#ifdef CONFIG_PM +static int hns3_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev); + + if (ae_dev->ops->suspend) + ae_dev->ops->suspend(ae_dev); + + pci_save_state(pdev); + pci_set_power_state(pdev, PCI_D3hot); + + return 0; +} + +static int hns3_resume(struct pci_dev *pdev) +{ + struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev); + + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + + if (ae_dev->ops->resume) + return ae_dev->ops->resume(ae_dev); + + return 0; +} +#endif + static pci_ers_result_t hns3_error_detected(struct pci_dev *pdev, pci_channel_state_t state) { @@ -2310,6 +2338,10 @@ struct pci_driver hns3_driver = { .probe = hns3_probe, .remove = hns3_remove, .shutdown = hns3_shutdown, +#ifdef CONFIG_PM + .suspend = hns3_suspend, + .resume = hns3_resume, +#endif .sriov_configure = hns3_pci_sriov_configure, .err_handler = &hns3_err_handler, }; diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index c2ae05f..478a3b5 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -3820,6 +3820,72 @@ static void hclge_reset(struct hclge_dev *hdev) hclge_reset_task_schedule(hdev); } +#ifdef CONFIG_PM +static int hclge_suspend(struct hnae3_ae_dev *ae_dev) +{ + struct hclge_dev *hdev = ae_dev->priv; + int ret; + + ret = hclge_notify_roce_client(hdev, HNAE3_DOWN_CLIENT); + if (ret) + return ret; + + rtnl_lock(); + + ret = hclge_notify_client(hdev, HNAE3_DOWN_CLIENT); + if (ret) + goto err_reset_lock; + + ret = hclge_notify_client(hdev, HNAE3_UNINIT_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_unlock(); + + return hclge_notify_roce_client(hdev, HNAE3_UNINIT_CLIENT); + +err_reset_lock: + rtnl_unlock(); + return ret; +} + +static int hclge_resume(struct hnae3_ae_dev *ae_dev) +{ + struct hclge_dev *hdev = ae_dev->priv; + int ret; + + rtnl_lock(); + + ret = hclge_reset_ae_dev(hdev->ae_dev); + if (ret) + goto err_reset_lock; + + ret = hclge_notify_client(hdev, HNAE3_INIT_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_unlock(); + + ret = hclge_notify_roce_client(hdev, HNAE3_INIT_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_lock(); + + ret = hclge_notify_client(hdev, HNAE3_UP_CLIENT); + if (ret) + goto err_reset_lock; + + rtnl_unlock(); + + return hclge_notify_roce_client(hdev, HNAE3_UP_CLIENT); + +err_reset_lock: + rtnl_unlock(); + return ret; +} +#endif + static void hclge_reset_event(struct pci_dev *pdev, struct hnae3_handle *handle) { struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev); @@ -11525,6 +11591,10 @@ struct hnae3_ae_ops hclge_ops = { .set_vf_rate = hclge_set_vf_rate, .set_vf_mac = hclge_set_vf_mac, .get_module_eeprom = hclge_get_module_eeprom, +#ifdef CONFIG_PM + .suspend = hclge_suspend, + .resume = hclge_resume, +#endif }; static struct hnae3_ae_algo ae_algo = { -- 1.9.1

1 0

[PATCH 000/144] Backport lts patches from Linux-4.19.116
by Yang Yingliang 21 Apr '20

21 Apr '20

Alain Volmat (1): i2c: st: fix missing struct parameter description Alex Vesker (1): IB/mlx5: Replace tunnel mpls capability bits for tunnel_offloads Alexander Duyck (1): mm: Use fixed constant in page_frag_alloc instead of size + 1 Alexander Sverdlin (1): genirq/irqdomain: Check pointer in irq_domain_alloc_irqs_hierarchy() Alexey Dobriyan (1): null_blk: fix spurious IO errors after failed past-wp access Andrei Botila (1): crypto: caam - update xts sector size for large input length Andy Lutomirski (1): selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault Andy Shevchenko (1): mfd: dln2: Fix sanity checking for endpoints Aneesh Kumar K.V (1): powerpc/hash64/devmap: Use H_PAGE_THP_HUGE when setting up huge devmap PTE entries Anssi Hannula (1): tools: gpio: Fix out-of-tree build regression Ard Biesheuvel (1): efi/x86: Ignore the memory attributes table on i386 Arvind Sankar (1): x86/boot: Use unsigned comparison for addresses Bart Van Assche (2): null_blk: Fix the null_add_dev() error path null_blk: Handle null_add_dev() failures properly Benoit Parrot (1): media: ti-vpe: cal: fix disable_irqs to only the intended target Bob Liu (1): dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone() Bob Peterson (1): gfs2: Don't demote a glock until its revokes are written Boqun Feng (1): locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps() Changwei Ge (1): ocfs2: no need try to truncate file beyond i_size Chris Wilson (1): drm: Remove PageReserved manipulation from drm_pci_alloc Christian Gmeiner (2): drm/etnaviv: rework perfmon query infrastructure etnaviv: perfmon: fix total and idle HI cyleces readout Christoph Niedermaier (1): cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL Christophe Leroy (1): powerpc/kprobes: Ignore traps that happened in real mode Clement Courbet (1): powerpc: Make setjmp/longjmp signature standard Cédric Le Goater (1): powerpc/xive: Use XIVE_BAD_IRQ instead of zero to catch non configured IPIs David Hildenbrand (2): KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks KVM: s390: vsie: Fix delivery of addressing exceptions Dongchun Zhu (1): media: i2c: ov5695: Fix power on and off sequences Eric Biggers (2): fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() kmod: make request_module() return an error when autoloading is disabled Eric W. Biederman (1): signal: Extend exec_id to 64bits Filipe Manana (2): Btrfs: fix crash during unmount due to race with delayed inode workers btrfs: fix missing file extent item for hole after ranged fsync Fredrik Strupe (1): arm64: armv8_deprecated: Fix undef_hook mask for thumb setend Frieder Schrempf (2): mtd: spinand: Stop using spinand->oobbuf for buffering bad block markers mtd: spinand: Do not erase the block before writing a bad block marker Gao Xiang (1): erofs: correct the remaining shrink objects Gary Lin (1): efi/x86: Fix the deletion of variables in mixed mode Gilad Ben-Yossef (4): crypto: ccree - zero out internal struct before use crypto: ccree - don't mangle the request assoclen crypto: ccree - dec auth tag size from cryptlen map crypto: ccree - only try to map auth tag if needed Greg Kroah-Hartman (1): Linux 4.19.116 Guoqing Jiang (1): md: check arrays is suspended in mddev_detach before call quiesce operations Gustavo A. R. Silva (1): MIPS: OCTEON: irq: Fix potential NULL pointer dereference Hadar Gat (1): crypto: ccree - improve error handling Hans de Goede (1): Input: i8042 - add Acer Aspire 5738z to nomux list Huacai Chen (1): MIPS/tlbex: Fix LDDIR usage in setup_pw() for Loongson-3 James Morse (1): firmware: arm_sdei: fix double-lock on hibernate with shared events James Smart (2): nvme-fc: Revert "add module to ops template to allow module references" nvme: Treat discovery subsystems as unique subsystems Jan Engelhardt (1): acpi/x86: ignore unspecified bit positions in the ACPI global lock field John Garry (1): libata: Remove extra scsi_host_put() in ata_scsi_add_hosts() Josef Bacik (5): btrfs: remove a BUG_ON() from merge_reloc_roots() btrfs: track reloc roots based on their commit root bytenr btrfs: set update the uuid generation as soon as possible btrfs: drop block from cache on error in relocation btrfs: use nofs allocations for running delayed items Juergen Gross (1): xen/blkfront: fix memory allocation flags in blkfront_setup_indirect() Junyong Sun (1): firmware: fix a double abort case with fw_load_sysfs_fallback Kai-Heng Feng (1): libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set Kees Cook (1): slub: improve bit diffusion for freelist ptr obfuscation Kishon Vijay Abraham I (1): PCI: endpoint: Fix for concurrent memory allocation in OB address region Konstantin Khlebnikov (1): block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices Laurentiu Tudor (1): powerpc/fsl_booke: Avoid creating duplicate tlb1 entry Libor Pechacek (1): powerpc/pseries: Avoid NULL pointer dereference when drmem is unavailable Logan Gunthorpe (1): PCI/switchtec: Fix init_completion race condition with poll_wait() Lukas Wunner (1): PCI: pciehp: Fix indefinite wait on sysfs requests Lyude Paul (1): drm/dp_mst: Fix clearing payload state on topology disable Marc Zyngier (1): irqchip/gic-v4: Provide irq_retrigger to avoid circular locking dependency Martin Blumenstingl (1): thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n Masami Hiramatsu (1): ftrace/kprobe: Show the maxactive number on kprobe_events Mathias Nyman (1): xhci: bail out early if driver can't accress host in resume Matt Ranostay (1): media: i2c: video-i2c: fix build errors due to 'imply hwmon' Matthew Garrett (1): tpm: Don't make log failures fatal Maxime Ripard (1): arm64: dts: allwinner: h6: Fix PMU compatible Michael Ellerman (1): powerpc/64/tm: Don't let userspace set regs->trap via sigreturn Michael Mueller (1): s390/diag: fix display of diagnose call statistics Michael Wang (1): sched: Avoid scale real weight down to zero Michal Hocko (1): selftests: vm: drop dependencies on page flags from mlock2 tests Mikulas Patocka (1): dm writecache: add cond_resched to avoid CPU hangs Nathan Chancellor (2): rtc: omap: Use define directive for PIN_CONFIG_ACTIVE_HIGH misc: echo: Remove unnecessary parentheses and simplify check for zero Neil Armstrong (1): usb: dwc3: core: add support for disabling SS instances in park mode Oliver O'Halloran (1): cpufreq: powernv: Fix use-after-free Ondrej Jirman (2): ARM: dts: sun8i-a83t-tbs-a711: HM5065 doesn't like such a high voltage bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads Paul Cercueil (1): clk: ingenic/jz4770: Exit with error if CGU init failed Qian Cai (1): ext4: fix a data race at inode->i_blocks Qu Wenruo (1): btrfs: qgroup: ensure qgroup_rescan_running is only set when the worker is at least queued Raju Rangoju (1): cxgb4/ptp: pass the sign of offset delta in FW CMD Remi Pommarel (1): ath9k: Handle txpower changes even when TPC is disabled Robbie Ko (1): btrfs: fix missing semaphore unlock in btrfs_sync_file Rosioru Dragos (1): crypto: mxs-dcp - fix scatterlist linearization for hash Sahitya Tummala (1): block: Fix use-after-free issue accessing struct io_cq Sam Lunt (1): perf tools: Support Python 3.8+ in Makefile Sasha Levin (1): Revert "drm/dp_mst: Remove VCPI while disabling topology mgr" Sean Christopherson (4): KVM: nVMX: Properly handle userspace interrupt window request KVM: x86: Allocate new rmap and large page tracking when moving memslot KVM: VMX: Always VMCLEAR in-use VMCSes during crash with kexec support KVM: x86: Gracefully handle __vmalloc() failure during VM allocation Sean V Kelley (1): PCI: Add boot interrupt quirk mechanism for Xeon chipsets Segher Boessenkool (1): powerpc: Add attributes for setjmp/longjmp Shetty, Harshini X (EXT-Sony Mobile) (1): dm verity fec: fix memory leak in verity_fec_dtr Simon Gander (1): hfsplus: fix crash and filesystem corruption when deleting files Sreekanth Reddy (1): scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug Sriharsha Allenki (1): usb: gadget: f_fs: Fix use after free issue as part of queue failure Steffen Maier (1): scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point Stephan Gerhold (1): media: venus: hfi_parser: Ignore HEVC encoding for V1 Subash Abhinov Kasiviswanathan (1): net: qualcomm: rmnet: Allow configuration updates to existing devices Sungbo Eo (2): irqchip/versatile-fpga: Handle chained IRQs properly irqchip/versatile-fpga: Apply clear-mask earlier Takashi Iwai (6): ALSA: usb-audio: Add mixer workaround for TRX40 and co ALSA: hda: Add driver blacklist ALSA: hda: Fix potential access overflow in beep helper ALSA: ice1724: Fix invalid access for enumerated ctl items ALSA: pcm: oss: Fix regression by buffer overflow fix ALSA: hda/realtek - Add quirk for MSI GL63 Thinh Nguyen (1): usb: gadget: composite: Inform controller driver of self-powered Thomas Gleixner (1): x86/entry/32: Add missing ASM_CLAC to general_protection entry Thomas Hebb (3): ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256 ALSA: hda/realtek - Set principled PC Beep configuration for ALC256 ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups Thomas Hellstrom (1): x86: Don't let pgprot_modify() change the page encryption bit Trond Myklebust (1): NFS: Fix a page leak in nfs_destroy_unlinked_subrequests() Vasily Averin (3): tpm: tpm1_bios_measurements_next should increase position index tpm: tpm2_bios_measurements_next should increase position index pstore: pstore_ftrace_seq_next should increase position index Vitaly Kuznetsov (1): KVM: VMX: fix crash cleanup when KVM wasn't used Wen Yang (1): ipmi: fix hung processes in __get_guid() Xu Wang (1): qlcnic: Fix bad kzalloc null test Yang Xu (1): KEYS: reaching the keys quotas correctly Yicong Yang (1): PCI/ASPM: Clear the correct bits when enabling L1 substates YueHaibing (1): powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init() Yury Norov (1): uapi: rename ext2_swab() to swab() and share globally in swab.h Zheng Wei (1): net: vxge: fix wrong __VA_ARGS__ usage Zhenzhong Duan (1): x86/speculation: Remove redundant arch_smt_update() invocation Zhiqiang Liu (1): block, bfq: fix use-after-free in bfq_idle_slice_timer_body chenqiwu (1): pstore/platform: fix potential mem leak if pstore_init_fs failed 이경택 (4): ASoC: fix regwmask ASoC: dapm: connect virtual mux with default value ASoC: dpcm: allow start or stop during pause for backend ASoC: topology: use name_prefix for new kcontrol Documentation/sound/hd-audio/index.rst | 1 + Documentation/sound/hd-audio/models.rst | 2 - Documentation/sound/hd-audio/realtek-pc-beep.rst | 129 ++++++++++++ Makefile | 2 +- arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 4 +- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 3 +- arch/arm64/kernel/armv8_deprecated.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 3 + arch/mips/mm/tlbex.c | 5 +- arch/powerpc/include/asm/book3s/64/hash-4k.h | 6 + arch/powerpc/include/asm/book3s/64/hash-64k.h | 8 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- arch/powerpc/include/asm/book3s/64/radix.h | 5 + arch/powerpc/include/asm/drmem.h | 4 +- arch/powerpc/include/asm/setjmp.h | 6 +- arch/powerpc/kernel/Makefile | 3 - arch/powerpc/kernel/kprobes.c | 3 + arch/powerpc/kernel/signal_64.c | 4 +- arch/powerpc/mm/tlb_nohash_low.S | 12 +- arch/powerpc/platforms/pseries/hotplug-memory.c | 8 +- arch/powerpc/platforms/pseries/lpar.c | 2 +- arch/powerpc/sysdev/xive/common.c | 12 +- arch/powerpc/sysdev/xive/native.c | 4 +- arch/powerpc/sysdev/xive/spapr.c | 4 +- arch/powerpc/sysdev/xive/xive-internal.h | 7 + arch/powerpc/xmon/Makefile | 3 - arch/s390/kernel/diag.c | 2 +- arch/s390/kvm/vsie.c | 1 + arch/s390/mm/gmap.c | 6 +- arch/x86/boot/compressed/head_32.S | 2 +- arch/x86/boot/compressed/head_64.S | 4 +- arch/x86/entry/entry_32.S | 1 + arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/include/asm/pgtable.h | 7 +- arch/x86/include/asm/pgtable_types.h | 2 +- arch/x86/kernel/acpi/boot.c | 2 +- arch/x86/kvm/svm.c | 4 + arch/x86/kvm/vmx.c | 110 ++++------ arch/x86/kvm/x86.c | 21 +- arch/x86/platform/efi/efi_64.c | 4 +- block/bfq-iosched.c | 16 +- block/blk-ioc.c | 7 + block/blk-settings.c | 3 + drivers/ata/libata-pmp.c | 1 + drivers/ata/libata-scsi.c | 9 +- drivers/base/firmware_loader/fallback.c | 2 +- drivers/block/null_blk_main.c | 10 +- drivers/block/xen-blkfront.c | 17 +- drivers/bus/sunxi-rsb.c | 2 +- drivers/char/ipmi/ipmi_msghandler.c | 4 +- drivers/char/tpm/eventlog/common.c | 12 +- drivers/char/tpm/eventlog/tpm1.c | 2 +- drivers/char/tpm/eventlog/tpm2.c | 2 +- drivers/char/tpm/tpm-chip.c | 4 +- drivers/char/tpm/tpm.h | 2 +- drivers/clk/ingenic/jz4770-cgu.c | 4 +- drivers/cpufreq/imx6q-cpufreq.c | 3 + drivers/cpufreq/powernv-cpufreq.c | 6 + drivers/crypto/caam/caamalg_desc.c | 16 +- drivers/crypto/ccree/cc_aead.c | 56 +++-- drivers/crypto/ccree/cc_aead.h | 1 + drivers/crypto/ccree/cc_buffer_mgr.c | 108 +++++----- drivers/crypto/mxs-dcp.c | 58 +++-- drivers/firmware/arm_sdei.c | 32 ++- drivers/firmware/efi/efi.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 19 +- drivers/gpu/drm/drm_pci.c | 25 +-- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 103 +++++++-- drivers/i2c/busses/i2c-st.c | 1 + drivers/infiniband/hw/mlx5/main.c | 6 +- drivers/input/serio/i8042-x86ia64io.h | 11 + drivers/irqchip/irq-gic-v3-its.c | 6 + drivers/irqchip/irq-versatile-fpga.c | 18 +- drivers/md/dm-verity-fec.c | 1 + drivers/md/dm-writecache.c | 6 +- drivers/md/dm-zoned-metadata.c | 1 - drivers/md/md.c | 2 +- drivers/media/i2c/ov5695.c | 49 +++-- drivers/media/i2c/video-i2c.c | 2 +- drivers/media/platform/qcom/venus/hfi_parser.c | 1 + drivers/media/platform/ti-vpe/cal.c | 16 +- drivers/mfd/dln2.c | 9 +- drivers/misc/echo/echo.c | 2 +- drivers/mtd/nand/spi/core.c | 17 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 3 + drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.h | 14 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +- drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 31 +-- drivers/net/wireless/ath/ath9k/main.c | 3 + drivers/nvme/host/core.c | 11 + drivers/nvme/host/fc.c | 14 +- drivers/nvme/target/fcloop.c | 1 - drivers/pci/endpoint/pci-epc-mem.c | 10 +- drivers/pci/hotplug/pciehp_hpc.c | 14 +- drivers/pci/pcie/aspm.c | 4 +- drivers/pci/quirks.c | 80 ++++++- drivers/pci/switch/switchtec.c | 2 +- drivers/rtc/rtc-omap.c | 4 +- drivers/s390/scsi/zfcp_erp.c | 2 +- drivers/scsi/lpfc/lpfc_nvme.c | 2 - drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- drivers/scsi/qla2xxx/qla_nvme.c | 1 - drivers/staging/erofs/utils.c | 2 +- drivers/usb/dwc3/core.c | 5 + drivers/usb/dwc3/core.h | 4 + drivers/usb/gadget/composite.c | 9 + drivers/usb/gadget/function/f_fs.c | 1 + drivers/usb/host/xhci.c | 4 +- fs/btrfs/async-thread.c | 8 + fs/btrfs/async-thread.h | 1 + fs/btrfs/delayed-inode.c | 13 ++ fs/btrfs/disk-io.c | 27 ++- fs/btrfs/file.c | 11 + fs/btrfs/qgroup.c | 11 +- fs/btrfs/relocation.c | 35 ++-- fs/exec.c | 2 +- fs/ext4/inode.c | 2 +- fs/filesystems.c | 4 +- fs/gfs2/glock.c | 3 + fs/hfsplus/attributes.c | 4 + fs/nfs/write.c | 1 + fs/ocfs2/alloc.c | 4 + fs/pstore/inode.c | 5 +- fs/pstore/platform.c | 4 +- include/linux/devfreq_cooling.h | 2 +- include/linux/iocontext.h | 1 + include/linux/mlx5/mlx5_ifc.h | 9 +- include/linux/nvme-fc-driver.h | 4 - include/linux/pci-epc.h | 3 + include/linux/sched.h | 4 +- include/linux/swab.h | 1 + include/uapi/linux/swab.h | 10 + kernel/cpu.c | 5 +- kernel/irq/irqdomain.c | 10 +- kernel/kmod.c | 4 +- kernel/locking/lockdep.c | 4 + kernel/sched/sched.h | 8 +- kernel/signal.c | 2 +- kernel/trace/trace_kprobe.c | 2 + lib/find_bit.c | 16 +- mm/page_alloc.c | 8 +- mm/slub.c | 2 +- security/keys/key.c | 2 +- security/keys/keyctl.c | 4 +- sound/core/oss/pcm_plugin.c | 32 ++- sound/pci/hda/hda_beep.c | 6 +- sound/pci/hda/hda_intel.c | 16 ++ sound/pci/hda/patch_realtek.c | 50 +---- sound/pci/ice1712/prodigy_hifi.c | 4 +- sound/soc/soc-dapm.c | 8 +- sound/soc/soc-ops.c | 4 +- sound/soc/soc-pcm.c | 6 +- sound/soc/soc-topology.c | 2 +- sound/usb/mixer_maps.c | 28 +++ tools/gpio/Makefile | 2 +- tools/perf/Makefile.config | 11 +- tools/testing/selftests/vm/mlock2-tests.c | 233 ++++----------------- tools/testing/selftests/x86/ptrace_syscall.c | 8 +- 159 files changed, 1190 insertions(+), 777 deletions(-) create mode 100644 Documentation/sound/hd-audio/realtek-pc-beep.rst -- 1.8.3

1 144

[PATCH 1/2] ACPI: GED: implement powerkey evged freeze function
by Hongbo Yao 21 Apr '20

21 Apr '20

From: huangjun <huangjun63(a)huawei.com> If we want acpi ged to support wake from freeze, we need to implement the suspend/resume function. In these two methods, ACPI's _GPO, GPP method is called to realize the setting of sleep flag and anti-shake. Signed-off-by: Huangjun <huangjun63(a)huawei.com> --- drivers/acpi/evged.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/drivers/acpi/evged.c b/drivers/acpi/evged.c index f13ba2c07667..84656fc09d15 100644 --- a/drivers/acpi/evged.c +++ b/drivers/acpi/evged.c @@ -46,11 +46,14 @@ #include <linux/list.h> #include <linux/platform_device.h> #include <linux/acpi.h> +#include <linux/timer.h> +#include <linux/jiffies.h> #define MODULE_NAME "acpi-ged" struct acpi_ged_device { struct device *dev; + struct timer_list timer; struct list_head event_list; }; @@ -148,6 +151,8 @@ static int ged_probe(struct platform_device *pdev) dev_err(&pdev->dev, "unable to parse the _CRS record\n"); return -EINVAL; } + + timer_setup(&geddev->timer, NULL, 0); platform_set_drvdata(pdev, geddev); return 0; @@ -164,6 +169,7 @@ static void ged_shutdown(struct platform_device *pdev) dev_dbg(geddev->dev, "GED releasing GSI %u @ IRQ %u\n", event->gsi, event->irq); } + del_timer(&geddev->timer); } static int ged_remove(struct platform_device *pdev) @@ -177,6 +183,78 @@ static const struct acpi_device_id ged_acpi_ids[] = { {}, }; +#ifdef CONFIG_PM_SLEEP +static acpi_status ged_acpi_execute(struct device *dev, char* method, u64 arg) +{ + acpi_status acpi_ret; + acpi_handle method_handle; + + acpi_ret = acpi_get_handle(ACPI_HANDLE(dev), method, &method_handle); + + if (ACPI_FAILURE(acpi_ret)) { + dev_err(dev, "cannot locate %s method\n", method); + return AE_NOT_FOUND; + } + + acpi_ret = acpi_execute_simple_method(method_handle, NULL, arg); + if (ACPI_FAILURE(acpi_ret)) { + dev_err(dev, "%s method execution failed\n", method); + return AE_ERROR; + } + + return AE_OK; +} + +static void ged_timer_callback(struct timer_list *t) +{ + struct acpi_ged_device *geddev = from_timer(geddev, t, timer); + struct acpi_ged_event *event, *next; + + list_for_each_entry_safe(event, next, &geddev->event_list, node) { + ged_acpi_execute(geddev->dev, "_GPP", event->gsi); + } +} + +static int ged_suspend(struct device *dev) +{ + struct acpi_ged_device *geddev = dev_get_drvdata(dev); + struct acpi_ged_event *event, *next; + acpi_status acpi_ret; + + list_for_each_entry_safe(event, next, &geddev->event_list, node) { + acpi_ret = ged_acpi_execute(dev, "_GPO", event->gsi); + + if (acpi_ret == AE_ERROR) + return -EINVAL; + + enable_irq_wake(event->irq); + } + return 0; +} + +static int ged_resume(struct device *dev) +{ + struct acpi_ged_device *geddev = dev_get_drvdata(dev); + struct acpi_ged_event *event, *next; + + list_for_each_entry_safe(event, next, &geddev->event_list, node) { + disable_irq_wake(event->irq); + } + + /* use timer to complete 4s anti-shake */ + geddev->timer.expires = jiffies + (4 * HZ); + geddev->timer.function = ged_timer_callback; + add_timer(&geddev->timer); + + return 0; +} + +static const struct dev_pm_ops ged_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(ged_suspend, ged_resume) +}; +#endif + + static struct platform_driver ged_driver = { .probe = ged_probe, .remove = ged_remove, @@ -184,6 +262,10 @@ static struct platform_driver ged_driver = { .driver = { .name = MODULE_NAME, .acpi_match_table = ACPI_PTR(ged_acpi_ids), +#ifdef CONFIG_PM_SLEEP + .pm = &ged_pm_ops, +#endif + }, }; builtin_platform_driver(ged_driver); -- 2.20.1

1 1

[PATCH] irqchip/gic-v3-its: Fix the ITT address changing for hebernation.
by Hongbo Yao 20 Apr '20

20 Apr '20

From: Sunnanyong <sunnanyong(a)huawei.com> If we want to support S4 (suspend to Disk), it is necessary to guarantee that the ITS tables are at the same address in the booting kernel and the resumed kernel. That covers all the ITS tables and as well as the RDs'. To support this, allocting the itt memory from memory pool intead. Signed-off-by: Sunnanyong <sunnanyong(a)huawei.com> --- drivers/irqchip/irq-gic-v3-its.c | 72 ++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 860f3ef2969e..9de585fe74fb 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -189,6 +189,14 @@ static DEFINE_IDA(its_vpeid_ida); #define gic_data_rdist_rd_base() (gic_data_rdist()->rd_base) #define gic_data_rdist_vlpi_base() (gic_data_rdist_rd_base() + SZ_128K) +static void *its_mem_pool_alloc(int dev_id); +#define ITS_MEM_POOL_SIZE (SZ_4M) +#define ITS_MEM_POOL_MAX (16) +#define GITS_OTHER_OFFSET 0x20000 +#define GITS_OTHER_REG_SIZE 0x100 +#define GITS_FUNC_REG_OFFSET 0x80 +static void *its_mem_pool[ITS_MEM_POOL_MAX] = {0}; + static u16 get_its_list(struct its_vm *vm) { struct its_node *its; @@ -2436,7 +2444,11 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, nr_ites = max(2, nvecs); sz = nr_ites * its->ite_size; sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1; - itt = kzalloc_node(sz, GFP_KERNEL, its->numa_node); + + itt = its_mem_pool_alloc(dev_id); + if (!itt) + itt = kzalloc_node(sz, GFP_KERNEL, its->numa_node); + if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); if (lpi_map) @@ -2450,7 +2462,6 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id, if (!dev || !itt || !col_map || (!lpi_map && alloc_lpis)) { kfree(dev); - kfree(itt); kfree(lpi_map); kfree(col_map); return NULL; @@ -2486,7 +2497,6 @@ static void its_free_device(struct its_device *its_dev) raw_spin_lock_irqsave(&its_dev->its->lock, flags); list_del(&its_dev->entry); raw_spin_unlock_irqrestore(&its_dev->its->lock, flags); - kfree(its_dev->itt); kfree(its_dev); } @@ -3798,11 +3808,41 @@ static int redist_disable_lpis(void) return 0; } +static void its_cpu_clear_cache(void) +{ + struct its_node *its; + u64 val = 0; + void __iomem *func_base; + + raw_spin_lock(&its_lock); + + list_for_each_entry(its, &its_nodes, entry) { + func_base = ioremap(its->phys_base + GITS_OTHER_OFFSET, + GITS_OTHER_REG_SIZE); + if (!func_base) { + pr_err("ITS@%p : Unable to map ITS OTHER registers\n", + (void *)(its->phys_base + GITS_OTHER_OFFSET)); + raw_spin_unlock(&its_lock); + return; + } + + val = readl_relaxed(func_base + GITS_FUNC_REG_OFFSET); + val = val | (0x7 << 16); + writel_relaxed(val, func_base + GITS_FUNC_REG_OFFSET); + dsb(sy); + iounmap(func_base); + } + + raw_spin_unlock(&its_lock); +} + + int its_cpu_init(void) { if (!list_empty(&its_nodes)) { int ret; + its_cpu_clear_cache(); ret = redist_disable_lpis(); if (ret) return ret; @@ -4001,6 +4041,7 @@ int __init its_init(struct fwnode_handle *handle, struct rdists *rdists, struct its_node *its; bool has_v4 = false; int err; + int i; its_parent = parent_domain; of_node = to_of_node(handle); @@ -4014,6 +4055,16 @@ int __init its_init(struct fwnode_handle *handle, struct rdists *rdists, return -ENXIO; } + for (i = 0; i < ITS_MEM_POOL_MAX; i++) { + if (!its_mem_pool[i]) { + its_mem_pool[i] = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, + get_order(ITS_MEM_POOL_SIZE)); + if (!its_mem_pool[i]) + pr_err("err:[its mem[%d]] has no memory\n", i); + } + } + + gic_rdists = rdists; err = allocate_lpi_tables(); @@ -4035,3 +4086,18 @@ int __init its_init(struct fwnode_handle *handle, struct rdists *rdists, return 0; } + +void *its_mem_pool_alloc(int dev_id) +{ + int pool_num = dev_id / (ITS_MEM_POOL_SIZE / SZ_512); + int idx = dev_id % (ITS_MEM_POOL_SIZE / SZ_512); + void *addr = NULL; + + if (pool_num >= ITS_MEM_POOL_MAX || !its_mem_pool[pool_num]) { + pr_err("[its mem[%d]] alloc error\n", pool_num); + return NULL; + } + + addr = its_mem_pool[pool_num] + idx * SZ_512; + return addr; +} -- 2.20.1

1 0

[PATCH 00/22] Add support for Hygon Dhyana Family 18h processor
by Pu Wen 20 Apr '20

20 Apr '20

As a new x86 CPU Vendor, Chengdu Haiguang IC Design Co., Ltd (Hygon) is a Joint Venture between AMD and Haiguang Information Technology Co., Ltd., and aims at providing high performance x86 processor for China server market. The first generation Hygon's processor(Dhyana) originates from AMD technology and shares most of the architecture with AMD's family 17h, but with different CPU Vendor ID("HygonGenuine")/PCIE Device Vendor ID (0x1D94)/Family series number (Family 18h). To enable the support of Linux kernel to Hygon's CPU, we added a new vendor type (X86_VENDOR_HYGON, with value of 9) in arch/x86/include/ asm/processor.h, and shared most of kernel support codes with AMD family 17h. As Hygon will negotiate with AMD to make sure that only Hygon will use family 18h, so try to minimize code modification and share most codes with AMD under this consideration. This patch series have been applied and tested successfully on Hygon Dhyana SoC silicon. Also tested on AMD EPYC (Family 17h) processor, it works fine and makes no harm to the existing codes. This patch series are created for the current branch openEuler-1.0-LTS. References: [1] Linux kernel patches for Hygon Dhyana, merged in 4.20: https://git.kernel.org/tip/c9661c1e80b609cd038db7c908e061f0535804ef [2] MSR and CPUID definition: https://www.amd.com/system/files/TechDocs/54945_PPR_Family_17h_Models_00h-0… Pu Wen (22): x86/cpu: Create Hygon Dhyana architecture support file x86/cpu: Get cache info and setup cache cpumap for Hygon Dhyana x86/cpu/mtrr: Support TOP_MEM2 and get MTRR number x86/smpboot: Do not use BSP INIT delay and MWAIT to idle on Dhyana x86/events: Add Hygon Dhyana support to PMU infrastructure x86/alternative: Init ideal_nops for Hygon Dhyana x86/amd_nb: Check vendor in AMD-only functions x86/pci, x86/amd_nb: Add Hygon Dhyana support to PCI and northbridge x86/apic: Add Hygon Dhyana support x86/bugs: Add Hygon Dhyana to the respective mitigation machinery x86/mce: Add Hygon Dhyana support to the MCA infrastructure x86/kvm: Add Hygon Dhyana support to KVM x86/xen: Add Hygon Dhyana support to Xen ACPI: Add Hygon Dhyana support cpufreq: Add Hygon Dhyana support EDAC, amd64: Add Hygon Dhyana support tools/cpupower: Add Hygon Dhyana support hwmon: (k10temp) Add Hygon Dhyana support x86/CPU/hygon: Fix phys_proc_id calculation logic for multi-die processors i2c-piix4: Add Hygon Dhyana SMBus support x86/amd_nb: Make hygon_nb_misc_ids static NTB: Add Hygon Device ID Documentation/i2c/busses/i2c-piix4 | 2 + MAINTAINERS | 6 + arch/x86/Kconfig.cpu | 14 + arch/x86/events/amd/core.c | 4 + arch/x86/events/amd/uncore.c | 20 +- arch/x86/events/core.c | 4 + arch/x86/include/asm/amd_nb.h | 3 + arch/x86/include/asm/cacheinfo.h | 1 + arch/x86/include/asm/kvm_emulate.h | 4 + arch/x86/include/asm/mce.h | 2 + arch/x86/include/asm/processor.h | 3 +- arch/x86/include/asm/virtext.h | 5 +- arch/x86/kernel/alternative.c | 4 + arch/x86/kernel/amd_nb.c | 49 ++- arch/x86/kernel/apic/apic.c | 7 + arch/x86/kernel/apic/probe_32.c | 1 + arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/bugs.c | 4 +- arch/x86/kernel/cpu/cacheinfo.c | 31 +- arch/x86/kernel/cpu/common.c | 4 + arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/hygon.c | 413 ++++++++++++++++++ arch/x86/kernel/cpu/mce/core.c | 20 +- arch/x86/kernel/cpu/mce/severity.c | 3 +- arch/x86/kernel/cpu/mtrr/cleanup.c | 3 +- arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- arch/x86/kernel/cpu/perfctr-watchdog.c | 2 + arch/x86/kernel/smpboot.c | 4 +- arch/x86/kvm/emulate.c | 11 +- arch/x86/pci/amd_bus.c | 6 +- arch/x86/xen/pmu.c | 12 +- drivers/acpi/acpi_pad.c | 1 + drivers/acpi/processor_idle.c | 1 + drivers/cpufreq/acpi-cpufreq.c | 5 + drivers/cpufreq/amd_freq_sensitivity.c | 9 +- drivers/edac/amd64_edac.c | 10 +- drivers/edac/mce_amd.c | 4 +- drivers/hwmon/k10temp.c | 3 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-piix4.c | 15 +- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + include/linux/pci_ids.h | 2 + tools/power/cpupower/utils/cpufreq-info.c | 6 +- tools/power/cpupower/utils/helpers/amd.c | 4 +- tools/power/cpupower/utils/helpers/cpuid.c | 8 +- tools/power/cpupower/utils/helpers/helpers.h | 2 +- tools/power/cpupower/utils/helpers/misc.c | 2 +- .../utils/idle_monitor/mperf_monitor.c | 3 +- 48 files changed, 668 insertions(+), 55 deletions(-) create mode 100644 arch/x86/kernel/cpu/hygon.c -- 2.23.0

5 28

[PATCH 00/52] Backport lts patches from Linux-4.19.115
by Yang Yingliang 18 Apr '20

18 Apr '20

Alexander Usyskin (1): mei: me: add cedar fork device ids Amritha Nambiar (1): net: Fix Tx hash bound checking Arun KS (1): arm64: Fix size of __early_cpu_boot_status Avihai Horon (1): RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow Chris Lew (1): rpmsg: glink: Remove chunk size word align warning Daniel Jordan (1): padata: always acquire cpu_hotplug_lock before pinst->lock David Ahern (1): tools/accounting/getdelays.c: fix netlink attribute length David Howells (1): rxrpc: Fix sendmsg(MSG_WAITALL) handling Eugene Syromiatnikov (1): coresight: do not use the BIT() macro in the UAPI header Eugeniy Paltsev (1): initramfs: restore default compression behavior Florian Fainelli (2): net: dsa: bcm_sf2: Do not register slave MDIO bus with OF net: dsa: bcm_sf2: Ensure correct sub-node is parsed Geoffrey Allott (1): ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard Gerd Hoffmann (1): drm/bochs: downgrade pci_request_region failure from error to warning Greg Kroah-Hartman (1): Linux 4.19.115 Hans Verkuil (1): drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read() Hans de Goede (2): extcon: axp288: Add wakeup support power: supply: axp288_charger: Add special handling for HP Pavilion x2 10 Ilya Dryomov (1): ceph: canonicalize server path in place James Zhu (1): drm/amdgpu: fix typo for vcn1 idle check Jarod Wilson (1): ipv6: don't auto-add link-local address to lag ports Jason A. Donenfeld (1): random: always use batched entropy for get_random_u{32, 64} Jason Gunthorpe (2): RDMA/ucma: Put a lock around every call to the rdma_cm layer RDMA/cma: Teach lockdep about the order of rtnl and lock Jisheng Zhang (1): net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting Kaike Wan (2): IB/hfi1: Call kobject_put() when kobject_init_and_add() fails IB/hfi1: Fix memory leaks in sysfs registration and unregistration Kishon Vijay Abraham I (2): misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices misc: pci_endpoint_test: Avoid using module parameter to determine irqtype Len Brown (2): tools/power turbostat: Fix gcc build warnings tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks Lucas Stach (1): drm/etnaviv: replace MMU flush marker with flush sequence Marcelo Ricardo Leitner (1): sctp: fix possibly using a bad saddr with a given dst Mario Kleiner (1): drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017 Martin Kaiser (1): hwrng: imx-rngc - fix an error path Oleksij Rempel (1): net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers Paul Cercueil (1): ASoC: jz4740-i2s: Fix divider written at incorrect offset in register Petr Machata (1): mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE Prabhath Sajeepa (1): nvme-rdma: Avoid double freeing of async event data Qian Cai (1): ipv4: fix a RCU-list lock in fib_triestat_seq_show Qiujun Huang (3): sctp: fix refcount bug in sctp_wfree Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl fbcon: fix null-ptr-deref in fbcon_switch Rob Clark (2): drm/msm: stop abusing dma_map/unmap for cache drm/msm: Use the correct dma_sync calls in msm_gem Roger Quadros (1): usb: dwc3: don't set gadget->is_otg flag Sean Young (1): media: rc: IR signal for Panasonic air conditioner too long Taniya Das (1): clk: qcom: rcg: Return failure for RCG update Thinh Nguyen (1): usb: dwc3: gadget: Wrap around when skip TRBs William Dauchy (1): net, ip_tunnel: fix interface lookup with no key Xiubo Li (1): ceph: remove the extra slashes in the server path YueHaibing (1): misc: rtsx: set correct pcr_ops for rts522A Makefile | 2 +- arch/arm64/kernel/head.S | 2 +- drivers/char/hw_random/imx-rngc.c | 4 +- drivers/char/random.c | 20 ++------ drivers/clk/qcom/clk-rcg2.c | 2 +- drivers/extcon/extcon-axp288.c | 32 ++++++++++++ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 11 +++++ drivers/gpu/drm/bochs/bochs_hw.c | 6 +-- drivers/gpu/drm/drm_dp_mst_topology.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 10 ++-- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 6 +-- drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 2 +- drivers/gpu/drm/msm/msm_gem.c | 47 ++++++++++++++++-- drivers/infiniband/core/cma.c | 14 ++++++ drivers/infiniband/core/ucma.c | 49 ++++++++++++++++++- drivers/infiniband/hw/hfi1/sysfs.c | 26 +++++++--- drivers/media/rc/lirc_dev.c | 2 +- drivers/misc/cardreader/rts5227.c | 1 + drivers/misc/mei/hw-me-regs.h | 2 + drivers/misc/mei/pci-me.c | 2 + drivers/misc/pci_endpoint_test.c | 14 ++++-- drivers/net/dsa/bcm_sf2.c | 9 +++- .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 8 +-- .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- drivers/net/phy/micrel.c | 7 +++ drivers/nvme/host/rdma.c | 8 +-- drivers/power/supply/axp288_charger.c | 57 +++++++++++++++++++++- drivers/rpmsg/qcom_glink_native.c | 3 -- drivers/usb/dwc3/gadget.c | 3 +- drivers/video/fbdev/core/fbcon.c | 3 ++ fs/ceph/super.c | 56 +++++++++++++-------- fs/ceph/super.h | 2 +- include/uapi/linux/coresight-stm.h | 6 ++- kernel/padata.c | 4 +- net/bluetooth/rfcomm/tty.c | 4 +- net/core/dev.c | 2 + net/ipv4/fib_trie.c | 3 ++ net/ipv4/ip_tunnel.c | 6 +-- net/ipv6/addrconf.c | 4 ++ net/rxrpc/sendmsg.c | 4 +- net/sctp/ipv6.c | 20 +++++--- net/sctp/protocol.c | 28 +++++++---- net/sctp/socket.c | 31 +++++++++--- sound/pci/hda/patch_ca0132.c | 1 + sound/soc/jz4740/jz4740-i2s.c | 2 +- tools/accounting/getdelays.c | 2 +- tools/power/x86/turbostat/turbostat.c | 27 +++++----- usr/Kconfig | 22 ++++----- 50 files changed, 434 insertions(+), 148 deletions(-) -- 1.8.3

1 52

[PATCH] srcu: Apply *_ONCE() to ->srcu_last_gp_end
by Yang Yingliang 18 Apr '20

18 Apr '20

From: "Paul E. McKenney" <paulmck(a)kernel.org> mainline inclusion from mainline-v5.6-rc1 commit 844a378de3372c923909681706d62336d702531e category: bugfix bugzilla: 28851 CVE: NA ------------------------------------------------------------------------- The ->srcu_last_gp_end field is accessed from any CPU at any time by synchronize_srcu(), so non-initialization references need to use READ_ONCE() and WRITE_ONCE(). This commit therefore makes that change. Reported-by: syzbot+08f3e9d26e5541e1ecf2(a)syzkaller.appspotmail.com Acked-by: Marco Elver <elver(a)google.com> Signed-off-by: Paul E. McKenney <paulmck(a)kernel.org> Conflicts: kernel/rcu/srcutree.c Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- kernel/rcu/srcutree.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c index 4b0a6e3..7bd0204 100644 --- a/kernel/rcu/srcutree.c +++ b/kernel/rcu/srcutree.c @@ -552,7 +552,7 @@ static void srcu_gp_end(struct srcu_struct *sp) idx = rcu_seq_state(sp->srcu_gp_seq); WARN_ON_ONCE(idx != SRCU_STATE_SCAN2); cbdelay = srcu_get_delay(sp); - sp->srcu_last_gp_end = ktime_get_mono_fast_ns(); + WRITE_ONCE(sp->srcu_last_gp_end, ktime_get_mono_fast_ns()); rcu_seq_end(&sp->srcu_gp_seq); gpseq = rcu_seq_current(&sp->srcu_gp_seq); if (ULONG_CMP_LT(sp->srcu_gp_seq_needed_exp, gpseq)) @@ -780,6 +780,7 @@ static bool srcu_might_be_idle(struct srcu_struct *sp) unsigned long flags; struct srcu_data *sdp; unsigned long t; + unsigned long tlast; /* If the local srcu_data structure has callbacks, not idle. */ local_irq_save(flags); @@ -798,9 +799,9 @@ static bool srcu_might_be_idle(struct srcu_struct *sp) /* First, see if enough time has passed since the last GP. */ t = ktime_get_mono_fast_ns(); + tlast = READ_ONCE(sp->srcu_last_gp_end); if (exp_holdoff == 0 || - time_in_range_open(t, sp->srcu_last_gp_end, - sp->srcu_last_gp_end + exp_holdoff)) + time_in_range_open(t, tlast, tlast + exp_holdoff)) return false; /* Too soon after last GP. */ /* Next, check for probable idleness. */ -- 1.8.3

1 0

[PATCH 1/2] iommu/dma: Fix for dereferencing before null checking
by Yang Yingliang 18 Apr '20

18 Apr '20

From: Yunsheng Lin <linyunsheng(a)huawei.com> mainline inclusion from mainline-v5.4-rc1 commit 6b0c54e7f2715997c366e8374209bc74259b0a59 category: bugfix bugzilla: 21318 CVE: NA ------------------------------------------------------------------------- The cookie is dereferenced before null checking in the function iommu_dma_init_domain. This patch moves the dereferencing after the null checking. Fixes: fdbe574eb693 ("iommu/dma: Allow MSI-only cookies") Signed-off-by: Yunsheng Lin <linyunsheng(a)huawei.com> Signed-off-by: Joerg Roedel <jroedel(a)suse.de> Conflicts: drivers/iommu/dma-iommu.c Signed-off-by: Zhen Lei <thunder.leizhen(a)huawei.com> Reviewed-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/iommu/dma-iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 64ae17e8b..b68d9fd 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -290,13 +290,15 @@ int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, u64 size, struct device *dev) { struct iommu_dma_cookie *cookie = domain->iova_cookie; - struct iova_domain *iovad = &cookie->iovad; unsigned long order, base_pfn, end_pfn; + struct iova_domain *iovad; int attr; if (!cookie || cookie->type != IOMMU_DMA_IOVA_COOKIE) return -EINVAL; + iovad = &cookie->iovad; + /* Use the smallest supported page size for IOVA granularity */ order = __ffs(domain->pgsize_bitmap); base_pfn = max_t(unsigned long, 1, base >> order); -- 1.8.3

1 1

[PATCH] net/hinic: fix the problem that out-of-bounds access
by Yang Yingliang 18 Apr '20

18 Apr '20

From: Shaozhengchao <shaozhengchao(a)huawei.com> driver inclusion category: bugfix bugzilla: 4472 ----------------------------------------------------------------------- Fix the problem that out-of-bounds access caused by user input In order to solve the problem, restrictions are imposed on each input which is done in kernel driver. Signed-off-by: Shaozhengchao <shaozhengchao(a)huawei.com> Reviewed-by: Luoshaokai <luoshaokai(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- drivers/net/ethernet/huawei/hinic/hinic_nictool.c | 18 ++++++++++++++++++ drivers/net/ethernet/huawei/hinic/hinic_nictool.h | 2 ++ drivers/net/ethernet/huawei/hinic/hinic_sml_counter.c | 16 +++++++++++++--- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c index 46dd9ec..df01088 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nictool.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_nictool.c @@ -1712,6 +1712,19 @@ static u32 get_up_timeout_val(enum hinic_mod_type mod, u8 cmd) return UP_COMP_TIME_OUT_VAL; } +static int check_useparam_valid(struct msg_module *nt_msg, void *buf_in) +{ + struct csr_write_st *csr_write_msg = (struct csr_write_st *)buf_in; + u32 rd_len = csr_write_msg->rd_len; + + if (rd_len > TOOL_COUNTER_MAX_LEN) { + pr_err("Csr read or write len is invalid!\n"); + return -EINVAL; + } + + return 0; +} + static int send_to_up(void *hwdev, struct msg_module *nt_msg, void *buf_in, u32 in_size, void *buf_out, u32 *out_size) { @@ -1744,6 +1757,9 @@ static int send_to_up(void *hwdev, struct msg_module *nt_msg, } } else if (nt_msg->up_cmd.up_db.up_api_type == API_CHAIN) { + if (check_useparam_valid(nt_msg, buf_in)) + return -EINVAL; + if (nt_msg->up_cmd.up_db.chipif_cmd == API_CSR_WRITE) { ret = api_csr_write(hwdev, nt_msg, buf_in, in_size, buf_out, out_size); @@ -1994,6 +2010,8 @@ static int get_all_chip_id_cmd(struct msg_module *nt_msg) { struct nic_card_id card_id; + memset(&card_id, 0, sizeof(card_id)); + hinic_get_all_chip_id((void *)&card_id); if (copy_to_user(nt_msg->out_buf, &card_id, sizeof(card_id))) { diff --git a/drivers/net/ethernet/huawei/hinic/hinic_nictool.h b/drivers/net/ethernet/huawei/hinic/hinic_nictool.h index cfbe435..e8eccaf 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_nictool.h +++ b/drivers/net/ethernet/huawei/hinic/hinic_nictool.h @@ -285,4 +285,6 @@ struct hinic_pf_info { extern void hinic_get_io_stats(struct hinic_nic_dev *nic_dev, struct hinic_show_item *items); +#define TOOL_COUNTER_MAX_LEN 512 + #endif diff --git a/drivers/net/ethernet/huawei/hinic/hinic_sml_counter.c b/drivers/net/ethernet/huawei/hinic/hinic_sml_counter.c index 9536adf..eb35df6 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_sml_counter.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_sml_counter.c @@ -253,9 +253,19 @@ int hinic_sm_ctr_rd64_pair(void *hwdev, u8 node, u8 instance, ctr_rd_rsp_u rsp; int ret; - if (!hwdev || (0 != (ctr_id & 0x1)) || !value1 || !value2) { - pr_err("Hwdev(0x%p) or value1(0x%p) or value2(0x%p) is NULL or ctr_id(%d) is odd number\n", - hwdev, value1, value2, ctr_id); + if (!value1) { + pr_err("value1 is NULL for read 64 bit pair\n"); + return -EFAULT; + } + + if (!value2) { + pr_err("value2 is NULL for read 64 bit pair\n"); + return -EFAULT; + } + + if (!hwdev || (0 != (ctr_id & 0x1))) { + pr_err("Hwdev is NULL or ctr_id(%d) is odd number for read 64 bit pair\n", + ctr_id); return -EFAULT; } -- 1.8.3

1 0

2024

2023

2022

2021

2020

2019

Kernel