Author: tsoome
Date: Mon Oct 12 09:34:50 2020
New Revision: 366631
URL: https://svnweb.freebsd.org/changeset/base/366631

Log:
  loader: edd_device_path_v3 is too small
  
  The EDD v3[1], see table 13, page 33, does define device path as double
  qword, that is, 16 bytes, we have only qword.
  
  Also remove edd_device_path_v4 and edd_params_v4 because those are not used,
  and there is no size difference in v3 versus v4.
  
  [1] http://www.t13.org/documents/UploadedDocuments/docs2004/d1572r3-EDD3.pdf
  
  MFC after:    2 weeks

Modified:
  head/stand/i386/common/edd.h

Modified: head/stand/i386/common/edd.h
==============================================================================
--- head/stand/i386/common/edd.h        Mon Oct 12 08:43:21 2020        
(r366630)
+++ head/stand/i386/common/edd.h        Mon Oct 12 09:34:50 2020        
(r366631)
@@ -71,7 +71,7 @@ struct edd_device_path_v3 {
        char            host_bus[4];
        char            interface[8];
        uint64_t        interface_path;
-       uint64_t        device_path;
+       uint64_t        device_path[2];
        uint8_t         reserved2[1];
        uint8_t         checksum;
 } __packed;
@@ -79,23 +79,6 @@ struct edd_device_path_v3 {
 struct edd_params_v3 {
        struct edd_params params;
        struct edd_device_path_v3 device_path;
-} __packed;
-
-struct edd_device_path_v4 {
-       uint16_t        key;
-       uint8_t         len;
-       uint8_t         reserved[3];
-       char            host_bus[4];
-       char            interface[8];
-       uint64_t        interface_path;
-       uint64_t        device_path[2];
-       uint8_t         reserved2[1];
-       uint8_t         checksum;
-} __packed;
-
-struct edd_params_v4 {
-       struct edd_params params;
-       struct edd_device_path_v4 device_path;
 } __packed;
 
 #define        EDD_FLAGS_DMA_BOUNDARY_HANDLING         0x0001
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to