From: "StDenis, Tom" Subject: [PATCH] Fix VM handling for VMID 0 w.r.t. SYSTEM_APERTURE Date: Thu, 20 Jun 2019 17:44:09 +0000 Message-ID: <20190620174359.20529-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: "amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org" Cc: "StDenis, Tom" U2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPg0KLS0tDQog c3JjL2xpYi9yZWFkX3ZyYW0uYyB8IDQ3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCA0IGRlbGV0 aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvc3JjL2xpYi9yZWFkX3ZyYW0uYyBiL3NyYy9saWIvcmVh ZF92cmFtLmMNCmluZGV4IDEzMWNlYzMuLjgxMmRlOTYgMTAwNjQ0DQotLS0gYS9zcmMvbGliL3Jl YWRfdnJhbS5jDQorKysgYi9zcmMvbGliL3JlYWRfdnJhbS5jDQpAQCAtMzAwLDcgKzMwMCw3IEBA IHN0YXRpYyBpbnQgdW1yX2FjY2Vzc192cmFtX2FpKHN0cnVjdCB1bXJfYXNpYyAqYXNpYywgdWlu dDMyX3Qgdm1pZCwNCiAJdWludDY0X3Qgc3RhcnRfYWRkciwgcGFnZV90YWJsZV9zdGFydF9hZGRy LCBwYWdlX3RhYmxlX2Jhc2VfYWRkciwNCiAJCSBwYWdlX3RhYmxlX3NpemUsIHB0ZV9pZHgsIHBk ZV9pZHgsIHB0ZV9lbnRyeSwgcGRlX2VudHJ5LA0KIAkJIHBkZV9hZGRyZXNzLCB2Z2FfYmFzZV9h ZGRyZXNzLCB2bV9mYl9vZmZzZXQsIHZtX2ZiX2Jhc2UsDQotCQkgdmFfbWFzaywgb2Zmc2V0X21h c2s7DQorCQkgdmFfbWFzaywgb2Zmc2V0X21hc2ssIHN5c3RlbV9hcGVydHVyZV9sb3csIHN5c3Rl bV9hcGVydHVyZV9oaWdoOw0KIAl1aW50MzJfdCBjaHVua19zaXplLCB0bXA7DQogCWludCBwZGVf Y250LCBjdXJyZW50X2RlcHRoLCBwYWdlX3RhYmxlX2RlcHRoLCBmaXJzdDsNCiAJc3RydWN0IHsN CkBAIC0zMTIsNyArMzEyLDEwIEBAIHN0YXRpYyBpbnQgdW1yX2FjY2Vzc192cmFtX2FpKHN0cnVj dCB1bXJfYXNpYyAqYXNpYywgdWludDMyX3Qgdm1pZCwNCiAJCQltbVZNX0NPTlRFWFR4X1BBR0Vf VEFCTEVfQkFTRV9BRERSX0hJMzIsDQogCQkJbW1WR0FfTUVNT1JZX0JBU0VfQUREUkVTUywNCiAJ CQltbVZHQV9NRU1PUllfQkFTRV9BRERSRVNTX0hJR0gsDQotCQkJbW1NQ19WTV9GQl9PRkZTRVQ7 DQorCQkJbW1NQ19WTV9GQl9PRkZTRVQsDQorCQkJbW1NQ19WTV9NWF9MMV9UTEJfQ05UTCwNCisJ CQltbU1DX1ZNX1NZU1RFTV9BUEVSVFVSRV9MT1dfQUREUiwNCisJCQltbU1DX1ZNX1NZU1RFTV9B UEVSVFVSRV9ISUdIX0FERFI7DQogCX0gcmVnaXN0ZXJzOw0KIAlzdHJ1Y3Qgew0KIAkJdWludDY0 X3QNCkBAIC0zODEsNiArMzg0LDExIEBAIHN0YXRpYyBpbnQgdW1yX2FjY2Vzc192cmFtX2FpKHN0 cnVjdCB1bXJfYXNpYyAqYXNpYywgdWludDMyX3Qgdm1pZCwNCiAJfQ0KIA0KIAkvLyByZWFkIHZt IHJlZ2lzdGVycw0KKwlyZWdpc3RlcnMubW1NQ19WTV9TWVNURU1fQVBFUlRVUkVfSElHSF9BRERS ID0gdW1yX3JlYWRfcmVnX2J5X25hbWVfYnlfaXAoYXNpYywgaHViLCAibW1NQ19WTV9TWVNURU1f QVBFUlRVUkVfSElHSF9BRERSIik7DQorCXJlZ2lzdGVycy5tbU1DX1ZNX1NZU1RFTV9BUEVSVFVS RV9MT1dfQUREUiA9IHVtcl9yZWFkX3JlZ19ieV9uYW1lX2J5X2lwKGFzaWMsIGh1YiwgIm1tTUNf Vk1fU1lTVEVNX0FQRVJUVVJFX0xPV19BRERSIik7DQorCXN5c3RlbV9hcGVydHVyZV9sb3cgPSAo KHVpbnQ2NF90KXJlZ2lzdGVycy5tbU1DX1ZNX1NZU1RFTV9BUEVSVFVSRV9MT1dfQUREUikgPDwg MTg7DQorCXN5c3RlbV9hcGVydHVyZV9oaWdoID0gKCh1aW50NjRfdClyZWdpc3RlcnMubW1NQ19W TV9TWVNURU1fQVBFUlRVUkVfSElHSF9BRERSKSA8PCAxODsNCisJcmVnaXN0ZXJzLm1tTUNfVk1f TVhfTDFfVExCX0NOVEwgPSB1bXJfcmVhZF9yZWdfYnlfbmFtZV9ieV9pcChhc2ljLCBodWIsICJt bU1DX1ZNX01YX0wxX1RMQl9DTlRMIik7DQogCXNwcmludGYoYnVmLCAibW1WTV9DT05URVhUJSIg UFJJdTMyICJfUEFHRV9UQUJMRV9TVEFSVF9BRERSX0xPMzIiLCB2bWlkKTsNCiAJCXJlZ2lzdGVy cy5tbVZNX0NPTlRFWFR4X1BBR0VfVEFCTEVfU1RBUlRfQUREUl9MTzMyID0gdW1yX3JlYWRfcmVn X2J5X25hbWVfYnlfaXAoYXNpYywgaHViLCBidWYpOw0KIAkJcGFnZV90YWJsZV9zdGFydF9hZGRy ID0gKHVpbnQ2NF90KXJlZ2lzdGVycy5tbVZNX0NPTlRFWFR4X1BBR0VfVEFCTEVfU1RBUlRfQURE Ul9MTzMyIDw8IDEyOw0KQEAgLTQyNSw3ICs0MzMsMTAgQEAgc3RhdGljIGludCB1bXJfYWNjZXNz X3ZyYW1fYWkoc3RydWN0IHVtcl9hc2ljICphc2ljLCB1aW50MzJfdCB2bWlkLA0KIAkJCQkibW1W R0FfTUVNT1JZX0JBU0VfQUREUkVTUz0weCUiIFBSSXgzMiAiXG4iDQogCQkJCSJtbVZHQV9NRU1P UllfQkFTRV9BRERSRVNTX0hJR0g9MHglIiBQUkl4MzIgIlxuIg0KIAkJCQkibW1NQ19WTV9GQl9P RkZTRVQ9MHglIiBQUkl4MzIgIlxuIg0KLQkJCQkibW1NQ19WTV9GQl9MT0NBVElPTl9CQVNFPTB4 JSIgUFJJeDY0ICJcbiIsDQorCQkJCSJtbU1DX1ZNX0ZCX0xPQ0FUSU9OX0JBU0U9MHglIiBQUkl4 NjQgIlxuIg0KKwkJCQkibW1NQ19WTV9NWF9MMV9UTEJfQ05UTD0weCUiIFBSSXgzMiAiXG4iDQor CQkJCSJtbU1DX1ZNX1NZU1RFTV9BUEVSVFVSRV9MT1dfQUREUj0weCUiIFBSSXgzMiAiXG4iDQor CQkJCSJtbU1DX1ZNX1NZU1RFTV9BUEVSVFVSRV9ISUdIX0FERFI9MHglIiBQUkl4MzIgIlxuIiwN CiAJCQl2bWlkLCByZWdpc3RlcnMubW1WTV9DT05URVhUeF9QQUdFX1RBQkxFX1NUQVJUX0FERFJf TE8zMiwNCiAJCQl2bWlkLCByZWdpc3RlcnMubW1WTV9DT05URVhUeF9QQUdFX1RBQkxFX1NUQVJU X0FERFJfSEkzMiwNCiAJCQl2bWlkLCByZWdpc3RlcnMubW1WTV9DT05URVhUeF9QQUdFX1RBQkxF X0JBU0VfQUREUl9MTzMyLA0KQEAgLTQzNCwxMCArNDQ1LDM4IEBAIHN0YXRpYyBpbnQgdW1yX2Fj Y2Vzc192cmFtX2FpKHN0cnVjdCB1bXJfYXNpYyAqYXNpYywgdWludDMyX3Qgdm1pZCwNCiAJCQly ZWdpc3RlcnMubW1WR0FfTUVNT1JZX0JBU0VfQUREUkVTUywNCiAJCQlyZWdpc3RlcnMubW1WR0Ff TUVNT1JZX0JBU0VfQUREUkVTU19ISUdILA0KIAkJCXJlZ2lzdGVycy5tbU1DX1ZNX0ZCX09GRlNF VCwNCi0JCQl2bV9mYl9iYXNlKTsNCisJCQl2bV9mYl9iYXNlLA0KKwkJCXJlZ2lzdGVycy5tbU1D X1ZNX01YX0wxX1RMQl9DTlRMLA0KKwkJCXJlZ2lzdGVycy5tbU1DX1ZNX1NZU1RFTV9BUEVSVFVS RV9MT1dfQUREUiwNCisJCQlyZWdpc3RlcnMubW1NQ19WTV9TWVNURU1fQVBFUlRVUkVfSElHSF9B RERSDQorCQkJKTsNCiANCiAJLy8gdHJhbnNmb3JtIHBhZ2VfdGFibGVfYmFzZQ0KIAlwYWdlX3Rh YmxlX2Jhc2VfYWRkciAtPSB2bV9mYl9vZmZzZXQ7DQorDQorCWlmICh2bWlkID09IDApIHsNCisJ CXVpbnQzMl90IHNhbSA9IHVtcl9iaXRzbGljZV9yZWdfYnlfbmFtZV9ieV9pcChhc2ljLCBodWIs ICJtbU1DX1ZNX01YX0wxX1RMQl9DTlRMIiwgIlNZU1RFTV9BQ0NFU1NfTU9ERSIsIHJlZ2lzdGVy cy5tbU1DX1ZNX01YX0wxX1RMQl9DTlRMKTsNCisJCS8vIGFkZHJlc3NlcyBpbiBWTUlEMCBuZWVk IHNwZWNpYWwgaGFuZGxpbmcgdy5yLnQuIFBBR0VfVEFCTEVfU1RBUlRfQUREUg0KKwkJc3dpdGNo IChzYW0pIHsNCisJCQljYXNlIDA6IC8vIHBoeXNpY2FsIGFjY2Vzcw0KKwkJCQlyZXR1cm4gdW1y X2FjY2Vzc192cmFtKGFzaWMsIFVNUl9MSU5FQVJfSFVCLCBhZGRyZXNzLCBzaXplLCBkc3QsIHdy aXRlX2VuKTsNCisJCQljYXNlIDE6IC8vIGFsd2F5cyBWTSBhY2Nlc3MNCisJCQkJYnJlYWs7DQor CQkJY2FzZSAyOiAvLyBpbnNpZGUgc3lzdGVtIGFwZXJ0dXJlIGlzIG1hcHBlZCwgb3RoZXJ3aXNl IHVubWFwcGVkDQorCQkJCWlmICghKGFkZHJlc3MgPj0gc3lzdGVtX2FwZXJ0dXJlX2xvdyAmJiBh ZGRyZXNzIDwgc3lzdGVtX2FwZXJ0dXJlX2hpZ2gpKQ0KKwkJCQkJcmV0dXJuIHVtcl9hY2Nlc3Nf dnJhbShhc2ljLCBVTVJfTElORUFSX0hVQiwgYWRkcmVzcywgc2l6ZSwgZHN0LCB3cml0ZV9lbik7 DQorCQkJCWJyZWFrOw0KKwkJCWNhc2UgMzogLy8gaW5zaWRlIHN5c3RlbSBhcGVydHVyZSBpcyB1 bm1hcHBlZCwgb3RoZXJ3aXNlIG1hcHBlZA0KKwkJCQlpZiAoYWRkcmVzcyA+PSBzeXN0ZW1fYXBl cnR1cmVfbG93ICYmIGFkZHJlc3MgPCBzeXN0ZW1fYXBlcnR1cmVfaGlnaCkNCisJCQkJCXJldHVy biB1bXJfYWNjZXNzX3ZyYW0oYXNpYywgVU1SX0xJTkVBUl9IVUIsIGFkZHJlc3MsIHNpemUsIGRz dCwgd3JpdGVfZW4pOw0KKwkJCQlicmVhazsNCisJCQlkZWZhdWx0Og0KKwkJCQlhc2ljLT5tZW1f ZnVuY3Mudm1fbWVzc2FnZSgiW1dBUk5JTkddOiBVbmhhbmRsZWQgU1lTVEVNX0FDQ0VTU19NT0RF IG1vZGUgWyUiIFBSSXUzMiAiXVxuIiwgc2FtKTsNCisJCQkJYnJlYWs7DQorCQl9DQorCX0NCisN CisJLy8gZmFsbHRocm91Z2gsIGFuZC9vciBWTUlEcyBmb3IgPj0gMSBhcmUgYWx3YXlzIG1hcHBl ZA0KIAlhZGRyZXNzIC09IHBhZ2VfdGFibGVfc3RhcnRfYWRkcjsNCiANCiAJZG8gew0KLS0gDQoy LjIxLjANCg0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K YW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4