forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/s390/char/sclp_cmd.c
....@@ -406,7 +406,7 @@
406406 if (!size)
407407 goto skip_add;
408408 for (addr = start; addr < start + size; addr += block_size)
409
- add_memory(numa_pfn_to_nid(PFN_DOWN(addr)), addr, block_size);
409
+ add_memory(0, addr, block_size, MHP_NONE);
410410 skip_add:
411411 first_rn = rn;
412412 num = 1;
....@@ -460,15 +460,6 @@
460460 return -EPERM;
461461 }
462462
463
-struct read_storage_sccb {
464
- struct sccb_header header;
465
- u16 max_id;
466
- u16 assigned;
467
- u16 standby;
468
- u16 :16;
469
- u32 entries[0];
470
-} __packed;
471
-
472463 static const struct dev_pm_ops sclp_mem_pm_ops = {
473464 .freeze = sclp_mem_freeze,
474465 };
....@@ -498,7 +489,7 @@
498489 for (id = 0; id <= sclp_max_storage_id; id++) {
499490 memset(sccb, 0, PAGE_SIZE);
500491 sccb->header.length = PAGE_SIZE;
501
- rc = sclp_sync_request(0x00040001 | id << 8, sccb);
492
+ rc = sclp_sync_request(SCLP_CMDW_READ_STORAGE_INFO | id << 8, sccb);
502493 if (rc)
503494 goto out;
504495 switch (sccb->header.response_code) {