| Message ID | 20240703181132.28374-1-brgl@bgdev.pl (mailing list archive) |
|---|---|
| Headers | show |
| Series | net: phy: aquantia: enable support for aqr115c | expand |
On Wed, 3 Jul 2024 20:11:27 +0200 Bartosz Golaszewski wrote:
> [PATCH net-next v3 0/4] net: phy: aquantia: enable support for aqr115c
Doesn't seem to apply:
Applying: net: phy: aquantia: rename and export aqr107_wait_reset_complete()
error: patch failed: drivers/net/phy/aquantia/aquantia.h:201
error: drivers/net/phy/aquantia/aquantia.h: patch does not apply
Patch failed at 0001 net: phy: aquantia: rename and export aqr107_wait_reset_complete()
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
On Sat, Jul 6, 2024 at 2:04 AM Jakub Kicinski <kuba@kernel.org> wrote: > > On Wed, 3 Jul 2024 20:11:27 +0200 Bartosz Golaszewski wrote: > > [PATCH net-next v3 0/4] net: phy: aquantia: enable support for aqr115c > > Doesn't seem to apply: > > Applying: net: phy: aquantia: rename and export aqr107_wait_reset_complete() > error: patch failed: drivers/net/phy/aquantia/aquantia.h:201 > error: drivers/net/phy/aquantia/aquantia.h: patch does not apply > Patch failed at 0001 net: phy: aquantia: rename and export aqr107_wait_reset_complete() > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abort". > hint: Disable this message with "git config advice.mergeConflict false" > -- > pw-bot: cr It conflicts with the fix I sent separately to add include guards that I had in my branch as well. I'll resend it. Bart
On Sat, Jul 6, 2024 at 7:11 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > On Sat, Jul 6, 2024 at 2:04 AM Jakub Kicinski <kuba@kernel.org> wrote: > > > > On Wed, 3 Jul 2024 20:11:27 +0200 Bartosz Golaszewski wrote: > > > [PATCH net-next v3 0/4] net: phy: aquantia: enable support for aqr115c > > > > Doesn't seem to apply: > > > > Applying: net: phy: aquantia: rename and export aqr107_wait_reset_complete() > > error: patch failed: drivers/net/phy/aquantia/aquantia.h:201 > > error: drivers/net/phy/aquantia/aquantia.h: patch does not apply > > Patch failed at 0001 net: phy: aquantia: rename and export aqr107_wait_reset_complete() > > hint: Use 'git am --show-current-patch=diff' to see the failed patch > > hint: When you have resolved this problem, run "git am --continue". > > hint: If you prefer to skip this patch, run "git am --skip" instead. > > hint: To restore the original branch and stop patching, run "git am --abort". > > hint: Disable this message with "git config advice.mergeConflict false" > > -- > > pw-bot: cr > > It conflicts with the fix I sent separately to add include guards that > I had in my branch as well. I'll resend it. > > Bart Actually this conflicts with commit 61578f679378 ("net: phy: aquantia: add support for PHY LEDs") that was applied to net-next recently. The resolution is trivial - just leave both sides as they are. Can you resolve it when applying or do you want a new version after all? Bart
On Sat, Jul 6, 2024 at 8:26 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > On Sat, Jul 6, 2024 at 7:11 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > On Sat, Jul 6, 2024 at 2:04 AM Jakub Kicinski <kuba@kernel.org> wrote: > > > > > > On Wed, 3 Jul 2024 20:11:27 +0200 Bartosz Golaszewski wrote: > > > > [PATCH net-next v3 0/4] net: phy: aquantia: enable support for aqr115c > > > > > > Doesn't seem to apply: > > > > > > Applying: net: phy: aquantia: rename and export aqr107_wait_reset_complete() > > > error: patch failed: drivers/net/phy/aquantia/aquantia.h:201 > > > error: drivers/net/phy/aquantia/aquantia.h: patch does not apply > > > Patch failed at 0001 net: phy: aquantia: rename and export aqr107_wait_reset_complete() > > > hint: Use 'git am --show-current-patch=diff' to see the failed patch > > > hint: When you have resolved this problem, run "git am --continue". > > > hint: If you prefer to skip this patch, run "git am --skip" instead. > > > hint: To restore the original branch and stop patching, run "git am --abort". > > > hint: Disable this message with "git config advice.mergeConflict false" > > > -- > > > pw-bot: cr > > > > It conflicts with the fix I sent separately to add include guards that > > I had in my branch as well. I'll resend it. > > > > Bart > > Actually this conflicts with commit 61578f679378 ("net: phy: aquantia: > add support for PHY LEDs") that was applied to net-next recently. The > resolution is trivial - just leave both sides as they are. Can you > resolve it when applying or do you want a new version after all? > > Bart Nevermind, I resent this version rebased on top of today's net-next. Bart
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> This series addesses two issues with the aqr115c PHY on Qualcomm sa8775p-ride-r3 board and adds support for this PHY to the aquantia driver. While the manufacturer calls the 2.5G PHY mode OCSGMII, we reuse the existing 2500BASEX mode in the kernel to avoid extending the uAPI. It took me a while to resend because I noticed an issue with the PHY coming out of suspend with no possible interfaces listed and tracked it to the GLOBAL_CFG registers for different modes returning 0. A workaround has been added to the series. Unfortunately the HPG doesn't mention a proper way of doing it or even mention any such issue at all. Changes since v2: - add a patch that addresses an issue with GLOBAL_CFG registers returning 0 - reuse aqr113c_config_init() for aqr115c - improve commit messages, give more details on the 2500BASEX mode reuse Link to v2: https://lore.kernel.org/lkml/Zn4Nq1QvhjAUaogb@makrotopia.org/T/ Changes since v1: - split out the PHY patches into their own series - don't introduce new mode (OCSGMII) but use existing 2500BASEX instead - split the wait-for-FW patch into two: one renaming and exporting the relevant function and the second using it before checking the FW ID Link to v1: https://lore.kernel.org/linux-arm-kernel/20240619184550.34524-1-brgl@bgdev.pl/T/ Bartosz Golaszewski (4): net: phy: aquantia: rename and export aqr107_wait_reset_complete() net: phy: aquantia: wait for FW reset before checking the vendor ID net: phy: aquantia: wait for the GLOBAL_CFG to start returning real values net: phy: aquantia: add support for aqr115c drivers/net/phy/aquantia/aquantia.h | 1 + drivers/net/phy/aquantia/aquantia_firmware.c | 4 ++ drivers/net/phy/aquantia/aquantia_main.c | 40 ++++++++++++++++++-- 3 files changed, 41 insertions(+), 4 deletions(-)