UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

!236 [linux-5.4/next] Add support of Zhaoxin HDAC and codec 

Merge pull request !236 from LeoLiu-oc/linux-5.4-next-13-hdac
This commit is contained in:
chinaljp030 2024-10-23 09:29:43 +00:00 committed by Gitee
parent 5ab633d0b5 2c24189e6f
commit 7fbd37f2dd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 124 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/pci/hda/hda_controller.c
View File

@ -1104,6 +1104,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
*/
@ -1163,9 +1173,14 @@ irqreturn_t azx_interrupt(int irq, void *dev_id)
azx_writeb(chip, RIRBSTS, 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);
}
}
} while (active && ++repeat < 10);

2
sound/pci/hda/hda_controller.h
View File

@ -45,6 +45,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) /* Put a delay before read */
enum {
AZX_SNOOP_TYPE_NONE,
@ -147,6 +148,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;

73
sound/pci/hda/hda_intel.c
View File

@ -238,7 +238,9 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
"{VIA, VT8251},"
"{VIA, VT8237A},"
"{SiS, SIS966},"
"{ULI, M5461}}");
"{ULI, M5461},"
"{ZX, ZhaoxinHDA},"
"{ZX, ZhaoxinHDMI}}");
MODULE_DESCRIPTION("Intel HDA driver");
#if defined(CONFIG_PM) && defined(CONFIG_VGA_SWITCHEROO)
@ -270,6 +272,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 */
};
@ -395,6 +398,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 GFX",
[AZX_DRIVER_GENERIC] = "HD-Audio Generic",
};
@ -416,6 +420,32 @@ 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;
azx_bus(chip)->polling_mode = 1;
diu_pci = pci_get_device(0x1d17, 0x3a03, NULL);
if (!diu_pci) {
dev_err(card->dev, "hda no KX-5000 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);
pci_dev_put(diu_pci);
return 0;
}
static void azx_free_chip_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);
@ -1407,6 +1437,9 @@ static void 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_chip_zx(chip);
if (use_vga_switcheroo(hda)) {
if (chip->disabled && hda->probe_continued)
snd_hda_unlock_devices(&chip->bus);
@ -1548,7 +1581,7 @@ static int check_position_fix(struct azx *chip, int fix)
}
/* Check VIA/ATI HD Audio Controller exist */
if (chip->driver_type == AZX_DRIVER_VIA) {
if (chip->driver_type == AZX_DRIVER_VIA || chip->driver_type == AZX_DRIVER_ZHAOXIN) {
dev_dbg(chip->card->dev, "Using VIACOMBO position fix\n");
return POS_FIX_VIACOMBO;
}
@ -1702,7 +1735,7 @@ static void azx_check_snoop_available(struct azx *chip)
snoop = true;
if (azx_get_snoop_type(chip) == AZX_SNOOP_TYPE_NONE &&
chip->driver_type == AZX_DRIVER_VIA) {
((chip->driver_type == AZX_DRIVER_VIA) || (chip->driver_type == AZX_DRIVER_ZHAOXIN))) {
/* force to non-snoop mode for a new VIA controller
* when BIOS is set
*/
@ -1746,6 +1779,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;
}
@ -1867,6 +1902,11 @@ 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;
@ -1976,6 +2016,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;
@ -2692,6 +2733,19 @@ 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 | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1106, 0x9142),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1106, 0x9144),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1106, 0x9145),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1106, 0x9146),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
/* SIS966 */
{ PCI_DEVICE(0x1039, 0x7502), .driver_data = AZX_DRIVER_SIS },
/* ULI M5461 */
@ -2747,6 +2801,19 @@ 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 | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1d17, 0x9142),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1d17, 0x9144),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1d17, 0x9145),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
{ PCI_DEVICE(0x1d17, 0x9146),
.driver_data = AZX_DRIVER_ZXHDMI | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI |
AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_NO_64BIT },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, azx_ids);

36
sound/pci/hda/patch_hdmi.c
View File

@ -4110,6 +4110,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
*/
@ -4203,6 +4217,17 @@ 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, "ZX-100S HDMI/DP", patch_generic_hdmi),
HDA_CODEC_ENTRY(0x11069f87, "ZX-100S HDMI/DP", patch_generic_hdmi),
HDA_CODEC_ENTRY(0x11069f88, "KX-5000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f89, "KX-5000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f8a, "KX-6000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f8b, "KX-6000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f8c, "KX-6000G HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f8d, "KX-6000G HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f8e, "KX-7000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f8f, "KX-7000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x11069f90, "KX-7000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x80860054, "IbexPeak HDMI", patch_i915_cpt_hdmi),
HDA_CODEC_ENTRY(0x80862800, "Geminilake HDMI", patch_i915_glk_hdmi),
HDA_CODEC_ENTRY(0x80862801, "Bearlake HDMI", patch_generic_hdmi),
@ -4229,6 +4254,17 @@ 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, "ZX-100S HDMI/DP", patch_generic_hdmi),
HDA_CODEC_ENTRY(0x1d179f87, "ZX-100S HDMI/DP", patch_generic_hdmi),
HDA_CODEC_ENTRY(0x1d179f88, "KX-5000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f89, "KX-5000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f8a, "KX-6000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f8b, "KX-6000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f8c, "KX-6000G HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f8d, "KX-6000G HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f8e, "KX-7000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f8f, "KX-7000 HDMI/DP", patch_zx_hdmi),
HDA_CODEC_ENTRY(0x1d179f90, "KX-7000 HDMI/DP", patch_zx_hdmi),
/* special ID for generic HDMI */
HDA_CODEC_ENTRY(HDA_CODEC_ID_GENERIC_HDMI, "Generic HDMI", patch_generic_hdmi),
{} /* terminator */