forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-04 1543e317f1da31b75942316931e8f491a8920811 
 kernel/drivers/s390/cio/device.c
....@@ -24,6 +24,7 @@
2424 #include <linux/timer.h>
2525 #include <linux/kernel_stat.h>
2626 #include <linux/sched/signal.h>
27
+#include <linux/dma-mapping.h>
2728 
2829 #include <asm/ccwdev.h>
2930 #include <asm/cio.h>
....@@ -642,10 +643,10 @@
642643 	return device_add(dev);
643644 }
644645 
645
-static int match_dev_id(struct device *dev, void *data)
646
+static int match_dev_id(struct device *dev, const void *data)
646647 {
647648 	struct ccw_device *cdev = to_ccwdev(dev);
648
-	struct ccw_dev_id *dev_id = data;
649
+	struct ccw_dev_id *dev_id = (void *)data;
649650 
650651 	return ccw_dev_id_is_equal(&cdev->private->dev_id, dev_id);
651652 }
....@@ -687,6 +688,9 @@
687688 	struct ccw_device *cdev;
688689 
689690 	cdev = to_ccwdev(dev);
691
+	cio_gp_dma_free(cdev->private->dma_pool, cdev->private->dma_area,
692
+			sizeof(*cdev->private->dma_area));
693
+	cio_gp_dma_destroy(cdev->private->dma_pool, &cdev->dev);
690694 	/* Release reference of parent subchannel. */
691695 	put_device(cdev->dev.parent);
692696 	kfree(cdev->private);
....@@ -696,15 +700,33 @@
696700 static struct ccw_device * io_subchannel_allocate_dev(struct subchannel *sch)
697701 {
698702 	struct ccw_device *cdev;
703
+	struct gen_pool *dma_pool;
699704 
700705 	cdev  = kzalloc(sizeof(*cdev), GFP_KERNEL);
701
-	if (cdev) {
702
-		cdev->private = kzalloc(sizeof(struct ccw_device_private),
703
-					GFP_KERNEL | GFP_DMA);
704
-		if (cdev->private)
705
-			return cdev;
706
-	}
706
+	if (!cdev)
707
+		goto err_cdev;
708
+	cdev->private = kzalloc(sizeof(struct ccw_device_private),
709
+				GFP_KERNEL | GFP_DMA);
710
+	if (!cdev->private)
711
+		goto err_priv;
712
+	cdev->dev.coherent_dma_mask = sch->dev.coherent_dma_mask;
713
+	cdev->dev.dma_mask = sch->dev.dma_mask;
714
+	dma_pool = cio_gp_dma_create(&cdev->dev, 1);
715
+	if (!dma_pool)
716
+		goto err_dma_pool;
717
+	cdev->private->dma_pool = dma_pool;
718
+	cdev->private->dma_area = cio_gp_dma_zalloc(dma_pool, &cdev->dev,
719
+					sizeof(*cdev->private->dma_area));
720
+	if (!cdev->private->dma_area)
721
+		goto err_dma_area;
722
+	return cdev;
723
+err_dma_area:
724
+	cio_gp_dma_destroy(dma_pool, &cdev->dev);
725
+err_dma_pool:
726
+	kfree(cdev->private);
727
+err_priv:
707728 	kfree(cdev);
729
+err_cdev:
708730 	return ERR_PTR(-ENOMEM);
709731 }
710732 
....@@ -886,7 +908,7 @@
886908 			wake_up(&ccw_device_init_wq);
887909 		break;
888910 	case DEV_STATE_OFFLINE:
889
-		/* 
911
+		/*
890912 		 * We can't register the device in interrupt context so
891913 		 * we schedule a work item.
892914 		 */
....@@ -1067,6 +1089,14 @@
10671089 	if (!io_priv)
10681090 		goto out_schedule;
10691091 
1092
+	io_priv->dma_area = dma_alloc_coherent(&sch->dev,
1093
+				sizeof(*io_priv->dma_area),
1094
+				&io_priv->dma_area_dma, GFP_KERNEL);
1095
+	if (!io_priv->dma_area) {
1096
+		kfree(io_priv);
1097
+		goto out_schedule;
1098
+	}
1099
+
10701100 	set_io_private(sch, io_priv);
10711101 	css_schedule_eval(sch->schid);
10721102 	return 0;
....@@ -1093,6 +1123,8 @@
10931123 	set_io_private(sch, NULL);
10941124 	spin_unlock_irq(sch->lock);
10951125 out_free:
1126
+	dma_free_coherent(&sch->dev, sizeof(*io_priv->dma_area),
1127
+			  io_priv->dma_area, io_priv->dma_area_dma);
10961128 	kfree(io_priv);
10971129 	sysfs_remove_group(&sch->dev.kobj, &io_subchannel_attr_group);
10981130 	return 0;
....@@ -1235,7 +1267,7 @@
12351267 		sch = to_subchannel(cdev->dev.parent);
12361268 		if ((sch->schib.pmcw.pam & sch->opm) == sch->vpm)
12371269 			break;
1238
-		/* fall through */
1270
+		fallthrough;
12391271 	case DEV_STATE_DISCONNECTED:
12401272 		CIO_MSG_EVENT(3, "recovery: trigger 0.%x.%04x\n",
12411273 			      cdev->private->dev_id.ssid,
....@@ -1353,6 +1385,7 @@
13531385 enum io_sch_action {
13541386 	IO_SCH_UNREG,
13551387 	IO_SCH_ORPH_UNREG,
1388
+	IO_SCH_UNREG_CDEV,
13561389 	IO_SCH_ATTACH,
13571390 	IO_SCH_UNREG_ATTACH,
13581391 	IO_SCH_ORPH_ATTACH,
....@@ -1385,7 +1418,7 @@
13851418 	}
13861419 	if ((sch->schib.pmcw.pam & sch->opm) == 0) {
13871420 		if (ccw_device_notify(cdev, CIO_NO_PATH) != NOTIFY_OK)
1388
-			return IO_SCH_UNREG;
1421
+			return IO_SCH_UNREG_CDEV;
13891422 		return IO_SCH_DISC;
13901423 	}
13911424 	if (device_is_disconnected(cdev))
....@@ -1447,6 +1480,7 @@
14471480 	case IO_SCH_ORPH_ATTACH:
14481481 		ccw_device_set_disconnected(cdev);
14491482 		break;
1483
+	case IO_SCH_UNREG_CDEV:
14501484 	case IO_SCH_UNREG_ATTACH:
14511485 	case IO_SCH_UNREG:
14521486 		if (!cdev)
....@@ -1480,6 +1514,7 @@
14801514 		if (rc)
14811515 			goto out;
14821516 		break;
1517
+	case IO_SCH_UNREG_CDEV:
14831518 	case IO_SCH_UNREG_ATTACH:
14841519 		spin_lock_irqsave(sch->lock, flags);
14851520 		if (cdev->private->flags.resuming) {
....@@ -1598,13 +1633,19 @@
15981633 		return ERR_CAST(sch);
15991634 
16001635 	io_priv = kzalloc(sizeof(*io_priv), GFP_KERNEL | GFP_DMA);
1601
-	if (!io_priv) {
1602
-		put_device(&sch->dev);
1603
-		return ERR_PTR(-ENOMEM);
1604
-	}
1636
+	if (!io_priv)
1637
+		goto err_priv;
1638
+	io_priv->dma_area = dma_alloc_coherent(&sch->dev,
1639
+				sizeof(*io_priv->dma_area),
1640
+				&io_priv->dma_area_dma, GFP_KERNEL);
1641
+	if (!io_priv->dma_area)
1642
+		goto err_dma_area;
16051643 	set_io_private(sch, io_priv);
16061644 	cdev = io_subchannel_create_ccwdev(sch);
16071645 	if (IS_ERR(cdev)) {
1646
+		dma_free_coherent(&sch->dev, sizeof(*io_priv->dma_area),
1647
+				  io_priv->dma_area, io_priv->dma_area_dma);
1648
+		set_io_private(sch, NULL);
16081649 		put_device(&sch->dev);
16091650 		kfree(io_priv);
16101651 		return cdev;
....@@ -1612,6 +1653,12 @@
16121653 	cdev->drv = drv;
16131654 	ccw_device_set_int_class(cdev);
16141655 	return cdev;
1656
+
1657
+err_dma_area:
1658
+	kfree(io_priv);
1659
+err_priv:
1660
+	put_device(&sch->dev);
1661
+	return ERR_PTR(-ENOMEM);
16151662 }
16161663 
16171664 void __init ccw_device_destroy_console(struct ccw_device *cdev)
....@@ -1620,6 +1667,8 @@
16201667 	struct io_subchannel_private *io_priv = to_io_private(sch);
16211668 
16221669 	set_io_private(sch, NULL);
1670
+	dma_free_coherent(&sch->dev, sizeof(*io_priv->dma_area),
1671
+			  io_priv->dma_area, io_priv->dma_area_dma);
16231672 	put_device(&sch->dev);
16241673 	put_device(&cdev->dev);
16251674 	kfree(io_priv);
....@@ -1654,20 +1703,6 @@
16541703 EXPORT_SYMBOL_GPL(ccw_device_force_console);
16551704 #endif
16561705 
1657
-/*
1658
- * get ccw_device matching the busid, but only if owned by cdrv
1659
- */
1660
-static int
1661
-__ccwdev_check_busid(struct device *dev, void *id)
1662
-{
1663
-	char *bus_id;
1664
-
1665
-	bus_id = id;
1666
-
1667
-	return (strcmp(bus_id, dev_name(dev)) == 0);
1668
-}
1669
-
1670
-
16711706 /**
16721707  * get_ccwdev_by_busid() - obtain device from a bus id
16731708  * @cdrv: driver the device is owned by
....@@ -1684,8 +1719,7 @@
16841719 {
16851720 	struct device *dev;
16861721 
1687
-	dev = driver_find_device(&cdrv->driver, NULL, (void *)bus_id,
1688
-				 __ccwdev_check_busid);
1722
+	dev = driver_find_device_by_name(&cdrv->driver, bus_id);
16891723 
16901724 	return dev ? to_ccwdev(dev) : NULL;
16911725 }
....@@ -2065,7 +2099,7 @@
20652099 	case CDEV_TODO_UNREG_EVAL:
20662100 		if (!sch_is_pseudo_sch(sch))
20672101 			css_schedule_eval(sch->schid);
2068
-		/* fall-through */
2102
+		fallthrough;
20692103 	case CDEV_TODO_UNREG:
20702104 		if (sch_is_pseudo_sch(sch))
20712105 			ccw_device_unregister(cdev);