From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Date: Tue, 04 May 2021 01:21:13 +0000 Subject: Re: [PATCH v4 1/3] spapr: nvdimm: Forward declare and move the definitions Message-Id: MIME-Version: 1 Content-Type: multipart/mixed; boundary="rqO14lpZiRldN/l1" List-Id: References: <161966810162.652.13723419108625443430.stgit@17be908f7c1c> <161966811094.652.571342595267518155.stgit@17be908f7c1c> In-Reply-To: To: Eric Blake Cc: Shivaprasad G Bhat , groug@kaod.org, qemu-ppc@nongnu.org, ehabkost@redhat.com, marcel.apfelbaum@gmail.com, mst@redhat.com, imammedo@redhat.com, xiaoguangrong.eric@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, pbonzini@redhat.com, stefanha@redhat.com, haozhong.zhang@intel.com, shameerali.kolothum.thodi@huawei.com, kwangwoo.lee@sk.com, armbru@redhat.com, qemu-devel@nongnu.org, aneesh.kumar@linux.ibm.com, linux-nvdimm@lists.01.org, kvm-ppc@vger.kernel.org, shivaprasadbhat@gmail.com, bharata@linux.vnet.ibm.com --rqO14lpZiRldN/l1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, May 03, 2021 at 01:23:47PM -0500, Eric Blake wrote: > On 4/28/21 10:48 PM, Shivaprasad G Bhat wrote: > > The subsequent patches add definitions which tend to > > get the compilation to cyclic dependency. So, prepare > > with forward declarations, move the defitions and clean up. >=20 > definitions >=20 > >=20 > > Signed-off-by: Shivaprasad G Bhat > > --- > > hw/ppc/spapr_nvdimm.c | 12 ++++++++++++ > > include/hw/ppc/spapr_nvdimm.h | 14 ++------------ > > 2 files changed, 14 insertions(+), 12 deletions(-) > >=20 > > diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c > > index b46c36917c..8cf3fb2ffb 100644 > > --- a/hw/ppc/spapr_nvdimm.c > > +++ b/hw/ppc/spapr_nvdimm.c > > @@ -31,6 +31,18 @@ > > #include "qemu/range.h" > > #include "hw/ppc/spapr_numa.h" > > =20 > > +/* > > + * The nvdimm size should be aligned to SCM block size. > > + * The SCM block size should be aligned to SPAPR_MEMORY_BLOCK_SIZE > > + * inorder to have SCM regions not to overlap with dimm memory regions. >=20 > And while at it, even though it is code motion... It looks like the patch no longer applies clear to ppc-for-6.1, so can you rebase and fix up Eric's nitpicks at the same time? >=20 > > + * The SCM devices can have variable block sizes. For now, fixing the > > + * block size to the minimum value. > > + */ > > +#define SPAPR_MINIMUM_SCM_BLOCK_SIZE SPAPR_MEMORY_BLOCK_SIZE >=20 > > +++ b/include/hw/ppc/spapr_nvdimm.h > > @@ -11,19 +11,9 @@ > > #define HW_SPAPR_NVDIMM_H > > =20 > > #include "hw/mem/nvdimm.h" > > -#include "hw/ppc/spapr.h" > > =20 > > -/* > > - * The nvdimm size should be aligned to SCM block size. > > - * The SCM block size should be aligned to SPAPR_MEMORY_BLOCK_SIZE > > - * inorder to have SCM regions not to overlap with dimm memory regions. >=20 > ... this should be "in order" >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --rqO14lpZiRldN/l1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmCQoYcACgkQbDjKyiDZ s5K2XhAAnKMU4fHKY8zYm2UkdJJMJZJlnQtfgO1iJQLrmfFszhFekavJzaRx/xT0 gudfIWjcqRomM3jzQQq5LbEr/XH4w8ws+PF1kPTetjO7gSQepyO9krepcPmiciJ7 My58zSnBNmyNDAgMHzRc2fYNBFxr/XSXxo2ZZidUavG8fZS2h2ftIz8JlTepY9pN NBOURrUtwcT+gAvpbE7saAVKLFMlRRFN3vU3Aj/vt/1P5gBg7dOEsYhTleDFDske njhUdtDB8qy0NZba6Mz0Um6hiUZU/xH+YMS7S1ZZcqA8ne08kTELW5cKzjks1NST /AAIlrHuFckRzGo3xHeTNeBoU76rZCUWXNe8TxmCswUHOlQQELLspIqbMW2/BgNP XccFpegH/H/qEwe2ZXVM86aOHuSaIwmKmrF96N5sD0WZMLgRA1XXDSc40p+NV67h p6uGnKotunrlyHIztASEd+/hwenV6nGAAePeuBP2NLQbD+ZaQRDkzMrTmujN1SRj u68z8XYYO/pSk77mWO0oh9Ao42EVZVLEOHnRqyjsdc/YD3iLm0QP4hDXe6Q9c39Q sHXBju4en2BPVJme+8yZzobJzHYXKA3E7wJ0PVx57Ra9KToZf7mZdiL7pHffHI1c XtqKim8cz5xm4OnCloZTghId9DHNgO9maAHFP+xnroRosQwzD4s= =tiiy -----END PGP SIGNATURE----- --rqO14lpZiRldN/l1--