- Kernel - mailweb.openeuler.org

[PATCH openEuler-5.10 01/28] af_key: add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register
by Zheng Zengkai 21 Apr '22

21 Apr '22

From: Haimin Zhang <tcs_kernel(a)tencent.com> stable inclusion from stable-v5.10.110 commit 8d3f4ad43054619379ccc697cfcbdb2c266800d8 category: bugfix bugzilla: 186606, https://gitee.com/src-openeuler/kernel/issues/I53SSV CVE: CVE-2022-1353 -------------------------------- [ Upstream commit 9a564bccb78a76740ea9d75a259942df8143d02c ] Add __GFP_ZERO flag for compose_sadb_supported in function pfkey_register to initialize the buffer of supp_skb to fix a kernel-info-leak issue. 1) Function pfkey_register calls compose_sadb_supported to request a sk_buff. 2) compose_sadb_supported calls alloc_sbk to allocate a sk_buff, but it doesn't zero it. 3) If auth_len is greater 0, then compose_sadb_supported treats the memory as a struct sadb_supported and begins to initialize. But it just initializes the field sadb_supported_len and field sadb_supported_exttype without field sadb_supported_reserved. Reported-by: TCS Robot <tcs_robot(a)tencent.com> Signed-off-by: Haimin Zhang <tcs_kernel(a)tencent.com> Signed-off-by: Steffen Klassert <steffen.klassert(a)secunet.com> Signed-off-by: Sasha Levin <sashal(a)kernel.org> Signed-off-by: Xu Jia <xujia39(a)huawei.com> Reviewed-by: Wei Yongjun <weiyongjun1(a)huawei.com> Reviewed-by: Wang Weiyang <wangweiyang2(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- net/key/af_key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index ef9b4ac03e7b..b95684b8903e 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1703,7 +1703,7 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, const struct sad xfrm_probe_algs(); - supp_skb = compose_sadb_supported(hdr, GFP_KERNEL); + supp_skb = compose_sadb_supported(hdr, GFP_KERNEL | __GFP_ZERO); if (!supp_skb) { if (hdr->sadb_msg_satype != SADB_SATYPE_UNSPEC) pfk->registered &= ~(1<<hdr->sadb_msg_satype); -- 2.20.1

1 27

[PATCH openEuler-5.10 01/29] spi: hisi-kunpeng: Add debugfs support
by Zheng Zengkai 19 Apr '22

19 Apr '22

