update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/s390/cio/device_id.c
..
..
@@ -99,7 +99,7 @@
99
99
 static int diag210_get_dev_info(struct ccw_device *cdev)
100
100
 {
101
101
 	struct ccw_dev_id *dev_id = &cdev->private->dev_id;
102
-	struct senseid *senseid = &cdev->private->senseid;
102
+	struct senseid *senseid = &cdev->private->dma_area->senseid;
103
103
 	struct diag210 diag_data;
104
104
 	int rc;
105
105
 
..
..
@@ -134,8 +134,10 @@
134
134
 static void snsid_init(struct ccw_device *cdev)
135
135
 {
136
136
 	cdev->private->flags.esid = 0;
137
-	memset(&cdev->private->senseid, 0, sizeof(cdev->private->senseid));
138
-	cdev->private->senseid.cu_type = 0xffff;
137
+
138
+	memset(&cdev->private->dma_area->senseid, 0,
139
+	       sizeof(cdev->private->dma_area->senseid));
140
+	cdev->private->dma_area->senseid.cu_type = 0xffff;
139
141
 }
140
142
 
141
143
 /*
..
..
@@ -143,16 +145,16 @@
143
145
  */
144
146
 static int snsid_check(struct ccw_device *cdev, void *data)
145
147
 {
146
-	struct cmd_scsw *scsw = &cdev->private->irb.scsw.cmd;
148
+	struct cmd_scsw *scsw = &cdev->private->dma_area->irb.scsw.cmd;
147
149
 	int len = sizeof(struct senseid) - scsw->count;
148
150
 
149
151
 	/* Check for incomplete SENSE ID data. */
150
152
 	if (len < SENSE_ID_MIN_LEN)
151
153
 		goto out_restart;
152
-	if (cdev->private->senseid.cu_type == 0xffff)
154
+	if (cdev->private->dma_area->senseid.cu_type == 0xffff)
153
155
 		goto out_restart;
154
156
 	/* Check for incompatible SENSE ID data. */
155
-	if (cdev->private->senseid.reserved != 0xff)
157
+	if (cdev->private->dma_area->senseid.reserved != 0xff)
156
158
 		return -EOPNOTSUPP;
157
159
 	/* Check for extended-identification information. */
158
160
 	if (len > SENSE_ID_BASIC_LEN)
..
..
@@ -170,7 +172,7 @@
170
172
 static void snsid_callback(struct ccw_device *cdev, void *data, int rc)
171
173
 {
172
174
 	struct ccw_dev_id *id = &cdev->private->dev_id;
173
-	struct senseid *senseid = &cdev->private->senseid;
175
+	struct senseid *senseid = &cdev->private->dma_area->senseid;
174
176
 	int vm = 0;
175
177
 
176
178
 	if (rc && MACHINE_IS_VM) {
..
..
@@ -200,7 +202,7 @@
200
202
 {
201
203
 	struct subchannel *sch = to_subchannel(cdev->dev.parent);
202
204
 	struct ccw_request *req = &cdev->private->req;
203
-	struct ccw1 *cp = cdev->private->iccws;
205
+	struct ccw1 *cp = cdev->private->dma_area->iccws;
204
206
 
205
207
 	CIO_TRACE_EVENT(4, "snsid");
206
208
 	CIO_HEX_EVENT(4, &cdev->private->dev_id, sizeof(cdev->private->dev_id));
..
..
@@ -208,7 +210,7 @@
208
210
 	snsid_init(cdev);
209
211
 	/* Channel program setup. */
210
212
 	cp->cmd_code	= CCW_CMD_SENSE_ID;
211
-	cp->cda		= (u32) (addr_t) &cdev->private->senseid;
213
+	cp->cda		= (u32) (addr_t) &cdev->private->dma_area->senseid;
212
214
 	cp->count	= sizeof(struct senseid);
213
215
 	cp->flags	= CCW_FLAG_SLI;
214
216
 	/* Request setup. */