* [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds
@ 2024-02-15 1:23 Lukas Stockner
2024-02-16 7:52 ` Manos Pitsidianakis
2024-03-12 15:19 ` Michael S. Tsirkin
0 siblings, 2 replies; 4+ messages in thread
From: Lukas Stockner @ 2024-02-15 1:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael S. Tsirkin, Marcel Apfelbaum, Lukas Stockner
This patch extends the PCIe link speed option so that slots can be
configured as supporting 32GT/s (Gen5) or 64GT/s (Gen5) speeds.
This is as simple as setting the appropriate bit in LnkCap2 and
the appropriate value in LnkCap and LnkCtl2.
Signed-off-by: Lukas Stockner <lstockner@genesiscloud.com>
---
hw/core/qdev-properties-system.c | 16 ++++++++++++++--
hw/pci/pcie.c | 8 ++++++++
include/hw/pci/pcie_regs.h | 2 ++
qapi/common.json | 6 +++++-
4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 1a396521d5..106a31c233 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -941,7 +941,7 @@ const PropertyInfo qdev_prop_off_auto_pcibar = {
.set_default_value = qdev_propinfo_set_default_value_enum,
};
-/* --- PCIELinkSpeed 2_5/5/8/16 -- */
+/* --- PCIELinkSpeed 2_5/5/8/16/32/64 -- */
static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
@@ -963,6 +963,12 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
case QEMU_PCI_EXP_LNK_16GT:
speed = PCIE_LINK_SPEED_16;
break;
+ case QEMU_PCI_EXP_LNK_32GT:
+ speed = PCIE_LINK_SPEED_32;
+ break;
+ case QEMU_PCI_EXP_LNK_64GT:
+ speed = PCIE_LINK_SPEED_64;
+ break;
default:
/* Unreachable */
abort();
@@ -996,6 +1002,12 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
case PCIE_LINK_SPEED_16:
*p = QEMU_PCI_EXP_LNK_16GT;
break;
+ case PCIE_LINK_SPEED_32:
+ *p = QEMU_PCI_EXP_LNK_32GT;
+ break;
+ case PCIE_LINK_SPEED_64:
+ *p = QEMU_PCI_EXP_LNK_64GT;
+ break;
default:
/* Unreachable */
abort();
@@ -1004,7 +1016,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
const PropertyInfo qdev_prop_pcie_link_speed = {
.name = "PCIELinkSpeed",
- .description = "2_5/5/8/16",
+ .description = "2_5/5/8/16/32/64",
.enum_table = &PCIELinkSpeed_lookup,
.get = get_prop_pcielinkspeed,
.set = set_prop_pcielinkspeed,
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 6db0cf69cd..0b4817e144 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -153,6 +153,14 @@ static void pcie_cap_fill_slot_lnk(PCIDevice *dev)
pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2,
PCI_EXP_LNKCAP2_SLS_16_0GB);
}
+ if (s->speed > QEMU_PCI_EXP_LNK_16GT) {
+ pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2,
+ PCI_EXP_LNKCAP2_SLS_32_0GB);
+ }
+ if (s->speed > QEMU_PCI_EXP_LNK_32GT) {
+ pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2,
+ PCI_EXP_LNKCAP2_SLS_64_0GB);
+ }
}
}
diff --git a/include/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h
index 4972106c42..9d3b6868dc 100644
--- a/include/hw/pci/pcie_regs.h
+++ b/include/hw/pci/pcie_regs.h
@@ -39,6 +39,8 @@ typedef enum PCIExpLinkSpeed {
QEMU_PCI_EXP_LNK_5GT,
QEMU_PCI_EXP_LNK_8GT,
QEMU_PCI_EXP_LNK_16GT,
+ QEMU_PCI_EXP_LNK_32GT,
+ QEMU_PCI_EXP_LNK_64GT,
} PCIExpLinkSpeed;
#define QEMU_PCI_EXP_LNKCAP_MLS(speed) (speed)
diff --git a/qapi/common.json b/qapi/common.json
index f1bb841951..867a9ad9b0 100644
--- a/qapi/common.json
+++ b/qapi/common.json
@@ -107,10 +107,14 @@
#
# @16: 16.0GT/s
#
+# @32: 32.0GT/s
+#
+# @64: 64.0GT/s
+#
# Since: 4.0
##
{ 'enum': 'PCIELinkSpeed',
- 'data': [ '2_5', '5', '8', '16' ] }
+ 'data': [ '2_5', '5', '8', '16', '32', '64' ] }
##
# @PCIELinkWidth:
--
2.43.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds
2024-02-15 1:23 [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds Lukas Stockner
@ 2024-02-16 7:52 ` Manos Pitsidianakis
2024-03-12 15:19 ` Michael S. Tsirkin
1 sibling, 0 replies; 4+ messages in thread
From: Manos Pitsidianakis @ 2024-02-16 7:52 UTC (permalink / raw)
To: qemu-devel, Lukas Stockner
Cc: Michael S. Tsirkin, Marcel Apfelbaum, Lukas Stockner
On Thu, 15 Feb 2024 03:23, Lukas Stockner <lstockner@genesiscloud.com> wrote:
>This patch extends the PCIe link speed option so that slots can be
>configured as supporting 32GT/s (Gen5) or 64GT/s (Gen5) speeds.
>This is as simple as setting the appropriate bit in LnkCap2 and
>the appropriate value in LnkCap and LnkCtl2.
>
>Signed-off-by: Lukas Stockner <lstockner@genesiscloud.com>
>---
> hw/core/qdev-properties-system.c | 16 ++++++++++++++--
> hw/pci/pcie.c | 8 ++++++++
> include/hw/pci/pcie_regs.h | 2 ++
> qapi/common.json | 6 +++++-
> 4 files changed, 29 insertions(+), 3 deletions(-)
>
>diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
>index 1a396521d5..106a31c233 100644
>--- a/hw/core/qdev-properties-system.c
>+++ b/hw/core/qdev-properties-system.c
>@@ -941,7 +941,7 @@ const PropertyInfo qdev_prop_off_auto_pcibar = {
> .set_default_value = qdev_propinfo_set_default_value_enum,
> };
>
>-/* --- PCIELinkSpeed 2_5/5/8/16 -- */
>+/* --- PCIELinkSpeed 2_5/5/8/16/32/64 -- */
>
> static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
> void *opaque, Error **errp)
>@@ -963,6 +963,12 @@ static void get_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
> case QEMU_PCI_EXP_LNK_16GT:
> speed = PCIE_LINK_SPEED_16;
> break;
>+ case QEMU_PCI_EXP_LNK_32GT:
>+ speed = PCIE_LINK_SPEED_32;
>+ break;
>+ case QEMU_PCI_EXP_LNK_64GT:
>+ speed = PCIE_LINK_SPEED_64;
>+ break;
> default:
> /* Unreachable */
> abort();
>@@ -996,6 +1002,12 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
> case PCIE_LINK_SPEED_16:
> *p = QEMU_PCI_EXP_LNK_16GT;
> break;
>+ case PCIE_LINK_SPEED_32:
>+ *p = QEMU_PCI_EXP_LNK_32GT;
>+ break;
>+ case PCIE_LINK_SPEED_64:
>+ *p = QEMU_PCI_EXP_LNK_64GT;
>+ break;
> default:
> /* Unreachable */
> abort();
>@@ -1004,7 +1016,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visitor *v, const char *name,
>
> const PropertyInfo qdev_prop_pcie_link_speed = {
> .name = "PCIELinkSpeed",
>- .description = "2_5/5/8/16",
>+ .description = "2_5/5/8/16/32/64",
> .enum_table = &PCIELinkSpeed_lookup,
> .get = get_prop_pcielinkspeed,
> .set = set_prop_pcielinkspeed,
>diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
>index 6db0cf69cd..0b4817e144 100644
>--- a/hw/pci/pcie.c
>+++ b/hw/pci/pcie.c
>@@ -153,6 +153,14 @@ static void pcie_cap_fill_slot_lnk(PCIDevice *dev)
> pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2,
> PCI_EXP_LNKCAP2_SLS_16_0GB);
> }
>+ if (s->speed > QEMU_PCI_EXP_LNK_16GT) {
>+ pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2,
>+ PCI_EXP_LNKCAP2_SLS_32_0GB);
>+ }
>+ if (s->speed > QEMU_PCI_EXP_LNK_32GT) {
>+ pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKCAP2,
>+ PCI_EXP_LNKCAP2_SLS_64_0GB);
>+ }
> }
> }
>
>diff --git a/include/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h
>index 4972106c42..9d3b6868dc 100644
>--- a/include/hw/pci/pcie_regs.h
>+++ b/include/hw/pci/pcie_regs.h
>@@ -39,6 +39,8 @@ typedef enum PCIExpLinkSpeed {
> QEMU_PCI_EXP_LNK_5GT,
> QEMU_PCI_EXP_LNK_8GT,
> QEMU_PCI_EXP_LNK_16GT,
>+ QEMU_PCI_EXP_LNK_32GT,
>+ QEMU_PCI_EXP_LNK_64GT,
> } PCIExpLinkSpeed;
>
> #define QEMU_PCI_EXP_LNKCAP_MLS(speed) (speed)
>diff --git a/qapi/common.json b/qapi/common.json
>index f1bb841951..867a9ad9b0 100644
>--- a/qapi/common.json
>+++ b/qapi/common.json
>@@ -107,10 +107,14 @@
> #
> # @16: 16.0GT/s
> #
>+# @32: 32.0GT/s
>+#
>+# @64: 64.0GT/s
>+#
> # Since: 4.0
> ##
> { 'enum': 'PCIELinkSpeed',
>- 'data': [ '2_5', '5', '8', '16' ] }
>+ 'data': [ '2_5', '5', '8', '16', '32', '64' ] }
>
> ##
> # @PCIELinkWidth:
>--
>2.43.1
>
>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds
2024-02-15 1:23 [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds Lukas Stockner
2024-02-16 7:52 ` Manos Pitsidianakis
@ 2024-03-12 15:19 ` Michael S. Tsirkin
2024-03-13 6:41 ` Markus Armbruster
1 sibling, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2024-03-12 15:19 UTC (permalink / raw)
To: Lukas Stockner; +Cc: qemu-devel, Marcel Apfelbaum, Markus Armbruster
On Thu, Feb 15, 2024 at 02:23:26AM +0100, Lukas Stockner wrote:
> diff --git a/qapi/common.json b/qapi/common.json
> index f1bb841951..867a9ad9b0 100644
> --- a/qapi/common.json
> +++ b/qapi/common.json
> @@ -107,10 +107,14 @@
> #
> # @16: 16.0GT/s
> #
> +# @32: 32.0GT/s
> +#
> +# @64: 64.0GT/s
> +#
> # Since: 4.0
> ##
> { 'enum': 'PCIELinkSpeed',
> - 'data': [ '2_5', '5', '8', '16' ] }
> + 'data': [ '2_5', '5', '8', '16', '32', '64' ] }
>
> ##
> # @PCIELinkWidth:
> --
I'll merge this but I really don't know how one documents
that some enum options have been added since some version
of qemu.
> 2.43.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds
2024-03-12 15:19 ` Michael S. Tsirkin
@ 2024-03-13 6:41 ` Markus Armbruster
0 siblings, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2024-03-13 6:41 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: Lukas Stockner, qemu-devel, Marcel Apfelbaum
"Michael S. Tsirkin" <mst@redhat.com> writes:
> On Thu, Feb 15, 2024 at 02:23:26AM +0100, Lukas Stockner wrote:
>> diff --git a/qapi/common.json b/qapi/common.json
>> index f1bb841951..867a9ad9b0 100644
>> --- a/qapi/common.json
>> +++ b/qapi/common.json
>> @@ -107,10 +107,14 @@
>> #
>> # @16: 16.0GT/s
>> #
>> +# @32: 32.0GT/s
>> +#
>> +# @64: 64.0GT/s
>> +#
>> # Since: 4.0
>> ##
>> { 'enum': 'PCIELinkSpeed',
>> - 'data': [ '2_5', '5', '8', '16' ] }
>> + 'data': [ '2_5', '5', '8', '16', '32', '64' ] }
>>
>> ##
>> # @PCIELinkWidth:
>> --
>
>
> I'll merge this but I really don't know how one documents
> that some enum options have been added since some version
> of qemu.
Common style:
#
# @16: 16.0GT/s
#
# @32: 32.0GT/s (since 9.0)
#
# @64: 64.0GT/s (since 9.0)
#
# Since: 4.0
##
Please add that for the merge.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-13 6:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-15 1:23 [PATCH] pcie: Support PCIe Gen5/Gen6 link speeds Lukas Stockner
2024-02-16 7:52 ` Manos Pitsidianakis
2024-03-12 15:19 ` Michael S. Tsirkin
2024-03-13 6:41 ` Markus Armbruster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).