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

x86: revert removing soc.h from atom soc #69758

Merged

Conversation

nashif
Copy link
Member

@nashif nashif commented Mar 4, 2024

This was part of the mega hwmv2 commit. Looks like hpet drivers heavily
relies on soc.h. Reverting this for now while we look for a proper fix
and remove reliance on soc.h for drivers.

Signed-off-by: Anas Nashif [email protected]

This was part of the mega hwmv2 commit. Looks like hpet drivers heavily
relies on soc.h. Reverting this for now while we look for a proper fix
and remove reliance on soc.h for drivers.

Signed-off-by: Anas Nashif <[email protected]>
@@ -18,6 +18,7 @@
#include <zephyr/sys/byteorder.h>
#include <zephyr/debug/stack.h>
#include <zephyr/sys/__assert.h>
#include <soc.h>
Copy link
Member

Choose a reason for hiding this comment

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

This is a bit surprising. What does hci_core.c need this for? I'd have expected to see reports of build failures, etc if it was absolutely necessary there.

@@ -18,6 +18,7 @@
#include <zephyr/sys/byteorder.h>
#include <zephyr/debug/stack.h>
#include <zephyr/sys/__assert.h>
#include <soc.h>
Copy link
Member

Choose a reason for hiding this comment

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

soc.h should not be on a subsys level file

gmarull
gmarull previously requested changes Mar 4, 2024
Comment on lines +18 to +23
#include <zephyr/sys/util.h>

#ifndef _ASMLANGUAGE
#include <zephyr/device.h>
#include <zephyr/random/random.h>
#endif
Copy link
Member

Choose a reason for hiding this comment

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

none of these seem to be required by this file, only toolchain.h for ARG_UNUSED?

@nashif
Copy link
Member Author

nashif commented Mar 4, 2024

Guys, I am reverting a commit with this, I do not want to go through partial fixes, will come back to this and give it another go, but this is blocking and breaking few platforms and I do not want to be selective in the revert. The commit in question:

ffd1c15 (#69039)

I know some of those might not be needed, thats why I originally removed them.

@gmarull gmarull dismissed their stale review March 4, 2024 14:42

unblocking, can be taken as a revert for now, but please, open a PR fixing the trivial issues

Copy link
Collaborator

@teburd teburd left a comment

Choose a reason for hiding this comment

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

Simple revert for fixing issues, seems fine

@nashif nashif added Hotfix Fix for issues blocking development, i.e. CI issues, tests failing in CI, etc. HWMv2 labels Mar 4, 2024
@carlescufi carlescufi merged commit e2f3912 into zephyrproject-rtos:main Mar 4, 2024
49 checks passed
@ycsin
Copy link
Member

ycsin commented Sep 19, 2024

I'm working on #78670 and trying to incorporate test into samples/subsys/shell/shell_module and found that this doesn't build on the qemu_riscv64, is there an issue tracking this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Bluetooth Host area: Bluetooth area: Counter area: Disk Access area: Timer Timer area: X86 x86 Architecture (32-bit) Hotfix Fix for issues blocking development, i.e. CI issues, tests failing in CI, etc. HWMv2 platform: X86 x86 and x86-64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants