Skip to content

Commit 24bf80f

Browse files
eaibmzAlexander Gordeev
authored andcommitted
s390/ipl: Introduce sysfs attribute 'scp_data' for dump ipl
This is analogous to the reipl's sysfs attribute named equally and enables tools such as s390-tools' dumpconf to pass additional kernel cmdline parameters to a stand-alone dumper such as zfcpdump (e.g. to enable debug output with 'dump_debug' parameter) or ngdump. Acked-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
1 parent 005ca01 commit 24bf80f

File tree

1 file changed

+33
-0
lines changed

1 file changed

+33
-0
lines changed

arch/s390/kernel/ipl.c

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,6 +1572,11 @@ DEFINE_IPL_ATTR_RW(dump_fcp, br_lba, "%lld\n", "%lld\n",
15721572
DEFINE_IPL_ATTR_RW(dump_fcp, device, "0.0.%04llx\n", "0.0.%llx\n",
15731573
dump_block_fcp->fcp.devno);
15741574

1575+
DEFINE_IPL_ATTR_SCP_DATA_RW(dump_fcp, dump_block_fcp->hdr,
1576+
dump_block_fcp->fcp,
1577+
IPL_BP_FCP_LEN, IPL_BP0_FCP_LEN,
1578+
DIAG308_SCPDATA_SIZE);
1579+
15751580
static struct attribute *dump_fcp_attrs[] = {
15761581
&sys_dump_fcp_device_attr.attr,
15771582
&sys_dump_fcp_wwpn_attr.attr,
@@ -1581,9 +1586,15 @@ static struct attribute *dump_fcp_attrs[] = {
15811586
NULL,
15821587
};
15831588

1589+
static struct bin_attribute *dump_fcp_bin_attrs[] = {
1590+
&sys_dump_fcp_scp_data_attr,
1591+
NULL,
1592+
};
1593+
15841594
static struct attribute_group dump_fcp_attr_group = {
15851595
.name = IPL_FCP_STR,
15861596
.attrs = dump_fcp_attrs,
1597+
.bin_attrs = dump_fcp_bin_attrs,
15871598
};
15881599

15891600
/* NVME dump device attributes */
@@ -1596,6 +1607,11 @@ DEFINE_IPL_ATTR_RW(dump_nvme, bootprog, "%lld\n", "%llx\n",
15961607
DEFINE_IPL_ATTR_RW(dump_nvme, br_lba, "%lld\n", "%llx\n",
15971608
dump_block_nvme->nvme.br_lba);
15981609

1610+
DEFINE_IPL_ATTR_SCP_DATA_RW(dump_nvme, dump_block_nvme->hdr,
1611+
dump_block_nvme->nvme,
1612+
IPL_BP_NVME_LEN, IPL_BP0_NVME_LEN,
1613+
DIAG308_SCPDATA_SIZE);
1614+
15991615
static struct attribute *dump_nvme_attrs[] = {
16001616
&sys_dump_nvme_fid_attr.attr,
16011617
&sys_dump_nvme_nsid_attr.attr,
@@ -1604,9 +1620,15 @@ static struct attribute *dump_nvme_attrs[] = {
16041620
NULL,
16051621
};
16061622

1623+
static struct bin_attribute *dump_nvme_bin_attrs[] = {
1624+
&sys_dump_nvme_scp_data_attr,
1625+
NULL,
1626+
};
1627+
16071628
static struct attribute_group dump_nvme_attr_group = {
16081629
.name = IPL_NVME_STR,
16091630
.attrs = dump_nvme_attrs,
1631+
.bin_attrs = dump_nvme_bin_attrs,
16101632
};
16111633

16121634
/* ECKD dump device attributes */
@@ -1620,16 +1642,27 @@ IPL_ATTR_BR_CHR_STORE_FN(dump, dump_block_eckd->eckd);
16201642
static struct kobj_attribute sys_dump_eckd_br_chr_attr =
16211643
__ATTR(br_chr, 0644, eckd_dump_br_chr_show, eckd_dump_br_chr_store);
16221644

1645+
DEFINE_IPL_ATTR_SCP_DATA_RW(dump_eckd, dump_block_eckd->hdr,
1646+
dump_block_eckd->eckd,
1647+
IPL_BP_ECKD_LEN, IPL_BP0_ECKD_LEN,
1648+
DIAG308_SCPDATA_SIZE);
1649+
16231650
static struct attribute *dump_eckd_attrs[] = {
16241651
&sys_dump_eckd_device_attr.attr,
16251652
&sys_dump_eckd_bootprog_attr.attr,
16261653
&sys_dump_eckd_br_chr_attr.attr,
16271654
NULL,
16281655
};
16291656

1657+
static struct bin_attribute *dump_eckd_bin_attrs[] = {
1658+
&sys_dump_eckd_scp_data_attr,
1659+
NULL,
1660+
};
1661+
16301662
static struct attribute_group dump_eckd_attr_group = {
16311663
.name = IPL_ECKD_STR,
16321664
.attrs = dump_eckd_attrs,
1665+
.bin_attrs = dump_eckd_bin_attrs,
16331666
};
16341667

16351668
/* CCW dump device attributes */

0 commit comments

Comments
 (0)