diff mbox series

ASoC: SOF: disallow building without CONFIG_PCI again

Message ID 20190617124632.1176809-1-arnd@arndb.de
State Accepted
Commit 9de7eaddfa7f47fbb1cd9cdb9aab405599ef414e
Headers show
Series ASoC: SOF: disallow building without CONFIG_PCI again | expand

Commit Message

Arnd Bergmann June 17, 2019, 12:45 p.m. UTC 
Compile-testing without PCI just causes warnings:

sound/soc/sof/sof-pci-dev.c:330:13: error: 'sof_pci_remove' defined but not used [-Werror=unused-function]
 static void sof_pci_remove(struct pci_dev *pci)
             ^~~~~~~~~~~~~~
sound/soc/sof/sof-pci-dev.c:230:12: error: 'sof_pci_probe' defined but not used [-Werror=unused-function]
 static int sof_pci_probe(struct pci_dev *pci,
            ^~~~~~~~~~~~~

I tried to fix this in a way that would still allow compile
tests, but it got too ugly, so this just reverts the patch
that allowed it in the first place.

Most architectures do allow enabling PCI, so the value of the
COMPILE_TEST alternative was not very high to start with.

Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 sound/soc/sof/Kconfig       |  2 +-
 sound/soc/sof/intel/hda.c   | 13 ++-----------
 sound/soc/sof/sof-pci-dev.c |  4 ----
 3 files changed, 3 insertions(+), 16 deletions(-)

-- 
2.20.0

Comments

Pierre-Louis Bossart June 17, 2019, 1:52 p.m. UTC | #1 
On 6/17/19 2:45 PM, Arnd Bergmann wrote:
> Compile-testing without PCI just causes warnings:

> 

> sound/soc/sof/sof-pci-dev.c:330:13: error: 'sof_pci_remove' defined but not used [-Werror=unused-function]

>   static void sof_pci_remove(struct pci_dev *pci)

>               ^~~~~~~~~~~~~~

> sound/soc/sof/sof-pci-dev.c:230:12: error: 'sof_pci_probe' defined but not used [-Werror=unused-function]

>   static int sof_pci_probe(struct pci_dev *pci,

>              ^~~~~~~~~~~~~

> 

> I tried to fix this in a way that would still allow compile

> tests, but it got too ugly, so this just reverts the patch

> that allowed it in the first place.

> 

> Most architectures do allow enabling PCI, so the value of the

> COMPILE_TEST alternative was not very high to start with.


I think COMPILE_TEST has value in that it exposed issues in the PCI 
headers, and in general COMPILE_TEST exposes code that can be 
simplified/refactored. That said I don't have the time to suggest an 
alternative at the moment so it's fine with me if you want to revert. If 
you don't mind sharing your config it'd help me work on this when I get 
a chance.
Thanks!

> 

> Fixes: e13ef82a9ab8 ("ASoC: SOF: add COMPILE_TEST for PCI options")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>   sound/soc/sof/Kconfig       |  2 +-

>   sound/soc/sof/intel/hda.c   | 13 ++-----------

>   sound/soc/sof/sof-pci-dev.c |  4 ----

>   3 files changed, 3 insertions(+), 16 deletions(-)

> 

> diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig

> index 41f79cdcbf47..fb01f0ca6027 100644

> --- a/sound/soc/sof/Kconfig

> +++ b/sound/soc/sof/Kconfig

> @@ -11,7 +11,7 @@ if SND_SOC_SOF_TOPLEVEL

>   

>   config SND_SOC_SOF_PCI

>   	tristate "SOF PCI enumeration support"

> -	depends on PCI || COMPILE_TEST

> +	depends on PCI

>   	select SND_SOC_SOF

>   	select SND_SOC_ACPI if ACPI

>   	select SND_SOC_SOF_OPTIONS

> diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c

> index 140b1424f291..51c1c1787de7 100644

> --- a/sound/soc/sof/intel/hda.c

> +++ b/sound/soc/sof/intel/hda.c

> @@ -533,9 +533,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)

>   	 * TODO: support interrupt mode selection with kernel parameter

>   	 *       support msi multiple vectors

>   	 */

> -#if IS_ENABLED(CONFIG_PCI)

>   	ret = pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI);

> -#endif

>   	if (ret < 0) {

>   		dev_info(sdev->dev, "use legacy interrupt mode\n");

>   		/*

> @@ -547,9 +545,7 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)

>   		sdev->msi_enabled = 0;

>   	} else {

>   		dev_info(sdev->dev, "use msi interrupt mode\n");

> -#if IS_ENABLED(CONFIG_PCI)

>   		hdev->irq = pci_irq_vector(pci, 0);

> -#endif

>   		/* ipc irq number is the same of hda irq */

>   		sdev->ipc_irq = hdev->irq;

>   		sdev->msi_enabled = 1;

> @@ -606,10 +602,8 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)

>   free_hda_irq:

>   	free_irq(hdev->irq, bus);

>   free_irq_vector:

> -#if IS_ENABLED(CONFIG_PCI)

>   	if (sdev->msi_enabled)

>   		pci_free_irq_vectors(pci);

> -#endif

>   free_streams:

>   	hda_dsp_stream_free(sdev);

>   /* dsp_unmap: not currently used */

> @@ -624,6 +618,7 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)

>   {

>   	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;

>   	struct hdac_bus *bus = sof_to_bus(sdev);

> +	struct pci_dev *pci = to_pci_dev(sdev->dev);

>   	const struct sof_intel_dsp_desc *chip = hda->desc;

>   

>   #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

> @@ -652,12 +647,8 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)

>   

>   	free_irq(sdev->ipc_irq, sdev);

>   	free_irq(hda->irq, bus);

> -#if IS_ENABLED(CONFIG_PCI)

> -	if (sdev->msi_enabled) {

> -		struct pci_dev *pci = to_pci_dev(sdev->dev);

> +	if (sdev->msi_enabled)

>   		pci_free_irq_vectors(pci);

> -	}

> -#endif

>   

>   	hda_dsp_stream_free(sdev);

>   #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

> diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c

> index ab58d4f9119f..e2b19782f01a 100644

> --- a/sound/soc/sof/sof-pci-dev.c

> +++ b/sound/soc/sof/sof-pci-dev.c

> @@ -251,11 +251,9 @@ static int sof_pci_probe(struct pci_dev *pci,

>   	if (!sof_pdata)

>   		return -ENOMEM;

>   

> -#if IS_ENABLED(CONFIG_PCI)

>   	ret = pcim_enable_device(pci);

>   	if (ret < 0)

>   		return ret;

> -#endif

>   

>   	ret = pci_request_regions(pci, "Audio DSP");

>   	if (ret < 0)

> @@ -388,7 +386,6 @@ static const struct pci_device_id sof_pci_ids[] = {

>   };

>   MODULE_DEVICE_TABLE(pci, sof_pci_ids);

>   

> -#if IS_ENABLED(CONFIG_PCI)

>   /* pci_driver definition */

>   static struct pci_driver snd_sof_pci_driver = {

>   	.name = "sof-audio-pci",

> @@ -400,6 +397,5 @@ static struct pci_driver snd_sof_pci_driver = {

>   	},

>   };

>   module_pci_driver(snd_sof_pci_driver);

> -#endif

>   

>   MODULE_LICENSE("Dual BSD/GPL");

>
Arnd Bergmann June 17, 2019, 1:57 p.m. UTC | #2 
On Mon, Jun 17, 2019 at 3:52 PM Pierre-Louis Bossart
<pierre-louis.bossart@linux.intel.com> wrote:
>

> On 6/17/19 2:45 PM, Arnd Bergmann wrote:

> > Compile-testing without PCI just causes warnings:

> >

> > sound/soc/sof/sof-pci-dev.c:330:13: error: 'sof_pci_remove' defined but not used [-Werror=unused-function]

> >   static void sof_pci_remove(struct pci_dev *pci)

> >               ^~~~~~~~~~~~~~

> > sound/soc/sof/sof-pci-dev.c:230:12: error: 'sof_pci_probe' defined but not used [-Werror=unused-function]

> >   static int sof_pci_probe(struct pci_dev *pci,

> >              ^~~~~~~~~~~~~

> >

> > I tried to fix this in a way that would still allow compile

> > tests, but it got too ugly, so this just reverts the patch

> > that allowed it in the first place.

> >

> > Most architectures do allow enabling PCI, so the value of the

> > COMPILE_TEST alternative was not very high to start with.

>

> I think COMPILE_TEST has value in that it exposed issues in the PCI

> headers, and in general COMPILE_TEST exposes code that can be

> simplified/refactored. That said I don't have the time to suggest an

> alternative at the moment so it's fine with me if you want to revert. If

> you don't mind sharing your config it'd help me work on this when I get

> a chance.


I agree that fixing this in the pci headers would be best. Ideally we would
be able to compile-test PCI drivers without any #ifdef in the sources,
while ending up with an empty .o file as the compiler can discard all
local functions starting with an unused pci_driver.

I saw the error in a randconfig build, uploaded the .config to
https://pastebin.com/zBeyM41R now.

        Arnd
diff mbox series

Patch

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 41f79cdcbf47..fb01f0ca6027 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -11,7 +11,7 @@  if SND_SOC_SOF_TOPLEVEL
 
 config SND_SOC_SOF_PCI
 	tristate "SOF PCI enumeration support"
-	depends on PCI || COMPILE_TEST
+	depends on PCI
 	select SND_SOC_SOF
 	select SND_SOC_ACPI if ACPI
 	select SND_SOC_SOF_OPTIONS
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 140b1424f291..51c1c1787de7 100644
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -533,9 +533,7 @@  int hda_dsp_probe(struct snd_sof_dev *sdev)
 	 * TODO: support interrupt mode selection with kernel parameter
 	 *       support msi multiple vectors
 	 */
-#if IS_ENABLED(CONFIG_PCI)
 	ret = pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_MSI);
-#endif
 	if (ret < 0) {
 		dev_info(sdev->dev, "use legacy interrupt mode\n");
 		/*
@@ -547,9 +545,7 @@  int hda_dsp_probe(struct snd_sof_dev *sdev)
 		sdev->msi_enabled = 0;
 	} else {
 		dev_info(sdev->dev, "use msi interrupt mode\n");
-#if IS_ENABLED(CONFIG_PCI)
 		hdev->irq = pci_irq_vector(pci, 0);
-#endif
 		/* ipc irq number is the same of hda irq */
 		sdev->ipc_irq = hdev->irq;
 		sdev->msi_enabled = 1;
@@ -606,10 +602,8 @@  int hda_dsp_probe(struct snd_sof_dev *sdev)
 free_hda_irq:
 	free_irq(hdev->irq, bus);
 free_irq_vector:
-#if IS_ENABLED(CONFIG_PCI)
 	if (sdev->msi_enabled)
 		pci_free_irq_vectors(pci);
-#endif
 free_streams:
 	hda_dsp_stream_free(sdev);
 /* dsp_unmap: not currently used */
@@ -624,6 +618,7 @@  int hda_dsp_remove(struct snd_sof_dev *sdev)
 {
 	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
 	struct hdac_bus *bus = sof_to_bus(sdev);
+	struct pci_dev *pci = to_pci_dev(sdev->dev);
 	const struct sof_intel_dsp_desc *chip = hda->desc;
 
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
@@ -652,12 +647,8 @@  int hda_dsp_remove(struct snd_sof_dev *sdev)
 
 	free_irq(sdev->ipc_irq, sdev);
 	free_irq(hda->irq, bus);
-#if IS_ENABLED(CONFIG_PCI)
-	if (sdev->msi_enabled) {
-		struct pci_dev *pci = to_pci_dev(sdev->dev);
+	if (sdev->msi_enabled)
 		pci_free_irq_vectors(pci);
-	}
-#endif
 
 	hda_dsp_stream_free(sdev);
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index ab58d4f9119f..e2b19782f01a 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -251,11 +251,9 @@  static int sof_pci_probe(struct pci_dev *pci,
 	if (!sof_pdata)
 		return -ENOMEM;
 
-#if IS_ENABLED(CONFIG_PCI)
 	ret = pcim_enable_device(pci);
 	if (ret < 0)
 		return ret;
-#endif
 
 	ret = pci_request_regions(pci, "Audio DSP");
 	if (ret < 0)
@@ -388,7 +386,6 @@  static const struct pci_device_id sof_pci_ids[] = {
 };
 MODULE_DEVICE_TABLE(pci, sof_pci_ids);
 
-#if IS_ENABLED(CONFIG_PCI)
 /* pci_driver definition */
 static struct pci_driver snd_sof_pci_driver = {
 	.name = "sof-audio-pci",
@@ -400,6 +397,5 @@  static struct pci_driver snd_sof_pci_driver = {
 	},
 };
 module_pci_driver(snd_sof_pci_driver);
-#endif
 
 MODULE_LICENSE("Dual BSD/GPL");