73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Eric Snowberg <eric.snowberg@oracle.com>
|
|
Date: Mon, 26 Feb 2018 17:34:19 -0800
|
|
Subject: [PATCH] sparc64: #blocks disk node method
|
|
|
|
Return the number of blocks of storage associated with the device or
|
|
instance. Where a "block" is a unit of storage consisting of the number
|
|
of bytes returned by the package's "block-size" method. If the size cannot
|
|
be determined, the #blocks method returns the maximum unsigned integer
|
|
(which, because of Open Firmware's assumption of two's complement arithmetic,
|
|
is equivalent to the signed number -1). If the number of blocks exceeds
|
|
the range of an unsigned number, return 0 to alert the caller to try
|
|
the #blocks64 command.
|
|
|
|
Signed-off-by: Eric Snowberg <eric.snowberg@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/kern/sparc64/ieee1275/ieee1275.c | 31 ++++++++++++++++++++++++++++++
|
|
include/grub/sparc64/ieee1275/ieee1275.h | 1 +
|
|
2 files changed, 32 insertions(+)
|
|
|
|
diff --git a/grub-core/kern/sparc64/ieee1275/ieee1275.c b/grub-core/kern/sparc64/ieee1275/ieee1275.c
|
|
index 53be692c3d8..67933a45b35 100644
|
|
--- a/grub-core/kern/sparc64/ieee1275/ieee1275.c
|
|
+++ b/grub-core/kern/sparc64/ieee1275/ieee1275.c
|
|
@@ -89,3 +89,34 @@ grub_ieee1275_alloc_physmem (grub_addr_t *paddr, grub_size_t size,
|
|
|
|
return args.catch_result;
|
|
}
|
|
+
|
|
+grub_uint64_t
|
|
+grub_ieee1275_num_blocks (grub_ieee1275_ihandle_t ihandle)
|
|
+{
|
|
+ struct nblocks_args_ieee1275
|
|
+ {
|
|
+ struct grub_ieee1275_common_hdr common;
|
|
+ grub_ieee1275_cell_t method;
|
|
+ grub_ieee1275_cell_t ihandle;
|
|
+ grub_ieee1275_cell_t catch_result;
|
|
+ grub_ieee1275_cell_t blocks;
|
|
+ }
|
|
+ args;
|
|
+
|
|
+ INIT_IEEE1275_COMMON (&args.common, "call-method", 2, 2);
|
|
+ args.method = (grub_ieee1275_cell_t) "#blocks";
|
|
+ args.ihandle = ihandle;
|
|
+ args.catch_result = 1;
|
|
+
|
|
+ if ((IEEE1275_CALL_ENTRY_FN (&args) == -1) || (args.catch_result != 0))
|
|
+ return -1;
|
|
+
|
|
+ /*
|
|
+ * If the number of blocks exceeds the range of an unsigned number,
|
|
+ * return 0 to alert the caller to try the #blocks64 command.
|
|
+ */
|
|
+ if (args.blocks >= 0xffffffffULL)
|
|
+ return 0;
|
|
+
|
|
+ return args.blocks;
|
|
+}
|
|
diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
|
|
index 32c77f80f1a..2ddf44d41df 100644
|
|
--- a/include/grub/sparc64/ieee1275/ieee1275.h
|
|
+++ b/include/grub/sparc64/ieee1275/ieee1275.h
|
|
@@ -42,6 +42,7 @@ extern int EXPORT_FUNC(grub_ieee1275_claim_vaddr) (grub_addr_t vaddr,
|
|
extern int EXPORT_FUNC(grub_ieee1275_alloc_physmem) (grub_addr_t *paddr,
|
|
grub_size_t size,
|
|
grub_uint32_t align);
|
|
+extern grub_uint64_t EXPORT_FUNC(grub_ieee1275_num_blocks) (grub_uint32_t ihandle);
|
|
|
|
extern grub_addr_t EXPORT_VAR (grub_ieee1275_original_stack);
|
|
|