| Message ID | 20230615174940.jmzuv5kb6o7htkwo@mercury.elektranox.org (mailing list archive) |
|---|---|
| State | Queued |
| Headers | show |
| Series | [GIT,PULL] ARM64 RK808 defconfig fix | expand |
On Thu, Jun 15, 2023, at 19:49, Sebastian Reichel wrote: > Hi, > > Since I did not get any feedback for the defconfig patches from [0] and they > are fixing a KernelCI regression (Rockchip Chromebooks no longer boot because > of missing PMIC driver), I prepared a pull request with the defconfig change > instead as suggested by Tony [1]. It consists of the rk806 immutable branch > prepared by Lee Jones [2] and the arm64 defconfig patch. I will send a second > pull request for the arm32 multi_v7 defconfig. This is targeting linux-next. > > [0] > https://lore.kernel.org/all/20230518040541.299189-1-sebastian.reichel@collabora.com/ > [1] > https://lore.kernel.org/linux-omap/20230604060436.GT14287@atomide.com/ > [1] https://lore.kernel.org/all/20230515152425.GV10825@google.com/ I don't think it's important to have bisectable defconfig changes, and I'd prefer to just cherry-pick the two defconfig patches in this case if that's ok with you. > The following changes since commit ac9a78681b921877518763ba0e89202254349d1b: > > Linux 6.4-rc1 (2023-05-07 13:34:35 -0700) > > are available in the Git repository at: > > > ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-misc.git/ > rk806-defconfig-fix-arm64 This is also not a public git URL, you may need something like this in your .gitconfig to generate better pull requests: [url "https://git.kernel.org"] insteadOf = ssh://git@gitolite.ra.kernel.org Arnd
Hi Arnd, On Wed, Jun 21, 2023 at 11:36:48AM +0200, Arnd Bergmann wrote: > On Thu, Jun 15, 2023, at 19:49, Sebastian Reichel wrote: > > Since I did not get any feedback for the defconfig patches from [0] and they > > are fixing a KernelCI regression (Rockchip Chromebooks no longer boot because > > of missing PMIC driver), I prepared a pull request with the defconfig change > > instead as suggested by Tony [1]. It consists of the rk806 immutable branch > > prepared by Lee Jones [2] and the arm64 defconfig patch. I will send a second > > pull request for the arm32 multi_v7 defconfig. This is targeting linux-next. > > > > [0] > > https://lore.kernel.org/all/20230518040541.299189-1-sebastian.reichel@collabora.com/ > > [1] > > https://lore.kernel.org/linux-omap/20230604060436.GT14287@atomide.com/ > > [1] https://lore.kernel.org/all/20230515152425.GV10825@google.com/ > > I don't think it's important to have bisectable defconfig changes, > and I'd prefer to just cherry-pick the two defconfig patches in > this case if that's ok with you. Sure, please go ahead. I just want to make sure that the regression is fixed. By the way, what's the merge strategy for defconfig patches? Apart from my RK808 fixes we have some other pending defconfig updates and nobody seems to care: https://lore.kernel.org/all/20230504201916.1121243-1-cristian.ciocaltea@collabora.com/ https://lore.kernel.org/all/20230604171345.1215276-1-cristian.ciocaltea@collabora.com/ > > The following changes since commit ac9a78681b921877518763ba0e89202254349d1b: > > > > Linux 6.4-rc1 (2023-05-07 13:34:35 -0700) > > > > are available in the Git repository at: > > > > > > ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-misc.git/ > > rk806-defconfig-fix-arm64 > > This is also not a public git URL, you may need something like this > in your .gitconfig to generate better pull requests: > > [url "https://git.kernel.org"] > insteadOf = ssh://git@gitolite.ra.kernel.org oops, I actually have the reverse thing in my .gitconfig and didn't notice it gets applied for 'git request-pull'. Thanks for the hint. Greetings, -- Sebastian
On Wed, Jun 21, 2023, at 14:28, Sebastian Reichel wrote: > On Wed, Jun 21, 2023 at 11:36:48AM +0200, Arnd Bergmann wrote: >> On Thu, Jun 15, 2023, at 19:49, Sebastian Reichel wrote: >> > Since I did not get any feedback for the defconfig patches from [0] and they >> > are fixing a KernelCI regression (Rockchip Chromebooks no longer boot because >> > of missing PMIC driver), I prepared a pull request with the defconfig change >> > instead as suggested by Tony [1]. It consists of the rk806 immutable branch >> > prepared by Lee Jones [2] and the arm64 defconfig patch. I will send a second >> > pull request for the arm32 multi_v7 defconfig. This is targeting linux-next. >> > >> > [0] >> > https://lore.kernel.org/all/20230518040541.299189-1-sebastian.reichel@collabora.com/ >> > [1] >> > https://lore.kernel.org/linux-omap/20230604060436.GT14287@atomide.com/ >> > [1] https://lore.kernel.org/all/20230515152425.GV10825@google.com/ >> >> I don't think it's important to have bisectable defconfig changes, >> and I'd prefer to just cherry-pick the two defconfig patches in >> this case if that's ok with you. > > Sure, please go ahead. I just want to make sure that the regression > is fixed. Done > By the way, what's the merge strategy for defconfig patches? Apart > from my RK808 fixes we have some other pending defconfig updates and > nobody seems to care: > > https://lore.kernel.org/all/20230504201916.1121243-1-cristian.ciocaltea@collabora.com/ > https://lore.kernel.org/all/20230604171345.1215276-1-cristian.ciocaltea@collabora.com/ I normally expect defconfig patches to go through one of the platform maintainer trees, the same way that I merge dts or driver changes, so I tend to miss patches sent individually, unless they take soc@kernel.org into Cc, which puts them into patchwork. I've applied the above two now, as they seem harmless. I see that Heiko was not on Cc here, so he probably never saw them. >> > The following changes since commit ac9a78681b921877518763ba0e89202254349d1b: >> > >> > Linux 6.4-rc1 (2023-05-07 13:34:35 -0700) >> > >> > are available in the Git repository at: >> > >> > >> > ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-misc.git/ >> > rk806-defconfig-fix-arm64 >> >> This is also not a public git URL, you may need something like this >> in your .gitconfig to generate better pull requests: >> >> [url "https://git.kernel.org"] >> insteadOf = ssh://git@gitolite.ra.kernel.org > > oops, I actually have the reverse thing in my .gitconfig and didn't > notice it gets applied for 'git request-pull'. Thanks for the hint. For the reverse entry, you probably want this: [url "git+ssh://gitolite@ra.kernel.org"] pushInsteadOf = git://git.kernel.org so that "git request-pull" always uses the https but "git push" always uses git+ssh, regardless of what URL you have. Arnd
Hi, On Wed, Jun 21, 2023 at 03:10:46PM +0200, Arnd Bergmann wrote: > On Wed, Jun 21, 2023, at 14:28, Sebastian Reichel wrote: > > On Wed, Jun 21, 2023 at 11:36:48AM +0200, Arnd Bergmann wrote: > >> On Thu, Jun 15, 2023, at 19:49, Sebastian Reichel wrote: > >> > Since I did not get any feedback for the defconfig patches from [0] and they > >> > are fixing a KernelCI regression (Rockchip Chromebooks no longer boot because > >> > of missing PMIC driver), I prepared a pull request with the defconfig change > >> > instead as suggested by Tony [1]. It consists of the rk806 immutable branch > >> > prepared by Lee Jones [2] and the arm64 defconfig patch. I will send a second > >> > pull request for the arm32 multi_v7 defconfig. This is targeting linux-next. > >> > > >> > [0] > >> > https://lore.kernel.org/all/20230518040541.299189-1-sebastian.reichel@collabora.com/ > >> > [1] > >> > https://lore.kernel.org/linux-omap/20230604060436.GT14287@atomide.com/ > >> > [1] https://lore.kernel.org/all/20230515152425.GV10825@google.com/ > >> > >> I don't think it's important to have bisectable defconfig changes, > >> and I'd prefer to just cherry-pick the two defconfig patches in > >> this case if that's ok with you. > > > > Sure, please go ahead. I just want to make sure that the regression > > is fixed. > > Done Thanks. > > By the way, what's the merge strategy for defconfig patches? Apart > > from my RK808 fixes we have some other pending defconfig updates and > > nobody seems to care: > > > > https://lore.kernel.org/all/20230504201916.1121243-1-cristian.ciocaltea@collabora.com/ > > https://lore.kernel.org/all/20230604171345.1215276-1-cristian.ciocaltea@collabora.com/ > > I normally expect defconfig patches to go through one of the platform > maintainer trees, the same way that I merge dts or driver changes, > so I tend to miss patches sent individually, unless they take soc@kernel.org > into Cc, which puts them into patchwork. Ok. So maybe something like this could be applied to MAINTAINERS? diff --git a/MAINTAINERS b/MAINTAINERS index 7e0b87d5aa2e..63e7105a7f59 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3069,6 +3069,13 @@ F: Documentation/arm64/ F: arch/arm64/ F: tools/testing/selftests/arm64/ X: arch/arm64/boot/dts/ +X: arch/arm64/configs/defconfig + +ARM64 DEFCONFIG +M: ARM64 subsystem maintainers (e.g. Qualcomm, Mediatek, ...) <invalid@invalid> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm64/configs/defconfig ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER M: George McCollister <george.mccollister@gmail.com> This changes get_maintainers output from $ ./scripts/get_maintainer.pl -f arch/arm64/configs/defconfig Catalin Marinas <catalin.marinas@arm.com> (maintainer:ARM64 PORT (AARCH64 ARCHITECTURE)) Will Deacon <will@kernel.org> (maintainer:ARM64 PORT (AARCH64 ARCHITECTURE)) Bjorn Andersson <quic_bjorande@quicinc.com> (commit_signer:39/96=41%) Arnd Bergmann <arnd@arndb.de> (commit_signer:21/96=22%,added_lines:60/287=21%,removed_lines:60/87=69%) Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> (commit_signer:13/96=14%,authored:6/96=6%,added_lines:22/287=8%) Geert Uytterhoeven <geert+renesas@glider.be> (commit_signer:11/96=11%) Konrad Dybcio <konrad.dybcio@linaro.org> (commit_signer:9/96=9%) Neil Armstrong <neil.armstrong@linaro.org> (authored:5/96=5%) "Nícolas F. R. A. Prado" <nfraprado@collabora.com> (added_lines:43/287=15%) Mark Brown <broonie@kernel.org> (added_lines:16/287=6%) "Rafał Miłecki" <rafal@milecki.pl> (removed_lines:5/87=6%) linux-arm-kernel@lists.infradead.org (moderated list:ARM64 PORT (AARCH64 ARCHITECTURE)) linux-kernel@vger.kernel.org (open list) to $ ./scripts/get_maintainer.pl -f arch/arm64/configs/defconfig "ARM64 subsystem maintainers (e.g. Qualcomm, Mediatek, ...)" <invalid@invalid> (maintainer:ARM64 DEFCONFIG) linux-arm-kernel@lists.infradead.org (moderated list:ARM64 DEFCONFIG) linux-kernel@vger.kernel.org (open list) That should make it a bit more obvious, what to do. > I've applied the above two now, as they seem harmless. I see that > Heiko was not on Cc here, so he probably never saw them. Thanks. > >> > The following changes since commit ac9a78681b921877518763ba0e89202254349d1b: > >> > > >> > Linux 6.4-rc1 (2023-05-07 13:34:35 -0700) > >> > > >> > are available in the Git repository at: > >> > > >> > > >> > ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-misc.git/ > >> > rk806-defconfig-fix-arm64 > >> > >> This is also not a public git URL, you may need something like this > >> in your .gitconfig to generate better pull requests: > >> > >> [url "https://git.kernel.org"] > >> insteadOf = ssh://git@gitolite.ra.kernel.org > > > > oops, I actually have the reverse thing in my .gitconfig and didn't > > notice it gets applied for 'git request-pull'. Thanks for the hint. > > For the reverse entry, you probably want this: > > [url "git+ssh://gitolite@ra.kernel.org"] > pushInsteadOf = git://git.kernel.org > > so that "git request-pull" always uses the https but "git push" > always uses git+ssh, regardless of what URL you have. Thanks, that seems to work. Greetings, -- Sebastian
On 6/21/23 16:10, Arnd Bergmann wrote: > On Wed, Jun 21, 2023, at 14:28, Sebastian Reichel wrote: >> On Wed, Jun 21, 2023 at 11:36:48AM +0200, Arnd Bergmann wrote: >>> On Thu, Jun 15, 2023, at 19:49, Sebastian Reichel wrote: >>>> Since I did not get any feedback for the defconfig patches from [0] and they >>>> are fixing a KernelCI regression (Rockchip Chromebooks no longer boot because >>>> of missing PMIC driver), I prepared a pull request with the defconfig change >>>> instead as suggested by Tony [1]. It consists of the rk806 immutable branch >>>> prepared by Lee Jones [2] and the arm64 defconfig patch. I will send a second >>>> pull request for the arm32 multi_v7 defconfig. This is targeting linux-next. >>>> >>>> [0] >>>> https://lore.kernel.org/all/20230518040541.299189-1-sebastian.reichel@collabora.com/ >>>> [1] >>>> https://lore.kernel.org/linux-omap/20230604060436.GT14287@atomide.com/ >>>> [1] https://lore.kernel.org/all/20230515152425.GV10825@google.com/ >>> >>> I don't think it's important to have bisectable defconfig changes, >>> and I'd prefer to just cherry-pick the two defconfig patches in >>> this case if that's ok with you. >> >> Sure, please go ahead. I just want to make sure that the regression >> is fixed. > > Done > >> By the way, what's the merge strategy for defconfig patches? Apart >> from my RK808 fixes we have some other pending defconfig updates and >> nobody seems to care: >> >> https://lore.kernel.org/all/20230504201916.1121243-1-cristian.ciocaltea@collabora.com/ >> https://lore.kernel.org/all/20230604171345.1215276-1-cristian.ciocaltea@collabora.com/ > > I normally expect defconfig patches to go through one of the platform > maintainer trees, the same way that I merge dts or driver changes, > so I tend to miss patches sent individually, unless they take soc@kernel.org > into Cc, which puts them into patchwork. > > I've applied the above two now, as they seem harmless. I see that > Heiko was not on Cc here, so he probably never saw them. Hi Arnd, For some reason, the 2nd patch ("arm64: defconfig: Enable Rockchip OTP memory driver") didn't show up in linux-next, but only the 1st one ("arm64: defconfig: Enable Rockchip I2S TDM and ES8316 drivers"). Could you please check? Thanks, Cristian
Hi, Since I did not get any feedback for the defconfig patches from [0] and they are fixing a KernelCI regression (Rockchip Chromebooks no longer boot because of missing PMIC driver), I prepared a pull request with the defconfig change instead as suggested by Tony [1]. It consists of the rk806 immutable branch prepared by Lee Jones [2] and the arm64 defconfig patch. I will send a second pull request for the arm32 multi_v7 defconfig. This is targeting linux-next. [0] https://lore.kernel.org/all/20230518040541.299189-1-sebastian.reichel@collabora.com/ [1] https://lore.kernel.org/linux-omap/20230604060436.GT14287@atomide.com/ [1] https://lore.kernel.org/all/20230515152425.GV10825@google.com/ Thanks, -- Sebastian The following changes since commit ac9a78681b921877518763ba0e89202254349d1b: Linux 6.4-rc1 (2023-05-07 13:34:35 -0700) are available in the Git repository at: ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-misc.git/ rk806-defconfig-fix-arm64 for you to fetch changes up to 787614e7c48437ea5764f9cff824b45357c912ed: arm64: defconfig: update RK8XX MFD config (2023-06-14 19:33:04 +0200) ---------------------------------------------------------------- Sebastian Reichel (10): clk: RK808: Reduce 'struct rk808' usage mfd: rk808: Convert to device managed resources mfd: rk808: Use dev_err_probe mfd: rk808: Replace 'struct i2c_client' with 'struct device' mfd: rk808: Split into core and i2c mfd: rk8xx-i2c: Use device_get_match_data dt-bindings: mfd: Add rk806 binding mfd: rk8xx: Add rk806 support pinctrl: rk805: Add rk806 pinctrl support arm64: defconfig: update RK8XX MFD config .../devicetree/bindings/mfd/rockchip,rk806.yaml | 406 ++++++++++++++++++++ arch/arm64/configs/defconfig | 3 +- drivers/clk/Kconfig | 2 +- drivers/clk/clk-rk808.c | 34 +- drivers/input/misc/Kconfig | 2 +- drivers/mfd/Kconfig | 21 +- drivers/mfd/Makefile | 4 +- drivers/mfd/{rk808.c => rk8xx-core.c} | 352 ++++++----------- drivers/mfd/rk8xx-i2c.c | 185 +++++++++ drivers/mfd/rk8xx-spi.c | 124 ++++++ drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rk805.c | 189 ++++++++-- drivers/power/supply/Kconfig | 2 +- drivers/regulator/Kconfig | 2 +- drivers/rtc/Kconfig | 2 +- include/linux/mfd/rk808.h | 417 ++++++++++++++++++++- sound/soc/codecs/Kconfig | 2 +- 17 files changed, 1466 insertions(+), 283 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk806.yaml rename drivers/mfd/{rk808.c => rk8xx-core.c} (71%) create mode 100644 drivers/mfd/rk8xx-i2c.c create mode 100644 drivers/mfd/rk8xx-spi.c