Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 1 Aug 2023 16:28:44 +0300
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Roger Quadros <rogerq@kernel.org>
Cc:     davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
        pabeni@redhat.com, s-vadapalli@ti.com, srk@ti.com,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH] net: ethernet: ti: am65-cpsw-qos: Add Frame
 Preemption MAC Merge support
Message-ID: <20230801132844.o56h3bsx7zfwbeu6@skbuf>
References: <20230725072338.20789-1-rogerq@kernel.org>
 <20230801131418.bhcjtflj3iu77mmc@skbuf>
 <0f18cf9e-9c5b-02dd-b396-729b9fecdfe7@kernel.org>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <0f18cf9e-9c5b-02dd-b396-729b9fecdfe7@kernel.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VGJhOHFZeGpWZU5wUGpUQk83VklxMWtMdTRyWHVqcG12UlgrNHVMSzU5L2Uz?=
 =?utf-8?B?NHFrZmlsWmt2ejc4SDZjaHV1ODluNWZlUXh0NTVIUnhvdkJNVnhoWUNiTlRH?=
 =?utf-8?B?RTVZbUV6UTc3aDYwUVdMRTd6L1NranN6bllGYWtCVXZiZ045YkI5R0REbU1Z?=
 =?utf-8?B?QW53U3VlOGdLOHZxanc5SURKQ0xsRGlNbUdxbWpiUWs2emtHY3B5RjRmU1Bv?=
 =?utf-8?B?T2JTdi8vZ0xZWENDU25NaEJLL04wNHFKVWZsdXJ4WlVlTi9jem1ER1dVU0x6?=
 =?utf-8?B?VW4yVU9tUXA4SnlrQkVnNWs0bG9rOTF6cFU2c1ZmUGJ6Ky94eHlYeXdJRS9B?=
 =?utf-8?B?ak9sWXNmcWtUaFR1aTJGTjN2TnhXNVlENDFFbEhNbTMzeDM4U2VhZVJaZGY4?=
 =?utf-8?B?T0ljUmxIeGdEc3RwRnZOekZhN0psVHFvQlBxRVZqZk5PV3ZsWk5qaWpnbkpX?=
 =?utf-8?B?UnpsY0ovbFZONHpDSjRWaktReUQ2OGZXc0F4OGJxdno5OXUvV0JabDYvNkdN?=
 =?utf-8?B?OXVoMFVMRzA3OFI3aC96cXcrODM0WWhDaUhuK2dvR0g0Wk5mQzFpTXFraFFr?=
 =?utf-8?B?M3F3YkMyK0VPaUdpM3lhbXJ3d2daQktmdkJJY2NRd0ExMEIxZmFZS3NNcjZK?=
 =?utf-8?B?SlpPcUlFZUw4WkZmbCtwa2xJb3NsdS9FRGhhM1BkTzg3bE1JQklCQ3g2M29k?=
 =?utf-8?B?T0RqTDZxVlNHMHN0NE9BOTRETmlDNWlJTUNPQkZMeDNYWEpLb2JseEdzazR3?=
 =?utf-8?B?eXpjcnZobEpNcTh4ZUNiMG5FczNmbmVVenNYU2o4SVNLR3BEVFRNcGtqQWxi?=
 =?utf-8?B?ZWJqTlV0cDRhSWdaMUpRNW9NdUNmMlNCRElEenlRZjFXVmZtZlhmaDg4NjNB?=
 =?utf-8?B?ZDJlZ1pIVm9lcDg0V3RSQzljSlQ5SFRLa3dNaEYwOHEvQ3AwSVF4VWJyN0dB?=
 =?utf-8?B?ZXhsbDNPRFl5b05vY0NaVmlDb1J3U3F3SGhJbW1hSVRtaWdsR0ZOZDNlMm9N?=
 =?utf-8?B?bFNqUkcyc1hBUXhrOE5kTTBIa2MxTHVkMjlZeG8zQmhFYUJtRHdwbGlkN2Ft?=
 =?utf-8?B?OW1xcjlUdkg2TUU1MG9ramJxcVlQNWRqblBuR05wcEIvZTdYNW1zcTZxTzRK?=
 =?utf-8?B?bXg5VEUwb3NkWElrcWNQV1I0bDM0M25qbkxET28xRG9rMkg5OGdWTi9NVk5S?=
 =?utf-8?B?eVVwRUdjV3E0ZTdweWMrVlRLakRRRTVBdGxVUXN4Vk9aVkp3ajQ4Q2xkMW5k?=
 =?utf-8?B?YnpSdzBWcmw3WDkrYTdpWU5CRy82c1BIRFo2cmt3UUdCaDFRT1Jib093UVhT?=
 =?utf-8?B?aDFMV0xTV0VWOUtCRktJT0lmMThNbGlvRUM3d1MrR0l2cjFRZmZWTm1YMkFi?=
 =?utf-8?B?UmtMSnIrNVlNSnlwaE9WOTdmSWc1TCszTFYzZGM0TDhlN1hSb0lvWDk5Y2Jr?=
 =?utf-8?B?OFFSMXBNaDRzMjhKWmErb2FrREtrQi9zc1UyVnZhcTFyRWRTMTN6UmxvUDJB?=
 =?utf-8?B?eTFyMkdCOFpwWnliN094QnRNUXFNUWM3YnU0Q04xaW5hUWdMVmxCNWV3eCs4?=
 =?utf-8?B?THBSYWMzTW5xWVhVTE41amFnbWhMdjZQeEpNN3hLRG9hNk5xZmhtT2EvRzAv?=
 =?utf-8?B?dXBHZVdUVWRvU28wbUwxMEVMMlhvdUhYc0JaTVdqbGlTdUliZm5NbkFUaytu?=
 =?utf-8?B?MklWRmU1cnJjdUJ6aXlIeEdKY2p6bDBqR3FMRUYvdURjSEI3ajJWRVJmQ1VI?=
 =?utf-8?B?eVlWSnVuWGZ2V3F0VHVQQVkraXMyL24xWDJJNTFla1g1SDhnbkIzSVcwb3Ji?=
 =?utf-8?B?UVk4RVkxcGdOWkhRYk44RFB6cXRlbm91QkwrOU0xZ0ZTSmVIQmIva25FUUdh?=
 =?utf-8?B?MHBVd3I0eFRCaG5ocWhQbDBLZDlBNEZ0OEpGYXJlUEtaeWJsMUxtTWZVMlBK?=
 =?utf-8?B?akZEOXJyRzA2NklHOFNPQzQrZ0JHc2FhTXdjcDg2VXJSSk9OV1VsRjZiMkdh?=
 =?utf-8?B?YmdMbFR5Uk5ydkZieVVkdm5TMGhvUWowZHZBTDlZTkMxUnE3MElQVm9qSkMy?=
 =?utf-8?B?UWsxUEE1L1FsSW5oSlRtWTZGUEZHNFBFTWdQZE1jTzgwUE9hYzF3djBLMjQ5?=
 =?utf-8?B?T01Ra0dFaEYycFdibVVwSXFtUnlxdW9QdDJLU2NEQWxGYUtocmZRcHVnTVdW?=
 =?utf-8?B?Rmc9PQ==?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8d9c658c-59ff-4924-8a61-08db92933ce9
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 13:28:48.4170
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: OpqQKutb3hTEr+aQCXDIo4RAI762mJ6gEgreAZa9nzodGwqotgPwv/BAwz15VvMjyuQ//CiKTO92o7qYiSURug==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DUZPR04MB9966
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Aug 01, 2023 at 04:19:30PM +0300, Roger Quadros wrote:
> > Also:
> > 
> > ../drivers/net/ethernet/ti/am65-cpsw-qos.c:173:6: warning: no previous prototype for function 'am65_cpsw_iet_change_preemptible_tcs' [-Wmissing-prototypes]
> > void am65_cpsw_iet_change_preemptible_tcs(struct am65_cpsw_port *port, u8 preemptible_tcs)
> >      ^
> > ../drivers/net/ethernet/ti/am65-cpsw-qos.c:173:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
> > void am65_cpsw_iet_change_preemptible_tcs(struct am65_cpsw_port *port, u8 preemptible_tcs)
> > ^
> > static
> > ../drivers/net/ethernet/ti/am65-cpsw-qos.c:179:6: warning: no previous prototype for function 'am65_cpsw_iet_link_state_update' [-Wmissing-prototypes]
> > void am65_cpsw_iet_link_state_update(struct net_device *ndev)
> >      ^
> > ../drivers/net/ethernet/ti/am65-cpsw-qos.c:179:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
> > void am65_cpsw_iet_link_state_update(struct net_device *ndev)
> > ^
> > static
> > ../drivers/net/ethernet/ti/am65-cpsw-qos.c:699:33: error: redefinition of 'taprio'
> >         struct tc_taprio_qopt_offload *taprio = type_data;
> >                                        ^
> > ../drivers/net/ethernet/ti/am65-cpsw-qos.c:697:33: note: previous definition is here
> >         struct tc_taprio_qopt_offload *taprio = type_data;
> >                                        ^
> > 2 warnings and 1 error generated.
> > make[7]: *** [../scripts/Makefile.build:243: drivers/net/ethernet/ti/am65-cpsw-qos.o] Error 1
> > make[7]: *** Waiting for unfinished jobs....
> 
> I'm pretty sure there weren't any build errors for me.
> Did you have and resolve conflicts when applying this patch?

