Skip to content

Commit 09b4826

Browse files
GoKu-Gear6jfvogel
authored andcommitted
uek-rpm: Enable the FWCTL PDS and CXL support in UEK8
Enable these config flags for OL9/OL10 x86_64 kernel builds in UEK8-U1: CONFIG_CXL_FEATURES=y CONFIG_FWCTL_PDS=m Also add this module to the OL9/OL10 x86_64 module list: pds_fwctl.ko Remove fwctl.ko from the module list to avoid a build error, as CONFIG_FWCTL is now built-in rather than a module after enabling CONFIG_CXL_FEATURES=y. Move pds_core.ko from the common modules section to the common modules-core section (not the x86_64-specific section) to avoid a Jenkins build error. Since pds_fwctl.ko uses the symbol pds_client_adminq_cmd exported by pds_core.ko, we need to include all dependent modules in modules-core when adding pds_fwctl.ko in the x86_64-specific modules-core section. Orabug: 38006732 Signed-off-by: Qing Huang <[email protected]> Reviewed-by: Harshit Mogalapalli <[email protected]> Reviewed-by: Samasth Norway Ananda <[email protected]>
1 parent 6c764fb commit 09b4826

File tree

6 files changed

+12
-4
lines changed

6 files changed

+12
-4
lines changed

uek-rpm/ol10/config-x86_64

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
653653
CONFIG_VMD=m
654654
CONFIG_CXL_BUS=y
655655
CONFIG_CXL_MEM=m
656+
CONFIG_CXL_FEATURES=y
656657
CONFIG_PCCARD=y
657658
# CONFIG_PCMCIA is not set
658659
CONFIG_YENTA=m
@@ -1030,6 +1031,7 @@ CONFIG_JME=m
10301031
CONFIG_MVMDIO=m
10311032
CONFIG_FWCTL=m
10321033
CONFIG_FWCTL_MLX5=m
1034+
CONFIG_FWCTL_PDS=m
10331035
CONFIG_MSTFLINT_ACCESS=m
10341036
CONFIG_SKGE=m
10351037
CONFIG_SKGE_GENESIS=y

uek-rpm/ol10/config-x86_64-debug

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
661661
CONFIG_VMD=m
662662
CONFIG_CXL_BUS=y
663663
CONFIG_CXL_MEM=m
664+
CONFIG_CXL_FEATURES=y
664665
CONFIG_PCCARD=y
665666
# CONFIG_PCMCIA is not set
666667
CONFIG_YENTA=m
@@ -1039,6 +1040,7 @@ CONFIG_IDPF=m
10391040
CONFIG_JME=m
10401041
CONFIG_FWCTL=m
10411042
CONFIG_FWCTL_MLX5=m
1043+
CONFIG_FWCTL_PDS=m
10421044
CONFIG_MSTFLINT_ACCESS=m
10431045
CONFIG_MVMDIO=m
10441046
CONFIG_SKGE=m

uek-rpm/ol10/modules.yaml.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ modules-core:
389389
- pci-hyperv
390390
- pci-hyperv-intf
391391
- pcrypt
392+
- pds_core
392393
- pkcs8_key_parser
393394
- pktgen
394395
- pm80xx
@@ -606,7 +607,6 @@ modules-core:
606607
- edac_mce_amd
607608
- erst-dbg
608609
- ext4
609-
- fwctl
610610
- ghash-clmulni-intel
611611
- i10nm_edac
612612
- i2c-i801
@@ -652,6 +652,7 @@ modules-core:
652652
- ovmapi
653653
- pcc-cpufreq
654654
- pcspkr
655+
- pds_fwctl
655656
- poly1305-x86_64
656657
- power
657658
- ptp_kvm
@@ -1164,7 +1165,6 @@ modules:
11641165
- pcwd_usb
11651166
- pdc_adma
11661167
- pds-vfio-pci
1167-
- pds_core
11681168
- pds_vdpa
11691169
- peak_pci
11701170
- peak_pciefd

uek-rpm/ol9/config-x86_64

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
653653
CONFIG_VMD=m
654654
CONFIG_CXL_BUS=y
655655
CONFIG_CXL_MEM=m
656+
CONFIG_CXL_FEATURES=y
656657
CONFIG_PCCARD=y
657658
# CONFIG_PCMCIA is not set
658659
CONFIG_YENTA=m
@@ -1038,6 +1039,7 @@ CONFIG_SKGE=m
10381039
CONFIG_MSTFLINT_ACCESS=m
10391040
CONFIG_FWCTL=m
10401041
CONFIG_FWCTL_MLX5=m
1042+
CONFIG_FWCTL_PDS=m
10411043
CONFIG_SKGE_GENESIS=y
10421044
CONFIG_SKY2=m
10431045
CONFIG_MLX4_EN=m

uek-rpm/ol9/config-x86_64-debug

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,7 @@ CONFIG_HOTPLUG_PCI_SHPC=y
661661
CONFIG_VMD=m
662662
CONFIG_CXL_BUS=y
663663
CONFIG_CXL_MEM=m
664+
CONFIG_CXL_FEATURES=y
664665
CONFIG_PCCARD=y
665666
# CONFIG_PCMCIA is not set
666667
CONFIG_YENTA=m
@@ -1047,6 +1048,7 @@ CONFIG_MVMDIO=m
10471048
CONFIG_MSTFLINT_ACCESS=m
10481049
CONFIG_FWCTL=m
10491050
CONFIG_FWCTL_MLX5=m
1051+
CONFIG_FWCTL_PDS=m
10501052
CONFIG_SKGE=m
10511053
CONFIG_SKGE_GENESIS=y
10521054
CONFIG_SKY2=m

uek-rpm/ol9/modules.yaml.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@ modules-core:
389389
- pci-hyperv
390390
- pci-hyperv-intf
391391
- pcrypt
392+
- pds_core
392393
- pkcs8_key_parser
393394
- pktgen
394395
- pm80xx
@@ -606,7 +607,6 @@ modules-core:
606607
- edac_mce_amd
607608
- erst-dbg
608609
- ext4
609-
- fwctl
610610
- ghash-clmulni-intel
611611
- i10nm_edac
612612
- i2c-i801
@@ -652,6 +652,7 @@ modules-core:
652652
- ovmapi
653653
- pcc-cpufreq
654654
- pcspkr
655+
- pds_fwctl
655656
- poly1305-x86_64
656657
- power
657658
- ptp_kvm
@@ -1164,7 +1165,6 @@ modules:
11641165
- pcwd_usb
11651166
- pdc_adma
11661167
- pds-vfio-pci
1167-
- pds_core
11681168
- pds_vdpa
11691169
- peak_pci
11701170
- peak_pciefd

0 commit comments

Comments
 (0)