From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 201A412C48D; Tue, 23 Apr 2024 11:53:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713873221; cv=none; b=kHrbANPDwPyCho1s4gdgM/57CDyf+g3xUluY+mIeah42PzYBtSvBrVoSjWtO071G7g6NVWG9P1kLiyXJ9M/544ppasUixUjRpjulfw7USmqkfxACJtIc0sQQ+pGihLUajlbZV74Eijwn9FAPa7BSOdNoFMPb6eToMdNgESiOq3M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713873221; c=relaxed/simple; bh=sJUlIw2u3y7di8lLXLn9J2hl+nc7e+xRy/529rTVAcI=; h=Subject:To:CC:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=NWYsqE9zNZQs7y+zzxfmyrlV8xe01vmVNXYp7taAxJDnERsDXR+qmlJq9M2wliJG1+1nlhZaENqDDl5ufNczCIhIYsmWpAx+y0V046CLpvSwG1ZQFaxT7+rSb89m7AEMt/zWxu0mYp8AyIEKjUEskmWK6W3faElFYMPHoAHyhfE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VP0mq6yPrzvPrw; Tue, 23 Apr 2024 19:50:35 +0800 (CST) Received: from dggpemm500002.china.huawei.com (unknown [7.185.36.229]) by mail.maildlp.com (Postfix) with ESMTPS id 6BA521403D4; Tue, 23 Apr 2024 19:53:36 +0800 (CST) Received: from [10.174.178.247] (10.174.178.247) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 23 Apr 2024 19:53:35 +0800 Subject: Re: [PATCH v7 04/16] ACPI: processor: Move checks and availability of acpi_processor earlier To: Jonathan Cameron , Thomas Gleixner , Peter Zijlstra , , , , , , , , , Russell King , "Rafael J . Wysocki" , Miguel Luis , James Morse , Salil Mehta , Jean-Philippe Brucker , Catalin Marinas , Will Deacon CC: Ingo Molnar , Borislav Petkov , Dave Hansen , , , References: <20240418135412.14730-1-Jonathan.Cameron@huawei.com> <20240418135412.14730-5-Jonathan.Cameron@huawei.com> From: Hanjun Guo Message-ID: <0cfc4e2d-65ab-0040-2c7d-fad83f32455b@huawei.com> Date: Tue, 23 Apr 2024 19:53:34 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240418135412.14730-5-Jonathan.Cameron@huawei.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500002.china.huawei.com (7.185.36.229) > @@ -232,6 +263,7 @@ static int acpi_processor_get_info(struct acpi_device *device) > acpi_status status = AE_OK; > static int cpu0_initialized; > unsigned long long value; > + int ret; > > acpi_processor_errata(); > > @@ -316,10 +348,12 @@ static int acpi_processor_get_info(struct acpi_device *device) > * because cpuid <-> apicid mapping is persistent now. > */ > if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id)) { > - int ret = acpi_processor_hotadd_init(pr); > + ret = acpi_processor_hotadd_init(pr, device); > > if (ret) > - return ret; > + goto err; > + } else { > + acpi_processor_set_per_cpu(pr, device); > } > > /* > @@ -357,6 +391,10 @@ static int acpi_processor_get_info(struct acpi_device *device) > arch_fix_phys_package_id(pr->id, value); > > return 0; > + > +err: > + per_cpu(processors, pr->id) = NULL; ... > + return ret; > } > > /* > @@ -365,8 +403,6 @@ static int acpi_processor_get_info(struct acpi_device *device) > * (cpu_data(cpu)) values, like CPU feature flags, family, model, etc. > * Such things have to be put in and set up by the processor driver's .probe(). > */ > -static DEFINE_PER_CPU(void *, processor_device_array); > - > static int acpi_processor_add(struct acpi_device *device, > const struct acpi_device_id *id) > { > @@ -395,28 +431,6 @@ static int acpi_processor_add(struct acpi_device *device, > if (result) /* Processor is not physically present or unavailable */ > return 0; > > - BUG_ON(pr->id >= nr_cpu_ids); > - > - /* > - * Buggy BIOS check. > - * ACPI id of processors can be reported wrongly by the BIOS. > - * Don't trust it blindly > - */ > - if (per_cpu(processor_device_array, pr->id) != NULL && > - per_cpu(processor_device_array, pr->id) != device) { > - dev_warn(&device->dev, > - "BIOS reported wrong ACPI id %d for the processor\n", > - pr->id); > - /* Give up, but do not abort the namespace scan. */ > - goto err; > - } > - /* > - * processor_device_array is not cleared on errors to allow buggy BIOS > - * checks. > - */ > - per_cpu(processor_device_array, pr->id) = device; > - per_cpu(processors, pr->id) = pr; Nit: seems we need to remove the duplicated per_cpu(processors, pr->id) = NULL; in acpi_processor_add(): --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -446,7 +446,6 @@ static int acpi_processor_add(struct acpi_device *device, err: free_cpumask_var(pr->throttling.shared_cpu_map); device->driver_data = NULL; - per_cpu(processors, pr->id) = NULL; err_free_pr: kfree(pr); return result; Thanks Hanjun