From: Jay Fang <f.fangjian(a)huawei.com> mainline inclusion from mainline-v5.14-rc1 commit 2b2142f247eb category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4UR1H CVE: NA Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… ----------------------------------------------------------------------- This patch uses debugfs_regset32 interface to create the registers dump file. Use it instead of creating a generic debugfs file with manually written read callback function. With these entries, users can check all the SPI controller registers during run time. Signed-off-by: Jay Fang <f.fangjian(a)huawei.com> Link: https://lore.kernel.org/r/1622789718-13977-1-git-send-email-f.fangjian@huaw… Signed-off-by: Mark Brown <broonie(a)kernel.org> Reviewed-by: Jay Fang <f.fangjian(a)huawei.com> Acked-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> --- drivers/spi/spi-hisi-kunpeng.c | 51 +++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-hisi-kunpeng.c b/drivers/spi/spi-hisi-kunpeng.c index 3f986ba1c328..58b823a16fc4 100644 --- a/drivers/spi/spi-hisi-kunpeng.c +++ b/drivers/spi/spi-hisi-kunpeng.c @@ -9,6 +9,7 @@ #include <linux/acpi.h> #include <linux/bitfield.h> +#include <linux/debugfs.h> #include <linux/delay.h> #include <linux/err.h> #include <linux/interrupt.h> @@ -126,6 +127,7 @@ struct hisi_spi { void __iomem *regs; int irq; u32 fifo_len; /* depth of the FIFO buffer */ + u16 bus_num; /* Current message transfer state info */ const void *tx; @@ -133,8 +135,49 @@ struct hisi_spi { void *rx; unsigned int rx_len; u8 n_bytes; /* current is a 1/2/4 bytes op */ + + struct dentry *debugfs; + struct debugfs_regset32 regset; +}; + +#define HISI_SPI_DBGFS_REG(_name, _off) \ +{ \ + .name = _name, \ + .offset = _off, \ +} + +static const struct debugfs_reg32 hisi_spi_regs[] = { + HISI_SPI_DBGFS_REG("CSCR", HISI_SPI_CSCR), + HISI_SPI_DBGFS_REG("CR", HISI_SPI_CR), + HISI_SPI_DBGFS_REG("ENR", HISI_SPI_ENR), + HISI_SPI_DBGFS_REG("FIFOC", HISI_SPI_FIFOC), + HISI_SPI_DBGFS_REG("IMR", HISI_SPI_IMR), + HISI_SPI_DBGFS_REG("DIN", HISI_SPI_DIN), + HISI_SPI_DBGFS_REG("DOUT", HISI_SPI_DOUT), + HISI_SPI_DBGFS_REG("SR", HISI_SPI_SR), + HISI_SPI_DBGFS_REG("RISR", HISI_SPI_RISR), + HISI_SPI_DBGFS_REG("ISR", HISI_SPI_ISR), + HISI_SPI_DBGFS_REG("ICR", HISI_SPI_ICR), + HISI_SPI_DBGFS_REG("VERSION", HISI_SPI_VERSION), }; +static int hisi_spi_debugfs_init(struct hisi_spi *hs) +{ + char name[32]; + + snprintf(name, 32, "hisi_spi%d", hs->bus_num); + hs->debugfs = debugfs_create_dir(name, NULL); + if (!hs->debugfs) + return -ENOMEM; + + hs->regset.regs = hisi_spi_regs; + hs->regset.nregs = ARRAY_SIZE(hisi_spi_regs); + hs->regset.base = hs->regs; + debugfs_create_regset32("registers", 0400, hs->debugfs, &hs->regset); + + return 0; +} + static u32 hisi_spi_busy(struct hisi_spi *hs) { return readl(hs->regs + HISI_SPI_SR) & SR_BUSY; @@ -424,6 +467,7 @@ static int hisi_spi_probe(struct platform_device *pdev) hs = spi_controller_get_devdata(master); hs->dev = dev; hs->irq = irq; + hs->bus_num = pdev->id; hs->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hs->regs)) @@ -446,7 +490,7 @@ static int hisi_spi_probe(struct platform_device *pdev) master->use_gpio_descriptors = true; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); - master->bus_num = pdev->id; + master->bus_num = hs->bus_num; master->setup = hisi_spi_setup; master->cleanup = hisi_spi_cleanup; master->transfer_one = hisi_spi_transfer_one; @@ -462,6 +506,9 @@ static int hisi_spi_probe(struct platform_device *pdev) return ret; } + if (hisi_spi_debugfs_init(hs)) + dev_info(dev, "failed to create debugfs dir\n"); + ret = spi_register_controller(master); if (ret) { dev_err(dev, "failed to register spi master, ret=%d\n", ret); @@ -478,7 +525,9 @@ static int hisi_spi_probe(struct platform_device *pdev) static int hisi_spi_remove(struct platform_device *pdev) { struct spi_controller *master = platform_get_drvdata(pdev); + struct hisi_spi *hs = spi_controller_get_devdata(master); + debugfs_remove_recursive(hs->debugfs); spi_unregister_controller(master); return 0; -- 2.20.1

1 28

[PATCH openEuler-5.10 00/12] Backport CVE fix patches
by Zheng Zengkai 19 Apr '22

19 Apr '22

