Merge #107

bors[bot] · orangecms · web-flow · commit e38a68d2edca · 2022-08-07T20:05:12.000Z
107: fix reading marchid and mimpid r=Disasm a=orangecms

It seems to have been a copy-paste error.
We ran into a very nasty bug in oreboot on the Allwinner D1 (C906) where
an errata patch in Linux relies on those two being zero.

Signed-off-by: Daniel Maslowski &lt;info@orangecms.org&gt;

Co-authored-by: Daniel Maslowski &lt;info@orangecms.org&gt;
diff --git a/src/register/marchid.rs b/src/register/marchid.rs
@@ -16,7 +16,7 @@ impl Marchid {
     }
 }
 
-read_csr!(0xF11);
+read_csr!(0xF12);
 
 /// Reads the CSR
 #[inline]
diff --git a/src/register/mimpid.rs b/src/register/mimpid.rs
@@ -16,7 +16,7 @@ impl Mimpid {
     }
 }
 
-read_csr!(0xF11);
+read_csr!(0xF13);
 
 /// Reads the CSR
 #[inline]

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ impl Marchid {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-read_csr!(0xF11);`
	`19`	`+read_csr!(0xF12);`
`20`	`20`
`21`	`21`	`/// Reads the CSR`
`22`	`22`	`#[inline]`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ impl Mimpid {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-read_csr!(0xF11);`
	`19`	`+read_csr!(0xF13);`
`20`	`20`
`21`	`21`	`/// Reads the CSR`
`22`	`22`	`#[inline]`