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

package/linux-mainline: Bump to 6.2 #657

Merged
merged 7 commits into from
Aug 16, 2023

Conversation

alistair23
Copy link

@alistair23 alistair23 commented Dec 12, 2022

Bump the mainline based kernel to the 6.1 6.2 release.

Besides the mainline changes from 6.0 to 6.2, this includes a refactoring of the rohm,bd71815 code to use the mainline driver instead of the reMarkable version. It has also dropped a Koreader related hack from the kernel, see koreader/koreader#10012.

This is the 6.1 6.2 mainline kernel and 18 12 rM2 specific patches on top.

@Etn40ff
Copy link

Etn40ff commented Jan 9, 2023

I just ran this on 20221026104022. There are a couple of issues:

  • a ⚠️ symbol appears next to the battery indicator in xochitl

  • I get the following messages in dmesg

[   15.287260] UDC core: g_ether: couldn't find an available UDC or it's busy
[  231.122624] evbug: Event. Dev: input1, Type: 1, Code: 330, Value: 0
[  231.122635] evbug: Event. Dev: input1, Type: 0, Code: 0, Value: 0
[  234.253718] usbmisc_imx 30b20200.usbmisc: vbus is error
[  234.253764] usbmisc_imx 30b20200.usbmisc: Error occurs during detection: -22

actually dmesg output is spammed with evbugs messages.

Other than that all seems to be in order.

@alistair23
Copy link
Author

alistair23 commented Jan 18, 2023

Weird. I don't see those.

dmesg | grep g_ether    
[    3.610858] UDC core: g_ether: couldn't find an available UDC
[    4.899438] g_ether gadget.0: Ethernet Gadget, version: Memorial Day 2008
[    4.906347] g_ether gadget.0: g_ether ready

After a reboot do you still see the battery warning sign?

@Etn40ff
Copy link

Etn40ff commented Jan 19, 2023

I do but the message buffer is not spammed by them and ethernet over usb works:

reMarkable: ~/ dmesg | grep g_ether
[    2.620511] UDC core: g_ether: couldn't find an available UDC
[    3.493576] g_ether gadget.0: Ethernet Gadget, version: Memorial Day 2008
[    3.493599] g_ether gadget.0: g_ether ready
[   13.885486] UDC core: g_ether: couldn't find an available UDC or it's busy

Here are some pictures of the warning signs:

signal-2023-01-19-133447_002
signal-2023-01-19-133442

@Eeems Eeems added the packages Add or improve packages of the repository label Feb 8, 2023
Signed-off-by: Alistair Francis <alistair@alistair23.me>
@alistair23 alistair23 changed the title package/linux-mainline: Bump to 6.1 package/linux-mainline: Bump to 6.2 Feb 25, 2023
@alistair23
Copy link
Author

Ok! Pushed an update to go all the way to the 6.2 kernel.

I double checked and in Xochitl 2.9.0.210 I don't see any warning signs for the battery. Let me know if you still see anything, although I think that's a Xochitl bug as we are now using the upstream driver for the power management

Signed-off-by: Alistair Francis <alistair@alistair23.me>
@Etn40ff
Copy link

Etn40ff commented Mar 1, 2023

I just gave this another spin. I still get the weird error symbol in 2.15.1.1189 but other than that it works as intended.

@alistair23
Copy link
Author

I think this should be merged then. We can work on the warning symbol in the future

@alistair23
Copy link
Author

Ping!

1 similar comment
@alistair23
Copy link
Author

Ping!

@Eeems
Copy link
Member

Eeems commented Apr 17, 2023

I'd be happy to merge it if one of the maintainers with a rM2 is okay with that. @raisjn @matteodelabre @LinusCDE ?

@alistair23
Copy link
Author

Anyone?

@alistair23
Copy link
Author

Another ping

@alistair23
Copy link
Author

Ping!

@Eeems
Copy link
Member

Eeems commented Jul 20, 2023

I've asked the question a number of times on discord and had no reply about it, other than @LinusCDE saying he didn't think he was the right person to answer.

@Eeems
Copy link
Member

Eeems commented Aug 8, 2023

@LinusCDE I think it would be fine for you to approve this at this point.

Copy link
Member

@LinusCDE LinusCDE left a comment

Choose a reason for hiding this comment

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

Will rubber stamp, but have not done testing on custom kernels yet. If some unknown issue crops up, i can probably find the time to look into it.

@Eeems
Copy link
Member

Eeems commented Aug 15, 2023

Will rubber stamp, but have not done testing on custom kernels yet. If some unknown issue crops up, i can probably find the time to look into it.

To clarify, I'm not looking for a rubber stamp. I'm looking for an explicit statement that you are comfortable or not with the battery warning when running this on 2.15.

@LinusCDE
Copy link
Member

Was initially not sure, because it involves battery seemingly. I doubt that the kernel would need to do any crucial control for it, but on the rM 2 it's usually hard to say what they did in the name of making stuff sleeker and more responsive.

In this case I doubt it's an issue though. Looking at the dmesg log, the problem doesn't seem to be battery but actually the UDC, which according to this documenation should mean USB Device Controller. At first I thought this should not matter to the reMarkable anyway.

But in one way I would: The ethernet interface. Can someone confirm that the Ethernet functionality still works normally? If not I should have probably not approved it. Otherwise I think it should be fine.

@Eeems
Copy link
Member

Eeems commented Aug 15, 2023

@Etn40ff since you are the one who can replicate, can you take a look?

@Etn40ff
Copy link

Etn40ff commented Aug 16, 2023

@Etn40ff since you are the one who can replicate, can you take a look?

I do not have my recovery gear with me at the moment; I will not be able to test this again before mid September.

@alistair23
Copy link
Author

I use the Ethernet interface fairly often. I'm pretty sure it works fine with the 6.2 kernel

@LinusCDE
Copy link
Member

Then there should be no issue merging this i guess. 👍

@Eeems
Copy link
Member

Eeems commented Aug 16, 2023

Alright, good enough for me, I guess. Merging.

@Eeems Eeems merged commit 4f874ca into toltec-dev:testing Aug 16, 2023
3 checks passed
@Eeems Eeems added this to the 2023-W33 merge window milestone Aug 16, 2023
Eeems added a commit that referenced this pull request Aug 18, 2023
* package/linux-mainline: Bump to 6.1

Signed-off-by: Alistair Francis <alistair@alistair23.me>

* package/linux-mainline: Bump to 6.2

Signed-off-by: Alistair Francis <alistair@alistair23.me>

---------

Signed-off-by: Alistair Francis <alistair@alistair23.me>
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Eeems added a commit that referenced this pull request Aug 23, 2023
### New Packages
- `reterm` - 0230628.1927-1 (#703)
- `sill` - 0.1.1-alpha (#719)
- `changescrn` - 1.0.0-1 (#571)

### Updated Packages
- `yaft` - 0.0.8-2 (#715 #716)
  - Update to 0.0.8
  - Depend on `terminfo`
  - Add patch to start bash as a login shell
- `toltec-base` - 1.2-2 (#715)
  - Adds `/opt/etc/profile` to `/etc/profile.d` so that it automatically loads the environment variables provided by the entware source
- `linux-mainline` - 6.2.0-1 (#657)

### Tooling
- Update build process to use Python 3.10 (#684)
- Added issue templates to the repository (#711)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages Add or improve packages of the repository
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants