- Cloud Kernel - lists.openanolis.cn

[4.19 PATCH] fuse: add FUSE_WRITE_KILL_PRIV

by Jeffle Xu

From: Miklos Szeredi <mszeredi(a)redhat.com> commit 4a2abf99f9c2877039006b8dfb3ec4e0d1278fe8 upstream In the FOPEN_DIRECT_IO case the write path doesn't call file_remove_privs() and that means setuid bit is not cleared if unpriviliged user writes to a file with setuid bit set. pjdfstest chmod test 12.t tests this and fails. Fix this by adding a flag to the FUSE_WRITE message that requests clearing privileges on the given file. This needs This better than just calling fuse_remove_privs(), because the attributes may not be up to date, so in that case a write may miss clearing the privileges. Test case: $ passthrough_ll /mnt/pasthrough-mnt -o default_permissions,allow_other,cache=never $ mkdir /mnt/pasthrough-mnt/testdir $ cd /mnt/pasthrough-mnt/testdir $ prove -rv pjdfstests/tests/chmod/12.t Reported-by: Vivek Goyal <vgoyal(a)redhat.com> Signed-off-by: Miklos Szeredi <mszeredi(a)redhat.com> Tested-by: Vivek Goyal <vgoyal(a)redhat.com> Signed-off-by: Jeffle Xu <jefflexu(a)linux.alibaba.com> --- Corresponding virtiofsd commits can refer to [1] virtiofsd: Parse flag FUSE_WRITE_KILL_PRIV https://gitlab.com/virtio-fs/qemu/-/commit/f779bc5265e7e7abb13a03d4bfbc7415… [2] virtiofsd: Drop CAP_FSETID if client asked for it https://gitlab.com/virtio-fs/qemu/-/commit/ee88465224b3aed2596049caa28f86cb… --- fs/fuse/file.c | 11 +++++++++-- include/uapi/linux/fuse.h | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 80f991ac4a0a..e6d2e5e2b072 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1404,10 +1404,17 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter, if (err && !nbytes) break; - if (write) + if (write) { + if (!capable(CAP_FSETID)) { + struct fuse_write_in *inarg; + + inarg = &req->misc.write.in; + inarg->write_flags |= FUSE_WRITE_KILL_PRIV; + } nres = fuse_send_write(req, io, pos, nbytes, owner); - else + } else { nres = fuse_send_read(req, io, pos, nbytes, owner); + } if (!io->async) fuse_release_user_pages(req, io->should_dirty); diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 1c6956b32597..5a011734a97b 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -120,6 +120,9 @@ * 7.28 * - add FOPEN_CACHE_DIR * - add FUSE_CACHE_SYMLINKS + * + * 7.31 + * - add FUSE_WRITE_KILL_PRIV flag */ #ifndef _LINUX_FUSE_H @@ -315,9 +318,11 @@ struct fuse_file_lock { * * FUSE_WRITE_CACHE: delayed write from page cache, file handle is guessed * FUSE_WRITE_LOCKOWNER: lock_owner field is valid + * FUSE_WRITE_KILL_PRIV: kill suid and sgid bits */ #define FUSE_WRITE_CACHE (1 << 0) #define FUSE_WRITE_LOCKOWNER (1 << 1) +#define FUSE_WRITE_KILL_PRIV (1 << 2) /** * Read flags -- 2.27.0

3 years, 8 months

2
2
0 0

anolis-linux

by byhoo

3 years, 8 months

1
0
0 0

[PATCH] ck: virtiofs: remove unused vertab_len and vertab_kaddr fields

by Jeffle Xu

These two fields were originally introduced for metadata coherency, and shall be used by [1]. However, this feature doesn't get merged to upstream, and we didn't backport [1] yet. Thus remove these two stale fields. [1] "fuse: add shared version support" https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1873773.html Signed-off-by: Jeffle Xu <jefflexu(a)linux.alibaba.com> --- fs/fuse/fuse_i.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 83632816b581..c0799cc2249f 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -83,12 +83,6 @@ struct fuse_mount_data { /* fuse_dev pointer to fill in, should contain NULL on entry */ void **fudptr; - - /* version table length in bytes */ - size_t vertab_len; - - /* version table kernel address */ - void *vertab_kaddr; }; /* One forget request */ -- 2.27.0

3 years, 8 months

3
4
0 0

[ANCK-4.19 PATCH 0/9] fuse: support CACHE_DIR/CACHE_SYMLINK

by Jeffle Xu

patch 1-8: support CACHE_DIR patch 9: support CACHE_SYMLINK Dan Schatzberg (1): fuse: enable caching of symlinks Miklos Szeredi (7): fuse: add FOPEN_CACHE_DIR fuse: extract fuse_emit() helper fuse: allow caching readdir fuse: allow using readdir cache fuse: add readdir cache version fuse: use mtime for readdir cache verification fuse: use iversion for readdir cache verification Tejun Heo (1): fuse: fix beyond-end-of-page access in fuse_parse_cache() fs/fuse/dir.c | 129 +++++++++++---- fs/fuse/file.c | 2 + fs/fuse/fuse_i.h | 46 ++++++ fs/fuse/inode.c | 9 +- fs/fuse/readdir.c | 330 ++++++++++++++++++++++++++++++++++++-- include/uapi/linux/fuse.h | 8 + 6 files changed, 482 insertions(+), 42 deletions(-) -- 2.27.0

3 years, 8 months

2
18
0 0

[PATCH 01/17] Crypto: CCP: Add a new interface for X86 sending command to PSP

by fenghao＠openanolis.org

From: niuyongwen <niuyongwen(a)hygon.cn> HYGON's fTPM and TDM need to send commands to PSP to complete the firmware function. In order to be compatible with the original kernel code, The command of psp_do_cmd is added to send the command from x86 to PSP. The interface is currently used for fTPM and TDM of HYGON. Change-Id: I47b01f10e67ea77cf31c7b021532728f1c3f1323 Signed-off-by: niuyongwen <niuyongwen(a)hygon.cn> --- drivers/crypto/ccp/psp-dev.c | 6 ++++++ include/linux/psp-sev.h | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index 1603dc8d2d75..cf65991723c4 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -216,6 +216,12 @@ static int sev_do_cmd(int cmd, void *data, int *psp_ret) return rc; } +int psp_do_cmd(int cmd, void *data, int *psp_ret) +{ + return sev_do_cmd(cmd, data, psp_ret); +} +EXPORT_SYMBOL_GPL(psp_do_cmd); + static int __sev_platform_init_locked(int *error) { struct psp_device *psp = psp_master; diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index 827c601841c4..6a5854ac5e93 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -487,6 +487,8 @@ struct sev_data_dbg { #ifdef CONFIG_CRYPTO_DEV_SP_PSP +int psp_do_cmd(int cmd, void *data, int *psp_ret); + /** * sev_platform_init - perform SEV INIT command * @@ -603,6 +605,8 @@ void *psp_copy_user_blob(u64 __user uaddr, u32 len); #else /* !CONFIG_CRYPTO_DEV_SP_PSP */ +static inline int psp_do_cmd(int cmd, void *data, int *psp_ret) { return -ENODEV; } + static inline int sev_platform_status(struct sev_user_data_status *status, int *error) { return -ENODEV; } -- 2.17.1

3 years, 9 months

1
16
0 0

[PATCH] ck: crypto: ccp: Add Hygon CSV support

by 冯浩

From: Hao Feng <fenghao(a)hygon.cn> Hygon CPU has 2 CCP devices, add them in the device list. Signed-off-by: Hao Feng <fenghao(a)hygon.cn> --- drivers/crypto/ccp/sp-pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index 7da93e9bebed..0801e7ae0704 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -325,6 +325,8 @@ static const struct pci_device_id sp_pci_table[] = { { PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&dev_vdata[1] }, { PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&dev_vdata[2] }, { PCI_VDEVICE(AMD, 0x1486), (kernel_ulong_t)&dev_vdata[3] }, + { PCI_VDEVICE(HYGON, 0x1456), (kernel_ulong_t)&dev_vdata[1] }, + { PCI_VDEVICE(HYGON, 0x1468), (kernel_ulong_t)&dev_vdata[2] }, /* Last entry must be zero */ { 0, } }; -- 2.17.1

3 years, 11 months

2
1
0 0

回复：[PATCH] ck: crypto: ccp: Add Hygon CCP support

by 冯浩

建议同后面patch一同发出，一起review。 >> 支持国密的patch会作为单独的功能发出来。这个patch使能了X86和CCP的通信接口，支持海光CSV功能，需要先合入。 Thanks Hao ------------------------------------------------------------------ 发件人：富邻 <artie.ding(a)openanolis.org> 发送时间：2021年5月25日(星期二) 16:29 收件人：冯浩 <fenghao(a)openanolis.org>; cloud-kernel <cloud-kernel(a)lists.OpenAnolis.org> 抄　送：Hao Feng <fenghao(a)hygon.cn>; allenli <allenli(a)hygon.cn>; yingzhiwei <yingzhiwei(a)hygon.cn> 主　题：Re: 回复：回复：[PATCH] ck: crypto: ccp: Add Hygon CCP support Hao, 建议同后面patch一同发出，一起review。 BR Artie 在 2021/5/25 下午3:44, 冯浩写道: 确认一下，Hygon CCP是否兼容AMD CCP？ >> 是的，Hygon CCP和AMD CCP的硬件接口一样。是否要有其他相关patch来支持Hygon CCP？ >> Hygon CCP支持国密，后续会有添加国密支持的patch。 Thanks Hao ------------------------------------------------------------------ 发件人：Artie Ding <artie.ding(a)linux.alibaba.com> 发送时间：2021年5月25日(星期二) 14:46 收件人：冯浩 <fenghao(a)openanolis.org>; cloud-kernel <cloud-kernel(a)lists.OpenAnolis.org> 抄　送：Hao Feng <fenghao(a)hygon.cn>; allenli <allenli(a)hygon.cn>; yingzhiwei <yingzhiwei(a)hygon.cn> 主　题：Re: 回复：[PATCH] ck: crypto: ccp: Add Hygon CCP support Hi Hao, 确认一下，Hygon CCP是否兼容AMD CCP？是否要有其他相关patch来支持Hygon CCP？在 2021/5/17 下午4:22, 冯浩写道: 请问这个patch可以合入吗？ Thanks Hao ------------------------------------------------------------------ 发件人：冯浩 <fenghao(a)openanolis.org> 发送时间：2021年3月25日(星期四) 17:57 收件人：cloud-kernel <cloud-kernel(a)lists.OpenAnolis.org> 抄　送：Hao Feng <fenghao(a)hygon.cn>; allenli <allenli(a)hygon.cn>; yingzhiwei <yingzhiwei(a)hygon.cn>; 冯浩 <fenghao(a)openanolis.org> 主　题：[PATCH] ck: crypto: ccp: Add Hygon CCP support From: Hao Feng <fenghao(a)hygon.cn> Hygon CPU has 2 CCP devices, add them in the device list. Signed-off-by: Hao Feng <fenghao(a)hygon.cn> --- drivers/crypto/ccp/sp-pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c index 7da93e9bebed..0801e7ae0704 100644 --- a/drivers/crypto/ccp/sp-pci.c +++ b/drivers/crypto/ccp/sp-pci.c @@ -325,6 +325,8 @@ static const struct pci_device_id sp_pci_table[] = { { PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&dev_vdata[1] }, { PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&dev_vdata[2] }, { PCI_VDEVICE(AMD, 0x1486), (kernel_ulong_t)&dev_vdata[3] }, + { PCI_VDEVICE(HYGON, 0x1456), (kernel_ulong_t)&dev_vdata[1] }, + { PCI_VDEVICE(HYGON, 0x1468), (kernel_ulong_t)&dev_vdata[2] }, /* Last entry must be zero */ { 0, } }; -- 2.17.1

3 years, 11 months

2
10
0 0

Just for Test, Please ignore!

by Jacob Wang

3 years, 11 months

1
0
0 0

[patch v4 3/3] ck: ALSA: hda: Add support of Zhaoxin NB HDAC codec

by LeoLiuoc

Add Zhaoxin NB HDAC codec support. The patch is scheduled to be submitted to the kernel mainline in 2021. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- sound/pci/hda/patch_hdmi.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index c827a2a89cc3..f011b0d3bddc 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -3813,6 +3813,20 @@ static int patch_via_hdmi(struct hda_codec *codec) return patch_simple_hdmi(codec, VIAHDMI_CVT_NID, VIAHDMI_PIN_NID); } +/* ZHAOXIN HDMI Implementation */ +static int patch_zx_hdmi(struct hda_codec *codec) +{ + int err; + + err = patch_generic_hdmi(codec); + codec->no_sticky_stream = 1; + + if (err) + return err; + + return 0; +} + /* * patch entries */ @@ -3897,6 +3911,12 @@ HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP", patch_via_hdmi), HDA_CODEC_ENTRY(0x11069f81, "VX900 HDMI/DP", patch_via_hdmi), HDA_CODEC_ENTRY(0x11069f84, "VX11 HDMI/DP", patch_generic_hdmi), HDA_CODEC_ENTRY(0x11069f85, "VX11 HDMI/DP", patch_generic_hdmi), +HDA_CODEC_ENTRY(0x11069f86, "CND001 HDMI/DP", patch_generic_hdmi), +HDA_CODEC_ENTRY(0x11069f87, "CND001 HDMI/DP", patch_generic_hdmi), +HDA_CODEC_ENTRY(0x11069f88, "CHX001 HDMI/DP", patch_zx_hdmi), +HDA_CODEC_ENTRY(0x11069f89, "CHX001 HDMI/DP", patch_zx_hdmi), +HDA_CODEC_ENTRY(0x11069f8a, "CHX002 HDMI/DP", patch_zx_hdmi), +HDA_CODEC_ENTRY(0x11069f8b, "CHX002 HDMI/DP", patch_zx_hdmi), HDA_CODEC_ENTRY(0x80860054, "IbexPeak HDMI", patch_i915_cpt_hdmi), HDA_CODEC_ENTRY(0x80862801, "Bearlake HDMI", patch_generic_hdmi), HDA_CODEC_ENTRY(0x80862802, "Cantiga HDMI", patch_generic_hdmi), @@ -3916,6 +3936,12 @@ HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi), HDA_CODEC_ENTRY(0x80862883, "Braswell HDMI", patch_i915_byt_hdmi), HDA_CODEC_ENTRY(0x808629fb, "Crestline HDMI", patch_generic_hdmi), +HDA_CODEC_ENTRY(0x1d179f86, "CND001 HDMI/DP", patch_generic_hdmi), +HDA_CODEC_ENTRY(0x1d179f87, "CND001 HDMI/DP", patch_generic_hdmi), +HDA_CODEC_ENTRY(0x1d179f88, "CHX001 HDMI/DP", patch_zx_hdmi), +HDA_CODEC_ENTRY(0x1d179f89, "CHX001 HDMI/DP", patch_zx_hdmi), +HDA_CODEC_ENTRY(0x1d179f8a, "CHX002 HDMI/DP", patch_zx_hdmi), +HDA_CODEC_ENTRY(0x1d179f8b, "CHX002 HDMI/DP", patch_zx_hdmi), /* special ID for generic HDMI */ HDA_CODEC_ENTRY(HDA_CODEC_ID_GENERIC_HDMI, "Generic HDMI", patch_generic_hdmi), {} /* terminator */ -- 2.20.1

4 years, 1 month

1
0
0 0

[patch v4 2/3] ck: ALSA: hda: Add support of Zhaoxin NB HDAC

by LeoLiuoc

Add the new PCI ID 0x1d17 0x9141/0x9142/0x9144 Zhaoxin NB HDAC support. And add some special initialization for Zhaoxin NB HDAC. The patch is scheduled to be submitted to the kernel mainline in 2021. Signed-off-by: LeoLiu-oc <LeoLiu-oc(a)zhaoxin.com> --- sound/pci/hda/hda_controller.c | 17 +++++++++++- sound/pci/hda/hda_controller.h | 2 ++ sound/pci/hda/hda_intel.c | 51 +++++++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 8fcb421193e0..d648119c72c9 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1123,6 +1123,16 @@ void azx_stop_chip(struct azx *chip) } EXPORT_SYMBOL_GPL(azx_stop_chip); +static void azx_rirb_zxdelay(struct azx *chip, int enable) +{ + if (chip->remap_diu_addr) { + if (!enable) + writel(0x0, (char *)chip->remap_diu_addr + 0x490a8); + else + writel(0x1000000, (char *)chip->remap_diu_addr + 0x490a8); + } +} + /* * interrupt handler */ @@ -1174,9 +1184,14 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) if (status & RIRB_INT_MASK) { active = true; if (status & RIRB_INT_RESPONSE) { - if (chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND) + if ((chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND) || + (chip->driver_caps & AZX_DCAPS_RIRB_PRE_DELAY)) { + azx_rirb_zxdelay(chip, 1); udelay(80); + } snd_hdac_bus_update_rirb(bus); + if (chip->driver_caps & AZX_DCAPS_RIRB_PRE_DELAY) + azx_rirb_zxdelay(chip, 0); } azx_writeb(chip, RIRBSTS, RIRB_INT_MASK); } diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index 8a9dd4767b1e..36de9806e890 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -58,6 +58,7 @@ #define AZX_DCAPS_CORBRP_SELF_CLEAR (1 << 28) /* CORBRP clears itself after reset */ #define AZX_DCAPS_NO_MSI64 (1 << 29) /* Stick to 32-bit MSIs */ #define AZX_DCAPS_SEPARATE_STREAM_TAG (1 << 30) /* capture and playback use separate stream tag */ +#define AZX_DCAPS_RIRB_PRE_DELAY (1 << 31) enum { AZX_SNOOP_TYPE_NONE, @@ -167,6 +168,7 @@ struct azx { /* GTS present */ unsigned int gts_present:1; + void __iomem *remap_diu_addr; #ifdef CONFIG_SND_HDA_DSP_LOADER struct azx_dev saved_azx_dev; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c46ab0f41fd6..a0010367c8c0 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -251,7 +251,8 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," "{VIA, VT8237A}," "{SiS, SIS966}," "{ULI, M5461}," - "{ZX, ZhaoxinHDA}}"); + "{ZX, ZhaoxinHDA}," + "{ZX, ZhaoxinHDMI}}"); MODULE_DESCRIPTION("Intel HDA driver"); #if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO) @@ -283,6 +284,7 @@ enum { AZX_DRIVER_CTHDA, AZX_DRIVER_CMEDIA, AZX_DRIVER_ZHAOXIN, + AZX_DRIVER_ZXHDMI, AZX_DRIVER_GENERIC, AZX_NUM_DRIVERS, /* keep this as last entry */ }; @@ -404,6 +406,7 @@ static char *driver_short_names[] = { [AZX_DRIVER_CTHDA] = "HDA Creative", [AZX_DRIVER_CMEDIA] = "HDA C-Media", [AZX_DRIVER_ZHAOXIN] = "HDA Zhaoxin", + [AZX_DRIVER_ZXHDMI] = "HDA Zhaoxin GFX", [AZX_DRIVER_GENERIC] = "HD-Audio Generic", }; @@ -480,6 +483,29 @@ static void update_pci_byte(struct pci_dev *pci, unsigned int reg, pci_write_config_byte(pci, reg, data); } +static int azx_init_chip_zx(struct azx *chip) +{ + struct snd_card *card = chip->card; + unsigned int diu_reg; + struct pci_dev *diu_pci = NULL; + + diu_pci = pci_get_device(0x1d17, 0x3a03, NULL); + if (!diu_pci) { + dev_err(card->dev, "hda no chx001 device. \n"); + return -ENXIO; + } + pci_read_config_dword(diu_pci, PCI_BASE_ADDRESS_0, &diu_reg); + chip->remap_diu_addr = ioremap_nocache(diu_reg, 0x50000); + dev_info(card->dev, "hda %x %p \n", diu_reg, chip->remap_diu_addr); + return 0; +} + +static void azx_free_pci_zx(struct azx *chip) +{ + if (chip->remap_diu_addr) + iounmap(chip->remap_diu_addr); +} + static void azx_init_pci(struct azx *chip) { int snoop_type = azx_get_snoop_type(chip); @@ -1450,6 +1476,10 @@ static int azx_free(struct azx *chip) hda->init_failed = 1; /* to be sure */ complete_all(&hda->probe_wait); + if (chip->driver_type == AZX_DRIVER_ZXHDMI) { + azx_free_pci_zx(chip); + } + if (use_vga_switcheroo(hda)) { if (chip->disabled && hda->probe_continued) snd_hda_unlock_devices(&chip->bus); @@ -1793,6 +1823,8 @@ static int default_bdl_pos_adj(struct azx *chip) case AZX_DRIVER_ICH: case AZX_DRIVER_PCH: return 1; + case AZX_DRIVER_ZXHDMI: + return 128; default: return 32; } @@ -1911,6 +1943,12 @@ static int azx_first_init(struct azx *chip) } #endif + chip->remap_diu_addr = NULL; + + if (chip->driver_type == AZX_DRIVER_ZXHDMI) { + azx_init_chip_zx(chip); + } + err = pci_request_regions(pci, "ICH HD audio"); if (err < 0) return err; @@ -2020,6 +2058,7 @@ static int azx_first_init(struct azx *chip) chip->playback_streams = ATIHDMI_NUM_PLAYBACK; chip->capture_streams = ATIHDMI_NUM_CAPTURE; break; + case AZX_DRIVER_ZXHDMI: case AZX_DRIVER_GENERIC: default: chip->playback_streams = ICH6_NUM_PLAYBACK; @@ -2752,6 +2791,11 @@ static const struct pci_device_id azx_ids[] = { { PCI_DEVICE(0x1106, 0x9170), .driver_data = AZX_DRIVER_GENERIC }, /* VIA GFX VT6122/VX11 */ { PCI_DEVICE(0x1106, 0x9140), .driver_data = AZX_DRIVER_GENERIC }, + { PCI_DEVICE(0x1106, 0x9141), .driver_data = AZX_DRIVER_GENERIC }, + { PCI_DEVICE(0x1106, 0x9142), + .driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI | AZX_DCAPS_RIRB_PRE_DELAY }, + { PCI_DEVICE(0x1106, 0x9144), + .driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI | AZX_DCAPS_RIRB_PRE_DELAY }, /* SIS966 */ { PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS }, /* ULI M5461 */ @@ -2807,6 +2851,11 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_GENERIC | AZX_DCAPS_PRESET_ATI_HDMI }, /* Zhaoxin */ { PCI_DEVICE(0x1d17, 0x3288), .driver_data = AZX_DRIVER_ZHAOXIN }, + { PCI_DEVICE(0x1d17, 0x9141), .driver_data = AZX_DRIVER_GENERIC }, + { PCI_DEVICE(0x1d17, 0x9142), + .driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI | AZX_DCAPS_RIRB_PRE_DELAY }, + { PCI_DEVICE(0x1d17, 0x9144), + .driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI | AZX_DCAPS_RIRB_PRE_DELAY }, { 0, } }; MODULE_DEVICE_TABLE(pci, azx_ids); -- 2.20.1

4 years, 1 month

1
0
0 0

2025

2024

2023

2022

2021

Cloud Kernel