Hi all,
After merging the usb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_cmd_mux_set':
drivers/platform/chrome/cros_typec_switch.c:52:16: error: implicit declaration of function 'cros_ec_command'; did you mean 'cros_ec_cmd'? [-Werror=implicit-function-declaration]
52 | return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
| ^~~~~~~~~~~~~~~
| cros_ec_cmd
drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_register_switches':
drivers/platform/chrome/cros_typec_switch.c:244:23: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
| ^~~~~~~~~~~~~~~~~~~~~
| acpi_evaluate_object
drivers/platform/chrome/cros_typec_switch.c:244:49: error: invalid use of undefined type 'struct acpi_device'
244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
| ^~
Caused by commit
e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver")
and commits
34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer")
bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check")
interacting with commit
b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function")
from the chrome-platform tree.
I have used the usb tree from next-20220715 for today.
I will fix up the cros_ec_command() rename with a merge fix patch after
the apci usage problem is solved.
--
Cheers,
Stephen Rothwell
On Mon, Jul 18, 2022 at 04:31:58PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the usb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_cmd_mux_set':
> drivers/platform/chrome/cros_typec_switch.c:52:16: error: implicit declaration of function 'cros_ec_command'; did you mean 'cros_ec_cmd'? [-Werror=implicit-function-declaration]
> 52 | return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
> | ^~~~~~~~~~~~~~~
> | cros_ec_cmd
> drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_register_switches':
> drivers/platform/chrome/cros_typec_switch.c:244:23: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
> 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> | ^~~~~~~~~~~~~~~~~~~~~
> | acpi_evaluate_object
> drivers/platform/chrome/cros_typec_switch.c:244:49: error: invalid use of undefined type 'struct acpi_device'
> 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> | ^~
>
> Caused by commit
>
> e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver")
>
> and commits
>
> 34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer")
> bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check")
>
> interacting with commit
>
> b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function")
>
> from the chrome-platform tree.
>
> I have used the usb tree from next-20220715 for today.
>
> I will fix up the cros_ec_command() rename with a merge fix patch after
> the apci usage problem is solved.
The ACPI issue should now be solved in my tree.
thanks,
greg k-h
Hi Stephen & Greg,
On Mon, Jul 18, 2022 at 1:43 PM Greg KH <[email protected]> wrote:
>
> On Mon, Jul 18, 2022 at 04:31:58PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the usb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_cmd_mux_set':
> > drivers/platform/chrome/cros_typec_switch.c:52:16: error: implicit declaration of function 'cros_ec_command'; did you mean 'cros_ec_cmd'? [-Werror=implicit-function-declaration]
> > 52 | return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
> > | ^~~~~~~~~~~~~~~
> > | cros_ec_cmd
> > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_register_switches':
> > drivers/platform/chrome/cros_typec_switch.c:244:23: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
> > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > | ^~~~~~~~~~~~~~~~~~~~~
> > | acpi_evaluate_object
> > drivers/platform/chrome/cros_typec_switch.c:244:49: error: invalid use of undefined type 'struct acpi_device'
> > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > | ^~
> >
> > Caused by commit
> >
> > e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver")
> >
> > and commits
> >
> > 34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer")
> > bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check")
> >
> > interacting with commit
> >
> > b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function")
> >
> > from the chrome-platform tree.
I am very sorry about the conflicts.
I can think of a few ways to address this:
1. A fixup patch on top of linux-next updating the function signature
to cros_ec_cmd() ; I will send this out if you'd like.
2. Pull in Commit b1d288d9c3c5 ("platform/chrome: cros_ec_proto:
Rename cros_ec_command function") to usb-next.
We will also have to pull in dependent commit 015cd0043503
("regulator: cros-ec: Use common cros_ec_command()")
3. Revert the entire cros-typec-switch (patches 3-9) series from
usb-next and wait till after the merge window to apply it to
chrome-platform directly.
> >
> > I have used the usb tree from next-20220715 for today.
> >
> > I will fix up the cros_ec_command() rename with a merge fix patch after
> > the apci usage problem is solved.
>
> The ACPI issue should now be solved in my tree.
Sorry about the missing Kconfig dependency, and thank you for applying
the patch quickly.
Best regards,
-Prashant
On Mon, Jul 18, 2022 at 2:41 PM Prashant Malani <[email protected]> wrote:
>
> Hi Stephen & Greg,
>
> On Mon, Jul 18, 2022 at 1:43 PM Greg KH <[email protected]> wrote:
> >
> > On Mon, Jul 18, 2022 at 04:31:58PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the usb tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_cmd_mux_set':
> > > drivers/platform/chrome/cros_typec_switch.c:52:16: error: implicit declaration of function 'cros_ec_command'; did you mean 'cros_ec_cmd'? [-Werror=implicit-function-declaration]
> > > 52 | return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
> > > | ^~~~~~~~~~~~~~~
> > > | cros_ec_cmd
> > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_register_switches':
> > > drivers/platform/chrome/cros_typec_switch.c:244:23: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
> > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > > | ^~~~~~~~~~~~~~~~~~~~~
> > > | acpi_evaluate_object
> > > drivers/platform/chrome/cros_typec_switch.c:244:49: error: invalid use of undefined type 'struct acpi_device'
> > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > > | ^~
> > >
> > > Caused by commit
> > >
> > > e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver")
> > >
> > > and commits
> > >
> > > 34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer")
> > > bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check")
> > >
> > > interacting with commit
> > >
> > > b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function")
> > >
> > > from the chrome-platform tree.
>
> I am very sorry about the conflicts.
>
> I can think of a few ways to address this:
> 1. A fixup patch on top of linux-next updating the function signature
> to cros_ec_cmd() ; I will send this out if you'd like.
> 2. Pull in Commit b1d288d9c3c5 ("platform/chrome: cros_ec_proto:
> Rename cros_ec_command function") to usb-next.
> We will also have to pull in dependent commit 015cd0043503
> ("regulator: cros-ec: Use common cros_ec_command()")
> 3. Revert the entire cros-typec-switch (patches 3-9) series from
> usb-next and wait till after the merge window to apply it to
> chrome-platform directly.
>
> > >
> > > I have used the usb tree from next-20220715 for today.
> > >
> > > I will fix up the cros_ec_command() rename with a merge fix patch after
> > > the apci usage problem is solved.
> >
Sorry, quick to the trigger (again). Thanks for fixing up the
cros_ec_command() rename.
Please LMK if any other errors arise from the various patches across branches.
BR,
-Prashant
Hi Greg,
On Mon, 18 Jul 2022 22:43:29 +0200 Greg KH <[email protected]> wrote:
>
> > Caused by commit
> >
> > e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver")
> >
> > and commits
> >
> > 34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer")
> > bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check")
> >
> > interacting with commit
> >
> > b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function")
> >
> > from the chrome-platform tree.
> >
> > I have used the usb tree from next-20220715 for today.
> >
> > I will fix up the cros_ec_command() rename with a merge fix patch after
> > the apci usage problem is solved.
>
> The ACPI issue should now be solved in my tree.
OK, so I have applied the following merge fix patch from today. So
Linus will need to know about this when the usb and chrome-platform
trees are merged.
From: Stephen Rothwell <[email protected]>
Date: Tue, 19 Jul 2022 15:57:13 +1000
Subject: [PATCH] fix up for "platform/chrome: cros_ec_proto: Rename cros_ec_command function"
Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/platform/chrome/cros_typec_switch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform/chrome/cros_typec_switch.c
index 024a2bb146b2..38ac20d52c88 100644
--- a/drivers/platform/chrome/cros_typec_switch.c
+++ b/drivers/platform/chrome/cros_typec_switch.c
@@ -49,7 +49,7 @@ static int cros_typec_cmd_mux_set(struct cros_typec_switch_data *sdata, int port
.mux_params = params,
};
- return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
+ return cros_ec_cmd(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
sizeof(req), NULL, 0);
}
@@ -76,7 +76,7 @@ static int cros_typec_send_clear_event(struct cros_typec_switch_data *sdata, int
.clear_events_mask = events_mask,
};
- return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
+ return cros_ec_cmd(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
sizeof(req), NULL, 0);
}
@@ -88,7 +88,7 @@ static bool cros_typec_check_event(struct cros_typec_switch_data *sdata, int por
};
int ret;
- ret = cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_STATUS, &req, sizeof(req),
+ ret = cros_ec_cmd(sdata->ec, 0, EC_CMD_TYPEC_STATUS, &req, sizeof(req),
&resp, sizeof(resp));
if (ret < 0) {
dev_warn(sdata->dev, "EC_CMD_TYPEC_STATUS failed for port: %d\n", port_num);
--
2.35.1
--
Cheers,
Stephen Rothwell
On Mon, Jul 18, 2022 at 02:41:23PM -0700, Prashant Malani wrote:
> Hi Stephen & Greg,
>
> On Mon, Jul 18, 2022 at 1:43 PM Greg KH <[email protected]> wrote:
> >
> > On Mon, Jul 18, 2022 at 04:31:58PM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the usb tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_cmd_mux_set':
> > > drivers/platform/chrome/cros_typec_switch.c:52:16: error: implicit declaration of function 'cros_ec_command'; did you mean 'cros_ec_cmd'? [-Werror=implicit-function-declaration]
> > > 52 | return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
> > > | ^~~~~~~~~~~~~~~
> > > | cros_ec_cmd
> > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_register_switches':
> > > drivers/platform/chrome/cros_typec_switch.c:244:23: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
> > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > > | ^~~~~~~~~~~~~~~~~~~~~
> > > | acpi_evaluate_object
> > > drivers/platform/chrome/cros_typec_switch.c:244:49: error: invalid use of undefined type 'struct acpi_device'
> > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > > | ^~
> > >
> > > Caused by commit
> > >
> > > e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver")
> > >
> > > and commits
> > >
> > > 34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer")
> > > bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check")
> > >
> > > interacting with commit
> > >
> > > b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function")
> > >
> > > from the chrome-platform tree.
>
> I am very sorry about the conflicts.
>
> I can think of a few ways to address this:
> 1. A fixup patch on top of linux-next updating the function signature
> to cros_ec_cmd() ; I will send this out if you'd like.
> 2. Pull in Commit b1d288d9c3c5 ("platform/chrome: cros_ec_proto:
> Rename cros_ec_command function") to usb-next.
> We will also have to pull in dependent commit 015cd0043503
> ("regulator: cros-ec: Use common cros_ec_command()")
> 3. Revert the entire cros-typec-switch (patches 3-9) series from
> usb-next and wait till after the merge window to apply it to
> chrome-platform directly.
I think I'll just do #3 to resolve the issue. I'll do it in a few
hours.
thanks,
greg k-h
On Tue, Jul 19, 2022 at 08:50:14AM +0200, Greg KH wrote:
> On Mon, Jul 18, 2022 at 02:41:23PM -0700, Prashant Malani wrote:
> > Hi Stephen & Greg,
> >
> > On Mon, Jul 18, 2022 at 1:43 PM Greg KH <[email protected]> wrote:
> > >
> > > On Mon, Jul 18, 2022 at 04:31:58PM +1000, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > After merging the usb tree, today's linux-next build (arm
> > > > multi_v7_defconfig) failed like this:
> > > >
> > > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_cmd_mux_set':
> > > > drivers/platform/chrome/cros_typec_switch.c:52:16: error: implicit declaration of function 'cros_ec_command'; did you mean 'cros_ec_cmd'? [-Werror=implicit-function-declaration]
> > > > 52 | return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req,
> > > > | ^~~~~~~~~~~~~~~
> > > > | cros_ec_cmd
> > > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_register_switches':
> > > > drivers/platform/chrome/cros_typec_switch.c:244:23: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration]
> > > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > > > | ^~~~~~~~~~~~~~~~~~~~~
> > > > | acpi_evaluate_object
> > > > drivers/platform/chrome/cros_typec_switch.c:244:49: error: invalid use of undefined type 'struct acpi_device'
> > > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
> > > > | ^~
> > > >
> > > > Caused by commit
> > > >
> > > > e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver")
> > > >
> > > > and commits
> > > >
> > > > 34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer")
> > > > bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check")
> > > >
> > > > interacting with commit
> > > >
> > > > b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function")
> > > >
> > > > from the chrome-platform tree.
> >
> > I am very sorry about the conflicts.
> >
> > I can think of a few ways to address this:
> > 1. A fixup patch on top of linux-next updating the function signature
> > to cros_ec_cmd() ; I will send this out if you'd like.
> > 2. Pull in Commit b1d288d9c3c5 ("platform/chrome: cros_ec_proto:
> > Rename cros_ec_command function") to usb-next.
> > We will also have to pull in dependent commit 015cd0043503
> > ("regulator: cros-ec: Use common cros_ec_command()")
> > 3. Revert the entire cros-typec-switch (patches 3-9) series from
> > usb-next and wait till after the merge window to apply it to
> > chrome-platform directly.
>
> I think I'll just do #3 to resolve the issue. I'll do it in a few
> hours.
Now all reverted from my tree. Please send these changs through the
platform tree after the next -rc1 is released so that you don't end up
with build problems again.
thanks,
greg k-h
On Tue, Jul 19, 2022 at 5:30 AM Greg KH <[email protected]> wrote:
> > > 3. Revert the entire cros-typec-switch (patches 3-9) series from
> > > usb-next and wait till after the merge window to apply it to
> > > chrome-platform directly.
> >
> > I think I'll just do #3 to resolve the issue. I'll do it in a few
> > hours.
>
> Now all reverted from my tree. Please send these changs through the
> platform tree after the next -rc1 is released so that you don't end up
> with build problems again.
Will do. Thank you for catching this and reverting the patches. Sorry
for the trouble.
BR,
-Prashant