Backport following CVE fix patches: CVE-2022-1055: 04c2a47ffb13c net: sched: fix use-after-free in tc_new_tfilter() CVE-2022-23036: 6b1775f26a2d xen/grant-table: add gnttab_try_end_foreign_access() abf1fd5919d6 xen/blkfront: don't use gnttab_query_foreign_access() for mapped status CVE-2022-23037: 31185df7e2b1d xen/netfront: don't use gnttab_query_foreign_access() for mapped status CVE-2022-23038: 33172ab50a535 xen/scsifront: don't use gnttab_query_foreign_access() for mapped status CVE-2022-23039: d3b6372c5881 xen/gntalloc: don't use gnttab_query_foreign_access() CVE-2022-23040: 3777ea7bac31 xen/xenbus: don't let xenbus_grant_ring() remove grants in error case CVE-2022-23041: 5cadd4bb1d7f xen/9p: use alloc/free_pages_exact() b0576cc9c6b8 xen/pvcalls: use alloc/free_pages_exact() 42baefac638f xen/gnttab: fix gnttab_end_foreign_access() without page specified CVE-2022-23042: 66e3531b33ee5 xen/netfront: react properly to failing gnttab_end_foreign_access_ref() Eric Dumazet (1): net: sched: fix use-after-free in tc_new_tfilter() Juergen Gross (11): xen/xenbus: don't let xenbus_grant_ring() remove grants in error case xen/grant-table: add gnttab_try_end_foreign_access() xen/blkfront: don't use gnttab_query_foreign_access() for mapped status xen/netfront: don't use gnttab_query_foreign_access() for mapped status xen/scsifront: don't use gnttab_query_foreign_access() for mapped status xen/gntalloc: don't use gnttab_query_foreign_access() xen: remove gnttab_query_foreign_access() xen/9p: use alloc/free_pages_exact() xen/pvcalls: use alloc/free_pages_exact() xen/gnttab: fix gnttab_end_foreign_access() without page specified xen/netfront: react properly to failing gnttab_end_foreign_access_ref() drivers/block/xen-blkfront.c | 63 +++++++++++++++----------- drivers/net/xen-netfront.c | 54 ++++++++++++++--------- drivers/scsi/xen-scsifront.c | 3 +- drivers/xen/gntalloc.c | 25 +++-------- drivers/xen/grant-table.c | 71 ++++++++++++++++-------------- drivers/xen/pvcalls-front.c | 8 ++-- drivers/xen/xenbus/xenbus_client.c | 24 +++++----- include/xen/grant_table.h | 19 +++++++- net/9p/trans_xen.c | 14 +++--- net/sched/cls_api.c | 11 +++-- 10 files changed, 162 insertions(+), 130 deletions(-) -- 2.20.1

1 12

[PATCH openEuler-5.10 00/22] Backport 5.10.93 LTS patches
by Zheng Zengkai 19 Apr '22

19 Apr '22

