Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hwmv2: intel_ish: Port to HMWv2 #68178

Merged
merged 3 commits into from
Feb 19, 2024

Conversation

golowanow
Copy link
Member

Port intel_ish SoCs and board configurations for:

  • intel_ish_5_4_1
  • intel_ish_5_6_0
  • intel_ish_5_8_0

@golowanow golowanow marked this pull request as ready for review January 27, 2024 10:08
@golowanow golowanow requested review from nashif and tejlmand January 27, 2024 10:09
Copy link
Collaborator

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm.

Comment on lines 6 to 7
if TEST
config TEST_EXTRA_STACK_SIZE
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor nit, the construct if construct is equivalent to apply if on all entries.

So when there is only one entry, then you might just write:

config TEST_EXTRA_STACK_SIZE
	int
	default 1024
	depends on TEST

(depends on is also equivalent to apply if on all parts)
Ref: https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html#

@tejlmand tejlmand requested review from nordicjm and 57300 January 31, 2024 10:04
boards/v2/intel/intel_ish/Kconfig.intel_ish_5_4_1 Outdated Show resolved Hide resolved
boards/v2/intel/intel_ish/Kconfig.intel_ish_5_6_0 Outdated Show resolved Hide resolved
boards/v2/intel/intel_ish/Kconfig.intel_ish_5_8_0 Outdated Show resolved Hide resolved
Comment on lines 3 to 16
- name: intel_ish_5_4_1
vendor: intel
socs:
- name: intel_ish_5_4_1

- name: intel_ish_5_6_0
vendor: intel
socs:
- name: intel_ish_5_6_0

- name: intel_ish_5_8_0
vendor: intel
socs:
- name: intel_ish_5_8_0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be using revisions

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but we don't have revisions for SoCs in Zephyr, only for boards, and those numbers seems to identify the SoC.

I assume somewhat similar to what nRF does with its package variant identification field, like qfaa, ciaa, etc.

So probably the cleanest approach would be to have a single board, and then identify the soc, something like:

board
 name: intel_ish
  vendor: intel
    socs:
      - name: intel_ish_5_4_1
      - name: intel_ish_5_6_0
      - name: intel_ish_5_8_0

but I would leave such decision at the discretion of the board maintainer.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do have board revisions which can select which soc is used, as per 6809aae#diff-e26d2b274c8899adef8f82cb8fcf2a53a96838c4726caa9d7ad11c2afdb886af

Copy link
Member Author

@golowanow golowanow Jan 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but I would leave such decision at the discretion of the board maintainer.

@nashif , @jhedberg, @tbursztyka, @kwd-doodling - what do you think: should we keep ISH for HWMv2 as separate socs/boards for now same as currently, or migrate to board variants revisions, or ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do have board revisions which can select which soc is used

I know, I was just pointing to the fact that 5_4_1, 5_6_0, 5_8_0 doesn't seem to be a revision of the board, but the revision of the SoC, and therefore using board revisions in this case might be a misnomer as well.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, they're different boards with different SoCs, not one board with different SoCs.
I've tried board revision. unfortunately it's a support of different boards with a same SoC, which doesn't fit our usage.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, they're different boards with different SoCs, not one board with different SoCs. I've tried board revision. unfortunately it's a support of different boards with a same SoC, which doesn't fit our usage.

@kwd-doodling just to double check: does the new board/soc/variant naming scheme fit the ISH purposes ?,
i.e. what is proposed with the last commit here to have intel_ish/intel_ish_5_4_1 etc. board names

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, they're different boards with different SoCs, not one board with different SoCs.

if they are in fact different boards, then I think they should still be modeled as individual boards.
I just had the impression that the intel_ish as a board was kind of a phony board, because the ish is a co-processor inside a SoC / SiP.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nashif what do you think about possible optimizations for ISH names ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nashif what do you think about possible optimizations for ISH names ?

@nashif, @kwd-doodling - are we going to rename SoC/boards somehow towards hwmv2 in this PR ?
If yes, then please suggest your new naming schema.

boards/v2/intel/intel_ish/intel_ish_5_6_0_defconfig Outdated Show resolved Hide resolved
boards/v2/intel/intel_ish/Kconfig.defconfig Outdated Show resolved Hide resolved
@kwd-doodling
Copy link
Collaborator

@golowanow Hi Dmitrii, what's HMWv2? why move ISH boards/SoCs into a new v2 sub-directory?

@golowanow
Copy link
Member Author

@golowanow Hi Dmitrii, what's HMWv2? why move ISH boards/SoCs into a new v2 sub-directory?

@kwd-doodling more details on HMWv2 are here - #51831, #67682 or you can contacl me or @nashif on Teams/email.

@golowanow
Copy link
Member Author

  1. adjusted to hwmv2: move all non-ported legacy boards and socs to legacy folders #68346
  2. keep intel_ish board configurations as separate boards (no revisions, no variants) as suggested by @kwd-doodling

@golowanow
Copy link
Member Author

@kwd-doodling, @tejlmand, @nashif, @57300, @gmarull - up to your attention.

soc/intel/intel_ish/Kconfig Show resolved Hide resolved
soc/intel/intel_ish/Kconfig.soc Show resolved Hide resolved
soc/intel/intel_ish/Kconfig.defconfig Outdated Show resolved Hide resolved
soc/intel/intel_ish/intel_ish5/Kconfig.soc Show resolved Hide resolved
boards/intel/intel_ish/intel_ish_5_4_1.yaml Outdated Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comments as to intel_ish_5_4_1.yaml.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same thing - it is not yet upstreamed

identifier: intel_ish_5_6_0
name: Intel ISH 5.6.0 SoC
type: mcu
arch: x86
toolchain:
- zephyr
ram: 640
supported:
- serial
testing:
ignore_tags:
- net
- bluetooth
vendor: intel

boards/intel/intel_ish/intel_ish_5_8_0.yaml Outdated Show resolved Hide resolved
@simonguinot
Copy link
Collaborator

simonguinot commented Feb 16, 2024

Sorry, I messed up with the reviewers list while removing myself. And for some reason I am unable to fix it...

@simonguinot
Copy link
Collaborator

It looks like that at most 15 reviewers can be "manually" selected. Maybe the removal of additional people is due to this limit as well.

Move and convert soc/x86/intel_ish to HWMv2 as soc/intel/intel_ish

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Move and convert to HWMv2 the following board configurations:
intel_ish_5_4_1, intel_ish_5_6_0, intel_ish_5_8_0

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Adjust intel/intel_ish SoC and board maintainers to HWMv2 move.

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
@golowanow
Copy link
Member Author

  • rebase to the latest changes at collab-hwm
  • align paths at MAINTAINERS

@nordicjm nordicjm merged commit 90f38dd into zephyrproject-rtos:collab-hwm Feb 19, 2024
19 checks passed
@golowanow golowanow deleted the hwmv2_intel_ish branch February 19, 2024 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants