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;
Subject: Re: [PATCH net-next v6 6/9] net: dpaa: Convert to phylink
To:     "Russell King (Oracle)" <linux@armlinux.org.uk>
Cc:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Madalin Bucur <madalin.bucur@nxp.com>,
        Camelia Alexandra Groza <camelia.groza@nxp.com>,
        netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, Paolo Abeni <pabeni@redhat.com>,
        Eric Dumazet <edumazet@google.com>,
        "linuxppc-dev @ lists . ozlabs . org" <linuxppc-dev@lists.ozlabs.org>
References: <20220930200933.4111249-1-sean.anderson@seco.com>
 <20220930200933.4111249-7-sean.anderson@seco.com>
 <YzxbogPClCjNgN+m@shell.armlinux.org.uk>
From:   Sean Anderson <sean.anderson@seco.com>
Message-ID: <f5fec474-095b-2727-c0dc-878d4cd34d06@seco.com>
Date:   Tue, 4 Oct 2022 12:20:27 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
In-Reply-To: <YzxbogPClCjNgN+m@shell.armlinux.org.uk>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MS9zZ2JVcHo1c3NFWi9sUHUyUHBFSkV4ZE94N1krdFZVMFVqU1FuaDExMlNM?=
 =?utf-8?B?dkwzbk40Skc1NzRSeVJkQ2o2SlBpT0VKZ1Q1SGVUVnVGWVNFL0xERWs2K2VS?=
 =?utf-8?B?RmFvYjh3cTBZQUpuSHhOUnFDa2tYU1FKZUpVWUJtSDdKMWQwZi80QVBLTzNs?=
 =?utf-8?B?WTRWKzJNNERKMmFPQTczcFFsajl0T1Q4SkpDd0NSaWJjdTEydTJyWEFkcUFl?=
 =?utf-8?B?SnFjVFFZc2pSRVRlanBDUXlGQ2VESEIzdXR1bncxc1NtbUxLSGNaM3BsSE4w?=
 =?utf-8?B?bDJWOWpjWE9iTE8zSlRQcUlkaFJJNDU0RWtVZTk1ZlMwNGVYeC8zaGdsQXU5?=
 =?utf-8?B?ZHZVZ0R1R2oxZmRYMjI3SmwrcmVhK3BzYTZBOHFkUEJ4TzdOb3VFVmJlRkZz?=
 =?utf-8?B?eW5jMHgyZmU3NzRERDFVd0dNcUZtdExCWXFkZDI3RzBub01RM2l6UUtORHkv?=
 =?utf-8?B?Q245YVNFR05aZGE1b2YyQWhOTW83b0ZybjAyaUVtSURWTldVcWJsVE5hTkdY?=
 =?utf-8?B?SExQc2s5UTZjTVRjaWtUNE52eFk2bisvcXRwQk4wTXFCemxHYmM3Yk9BUGZr?=
 =?utf-8?B?VkhTZDF4K3IvblhiRmxJZkZXYVgwc1daQXdrWnMwNUdPMGd5MndjRVhpM0ZQ?=
 =?utf-8?B?OWhkYUh5SWx1dlU1NUptWlRCT2k5amFCWVhSZTJMQjNCR3M0VWx2d0pDcUVs?=
 =?utf-8?B?dS9CS0t0aUsyTU1OU09Fbm5JSFVlM1hvVFBmcFpMbFM0bXZCOGViT2NFdElK?=
 =?utf-8?B?VXBEWVc4cnlsc250UVl4cmJhWWQ4M0h5NytTUXBPTWRYalh5eTM0K245a3ox?=
 =?utf-8?B?T1A2bXZmeWdUWTl5eno2cThTNXlvbVNueksvZTdQN1g4c09qZjVOS242NmVn?=
 =?utf-8?B?alo3SklRNlBwQkJkVVJiaWJLZy9pQVVzOTBaYVRTVWpDNXVpUGVTSERXSTNJ?=
 =?utf-8?B?Nm93MGFENlFrZCs3ZlZIWEhBUDFRSS84RzFLMVFMM08zUkpNVCtLNTlUdXdB?=
 =?utf-8?B?V0djUGlEQ3pxeDVuQ3VIdzlGYjZHemZ2blI2Y2hnU0tCTTRRMmZwZVMwdlVr?=
 =?utf-8?B?Q3JSTWdmQVhrQXh1Uzlscjg1cVc4cTNGYVFwQmFuNFpuVy9JZlhsNm9FdVNX?=
 =?utf-8?B?RGlvWC9kdFd0N1JFVkUxYzBOaHpndlJNR2VWRmVxZUpnZXJ6Skg0RGdBeTd3?=
 =?utf-8?B?NDdqbHUzd0ZHMjVrYVBvZWRCdXpLWTl0dEp2TnN5bU9vTzNQVnIvUGFkUGd2?=
 =?utf-8?B?OC9IdjRjOVhHd1VmYTFJQk4vZnh0dkFaVkVjMXMxMm02MmxmelpnMXRISW1F?=
 =?utf-8?B?c1YvdG1oQjN5YXk2eVJBaTFJMW1PVktXQVVqSlREakdrelBRZVUzc0t2OGhP?=
 =?utf-8?B?aEc5L1RRWGVTdlNuN1dBTTBZVkh4RmxoNkF2NWtiUWYxaUdvVkJLMG5jYWd3?=
 =?utf-8?B?czdNSThNT1pYK25seHA4YzNNMVNkL0p1bTR3N3JXMURSR084MExndmpMSUFV?=
 =?utf-8?B?N3kvY1d5TUxqZXZCcW5SOWQ0MzZpZnJBVkphYW0zeGp4SVkrcDFBMnlySmtl?=
 =?utf-8?B?aUgrUml4dnJOenpoUGNNUXhicEJtSGpTKzFqWDR2RmtEd3M1ZW9xRmhpVHBz?=
 =?utf-8?B?a0pSVy9IemZhRkdJcEhFSWV5V29CREhKUXo3NmtYc3Y1TGNKeFA5bDBCRnBX?=
 =?utf-8?B?Znk2MlFrZUtKa040SmRLOS9YR0E5R2wzT2tiZVJwWHVsK0JZSE11REdYdVZP?=
 =?utf-8?B?aURoWG9CRm9UUUYvemxZa3B6Yno4REtnQXNZWXdBeFhoM0hlWEJmVG5UTkd5?=
 =?utf-8?B?aVhBeFF0VU8vSjY0S2h6VTNrVVFZMmVoRXRJOFFMMWJRY2p4YWxqMG96OGs2?=
 =?utf-8?B?cmdaeWJjaWYySGxxTURGSXVyWVZhWG1KVjRHa2lObHh2ZjVnQ2FiTFRlcVN0?=
 =?utf-8?B?dkNtM3ZKdnZHeVZOZ2h1UjNRa2ltazNLb1M3SStYWFo4ajhIeXQzRGxWZm1s?=
 =?utf-8?B?eGhPZDh3Znl0YzhsaWZFK2JaV29MQ0RuWjNORlQ4VXZlWVdZdEZXdTF0VlpE?=
 =?utf-8?B?azYrREZTUEV4NEdtYWF5dHN1T1ZiRzVqMVdURHh3aWJFcGhMVFpsWlc5bm82?=
 =?utf-8?B?SVpRTXR0L1ZjZUI4QXdRRzBWcmFQcUszS1FzdDRnWVVrZzVnS3ZoL0xYaHNM?=
 =?utf-8?B?S2c9PQ==?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 48293118-49c5-488f-cd5c-08daa6245bd1
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2022 16:20:31.6949
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8nacqgj1N2Vm9RBZ4w3pCnblamTLGi5smMjHha8vHnSTGAPNNU0bjfXv6T7yDLVpDcKuBkkgi+Vrl8uqfMJ67w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR03MB8126
X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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 10/4/22 12:13 PM, Russell King (Oracle) wrote:
> On Fri, Sep 30, 2022 at 04:09:30PM -0400, Sean Anderson wrote:
>> @@ -1064,43 +1061,50 @@ static struct phylink_pcs *memac_pcs_create(struct device_node *mac_node,
>>  	return pcs;
>>  }
>>  
>> +static bool memac_supports(struct mac_device *mac_dev, phy_interface_t iface)
>> +{
>> +	/* If there's no serdes device, assume that it's been configured for
>> +	 * whatever the default interface mode is.
>> +	 */
>> +	if (!mac_dev->fman_mac->serdes)
>> +		return mac_dev->phy_if == iface;
>> +	/* Otherwise, ask the serdes */
>> +	return !phy_validate(mac_dev->fman_mac->serdes, PHY_MODE_ETHERNET,
>> +			     iface, NULL);
>> +}
>> +
>>  int memac_initialization(struct mac_device *mac_dev,
>>  			 struct device_node *mac_node,
>>  			 struct fman_mac_params *params)
>>  {
>>  	int			 err;
>> +	struct device_node      *fixed;
>>  	struct phylink_pcs	*pcs;
>> -	struct fixed_phy_status *fixed_link;
>>  	struct fman_mac		*memac;
>> +	unsigned long		 capabilities;
>> +	unsigned long		*supported;
>>  
>> +	mac_dev->phylink_ops		= &memac_mac_ops;
>>  	mac_dev->set_promisc		= memac_set_promiscuous;
>>  	mac_dev->change_addr		= memac_modify_mac_address;
>>  	mac_dev->add_hash_mac_addr	= memac_add_hash_mac_address;
>>  	mac_dev->remove_hash_mac_addr	= memac_del_hash_mac_address;
>> -	mac_dev->set_tx_pause		= memac_set_tx_pause_frames;
>> -	mac_dev->set_rx_pause		= memac_accept_rx_pause_frames;
>>  	mac_dev->set_exception		= memac_set_exception;
>>  	mac_dev->set_allmulti		= memac_set_allmulti;
>>  	mac_dev->set_tstamp		= memac_set_tstamp;
>>  	mac_dev->set_multi		= fman_set_multi;
>> -	mac_dev->adjust_link            = adjust_link_memac;
>>  	mac_dev->enable			= memac_enable;
>>  	mac_dev->disable		= memac_disable;
>>  
>> -	if (params->max_speed == SPEED_10000)
>> -		mac_dev->phy_if = PHY_INTERFACE_MODE_XGMII;
>> -
>>  	mac_dev->fman_mac = memac_config(mac_dev, params);
>> -	if (!mac_dev->fman_mac) {
>> -		err = -EINVAL;
>> -		goto _return;
>> -	}
>> +	if (!mac_dev->fman_mac)
>> +		return -EINVAL;
>>  
>>  	memac = mac_dev->fman_mac;
>>  	memac->memac_drv_param->max_frame_length = fman_get_max_frm();
>>  	memac->memac_drv_param->reset_on_init = true;
>>  
>> -	err = of_property_match_string(mac_node, "pcs-names", "xfi");
>> +	err = of_property_match_string(mac_node, "pcs-handle-names", "xfi");
> 
> While reading through the patch, I stumbled upon this - in the previous
> patch, you introduce this code with "pcs-names" and then in this patch
> you change the name of the property. I don't think this was mentioned in
> the commit message (searching it for "pcs" didn't reveal anything) so
> I'm wondering whether this name update should've been merged into the
> previous patch instead of this one?

Yes, you're right. It looks like I applied this update to the wrong
patch. Will fix for v7.

--Sean