[v2] hw/sh4: Kconfig cleanups

[PATCH v2 7/8] hw/pci-host: Introduce SH_PCI Kconfig entry

Posted by Philippe Mathieu-Daudé 4 years, 11 months ago

We want to be able to use the 'SH4' config for architecture
specific features. Add more fine-grained selection by adding
a CONFIG_SH_PCI selector for the SH4 PCI controller.
Move the file with the other PCI host devices in hw/pci-host
and add its missing MAINTAINERS entries.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/{sh4 => pci-host}/sh_pci.c | 0
 MAINTAINERS                   | 1 +
 hw/pci-host/meson.build       | 1 +
 hw/sh4/Kconfig                | 1 +
 hw/sh4/meson.build            | 1 -
 5 files changed, 3 insertions(+), 1 deletion(-)
 rename hw/{sh4 => pci-host}/sh_pci.c (100%)

diff --git a/hw/sh4/sh_pci.c b/hw/pci-host/sh_pci.c
similarity index 100%
rename from hw/sh4/sh_pci.c
rename to hw/pci-host/sh_pci.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 6117ad414a4..7698a69e621 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1390,6 +1390,7 @@ S: Odd Fixes
 F: hw/char/sh_serial.c
 F: hw/sh4/r2d.c
 F: hw/intc/sh_intc.c
+F: hw/pci-host/sh_pci.c
 F: hw/timer/sh_timer.c
 F: include/hw/sh4/sh_intc.h
 
diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
index 1847c69905c..87a896973e7 100644
--- a/hw/pci-host/meson.build
+++ b/hw/pci-host/meson.build
@@ -10,6 +10,7 @@
 pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c'))
 pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.c'))
 pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c'))
+pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c'))
 
 # PPC devices
 pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c'))
diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig
index 34c01dadde9..b9f0538d57f 100644
--- a/hw/sh4/Kconfig
+++ b/hw/sh4/Kconfig
@@ -11,6 +11,7 @@ config R2D
     select SM501
     select SH4
     select SH7750
+    select SH_PCI
 
 config SHIX
     bool
diff --git a/hw/sh4/meson.build b/hw/sh4/meson.build
index 303c0f42879..424d5674dea 100644
--- a/hw/sh4/meson.build
+++ b/hw/sh4/meson.build
@@ -2,7 +2,6 @@
 sh4_ss.add(files(
   'sh7750.c',
   'sh7750_regnames.c',
-  'sh_pci.c'
 ))
 sh4_ss.add(when: 'CONFIG_R2D', if_true: files('r2d.c'))
 sh4_ss.add(when: 'CONFIG_SHIX', if_true: files('shix.c'))
-- 
2.26.2

Re: [PATCH v2 7/8] hw/pci-host: Introduce SH_PCI Kconfig entry

Posted by Peter Maydell 4 years, 11 months ago

On Sun, 21 Feb 2021 at 20:03, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> We want to be able to use the 'SH4' config for architecture
> specific features. Add more fine-grained selection by adding
> a CONFIG_SH_PCI selector for the SH4 PCI controller.
> Move the file with the other PCI host devices in hw/pci-host
> and add its missing MAINTAINERS entries.
>
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/{sh4 => pci-host}/sh_pci.c | 0
>  MAINTAINERS                   | 1 +
>  hw/pci-host/meson.build       | 1 +
>  hw/sh4/Kconfig                | 1 +
>  hw/sh4/meson.build            | 1 -
>  5 files changed, 3 insertions(+), 1 deletion(-)
>  rename hw/{sh4 => pci-host}/sh_pci.c (100%)

Don't we need a hw/pci-host/Kconfig change to add
the "config SH_PCI" section ?

thanks
-- PMM

Re: [PATCH v2 7/8] hw/pci-host: Introduce SH_PCI Kconfig entry

Posted by Philippe Mathieu-Daudé 4 years, 11 months ago

On 2/21/21 9:49 PM, Peter Maydell wrote:
> On Sun, 21 Feb 2021 at 20:03, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>
>> We want to be able to use the 'SH4' config for architecture
>> specific features. Add more fine-grained selection by adding
>> a CONFIG_SH_PCI selector for the SH4 PCI controller.
>> Move the file with the other PCI host devices in hw/pci-host
>> and add its missing MAINTAINERS entries.
>>
>> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  hw/{sh4 => pci-host}/sh_pci.c | 0
>>  MAINTAINERS                   | 1 +
>>  hw/pci-host/meson.build       | 1 +
>>  hw/sh4/Kconfig                | 1 +
>>  hw/sh4/meson.build            | 1 -
>>  5 files changed, 3 insertions(+), 1 deletion(-)
>>  rename hw/{sh4 => pci-host}/sh_pci.c (100%)
> 
> Don't we need a hw/pci-host/Kconfig change to add
> the "config SH_PCI" section ?

Oops sorry...