Backport 5.10.93 LTS patches from upstream. Conflicts: already merged(git am --skip): 7f4308792a vfs: fs_context: fix up param length parsing in legacy_parse_param Arie Geiger (1): ALSA: hda/realtek: Add speaker fixup for some Yoga 15ITL5 devices Arnd Bergmann (1): mtd: fixup CFI on ixp4xx Baole Fang (1): ALSA: hda/realtek: Add quirk for Legion Y9000X 2020 Bart Kroon (1): ALSA: hda: ALC287: Add Lenovo IdeaPad Slim 9i 14ITL5 speaker quirk Christian Brauner (1): 9p: only copy valid iattrs in 9P2000.L setattr implementation Christian Lachner (1): ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot from Windows Christophe JAILLET (1): orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc() Eric Farman (1): KVM: s390: Clarify SIGP orders versus STOP/RESTART Javier Martinez Canillas (1): video: vga16fb: Only probe for EGA and VGA 16 color graphic cards Johan Hovold (4): media: uvcvideo: fix division by zero at stream start firmware: qemu_fw_cfg: fix sysfs information leak firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entries firmware: qemu_fw_cfg: fix kobject leak in probe error path Larry Finger (1): rtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts enabled Nathan Chancellor (1): kbuild: Add $(KBUILD_HOSTLDFLAGS) to 'has_libelf' test NeilBrown (1): devtmpfs regression fix: reconfigure on each mount Nicholas Piggin (1): powerpc/pseries: Get entry and uaccess flush required bits from H_GET_CPU_CHARACTERISTICS Sean Christopherson (2): perf: Protect perf_guest_cbs with RCU KVM: x86: Register Processor Trace interrupt hook iff PT enabled in guest Stephen Boyd (1): remoteproc: qcom: pil_info: Don't memcpy_toio more than is provided Takashi Iwai (1): ALSA: hda/realtek: Re-order quirk entries for Lenovo Wei Wang (1): KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all Makefile | 2 +- arch/arm/kernel/perf_callchain.c | 17 ++++--- arch/arm64/kernel/perf_callchain.c | 18 ++++--- arch/csky/kernel/perf_callchain.c | 6 ++- arch/nds32/kernel/perf_event_cpu.c | 17 ++++--- arch/powerpc/include/asm/hvcall.h | 2 + arch/powerpc/platforms/pseries/setup.c | 6 +++ arch/riscv/kernel/perf_callchain.c | 7 ++- arch/s390/kvm/interrupt.c | 7 +++ arch/s390/kvm/kvm-s390.c | 9 +++- arch/s390/kvm/kvm-s390.h | 1 + arch/s390/kvm/sigp.c | 28 ++++++++++ arch/x86/events/core.c | 17 ++++--- arch/x86/events/intel/core.c | 9 ++-- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 7 ++- drivers/base/devtmpfs.c | 7 +++ drivers/firmware/qemu_fw_cfg.c | 20 +++----- drivers/media/usb/uvc/uvc_video.c | 4 ++ drivers/mtd/chips/Kconfig | 2 + drivers/mtd/maps/Kconfig | 2 +- .../wireless/realtek/rtlwifi/rtl8192cu/hw.c | 1 + drivers/remoteproc/qcom_pil_info.c | 2 +- drivers/video/fbdev/vga16fb.c | 24 +++++++++ fs/9p/vfs_inode_dotl.c | 29 +++++++---- fs/orangefs/orangefs-bufmap.c | 7 ++- fs/super.c | 4 +- include/linux/fs_context.h | 2 + include/linux/perf_event.h | 13 ++++- kernel/events/core.c | 13 +++-- sound/pci/hda/patch_realtek.c | 51 +++++++++++++++++-- 32 files changed, 264 insertions(+), 72 deletions(-) -- 2.20.1

1 22

[PATCH openEuler-5.10 00/23] Backport 5.10.92 LTS patches
by Zheng Zengkai 19 Apr '22

19 Apr '22

Backport 5.10.92 LTS patches from upstream. Conflicts: already merged(git am --skip): 35ab8c9085b0a bpf: Fix out of bounds access from invalid *_or_null type verification Aaron Ma (2): Bluetooth: btusb: Add support for Foxconn MT7922A Bluetooth: btusb: Add support for Foxconn QCA 0xe0d0 Adrian Hunter (1): mmc: sdhci-pci: Add PCI ID for Intel ADL Alan Stern (2): USB: core: Fix bug in resuming hub's handling of wakeup requests USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status Andy Shevchenko (1): mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe() Arnd Bergmann (1): staging: greybus: fix stack size warning with UBSAN Brian Silverman (1): can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved} Daniel Borkmann (1): veth: Do not record rx queue hint in veth_xmit Dominik Brodowski (1): random: fix crash on multiple early calls to add_bootloader_randomness() Eric Biggers (2): random: fix data race on crng_node_pool random: fix data race on crng init time Frederic Weisbecker (1): workqueue: Fix unbind_workers() VS wq_worker_running() race Johan Hovold (1): Bluetooth: bfusb: fix division by zero in send path Marc Kleine-Budde (2): can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data can: isotp: convert struct tpcon::{idx,len} to unsigned int Mark-YW.Chen (1): Bluetooth: btusb: fix memory leak in btusb_mtk_submit_wmt_recv_urb() Nathan Chancellor (2): staging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn() drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk() Paul Cercueil (1): ARM: dts: exynos: Fix BCM4330 Bluetooth reset polarity in I9100 Ricardo Ribalda (1): media: Revert "media: uvcvideo: Set unique vdev name based in type" Sven Eckelmann (1): ath11k: Fix buffer overflow when scanning with extraie Zijun Hu (1): Bluetooth: btusb: Add two more Bluetooth parts for WCN6855 arch/arm/boot/dts/exynos4210-i9100.dts | 2 +- drivers/bluetooth/bfusb.c | 3 + drivers/bluetooth/btusb.c | 22 +++++ drivers/char/random.c | 117 +++++++++++++---------- drivers/gpu/drm/i915/intel_pm.c | 6 +- drivers/media/usb/uvc/uvc_driver.c | 7 +- drivers/mfd/intel-lpss-acpi.c | 7 +- drivers/mmc/host/sdhci-pci-core.c | 1 + drivers/mmc/host/sdhci-pci.h | 1 + drivers/net/can/usb/gs_usb.c | 5 +- drivers/net/veth.c | 1 - drivers/net/wireless/ath/ath11k/wmi.c | 6 +- drivers/staging/greybus/audio_topology.c | 92 +++++++++--------- drivers/staging/wlan-ng/hfa384x_usb.c | 22 ++--- drivers/usb/core/hcd.c | 9 +- drivers/usb/core/hub.c | 2 +- kernel/workqueue.c | 9 ++ net/can/isotp.c | 4 +- 18 files changed, 190 insertions(+), 126 deletions(-) -- 2.20.1

1 23

转发：Welcome to the "Kernel" mailing list
by 王滨 19 Apr '22

19 Apr '22

help ------------------ 原始邮件 ------------------ 发件人: "kernel-request" <kernel-request(a)openeuler.org>; 发送时间: 2022年4月19日(星期二) 下午4:29 收件人: "王滨"<734059002(a)qq.com>; 主题: Welcome to the "Kernel" mailing list 欢迎使用“Kernel”邮件列表！要通过此列表交流，请发送电子邮件至:     kernel(a)openeuler.org 取消订阅或调整选项请发送电子邮件至:     kernel-leave(a)openeuler.org 在主题或正文中使用"help"一词(不包括引号), 您将会收到一条带有说明的信息。更改设置需要用到密码，但出于安全考虑，此处不包括此密码。如果您忘记了密码，则需要通过网络用户界面重置密码。 Welcome to the "Kernel" mailing list! To post to this list, send your email to:   kernel(a)openeuler.org You can unsubscribe or make adjustments to your options via email by sending a message to:   kernel-leave(a)openeuler.org with the word 'help' in the subject or body (don't include the quotes), and you will receive a message with instructions.  You will need your password to change your options, but for security purposes, this password is not included here.  If you have forgotten your password, you will need to reset it via the web UI.

1 0

转发：Welcome to the "Kernel" mailing list
by 王滨 19 Apr '22

19 Apr '22

------------------ 原始邮件 ------------------ 发件人: "kernel-request" <kernel-request(a)openeuler.org>; 发送时间: 2022年4月19日(星期二) 下午4:29 收件人: "王滨"<734059002(a)qq.com>; 主题: Welcome to the "Kernel" mailing list 欢迎使用“Kernel”邮件列表！要通过此列表交流，请发送电子邮件至:     kernel(a)openeuler.org 取消订阅或调整选项请发送电子邮件至:     kernel-leave(a)openeuler.org 在主题或正文中使用"help"一词(不包括引号), 您将会收到一条带有说明的信息。更改设置需要用到密码，但出于安全考虑，此处不包括此密码。如果您忘记了密码，则需要通过网络用户界面重置密码。 Welcome to the "Kernel" mailing list! To post to this list, send your email to:   kernel(a)openeuler.org You can unsubscribe or make adjustments to your options via email by sending a message to:   kernel-leave(a)openeuler.org with the word 'help' in the subject or body (don't include the quotes), and you will receive a message with instructions.  You will need your password to change your options, but for security purposes, this password is not included here.  If you have forgotten your password, you will need to reset it via the web UI.

1 0

[PATCH OLK-5.10] Driver for Zhaoxin CPU core temperature monitoring
by LeoLiuoc 19 Apr '22

19 Apr '22

zhaoxin inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I52DS7 CVE: NA Add support for the temperature sensor inside CPU. Supported are all known variants of the Zhaoxin processors. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- drivers/hwmon/Kconfig | 9 + drivers/hwmon/Makefile | 1 + drivers/hwmon/via-cputemp.c | 1 - drivers/hwmon/zhaoxin-cputemp.c | 292 ++++++++++++++++++++++++++++++++ 4 files changed, 302 insertions(+), 1 deletion(-) create mode 100644 drivers/hwmon/zhaoxin-cputemp.c diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 0c2b032ee617..c11c3c46898a 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1889,6 +1889,15 @@ config SENSORS_VIA_CPUTEMP sensor inside your CPU. Supported are all known variants of the VIA C7 and Nano. +config SENSORS_ZHAOXIN_CPUTEMP + tristate "Zhaoxin CPU temperature sensor" + depends on X86 + select HWMON_VID + help + If you say yes here you get support for the temperature + sensor inside your CPU. Supported are all known variants of + the Zhaoxin processors. + config SENSORS_VIA686A tristate "VIA686A" depends on PCI diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 9db2903b61e5..2427687972c9 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -184,6 +184,7 @@ obj-$(CONFIG_SENSORS_TMP421) += tmp421.o obj-$(CONFIG_SENSORS_TMP513) += tmp513.o obj-$(CONFIG_SENSORS_VEXPRESS) += vexpress-hwmon.o obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o +obj-$(CONFIG_SENSORS_ZHAOXIN_CPUTEMP) += zhaoxin-cputemp.o obj-$(CONFIG_SENSORS_VIA686A) += via686a.o obj-$(CONFIG_SENSORS_VT1211) += vt1211.o obj-$(CONFIG_SENSORS_VT8231) += vt8231.o diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c index e5d18dac8ee7..0a5057dbe51a 100644 --- a/drivers/hwmon/via-cputemp.c +++ b/drivers/hwmon/via-cputemp.c @@ -273,7 +273,6 @@ static const struct x86_cpu_id __initconst cputemp_ids[] = { X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_A, NULL), X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_C7_D, NULL), X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 6, X86_CENTAUR_FAM6_NANO, NULL), - X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 7, X86_MODEL_ANY, NULL), {} }; MODULE_DEVICE_TABLE(x86cpu, cputemp_ids); diff --git a/drivers/hwmon/zhaoxin-cputemp.c b/drivers/hwmon/zhaoxin-cputemp.c new file mode 100644 index 000000000000..dcedb51515f0 --- /dev/null +++ b/drivers/hwmon/zhaoxin-cputemp.c @@ -0,0 +1,292 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * zhaoxin-cputemp.c - Driver for Zhaoxin CPU core temperature monitoring + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/slab.h> +#include <linux/hwmon.h> +#include <linux/hwmon-vid.h> +#include <linux/sysfs.h> +#include <linux/hwmon-sysfs.h> +#include <linux/err.h> +#include <linux/mutex.h> +#include <linux/list.h> +#include <linux/platform_device.h> +#include <linux/cpu.h> +#include <asm/msr.h> +#include <asm/processor.h> +#include <asm/cpu_device_id.h> + +#define DRVNAME "zhaoxin_cputemp" + +enum { SHOW_TEMP, SHOW_LABEL, SHOW_NAME }; + +/* Functions declaration */ + +struct zhaoxin_cputemp_data { + struct device *hwmon_dev; + const char *name; + u8 vrm; + u32 id; + u32 msr_temp; + u32 msr_vid; +}; + +/* Sysfs stuff */ + +static ssize_t name_show(struct device *dev, struct device_attribute *devattr, + char *buf) +{ + int ret; + struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); + struct zhaoxin_cputemp_data *data = dev_get_drvdata(dev); + + if (attr->index == SHOW_NAME) + ret = sprintf(buf, "%s\n", data->name); + else /* show label */ + ret = sprintf(buf, "Core %d\n", data->id); + return ret; +} + +static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, char *buf) +{ + struct zhaoxin_cputemp_data *data = dev_get_drvdata(dev); + u32 eax, edx; + int err; + + err = rdmsr_safe_on_cpu(data->id, data->msr_temp, &eax, &edx); + if (err) + return -EAGAIN; + + return sprintf(buf, "%lu\n", ((unsigned long)eax & 0xffffff) * 1000); +} + +static ssize_t cpu0_vid_show(struct device *dev, struct device_attribute *devattr, char *buf) +{ + struct zhaoxin_cputemp_data *data = dev_get_drvdata(dev); + u32 eax, edx; + int err; + + err = rdmsr_safe_on_cpu(data->id, data->msr_vid, &eax, &edx); + if (err) + return -EAGAIN; + + return sprintf(buf, "%d\n", vid_from_reg(~edx & 0x7f, data->vrm)); +} + +static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, SHOW_TEMP); +static SENSOR_DEVICE_ATTR_RO(temp1_label, name, SHOW_LABEL); +static SENSOR_DEVICE_ATTR_RO(name, name, SHOW_NAME); + +static struct attribute *zhaoxin_cputemp_attributes[] = { + &sensor_dev_attr_name.dev_attr.attr, + &sensor_dev_attr_temp1_label.dev_attr.attr, + &sensor_dev_attr_temp1_input.dev_attr.attr, + NULL +}; + +static const struct attribute_group zhaoxin_cputemp_group = { + .attrs = zhaoxin_cputemp_attributes, +}; + +/* Optional attributes */ +static DEVICE_ATTR_RO(cpu0_vid); + +static int zhaoxin_cputemp_probe(struct platform_device *pdev) +{ + struct zhaoxin_cputemp_data *data; + int err; + u32 eax, edx; + + data = devm_kzalloc(&pdev->dev, sizeof(struct zhaoxin_cputemp_data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->id = pdev->id; + data->name = "zhaoxin_cputemp"; + data->msr_temp = 0x1423; + + /* test if we can access the TEMPERATURE MSR */ + err = rdmsr_safe_on_cpu(data->id, data->msr_temp, &eax, &edx); + if (err) { + dev_err(&pdev->dev, "Unable to access TEMPERATURE MSR, giving up\n"); + return err; + } + + platform_set_drvdata(pdev, data); + + err = sysfs_create_group(&pdev->dev.kobj, &zhaoxin_cputemp_group); + if (err) + return err; + + if (data->msr_vid) + data->vrm = vid_which_vrm(); + + if (data->vrm) { + err = device_create_file(&pdev->dev, &dev_attr_cpu0_vid); + if (err) + goto exit_remove; + } + + data->hwmon_dev = hwmon_device_register(&pdev->dev); + if (IS_ERR(data->hwmon_dev)) { + err = PTR_ERR(data->hwmon_dev); + dev_err(&pdev->dev, "Class registration failed (%d)\n", err); + goto exit_remove; + } + + return 0; + +exit_remove: + if (data->vrm) + device_remove_file(&pdev->dev, &dev_attr_cpu0_vid); + sysfs_remove_group(&pdev->dev.kobj, &zhaoxin_cputemp_group); + return err; +} + +static int zhaoxin_cputemp_remove(struct platform_device *pdev) +{ + struct zhaoxin_cputemp_data *data = platform_get_drvdata(pdev); + + hwmon_device_unregister(data->hwmon_dev); + if (data->vrm) + device_remove_file(&pdev->dev, &dev_attr_cpu0_vid); + sysfs_remove_group(&pdev->dev.kobj, &zhaoxin_cputemp_group); + return 0; +} + +static struct platform_driver zhaoxin_cputemp_driver = { + .driver = { + .name = DRVNAME, + }, + .probe = zhaoxin_cputemp_probe, + .remove = zhaoxin_cputemp_remove, +}; + +struct pdev_entry { + struct list_head list; + struct platform_device *pdev; + unsigned int cpu; +}; + +static LIST_HEAD(pdev_list); +static DEFINE_MUTEX(pdev_list_mutex); + +static int zhaoxin_cputemp_online(unsigned int cpu) +{ + int err; + struct platform_device *pdev; + struct pdev_entry *pdev_entry; + + pdev = platform_device_alloc(DRVNAME, cpu); + if (!pdev) { + err = -ENOMEM; + pr_err("Device allocation failed\n"); + goto exit; + } + + pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL); + if (!pdev_entry) { + err = -ENOMEM; + goto exit_device_put; + } + + err = platform_device_add(pdev); + if (err) { + pr_err("Device addition failed (%d)\n", err); + goto exit_device_free; + } + + pdev_entry->pdev = pdev; + pdev_entry->cpu = cpu; + mutex_lock(&pdev_list_mutex); + list_add_tail(&pdev_entry->list, &pdev_list); + mutex_unlock(&pdev_list_mutex); + + return 0; + +exit_device_free: + kfree(pdev_entry); +exit_device_put: + platform_device_put(pdev); +exit: + return err; +} + +static int zhaoxin_cputemp_down_prep(unsigned int cpu) +{ + struct pdev_entry *p; + + mutex_lock(&pdev_list_mutex); + list_for_each_entry(p, &pdev_list, list) { + if (p->cpu == cpu) { + platform_device_unregister(p->pdev); + list_del(&p->list); + mutex_unlock(&pdev_list_mutex); + kfree(p); + return 0; + } + } + mutex_unlock(&pdev_list_mutex); + return 0; +} + +static const struct x86_cpu_id __initconst cputemp_ids[] = { + X86_MATCH_VENDOR_FAM_MODEL(CENTAUR, 7, X86_MODEL_ANY, NULL), + X86_MATCH_VENDOR_FAM_MODEL(ZHAOXIN, 7, X86_MODEL_ANY, NULL), + {} +}; +MODULE_DEVICE_TABLE(x86cpu, cputemp_ids); + +static enum cpuhp_state zhaoxin_temp_online; + +static int __init zhaoxin_cputemp_init(void) +{ + int err; + + if (!x86_match_cpu(cputemp_ids)) + return -ENODEV; + + err = platform_driver_register(&zhaoxin_cputemp_driver); + if (err) + goto exit; + + err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "hwmon/zhaoxin:online", + zhaoxin_cputemp_online, zhaoxin_cputemp_down_prep); + if (err < 0) + goto exit_driver_unreg; + zhaoxin_temp_online = err; + +#ifndef CONFIG_HOTPLUG_CPU + if (list_empty(&pdev_list)) { + err = -ENODEV; + goto exit_hp_unreg; + } +#endif + return 0; + +#ifndef CONFIG_HOTPLUG_CPU +exit_hp_unreg: + cpuhp_remove_state_nocalls(zhaoxin_temp_online); +#endif +exit_driver_unreg: + platform_driver_unregister(&zhaoxin_cputemp_driver); +exit: + return err; +} + +static void __exit zhaoxin_cputemp_exit(void) +{ + cpuhp_remove_state(zhaoxin_temp_online); + platform_driver_unregister(&zhaoxin_cputemp_driver); +} + +MODULE_DESCRIPTION("Zhaoxin CPU temperature monitor"); +MODULE_LICENSE("GPL"); + +module_init(zhaoxin_cputemp_init) +module_exit(zhaoxin_cputemp_exit) -- 2.20.1

1 0

[PATCH openEuler-5.10] vfio: pci: fix Memory deallocated more than once fault_pages
by yan 18 Apr '22

18 Apr '22

1 0

[PATCH openEuler-5.10] net: wireless: fix out of bounds read write to a buffer
by yan 18 Apr '22

18 Apr '22

1 0