Skip to content

Commit

Permalink
ieee1275: implement vec5 for cas negotiation
Browse files Browse the repository at this point in the history
As a legacy support, if the vector 5 is not implemented, Power Hypervisor will
consider the max CPUs as 64 instead 256 currently supported during
client-architecture-support negotiation.

This patch implements the vector 5 and set the MAX CPUs to 256 while setting the
others values to 0 (default).

Signed-off-by: Diego Domingos <[email protected]>
Acked-by: Daniel Axtens <[email protected]>
Signed-off-by: Stefan Berger <[email protected]>
Signed-off-by: Avnish Chouhan <[email protected]>
(cherry picked from commit 942f19959fe7465fb52a1da39ff271a7ab704892)
  • Loading branch information
Diego Domingos authored and frozencemetery committed Feb 8, 2023
1 parent 5ebb635 commit e6cd87b
Showing 1 changed file with 20 additions and 1 deletion.
21 changes: 20 additions & 1 deletion grub-core/kern/ieee1275/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,19 @@ struct option_vector2
grub_uint8_t max_pft_size;
} GRUB_PACKED;

struct option_vector5
{
grub_uint8_t byte1;
grub_uint8_t byte2;
grub_uint8_t byte3;
grub_uint8_t cmo;
grub_uint8_t associativity;
grub_uint8_t bin_opts;
grub_uint8_t micro_checkpoint;
grub_uint8_t reserved0;
grub_uint32_t max_cpus;
} GRUB_PACKED;

struct pvr_entry
{
grub_uint32_t mask;
Expand All @@ -523,6 +536,8 @@ struct cas_vector
grub_uint16_t vec3;
grub_uint8_t vec4_size;
grub_uint16_t vec4;
grub_uint8_t vec5_size;
struct option_vector5 vec5;
} GRUB_PACKED;

/*
Expand All @@ -547,7 +562,7 @@ grub_ieee1275_ibm_cas (void)
struct cas_vector vector =
{
.pvr_list = { { 0x00000000, 0xffffffff } }, /* any processor */
.num_vecs = 4 - 1,
.num_vecs = 5 - 1,
.vec1_size = 0,
.vec1 = 0x80, /* ignore */
.vec2_size = 1 + sizeof (struct option_vector2) - 2,
Expand All @@ -558,6 +573,10 @@ grub_ieee1275_ibm_cas (void)
.vec3 = 0x00e0, /* ask for FP + VMX + DFP but don't halt if unsatisfied */
.vec4_size = 2 - 1,
.vec4 = 0x0001, /* set required minimum capacity % to the lowest value */
.vec5_size = 1 + sizeof (struct option_vector5) - 2,
.vec5 = {
0, 192, 0, 128, 0, 0, 0, 0, 256
}
};

INIT_IEEE1275_COMMON (&args.common, "call-method", 3, 2);
Expand Down

0 comments on commit e6cd87b

Please sign in to comment.