From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MRt8C-0008Iq-9Z for qemu-devel@nongnu.org; Fri, 17 Jul 2009 15:30:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MRt8A-0008I7-4l for qemu-devel@nongnu.org; Fri, 17 Jul 2009 15:30:06 -0400 Received: from [199.232.76.173] (port=35873 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRt89-0008I2-U1 for qemu-devel@nongnu.org; Fri, 17 Jul 2009 15:30:05 -0400 Received: from fg-out-1718.google.com ([72.14.220.155]:3812) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MRt89-00066U-8L for qemu-devel@nongnu.org; Fri, 17 Jul 2009 15:30:05 -0400 Received: by fg-out-1718.google.com with SMTP id d23so417754fga.8 for ; Fri, 17 Jul 2009 12:30:04 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <200907171558.32607.paul@codesourcery.com> References: <200907171104.n6HB4EDY011438@d01av04.pok.ibm.com> <4A60899E.6020108@codemonkey.ws> <200907171558.32607.paul@codesourcery.com> From: Blue Swirl Date: Fri, 17 Jul 2009 22:29:44 +0300 Message-ID: Subject: Re: [Qemu-devel] Re: [Qemu-commits] [COMMIT e813376] Sparc32: fix fdc io_base Content-Type: multipart/mixed; boundary=000e0cd24442ab5048046eebd008 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook Cc: qemu-devel@nongnu.org --000e0cd24442ab5048046eebd008 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, Jul 17, 2009 at 5:58 PM, Paul Brook wrote: >> > =C2=A0 =C2=A0 =C2=A0.qdev.props =3D (Property[]) { >> > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{ >> > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.name =3D "io_base", >> > - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.info =3D &qdev_prop_uint32= , >> > + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.info =3D &qdev_prop_taddr, >> >> fdc probably shouldn't use target_phys_addr_t and instead should just >> use a uint64_t for io_base. =C2=A0target_phys is a CPU type, devices >> shouldn't depend on it. > > The qdev support for this device is almost completely bogus. =C2=A0The de= vice code > should not be dealing with the base address at all. It should be handled = by a > SysBus MMIO region. fdctrl_init should not be calling fdctrl_init_common. > Instead everything should be done by the qdev init routine (fdctrl_init1)= . > > The mem_mapped property is also fairly suspect. We almost certainly want = two > different devices. On SysBus device a MMIO region, and the other an ISA d= evice > (using IO ports) - Note that qdev ISA bus support does not exist yet. How about this cleanup? --000e0cd24442ab5048046eebd008 Content-Type: application/x-patch; name="0001-Clean-up-fdc-qdev-conversion.patch" Content-Disposition: attachment; filename="0001-Clean-up-fdc-qdev-conversion.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fx9b01fv0 RnJvbSBlOTIyZjAxNDc3MTRiOTllZjk3MjdmM2YyOTA3NjQwMTZkMDY0MjllIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdtYWlsLmNvbT4KRGF0 ZTogRnJpLCAxNyBKdWwgMjAwOSAxOToyMzo0OCArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIENsZWFu IHVwIGZkYyBxZGV2IGNvbnZlcnNpb24KClNpZ25lZC1vZmYtYnk6IEJsdWUgU3dpcmwgPGJsYXV3 aXJiZWxAZ21haWwuY29tPgotLS0KIGh3L2ZkYy5jIHwgICA2MCArKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZXMgY2hhbmdl ZCwgMjUgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvZmRj LmMgYi9ody9mZGMuYwppbmRleCA0YWQ1ZTVlLi4yZjBhZGY5IDEwMDY0NAotLS0gYS9ody9mZGMu YworKysgYi9ody9mZGMuYwpAQCAtNTEyLDggKzUxMiw2IEBAIHN0cnVjdCBmZGN0cmxfdCB7CiAg ICAgLyogRmxvcHB5IGRyaXZlcyAqLwogICAgIGZkcml2ZV90IGRyaXZlc1tNQVhfRkRdOwogICAg IGludCByZXNldF9zZW5zZWk7Ci0gICAgdWludDMyX3Qgc3RyaWN0X2lvOwotICAgIHVpbnQzMl90 IG1lbV9tYXBwZWQ7CiB9OwogCiBzdGF0aWMgdWludDMyX3QgZmRjdHJsX3JlYWQgKHZvaWQgKm9w YXF1ZSwgdWludDMyX3QgcmVnKQpAQCAtMTkwMSw5ICsxODk5LDYgQEAgZmRjdHJsX3QgKmZkY3Ry bF9pbml0IChxZW11X2lycSBpcnEsIGludCBkbWFfY2hhbm4sIGludCBtZW1fbWFwcGVkLAogICAg IGZkY3RybF90ICpmZGN0cmw7CiAKICAgICBkZXYgPSBxZGV2X2NyZWF0ZShOVUxMLCAiZmRjIik7 Ci0gICAgcWRldl9wcm9wX3NldF91aW50MzIoZGV2LCAic3RyaWN0X2lvIiwgMCk7Ci0gICAgcWRl dl9wcm9wX3NldF91aW50MzIoZGV2LCAibWVtX21hcHBlZCIsIG1lbV9tYXBwZWQpOwotICAgIHFk ZXZfcHJvcF9zZXRfdWludDMyKGRldiwgInN1bjRtIiwgMCk7CiAgICAgcWRldl9pbml0KGRldik7 CiAgICAgcyA9IHN5c2J1c19mcm9tX3FkZXYoZGV2KTsKICAgICBzeXNidXNfY29ubmVjdF9pcnEo cywgMCwgaXJxKTsKQEAgLTE5MjAsNiArMTkxNSw3IEBAIGZkY3RybF90ICpmZGN0cmxfaW5pdCAo cWVtdV9pcnEgaXJxLCBpbnQgZG1hX2NoYW5uLCBpbnQgbWVtX21hcHBlZCwKICAgICAgICAgcmVn aXN0ZXJfaW9wb3J0X3dyaXRlKCh1aW50MzJfdClpb19iYXNlICsgMHgwNywgMSwgMSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICZmZGN0cmxfd3JpdGVfcG9ydCwgZmRjdHJsKTsKICAg ICB9CisgICAgZmRjdHJsLT5zdW40bSA9IDA7CiAKICAgICBmZGN0cmxfaW5pdF9jb21tb24oZmRj dHJsLCBkbWFfY2hhbm4sIGlvX2Jhc2UsIGZkcyk7CiAKQEAgLTE5MzMsMTAgKzE5MjksNyBAQCBm ZGN0cmxfdCAqc3VuNG1fZmRjdHJsX2luaXQgKHFlbXVfaXJxIGlycSwgdGFyZ2V0X3BoeXNfYWRk cl90IGlvX2Jhc2UsCiAgICAgU3lzQnVzRGV2aWNlICpzOwogICAgIGZkY3RybF90ICpmZGN0cmw7 CiAKLSAgICBkZXYgPSBxZGV2X2NyZWF0ZShOVUxMLCAiZmRjIik7Ci0gICAgcWRldl9wcm9wX3Nl dF91aW50MzIoZGV2LCAic3RyaWN0X2lvIiwgMSk7Ci0gICAgcWRldl9wcm9wX3NldF91aW50MzIo ZGV2LCAibWVtX21hcHBlZCIsIDEpOwotICAgIHFkZXZfcHJvcF9zZXRfdWludDMyKGRldiwgInN1 bjRtIiwgMSk7CisgICAgZGV2ID0gcWRldl9jcmVhdGUoTlVMTCwgIlNVTlcsZmR0d28iKTsKICAg ICBxZGV2X2luaXQoZGV2KTsKICAgICBzID0gc3lzYnVzX2Zyb21fcWRldihkZXYpOwogICAgIHN5 c2J1c19jb25uZWN0X2lycShzLCAwLCBpcnEpOwpAQCAtMTk0NCw2ICsxOTM3LDcgQEAgZmRjdHJs X3QgKnN1bjRtX2ZkY3RybF9pbml0IChxZW11X2lycSBpcnEsIHRhcmdldF9waHlzX2FkZHJfdCBp b19iYXNlLAogICAgICpmZGNfdGMgPSBxZGV2X2dldF9ncGlvX2luKGRldiwgMCk7CiAKICAgICBm ZGN0cmwgPSBGUk9NX1NZU0JVUyhmZGN0cmxfdCwgcyk7CisgICAgZmRjdHJsLT5zdW40bSA9IDE7 CiAgICAgZmRjdHJsX2luaXRfY29tbW9uKGZkY3RybCwgLTEsIGlvX2Jhc2UsIGZkcyk7CiAKICAg ICByZXR1cm4gZmRjdHJsOwpAQCAtMTk1Niw0MSArMTk1MCwzNiBAQCBzdGF0aWMgdm9pZCBmZGNf aW5pdDEoU3lzQnVzRGV2aWNlICpkZXYpCiAKICAgICBzeXNidXNfaW5pdF9pcnEoZGV2LCAmcy0+ aXJxKTsKICAgICBxZGV2X2luaXRfZ3Bpb19pbigmZGV2LT5xZGV2LCBmZGN0cmxfaGFuZGxlX3Rj LCAxKTsKLSAgICBpZiAocy0+c3RyaWN0X2lvKSB7Ci0gICAgICAgIGlvID0gY3B1X3JlZ2lzdGVy X2lvX21lbW9yeShmZGN0cmxfbWVtX3JlYWRfc3RyaWN0LAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZmRjdHJsX21lbV93cml0ZV9zdHJpY3QsIHMpOwotICAgIH0gZWxzZSB7 Ci0gICAgICAgIGlvID0gY3B1X3JlZ2lzdGVyX2lvX21lbW9yeShmZGN0cmxfbWVtX3JlYWQsIGZk Y3RybF9tZW1fd3JpdGUsIHMpOwotICAgIH0KKyAgICBpbyA9IGNwdV9yZWdpc3Rlcl9pb19tZW1v cnkoZmRjdHJsX21lbV9yZWFkLCBmZGN0cmxfbWVtX3dyaXRlLCBzKTsKICAgICBzeXNidXNfaW5p dF9tbWlvKGRldiwgMHgwOCwgaW8pOwogfQogCitzdGF0aWMgdm9pZCBzdW40bV9mZGNfaW5pdDEo U3lzQnVzRGV2aWNlICpkZXYpCit7CisgICAgZmRjdHJsX3QgKnMgPSBGUk9NX1NZU0JVUyhmZGN0 cmxfdCwgZGV2KTsKKyAgICBpbnQgaW87CisKKyAgICBzeXNidXNfaW5pdF9pcnEoZGV2LCAmcy0+ aXJxKTsKKyAgICBxZGV2X2luaXRfZ3Bpb19pbigmZGV2LT5xZGV2LCBmZGN0cmxfaGFuZGxlX3Rj LCAxKTsKKyAgICBpbyA9IGNwdV9yZWdpc3Rlcl9pb19tZW1vcnkoZmRjdHJsX21lbV9yZWFkX3N0 cmljdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmRjdHJsX21lbV93cml0ZV9z dHJpY3QsIHMpOworICAgIHN5c2J1c19pbml0X21taW8oZGV2LCAweDA4LCBpbyk7Cit9CiAKIHN0 YXRpYyBTeXNCdXNEZXZpY2VJbmZvIGZkY19pbmZvID0gewogICAgIC5pbml0ID0gZmRjX2luaXQx LAogICAgIC5xZGV2Lm5hbWUgID0gImZkYyIsCiAgICAgLnFkZXYuc2l6ZSAgPSBzaXplb2YoZmRj dHJsX3QpLAogICAgIC5xZGV2LnByb3BzID0gKFByb3BlcnR5W10pIHsKLSAgICAgICAgewotICAg ICAgICAgICAgLm5hbWUgPSAiaW9fYmFzZSIsCi0gICAgICAgICAgICAuaW5mbyA9ICZxZGV2X3By b3BfdGFkZHIsCi0gICAgICAgICAgICAub2Zmc2V0ID0gb2Zmc2V0b2YoZmRjdHJsX3QsIGlvX2Jh c2UpLAotICAgICAgICB9LAotICAgICAgICB7Ci0gICAgICAgICAgICAubmFtZSA9ICJzdHJpY3Rf aW8iLAotICAgICAgICAgICAgLmluZm8gPSAmcWRldl9wcm9wX3VpbnQzMiwKLSAgICAgICAgICAg IC5vZmZzZXQgPSBvZmZzZXRvZihmZGN0cmxfdCwgc3RyaWN0X2lvKSwKLSAgICAgICAgfSwKLSAg ICAgICAgewotICAgICAgICAgICAgLm5hbWUgPSAibWVtX21hcHBlZCIsCi0gICAgICAgICAgICAu aW5mbyA9ICZxZGV2X3Byb3BfdWludDMyLAotICAgICAgICAgICAgLm9mZnNldCA9IG9mZnNldG9m KGZkY3RybF90LCBtZW1fbWFwcGVkKSwKLSAgICAgICAgfSwKLSAgICAgICAgewotICAgICAgICAg ICAgLm5hbWUgPSAic3VuNG0iLAotICAgICAgICAgICAgLmluZm8gPSAmcWRldl9wcm9wX3VpbnQz MiwKLSAgICAgICAgICAgIC5vZmZzZXQgPSBvZmZzZXRvZihmZGN0cmxfdCwgc3VuNG0pLAotICAg ICAgICB9LAorICAgICAgICB7LyogZW5kIG9mIHByb3BlcnRpZXMgKi99CisgICAgfQorfTsKKwor c3RhdGljIFN5c0J1c0RldmljZUluZm8gc3VuNG1fZmRjX2luZm8gPSB7CisgICAgLmluaXQgPSBz dW40bV9mZGNfaW5pdDEsCisgICAgLnFkZXYubmFtZSAgPSAiU1VOVyxmZHR3byIsCisgICAgLnFk ZXYuc2l6ZSAgPSBzaXplb2YoZmRjdHJsX3QpLAorICAgIC5xZGV2LnByb3BzID0gKFByb3BlcnR5 W10pIHsKICAgICAgICAgey8qIGVuZCBvZiBwcm9wZXJ0aWVzICovfQogICAgIH0KIH07CkBAIC0x OTk4LDYgKzE5ODcsNyBAQCBzdGF0aWMgU3lzQnVzRGV2aWNlSW5mbyBmZGNfaW5mbyA9IHsKIHN0 YXRpYyB2b2lkIGZkY19yZWdpc3Rlcl9kZXZpY2VzKHZvaWQpCiB7CiAgICAgc3lzYnVzX3JlZ2lz dGVyX3dpdGhwcm9wKCZmZGNfaW5mbyk7CisgICAgc3lzYnVzX3JlZ2lzdGVyX3dpdGhwcm9wKCZz dW40bV9mZGNfaW5mbyk7CiB9CiAKIGRldmljZV9pbml0KGZkY19yZWdpc3Rlcl9kZXZpY2VzKQot LSAKMS41LjYuNQoK --000e0cd24442ab5048046eebd008--