Date: Thu, 8 Jan 2015 17:09:23 +0100 From: =?UTF-8?Q?Micha=C5=82_Stanek?= <mst@semihalf.com> To: freebsd-current@freebsd.org Cc: freebsd-embedded@freebsd.org Subject: [PATCH] Add support for 64-bit AHCI BAR. Message-ID: <CAMiGqYhKn49LrdFGS4DeGSHDOuVO1Ab0mwubyqGXzxFLmNGoEQ@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--001a11c37818767c02050c264381 Content-Type: text/plain; charset=UTF-8 Hello all, I ran into an issue with AHCI BAR allocation on arm64. The AHCI PCI driver in sys/dev/ahci/ahci_pci.c assumes that ABAR (AHCI Base Address) register is located at offset 0x24 (BAR5) in the PCI header. Specification for AHCI confirms this is indeed the default address of the main BAR. However, if AHCI uses 64-bit base addresses, then this register consists of two dwords starting at offset 0x20 - BAR4 and BAR5. This is the case on our arm64 target and possibly other platforms using 64-bit BARs for AHCI. The following patch adds a check for the extended BAR in ahci_pci_attach() and sets the 'rid' in bus_alloc_resource_any accordingly. It fixes the allocation error on our platform. Please review and test this patch on other platforms. If there are no issues then it will be committed in a week. Thanks, Michal Stanek --001a11c37818767c02050c264381 Content-Type: text/x-patch; charset=US-ASCII; name="ahci_64bit_bar.patch" Content-Disposition: attachment; filename="ahci_64bit_bar.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i4obv96a0 RnJvbSBjYWI2MGNkN2ZjNWE1MTdkZjRkOGM1NWRhNWU4NzI4OGM0MWE5ODVhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWwgU3RhbmVrIDxtc3RAc2VtaWhhbGYuY29tPgpEYXRl OiBXZWQsIDcgSmFuIDIwMTUgMTg6Mjg6MTggKzAxMDAKU3ViamVjdDogW1BBVENIXSBBZGQgc3Vw cG9ydCBmb3IgNjQtYml0IEFIQ0kgQkFSLgoKLS0tCiBzeXMvZGV2L2FoY2kvYWhjaV9wY2kuYyB8 IDExICsrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCAyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL3N5cy9kZXYvYWhjaS9haGNpX3BjaS5jIGIvc3lzL2Rldi9h aGNpL2FoY2lfcGNpLmMKaW5kZXggYWYyNjk1MS4uNDM3MjNhNiAxMDA2NDQKLS0tIGEvc3lzL2Rl di9haGNpL2FoY2lfcGNpLmMKKysrIGIvc3lzL2Rldi9haGNpL2FoY2lfcGNpLmMKQEAgLTM3Myw2 ICszNzMsNyBAQCBhaGNpX3BjaV9hdHRhY2goZGV2aWNlX3QgZGV2KQogCWludAllcnJvciwgaTsK IAl1aW50MzJfdCBkZXZpZCA9IHBjaV9nZXRfZGV2aWQoZGV2KTsKIAl1aW50OF90IHJldmlkID0g cGNpX2dldF9yZXZpZChkZXYpOworCXN0cnVjdCBwY2lfbWFwICptYXA7CiAKIAlpID0gMDsKIAl3 aGlsZSAoYWhjaV9pZHNbaV0uaWQgIT0gMCAmJgpAQCAtMzg2LDEyICszODcsMTggQEAgYWhjaV9w Y2lfYXR0YWNoKGRldmljZV90IGRldikKIAkgICAgcGNpX2dldF9zdWJ2ZW5kb3IoZGV2KSA9PSAw eDEwNDMgJiYKIAkgICAgcGNpX2dldF9zdWJkZXZpY2UoZGV2KSA9PSAweDgxZTQpCiAJCWN0bHIt PnF1aXJrcyB8PSBBSENJX1FfU0FUQTFfVU5JVDA7Ci0JLyogaWYgd2UgaGF2ZSBhIG1lbW9yeSBC QVIoNSkgd2UgYXJlIGxpa2VseSBvbiBhbiBBSENJIHBhcnQgKi8KIAljdGxyLT52ZW5kb3JpZCA9 IHBjaV9nZXRfdmVuZG9yKGRldik7CiAJY3Rsci0+ZGV2aWNlaWQgPSBwY2lfZ2V0X2RldmljZShk ZXYpOwogCWN0bHItPnN1YnZlbmRvcmlkID0gcGNpX2dldF9zdWJ2ZW5kb3IoZGV2KTsKIAljdGxy LT5zdWJkZXZpY2VpZCA9IHBjaV9nZXRfc3ViZGV2aWNlKGRldik7Ci0JY3Rsci0+cl9yaWQgPSBQ Q0lSX0JBUig1KTsKKworCS8qIEFIQ0kgQmFzZSBBZGRyZXNzIGlzIEJBUig1KSBieSBkZWZhdWx0 LCB1bmxlc3MgQkFScyBhcmUgNjQtYml0ICovCisJbWFwID0gcGNpX2ZpbmRfYmFyKGRldiwgUENJ Ul9CQVIoNCkpOworCWlmIChtYXAgIT0gTlVMTCAmJgorCSAgICAoKG1hcC0+cG1fdmFsdWUgJiBQ Q0lNX0JBUl9NRU1fVFlQRSkgPT0gUENJTV9CQVJfTUVNXzY0KSkKKwkJY3Rsci0+cl9yaWQgPSBQ Q0lSX0JBUig0KTsKKwllbHNlCisJCWN0bHItPnJfcmlkID0gUENJUl9CQVIoNSk7CiAJaWYgKCEo Y3Rsci0+cl9tZW0gPSBidXNfYWxsb2NfcmVzb3VyY2VfYW55KGRldiwgU1lTX1JFU19NRU1PUlks CiAJICAgICZjdGxyLT5yX3JpZCwgUkZfQUNUSVZFKSkpCiAJCXJldHVybiBFTlhJTzsKLS0gCjIu Mi4xCgo= --001a11c37818767c02050c264381--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMiGqYhKn49LrdFGS4DeGSHDOuVO1Ab0mwubyqGXzxFLmNGoEQ>