From:   =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To:     <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        Bjorn Helgaas <bhelgaas@google.com>
CC:     =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
        "Ard Biesheuvel" <ardb@kernel.org>,
        "Michael J . Ruhl" <michael.j.ruhl@intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH 2/2] PCI: Don't fail BAR resize if nothing is reassigned
Date:   Wed, 15 Dec 2021 15:16:26 +0100
Message-ID: <20211215141626.3090807-3-michal.winiarski@intel.com>
In-Reply-To: <20211215141626.3090807-1-michal.winiarski@intel.com>
References: <20211215141626.3090807-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGZoNmE0VGVDTXpIVi9ZSittTjNiTHM2czQ1UWYyTnYwR0I4TDJXSnJkdVNY?=
 =?utf-8?B?K1ZXcnZ5OUVjYUowRG1iSVcwNUdDOEhISTRPQXNBT01waW1INmRzNDVzck1r?=
 =?utf-8?B?akh6UmF2QVRMKzZYSjRhdWR5NFNnR3F2OHE4LzBpUGJIKzRGdHRTSG92OGx5?=
 =?utf-8?B?WWhwU25MdENIR085eTBDTXBMOGtBYUVyeXFlcjI3bmcvazJVeWxhcHZFS0RJ?=
 =?utf-8?B?N0NoTXliNmg5MlNVVDVlaWhMWi8wRVRpR2lXMDIxY3VmTGpQNVZsMGtrTFh1?=
 =?utf-8?B?YTNLR0xrVTh3R2NFTWJMY0lqTktBNWpkMm9GcVJQSnBMZWt0eUwxd1c2d1Jr?=
 =?utf-8?B?cnhVWGlyd0oxNHNvODZtamdrMHlYUXZyaDdzMXY3dnBja0FDMTJxL2xtb1VW?=
 =?utf-8?B?cEk5eUgyZ3VwYk9XR2xkR2wyK2F3QmxGQVZiai92a0JFTlFZby9UK3FaMVV4?=
 =?utf-8?B?RFJNTDBmaG1GVCtFVFpvN2lpTG12ejF6TXBHSnAxamJpdTF1bWF5TVRxZFdy?=
 =?utf-8?B?QUE2aUdKdkltUE5nM3dOUzBHbTBtZFh0di9pblI0ekpoZkVrZTJKRGlJL2ln?=
 =?utf-8?B?NXUxd3NWbHdpSllRYVRkcmdoSTl4eUxlam1sRDBwSHM3dTdkaE1aN2hrbTBi?=
 =?utf-8?B?eEs5V1pjT0lPZC9kRWdSVjcrQTdTRjBEZTZVOUdhQW1XUTFEVjFxY2hkVkpw?=
 =?utf-8?B?VVJZK0hkYkJkK0dtN29SaVFHM05Pbmpuc1gwWENMcGdvRlNyWEl4UzZPMjZs?=
 =?utf-8?B?dk9uNWI1Z3hYT0dvNVo1Qm9JcXVQeXU2M2RxbkZVRkRIemdZaEUyQWhwVzZW?=
 =?utf-8?B?VmJhdGdqWDJEZXJOdVZFQnlDdFFIZXYyMEc5bWhFWDRVdit2a0xrN0o0Ukdm?=
 =?utf-8?B?OHFqVVlpbldoU25uWG5weDR0NjZlbmVqbndIdE5mbGNQN09Gdk5kVWdlRmR3?=
 =?utf-8?B?aSs0QWRRSVMzQjRZME9HTnRzeXpqOVgrR3liSmZZWlZYN2Jka3BtK1IwZlVN?=
 =?utf-8?B?NDRicGN0UktPQ0JweW11Qzc1YmhXT0F3SkN6ZHpaRlZlYUlWMWlFaWZBOGhT?=
 =?utf-8?B?UFR4TjdqL085MDdyNmExTmJGeXYrVVVuRlpucjBPMFBGVUZDdkVFVVIyNUZt?=
 =?utf-8?B?cnhmR1RJRHdERm56UGRNeTBRSXdQQ0pXR3dUb0lDTXh5b2ptcWkzZk1na3FP?=
 =?utf-8?B?b0tLdXdtd3NyRkhWZWl1dFN5V3hHSWZzMDJ1OXJteTQvZDY0NGhFWExxTTdk?=
 =?utf-8?B?TTlITS93V3RWVHFnUGNqeUNYTUo4QTFDS1BPQ1FQRkpBaENUWGI2eGk2V0Mz?=
 =?utf-8?B?UU5RYTVuN1R2R3BxTW1wUVNybDN4RHFpV1hxZjhHMlB2TjFEcDM5bHhraUQ1?=
 =?utf-8?B?TFJQcmR0TlhySy9ZNllvcGc5NnlneExyYThmSDEzdFVyNHZIeHcwU3p1WTY1?=
 =?utf-8?B?c08rdjFtd0x6b2ZwdnB5dkx4Q3NjVFZOZ3pqS1pvRGNJS3ZSK0NyZ3Nhekwx?=
 =?utf-8?B?NDVsdURQYmx3aW1PUEdxajBlTEU0QnM1VTZ5ZTdmZ3lNZFduZDREQXJqNGVZ?=
 =?utf-8?B?NHp4bk9rR3lvZDZoTk84VUhTK29DQVZiMGlpait2bDFBMksxZ2FHTUJyREQ3?=
 =?utf-8?B?T0ZLMktBREdLbThwU3lGVXZOQ0k4bEFXa09WUVdhQ2RDT2RiZTZGa1JucFdL?=
 =?utf-8?B?Y1F2Y3lYWkFkSjNjcy9TN2lYWm1EWm5YMVJIdzhvU0ViUnk4eUQvTmRBWGx3?=
 =?utf-8?B?QWZuNmMxbEo4cjFVY2NsTy8wSjBHcWQ1YXZSQU4vMHFZNVNrQVB5NlFOVHdw?=
 =?utf-8?B?VmJkeURpRm9UcEVsekkyY0dsc1R3SHR1SXdrODFjbGNpaFVxQnhvQ01SNnl2?=
 =?utf-8?B?elJBR0lkbEZoUlNZRDhwUmZ3RGRqZW1FaTZOVWo4RkVJTlBwVDNGc3A2bW9q?=
 =?utf-8?B?dHNWYkhISkpZc0xBdjRZK2pUcjBJT1h0Yk4xZ29UMXJsbGx2b0JNU0RQaXds?=
 =?utf-8?B?UzhjaFkvSDgyeE9GdkNTa0RrU2syRHU2ZzBPeHRhVXVCS0JWRlVtbHhqc0xB?=
 =?utf-8?B?a3dpbXgxbUg5bVVCaXNGOExnR2wvZTJFbm5nemNPRkVIcUN1RHZUS2hqY0tV?=
 =?utf-8?B?MkJxMGdEcnNkdVVvVWhGUDJmckJNMmVscmRNQmluZ1ZaTEtBbUcwano4THkv?=
 =?utf-8?B?OVo2dmdvSk1haFAweWgwOXRvUE9JTmpxK2F1c0N0Ny9lTEtGMm4yRW12YlZs?=
 =?utf-8?B?L1BRVVc5T1JlK3N2QjZ0d0lDUCt3PT0=?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ec133b13-6eea-4dbe-0a76-08d9bfd58fda
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 14:17:01.2787
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: InFRK2bTR8lGCkfDtZFX9YzgFnI/v/CfyqzmAtqDmGvqKlGKairqK9I2+p8rqfOcgW1dbFONQrfSkG7Pv7VFNRDoM8nWUy8HAwhAd7dy0sw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4740
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When pci_reassign_bridge_resources returns -ENOENT, it means that no
resources needed to be "moved". This can happen when the resource was
resized to be smaller, and it's completely fine - there's no need to treat
this as an error and go back to the original BAR size.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 drivers/pci/setup-res.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 1946e52e7678a..5de5129055e0a 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -484,7 +484,7 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size)
 	/* Check if the new config works by trying to assign everything. */
 	if (dev->bus->self) {
 		ret = pci_reassign_bridge_resources(dev->bus->self, res->flags);
-		if (ret)
+		if (ret && ret != -ENOENT)
 			goto error_resize;
 	}
 	return 0;
-- 
2.34.0