hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
....@@ -1,10 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * Copyright (c) 2014-2015 Hisilicon Limited.
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License as published by
6
- * the Free Software Foundation; either version 2 of the License, or
7
- * (at your option) any later version.
84 */
95
106 #include "hns_dsaf_mac.h"
....@@ -334,11 +330,12 @@
334330 * hns_dsaf_srst_chns - reset dsaf channels
335331 * @dsaf_dev: dsaf device struct pointer
336332 * @msk: xbar channels mask value:
333
+ * @dereset: false - request reset , true - drop reset
334
+ *
337335 * bit0-5 for xge0-5
338336 * bit6-11 for ppe0-5
339337 * bit12-17 for roce0-5
340338 * bit18-19 for com/dfx
341
- * @enable: false - request reset , true - drop reset
342339 */
343340 static void
344341 hns_dsaf_srst_chns(struct dsaf_device *dsaf_dev, u32 msk, bool dereset)
....@@ -357,11 +354,12 @@
357354 * hns_dsaf_srst_chns - reset dsaf channels
358355 * @dsaf_dev: dsaf device struct pointer
359356 * @msk: xbar channels mask value:
357
+ * @dereset: false - request reset , true - drop reset
358
+ *
360359 * bit0-5 for xge0-5
361360 * bit6-11 for ppe0-5
362361 * bit12-17 for roce0-5
363362 * bit18-19 for com/dfx
364
- * @enable: false - request reset , true - drop reset
365363 */
366364 static void
367365 hns_dsaf_srst_chns_acpi(struct dsaf_device *dsaf_dev, u32 msk, bool dereset)
....@@ -620,7 +618,8 @@
620618 /**
621619 * hns_mac_config_sds_loopback - set loop back for serdes
622620 * @mac_cb: mac control block
623
- * retuen 0 == success
621
+ * @en: enable or disable
622
+ * return 0 == success
624623 */
625624 static int hns_mac_config_sds_loopback(struct hns_mac_cb *mac_cb, bool en)
626625 {
....@@ -674,7 +673,7 @@
674673 dsaf_set_field(origin, 1ull << 10, 10, en);
675674 dsaf_write_syscon(mac_cb->serdes_ctrl, reg_offset, origin);
676675 } else {
677
- u8 *base_addr = (u8 *)mac_cb->serdes_vaddr +
676
+ u8 __iomem *base_addr = mac_cb->serdes_vaddr +
678677 (mac_cb->mac_id <= 3 ? 0x00280000 : 0x00200000);
679678 dsaf_set_reg_field(base_addr, reg_offset, 1ull << 10, 10, en);
680679 }
....@@ -762,17 +761,11 @@
762761 return (void *)misc_op;
763762 }
764763
765
-static int hns_dsaf_dev_match(struct device *dev, void *fwnode)
766
-{
767
- return dev->fwnode == fwnode;
768
-}
769
-
770764 struct
771765 platform_device *hns_dsaf_find_platform_device(struct fwnode_handle *fwnode)
772766 {
773767 struct device *dev;
774768
775
- dev = bus_find_device(&platform_bus_type, NULL,
776
- fwnode, hns_dsaf_dev_match);
769
+ dev = bus_find_device_by_fwnode(&platform_bus_type, fwnode);
777770 return dev ? to_platform_device(dev) : NULL;
778771 }