Re: linux-next: build failure after merge of the usb tree

[Rohit Agarwal <quic_rohiagar@quicinc.com>]

On 10/9/2023 3:19 PM, Dmitry Baryshkov wrote:
> On Mon, 9 Oct 2023 at 12:48, Greg KH <gregkh@linuxfoundation.org> wrote:
>> On Mon, Oct 09, 2023 at 02:48:27PM +0530, Rohit Agarwal wrote:
>>> On 10/4/2023 6:16 PM, Greg KH wrote:
>>>> On Wed, Oct 04, 2023 at 12:17:27PM +0530, Rohit Agarwal wrote:
>>>>> On 10/4/2023 12:13 PM, Greg KH wrote:
>>>>>> On Wed, Oct 04, 2023 at 01:22:47PM +1100, Stephen Rothwell wrote:
>>>>>>> Hi all,
>>>>>>>
>>>>>>> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
>>>>>>> failed like this:
>>>>>>>
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:156:43: error: 'QPHY_V6_PCS_SW_RESET' undeclared here (not in a function); did you mean 'QPHY_V2_PCS_SW_RESET'?
>>>>>>>      156 |         [QPHY_SW_RESET]                 = QPHY_V6_PCS_SW_RESET,
>>>>>>>          |                                           ^~~~~~~~~~~~~~~~~~~~
>>>>>>>          |                                           QPHY_V2_PCS_SW_RESET
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:157:43: error: 'QPHY_V6_PCS_START_CONTROL' undeclared here (not in a function); did you mean 'QPHY_V3_PCS_START_CONTROL'?
>>>>>>>      157 |         [QPHY_START_CTRL]               = QPHY_V6_PCS_START_CONTROL,
>>>>>>>          |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>>          |                                           QPHY_V3_PCS_START_CONTROL
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:158:43: error: 'QPHY_V6_PCS_PCS_STATUS1' undeclared here (not in a function); did you mean 'QPHY_V5_PCS_PCS_STATUS1'?
>>>>>>>      158 |         [QPHY_PCS_STATUS]               = QPHY_V6_PCS_PCS_STATUS1,
>>>>>>>          |                                           ^~~~~~~~~~~~~~~~~~~~~~~
>>>>>>>          |                                           QPHY_V5_PCS_PCS_STATUS1
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:159:43: error: 'QPHY_V6_PCS_POWER_DOWN_CONTROL' undeclared here (not in a function); did you mean 'QPHY_V3_PCS_POWER_DOWN_CONTROL'?
>>>>>>>      159 |         [QPHY_PCS_POWER_DOWN_CONTROL]   = QPHY_V6_PCS_POWER_DOWN_CONTROL,
>>>>>>>          |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>>          |                                           QPHY_V3_PCS_POWER_DOWN_CONTROL
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:162:43: error: 'QPHY_V6_PCS_USB3_AUTONOMOUS_MODE_CTRL' undeclared here (not in a function); did you mean 'QPHY_V5_PCS_USB3_AUTONOMOUS_MODE_CTRL'?
>>>>>>>      162 |         [QPHY_PCS_AUTONOMOUS_MODE_CTRL] = QPHY_V6_PCS_USB3_AUTONOMOUS_MODE_CTRL,
>>>>>>>          |                                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>>          |                                           QPHY_V5_PCS_USB3_AUTONOMOUS_MODE_CTRL
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:163:44: error: 'QPHY_V6_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR' undeclared here (not in a function); did you mean 'QPHY_V5_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR'?
>>>>>>>      163 |         [QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V6_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR,
>>>>>>>          |                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>>          |                                            QPHY_V5_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:991:26: error: 'QPHY_V6_PCS_LOCK_DETECT_CONFIG1' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_LOCK_DETECT_CONFIG1'?
>>>>>>>      991 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_LOCK_DETECT_CONFIG1, 0xc4),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:992:26: error: 'QPHY_V6_PCS_LOCK_DETECT_CONFIG2' undeclared here (not in a function); did you mean 'QPHY_V3_PCS_LOCK_DETECT_CONFIG2'?
>>>>>>>      992 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_LOCK_DETECT_CONFIG2, 0x89),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:993:26: error: 'QPHY_V6_PCS_LOCK_DETECT_CONFIG3' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_LOCK_DETECT_CONFIG3'?
>>>>>>>      993 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_LOCK_DETECT_CONFIG3, 0x20),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:994:26: error: 'QPHY_V6_PCS_LOCK_DETECT_CONFIG6' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_LOCK_DETECT_CONFIG6'?
>>>>>>>      994 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_LOCK_DETECT_CONFIG6, 0x13),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:997:26: error: 'QPHY_V6_PCS_RCVR_DTCT_DLY_P1U2_L' undeclared here (not in a function); did you mean 'QPHY_V3_PCS_RCVR_DTCT_DLY_P1U2_L'?
>>>>>>>      997 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_RCVR_DTCT_DLY_P1U2_L, 0xe7),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:998:26: error: 'QPHY_V6_PCS_RCVR_DTCT_DLY_P1U2_H' undeclared here (not in a function); did you mean 'QPHY_V3_PCS_RCVR_DTCT_DLY_P1U2_H'?
>>>>>>>      998 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_RCVR_DTCT_DLY_P1U2_H, 0x03),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:999:26: error: 'QPHY_V6_PCS_CDR_RESET_TIME' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_CDR_RESET_TIME'?
>>>>>>>      999 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_CDR_RESET_TIME, 0x0a),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1000:26: error: 'QPHY_V6_PCS_ALIGN_DETECT_CONFIG1' undeclared here (not in a function); did you mean 'QPHY_V5_PCS_ALIGN_DETECT_CONFIG1'?
>>>>>>>     1000 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_ALIGN_DETECT_CONFIG1, 0x88),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1001:26: error: 'QPHY_V6_PCS_ALIGN_DETECT_CONFIG2' undeclared here (not in a function); did you mean 'QPHY_V5_PCS_ALIGN_DETECT_CONFIG2'?
>>>>>>>     1001 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_ALIGN_DETECT_CONFIG2, 0x13),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1003:26: error: 'QPHY_V6_PCS_EQ_CONFIG1' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_EQ_CONFIG1'?
>>>>>>>     1003 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_EQ_CONFIG1, 0x4b),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1004:26: error: 'QPHY_V6_PCS_EQ_CONFIG5' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_EQ_CONFIG5'?
>>>>>>>     1004 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_EQ_CONFIG5, 0x10),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1008:26: error: 'QPHY_V6_PCS_USB3_LFPS_DET_HIGH_COUNT_VAL' undeclared here (not in a function); did you mean 'QPHY_V5_PCS_USB3_LFPS_DET_HIGH_COUNT_VAL'?
>>>>>>>     1008 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_USB3_LFPS_DET_HIGH_COUNT_VAL, 0xf8),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1009:26: error: 'QPHY_V6_PCS_USB3_RXEQTRAINING_DFE_TIME_S2' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_USB3_RXEQTRAINING_DFE_TIME_S2'?
>>>>>>>     1009 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_USB3_RXEQTRAINING_DFE_TIME_S2, 0x07),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1010:26: error: 'QPHY_V6_PCS_USB3_RCVR_DTCT_DLY_U3_L' undeclared here (not in a function); did you mean 'QPHY_V4_PCS_USB3_RCVR_DTCT_DLY_U3_L'?
>>>>>>>     1010 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_USB3_RCVR_DTCT_DLY_U3_L, 0x40),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:1011:26: error: 'QPHY_V6_PCS_USB3_RCVR_DTCT_DLY_U3_H' undeclared here (not in a function); did you mean 'QPHY_V5_PCS_USB3_RCVR_DTCT_DLY_U3_H'?
>>>>>>>     1011 |         QMP_PHY_INIT_CFG(QPHY_V6_PCS_USB3_RCVR_DTCT_DLY_U3_H, 0x00),
>>>>>>>          |                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>> drivers/phy/qualcomm/phy-qcom-qmp-usb.c:78:27: note: in definition of macro 'QMP_PHY_INIT_CFG'
>>>>>>>       78 |                 .offset = o,            \
>>>>>>>          |                           ^
>>>>>>>
>>>>>>> Caused by commit
>>>>>>>
>>>>>>>      685dbd1b2306 ("phy: qcom-qmp-usb: Add Qualcomm SDX75 USB3 PHY support")
>>>>>>>
>>>>>>> I have used the usb tree from next-20231003 for today.
>>>>>> Thanks, I've now reverted this from my tree.
>>>>> As mentioned in the cover letter of these changes, the series was dependent
>>>>> on the other submitted series [1], [2].
>>>> Ah, I missed that, I almost never read cover letters :)
>>>>
>>>>> Can you also pick these series [1], [2] to resolve this build failures.
>>>>> [1] https://lore.kernel.org/all/20230911203842.778411-1-dmitry.baryshkov@linaro.org/
>>>>> [2] https://lore.kernel.org/linux-phy/20230824211952.1397699-1-dmitry.baryshkov@linaro.org/
>>>> How about you just send this change with these others, or all of them as
>>>> one big series so they can be applied in the proper order?
>>> Adding Dmitry as well.
>>>
>>> I see some of the dependent patches are already applied and the patches from
>>> [2] are not.
>>> Since all the rest dependent changes are already applied,
>>> you can pick series[2] and then this series that should also be fine.
>>> Please let me know if this is fine?
>> What is "this" series?  I don't have any of these in my inbox at all
>> anymore, sorry.  Please resend the pending patches that need to be
>> applied to my usb tree and I will be glad to do so.
> Actually, I wonder why the PHY patches were merged through the USB
> tree, maybe that is the issue here.
Yes Actually these patches needs to go via phy tree. Can you please drop 
patch 1/5, 2/5 and 5/5
from the series [3] (keeping [1] and [2] same reference from above to 
avoid confusion).

[3] 
https://lore.kernel.org/all/1695359525-4548-1-git-send-email-quic_rohiagar@quicinc.com/

At the same time requesting Vinod to please pick the patches 1/5, 2/5 
and 5/5 from series [3] and series [2].

Thanks,
Rohit.