Skip to content

[RFC] ASoC: SOF: ADL-P uses its own sof_dev_desc #2817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
libinyang wants to merge 1 commit into from
Closed

[RFC] ASoC: SOF: ADL-P uses its own sof_dev_desc #2817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sound/soc/sof/intel/hda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,7 @@ extern const struct sof_intel_dsp_desc tglh_chip_info;
extern const struct sof_intel_dsp_desc ehl_chip_info;
extern const struct sof_intel_dsp_desc jsl_chip_info;
extern const struct sof_intel_dsp_desc adls_chip_info;
extern const struct sof_intel_dsp_desc adlp_chip_info;

/* machine driver select */
void hda_machine_select(struct snd_sof_dev *sdev);
Expand Down
19 changes: 18 additions & 1 deletion sound/soc/sof/intel/pci-tgl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,23 @@ static const struct sof_dev_desc adls_desc = {
.ops = &sof_tgl_ops,
};

static const struct sof_dev_desc adlp_desc = {
.machines = snd_soc_acpi_intel_adl_machines,
.alt_machines = snd_soc_acpi_intel_adl_sdw_machines,
.use_acpi_target_states = true,
Copy link
Collaborator

@bardliao bardliao Apr 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does .use_acpi_target_states for? Do we need .use_acpi_target_states fir adls_desc, too?

Copy link
Author

@libinyang libinyang Apr 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bardliao I talked with Keyon 1 week ago for this question. We need to set this flag. And I had a patch to set this flag on some tgl platforms

Copy link
Author

@libinyang libinyang Apr 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bardliao The patch I mentioned is submitted #2822. And I described the use_acpi_target_states usage in that PR.

.resindex_lpe_base = 0,
.resindex_pcicfg_base = -1,
.resindex_imr_base = -1,
.irqindex_host_ipc = -1,
.resindex_dma_base = -1,
.chip_info = &adlp_chip_info,
.default_fw_path = "intel/sof",
.default_tplg_path = "intel/sof-tplg",
.default_fw_filename = "sof-adl-p.ri",
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
.ops = &sof_tgl_ops,
};

/* PCI IDs */
static const struct pci_device_id sof_pci_ids[] = {
{ PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */
Expand All @@ -97,7 +114,7 @@ static const struct pci_device_id sof_pci_ids[] = {
{ PCI_DEVICE(0x8086, 0x7ad0), /* ADL-S */
.driver_data = (unsigned long)&adls_desc},
{ PCI_DEVICE(0x8086, 0x51c8), /* ADL-P */
.driver_data = (unsigned long)&tgl_desc},
.driver_data = (unsigned long)&adlp_desc},
{ 0, }
};
MODULE_DEVICE_TABLE(pci, sof_pci_ids);
Expand Down
16 changes: 16 additions & 0 deletions sound/soc/sof/intel/tgl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,19 @@ const struct sof_intel_dsp_desc adls_chip_info = {
.ssp_base_offset = CNL_SSP_BASE_OFFSET,
};
EXPORT_SYMBOL_NS(adls_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);

const struct sof_intel_dsp_desc adlp_chip_info = {
/* Alderlake-P */
.cores_num = 4,
.init_core_mask = BIT(0),
.host_managed_cores_mask = BIT(0),
.ipc_req = CNL_DSP_REG_HIPCIDR,
.ipc_req_mask = CNL_DSP_REG_HIPCIDR_BUSY,
.ipc_ack = CNL_DSP_REG_HIPCIDA,
.ipc_ack_mask = CNL_DSP_REG_HIPCIDA_DONE,
.ipc_ctl = CNL_DSP_REG_HIPCCTL,
.rom_init_timeout = 300,
.ssp_count = ICL_SSP_COUNT,
.ssp_base_offset = CNL_SSP_BASE_OFFSET,
};
EXPORT_SYMBOL_NS(adlp_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);