Yup, part of it (the error) is to blame due to an auto-merge (conflict
with 2d800bc500fb ("net/sched: taprio: replace tc_taprio_qopt_offload ::
enable with a "cmd" enum")) which failed to do the right thing in
am65_cpsw_setup_taprio():

$ git b4 0f18cf9e-9c5b-02dd-b396-729b9fecdfe7@kernel.org
Looking up https://lore.kernel.org/r/0f18cf9e-9c5b-02dd-b396-729b9fecdfe7%40kernel.org
Grabbing thread from lore.kernel.org/all/0f18cf9e-9c5b-02dd-b396-729b9fecdfe7%40kernel.org/t.mbox.gz
Analyzing 5 messages in the thread
Checking attestation on all messages, may take a moment...
---
  ✓ [PATCH RFC] net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
  ---
  ✓ Signed: DKIM/kernel.org
---
Total patches: 1
---
 Link: https://lore.kernel.org/r/20230725072338.20789-1-rogerq@kernel.org
 Base: not specified
Applying: net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support
Using index info to reconstruct a base tree...
M       drivers/net/ethernet/ti/am65-cpsw-nuss.c
M       drivers/net/ethernet/ti/am65-cpsw-qos.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ethernet/ti/am65-cpsw-qos.c
Auto-merging drivers/net/ethernet/ti/am65-cpsw-nuss.c

But part of it is legit, and I saw it with a W=1 C=1 build.
am65_cpsw_iet_link_state_update() and am65_cpsw_iet_change_preemptible_tcs()
should be static.